mDNS: Import

The sources can be obtained via:

http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-544.tar.gz

578 files changed, 195006 insertions, 0 deletions

diff --git a/mDNSResponder/Clients/BonjourExample/BonjourExample.cpp b/mDNSResponder/Clients/BonjourExample/BonjourExample.cpp
new file mode 100644
index 00000000..f517456c
--- /dev/null
+++ b/mDNSResponder/Clients/BonjourExample/BonjourExample.cpp
@@ -0,0 +1,199 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"stdafx.h"
+
+#include	<assert.h>
+#include	<stdio.h>
+
+#include	"dns_sd.h"
+
+// Constants
+
+#define BONJOUR_EVENT		( WM_USER + 0x100 )	// Message sent to the Window when a Bonjour event occurs.
+
+// Prototypes
+
+static LRESULT CALLBACK WndProc( HWND inWindow, UINT inMsg, WPARAM inWParam, LPARAM inLParam );
+
+static void DNSSD_API
+	BrowserCallBack( 
+		DNSServiceRef		inServiceRef, 
+		DNSServiceFlags		inFlags,
+		uint32_t			inIFI, 
+		DNSServiceErrorType	inError,
+		const char *		inName,
+		const char *		inType,
+		const char *		inDomain, 
+		void *				inContext );
+
+// Globals
+
+DNSServiceRef		gServiceRef = NULL;
+
+// Main entry point for application.
+
+int _tmain( int argc, _TCHAR *argv[] )
+{
+	HINSTANCE				instance;
+	WNDCLASSEX				wcex;
+	HWND					wind;
+	MSG						msg;
+	DNSServiceErrorType		err;
+	
+	(void) argc; // Unused
+	(void) argv; // Unused
+	
+	// Create the window. This window won't actually be shown, but it demonstrates how to use Bonjour
+	// with Windows GUI applications by having Bonjour events processed as messages to a Window.
+	
+	instance = GetModuleHandle( NULL );
+	assert( instance );
+	
+	wcex.cbSize			= sizeof( wcex );
+	wcex.style			= 0;
+	wcex.lpfnWndProc	= (WNDPROC) WndProc;
+	wcex.cbClsExtra		= 0;
+	wcex.cbWndExtra		= 0;
+	wcex.hInstance		= instance;
+	wcex.hIcon			= NULL;
+	wcex.hCursor		= NULL;
+	wcex.hbrBackground	= NULL;
+	wcex.lpszMenuName	= NULL;
+	wcex.lpszClassName	= TEXT( "BonjourExample" );
+	wcex.hIconSm		= NULL;
+	RegisterClassEx( &wcex );
+	
+	wind = CreateWindow( wcex.lpszClassName, wcex.lpszClassName, 0, CW_USEDEFAULT, 0, CW_USEDEFAULT, 
+		0, NULL, NULL, instance, NULL );
+	assert( wind );
+	
+	// Start browsing for services and associate the Bonjour browser with our window using the 
+	// WSAAsyncSelect mechanism. Whenever something related to the Bonjour browser occurs, our 
+	// private Windows message will be sent to our window so we can give Bonjour a chance to 
+	// process it. This allows Bonjour to avoid using a secondary thread (and all the issues 
+	// with synchronization that would introduce), but still process everything asynchronously.
+	// This also simplifies app code because Bonjour will only run when we explicitly call it.
+	
+	err = DNSServiceBrowse( 
+		&gServiceRef, 					// Receives reference to Bonjour browser object.
+		0,								// No flags.
+		kDNSServiceInterfaceIndexAny,	// Browse on all network interfaces.
+		"_http._tcp",					// Browse for HTTP service types.
+		NULL,							// Browse on the default domain (e.g. local.).
+		BrowserCallBack, 				// Callback function when Bonjour events occur.
+		NULL );							// No callback context needed.
+	assert( err == kDNSServiceErr_NoError );
+	
+	err = WSAAsyncSelect( (SOCKET) DNSServiceRefSockFD( gServiceRef ), wind, BONJOUR_EVENT, FD_READ | FD_CLOSE );
+	assert( err == kDNSServiceErr_NoError );
+	
+	fprintf( stderr, "Browsing for _http._tcp\n" );
+	
+	// Main event loop for the application. All Bonjour events are dispatched while in this loop.
+	
+	while( GetMessage( &msg, NULL, 0, 0 ) ) 
+	{
+		TranslateMessage( &msg );
+		DispatchMessage( &msg );
+	}
+	
+	// Clean up Bonjour. This is not strictly necessary since the normal process cleanup will 
+	// close Bonjour socket(s) and release memory, but it's here to demonstrate how to do it.
+	
+	if( gServiceRef )
+	{
+		WSAAsyncSelect( (SOCKET) DNSServiceRefSockFD( gServiceRef ), wind, BONJOUR_EVENT, 0 );
+		DNSServiceRefDeallocate( gServiceRef );
+	}
+	return( 0 );
+}
+
+// Callback for the Window. Bonjour events are delivered here.
+
+static LRESULT CALLBACK WndProc( HWND inWindow, UINT inMsg, WPARAM inWParam, LPARAM inLParam )
+{
+	LRESULT					result;
+	DNSServiceErrorType		err;
+	
+	switch( inMsg )
+	{
+		case BONJOUR_EVENT:
+			
+			// Process the Bonjour event. All Bonjour callbacks occur from within this function.
+			// If an error occurs while trying to process the result, it most likely means that
+			// something serious has gone wrong with Bonjour, such as it being terminated. This 
+			// does not normally occur, but code should be prepared to handle it. If the error 
+			// is ignored, the window will receive a constant stream of BONJOUR_EVENT messages so
+			// if an error occurs, we disassociate the DNSServiceRef from the window, deallocate
+			// it, and invalidate the reference so we don't try to deallocate it again on quit. 
+			// Since this is a simple example app, if this error occurs, we quit the app too.
+			
+			err = DNSServiceProcessResult( gServiceRef );
+			if( err != kDNSServiceErr_NoError )
+			{
+				fprintf( stderr, "### ERROR! serious Bonjour error: %d\n", err );
+				
+				WSAAsyncSelect( (SOCKET) DNSServiceRefSockFD( gServiceRef ), inWindow, BONJOUR_EVENT, 0 );
+				DNSServiceRefDeallocate( gServiceRef );
+				gServiceRef = NULL;
+				
+				PostQuitMessage( 0 );
+			}
+			result = 0;
+			break;
+		
+		default:
+			result = DefWindowProc( inWindow, inMsg, inWParam, inLParam );
+			break;
+	}
+	return( result );
+}
+
+// Callback for Bonjour browser events. Called when services are added or removed.
+
+static void DNSSD_API
+	BrowserCallBack( 
+		DNSServiceRef		inServiceRef, 
+		DNSServiceFlags		inFlags,
+		uint32_t			inIFI, 
+		DNSServiceErrorType	inError,
+		const char *		inName,
+		const char *		inType,
+		const char *		inDomain, 
+		void *				inContext )
+{
+	(void) inServiceRef;	// Unused
+	(void) inContext;		// Unused
+	
+	if( inError == kDNSServiceErr_NoError )
+	{
+		const char *		action;
+		const char *		more;
+		
+		if( inFlags & kDNSServiceFlagsAdd )			action	= "ADD";
+		else										action	= "RMV";
+		if( inFlags & kDNSServiceFlagsMoreComing )	more	= " (MORE)";
+		else										more	= "";
+		
+		fprintf( stderr, "%s %30s.%s%s on interface %d%s\n", action, inName, inType, inDomain, (int) inIFI, more );
+	}
+	else
+	{
+		fprintf( stderr, "Bonjour browser error occurred: %d\n", inError );
+	}
+}
diff --git a/mDNSResponder/Clients/BonjourExample/BonjourExample.sln b/mDNSResponder/Clients/BonjourExample/BonjourExample.sln
new file mode 100644
index 00000000..fb803309
--- /dev/null
+++ b/mDNSResponder/Clients/BonjourExample/BonjourExample.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BonjourExample", "BonjourExample.vcproj", "{0A842379-799E-414C-BF1F-BF11A8D3A8A8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0A842379-799E-414C-BF1F-BF11A8D3A8A8}.Debug.ActiveCfg = Debug|Win32
+		{0A842379-799E-414C-BF1F-BF11A8D3A8A8}.Debug.Build.0 = Debug|Win32
+		{0A842379-799E-414C-BF1F-BF11A8D3A8A8}.Release.ActiveCfg = Release|Win32
+		{0A842379-799E-414C-BF1F-BF11A8D3A8A8}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/mDNSResponder/Clients/BonjourExample/BonjourExample.vcproj b/mDNSResponder/Clients/BonjourExample/BonjourExample.vcproj
new file mode 100644
index 00000000..b58f3b16
--- /dev/null
+++ b/mDNSResponder/Clients/BonjourExample/BonjourExample.vcproj
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="BonjourExample"
+	ProjectGUID="{0A842379-799E-414C-BF1F-BF11A8D3A8A8}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../mDNSShared"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="TRUE"
+				RuntimeLibrary="5"
+				BufferSecurityCheck="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="3"
+				BrowseInformation="1"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="$(OutDir)/BonjourExample.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/BonjourExample.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="../../mDNSShared"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				BufferSecurityCheck="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="3"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="$(OutDir)/BonjourExample.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\BonjourExample.cpp">
+		</File>
+		<File
+			RelativePath="..\..\mDNSWindows\Dll\release\dnssd.lib">
+		</File>
+		<File
+			RelativePath=".\stdafx.cpp">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath=".\stdafx.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mDNSResponder/Clients/BonjourExample/stdafx.cpp b/mDNSResponder/Clients/BonjourExample/stdafx.cpp
new file mode 100644
index 00000000..a28f2b5b
--- /dev/null
+++ b/mDNSResponder/Clients/BonjourExample/stdafx.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Standard source file to build the pre-compiled header.
+
+#include	"stdafx.h"
diff --git a/mDNSResponder/Clients/BonjourExample/stdafx.h b/mDNSResponder/Clients/BonjourExample/stdafx.h
new file mode 100644
index 00000000..d820f4ab
--- /dev/null
+++ b/mDNSResponder/Clients/BonjourExample/stdafx.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Standard Windows pre-compiled header file.
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
+
+#include    <windows.h>
+#include    <winsock2.h>
+
+#include    <stdlib.h>
+#include    <malloc.h>
+#include    <memory.h>
+#include    <tchar.h>
diff --git a/mDNSResponder/Clients/ClientCommon.c b/mDNSResponder/Clients/ClientCommon.c
new file mode 100644
index 00000000..68f354cc
--- /dev/null
+++ b/mDNSResponder/Clients/ClientCommon.c
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2008 Apple Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ctype.h>
+#include <stdio.h>          // For stdout, stderr
+
+#include "ClientCommon.h"
+
+const char *GetNextLabel(const char *cstr, char label[64])
+{
+    char *ptr = label;
+    while (*cstr && *cstr != '.')               // While we have characters in the label...
+    {
+        char c = *cstr++;
+        if (c == '\\' && *cstr)                 // If we have a backslash, and it's not the last character of the string
+        {
+            c = *cstr++;
+            if (isdigit(cstr[-1]) && isdigit(cstr[0]) && isdigit(cstr[1]))
+            {
+                int v0 = cstr[-1] - '0';                        // then interpret as three-digit decimal
+                int v1 = cstr[ 0] - '0';
+                int v2 = cstr[ 1] - '0';
+                int val = v0 * 100 + v1 * 10 + v2;
+                // If valid three-digit decimal value, use it
+                // Note that although ascii nuls are possible in DNS labels
+                // we're building a C string here so we have no way to represent that
+                if (val == 0) val = '-';
+                if (val <= 255) { c = (char)val; cstr += 2; }
+            }
+        }
+        *ptr++ = c;
+        if (ptr >= label+64) { label[63] = 0; return(NULL); }   // Illegal label more than 63 bytes
+    }
+    *ptr = 0;                                                   // Null-terminate label text
+    if (ptr == label) return(NULL);                             // Illegal empty label
+    if (*cstr) cstr++;                                          // Skip over the trailing dot (if present)
+    return(cstr);
+}
diff --git a/mDNSResponder/Clients/ClientCommon.h b/mDNSResponder/Clients/ClientCommon.h
new file mode 100644
index 00000000..afe5b7a5
--- /dev/null
+++ b/mDNSResponder/Clients/ClientCommon.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2008 Apple Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+extern const char *GetNextLabel(const char *cstr, char label[64]);
diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD.manifest b/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD.manifest
new file mode 100644
index 00000000..9e0b08ae
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.DNS-SD" type="win32"/>
+	<description>Command line utility.</description>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+				<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+				</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD64.manifest b/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD64.manifest
new file mode 100644
index 00000000..caa49dff
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/DNS-SD64.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="amd64" name="Apple.Bonjour.DNS-SD" type="win32"/> 
+	<description>Command Line Utility</description> 
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+				<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+				</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.rc b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.rc
new file mode 100755
index 00000000..79df1bac
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.rc
@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Console Utility"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "dns-sd.exe"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "dns-sd.exe"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.rc b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.rc
new file mode 100755
index 00000000..9274716c
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.rc
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 1,0,0,0

+ PRODUCTVERSION 1,0,0,0

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "Apple Inc."

+            VALUE "FileDescription", "Bonjour Console Utility"

+            VALUE "FileVersion", "1.0.0.0"

+            VALUE "InternalName", "dns-sd.exe"

+            VALUE "LegalCopyright", "Copyright (C) 2010 Apple Inc."

+            VALUE "OriginalFilename", "dns-sd.exe"

+            VALUE "ProductName", "Bonjour"

+            VALUE "ProductVersion", "1.0.0.0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.vcproj b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.vcproj
new file mode 100755
index 00000000..41daa815
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.sdk.vcproj
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="dns-sd"

+	ProjectGUID="{AA230639-E115-4A44-AA5A-44A61235BA50}"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(BONJOUR_SDK_HOME)/Include"

+				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="&quot;$(BONJOUR_SDK_HOME)/Lib/$(PlatformName)/dnssd.lib&quot; ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/dns-sd.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(BONJOUR_SDK_HOME)/Include"

+				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="&quot;$(BONJOUR_SDK_HOME)/Lib/$(PlatformName)/dnssd.lib&quot; ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/dns-sd.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="$(BONJOUR_SDK_HOME)/Include"

+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="&quot;$(BONJOUR_SDK_HOME)/Lib/$(PlatformName)/dnssd.lib&quot; ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="$(BONJOUR_SDK_HOME)/Include"

+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="&quot;$(BONJOUR_SDK_HOME)/Lib/$(PlatformName)/dnssd.lib&quot; ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine=""

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

+			<File

+				RelativePath=".\ClientCommon.c"

+				>

+			</File>

+			<File

+				RelativePath=".\dns-sd.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath=".\ClientCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="resource.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath="dns-sd.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcproj b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcproj
new file mode 100755
index 00000000..58e79e46
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcproj
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="dns-sd"

+	ProjectGUID="{AA230639-E115-4A44-AA5A-44A61235BA50}"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/dns-sd.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/dns-sd.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;            mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;               mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS&quot;           mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;               mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB&quot;             mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat&quot;               mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                           &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\dns-sd.c&quot;                                                            &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\ClientCommon.c&quot;                                             &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\ClientCommon.h&quot;                                             &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)resource.h&quot;                                                             &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)DNS-SD.manifest&quot;                                                 &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)DNS-SD64.manifest&quot;                                             &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)dns-sd.sdk.rc&quot;                                                        &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;move /Y &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.sdk.rc&quot; &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.rc&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)dns-sd.sdk.vcproj&quot;                                                &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;move /Y &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.sdk.vcproj&quot; &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.vcproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.NET\App.ico&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.NET\AssemblyInfo.cs&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.NET.csproj&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.cs&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.resx&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\SimpleChat.NET\App.ico&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\SimpleChat.NET\AssemblyInfo.cs&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\SimpleChat.NET\SimpleChat.NET.csproj&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\SimpleChat.NET\SimpleChat.cs&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\SimpleChat.NET\SimpleChat.resx&quot;                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.Designer.vb&quot;  &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.VB.vbproj&quot;   &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.resx&quot;   &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.vb&quot;   &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser&quot;&#x0D;&#x0A;xcopy /E/Y &quot;$(ProjectDir)..\DNSServiceBrowser.VB\My Project&quot;                      &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project&quot;&#x0D;&#x0A;xcopy /E/Y &quot;$(ProjectDir)..\SimpleChat.VB&quot;                                               &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/dns-sd.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="DNS-SD64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;            mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;               mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\Samples\C&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                           &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

+			<File

+				RelativePath="..\ClientCommon.c"

+				>

+			</File>

+			<File

+				RelativePath="..\dns-sd.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="..\ClientCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="resource.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath="dns-sd.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj
new file mode 100755
index 00000000..8ed154a9
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{AA230639-E115-4A44-AA5A-44A61235BA50}</ProjectGuid>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dns-sd.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dns-sd.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>DNS-SD.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dns-sd.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dns-sd.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>DNS-SD64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dns-sd.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>DNS-SD.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"            mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"               mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS"           mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"               mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB"             mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat"               mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat"

+xcopy /I/Y "$(TargetPath)"                                                                           "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+xcopy /I/Y "$(ProjectDir)..\dns-sd.c"                                                            "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)..\ClientCommon.c"                                             "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)..\ClientCommon.h"                                             "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)resource.h"                                                             "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)DNS-SD.manifest"                                                 "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)DNS-SD64.manifest"                                             "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(ProjectDir)dns-sd.sdk.rc"                                                        "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+move /Y "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.sdk.rc" "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.rc"

+xcopy /I/Y "$(ProjectDir)dns-sd.sdk.vcproj"                                                "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+move /Y "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.sdk.vcproj" "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C\dns-sd.vcproj"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.NET\App.ico"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.NET\AssemblyInfo.cs"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.NET.csproj"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.cs"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.NET\DNSServiceBrowser.resx"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\SimpleChat.NET\App.ico"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+xcopy /I/Y "$(ProjectDir)..\SimpleChat.NET\AssemblyInfo.cs"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+xcopy /I/Y "$(ProjectDir)..\SimpleChat.NET\SimpleChat.NET.csproj"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+xcopy /I/Y "$(ProjectDir)..\SimpleChat.NET\SimpleChat.cs"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+xcopy /I/Y "$(ProjectDir)..\SimpleChat.NET\SimpleChat.resx"                  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\CS\SimpleChat"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.Designer.vb"  "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.VB.vbproj"   "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.resx"   "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser"

+xcopy /I/Y "$(ProjectDir)..\DNSServiceBrowser.VB\DNSServiceBrowser.vb"   "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser"

+xcopy /E/Y "$(ProjectDir)..\DNSServiceBrowser.VB\My Project"                      "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\DNSServiceBrowser\My Project"

+xcopy /E/Y "$(ProjectDir)..\SimpleChat.VB"                                               "$(DSTROOT)\Program Files\Bonjour SDK\Samples\VB\SimpleChat"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_CONSOLE;NOT_HAVE_GETOPT;NOT_HAVE_SETLINEBUF;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dns-sd.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>DNS-SD64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"            mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"               mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\C"

+xcopy /I/Y "$(TargetPath)"                                                                           "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\ClientCommon.c" />

+    <ClCompile Include="..\dns-sd.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\ClientCommon.h" />

+    <ClInclude Include="resource.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="dns-sd.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj.filters b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj.filters
new file mode 100755
index 00000000..78299c04
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{663cbcf4-ce8e-49eb-9826-0676fba94350}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{f5fcca0d-918b-46ba-bb91-2f2f9d9ddbba}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{a7d985ec-3f36-4554-a707-5256b2e719b6}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\ClientCommon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\dns-sd.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\ClientCommon.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="dns-sd.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNS-SD.VisualStudio/resource.h b/mDNSResponder/Clients/DNS-SD.VisualStudio/resource.h
new file mode 100755
index 00000000..593b5f9f
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.VisualStudio/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dns-sd.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/DNS-SD.xcodeproj/project.pbxproj b/mDNSResponder/Clients/DNS-SD.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..f2d54f04
--- /dev/null
+++ b/mDNSResponder/Clients/DNS-SD.xcodeproj/project.pbxproj
@@ -0,0 +1,737 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		FFF520490671177900DA3D49 /* Build All */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 21D91E890B12A03D003981D9 /* Build configuration list for PBXAggregateTarget "Build All" */;
+			buildPhases = (
+			);
+			dependencies = (
+				FF383826067117F300FEF615 /* PBXTargetDependency */,
+				FF383828067117F600FEF615 /* PBXTargetDependency */,
+				FF1E351806711B6A003DD5BC /* PBXTargetDependency */,
+			);
+			name = "Build All";
+			productName = "Build All";
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		8DD76F770486A8DE00D96B5E /* dns-sd.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* dns-sd.c */; settings = {ATTRIBUTES = (); }; };
+		FF1B6915067114AF002304DD /* DNSServiceBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = FF1B6914067114AF002304DD /* DNSServiceBrowser.m */; };
+		FF1E351C06711BCF003DD5BC /* DNSServiceReg.m in Sources */ = {isa = PBXBuildFile; fileRef = FF1E351B06711BCF003DD5BC /* DNSServiceReg.m */; };
+		FF1E352606711BD6003DD5BC /* DNSServiceReg.nib in Resources */ = {isa = PBXBuildFile; fileRef = FF1E352506711BD6003DD5BC /* DNSServiceReg.nib */; };
+		FF2704F90F12A60900299571 /* ClientCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FF2704F80F12A60900299571 /* ClientCommon.c */; };
+		FF964AA10671153B0099215A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF964AA00671153B0099215A /* Foundation.framework */; };
+		FF964CAA0671155C0099215A /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF964CA90671155C0099215A /* AppKit.framework */; };
+		FF964DAC067115710099215A /* DNSServiceBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = FF964DAB067115710099215A /* DNSServiceBrowser.nib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		FF1E351706711B6A003DD5BC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FF1E351206711B5C003DD5BC;
+			remoteInfo = DNSServiceReg;
+		};
+		FF383825067117F300FEF615 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DD76F740486A8DE00D96B5E;
+			remoteInfo = "dns-sd";
+		};
+		FF383827067117F600FEF615 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FF1B691006711383002304DD;
+			remoteInfo = "DNS Service Browser";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		8DD76F7B0486A8DE00D96B5E /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		08FB7796FE84155DC02AAC07 /* dns-sd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "dns-sd.c"; sourceTree = "<group>"; };
+		8DD76F7E0486A8DE00D96B5E /* dns-sd */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "dns-sd"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FF1B691106711383002304DD /* DNS Service Browser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DNS Service Browser.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FF1B6914067114AF002304DD /* DNSServiceBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSServiceBrowser.m; sourceTree = "<group>"; };
+		FF1E351306711B5C003DD5BC /* DNS Service Registration.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DNS Service Registration.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FF1E351B06711BCF003DD5BC /* DNSServiceReg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSServiceReg.m; sourceTree = "<group>"; };
+		FF1E352506711BD6003DD5BC /* DNSServiceReg.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = DNSServiceReg.nib; sourceTree = "<group>"; };
+		FF2704F80F12A60900299571 /* ClientCommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ClientCommon.c; sourceTree = "<group>"; };
+		FF964AA00671153B0099215A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		FF964CA90671155C0099215A /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		FF964DAB067115710099215A /* DNSServiceBrowser.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = DNSServiceBrowser.nib; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8DD76F780486A8DE00D96B5E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1B690F06711383002304DD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF964AA10671153B0099215A /* Foundation.framework in Frameworks */,
+				FF964CAA0671155C0099215A /* AppKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1E351106711B5C003DD5BC /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		08FB7794FE84155DC02AAC07 /* mDNS */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7795FE84155DC02AAC07 /* Source */,
+				21D91EBD0B12A2B6003981D9 /* Resources */,
+				08FB779DFE84155DC02AAC07 /* Frameworks */,
+				19C28FBDFE9D53C911CA2CBB /* Products */,
+			);
+			name = mDNS;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7796FE84155DC02AAC07 /* dns-sd.c */,
+				FF2704F80F12A60900299571 /* ClientCommon.c */,
+				FF1B6914067114AF002304DD /* DNSServiceBrowser.m */,
+				FF1E351B06711BCF003DD5BC /* DNSServiceReg.m */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		08FB779DFE84155DC02AAC07 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FF964CA90671155C0099215A /* AppKit.framework */,
+				FF964AA00671153B0099215A /* Foundation.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		19C28FBDFE9D53C911CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8DD76F7E0486A8DE00D96B5E /* dns-sd */,
+				FF1B691106711383002304DD /* DNS Service Browser.app */,
+				FF1E351306711B5C003DD5BC /* DNS Service Registration.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		21D91EBD0B12A2B6003981D9 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				FF964DAB067115710099215A /* DNSServiceBrowser.nib */,
+				FF1E352506711BD6003DD5BC /* DNSServiceReg.nib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8DD76F750486A8DE00D96B5E /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1B690C06711383002304DD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1E350E06711B5C003DD5BC /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8DD76F740486A8DE00D96B5E /* dns-sd */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 21D91E7D0B12A03D003981D9 /* Build configuration list for PBXNativeTarget "dns-sd" */;
+			buildPhases = (
+				8DD76F750486A8DE00D96B5E /* Headers */,
+				8DD76F760486A8DE00D96B5E /* Sources */,
+				8DD76F780486A8DE00D96B5E /* Frameworks */,
+				8DD76F7A0486A8DE00D96B5E /* Rez */,
+				8DD76F7B0486A8DE00D96B5E /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "dns-sd";
+			productInstallPath = "$(HOME)/bin";
+			productName = mDNS;
+			productReference = 8DD76F7E0486A8DE00D96B5E /* dns-sd */;
+			productType = "com.apple.product-type.tool";
+		};
+		FF1B691006711383002304DD /* DNS Service Browser */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 21D91E810B12A03D003981D9 /* Build configuration list for PBXNativeTarget "DNS Service Browser" */;
+			buildPhases = (
+				FF1B690C06711383002304DD /* Headers */,
+				FF1B690D06711383002304DD /* Resources */,
+				FF1B690E06711383002304DD /* Sources */,
+				FF1B690F06711383002304DD /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DNS Service Browser";
+			productName = "DNS Service Browser";
+			productReference = FF1B691106711383002304DD /* DNS Service Browser.app */;
+			productType = "com.apple.product-type.application";
+		};
+		FF1E351206711B5C003DD5BC /* DNS Service Registration */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 21D91E850B12A03D003981D9 /* Build configuration list for PBXNativeTarget "DNS Service Registration" */;
+			buildPhases = (
+				FF1E350E06711B5C003DD5BC /* Headers */,
+				FF1E350F06711B5C003DD5BC /* Resources */,
+				FF1E351006711B5C003DD5BC /* Sources */,
+				FF1E351106711B5C003DD5BC /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "DNS Service Registration";
+			productName = "DNS Service Registration";
+			productReference = FF1E351306711B5C003DD5BC /* DNS Service Registration.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 21D91E8D0B12A03D003981D9 /* Build configuration list for PBXProject "DNS-SD" */;
+			hasScannedForEncodings = 1;
+			mainGroup = 08FB7794FE84155DC02AAC07 /* mDNS */;
+			projectDirPath = "";
+			targets = (
+				FFF520490671177900DA3D49 /* Build All */,
+				8DD76F740486A8DE00D96B5E /* dns-sd */,
+				FF1B691006711383002304DD /* DNS Service Browser */,
+				FF1E351206711B5C003DD5BC /* DNS Service Registration */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		FF1B690D06711383002304DD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF964DAC067115710099215A /* DNSServiceBrowser.nib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1E350F06711B5C003DD5BC /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF1E352606711BD6003DD5BC /* DNSServiceReg.nib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		8DD76F7A0486A8DE00D96B5E /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8DD76F760486A8DE00D96B5E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8DD76F770486A8DE00D96B5E /* dns-sd.c in Sources */,
+				FF2704F90F12A60900299571 /* ClientCommon.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1B690E06711383002304DD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF1B6915067114AF002304DD /* DNSServiceBrowser.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1E351006711B5C003DD5BC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF1E351C06711BCF003DD5BC /* DNSServiceReg.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		FF1E351806711B6A003DD5BC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FF1E351206711B5C003DD5BC /* DNS Service Registration */;
+			targetProxy = FF1E351706711B6A003DD5BC /* PBXContainerItemProxy */;
+		};
+		FF383826067117F300FEF615 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DD76F740486A8DE00D96B5E /* dns-sd */;
+			targetProxy = FF383825067117F300FEF615 /* PBXContainerItemProxy */;
+		};
+		FF383828067117F600FEF615 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FF1B691006711383002304DD /* DNS Service Browser */;
+			targetProxy = FF383827067117F600FEF615 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		21D91E7E0B12A03D003981D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_ENABLE_TRIGRAPHS = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INSTALL_PATH = "$(HOME)/bin";
+				LIBRARY_SEARCH_PATHS = "";
+				OPTIMIZATION_CFLAGS = "-O0";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "dns-sd";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Development;
+		};
+		21D91E7F0B12A03D003981D9 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_TRIGRAPHS = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INSTALL_PATH = "$(HOME)/bin";
+				LIBRARY_SEARCH_PATHS = "";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "dns-sd";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		21D91E800B12A03D003981D9 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_ENABLE_TRIGRAPHS = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INSTALL_PATH = "$(HOME)/bin";
+				LIBRARY_SEARCH_PATHS = "";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "dns-sd";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Default;
+		};
+		21D91E820B12A03D003981D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceBrowser-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OPTIMIZATION_CFLAGS = "-O0";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Browser";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+				ZERO_LINK = NO;
+			};
+			name = Development;
+		};
+		21D91E830B12A03D003981D9 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceBrowser-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Browser";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		21D91E840B12A03D003981D9 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceBrowser-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Browser";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+			};
+			name = Default;
+		};
+		21D91E860B12A03D003981D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceReg-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OPTIMIZATION_CFLAGS = "-O0";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Registration";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+				ZERO_LINK = NO;
+			};
+			name = Development;
+		};
+		21D91E870B12A03D003981D9 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceReg-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Registration";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		21D91E880B12A03D003981D9 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				HEADER_SEARCH_PATHS = ../mDNSShared;
+				INFOPLIST_FILE = "DNSServiceReg-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "DNS Service Registration";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost";
+			};
+			name = Default;
+		};
+		21D91E8A0B12A03D003981D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				OPTIMIZATION_CFLAGS = "-O0";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Build All";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Development;
+		};
+		21D91E8B0B12A03D003981D9 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Build All";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		21D91E8C0B12A03D003981D9 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Build All";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+			};
+			name = Default;
+		};
+		21D91E8E0B12A03D003981D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Development;
+		};
+		21D91E8F0B12A03D003981D9 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Deployment;
+		};
+		21D91E900B12A03D003981D9 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Default;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		21D91E7D0B12A03D003981D9 /* Build configuration list for PBXNativeTarget "dns-sd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21D91E7E0B12A03D003981D9 /* Development */,
+				21D91E7F0B12A03D003981D9 /* Deployment */,
+				21D91E800B12A03D003981D9 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		21D91E810B12A03D003981D9 /* Build configuration list for PBXNativeTarget "DNS Service Browser" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21D91E820B12A03D003981D9 /* Development */,
+				21D91E830B12A03D003981D9 /* Deployment */,
+				21D91E840B12A03D003981D9 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		21D91E850B12A03D003981D9 /* Build configuration list for PBXNativeTarget "DNS Service Registration" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21D91E860B12A03D003981D9 /* Development */,
+				21D91E870B12A03D003981D9 /* Deployment */,
+				21D91E880B12A03D003981D9 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		21D91E890B12A03D003981D9 /* Build configuration list for PBXAggregateTarget "Build All" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21D91E8A0B12A03D003981D9 /* Development */,
+				21D91E8B0B12A03D003981D9 /* Deployment */,
+				21D91E8C0B12A03D003981D9 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+		21D91E8D0B12A03D003981D9 /* Build configuration list for PBXProject "DNS-SD" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21D91E8E0B12A03D003981D9 /* Development */,
+				21D91E8F0B12A03D003981D9 /* Deployment */,
+				21D91E900B12A03D003981D9 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}
diff --git a/mDNSResponder/Clients/DNSServiceBrowser-Info.plist b/mDNSResponder/Clients/DNSServiceBrowser-Info.plist
new file mode 100644
index 00000000..093d7b4d
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>DNS Service Browser</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.DNSServiceBrowser</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>DNSServiceBrowser</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.NET/App.ico b/mDNSResponder/Clients/DNSServiceBrowser.NET/App.ico
new file mode 100755
index 00000000..3a5525fd
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.NET/App.ico
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.NET/AssemblyInfo.cs b/mDNSResponder/Clients/DNSServiceBrowser.NET/AssemblyInfo.cs
new file mode 100755
index 00000000..da6a08c9
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.NET/AssemblyInfo.cs
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.NET.csproj b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.NET.csproj
new file mode 100755
index 00000000..c78e314a
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.NET.csproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+  <PropertyGroup>

+    <ProjectType>Local</ProjectType>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}</ProjectGuid>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ApplicationIcon>

+    </ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>DNSServiceBrowser_NET</AssemblyName>

+    <AssemblyOriginatorKeyFile>

+    </AssemblyOriginatorKeyFile>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>WinExe</OutputType>

+    <RootNamespace>DNSServiceBrowser_NET</RootNamespace>

+    <StartupObject>

+    </StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <OldToolsVersion>2.0</OldToolsVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <OutputPath>bin\Debug\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>true</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>false</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>full</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <OutputPath>bin\Release\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>false</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>true</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>none</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System">

+      <Name>System</Name>

+    </Reference>

+    <Reference Include="System.Data">

+      <Name>System.Data</Name>

+    </Reference>

+    <Reference Include="System.Drawing">

+      <Name>System.Drawing</Name>

+    </Reference>

+    <Reference Include="System.Windows.Forms">

+      <Name>System.Windows.Forms</Name>

+    </Reference>

+    <Reference Include="System.Xml">

+      <Name>System.XML</Name>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="App.ico" />

+    <Compile Include="AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="DNSServiceBrowser.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <EmbeddedResource Include="DNSServiceBrowser.resx">

+      <DependentUpon>DNSServiceBrowser.cs</DependentUpon>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

+  </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="Bonjour">

+      <Guid>{18FBED6D-F2B7-4EC8-A4A4-46282E635308}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.cs b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.cs
new file mode 100755
index 00000000..df880844
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.cs
@@ -0,0 +1,734 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+using System.Text;
+using Bonjour;
+
+namespace DNSServiceBrowser_NET
+{
+	/// <summary>
+	/// Summary description for Form1.
+	/// </summary>
+	public class Form1 : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.ComboBox typeBox;
+		private System.Windows.Forms.ListBox browseList;
+        private Bonjour.DNSSDEventManager   eventManager = null;
+        private Bonjour.DNSSDService        service = null;
+		private Bonjour.DNSSDService        browser = null;
+		private Bonjour.DNSSDService        resolver = null;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.TextBox nameField;
+		private System.Windows.Forms.TextBox typeField;
+		private System.Windows.Forms.TextBox domainField;
+		private System.Windows.Forms.TextBox hostField;
+		private System.Windows.Forms.TextBox portField;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.ListBox serviceTextField;
+
+		public Form1()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			this.Load += new System.EventHandler(this.Form1_Load);
+
+			//
+			// Create the DNSSDEventManager. You can then associate event handlers
+			// with the instance that will be invoked when the event occurs
+			//
+			// In this example, we're associating ServiceFound, ServiceLost,
+			// ServiceResolved, and OperationFailed event handlers with the
+			// event manager instance.
+			//
+            eventManager                    =  new DNSSDEventManager();
+            eventManager.ServiceFound       += new _IDNSSDEvents_ServiceFoundEventHandler(this.ServiceFound);
+            eventManager.ServiceLost        += new _IDNSSDEvents_ServiceLostEventHandler(this.ServiceLost);
+            eventManager.ServiceResolved    += new _IDNSSDEvents_ServiceResolvedEventHandler(this.ServiceResolved);
+            eventManager.OperationFailed    += new _IDNSSDEvents_OperationFailedEventHandler(this.OperationFailed);
+            
+            service = new DNSSDService();
+		}
+
+		private void Form1_Load(object sender, EventArgs e) 
+		{
+			typeBox.SelectedItem = "_http._tcp";
+		}
+
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+
+				// 
+				// Clean up
+				//
+                if (resolver != null)
+                {
+                    resolver.Stop();
+                }
+
+                if (browser != null)
+                {
+                    browser.Stop();
+                }
+
+                if (service != null)
+                {
+                    service.Stop();
+                }
+
+                eventManager.ServiceFound    -= new _IDNSSDEvents_ServiceFoundEventHandler(this.ServiceFound);
+                eventManager.ServiceLost     -= new _IDNSSDEvents_ServiceLostEventHandler(this.ServiceLost);
+                eventManager.ServiceResolved -= new _IDNSSDEvents_ServiceResolvedEventHandler(this.ServiceResolved);
+                eventManager.OperationFailed -= new _IDNSSDEvents_OperationFailedEventHandler(this.OperationFailed);
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.browseList = new System.Windows.Forms.ListBox();
+			this.typeBox = new System.Windows.Forms.ComboBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.nameField = new System.Windows.Forms.TextBox();
+			this.typeField = new System.Windows.Forms.TextBox();
+			this.domainField = new System.Windows.Forms.TextBox();
+			this.hostField = new System.Windows.Forms.TextBox();
+			this.portField = new System.Windows.Forms.TextBox();
+			this.label5 = new System.Windows.Forms.Label();
+			this.serviceTextField = new System.Windows.Forms.ListBox();
+			this.SuspendLayout();
+			// 
+			// browseList
+			// 
+			this.browseList.Location = new System.Drawing.Point(8, 48);
+			this.browseList.Name = "browseList";
+			this.browseList.Size = new System.Drawing.Size(488, 147);
+			this.browseList.TabIndex = 0;
+			this.browseList.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+			// 
+			// typeBox
+			// 
+			this.typeBox.Items.AddRange(new object[]
+			{
+				"_accessone._tcp",
+				"_accountedge._tcp",
+				"_actionitems._tcp",
+				"_addressbook._tcp",
+				"_aecoretech._tcp",
+				"_afpovertcp._tcp",
+				"_airport._tcp",
+				"_animolmd._tcp",
+				"_animobserver._tcp",
+				"_apple-sasl._tcp",
+				"_aquamon._tcp",
+				"_async._tcp",
+				"_auth._tcp",
+				"_beep._tcp",
+				"_bfagent._tcp",
+				"_bootps._udp",
+				"_bousg._tcp",
+				"_bsqdea._tcp",
+				"_cheat._tcp",
+				"_chess._tcp",
+				"_clipboard._tcp",
+				"_collection._tcp",
+				"_contactserver._tcp",
+				"_cvspserver._tcp",
+				"_cytv._tcp",
+				"_daap._tcp",
+				"_difi._tcp",
+				"_distcc._tcp",
+				"_dossier._tcp",
+				"_dpap._tcp",
+				"_earphoria._tcp",
+				"_ebms._tcp",
+				"_ebreg._tcp",
+				"_ecbyesfsgksc._tcp",
+				"_eheap._tcp",
+				"_embrace._tcp",
+				"_eppc._tcp",
+				"_eventserver._tcp",
+				"_exec._tcp",
+				"_facespan._tcp",
+				"_faxstfx._tcp",
+				"_fish._tcp",
+				"_fjork._tcp",
+				"_fmpro-internal._tcp",
+				"_ftp._tcp",
+				"_ftpcroco._tcp",
+				"_gbs-smp._tcp",
+				"_gbs-stp._tcp",
+				"_grillezvous._tcp",
+				"_h323._tcp",
+				"_http._tcp",
+				"_hotwayd._tcp",
+				"_hydra._tcp",
+				"_ica-networking._tcp",
+				"_ichalkboard._tcp",
+				"_ichat._tcp",
+				"_iconquer._tcp",
+				"_ifolder._tcp",
+				"_ilynx._tcp",
+				"_imap._tcp",
+				"_imidi._tcp",
+				"_ipbroadcaster._tcp",
+				"_ipp._tcp",
+				"_isparx._tcp",
+				"_ispq-vc._tcp",
+				"_ishare._tcp",
+				"_isticky._tcp",
+				"_istorm._tcp",
+				"_iwork._tcp",
+				"_lan2p._tcp",
+				"_ldap._tcp",
+				"_liaison._tcp",
+				"_login._tcp",
+				"_lontalk._tcp",
+				"_lonworks._tcp",
+				"_macfoh-remote._tcp",
+				"_macminder._tcp",
+				"_moneyworks._tcp",
+				"_mp3sushi._tcp",
+				"_mttp._tcp",
+				"_ncbroadcast._tcp",
+				"_ncdirect._tcp",
+				"_ncsyncserver._tcp",
+				"_net-assistant._tcp",
+				"_newton-dock._tcp",
+				"_nfs._udp",
+				"_nssocketport._tcp",
+				"_odabsharing._tcp",
+				"_omni-bookmark._tcp",
+				"_openbase._tcp",
+				"_p2pchat._udp",
+				"_pdl-datastream._tcp",
+				"_poch._tcp",
+				"_pop3._tcp",
+				"_postgresql._tcp",
+				"_presence._tcp",
+				"_printer._tcp",
+				"_ptp._tcp",
+				"_quinn._tcp",
+				"_raop._tcp",
+				"_rce._tcp",
+				"_realplayfavs._tcp",
+				"_riousbprint._tcp",
+				"_rfb._tcp",
+				"_rtsp._tcp",
+				"_safarimenu._tcp",
+				"_sallingclicker._tcp",
+				"_scone._tcp",
+				"_sdsharing._tcp",
+				"_see._tcp",
+				"_seeCard._tcp",
+				"_serendipd._tcp",
+				"_servermgr._tcp",
+				"_shell._tcp",
+				"_shout._tcp",
+				"_shoutcast._tcp",
+				"_soap._tcp",
+				"_spike._tcp",
+				"_spincrisis._tcp",
+				"_spl-itunes._tcp",
+				"_spr-itunes._tcp",
+				"_ssh._tcp",
+				"_ssscreenshare._tcp",
+				"_strateges._tcp",
+				"_sge-exec._tcp",
+				"_sge-qmaster._tcp",
+				"_stickynotes._tcp",
+				"_sxqdea._tcp",
+				"_sybase-tds._tcp",
+				"_teamlist._tcp",
+				"_teleport._udp",
+				"_telnet._tcp",
+				"_tftp._udp",
+				"_ticonnectmgr._tcp",
+				"_tinavigator._tcp",
+				"_tryst._tcp",
+				"_upnp._tcp",
+				"_utest._tcp",
+				"_vue4rendercow._tcp",
+				"_webdav._tcp",
+				"_whamb._tcp",
+				"_wired._tcp",
+				"_workstation._tcp",
+				"_wormhole._tcp",
+				"_workgroup._tcp",
+				"_ws._tcp",
+				"_xserveraid._tcp",
+				"_xsync._tcp",
+				"_xtshapro._tcp"
+			});
+
+			this.typeBox.Location = new System.Drawing.Point(8, 16);
+			this.typeBox.Name = "typeBox";
+			this.typeBox.Size = new System.Drawing.Size(192, 21);
+			this.typeBox.Sorted = true;
+			this.typeBox.TabIndex = 3;
+			this.typeBox.SelectedIndexChanged += new System.EventHandler(this.typeBox_SelectedIndexChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(8, 208);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(48, 16);
+			this.label1.TabIndex = 4;
+			this.label1.Text = "Name:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// label2
+			// 
+			this.label2.Location = new System.Drawing.Point(8, 240);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(48, 16);
+			this.label2.TabIndex = 5;
+			this.label2.Text = "Type:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// label3
+			// 
+			this.label3.Location = new System.Drawing.Point(8, 272);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(48, 16);
+			this.label3.TabIndex = 6;
+			this.label3.Text = "Domain:";
+			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// label4
+			// 
+			this.label4.Location = new System.Drawing.Point(8, 304);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(48, 16);
+			this.label4.TabIndex = 7;
+			this.label4.Text = "Host:";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// nameField
+			// 
+			this.nameField.Location = new System.Drawing.Point(56, 208);
+			this.nameField.Name = "nameField";
+			this.nameField.ReadOnly = true;
+			this.nameField.Size = new System.Drawing.Size(168, 20);
+			this.nameField.TabIndex = 8;
+			this.nameField.Text = "";
+			// 
+			// typeField
+			// 
+			this.typeField.Location = new System.Drawing.Point(56, 240);
+			this.typeField.Name = "typeField";
+			this.typeField.ReadOnly = true;
+			this.typeField.Size = new System.Drawing.Size(168, 20);
+			this.typeField.TabIndex = 9;
+			this.typeField.Text = "";
+			// 
+			// domainField
+			// 
+			this.domainField.Location = new System.Drawing.Point(56, 272);
+			this.domainField.Name = "domainField";
+			this.domainField.ReadOnly = true;
+			this.domainField.Size = new System.Drawing.Size(168, 20);
+			this.domainField.TabIndex = 10;
+			this.domainField.Text = "";
+			// 
+			// hostField
+			// 
+			this.hostField.Location = new System.Drawing.Point(56, 304);
+			this.hostField.Name = "hostField";
+			this.hostField.ReadOnly = true;
+			this.hostField.Size = new System.Drawing.Size(168, 20);
+			this.hostField.TabIndex = 11;
+			this.hostField.Text = "";
+
+			// 
+			// portField
+			// 
+			this.portField.Location = new System.Drawing.Point(56, 336);
+			this.portField.Name = "portField";
+			this.portField.ReadOnly = true;
+			this.portField.Size = new System.Drawing.Size(168, 20);
+			this.portField.TabIndex = 12;
+			this.portField.Text = "";
+			// 
+			// label5
+			// 
+			this.label5.Location = new System.Drawing.Point(8, 336);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(48, 16);
+			this.label5.TabIndex = 14;
+			this.label5.Text = "Port:";
+			this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// serviceTextField
+			// 
+			this.serviceTextField.HorizontalScrollbar = true;
+			this.serviceTextField.Location = new System.Drawing.Point(264, 208);
+			this.serviceTextField.Name = "serviceTextField";
+			this.serviceTextField.Size = new System.Drawing.Size(232, 147);
+			this.serviceTextField.TabIndex = 16;
+			// 
+			// Form1
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(512, 365);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.serviceTextField,
+																		  this.label5,
+																		  this.portField,
+																		  this.hostField,
+																		  this.domainField,
+																		  this.typeField,
+																		  this.nameField,
+																		  this.label4,
+																		  this.label3,
+																		  this.label2,
+																		  this.label1,
+																		  this.typeBox,
+																		  this.browseList});
+			this.Name = "Form1";
+			this.Text = "DNSServices Browser";
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main() 
+		{
+			Application.Run(new Form1());
+		}
+		//
+		// BrowseData
+		//
+		// This class is used to store data associated
+		// with a DNSService.Browse() operation
+		//
+		public class BrowseData
+		{
+			public uint		InterfaceIndex;
+			public String	Name;
+			public String	Type;
+			public String	Domain;
+            public int      Refs;
+
+			public override String
+			ToString()
+			{
+				return Name;
+			}
+
+			public override bool
+			Equals(object other)
+			{
+				bool result = false;
+
+				if (other != null)
+				{
+					result = (this.Name == other.ToString());
+				}
+
+				return result;
+			}
+
+			public override int
+			GetHashCode()
+			{
+				return Name.GetHashCode();
+			}
+		};
+
+
+		//
+		// ResolveData
+		//
+		// This class is used to store data associated
+		// with a DNSService.Resolve() operation
+		//
+		public class ResolveData
+		{
+			public uint		    InterfaceIndex;
+			public String	    FullName;
+			public String	    HostName;
+			public int		    Port;
+			public TXTRecord	TxtRecord;
+
+			public override String
+				ToString()
+			{
+				return FullName;
+			}
+		};
+
+		//
+		// Populate()
+		//
+		// Populate this form with data associated with a 
+		// DNSService.Resolve() call
+		//
+		public void
+		Populate(BrowseData browseData, ResolveData resolveData)
+		{
+			nameField.Text	= browseData.Name;
+			typeField.Text	= browseData.Type;
+			domainField.Text	= browseData.Domain;
+			hostField.Text	= resolveData.HostName;
+			portField.Text	= resolveData.Port.ToString();
+
+			serviceTextField.Items.Clear();
+            
+			//
+			// When we print the text record, we're going to assume that every value
+			// is a string.
+			//
+            if (resolveData.TxtRecord != null)
+            {
+                for (uint idx = 0; idx < resolveData.TxtRecord.GetCount(); idx++)
+                {
+                    String key;
+                    Byte[] bytes;
+
+                    key = resolveData.TxtRecord.GetKeyAtIndex(idx);
+                    bytes = (Byte[])resolveData.TxtRecord.GetValueAtIndex(idx);
+
+                    if (key.Length > 0)
+                    {
+                        String val = "";
+
+                        if (bytes != null)
+                        {
+                            val = Encoding.ASCII.GetString(bytes, 0, bytes.Length);
+                        }
+
+                        serviceTextField.Items.Add(key + "=" + val);
+                    }
+                }
+            }
+		}
+
+		//
+		// called when the type field changes
+		//
+		private void typeBox_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			browseList.Items.Clear();
+
+			//
+			// Stop the current browse operation
+			//
+			if (browser != null)
+			{
+				browser.Stop();
+			}
+
+			nameField.Text = "";
+			typeField.Text = "";
+			domainField.Text = "";
+			hostField.Text = "";
+			portField.Text = "";
+			serviceTextField.Items.Clear();
+
+			try
+			{
+				//
+				// Selecting a service type will start a new browse operation.
+				//
+				browser = service.Browse( 0, 0, typeBox.SelectedItem.ToString(), null, eventManager );
+			}
+			catch
+			{
+				MessageBox.Show("Browse Failed", "Error");
+				Application.Exit();
+			}
+		}
+
+		private void listBox1_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			if (resolver != null)
+			{
+				resolver.Stop();
+                resolver = null;
+			}
+
+            if (browseList.SelectedItem != null)
+            {
+                try
+                {
+                    BrowseData data = (BrowseData) browseList.SelectedItem;
+
+					//
+					// Clicking on a service instance results in starting a resolve operation
+					// that will call us back with information about the service
+					//
+                    resolver = service.Resolve(0, data.InterfaceIndex, data.Name, data.Type, data.Domain, eventManager);
+                }
+                catch
+                {
+                    MessageBox.Show("Resolve Failed", "Error");
+                    Application.Exit();
+                }
+            }
+		}
+
+		//
+		// ServiceFound
+		//
+		// This call is invoked by the DNSService core.  We create
+        // a BrowseData object and invoked the appropriate method
+        // in the GUI thread so we can update the UI
+		//
+        public void ServiceFound
+                        (
+                        DNSSDService sref,
+                        DNSSDFlags flags,
+                        uint ifIndex,
+                        String serviceName,
+                        String regType,
+                        String domain
+                        )
+        {
+            int index = browseList.Items.IndexOf(serviceName);
+
+			//
+			// Check to see if we've seen this service before. If the machine has multiple
+			// interfaces, we could potentially get called back multiple times for the
+			// same service. Implementing a simple reference counting scheme will address
+			// the problem of the same service showing up more than once in the browse list.
+			//
+            if (index == -1)
+            {
+                BrowseData data = new BrowseData();
+
+                data.InterfaceIndex = ifIndex;
+                data.Name = serviceName;
+                data.Type = regType;
+                data.Domain = domain;
+                data.Refs = 1;
+
+                browseList.Items.Add(data);
+                browseList.Invalidate();
+            }
+            else
+            {
+                BrowseData data = (BrowseData) browseList.Items[index];
+                data.Refs++;
+            }
+        }
+
+        public void ServiceLost
+                        (
+                        DNSSDService sref,
+                        DNSSDFlags flags,
+                        uint ifIndex,
+                        String serviceName,
+                        String regType,
+                        String domain
+                        )
+        {
+            int index = browseList.Items.IndexOf(serviceName);
+
+			//
+			// See above comment in ServiceFound about reference counting
+			//
+            if (index != -1)
+            {
+                BrowseData data = (BrowseData) browseList.Items[index];
+
+                data.Refs--;
+
+                if (data.Refs == 0)
+                {
+                    browseList.Items.Remove(data);
+                    browseList.Invalidate();
+                }
+            }
+        }
+
+		public void ServiceResolved
+						(
+						DNSSDService    sref,  
+						DNSSDFlags      flags,
+						uint			ifIndex,
+                        String          fullName,
+                        String          hostName,
+                        ushort           port,
+                        TXTRecord       txtRecord
+						)
+		{
+			ResolveData data = new ResolveData();
+
+			data.InterfaceIndex = ifIndex;
+			data.FullName		= fullName;
+			data.HostName		= hostName;
+			data.Port			= port;
+			data.TxtRecord		= txtRecord;
+
+			//
+			// Don't forget to stop the resolver. This eases the burden on the network
+			//
+            resolver.Stop();
+			resolver = null;
+
+			Populate((BrowseData) browseList.SelectedItem, data);
+		}
+
+        public void OperationFailed
+                        (
+                        DNSSDService sref,
+                        DNSSDError error
+                        )
+        {
+            MessageBox.Show("Operation failed: error code: " + error, "Error");
+        }
+    }
+}
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.resx b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.resx
new file mode 100755
index 00000000..e5b5a111
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.NET/DNSServiceBrowser.resx
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+            Microsoft ResX Schema 

+        

+            Version 1.3

+                

+            The primary goals of this format is to allow a simple XML format 

+            that is mostly human readable. The generation and parsing of the 

+            various data types are done through the TypeConverter classes 

+            associated with the data types.

+        

+            Example:

+        

+                ... ado.net/XML headers & schema ...

+                <resheader name="resmimetype">text/microsoft-resx</resheader>

+                <resheader name="version">1.3</resheader>

+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+                <data name="Name1">this is my long string</data>

+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+                    [base64 mime encoded serialized .NET Framework object]

+                </data>

+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]

+                </data>

+        

+            There are any number of "resheader" rows that contain simple 

+            name/value pairs.

+            

+            Each data row contains a name, and value. The row also contains a 

+            type or mimetype. Type corresponds to a .NET class that support 

+            text/value conversion through the TypeConverter architecture. 

+            Classes that don't support this are serialized and stored with the 

+            mimetype set.

+                     

+            The mimetype is used for serialized objects, and tells the 

+            ResXResourceReader how to depersist the object. This is currently not 

+            extensible. For a given mimetype the value must be set accordingly:

+        

+            Note - application/x-microsoft.net.object.binary.base64 is the format 

+                   that the ResXResourceWriter will generate, however the reader can 

+                   read any of the formats listed below.

+        

+            mimetype: application/x-microsoft.net.object.binary.base64

+            value   : The object must be serialized with 

+                    : System.Serialization.Formatters.Binary.BinaryFormatter

+                    : and then encoded with base64 encoding.

+        

+            mimetype: application/x-microsoft.net.object.soap.base64

+            value   : The object must be serialized with 

+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+                    : and then encoded with base64 encoding.

+            mimetype: application/x-microsoft.net.object.bytearray.base64

+            value   : The object must be serialized into a byte array 

+                    : using a System.ComponentModel.TypeConverter

+                    : and then encoded with base64 encoding.

+        -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>1.3</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <data name="$this.Name">

+    <value>Form1</value>

+  </data>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.Designer.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.Designer.vb
new file mode 100644
index 00000000..0c6280b0
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.Designer.vb
@@ -0,0 +1,206 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _

+Partial Class DNSServiceBrowser

+    Inherits System.Windows.Forms.Form

+

+    'Form overrides dispose to clean up the component list.

+    <System.Diagnostics.DebuggerNonUserCode()> _

+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)

+        Try

+            If disposing AndAlso components IsNot Nothing Then

+                components.Dispose()

+            End If

+        Finally

+            MyBase.Dispose(disposing)

+        End Try

+    End Sub

+

+    'Required by the Windows Form Designer

+    Private components As System.ComponentModel.IContainer

+

+    'NOTE: The following procedure is required by the Windows Form Designer

+    'It can be modified using the Windows Form Designer.  

+    'Do not modify it using the code editor.

+    <System.Diagnostics.DebuggerStepThrough()> _

+    Private Sub InitializeComponent()

+        Me.ComboBox1 = New System.Windows.Forms.ComboBox

+        Me.ServiceNames = New System.Windows.Forms.ListBox

+        Me.Label1 = New System.Windows.Forms.Label

+        Me.Label2 = New System.Windows.Forms.Label

+        Me.Label3 = New System.Windows.Forms.Label

+        Me.Label4 = New System.Windows.Forms.Label

+        Me.Label5 = New System.Windows.Forms.Label

+        Me.NameField = New System.Windows.Forms.TextBox

+        Me.PortField = New System.Windows.Forms.TextBox

+        Me.HostField = New System.Windows.Forms.TextBox

+        Me.DomainField = New System.Windows.Forms.TextBox

+        Me.TypeField = New System.Windows.Forms.TextBox

+        Me.TextRecord = New System.Windows.Forms.ListBox

+        Me.SuspendLayout()

+        '

+        'ComboBox1

+        '

+        Me.ComboBox1.FormattingEnabled = True

+        Me.ComboBox1.Items.AddRange(New Object() {"_accessone._tcp", "_accountedge._tcp", "_actionitems._tcp", "_addressbook._tcp", "_aecoretech._tcp", "_afpovertcp._tcp", "_airport._tcp", "_animobserver._tcp", "_animolmd._tcp", "_apple-sasl._tcp", "_aquamon._tcp", "_async._tcp", "_auth._tcp", "_beep._tcp", "_bfagent._tcp", "_bootps._udp", "_bousg._tcp", "_bsqdea._tcp", "_cheat._tcp", "_chess._tcp", "_clipboard._tcp", "_collection._tcp", "_contactserver._tcp", "_cvspserver._tcp", "_cytv._tcp", "_daap._tcp", "_difi._tcp", "_distcc._tcp", "_dossier._tcp", "_dpap._tcp", "_earphoria._tcp", "_ebms._tcp", "_ebreg._tcp", "_ecbyesfsgksc._tcp", "_eheap._tcp", "_embrace._tcp", "_eppc._tcp", "_eventserver._tcp", "_exec._tcp", "_facespan._tcp", "_faxstfx._tcp", "_fish._tcp", "_fjork._tcp", "_fmpro-internal._tcp", "_ftp._tcp", "_ftpcroco._tcp", "_gbs-smp._tcp", "_gbs-stp._tcp", "_grillezvous._tcp", "_h323._tcp", "_hotwayd._tcp", "_http._tcp", "_hydra._tcp", "_ica-networking._tcp", "_ichalkboard._tcp", "_ichat._tcp", "_iconquer._tcp", "_ifolder._tcp", "_ilynx._tcp", "_imap._tcp", "_imidi._tcp", "_ipbroadcaster._tcp", "_ipp._tcp", "_ishare._tcp", "_isparx._tcp", "_ispq-vc._tcp", "_isticky._tcp", "_istorm._tcp", "_iwork._tcp", "_lan2p._tcp", "_ldap._tcp", "_liaison._tcp", "_login._tcp", "_lontalk._tcp", "_lonworks._tcp", "_macfoh-remote._tcp", "_macminder._tcp", "_moneyworks._tcp", "_mp3sushi._tcp", "_mttp._tcp", "_ncbroadcast._tcp", "_ncdirect._tcp", "_ncsyncserver._tcp", "_net-assistant._tcp", "_newton-dock._tcp", "_nfs._udp", "_nssocketport._tcp", "_odabsharing._tcp", "_omni-bookmark._tcp", "_openbase._tcp", "_p2pchat._udp", "_pdl-datastream._tcp", "_poch._tcp", "_pop3._tcp", "_postgresql._tcp", "_presence._tcp", "_printer._tcp", "_ptp._tcp", "_quinn._tcp", "_raop._tcp", "_rce._tcp", "_realplayfavs._tcp", "_rfb._tcp", "_riousbprint._tcp", "_rtsp._tcp", "_safarimenu._tcp", "_sallingclicker._tcp", "_scone._tcp", "_sdsharing._tcp", "_see._tcp", "_seeCard._tcp", "_serendipd._tcp", "_servermgr._tcp", "_sge-exec._tcp", "_sge-qmaster._tcp", "_shell._tcp", "_shout._tcp", "_shoutcast._tcp", "_soap._tcp", "_spike._tcp", "_spincrisis._tcp", "_spl-itunes._tcp", "_spr-itunes._tcp", "_ssh._tcp", "_ssscreenshare._tcp", "_stickynotes._tcp", "_strateges._tcp", "_sxqdea._tcp", "_sybase-tds._tcp", "_teamlist._tcp", "_teleport._udp", "_telnet._tcp", "_tftp._udp", "_ticonnectmgr._tcp", "_tinavigator._tcp", "_tryst._tcp", "_upnp._tcp", "_utest._tcp", "_vue4rendercow._tcp", "_webdav._tcp", "_whamb._tcp", "_wired._tcp", "_workgroup._tcp", "_workstation._tcp", "_wormhole._tcp", "_ws._tcp", "_xserveraid._tcp", "_xsync._tcp", "_xtshapro._tcp"})

+        Me.ComboBox1.Location = New System.Drawing.Point(13, 13)

+        Me.ComboBox1.Name = "ComboBox1"

+        Me.ComboBox1.Size = New System.Drawing.Size(252, 21)

+        Me.ComboBox1.Sorted = True

+        Me.ComboBox1.TabIndex = 0

+        '

+        'ServiceNames

+        '

+        Me.ServiceNames.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _

+                    Or System.Windows.Forms.AnchorStyles.Left) _

+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

+        Me.ServiceNames.FormattingEnabled = True

+        Me.ServiceNames.Location = New System.Drawing.Point(13, 41)

+        Me.ServiceNames.Name = "ServiceNames"

+        Me.ServiceNames.Size = New System.Drawing.Size(662, 251)

+        Me.ServiceNames.Sorted = True

+        Me.ServiceNames.TabIndex = 1

+        '

+        'Label1

+        '

+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.Label1.AutoSize = True

+        Me.Label1.Location = New System.Drawing.Point(16, 311)

+        Me.Label1.Name = "Label1"

+        Me.Label1.Size = New System.Drawing.Size(38, 13)

+        Me.Label1.TabIndex = 2

+        Me.Label1.Text = "Name:"

+        '

+        'Label2

+        '

+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.Label2.AutoSize = True

+        Me.Label2.Location = New System.Drawing.Point(16, 439)

+        Me.Label2.Name = "Label2"

+        Me.Label2.Size = New System.Drawing.Size(29, 13)

+        Me.Label2.TabIndex = 3

+        Me.Label2.Text = "Port:"

+        '

+        'Label3

+        '

+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.Label3.AutoSize = True

+        Me.Label3.Location = New System.Drawing.Point(16, 407)

+        Me.Label3.Name = "Label3"

+        Me.Label3.Size = New System.Drawing.Size(32, 13)

+        Me.Label3.TabIndex = 4

+        Me.Label3.Text = "Host:"

+        '

+        'Label4

+        '

+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.Label4.AutoSize = True

+        Me.Label4.Location = New System.Drawing.Point(16, 374)

+        Me.Label4.Name = "Label4"

+        Me.Label4.Size = New System.Drawing.Size(46, 13)

+        Me.Label4.TabIndex = 5

+        Me.Label4.Text = "Domain:"

+        '

+        'Label5

+        '

+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.Label5.AutoSize = True

+        Me.Label5.Location = New System.Drawing.Point(16, 342)

+        Me.Label5.Name = "Label5"

+        Me.Label5.Size = New System.Drawing.Size(34, 13)

+        Me.Label5.TabIndex = 6

+        Me.Label5.Text = "Type:"

+        '

+        'NameField

+        '

+        Me.NameField.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.NameField.Location = New System.Drawing.Point(69, 309)

+        Me.NameField.Name = "NameField"

+        Me.NameField.ReadOnly = True

+        Me.NameField.Size = New System.Drawing.Size(195, 20)

+        Me.NameField.TabIndex = 7

+        '

+        'PortField

+        '

+        Me.PortField.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.PortField.Location = New System.Drawing.Point(69, 436)

+        Me.PortField.Name = "PortField"

+        Me.PortField.ReadOnly = True

+        Me.PortField.Size = New System.Drawing.Size(195, 20)

+        Me.PortField.TabIndex = 8

+        '

+        'HostField

+        '

+        Me.HostField.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.HostField.Location = New System.Drawing.Point(69, 403)

+        Me.HostField.Name = "HostField"

+        Me.HostField.ReadOnly = True

+        Me.HostField.Size = New System.Drawing.Size(195, 20)

+        Me.HostField.TabIndex = 9

+        '

+        'DomainField

+        '

+        Me.DomainField.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.DomainField.Location = New System.Drawing.Point(69, 371)

+        Me.DomainField.Name = "DomainField"

+        Me.DomainField.ReadOnly = True

+        Me.DomainField.Size = New System.Drawing.Size(195, 20)

+        Me.DomainField.TabIndex = 10

+        '

+        'TypeField

+        '

+        Me.TypeField.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.TypeField.Location = New System.Drawing.Point(69, 340)

+        Me.TypeField.Name = "TypeField"

+        Me.TypeField.ReadOnly = True

+        Me.TypeField.Size = New System.Drawing.Size(195, 20)

+        Me.TypeField.TabIndex = 11

+        '

+        'TextRecord

+        '

+        Me.TextRecord.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _

+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

+        Me.TextRecord.FormattingEnabled = True

+        Me.TextRecord.Location = New System.Drawing.Point(278, 309)

+        Me.TextRecord.Name = "TextRecord"

+        Me.TextRecord.SelectionMode = System.Windows.Forms.SelectionMode.None

+        Me.TextRecord.Size = New System.Drawing.Size(397, 147)

+        Me.TextRecord.TabIndex = 12

+        '

+        'Form1

+        '

+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font

+        Me.ClientSize = New System.Drawing.Size(690, 480)

+        Me.Controls.Add(Me.TextRecord)

+        Me.Controls.Add(Me.TypeField)

+        Me.Controls.Add(Me.DomainField)

+        Me.Controls.Add(Me.HostField)

+        Me.Controls.Add(Me.PortField)

+        Me.Controls.Add(Me.NameField)

+        Me.Controls.Add(Me.Label5)

+        Me.Controls.Add(Me.Label4)

+        Me.Controls.Add(Me.Label3)

+        Me.Controls.Add(Me.Label2)

+        Me.Controls.Add(Me.Label1)

+        Me.Controls.Add(Me.ServiceNames)

+        Me.Controls.Add(Me.ComboBox1)

+        Me.Name = "Form1"

+        Me.Text = "Bonjour Browser"

+        Me.ResumeLayout(False)

+        Me.PerformLayout()

+

+    End Sub

+    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox

+    Friend WithEvents ServiceNames As System.Windows.Forms.ListBox

+    Friend WithEvents Label1 As System.Windows.Forms.Label

+    Friend WithEvents Label2 As System.Windows.Forms.Label

+    Friend WithEvents Label3 As System.Windows.Forms.Label

+    Friend WithEvents Label4 As System.Windows.Forms.Label

+    Friend WithEvents Label5 As System.Windows.Forms.Label

+    Friend WithEvents NameField As System.Windows.Forms.TextBox

+    Friend WithEvents PortField As System.Windows.Forms.TextBox

+    Friend WithEvents HostField As System.Windows.Forms.TextBox

+    Friend WithEvents DomainField As System.Windows.Forms.TextBox

+    Friend WithEvents TypeField As System.Windows.Forms.TextBox

+    Friend WithEvents TextRecord As System.Windows.Forms.ListBox

+

+End Class

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.VB.vbproj b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.VB.vbproj
new file mode 100644
index 00000000..52beedd4
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.VB.vbproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{FB79E297-5703-435C-A829-51AA51CD71C2}</ProjectGuid>

+    <OutputType>WinExe</OutputType>

+    <StartupObject>DNSServiceBrowser.VB.My.MyApplication</StartupObject>

+    <RootNamespace>DNSServiceBrowser.VB</RootNamespace>

+    <AssemblyName>DNSServiceBrowser.VB</AssemblyName>

+    <MyType>WindowsForms</MyType>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>2.0</OldToolsVersion>

+    <UpgradeBackupLocation />

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <DefineDebug>true</DefineDebug>

+    <DefineTrace>true</DefineTrace>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DocumentationFile>DNSServiceBrowser.VB.xml</DocumentationFile>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <DefineDebug>false</DefineDebug>

+    <DefineTrace>true</DefineTrace>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DocumentationFile>DNSServiceBrowser.VB.xml</DocumentationFile>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Deployment" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Windows.Forms" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Import Include="Microsoft.VisualBasic" />

+    <Import Include="System" />

+    <Import Include="System.Collections" />

+    <Import Include="System.Collections.Generic" />

+    <Import Include="System.Data" />

+    <Import Include="System.Drawing" />

+    <Import Include="System.Diagnostics" />

+    <Import Include="System.Windows.Forms" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="DNSServiceBrowser.vb">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="DNSServiceBrowser.Designer.vb">

+      <DependentUpon>DNSServiceBrowser.vb</DependentUpon>

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="My Project\AssemblyInfo.vb" />

+    <Compile Include="My Project\Application.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Application.myapp</DependentUpon>

+    </Compile>

+    <Compile Include="My Project\Resources.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Resources.resx</DependentUpon>

+    </Compile>

+    <Compile Include="My Project\Settings.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Settings.settings</DependentUpon>

+      <DesignTimeSharedInput>True</DesignTimeSharedInput>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="DNSServiceBrowser.resx">

+      <SubType>Designer</SubType>

+      <DependentUpon>DNSServiceBrowser.vb</DependentUpon>

+    </EmbeddedResource>

+    <EmbeddedResource Include="My Project\Resources.resx">

+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>

+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>

+      <CustomToolNamespace>My.Resources</CustomToolNamespace>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="My Project\Application.myapp">

+      <Generator>MyApplicationCodeGenerator</Generator>

+      <LastGenOutput>Application.Designer.vb</LastGenOutput>

+    </None>

+    <None Include="My Project\Settings.settings">

+      <Generator>SettingsSingleFileGenerator</Generator>

+      <CustomToolNamespace>My</CustomToolNamespace>

+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="Bonjour">

+      <Guid>{18FBED6D-F2B7-4EC8-A4A4-46282E635308}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+       Other similar extension points exist, see Microsoft.Common.targets.

+  <Target Name="BeforeBuild">

+  </Target>

+  <Target Name="AfterBuild">

+  </Target>

+  -->

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.resx b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.resx
new file mode 100644
index 00000000..ff31a6db
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

+    The primary goals of this format is to allow a simple XML format 

+    that is mostly human readable. The generation and parsing of the 

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

+    ... ado.net/XML headers & schema ...

+    <resheader name="resmimetype">text/microsoft-resx</resheader>

+    <resheader name="version">2.0</resheader>

+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+        <value>[base64 mime encoded serialized .NET Framework object]</value>

+    </data>

+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

+        <comment>This is a comment</comment>

+    </data>

+                

+    There are any number of "resheader" rows that contain simple 

+    name/value pairs.

+    

+    Each data row contains a name, and value. The row also contains a 

+    type or mimetype. Type corresponds to a .NET class that support 

+    text/value conversion through the TypeConverter architecture. 

+    Classes that don't support this are serialized and stored with the 

+    mimetype set.

+    

+    The mimetype is used for serialized objects, and tells the 

+    ResXResourceReader how to depersist the object. This is currently not 

+    extensible. For a given mimetype the value must be set accordingly:

+    

+    Note - application/x-microsoft.net.object.binary.base64 is the format 

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

+    mimetype: application/x-microsoft.net.object.binary.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

+            : and then encoded with base64 encoding.

+    

+    mimetype: application/x-microsoft.net.object.soap.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+            : and then encoded with base64 encoding.

+

+    mimetype: application/x-microsoft.net.object.bytearray.base64

+    value   : The object must be serialized into a byte array 

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" />

+              </xsd:sequence>

+              <xsd:attribute name="name" use="required" type="xsd:string" />

+              <xsd:attribute name="type" type="xsd:string" />

+              <xsd:attribute name="mimetype" type="xsd:string" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

+              <xsd:attribute name="alias" type="xsd:string" />

+              <xsd:attribute name="name" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.vb
new file mode 100644
index 00000000..bb67adab
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/DNSServiceBrowser.vb
@@ -0,0 +1,196 @@
+'

+' Copyright (c) 2010 Apple Inc. All rights reserved.

+'

+' Licensed under the Apache License, Version 2.0 (the "License");

+' you may not use this file except in compliance with the License.

+' You may obtain a copy of the License at

+' 

+'     http://www.apache.org/licenses/LICENSE-2.0

+' 

+' Unless required by applicable law or agreed to in writing, software

+' distributed under the License is distributed on an "AS IS" BASIS,

+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+' See the License for the specific language governing permissions and

+' limitations under the License.

+'

+

+Public Class DNSServiceBrowser

+    Public WithEvents MyEventManager As New Bonjour.DNSSDEventManager

+

+    Private m_service As New Bonjour.DNSSDService

+    Private m_browser As Bonjour.DNSSDService

+    Private m_resolver As Bonjour.DNSSDService

+

+    Public Sub New()

+        MyBase.New()

+

+        'This call is required by the Windows Form Designer.

+        InitializeComponent()

+

+        ComboBox1.SelectedIndex = 0

+    End Sub

+

+	'Called when a service is found as a result of a browse operation

+    Public Sub MyEventManager_ServiceFound(ByVal browser As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal serviceName As String, ByVal regtype As String, ByVal domain As String) Handles MyEventManager.ServiceFound

+        Dim index As Integer

+        index = ServiceNames.Items.IndexOf(serviceName)

+		'

+		' A simple reference counting scheme is implemented so that the same service

+		' does not show up more than once in the browse list.  This can happen

+		' if the machine has more than one network interface.

+		'

+		' If we have not seen this service before, then it is added to the browse list

+		' Otherwise it's reference count is bumped up.

+		'

+        If index = -1 Then

+            Dim browseData As New BrowseData

+            browseData.ServiceName = serviceName

+            browseData.RegType = regtype

+            browseData.Domain = domain

+            browseData.Refs = 1

+            ServiceNames.Items.Add(browseData)

+        Else

+            Dim browseData As BrowseData

+            browseData = ServiceNames.Items([index])

+            browseData.Refs += 1

+        End If

+    End Sub

+

+    Public Sub MyEventManager_ServiceLost(ByVal browser As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal serviceName As String, ByVal regtype As String, ByVal domain As String) Handles MyEventManager.ServiceLost

+        Dim index As Integer

+		'

+		' See the above about reference counting

+		'

+        index = ServiceNames.Items.IndexOf(serviceName)

+        If index <> -1 Then

+            Dim browseData As BrowseData

+            browseData = ServiceNames.Items([index])

+            browseData.Refs -= 1

+            If browseData.Refs = 0 Then

+                ServiceNames.Items.Remove(serviceName)

+            End If

+        End If

+    End Sub

+

+    Public Sub MyEventManager_ServiceResolved(ByVal resolver As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal fullname As String, ByVal hostname As String, ByVal port As UShort, ByVal record As Bonjour.TXTRecord) Handles MyEventManager.ServiceResolved

+		'

+		' Once the service is resolved, the resolve operation is stopped. This reduces the burdne on the network

+		'

+        m_resolver.Stop()

+        m_resolver = Nothing

+        Dim browseData As BrowseData = ServiceNames.Items.Item(ServiceNames.SelectedIndex)

+        NameField.Text = browseData.ServiceName

+        TypeField.Text = browseData.RegType

+        DomainField.Text = browseData.Domain

+        HostField.Text = hostname

+        PortField.Text = port

+

+		'

+		' The values found in the text record are assumed to be human readable strings.

+		'

+        If record IsNot Nothing Then

+            For i As UInteger = 0 To record.GetCount() - 1

+                Dim key As String = record.GetKeyAtIndex(i)

+                If key.Length() > 0 Then

+                    TextRecord.Items.Add(key + "=" + System.Text.Encoding.ASCII.GetString(record.GetValueAtIndex(i)))

+                End If

+            Next i

+        End If

+    End Sub

+

+    Private Sub ClearServiceInfo()

+        TextRecord.Items.Clear()

+        NameField.Text = ""

+        TypeField.Text = ""

+        DomainField.Text = ""

+        HostField.Text = ""

+        PortField.Text = ""

+    End Sub

+

+    Private Sub ServiceNames_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ServiceNames.SelectedIndexChanged

+        If m_resolver IsNot Nothing Then

+            m_resolver.Stop()

+        End If

+        Me.ClearServiceInfo()

+        Dim browseData As BrowseData = ServiceNames.Items.Item(ServiceNames.SelectedIndex)

+

+		'

+		' Selecting a service instance starts a new resolve operation

+		'

+        m_resolver = m_service.Resolve(0, 0, browseData.ServiceName, browseData.RegType, browseData.Domain, MyEventManager)

+    End Sub

+

+    Private Sub ComboBox1_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ComboBox1.SelectedIndexChanged

+        If m_browser IsNot Nothing Then

+            m_browser.Stop()

+        End If

+

+        ServiceNames.Items.Clear()

+        Me.ClearServiceInfo()

+

+		'

+		' Selecting a service type start a new browse operation

+		'

+

+        m_browser = m_service.Browse(0, 0, ComboBox1.Items.Item(ComboBox1.SelectedIndex), "", MyEventManager)

+    End Sub

+

+    Private Sub ListBox2_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TextRecord.SelectedIndexChanged

+

+    End Sub

+End Class

+Public Class BrowseData

+    Private m_serviceName As String

+    Private m_regType As String

+    Private m_domain As String

+    Private m_refs As Integer

+

+    Property ServiceName() As String

+        Get

+            Return m_serviceName

+        End Get

+        Set(ByVal Value As String)

+            m_serviceName = Value

+        End Set

+    End Property

+

+    Property RegType() As String

+        Get

+            Return m_regType

+        End Get

+        Set(ByVal Value As String)

+            m_regType = Value

+        End Set

+    End Property

+

+    Property Domain() As String

+        Get

+            Return m_domain

+        End Get

+        Set(ByVal Value As String)

+            m_domain = Value

+        End Set

+    End Property

+

+    Property Refs As Integer

+        Get

+            Return m_refs

+        End Get

+        Set(ByVal Value As Integer)

+            m_refs = Value

+        End Set

+    End Property

+

+    Public Overrides Function Equals(obj As Object) As Boolean

+        If obj Is Nothing Then

+            Return False

+        Else

+            Return m_serviceName.Equals(obj.ToString)

+        End If

+    End Function

+

+    Public Overrides Function ToString() As String

+        Return m_serviceName

+    End Function

+

+End Class

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.Designer.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.Designer.vb
new file mode 100644
index 00000000..ad73d2ed
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.Designer.vb
@@ -0,0 +1,38 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:2.0.50727.4918

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+

+Namespace My

+    

+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,

+    ' or if you encounter build errors in this file, go to the Project Designer

+    ' (go to Project Properties or double-click the My Project node in

+    ' Solution Explorer), and make changes on the Application tab.

+    '

+    Partial Friend Class MyApplication

+        

+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _

+        Public Sub New()

+            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)

+            Me.IsSingleInstance = false

+            Me.EnableVisualStyles = true

+            Me.SaveMySettingsOnExit = true

+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses

+        End Sub

+        

+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _

+        Protected Overrides Sub OnCreateMainForm()

+            Me.MainForm = Global.DNSServiceBrowser.VB.DNSServiceBrowser

+        End Sub

+    End Class

+End Namespace

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.myapp b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.myapp
new file mode 100644
index 00000000..85cb2c94
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>

+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+  <MySubMain>true</MySubMain>

+  <MainForm>DNSServiceBrowser</MainForm>

+  <SingleInstance>false</SingleInstance>

+  <ShutdownMode>0</ShutdownMode>

+  <EnableVisualStyles>true</EnableVisualStyles>

+  <AuthenticationMode>0</AuthenticationMode>

+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>

+</MyApplicationData>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/AssemblyInfo.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/AssemblyInfo.vb
new file mode 100644
index 00000000..32fd3b78
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/AssemblyInfo.vb
@@ -0,0 +1,35 @@
+Imports System

+Imports System.Reflection

+Imports System.Runtime.InteropServices

+

+' General Information about an assembly is controlled through the following 

+' set of attributes. Change these attribute values to modify the information

+' associated with an assembly.

+

+' Review the values of the assembly attributes

+

+<Assembly: AssemblyTitle("VBTester")> 

+<Assembly: AssemblyDescription("")> 

+<Assembly: AssemblyCompany("Porchdog Software, Inc.")> 

+<Assembly: AssemblyProduct("VBTester")> 

+<Assembly: AssemblyCopyright("Copyright © Porchdog Software, Inc. 2009")> 

+<Assembly: AssemblyTrademark("")> 

+

+<Assembly: ComVisible(False)>

+

+'The following GUID is for the ID of the typelib if this project is exposed to COM

+<Assembly: Guid("fa682747-1bdc-4ddb-962e-e3e3a9291b22")> 

+

+' Version information for an assembly consists of the following four values:

+'

+'      Major Version

+'      Minor Version 

+'      Build Number

+'      Revision

+'

+' You can specify all the values or you can default the Build and Revision Numbers 

+' by using the '*' as shown below:

+' <Assembly: AssemblyVersion("1.0.*")> 

+

+<Assembly: AssemblyVersion("1.0.0.0")> 

+<Assembly: AssemblyFileVersion("1.0.0.0")> 

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.Designer.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.Designer.vb
new file mode 100644
index 00000000..1f3f960d
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:2.0.50727.3082

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+

+Namespace My.Resources

+    

+    'This class was auto-generated by the StronglyTypedResourceBuilder

+    'class via a tool like ResGen or Visual Studio.

+    'To add or remove a member, edit your .ResX file then rerun ResGen

+    'with the /str option, or rebuild your VS project.

+    '<summary>

+    '  A strongly-typed resource class, for looking up localized strings, etc.

+    '</summary>

+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0"),  _

+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _

+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

+    Friend Module Resources

+        

+        Private resourceMan As Global.System.Resources.ResourceManager

+        

+        Private resourceCulture As Global.System.Globalization.CultureInfo

+        

+        '<summary>

+        '  Returns the cached ResourceManager instance used by this class.

+        '</summary>

+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager

+            Get

+                If Object.ReferenceEquals(resourceMan, Nothing) Then

+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VBTester.Resources", GetType(Resources).Assembly)

+                    resourceMan = temp

+                End If

+                Return resourceMan

+            End Get

+        End Property

+        

+        '<summary>

+        '  Overrides the current thread's CurrentUICulture property for all

+        '  resource lookups using this strongly typed resource class.

+        '</summary>

+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+        Friend Property Culture() As Global.System.Globalization.CultureInfo

+            Get

+                Return resourceCulture

+            End Get

+            Set(ByVal value As Global.System.Globalization.CultureInfo)

+                resourceCulture = value

+            End Set

+        End Property

+    End Module

+End Namespace

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.resx b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.resx
new file mode 100644
index 00000000..ffecec85
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

+    The primary goals of this format is to allow a simple XML format 

+    that is mostly human readable. The generation and parsing of the 

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

+    ... ado.net/XML headers & schema ...

+    <resheader name="resmimetype">text/microsoft-resx</resheader>

+    <resheader name="version">2.0</resheader>

+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+        <value>[base64 mime encoded serialized .NET Framework object]</value>

+    </data>

+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

+        <comment>This is a comment</comment>

+    </data>

+                

+    There are any number of "resheader" rows that contain simple 

+    name/value pairs.

+    

+    Each data row contains a name, and value. The row also contains a 

+    type or mimetype. Type corresponds to a .NET class that support 

+    text/value conversion through the TypeConverter architecture. 

+    Classes that don't support this are serialized and stored with the 

+    mimetype set.

+    

+    The mimetype is used for serialized objects, and tells the 

+    ResXResourceReader how to depersist the object. This is currently not 

+    extensible. For a given mimetype the value must be set accordingly:

+    

+    Note - application/x-microsoft.net.object.binary.base64 is the format 

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

+    mimetype: application/x-microsoft.net.object.binary.base64

+    value   : The object must be serialized with 

+            : System.Serialization.Formatters.Binary.BinaryFormatter

+            : and then encoded with base64 encoding.

+    

+    mimetype: application/x-microsoft.net.object.soap.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+            : and then encoded with base64 encoding.

+

+    mimetype: application/x-microsoft.net.object.bytearray.base64

+    value   : The object must be serialized into a byte array 

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" />

+              <xsd:attribute name="type" type="xsd:string" />

+              <xsd:attribute name="mimetype" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

+              <xsd:attribute name="alias" type="xsd:string" />

+              <xsd:attribute name="name" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.Designer.vb b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.Designer.vb
new file mode 100644
index 00000000..a8c15368
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:2.0.50727.3082

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+

+Namespace My

+

+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _

+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0"),  _

+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+    Partial Friend NotInheritable Class MySettings

+        Inherits Global.System.Configuration.ApplicationSettingsBase

+        

+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)

+        

+#Region "My.Settings Auto-Save Functionality"

+#If _MyType = "WindowsForms" Then

+        Private Shared addedHandler As Boolean

+

+        Private Shared addedHandlerLockObject As New Object

+

+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _

+        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)

+            If My.Application.SaveMySettingsOnExit Then

+                My.Settings.Save()

+            End If

+        End Sub

+#End If

+#End Region

+        

+        Public Shared ReadOnly Property [Default]() As MySettings

+            Get

+                

+#If _MyType = "WindowsForms" Then

+                   If Not addedHandler Then

+                        SyncLock addedHandlerLockObject

+                            If Not addedHandler Then

+                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings

+                                addedHandler = True

+                            End If

+                        End SyncLock

+                    End If

+#End If

+                Return defaultInstance

+            End Get

+        End Property

+    End Class

+End Namespace

+

+Namespace My

+    

+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _

+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _

+    Friend Module MySettingsProperty

+        

+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _

+        Friend ReadOnly Property Settings() As Global.DNSServiceBrowser.VB.My.MySettings

+            Get

+                Return Global.DNSServiceBrowser.VB.My.MySettings.Default

+            End Get

+        End Property

+    End Module

+End Namespace

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.settings b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.settings
new file mode 100644
index 00000000..377f56d6
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.VB/My Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>

+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">

+  <Profiles>

+    <Profile Name="(Default)" />

+  </Profiles>

+  <Settings />

+</SettingsFile>

diff --git a/mDNSResponder/Clients/DNSServiceBrowser.m b/mDNSResponder/Clients/DNSServiceBrowser.m
new file mode 100755
index 00000000..b4e04140
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.m
@@ -0,0 +1,679 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Cocoa/Cocoa.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <dns_sd.h>
+
+@class ServiceController;  // holds state corresponding to outstanding DNSServiceRef
+
+@interface BrowserController : NSObject
+{
+    IBOutlet id nameField;
+    IBOutlet id typeField;
+
+    IBOutlet id serviceDisplayTable;
+    IBOutlet id typeColumn;
+    IBOutlet id nameColumn;
+    IBOutlet id serviceTypeField;
+    IBOutlet id serviceNameField;
+
+    IBOutlet id hostField;
+    IBOutlet id ipAddressField;
+    IBOutlet id ip6AddressField;
+    IBOutlet id portField;
+    IBOutlet id interfaceField;
+    IBOutlet id textField;
+    
+    NSMutableArray *_srvtypeKeys;
+    NSMutableArray *_srvnameKeys;
+    NSMutableArray *_sortedServices;
+    NSMutableDictionary *_servicesDict;
+
+	ServiceController *_serviceBrowser;
+	ServiceController *_serviceResolver;
+	ServiceController *_ipv4AddressResolver;
+	ServiceController *_ipv6AddressResolver;
+}
+
+- (void)notifyTypeSelectionChange:(NSNotification*)note;
+- (void)notifyNameSelectionChange:(NSNotification*)note;
+
+- (IBAction)connect:(id)sender;
+
+- (IBAction)handleTableClick:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)addNewService:(id)sender;
+
+- (IBAction)update:(NSString *)Type;
+
+- (void)updateBrowseWithName:(const char *)name type:(const char *)resulttype domain:(const char *)domain interface:(uint32_t)interface flags:(DNSServiceFlags)flags;
+- (void)resolveClientWitHost:(NSString *)host port:(uint16_t)port interfaceIndex:(uint32_t)interface txtRecord:(const char*)txtRecord txtLen:(uint16_t)txtLen;
+- (void)updateAddress:(uint16_t)rrtype addr:(const void *)buff addrLen:(uint16_t)addrLen host:(const char*)host interfaceIndex:(uint32_t)interface more:(boolean_t)moreToCome;
+
+- (void)_cancelPendingResolve;
+- (void)_clearResolvedInfo;
+
+@end
+
+// The ServiceController manages cleanup of DNSServiceRef & runloop info for an outstanding request
+@interface ServiceController : NSObject
+{
+	DNSServiceRef       fServiceRef;
+	CFSocketRef         fSocketRef;
+	CFRunLoopSourceRef  fRunloopSrc;
+}
+
+- (id)initWithServiceRef:(DNSServiceRef)ref;
+- (void)addToCurrentRunLoop;
+- (DNSServiceRef)serviceRef;
+- (void)dealloc;
+
+@end // interface ServiceController
+
+
+static void
+ProcessSockData(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info)
+{
+	DNSServiceRef serviceRef = (DNSServiceRef)info;
+	DNSServiceErrorType err = DNSServiceProcessResult(serviceRef);
+	if (err != kDNSServiceErr_NoError) {
+		printf("DNSServiceProcessResult() returned an error! %d\n", err);
+    }
+}
+
+
+static void
+ServiceBrowseReply(DNSServiceRef sdRef, DNSServiceFlags servFlags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, 
+    const char *serviceName, const char *regtype, const char *replyDomain, void *context)
+{
+	if (errorCode == kDNSServiceErr_NoError) {
+		[(BrowserController*)context updateBrowseWithName:serviceName type:regtype domain:replyDomain interface:interfaceIndex flags:servFlags];
+	} else {
+		printf("ServiceBrowseReply got an error! %d\n", errorCode);
+	}
+}
+
+
+static void
+ServiceResolveReply(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode,
+    const char *fullname, const char *hosttarget, uint16_t port, uint16_t txtLen, const char *txtRecord, void *context)
+{
+	if (errorCode == kDNSServiceErr_NoError) {
+		[(BrowserController*)context resolveClientWitHost:[NSString stringWithUTF8String:hosttarget] port:port interfaceIndex:interfaceIndex txtRecord:txtRecord txtLen:txtLen];
+	} else {
+		printf("ServiceResolveReply got an error! %d\n", errorCode);
+	}
+}
+
+
+static void
+QueryRecordReply(DNSServiceRef DNSServiceRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode,
+    const char *fullname, uint16_t rrtype, uint16_t rrclass,  uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
+{
+    if (errorCode == kDNSServiceErr_NoError) {
+        [(BrowserController*)context updateAddress:rrtype addr:rdata addrLen:rdlen host:fullname interfaceIndex:interfaceIndex more:(flags & kDNSServiceFlagsMoreComing)];
+    } else {
+        printf("QueryRecordReply got an error! %d\n", errorCode);
+    }
+}
+
+
+static void
+InterfaceIndexToName(uint32_t interface, char *interfaceName)
+{
+    assert(interfaceName);
+    
+    if (interface == kDNSServiceInterfaceIndexAny) {
+        // All active network interfaces.
+        strlcpy(interfaceName, "all", IF_NAMESIZE);
+    } else if (interface == kDNSServiceInterfaceIndexLocalOnly) {
+        // Only available locally on this machine.
+        strlcpy(interfaceName, "local", IF_NAMESIZE);
+    } else if (interface == kDNSServiceInterfaceIndexP2P) {
+        // Peer-to-peer.
+        strlcpy(interfaceName, "p2p", IF_NAMESIZE);
+    } else {
+        // Converts interface index to interface name.
+        if_indextoname(interface, interfaceName);
+    }
+}
+
+
+@implementation BrowserController		//Begin implementation of BrowserController methods
+
+- (void)registerDefaults
+{
+    NSMutableDictionary *regDict = [NSMutableDictionary dictionary];
+
+    NSArray *typeArray = [NSArray arrayWithObjects:@"_afpovertcp._tcp",
+                                                   @"_smb._tcp",
+                                                   @"_rfb._tcp",
+												   @"_ssh._tcp",
+                                                   @"_ftp._tcp",
+												   @"_http._tcp",
+												   @"_printer._tcp",
+                                                   @"_ipp._tcp",
+                                                   @"_airport._tcp",
+												   @"_presence._tcp",
+												   @"_daap._tcp",
+												   @"_dpap._tcp",
+                                                   nil];
+                                                   
+    NSArray *nameArray = [NSArray arrayWithObjects:@"AppleShare Servers",
+                                                   @"Windows Sharing",
+                                                   @"Screen Sharing",
+	                                               @"Secure Shell",
+                                                   @"FTP Servers",
+	                                               @"Web Servers",
+	                                               @"LPR Printers",
+                                                   @"IPP Printers",
+                                                   @"AirPort Base Stations",
+												   @"iChat Buddies",
+												   @"iTunes Libraries",
+												   @"iPhoto Libraries",
+                                                   nil];
+
+    [regDict setObject:typeArray forKey:@"SrvTypeKeys"];
+    [regDict setObject:nameArray forKey:@"SrvNameKeys"];
+
+    [[NSUserDefaults standardUserDefaults] registerDefaults:regDict];
+}
+
+
+- (id)init
+{
+    self = [super init];
+    if (self) {
+        _srvtypeKeys = nil;
+        _srvnameKeys = nil;
+        _serviceBrowser = nil;
+        _serviceResolver = nil;
+        _ipv4AddressResolver = nil;
+        _ipv6AddressResolver = nil;
+        _sortedServices = [[NSMutableArray alloc] init];
+        _servicesDict = [[NSMutableDictionary alloc] init];
+    }
+    return self;
+}
+
+
+- (void)awakeFromNib
+{
+    [typeField sizeLastColumnToFit];
+    [nameField sizeLastColumnToFit];
+    [nameField setDoubleAction:@selector(connect:)];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notifyTypeSelectionChange:) name:NSTableViewSelectionDidChangeNotification object:typeField];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notifyNameSelectionChange:) name:NSTableViewSelectionDidChangeNotification object:nameField];
+    
+    _srvtypeKeys = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvTypeKeys"] mutableCopy];
+    _srvnameKeys = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvNameKeys"] mutableCopy];
+
+    if (!_srvtypeKeys || !_srvnameKeys) {
+        [_srvtypeKeys release];
+        [_srvnameKeys release];
+        [self registerDefaults];
+        _srvtypeKeys = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvTypeKeys"] mutableCopy];
+        _srvnameKeys = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvNameKeys"] mutableCopy];
+    }
+    
+    [typeField reloadData];
+}
+
+
+- (void)dealloc
+{
+    [_srvtypeKeys release];
+    [_srvnameKeys release];
+    [_servicesDict release];
+    [_sortedServices release];
+    [super dealloc];
+}
+
+
+-(void)tableView:(NSTableView *)theTableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(int)row
+{
+    if (row < 0) return;
+}
+
+
+- (int)numberOfRowsInTableView:(NSTableView *)theTableView	//Begin mandatory TableView methods
+{
+    if (theTableView == typeField) {
+        return [_srvnameKeys count];
+    }
+    if (theTableView == nameField) {
+        return [_servicesDict count];
+    }
+    if (theTableView == serviceDisplayTable) {
+        return [_srvnameKeys count];
+    }
+    return 0;
+}
+
+
+- (id)tableView:(NSTableView *)theTableView objectValueForTableColumn:(NSTableColumn *)theColumn row:(int)rowIndex
+{
+    if (theTableView == typeField) {
+        return [_srvnameKeys objectAtIndex:rowIndex];
+    }
+    if (theTableView == nameField) {
+        return [[_servicesDict objectForKey:[_sortedServices objectAtIndex:rowIndex]] name];
+    }
+    if (theTableView == serviceDisplayTable) {
+        if (theColumn == typeColumn) {
+            return [_srvtypeKeys objectAtIndex:rowIndex];
+        }
+        if (theColumn == nameColumn) {
+            return [_srvnameKeys objectAtIndex:rowIndex];
+        }
+        return nil;
+    }
+    
+    return nil;
+}
+
+
+- (void)notifyTypeSelectionChange:(NSNotification*)note
+{
+    [self _cancelPendingResolve];
+
+    int index = [[note object] selectedRow];
+    if (index != -1) {
+        [self update:[_srvtypeKeys objectAtIndex:index]];
+    } else {
+        [self update:nil];
+    }
+}
+
+
+- (void)notifyNameSelectionChange:(NSNotification*)note
+{
+    [self _cancelPendingResolve];
+    
+    int index = [[note object] selectedRow];
+    if (index == -1) {
+		return;
+	}
+    
+    // Get the currently selected service
+    NSNetService *service = [_servicesDict objectForKey:[_sortedServices objectAtIndex:index]];
+	
+    DNSServiceRef serviceRef;
+	DNSServiceErrorType err = DNSServiceResolve(&serviceRef,
+                                         (DNSServiceFlags)0,
+                               kDNSServiceInterfaceIndexAny,
+                  (const char *)[[service name] UTF8String],
+                 (const char *)[[service type]  UTF8String],
+                (const char *)[[service domain] UTF8String],
+                (DNSServiceResolveReply)ServiceResolveReply,
+                                                      self);
+        
+	if (kDNSServiceErr_NoError == err) {
+		_serviceResolver = [[ServiceController alloc] initWithServiceRef:serviceRef];
+		[_serviceResolver addToCurrentRunLoop];
+	}
+}
+
+
+- (IBAction)update:(NSString *)theType
+{
+    [_servicesDict removeAllObjects];
+    [_sortedServices removeAllObjects];
+    [nameField reloadData];
+
+    // get rid of the previous browser if one exists
+    if (_serviceBrowser != nil) {
+		[_serviceBrowser release];
+        _serviceBrowser = nil;
+    }
+    
+    if (theType) {
+        DNSServiceRef serviceRef;
+        DNSServiceErrorType err = DNSServiceBrowse(&serviceRef, (DNSServiceFlags)0, 0, [theType UTF8String], NULL, ServiceBrowseReply, self);
+        if (kDNSServiceErr_NoError == err) {
+            _serviceBrowser = [[ServiceController alloc] initWithServiceRef:serviceRef];
+            [_serviceBrowser addToCurrentRunLoop];
+        }
+    }
+}
+
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+{
+    return YES;
+}
+
+
+- (void)updateBrowseWithName:(const char *)name type:(const char *)type domain:(const char *)domain interface:(uint32_t)interface flags:(DNSServiceFlags)flags
+{
+    NSString *key = [NSString stringWithFormat:@"%s.%s%s%d", name, type, domain, interface];
+    NSNetService *service = [[NSNetService alloc] initWithDomain:[NSString stringWithUTF8String:domain] type:[NSString stringWithUTF8String:type] name:[NSString stringWithUTF8String:name]];
+    
+    if (flags & kDNSServiceFlagsAdd) {
+        [_servicesDict setObject:service forKey:key];
+    } else {
+        [_servicesDict removeObjectForKey:key];
+    }
+
+    // If not expecting any more data, then reload (redraw) TableView with newly found data
+    if (!(flags & kDNSServiceFlagsMoreComing)) {
+    
+        // Save the current TableView selection
+        int index = [nameField selectedRow];
+        NSString *selected = (index != -1) ? [[_sortedServices objectAtIndex:index] copy] : nil;
+        
+        [_sortedServices release];
+        _sortedServices = [[_servicesDict allKeys] mutableCopy];        
+        [_sortedServices sortUsingSelector:@selector(caseInsensitiveCompare:)];
+        [nameField reloadData];
+        
+        // Restore the previous TableView selection
+        index = selected ? [_sortedServices indexOfObject:selected] : NSNotFound;
+        if (index != NSNotFound) {
+            [nameField selectRowIndexes:[NSIndexSet indexSetWithIndex:index] byExtendingSelection:NO];
+            [nameField scrollRowToVisible:index];
+        }
+        
+        [selected release];
+    }
+
+    [service release];
+
+    return;
+}
+
+
+- (void)resolveClientWitHost:(NSString *)host port:(uint16_t)port interfaceIndex:(uint32_t)interface txtRecord:(const char*)txtRecord txtLen:(uint16_t)txtLen
+{
+	DNSServiceRef serviceRef;
+
+	if (_ipv4AddressResolver) {
+		[_ipv4AddressResolver release];
+		_ipv4AddressResolver = nil;
+	}
+    
+    if (_ipv6AddressResolver) {
+		[_ipv6AddressResolver release];
+		_ipv6AddressResolver = nil;
+	}
+
+	// Start an async lookup for IPv4 addresses
+	DNSServiceErrorType err = DNSServiceQueryRecord(&serviceRef, (DNSServiceFlags)0, interface, [host UTF8String], kDNSServiceType_A, kDNSServiceClass_IN, QueryRecordReply, self);
+	if (err == kDNSServiceErr_NoError) {
+		_ipv4AddressResolver = [[ServiceController alloc] initWithServiceRef:serviceRef];
+		[_ipv4AddressResolver addToCurrentRunLoop];
+	}
+
+	// Start an async lookup for IPv6 addresses
+    err = DNSServiceQueryRecord(&serviceRef, (DNSServiceFlags)0, interface, [host UTF8String], kDNSServiceType_AAAA, kDNSServiceClass_IN, QueryRecordReply, self);
+    if (err == kDNSServiceErr_NoError) {
+        _ipv6AddressResolver = [[ServiceController alloc] initWithServiceRef:serviceRef];
+        [_ipv6AddressResolver addToCurrentRunLoop];
+    }
+
+    char interfaceName[IF_NAMESIZE];
+    InterfaceIndexToName(interface, interfaceName);
+
+    [hostField setStringValue:host];
+    [interfaceField setStringValue:[NSString stringWithUTF8String:interfaceName]];
+    [portField setIntValue:ntohs(port)];
+
+	// kind of a hack: munge txtRecord so it's human-readable
+	if (txtLen > 0) {
+		char *readableText = (char*) malloc(txtLen);
+		if (readableText != nil) {
+			ByteCount index, subStrLen;
+			memcpy(readableText, txtRecord, txtLen);
+			for (index=0; index < txtLen - 1; index += subStrLen + 1) {
+				subStrLen = readableText[index];
+				readableText[index] = ' ';
+			}
+			[textField setStringValue:[NSString stringWithCString:&readableText[1] length:txtLen - 1]];
+			free(readableText);
+		}
+	}
+}
+
+
+- (void)updateAddress:(uint16_t)rrtype  addr:(const void *)buff addrLen:(uint16_t)addrLen host:(const char*) host interfaceIndex:(uint32_t)interface more:(boolean_t)moreToCome
+{
+    char addrBuff[256];
+
+	if (rrtype == kDNSServiceType_A) {
+		inet_ntop(AF_INET, buff, addrBuff, sizeof(addrBuff));
+        if ([[ipAddressField stringValue] length] > 0) {
+            [ipAddressField setStringValue:[NSString stringWithFormat:@"%@, ", [ipAddressField stringValue]]];
+        }
+		[ipAddressField setStringValue:[NSString stringWithFormat:@"%@%s", [ipAddressField stringValue], addrBuff]];
+
+		if (!moreToCome) {
+			[_ipv4AddressResolver release];
+			_ipv4AddressResolver = nil;
+		}
+	} else if (rrtype == kDNSServiceType_AAAA) {
+		inet_ntop(AF_INET6, buff, addrBuff, sizeof(addrBuff));
+        if ([[ip6AddressField stringValue] length] > 0) {
+            [ip6AddressField setStringValue:[NSString stringWithFormat:@"%@, ", [ip6AddressField stringValue]]];
+        }
+		[ip6AddressField setStringValue:[NSString stringWithFormat:@"%@%s", [ip6AddressField stringValue], addrBuff]];
+
+		if (!moreToCome) {
+			[_ipv6AddressResolver release];
+			_ipv6AddressResolver = nil;
+		}
+	}
+}
+
+
+- (void)connect:(id)sender
+{
+    NSString *host = [hostField stringValue];
+    NSString *txtRecord = [textField stringValue];
+    int port = [portField intValue];
+        
+    int index = [nameField selectedRow];
+    NSString *selected = (index >= 0) ? [_sortedServices objectAtIndex:index] : nil;
+    NSString *type = [[_servicesDict objectForKey:selected] type];
+    
+    if ([type isEqual:@"_http._tcp."]) {
+        NSString *pathDelim = @"path=";
+		NSRange where;
+
+        // If the TXT record specifies a path, extract it.
+		where = [txtRecord rangeOfString:pathDelim options:NSCaseInsensitiveSearch];
+        if (where.length) {
+			NSRange	targetRange = { where.location + where.length, [txtRecord length] - where.location - where.length };
+			NSRange	endDelim = [txtRecord rangeOfString:@"\n" options:kNilOptions range:targetRange];
+			
+			if (endDelim.length)   // if a delimiter was found, truncate the target range
+				targetRange.length = endDelim.location - targetRange.location;
+
+            NSString    *path = [txtRecord substringWithRange:targetRange];
+            [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@:%d%@", host, port, path]]];
+        } else {
+            [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@:%d", host, port]]];
+        }
+    }
+    else if ([type isEqual:@"_ftp._tcp."])        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"ftp://%@:%d/", host, port]]];
+    else if ([type isEqual:@"_ssh._tcp."])        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"ssh://%@:%d/", host, port]]];
+    else if ([type isEqual:@"_afpovertcp._tcp."]) [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"afp://%@:%d/", host, port]]];
+    else if ([type isEqual:@"_smb._tcp."])        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"smb://%@:%d/", host, port]]];
+    else if ([type isEqual:@"_rfb._tcp."])        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"vnc://%@:%d/", host, port]]];
+
+    return;
+}
+
+
+- (IBAction)handleTableClick:(id)sender
+{
+    //populate the text fields
+}
+
+
+- (IBAction)removeSelected:(id)sender
+{
+    // remove the selected row and force a refresh
+
+    int selectedRow = [serviceDisplayTable selectedRow];
+
+    if (selectedRow) {
+
+        [_srvtypeKeys removeObjectAtIndex:selectedRow];
+        [_srvnameKeys removeObjectAtIndex:selectedRow];
+
+        [[NSUserDefaults standardUserDefaults] setObject:_srvtypeKeys forKey:@"SrvTypeKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:_srvnameKeys forKey:@"SrvNameKeys"];
+
+        [typeField reloadData];
+        [serviceDisplayTable reloadData];
+    }
+}
+
+
+- (IBAction)addNewService:(id)sender
+{
+    // add new entries from the edit fields to the arrays for the defaults
+    NSString *newType = [serviceTypeField stringValue];
+    NSString *newName = [serviceNameField stringValue];
+
+    // 3282283: trim trailing '.' from service type field
+    if ([newType length] && [newType hasSuffix:@"."])
+        newType = [newType substringToIndex:[newType length] - 1];
+
+    if ([newType length] && [newName length]) {
+        [_srvtypeKeys addObject:newType];
+        [_srvnameKeys addObject:newName];
+
+        [[NSUserDefaults standardUserDefaults] setObject:_srvtypeKeys forKey:@"SrvTypeKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:_srvnameKeys forKey:@"SrvNameKeys"];
+
+        [typeField reloadData];
+        [serviceDisplayTable reloadData];
+    }
+}
+
+
+- (void)_cancelPendingResolve
+{
+    [_ipv4AddressResolver release];
+    _ipv4AddressResolver = nil;
+
+    [_ipv6AddressResolver release];
+    _ipv6AddressResolver = nil;
+
+    [_serviceResolver release];
+    _serviceResolver = nil;
+
+	[self _clearResolvedInfo];
+}
+
+
+- (void)_clearResolvedInfo
+{
+	[hostField setStringValue:@""];
+	[ipAddressField setStringValue:@""];
+	[ip6AddressField setStringValue:@""];
+	[portField setStringValue:@""];
+    [interfaceField setStringValue:@""];
+	[textField setStringValue:@""];
+}
+
+@end // implementation BrowserController
+
+
+@implementation ServiceController : NSObject
+{
+	DNSServiceRef        fServiceRef;
+	CFSocketRef          fSocketRef;
+	CFRunLoopSourceRef   fRunloopSrc;
+}
+
+
+- (id)initWithServiceRef:(DNSServiceRef)ref
+{
+	self = [super init];
+    if (self) {
+        fServiceRef = ref;
+        fSocketRef = NULL;
+        fRunloopSrc = NULL;
+    }
+	return self;
+}
+
+
+- (void)addToCurrentRunLoop
+{
+	CFSocketContext	context = { 0, (void*)fServiceRef, NULL, NULL, NULL };
+
+	fSocketRef = CFSocketCreateWithNative(kCFAllocatorDefault, DNSServiceRefSockFD(fServiceRef), kCFSocketReadCallBack, ProcessSockData, &context);
+	if (fSocketRef) {
+        // Prevent CFSocketInvalidate from closing DNSServiceRef's socket.
+        CFOptionFlags sockFlags = CFSocketGetSocketFlags(fSocketRef);
+        CFSocketSetSocketFlags(fSocketRef, sockFlags & (~kCFSocketCloseOnInvalidate));
+		fRunloopSrc = CFSocketCreateRunLoopSource(kCFAllocatorDefault, fSocketRef, 0);
+    }
+	if (fRunloopSrc) {
+		CFRunLoopAddSource(CFRunLoopGetCurrent(), fRunloopSrc, kCFRunLoopDefaultMode);
+    } else {
+		printf("Could not listen to runloop socket\n");
+    }
+}
+
+
+- (DNSServiceRef)serviceRef
+{
+	return fServiceRef;
+}
+
+
+- (void)dealloc
+{
+	if (fSocketRef) {
+		CFSocketInvalidate(fSocketRef);		// Note: Also closes the underlying socket
+		CFRelease(fSocketRef);
+        
+        // Workaround that gives time to CFSocket's select thread so it can remove the socket from its
+        // FD set before we close the socket by calling DNSServiceRefDeallocate. <rdar://problem/3585273>
+        usleep(1000);
+	}
+
+	if (fRunloopSrc) {
+		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), fRunloopSrc, kCFRunLoopDefaultMode);
+		CFRelease(fRunloopSrc);
+	}
+
+	DNSServiceRefDeallocate(fServiceRef);
+
+	[super dealloc];
+}
+
+
+@end // implementation ServiceController
+
+int main(int argc, const char *argv[])
+{
+    return NSApplicationMain(argc, argv);
+}
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.nib/classes.nib b/mDNSResponder/Clients/DNSServiceBrowser.nib/classes.nib
new file mode 100644
index 00000000..482d0aa7
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.nib/classes.nib
@@ -0,0 +1,37 @@
+{
+    IBClasses = (
+        {
+            ACTIONS = {
+                addNewService = id; 
+                connect = id; 
+                handleDomainClick = id; 
+                handleNameClick = id; 
+                handleTableClick = id; 
+                handleTypeClick = id; 
+                loadDomains = id; 
+                removeSelected = id; 
+            }; 
+            CLASS = BrowserController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                domainField = id; 
+                hostField = id; 
+                interfaceField = id; 
+                ip6AddressField = id; 
+                ipAddressField = id; 
+                nameColumn = id; 
+                nameField = id; 
+                portField = id; 
+                serviceDisplayTable = id; 
+                serviceNameField = id; 
+                serviceTypeField = id; 
+                textField = id; 
+                typeColumn = id; 
+                typeField = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.nib/info.nib b/mDNSResponder/Clients/DNSServiceBrowser.nib/info.nib
new file mode 100644
index 00000000..34ca9f0e
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.nib/info.nib
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>257 25 522 680 0 0 1280 1002 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>29</key>
+		<string>22 474 271 44 0 0 1152 746 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>446.1</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>201</integer>
+		<integer>220</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8L2127</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/Clients/DNSServiceBrowser.nib/objects.nib b/mDNSResponder/Clients/DNSServiceBrowser.nib/objects.nib
new file mode 100644
index 00000000..3f28e7a8
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceBrowser.nib/objects.nib
diff --git a/mDNSResponder/Clients/DNSServiceReg-Info.plist b/mDNSResponder/Clients/DNSServiceReg-Info.plist
new file mode 100644
index 00000000..25699685
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceReg-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>DNS Service Registration</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.DNS_Service_Registration</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0d1</string>
+	<key>NSMainNibFile</key>
+	<string>DNSServiceReg</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/Clients/DNSServiceReg.m b/mDNSResponder/Clients/DNSServiceReg.m
new file mode 100644
index 00000000..3f2620fe
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceReg.m
@@ -0,0 +1,274 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "dns_sd.h"
+
+@interface RegistrationController : NSObject
+{
+    IBOutlet NSTableColumn 	*typeColumn;
+    IBOutlet NSTableColumn 	*nameColumn;
+    IBOutlet NSTableColumn 	*portColumn;
+    IBOutlet NSTableColumn 	*domainColumn;
+    IBOutlet NSTableColumn 	*textColumn;
+
+    IBOutlet NSTableView	*serviceDisplayTable;
+
+    IBOutlet NSTextField	*serviceTypeField;
+    IBOutlet NSTextField	*serviceNameField;
+    IBOutlet NSTextField	*servicePortField;
+    IBOutlet NSTextField	*serviceDomainField;
+    IBOutlet NSTextField	*serviceTextField;
+    
+    NSMutableArray		*srvtypeKeys;
+    NSMutableArray		*srvnameKeys;
+    NSMutableArray		*srvportKeys;
+    NSMutableArray		*srvdomainKeys;
+    NSMutableArray		*srvtextKeys;
+
+    NSMutableDictionary		*registeredDict;
+}
+
+- (IBAction)registerService:(id)sender;
+- (IBAction)unregisterService:(id)sender;
+
+- (IBAction)addNewService:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+
+@end
+
+void reg_reply
+    (
+    DNSServiceRef                       sdRef,
+    DNSServiceFlags                     flags,
+    DNSServiceErrorType                 errorCode,
+    const char                          *name,
+    const char                          *regtype,
+    const char                          *domain,
+    void                                *context
+    )
+{
+    // registration reply
+    printf("Got a reply from the server with error %d\n", errorCode);
+    return;
+}
+
+static void myCFSocketCallBack(CFSocketRef cfs, CFSocketCallBackType CallBackType, CFDataRef address, const void *data, void *context)
+	{
+	DNSServiceProcessResult((DNSServiceRef)context);
+	}
+
+static void addDNSServiceRefToRunLoop(DNSServiceRef ref)
+	{
+	int s = DNSServiceRefSockFD(ref);
+	CFSocketContext myCFSocketContext = { 0, ref, NULL, NULL, NULL };
+	CFSocketRef c = CFSocketCreateWithNative(kCFAllocatorDefault, s, kCFSocketReadCallBack, myCFSocketCallBack, &myCFSocketContext);
+	CFRunLoopSourceRef rls = CFSocketCreateRunLoopSource(kCFAllocatorDefault, c, 0);
+	CFRunLoopAddSource(CFRunLoopGetCurrent(), rls, kCFRunLoopDefaultMode);
+	CFRelease(rls);
+	}
+
+
+@implementation RegistrationController
+
+- (void)registerDefaults
+{
+    NSMutableDictionary *regDict = [NSMutableDictionary dictionary];
+
+    NSArray *typeArray   = [NSArray arrayWithObjects:@"_ftp._tcp.",    @"_ssh._tcp.",  @"_tftp._tcp.",        @"_http._tcp.",      @"_printer._tcp.",  @"_afpovertcp._tcp.",         nil];
+    NSArray *nameArray   = [NSArray arrayWithObjects:@"My ftp Server", @"My Computer", @"Testing Boot Image", @"A Web Server",     @"Steve's Printer", @"Company AppleShare Server", nil];
+    NSArray *portArray   = [NSArray arrayWithObjects:@"21",            @"22",          @"69",                 @"80",               @"515",             @"548",                       nil];
+    NSArray *domainArray = [NSArray arrayWithObjects:@"",              @"",            @"",                   @"",                 @"",                @"",                          nil];
+    NSArray *textArray   = [NSArray arrayWithObjects:@"",              @"",            @"image=mybootimage",  @"path=/index.html", @"rn=lpt1",         @"Vol=Public",                nil];
+
+    [regDict setObject:typeArray forKey:@"SrvTypeKeys"];
+    [regDict setObject:nameArray forKey:@"SrvNameKeys"];
+    [regDict setObject:portArray forKey:@"SrvPortKeys"];
+    [regDict setObject:domainArray forKey:@"SrvDomainKeys"];
+    [regDict setObject:textArray forKey:@"SrvTextKeys"];
+
+    [[NSUserDefaults standardUserDefaults] registerDefaults:regDict];
+}
+
+- (id)init
+{
+    srvtypeKeys = [[NSMutableArray array] retain];	//Define arrays for Type, Domain, and Name
+    srvnameKeys = [[NSMutableArray array] retain];
+    srvportKeys = [[NSMutableArray array] retain];
+    srvdomainKeys = [[NSMutableArray array] retain];
+    srvtextKeys = [[NSMutableArray array] retain];
+
+    registeredDict = [[NSMutableDictionary alloc] init];
+    
+    [self registerDefaults];
+    return [super init];
+}
+
+- (void)awakeFromNib				//BrowserController startup procedure
+{
+    [srvtypeKeys addObjectsFromArray:[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvTypeKeys"]];
+    [srvnameKeys addObjectsFromArray:[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvNameKeys"]];
+    [srvportKeys addObjectsFromArray:[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvPortKeys"]];
+    [srvdomainKeys addObjectsFromArray:[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvDomainKeys"]];
+    [srvtextKeys addObjectsFromArray:[[NSUserDefaults standardUserDefaults] arrayForKey:@"SrvTextKeys"]];
+
+    [serviceDisplayTable reloadData];				//Reload (redraw) data in fields
+
+}
+
+
+
+ - (IBAction)registerService:(id)sender
+{
+    int selectedRow = [serviceDisplayTable selectedRow];
+    CFMachPortContext       context;
+    DNSServiceRef 	        dns_client;
+
+    if (selectedRow < 0) {
+        return;
+    }
+
+	NSString *key = [srvtypeKeys objectAtIndex:selectedRow];
+	if ([registeredDict objectForKey:key]) { printf("Already registered\n"); return; }
+
+    context.version                 = 1;
+    context.info                    = 0;
+    context.retain                  = NULL;
+    context.release                 = NULL;
+    context.copyDescription 	    = NULL;
+    unsigned char txtbuffer[300];
+	strncpy(txtbuffer+1, [[srvtextKeys objectAtIndex:selectedRow] UTF8String], sizeof(txtbuffer)-1);
+	txtbuffer[0] = strlen(txtbuffer+1);
+
+    DNSServiceErrorType err = DNSServiceRegister
+        (
+        	&dns_client, 0, 0,
+            [[srvnameKeys objectAtIndex:selectedRow] UTF8String],
+            [key UTF8String],
+            [[srvdomainKeys objectAtIndex:selectedRow] UTF8String],
+            NULL, htons([[srvportKeys objectAtIndex:selectedRow] intValue]),
+            txtbuffer[0]+1, txtbuffer,
+            reg_reply,
+            nil
+            );
+	if (err)
+		printf("DNSServiceRegister failed %d\n", err);
+	else
+	{
+		addDNSServiceRefToRunLoop(dns_client);
+		[registeredDict setObject:[NSNumber numberWithUnsignedInt:(unsigned int)dns_client] forKey:key];
+	}
+}
+
+- (IBAction)unregisterService:(id)sender
+{
+    int selectedRow = [serviceDisplayTable selectedRow];
+    NSString *key = [srvtypeKeys objectAtIndex:selectedRow];
+
+    NSNumber *refPtr = [registeredDict objectForKey:key];
+    DNSServiceRef ref = (DNSServiceRef)[refPtr unsignedIntValue];
+
+    if (ref) {
+        DNSServiceRefDeallocate(ref);
+        [registeredDict removeObjectForKey:key];
+    }
+}
+
+-(void)tableView:(NSTableView *)theTableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(int)row
+{
+    if (row<0) return;
+}
+
+- (int)numberOfRowsInTableView:(NSTableView *)theTableView	//Begin mandatory TableView methods
+{
+    return [srvtypeKeys count];
+}
+
+- (id)tableView:(NSTableView *)theTableView objectValueForTableColumn:(NSTableColumn *)theColumn row:(int)rowIndex
+{
+    if (theColumn == typeColumn) {
+        return [srvtypeKeys objectAtIndex:rowIndex];
+    }
+    if (theColumn == nameColumn) {
+        return [srvnameKeys objectAtIndex:rowIndex];
+    }
+    if (theColumn == portColumn) {
+        return [srvportKeys objectAtIndex:rowIndex];
+    }
+    if (theColumn == domainColumn) {
+        return [srvdomainKeys objectAtIndex:rowIndex];
+    }
+    if (theColumn == textColumn) {
+        return [srvtextKeys objectAtIndex:rowIndex];
+    }
+    
+    return(0);
+}						//End of mandatory TableView methods
+
+- (IBAction)removeSelected:(id)sender
+{
+    // remove the selected row and force a refresh
+
+    int selectedRow = [serviceDisplayTable selectedRow];
+
+    if (selectedRow) {
+
+        [srvtypeKeys removeObjectAtIndex:selectedRow];
+        [srvnameKeys removeObjectAtIndex:selectedRow];
+        [srvportKeys removeObjectAtIndex:selectedRow];
+        [srvdomainKeys removeObjectAtIndex:selectedRow];
+        [srvtextKeys removeObjectAtIndex:selectedRow];
+
+        [[NSUserDefaults standardUserDefaults] setObject:srvtypeKeys forKey:@"SrvTypeKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvnameKeys forKey:@"SrvNameKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvportKeys forKey:@"SrvPortKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvdomainKeys forKey:@"SrvDomainKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvtextKeys forKey:@"SrvTextKeys"];
+        
+        [serviceDisplayTable reloadData];
+    }
+}
+
+- (IBAction)addNewService:(id)sender
+{
+    // add new entries from the edit fields to the arrays for the defaults
+
+    if ([[serviceTypeField stringValue] length] && [[serviceNameField stringValue] length] && [[serviceDomainField stringValue] length]&& [[servicePortField stringValue] length]) {
+        [srvtypeKeys addObject:[serviceTypeField stringValue]];
+        [srvnameKeys addObject:[serviceNameField stringValue]];
+        [srvportKeys addObject:[servicePortField stringValue]];
+        [srvdomainKeys addObject:[serviceDomainField stringValue]];
+        [srvtextKeys addObject:[serviceTextField stringValue]];
+
+        [[NSUserDefaults standardUserDefaults] setObject:srvtypeKeys forKey:@"SrvTypeKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvnameKeys forKey:@"SrvNameKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvportKeys forKey:@"SrvPortKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvdomainKeys forKey:@"SrvDomainKeys"];
+        [[NSUserDefaults standardUserDefaults] setObject:srvtextKeys forKey:@"SrvTextKeys"];
+
+        [serviceDisplayTable reloadData];
+    } else {
+        NSBeep();
+    }
+
+}
+
+@end
+
+int main(int argc, const char *argv[])
+{
+    return NSApplicationMain(argc, argv);
+}
diff --git a/mDNSResponder/Clients/DNSServiceReg.nib/classes.nib b/mDNSResponder/Clients/DNSServiceReg.nib/classes.nib
new file mode 100644
index 00000000..46f466c7
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceReg.nib/classes.nib
@@ -0,0 +1,30 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {
+                addNewService = id; 
+                registerService = id; 
+                removeSelected = id; 
+                unregisterService = id; 
+            }; 
+            CLASS = RegistrationController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                domainColumn = NSTableColumn; 
+                nameColumn = NSTableColumn; 
+                portColumn = NSTableColumn; 
+                serviceDisplayTable = NSTableView; 
+                serviceDomainField = NSTextField; 
+                serviceNameField = NSTextField; 
+                servicePortField = NSTextField; 
+                serviceTextField = NSTextField; 
+                serviceTypeField = NSTextField; 
+                textColumn = NSTableColumn; 
+                typeColumn = NSTableColumn; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/mDNSResponder/Clients/DNSServiceReg.nib/info.nib b/mDNSResponder/Clients/DNSServiceReg.nib/info.nib
new file mode 100644
index 00000000..9d2eb74f
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceReg.nib/info.nib
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>32 111 356 240 0 0 1152 746 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>29</key>
+		<string>103 609 252 44 0 0 1152 746 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>273.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>243</integer>
+		<integer>21</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>6C30</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/Clients/DNSServiceReg.nib/objects.nib b/mDNSResponder/Clients/DNSServiceReg.nib/objects.nib
new file mode 100644
index 00000000..705e77d7
--- /dev/null
+++ b/mDNSResponder/Clients/DNSServiceReg.nib/objects.nib
diff --git a/mDNSResponder/Clients/ExplorerPlugin/About.cpp b/mDNSResponder/Clients/ExplorerPlugin/About.cpp
new file mode 100644
index 00000000..4a63f2c2
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/About.cpp
@@ -0,0 +1,90 @@
+// About.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "ExplorerPlugin.h"
+#include "About.h"
+#include "WinVersRes.h"
+#include <DebugServices.h>
+
+
+// CAbout dialog
+
+IMPLEMENT_DYNAMIC(CAbout, CDialog)
+CAbout::CAbout(CWnd* pParent /*=NULL*/)
+	: CDialog(CAbout::IDD, pParent)
+{
+	// Initialize brush with the desired background color
+	m_bkBrush.CreateSolidBrush(RGB(255, 255, 255));
+}
+
+CAbout::~CAbout()
+{
+}
+
+void CAbout::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_COMPONENT, m_componentCtrl);
+	DDX_Control(pDX, IDC_LEGAL, m_legalCtrl);
+}
+
+
+BEGIN_MESSAGE_MAP(CAbout, CDialog)
+ON_WM_CTLCOLOR()
+END_MESSAGE_MAP()
+
+
+// CAbout message handlers
+BOOL
+CAbout::OnInitDialog()
+{
+	BOOL b = CDialog::OnInitDialog();
+
+	CStatic * control = (CStatic*) GetDlgItem( IDC_ABOUT_BACKGROUND );
+	check( control );
+
+	if ( control )
+	{
+		control->SetBitmap( ::LoadBitmap( GetNonLocalizedResources(), MAKEINTRESOURCE( IDB_ABOUT ) ) );
+	}
+
+	control = ( CStatic* ) GetDlgItem( IDC_COMPONENT_VERSION );
+	check( control );
+
+	if ( control )
+	{
+		control->SetWindowText( TEXT( MASTER_PROD_VERS_STR2 ) );
+	}
+
+	return b;
+}
+
+
+HBRUSH CAbout::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{ 
+	switch (nCtlColor)
+	{
+		case CTLCOLOR_STATIC:
+	
+			if ( pWnd->GetDlgCtrlID() == IDC_COMPONENT )
+			{
+				pDC->SetTextColor(RGB(64, 64, 64));
+			}
+			else
+			{
+				pDC->SetTextColor(RGB(0, 0, 0));
+			}
+
+			pDC->SetBkColor(RGB(255, 255, 255));
+			return (HBRUSH)(m_bkBrush.GetSafeHandle());
+
+		case CTLCOLOR_DLG:
+	
+			return (HBRUSH)(m_bkBrush.GetSafeHandle());
+
+		default:
+	
+			return CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
+	}
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/About.h b/mDNSResponder/Clients/ExplorerPlugin/About.h
new file mode 100644
index 00000000..494d1f1e
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/About.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "Resource.h"
+#include "afxwin.h"
+
+// CAbout dialog
+
+class CAbout : public CDialog
+{
+DECLARE_DYNAMIC(CAbout)
+
+public:
+CAbout(CWnd* pParent = NULL);       // standard constructor
+virtual ~CAbout();
+
+// Dialog Data
+enum { IDD = IDD_ABOUT };
+
+protected:
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+virtual HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+virtual BOOL    OnInitDialog();
+DECLARE_MESSAGE_MAP()
+public:
+CStatic m_componentCtrl;
+CStatic m_legalCtrl;
+CBrush m_bkBrush;
+};
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.cpp b/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.cpp
new file mode 100644
index 00000000..e578e239
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.cpp
@@ -0,0 +1,177 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include	"StdAfx.h"
+
+#include	"DebugServices.h"
+
+#include	"ExplorerBar.h"
+#include	"ExplorerPlugin.h"
+
+#include	"ClassFactory.h"
+
+// MFC Debugging
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	ClassFactory
+//===========================================================================================================================
+
+ClassFactory::ClassFactory( CLSID inCLSID )
+{
+	mCLSIDObject 	= inCLSID;
+	mRefCount		= 1;
+	++gDLLRefCount;
+}
+
+//===========================================================================================================================
+//	~ClassFactory
+//===========================================================================================================================
+
+ClassFactory::~ClassFactory( void )
+{
+	check( gDLLRefCount > 0 );
+	
+	--gDLLRefCount;
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IUnknown methods ==
+#endif
+
+//===========================================================================================================================
+//	QueryInterface
+//===========================================================================================================================
+
+STDMETHODIMP	ClassFactory::QueryInterface( REFIID inID, LPVOID *outResult )
+{
+	HRESULT		err;
+	
+	check( outResult );
+	
+	if( IsEqualIID( inID, IID_IUnknown ) )
+	{
+		*outResult = this;
+	}
+	else if( IsEqualIID( inID, IID_IClassFactory ) )
+	{
+		*outResult = (IClassFactory *) this;
+	}   
+	else
+	{
+		*outResult = NULL;
+		err = E_NOINTERFACE;
+		goto exit;
+	}
+	
+	( *( (LPUNKNOWN *) outResult ) )->AddRef();
+	err = S_OK;
+	
+exit:
+	return( err );
+}                                             
+
+//===========================================================================================================================
+//	AddRef
+//===========================================================================================================================
+
+STDMETHODIMP_( DWORD )	ClassFactory::AddRef( void )
+{
+	return( ++mRefCount );
+}
+
+//===========================================================================================================================
+//	Release
+//===========================================================================================================================
+
+STDMETHODIMP_( DWORD )	ClassFactory::Release( void )
+{
+	DWORD		count;
+	
+	count = --mRefCount;
+	if( count == 0 )
+	{
+		delete this;
+	}
+	return( count );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IClassFactory methods ==
+#endif
+
+//===========================================================================================================================
+//	CreateInstance
+//===========================================================================================================================
+
+STDMETHODIMP	ClassFactory::CreateInstance( LPUNKNOWN inUnknown, REFIID inID, LPVOID *outObject )
+{
+	HRESULT		err;
+	LPVOID		obj;
+	
+	check( outObject );
+	
+	obj 		= NULL;
+	*outObject 	= NULL;
+	require_action( !inUnknown, exit, err = CLASS_E_NOAGGREGATION );
+	
+	// Create the object based on the CLSID.
+	
+	if( IsEqualCLSID( mCLSIDObject, CLSID_ExplorerBar ) )
+	{
+		try
+		{
+			obj = new ExplorerBar();
+		}
+		catch( ... )
+		{
+			// Don't let exception escape.
+		}
+		require_action( obj, exit, err = E_OUTOFMEMORY );
+	}
+	else
+	{
+		err = E_FAIL;
+		goto exit;
+	}
+	
+	// Query for the specified interface. Release the factory since QueryInterface retains it.
+		
+	err = ( (LPUNKNOWN ) obj )->QueryInterface( inID, outObject );
+	( (LPUNKNOWN ) obj )->Release();
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	LockServer
+//===========================================================================================================================
+
+STDMETHODIMP	ClassFactory::LockServer( BOOL inLock )
+{
+	DEBUG_UNUSED( inLock );
+	
+	return( E_NOTIMPL );
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.h b/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.h
new file mode 100644
index 00000000..cbf56302
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ClassFactory.h
@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CLASS_FACTORY__
+#define __CLASS_FACTORY__
+
+#include    "StdAfx.h"
+
+//===========================================================================================================================
+//	ClassFactory
+//===========================================================================================================================
+
+class ClassFactory : public IClassFactory
+{
+protected:
+
+DWORD mRefCount;
+CLSID mCLSIDObject;
+
+public:
+
+ClassFactory( CLSID inCLSID );
+~ClassFactory( void );
+
+// IUnknown methods
+
+STDMETHODIMP            QueryInterface( REFIID inID, LPVOID *outResult );
+STDMETHODIMP_( DWORD )  AddRef( void );
+STDMETHODIMP_( DWORD )  Release( void );
+
+// IClassFactory methods
+
+STDMETHODIMP    CreateInstance( LPUNKNOWN inUnknown, REFIID inID, LPVOID *outObject );
+STDMETHODIMP    LockServer( BOOL inLock );
+};
+
+#endif  // __CLASS_FACTORY__
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.cpp b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.cpp
new file mode 100644
index 00000000..644515fe
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.cpp
@@ -0,0 +1,659 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"StdAfx.h"
+
+#include	"comutil.h"
+#include	"ShObjIdl.h"
+
+#include	"DebugServices.h"
+
+#include	"Resource.h"
+
+#include	"ExplorerBar.h"
+
+#include	"About.h"
+// MFC Debugging
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+#define LENGTHOF(a) (sizeof(a) == sizeof(&*a)) ? 0 : (sizeof(a) / sizeof(*a))
+#define MIN_SIZE_X		10
+#define MIN_SIZE_Y		10
+
+//===========================================================================================================================
+//	ExplorerBar
+//===========================================================================================================================
+
+ExplorerBar::ExplorerBar( void )
+{
+	++gDLLRefCount;
+	
+	mRefCount		= 1;
+	mSite 			= NULL;
+	mWebBrowser		= NULL;
+	mParentWindow	= NULL;
+	mFocus			= FALSE;
+	mViewMode		= 0;
+	mBandID			= 0;
+}
+
+//===========================================================================================================================
+//	~ExplorerBar
+//===========================================================================================================================
+
+ExplorerBar::~ExplorerBar( void )
+{
+	if( mWebBrowser )
+	{
+		mWebBrowser->Release();
+		mWebBrowser = NULL;
+	}
+	if( mSite )
+	{
+		mSite->Release();
+		mSite = NULL;
+	}
+	
+	--gDLLRefCount;
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IUnknown implementation ==
+#endif
+
+//===========================================================================================================================
+//	QueryInterface
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::QueryInterface( REFIID inID, LPVOID *outResult )
+{
+	HRESULT		err;
+	
+	if( IsEqualIID( inID, IID_IUnknown ) )				// IUnknown
+	{
+		*outResult = this;
+	}
+	else if( IsEqualIID( inID, IID_IOleWindow ) )		// IOleWindow
+	{
+		*outResult = (IOleWindow *) this;
+	}
+	else if( IsEqualIID( inID, IID_IDockingWindow ) )	// IDockingWindow
+	{
+		*outResult = (IDockingWindow *) this;
+	}
+	else if( IsEqualIID( inID, IID_IDeskBand ) )		// IDeskBand
+	{
+		*outResult = (IDeskBand *) this;
+	}
+	else if( IsEqualIID( inID, IID_IInputObject ) )		// IInputObject
+	{
+		*outResult = (IInputObject *) this;
+	}
+	else if( IsEqualIID( inID, IID_IObjectWithSite ) )	// IObjectWithSite
+	{
+		*outResult = (IObjectWithSite *) this;
+	}
+	else if( IsEqualIID( inID, IID_IPersistStream ) )	// IPersistStream
+	{
+		*outResult = (IPersistStream *) this;
+	}
+	else if( IsEqualIID( inID, IID_IContextMenu ) )     // IContextMenu
+	{
+		*outResult = (IContextMenu *) this;
+	}
+	else
+	{
+		*outResult = NULL;
+		err = E_NOINTERFACE;
+		goto exit;
+	}
+	
+	( *( (LPUNKNOWN *) outResult ) )->AddRef();
+	err = S_OK;
+
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	AddRef
+//===========================================================================================================================
+
+STDMETHODIMP_( DWORD )	ExplorerBar::AddRef( void )
+{
+	return( ++mRefCount );
+}
+
+//===========================================================================================================================
+//	Release
+//===========================================================================================================================
+
+STDMETHODIMP_( DWORD )	ExplorerBar::Release( void )
+{
+	DWORD		count;
+
+	count = --mRefCount;
+	if( count == 0 )
+	{
+		delete this;
+	}
+	return( count );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IOleWindow implementation ==
+#endif
+
+//===========================================================================================================================
+//	GetWindow
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::GetWindow( HWND *outWindow )
+{
+	*outWindow = mWindow.GetSafeHwnd();
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	ContextSensitiveHelp
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::ContextSensitiveHelp( BOOL inEnterMode )
+{
+	DEBUG_UNUSED( inEnterMode );
+	
+	return( E_NOTIMPL );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IDockingWindow implementation ==
+#endif
+
+//===========================================================================================================================
+//	ShowDW
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::ShowDW( BOOL inShow )
+{
+	if( mWindow.GetSafeHwnd() )
+	{
+		mWindow.ShowWindow( inShow ? SW_SHOW : SW_HIDE );
+	}
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	CloseDW
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::CloseDW( DWORD inReserved )
+{
+	DEBUG_UNUSED( inReserved );
+
+	ShowDW( FALSE );
+	if( mWindow.GetSafeHwnd() )
+	{
+		mWindow.SendMessage( WM_CLOSE );
+	}
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	ResizeBorderDW
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::ResizeBorderDW( LPCRECT inBorder, IUnknown *inPunkSite, BOOL inReserved )
+{
+	DEBUG_UNUSED( inBorder );
+	DEBUG_UNUSED( inPunkSite );
+	DEBUG_UNUSED( inReserved );
+	
+	return( E_NOTIMPL );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IDeskBand implementation ==
+#endif
+
+//===========================================================================================================================
+//	GetBandInfo
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::GetBandInfo( DWORD inBandID, DWORD inViewMode, DESKBANDINFO *outInfo )
+{
+	HRESULT		err;
+	
+	require_action( outInfo, exit, err = E_INVALIDARG );
+	
+	mBandID   = inBandID;
+	mViewMode = inViewMode;
+	
+	if( outInfo->dwMask & DBIM_MINSIZE )
+	{
+		outInfo->ptMinSize.x = 100;
+		outInfo->ptMinSize.y = 100;
+	}
+	if( outInfo->dwMask & DBIM_MAXSIZE )
+	{
+		// Unlimited max size.
+		
+		outInfo->ptMaxSize.x = -1;
+		outInfo->ptMaxSize.y = -1;
+	}
+	if( outInfo->dwMask & DBIM_INTEGRAL )
+	{
+		outInfo->ptIntegral.x = 1;
+		outInfo->ptIntegral.y = 1;
+	}
+	if( outInfo->dwMask & DBIM_ACTUAL )
+	{
+		outInfo->ptActual.x = 0;
+		outInfo->ptActual.y = 0;
+	}
+	if( outInfo->dwMask & DBIM_TITLE )
+	{
+		CString		s;
+		BOOL		ok;
+		
+		ok = s.LoadString( IDS_NAME );
+		require_action( ok, exit, err = kNoResourcesErr );
+		
+		#ifdef UNICODE
+			lstrcpyn( outInfo->wszTitle, s, sizeof_array( outInfo->wszTitle ) );
+		#else
+			DWORD		nChars;
+			
+			nChars = MultiByteToWideChar( CP_ACP, 0, s, -1, outInfo->wszTitle, sizeof_array( outInfo->wszTitle ) );
+			err = translate_errno( nChars > 0, (OSStatus) GetLastError(), kUnknownErr );
+			require_noerr( err, exit );
+		#endif
+	}
+	if( outInfo->dwMask & DBIM_MODEFLAGS )
+	{
+		outInfo->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT;
+	}
+	
+	// Force the default background color.
+	
+	outInfo->dwMask &= ~DBIM_BKCOLOR;
+	err = S_OK;
+	
+exit:
+	return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IInputObject implementation ==
+#endif
+
+//===========================================================================================================================
+//	UIActivateIO
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::UIActivateIO( BOOL inActivate, LPMSG inMsg )
+{
+	DEBUG_UNUSED( inMsg );
+	
+	if( inActivate )
+	{
+		mWindow.SetFocus();
+	}
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	HasFocusIO
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::HasFocusIO( void )
+{
+	if( mWindow.GetFocus()->GetSafeHwnd() == mWindow.GetSafeHwnd() )
+	{
+		return( S_OK );
+	}
+	return( S_FALSE );
+}
+
+//===========================================================================================================================
+//	TranslateAcceleratorIO
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::TranslateAcceleratorIO( LPMSG inMsg )
+{
+	DEBUG_UNUSED( inMsg );
+		
+	return( S_FALSE );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IObjectWithSite implementation ==
+#endif
+
+//===========================================================================================================================
+//	SetSite
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::SetSite( IUnknown *inPunkSite )
+{
+	AFX_MANAGE_STATE( AfxGetStaticModuleState() );
+	
+	HRESULT		err;
+	
+	// Release the old interfaces.
+	
+	if( mWebBrowser )
+	{
+		mWebBrowser->Release();
+		mWebBrowser = NULL;
+	}
+	if( mSite )
+	{
+		mSite->Release();
+		mSite = NULL;
+	}
+	
+	// A non-NULL site means we're setting the site. Otherwise, the site is being released (done above).
+	
+	if( !inPunkSite )
+	{
+		err = S_OK;
+		goto exit;
+	}
+	
+	// Get the parent window.
+	
+	IOleWindow *		oleWindow;
+		
+	mParentWindow = NULL;
+	err = inPunkSite->QueryInterface( IID_IOleWindow, (LPVOID *) &oleWindow );
+	require( SUCCEEDED( err ), exit );
+	
+	err = oleWindow->GetWindow( &mParentWindow );
+	oleWindow->Release();
+	require_noerr( err, exit );
+	require_action( mParentWindow, exit, err = E_FAIL );
+	
+	// Get the IInputObject interface.
+	
+	err = inPunkSite->QueryInterface( IID_IInputObjectSite, (LPVOID *) &mSite );
+	require( SUCCEEDED( err ), exit );
+	check( mSite );
+	
+	// Get the IWebBrowser2 interface.
+	
+	IOleCommandTarget *		oleCommandTarget;
+	
+	err = inPunkSite->QueryInterface( IID_IOleCommandTarget, (LPVOID *) &oleCommandTarget );
+	require( SUCCEEDED( err ), exit );
+	
+	IServiceProvider *		serviceProvider;
+	
+	err = oleCommandTarget->QueryInterface( IID_IServiceProvider, (LPVOID *) &serviceProvider );
+	oleCommandTarget->Release();
+	require( SUCCEEDED( err ), exit );
+	
+	err = serviceProvider->QueryService( SID_SWebBrowserApp, IID_IWebBrowser2, (LPVOID *) &mWebBrowser );
+	serviceProvider->Release();
+	require( SUCCEEDED( err ), exit );
+	
+	// Create the main window.
+	
+	err = SetupWindow();
+	require_noerr( err, exit );
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	GetSite
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::GetSite( REFIID inID, LPVOID *outResult )
+{
+	HRESULT		err;
+	
+	*outResult = NULL;
+	require_action( mSite, exit, err = E_FAIL );
+	
+	err = mSite->QueryInterface( inID, outResult );
+	
+exit:
+	return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == IPersistStream implementation ==
+#endif
+
+//
+// IPersistStream implementation
+// 
+// This is only supported to allow the desk band to be dropped on the desktop and to prevent multiple instances of 
+// the desk band from showing up in the context menu. This desk band doesn't actually persist any data.
+//
+
+//===========================================================================================================================
+//	GetClassID
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::GetClassID( LPCLSID outClassID )
+{
+	*outClassID = CLSID_ExplorerBar;
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	IsDirty
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::IsDirty( void )
+{
+	return( S_FALSE );
+}
+
+//===========================================================================================================================
+//	Load
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::Load( LPSTREAM inStream )
+{
+	DEBUG_UNUSED( inStream );
+	
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	Save
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::Save( LPSTREAM inStream, BOOL inClearDirty )
+{
+	DEBUG_UNUSED( inStream );
+	DEBUG_UNUSED( inClearDirty );
+	
+	return( S_OK );
+}
+
+//===========================================================================================================================
+//	GetSizeMax
+//===========================================================================================================================
+
+STDMETHODIMP	ExplorerBar::GetSizeMax( ULARGE_INTEGER *outSizeMax )
+{
+	DEBUG_UNUSED( outSizeMax );
+	
+	return( E_NOTIMPL );
+}
+
+
+//===========================================================================================================================
+//	QueryContextMenu
+//===========================================================================================================================
+
+STDMETHODIMP  ExplorerBar::QueryContextMenu(HMENU hShellContextMenu, UINT iContextMenuFirstItem, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
+{
+	DEBUG_UNUSED( idCmdLast );
+	DEBUG_UNUSED( uFlags );
+
+	CMenu menubar;
+
+	menubar.LoadMenu(IDR_CONTEXT_MENU);
+	CMenu * menu = menubar.GetSubMenu(0);
+
+	CMenu shellmenu;
+
+	shellmenu.Attach(hShellContextMenu);
+
+	UINT iShellItem = iContextMenuFirstItem;	//! remove plus one
+	UINT idShellCmd = idCmdFirst;
+
+	int n = menu->GetMenuItemCount();
+
+	for (int i=0; i<n; ++i)
+	{
+		MENUITEMINFO	mii;
+		TCHAR				sz[128] = {0};
+		
+		ZeroMemory(&mii, sizeof(mii));
+		mii.fMask		= MIIM_TYPE | MIIM_ID;
+		mii.fType		= MFT_STRING;
+		mii.cbSize		= sizeof(mii);
+		mii.cch			= LENGTHOF(sz);
+		mii.dwTypeData	= sz;
+		
+		menu->GetMenuItemInfo(i, &mii, TRUE);
+
+		mii.wID = idShellCmd++;
+
+		shellmenu.InsertMenuItem(iShellItem++, &mii, TRUE);
+	}
+
+	shellmenu.Detach();
+
+	return n;
+}
+
+
+//===========================================================================================================================
+//	GetCommandString
+//===========================================================================================================================
+
+// Not called for explorer bars
+STDMETHODIMP ExplorerBar::GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax)
+{
+	DEBUG_UNUSED( idCmd );
+	DEBUG_UNUSED( uType );
+	DEBUG_UNUSED( pwReserved );
+	DEBUG_UNUSED( pszName );
+	DEBUG_UNUSED( cchMax );
+
+	return E_NOTIMPL;
+}
+
+//===========================================================================================================================
+//	InvokeCommand
+//===========================================================================================================================
+
+//	The shell sends either strings or indexes
+//	IE never sends strings
+//	The indexes are into an array of my commands
+//	So the verb for the first command I added to the menu is always 0x0000
+//	Here - because I don't have any submenus - 
+//		I can treat the 'verb' as an menu item position	
+STDMETHODIMP ExplorerBar::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
+{
+	// IE doesn't send string commands
+	if (HIWORD(lpici->lpVerb) != 0) return 0;
+
+	CAbout dlg;
+
+	dlg.DoModal();
+
+	return S_OK;
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Other ==
+#endif
+
+//===========================================================================================================================
+//	SetupWindow
+//===========================================================================================================================
+
+OSStatus	ExplorerBar::SetupWindow( void )
+{
+	OSStatus		err;
+	CWnd *			window;
+	CRect			rect;
+	CString			s;
+	BOOL			ok;
+	
+	window = CWnd::FromHandle( mParentWindow );
+	check( window );
+	window->GetClientRect( rect );
+	
+	ok = s.LoadString( IDS_NAME );
+	require_action( ok, exit, err = kNoResourcesErr );
+	
+	ok = mWindow.Create( NULL, s, WS_CHILD | WS_VISIBLE, rect, window, 100 ) != 0;
+	require_action( ok, exit, err = kNoResourcesErr );
+	
+	mWindow.SetOwner( this );
+	err = kNoErr;
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	GoToURL
+//===========================================================================================================================
+
+OSStatus	ExplorerBar::GoToURL( const CString &inURL )
+{
+	OSStatus		err;
+	BSTR			s;
+	VARIANT			empty;
+	
+	s = inURL.AllocSysString();
+	require_action( s, exit, err = kNoMemoryErr );
+	
+	VariantInit( &empty );
+	err = mWebBrowser->Navigate( s, &empty, &empty, &empty, &empty );
+	SysFreeString( s );
+	require_noerr( err, exit );
+
+exit:
+	return( err );
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.h b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.h
new file mode 100644
index 00000000..01d1beee
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBar.h
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __EXPLORER_BAR__
+#define __EXPLORER_BAR__
+
+#include    "StdAfx.h"
+
+#include    "ExplorerBarWindow.h"
+#include    "ExplorerPlugin.h"
+
+//===========================================================================================================================
+//	ExplorerBar
+//===========================================================================================================================
+
+class ExplorerBar : public IDeskBand,
+    public IInputObject,
+    public IObjectWithSite,
+    public IPersistStream,
+    public IContextMenu
+{
+protected:
+
+DWORD mRefCount;
+IInputObjectSite *      mSite;
+IWebBrowser2 *          mWebBrowser;
+HWND mParentWindow;
+BOOL mFocus;
+DWORD mViewMode;
+DWORD mBandID;
+ExplorerBarWindow mWindow;
+
+public:
+
+ExplorerBar( void );
+~ExplorerBar( void );
+
+// IUnknown methods
+
+STDMETHODIMP            QueryInterface( REFIID inID, LPVOID *outResult );
+STDMETHODIMP_( DWORD )  AddRef( void );
+STDMETHODIMP_( DWORD )  Release( void );
+
+// IOleWindow methods
+
+STDMETHOD( GetWindow ) ( HWND *outWindow );
+STDMETHOD( ContextSensitiveHelp ) ( BOOL inEnterMode );
+
+// IDockingWindow methods
+
+STDMETHOD( ShowDW ) ( BOOL inShow );
+STDMETHOD( CloseDW ) ( DWORD inReserved );
+STDMETHOD( ResizeBorderDW ) ( LPCRECT inBorder, IUnknown *inPunkSite, BOOL inReserved );
+
+// IDeskBand methods
+
+STDMETHOD( GetBandInfo ) ( DWORD inBandID, DWORD inViewMode, DESKBANDINFO *outInfo );
+
+// IInputObject methods
+
+STDMETHOD( UIActivateIO ) ( BOOL inActivate, LPMSG inMsg );
+STDMETHOD( HasFocusIO ) ( void );
+STDMETHOD( TranslateAcceleratorIO ) ( LPMSG inMsg );
+
+// IObjectWithSite methods
+
+STDMETHOD( SetSite ) ( IUnknown *inPunkSite );
+STDMETHOD( GetSite ) ( REFIID inID, LPVOID *outResult );
+
+// IPersistStream methods
+
+STDMETHOD( GetClassID ) ( LPCLSID outClassID );
+STDMETHOD( IsDirty ) ( void );
+STDMETHOD( Load ) ( LPSTREAM inStream );
+STDMETHOD( Save ) ( LPSTREAM inStream, BOOL inClearDirty );
+STDMETHOD( GetSizeMax ) ( ULARGE_INTEGER *outSizeMax );
+
+// IContextMenu methods
+
+STDMETHOD( QueryContextMenu ) ( HMENU hContextMenu, UINT iContextMenuFirstItem, UINT idCmdFirst, UINT idCmdLast, UINT uFlags );
+STDMETHOD( GetCommandString ) ( UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax );
+STDMETHOD( InvokeCommand ) ( LPCMINVOKECOMMANDINFO lpici );
+
+// Other
+
+OSStatus    SetupWindow( void );
+OSStatus    GoToURL( const CString &inURL );
+};
+
+#endif  // __EXPLORER_BAR__
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.cpp b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.cpp
new file mode 100644
index 00000000..5e0692aa
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.cpp
@@ -0,0 +1,794 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"StdAfx.h"
+
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+#include	"WinServices.h"
+#include	"dns_sd.h"
+
+#include	"ExplorerBar.h"
+#include	"LoginDialog.h"
+#include	"Resource.h"
+
+#include	"ExplorerBarWindow.h"
+#include	"ExplorerPlugin.h"
+
+// MFC Debugging
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+// Control IDs
+
+#define	IDC_EXPLORER_TREE				1234
+
+// Private Messages
+
+#define WM_PRIVATE_SERVICE_EVENT				( WM_USER + 0x100 )
+
+// TXT records
+
+#define	kTXTRecordKeyPath				"path"
+
+// IE Icon resource
+
+#define kIEIconResource					32529
+
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+DEBUG_LOCAL int			FindServiceArrayIndex( const ServiceInfoArray &inArray, const ServiceInfo &inService, int &outIndex );
+
+#if 0
+#pragma mark == Message Map ==
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP( ExplorerBarWindow, CWnd )
+	ON_WM_CREATE()
+	ON_WM_DESTROY()
+	ON_WM_SIZE()
+	ON_NOTIFY( NM_DBLCLK, IDC_EXPLORER_TREE, OnDoubleClick )
+	ON_MESSAGE( WM_PRIVATE_SERVICE_EVENT, OnServiceEvent )
+END_MESSAGE_MAP()
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	ExplorerBarWindow
+//===========================================================================================================================
+
+ExplorerBarWindow::ExplorerBarWindow( void )
+{
+	mOwner				= NULL;
+	mResolveServiceRef	= NULL;
+}
+
+//===========================================================================================================================
+//	~ExplorerBarWindow
+//===========================================================================================================================
+
+ExplorerBarWindow::~ExplorerBarWindow( void )
+{
+	//
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	OnCreate
+//===========================================================================================================================
+
+int	ExplorerBarWindow::OnCreate( LPCREATESTRUCT inCreateStruct )
+{
+	AFX_MANAGE_STATE( AfxGetStaticModuleState() );
+	
+	HINSTANCE		module = NULL;
+	OSStatus		err;
+	CRect			rect;
+	CBitmap			bitmap;
+	CString			s;
+	
+	err = CWnd::OnCreate( inCreateStruct );
+	require_noerr( err, exit );
+	
+	GetClientRect( rect );
+	mTree.Create( WS_TABSTOP | WS_VISIBLE | WS_CHILD | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_NOHSCROLL , rect, this, 
+		IDC_EXPLORER_TREE );
+	
+	ServiceHandlerEntry *		e;
+	
+	s.LoadString( IDS_ABOUT );
+	m_about = mTree.InsertItem( s, 0, 0 );
+
+	// Web Site Handler
+	
+	e = new ServiceHandlerEntry;
+	check( e );
+	e->type				= "_http._tcp";
+	e->urlScheme		= "http://";
+	e->ref				= NULL;
+	e->obj				= this;
+	e->needsLogin		= false;
+	mServiceHandlers.Add( e );
+
+	err = DNSServiceBrowse( &e->ref, 0, 0, e->type, NULL, BrowseCallBack, e );
+	require_noerr( err, exit );
+
+	err = WSAAsyncSelect((SOCKET) DNSServiceRefSockFD(e->ref), m_hWnd, WM_PRIVATE_SERVICE_EVENT, FD_READ|FD_CLOSE);
+	require_noerr( err, exit );
+
+	m_serviceRefs.push_back(e->ref);
+
+#if defined( _BROWSE_FOR_HTTPS_ )
+	e = new ServiceHandlerEntry;
+	check( e );
+	e->type				= "_https._tcp";
+	e->urlScheme		= "https://";
+	e->ref				= NULL;
+	e->obj				= this;
+	e->needsLogin		= false;
+	mServiceHandlers.Add( e );
+
+	err = DNSServiceBrowse( &e->ref, 0, 0, e->type, NULL, BrowseCallBack, e );
+	require_noerr( err, exit );
+
+	err = WSAAsyncSelect((SOCKET) DNSServiceRefSockFD(e->ref), m_hWnd, WM_PRIVATE_SERVICE_EVENT, FD_READ|FD_CLOSE);
+	require_noerr( err, exit );
+
+	m_serviceRefs.push_back(e->ref);
+#endif
+	
+	m_imageList.Create( 16, 16, ILC_MASK | ILC_COLOR16, 2, 0);
+
+	bitmap.Attach( ::LoadBitmap( GetNonLocalizedResources(), MAKEINTRESOURCE( IDB_LOGO ) ) );
+	m_imageList.Add( &bitmap, (CBitmap*) NULL );
+	bitmap.Detach();
+
+	mTree.SetImageList(&m_imageList, TVSIL_NORMAL);
+	
+exit:
+
+	if ( module )
+	{
+		FreeLibrary( module );
+		module = NULL;
+	}
+
+	// Cannot talk to the mDNSResponder service. Show the error message and exit (with kNoErr so they can see it).
+	if ( err )
+	{
+		if ( err == kDNSServiceErr_Firewall )
+		{
+			s.LoadString( IDS_FIREWALL );
+		}
+		else
+		{
+			s.LoadString( IDS_MDNSRESPONDER_NOT_AVAILABLE );
+		}
+		
+		mTree.DeleteAllItems();
+		mTree.InsertItem( s, 0, 0, TVI_ROOT, TVI_LAST );
+		
+		err = kNoErr;
+	}
+
+	return( err );
+}
+
+//===========================================================================================================================
+//	OnDestroy
+//===========================================================================================================================
+
+void	ExplorerBarWindow::OnDestroy( void ) 
+{
+	// Stop any resolves that may still be pending (shouldn't be any).
+	
+	StopResolve();
+	
+	// Clean up the extant browses
+	while (m_serviceRefs.size() > 0)
+	{
+		//
+		// take the head of the list
+		//
+		DNSServiceRef ref = m_serviceRefs.front();
+
+		//
+		// Stop will remove it from the list
+		//
+		Stop( ref );
+	}
+
+	// Clean up the service handlers.
+	
+	int		i;
+	int		n;
+	
+	n = (int) mServiceHandlers.GetSize();
+	for( i = 0; i < n; ++i )
+	{
+		delete mServiceHandlers[ i ];
+	}
+	
+	CWnd::OnDestroy();
+}
+
+//===========================================================================================================================
+//	OnSize
+//===========================================================================================================================
+
+void	ExplorerBarWindow::OnSize( UINT inType, int inX, int inY ) 
+{
+	CWnd::OnSize( inType, inX, inY );
+	mTree.MoveWindow( 0, 0, inX, inY );
+}
+
+//===========================================================================================================================
+//	OnDoubleClick
+//===========================================================================================================================
+
+void	ExplorerBarWindow::OnDoubleClick( NMHDR *inNMHDR, LRESULT *outResult )
+{
+	HTREEITEM			item;
+	ServiceInfo *		service;
+	OSStatus			err;
+	
+	DEBUG_UNUSED( inNMHDR );
+	
+	item = mTree.GetSelectedItem();
+	require( item, exit );
+	
+	// Tell Internet Explorer to go to the URL if it's about item
+	
+	if ( item == m_about )
+	{
+		CString url;
+
+		check( mOwner );
+
+		url.LoadString( IDS_ABOUT_URL );
+		mOwner->GoToURL( url );
+	}
+	else
+	{
+		service = reinterpret_cast < ServiceInfo * > ( mTree.GetItemData( item ) );
+		require_quiet( service, exit );
+		
+		err = StartResolve( service );
+		require_noerr( err, exit );
+	}
+
+exit:
+	*outResult = 0;
+}
+
+
+//===========================================================================================================================
+//	OnServiceEvent
+//===========================================================================================================================
+
+LRESULT
+ExplorerBarWindow::OnServiceEvent(WPARAM inWParam, LPARAM inLParam)
+{
+	if (WSAGETSELECTERROR(inLParam) && !(HIWORD(inLParam)))
+    {
+		dlog( kDebugLevelError, "OnServiceEvent: window error\n" );
+    }
+    else
+    {
+		SOCKET sock = (SOCKET) inWParam;
+
+		// iterate thru list
+		ServiceRefList::iterator it;
+
+		for (it = m_serviceRefs.begin(); it != m_serviceRefs.end(); it++)
+		{
+			DNSServiceRef ref = *it;
+
+			check(ref != NULL);
+
+			if ((SOCKET) DNSServiceRefSockFD(ref) == sock)
+			{
+				DNSServiceErrorType err;
+
+				err = DNSServiceProcessResult(ref);
+
+				if (err != 0)
+				{
+					CString s;
+
+					s.LoadString( IDS_MDNSRESPONDER_NOT_AVAILABLE );
+					mTree.DeleteAllItems();
+					mTree.InsertItem( s, 0, 0, TVI_ROOT, TVI_LAST );
+
+					Stop(ref);
+				}
+
+				break;
+			}
+		}
+	}
+
+	return ( 0 );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	BrowseCallBack
+//===========================================================================================================================
+
+void DNSSD_API
+	ExplorerBarWindow::BrowseCallBack(
+		DNSServiceRef 			inRef,
+		DNSServiceFlags 		inFlags,
+		uint32_t 				inInterfaceIndex,
+		DNSServiceErrorType 	inErrorCode,
+		const char *			inName,	
+		const char *			inType,	
+		const char *			inDomain,	
+		void *					inContext )
+{
+	ServiceHandlerEntry *		obj;
+	ServiceInfo *				service;
+	OSStatus					err;
+	
+	DEBUG_UNUSED( inRef );
+	
+	obj		=	NULL;
+	service = NULL;
+	
+	require_noerr( inErrorCode, exit );
+	obj = reinterpret_cast < ServiceHandlerEntry * > ( inContext );
+	check( obj );
+	check( obj->obj );
+	
+	//
+	// set the UI to hold off on updates
+	//
+	obj->obj->mTree.SetRedraw(FALSE);
+
+	try
+	{
+		service = new ServiceInfo;
+		require_action( service, exit, err = kNoMemoryErr );
+		
+		err = UTF8StringToStringObject( inName, service->displayName );
+		check_noerr( err );
+
+		service->name = _strdup( inName );
+		require_action( service->name, exit, err = kNoMemoryErr );
+		
+		service->type = _strdup( inType );
+		require_action( service->type, exit, err = kNoMemoryErr );
+		
+		service->domain = _strdup( inDomain );
+		require_action( service->domain, exit, err = kNoMemoryErr );
+		
+		service->ifi 		= inInterfaceIndex;
+		service->handler	= obj;
+
+		service->refs		= 1;
+		
+		if (inFlags & kDNSServiceFlagsAdd) obj->obj->OnServiceAdd   (service);
+		else                               obj->obj->OnServiceRemove(service);
+	
+		service = NULL;
+	}
+	catch( ... )
+	{
+		dlog( kDebugLevelError, "BrowseCallBack: exception thrown\n" );
+	}
+	
+exit:
+	//
+	// If no more coming, then update UI
+	//
+	if (obj && obj->obj && ((inFlags & kDNSServiceFlagsMoreComing) == 0))
+	{
+		obj->obj->mTree.SetRedraw(TRUE);
+		obj->obj->mTree.Invalidate();
+	}
+
+	if( service )
+	{
+		delete service;
+	}
+}
+
+//===========================================================================================================================
+//	OnServiceAdd
+//===========================================================================================================================
+
+LONG	ExplorerBarWindow::OnServiceAdd( ServiceInfo * service )
+{
+	ServiceHandlerEntry *		handler;
+	int							cmp;
+	int							index;
+	
+	
+	check( service );
+	handler = service->handler; 
+	check( handler );
+	
+	cmp = FindServiceArrayIndex( handler->array, *service, index );
+	if( cmp == 0 )
+	{
+		// Found a match so update the item. The index is index + 1 so subtract 1.
+		
+		index -= 1;
+		check( index < handler->array.GetSize() );
+
+		handler->array[ index ]->refs++;
+
+		delete service;
+	}
+	else
+	{
+		HTREEITEM		afterItem;
+		
+		// Insert the new item in sorted order.
+		
+		afterItem = ( index > 0 ) ? handler->array[ index - 1 ]->item : m_about;
+		handler->array.InsertAt( index, service );
+		service->item = mTree.InsertItem( service->displayName, 0, 0, NULL, afterItem );
+		mTree.SetItemData( service->item, (DWORD_PTR) service );
+	}
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnServiceRemove
+//===========================================================================================================================
+
+LONG	ExplorerBarWindow::OnServiceRemove( ServiceInfo * service )
+{
+	ServiceHandlerEntry *		handler;
+	int							cmp;
+	int							index;
+	
+	
+	check( service );
+	handler = service->handler; 
+	check( handler );
+	
+	// Search to see if we know about this service instance. If so, remove it from the list.
+	
+	cmp = FindServiceArrayIndex( handler->array, *service, index );
+	check( cmp == 0 );
+
+	if( cmp == 0 )
+	{
+		// Possibly found a match remove the item. The index
+		// is index + 1 so subtract 1.
+		index -= 1;
+		check( index < handler->array.GetSize() );
+
+		if ( --handler->array[ index ]->refs == 0 )
+		{
+			mTree.DeleteItem( handler->array[ index ]->item );
+			delete handler->array[ index ];
+			handler->array.RemoveAt( index );
+		}
+	}
+
+	delete service;
+	return( 0 );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	StartResolve
+//===========================================================================================================================
+
+OSStatus	ExplorerBarWindow::StartResolve( ServiceInfo *inService )
+{
+	OSStatus		err;
+	
+	check( inService );
+	
+	// Stop any current resolve that may be in progress.
+	
+	StopResolve();
+	
+	// Resolve the service.
+	err = DNSServiceResolve( &mResolveServiceRef, 0, 0, 
+		inService->name, inService->type, inService->domain, (DNSServiceResolveReply) ResolveCallBack, inService->handler );
+	require_noerr( err, exit );
+
+	err = WSAAsyncSelect((SOCKET) DNSServiceRefSockFD(mResolveServiceRef), m_hWnd, WM_PRIVATE_SERVICE_EVENT, FD_READ|FD_CLOSE);
+	require_noerr( err, exit );
+	
+	m_serviceRefs.push_back(mResolveServiceRef);
+
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	StopResolve
+//===========================================================================================================================
+
+void	ExplorerBarWindow::StopResolve( void )
+{
+	if( mResolveServiceRef )
+	{
+		Stop( mResolveServiceRef );
+		mResolveServiceRef = NULL;
+	}
+}
+
+//===========================================================================================================================
+//	ResolveCallBack
+//===========================================================================================================================
+
+void DNSSD_API
+	ExplorerBarWindow::ResolveCallBack(
+		DNSServiceRef			inRef,
+		DNSServiceFlags			inFlags,
+		uint32_t				inInterfaceIndex,
+		DNSServiceErrorType		inErrorCode,
+		const char *			inFullName,	
+		const char *			inHostName, 
+		uint16_t 				inPort,
+		uint16_t 				inTXTSize,
+		const char *			inTXT,
+		void *					inContext )
+{
+	ExplorerBarWindow *			obj;
+	ServiceHandlerEntry *		handler;
+	OSStatus					err;
+	
+	DEBUG_UNUSED( inRef );
+	DEBUG_UNUSED( inFlags );
+	DEBUG_UNUSED( inErrorCode );
+	DEBUG_UNUSED( inFullName );
+	
+	require_noerr( inErrorCode, exit );
+	handler = (ServiceHandlerEntry *) inContext;
+	check( handler );
+	obj = handler->obj;
+	check( obj );
+	
+	try
+	{
+		ResolveInfo *		resolve;
+		int					idx;
+		
+		dlog( kDebugLevelNotice, "resolved %s on ifi %d to %s\n", inFullName, inInterfaceIndex, inHostName );
+		
+		// Stop resolving after the first good result.
+		
+		obj->StopResolve();
+		
+		// Post a message to the main thread so it can handle it since MFC is not thread safe.
+		
+		resolve = new ResolveInfo;
+		require_action( resolve, exit, err = kNoMemoryErr );
+		
+		UTF8StringToStringObject( inHostName, resolve->host );
+
+		// rdar://problem/3841564
+		// 
+		// strip trailing dot from hostname because some flavors of Windows
+		// have trouble parsing it.
+
+		idx = resolve->host.ReverseFind('.');
+
+		if ((idx > 1) && ((resolve->host.GetLength() - 1) == idx))
+		{
+			resolve->host.Delete(idx, 1);
+		}
+
+		resolve->port		= ntohs( inPort );
+		resolve->ifi		= inInterfaceIndex;
+		resolve->handler	= handler;
+		
+		err = resolve->txt.SetData( inTXT, inTXTSize );
+		check_noerr( err );
+		
+		obj->OnResolve(resolve);
+	}
+	catch( ... )
+	{
+		dlog( kDebugLevelError, "ResolveCallBack: exception thrown\n" );
+	}
+
+exit:
+	return;
+}
+
+//===========================================================================================================================
+//	OnResolve
+//===========================================================================================================================
+
+LONG	ExplorerBarWindow::OnResolve( ResolveInfo * resolve )
+{
+	CString				url;
+	uint8_t *			path;
+	uint8_t				pathSize;
+	char *				pathPrefix;
+	CString				username;
+	CString				password;
+	
+	
+	check( resolve );
+		
+	// Get login info if needed.
+	
+	if( resolve->handler->needsLogin )
+	{
+		LoginDialog		dialog;
+		
+		if( !dialog.GetLogin( username, password ) )
+		{
+			goto exit;
+		}
+	}
+	
+	// If the HTTP TXT record is a "path=" entry, use it as the resource path. Otherwise, use "/".
+	
+	pathPrefix = "";
+	if( strcmp( resolve->handler->type, "_http._tcp" ) == 0 )
+	{
+		uint8_t	*	txtData;
+		uint16_t	txtLen;	
+
+		resolve->txt.GetData( &txtData, &txtLen );
+
+		path	 = (uint8_t*) TXTRecordGetValuePtr(txtLen, txtData, kTXTRecordKeyPath, &pathSize);
+
+		if (path == NULL)
+		{
+			path = (uint8_t*) "";
+			pathSize = 1;
+		}
+	}
+	else
+	{
+		path		= (uint8_t *) "";
+		pathSize	= 1;
+	}
+
+	// Build the URL in the following format:
+	//
+	// <urlScheme>[<username>[:<password>]@]<name/ip>[<path>]
+
+	url.AppendFormat( TEXT( "%S" ), resolve->handler->urlScheme );					// URL Scheme
+	if( username.GetLength() > 0 )
+	{
+		url.AppendFormat( TEXT( "%s" ), username );									// Username
+		if( password.GetLength() > 0 )
+		{
+			url.AppendFormat( TEXT( ":%s" ), password );							// Password
+		}
+		url.AppendFormat( TEXT( "@" ) );
+	}
+	
+	url += resolve->host;															// Host
+	url.AppendFormat( TEXT( ":%d" ), resolve->port );								// :Port
+	url.AppendFormat( TEXT( "%S" ), pathPrefix );									// Path Prefix ("/" or empty).
+	url.AppendFormat( TEXT( "%.*S" ), (int) pathSize, (char *) path );				// Path (possibly empty).
+	
+	// Tell Internet Explorer to go to the URL.
+	
+	check( mOwner );
+	mOwner->GoToURL( url );
+
+exit:
+	delete resolve;
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	Stop
+//===========================================================================================================================
+void ExplorerBarWindow::Stop( DNSServiceRef ref )
+{
+	m_serviceRefs.remove( ref );
+
+	WSAAsyncSelect(DNSServiceRefSockFD( ref ), m_hWnd, WM_PRIVATE_SERVICE_EVENT, 0);
+
+	DNSServiceRefDeallocate( ref );
+}
+
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	FindServiceArrayIndex
+//===========================================================================================================================
+
+DEBUG_LOCAL int	FindServiceArrayIndex( const ServiceInfoArray &inArray, const ServiceInfo &inService, int &outIndex )
+{
+	int		result;
+	int		lo;
+	int		hi;
+	int		mid;
+	
+	result 	= -1;
+	mid		= 0;
+	lo 		= 0;
+	hi 		= (int)( inArray.GetSize() - 1 );
+	while( lo <= hi )
+	{
+		mid = ( lo + hi ) / 2;
+		result = inService.displayName.CompareNoCase( inArray[ mid ]->displayName );
+#if 0
+		if( result == 0 )
+		{
+			result = ( (int) inService.ifi ) - ( (int) inArray[ mid ]->ifi );
+		}
+#endif
+		if( result == 0 )
+		{
+			break;
+		}
+		else if( result < 0 )
+		{
+			hi = mid - 1;
+		}
+		else
+		{
+			lo = mid + 1;
+		}
+	}
+	if( result == 0 )
+	{
+		mid += 1;	// Bump index so new item is inserted after matching item.
+	}
+	else if( result > 0 )
+	{
+		mid += 1;
+	}
+	outIndex = mid;
+	return( result );
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.h b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.h
new file mode 100644
index 00000000..e8163181
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerBarWindow.h
@@ -0,0 +1,264 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __EXPLORER_BAR_WINDOW__
+#define __EXPLORER_BAR_WINDOW__
+
+#pragma once
+
+#include    "afxtempl.h"
+
+#include    "dns_sd.h"
+#include    <list>
+
+//===========================================================================================================================
+//	Structures
+//===========================================================================================================================
+
+// Forward Declarations
+
+struct  ServiceHandlerEntry;
+class ExplorerBarWindow;
+
+// ServiceInfo
+
+struct  ServiceInfo
+{
+    CString displayName;
+    char *                      name;
+    char *                      type;
+    char *                      domain;
+    uint32_t ifi;
+    HTREEITEM item;
+    ServiceHandlerEntry *       handler;
+    DWORD refs;
+
+    ServiceInfo( void )
+    {
+        item    = NULL;
+        type    = NULL;
+        domain  = NULL;
+        handler = NULL;
+    }
+
+    ~ServiceInfo( void )
+    {
+        if( name )
+        {
+            free( name );
+        }
+        if( type )
+        {
+            free( type );
+        }
+        if( domain )
+        {
+            free( domain );
+        }
+    }
+};
+
+typedef CArray < ServiceInfo *, ServiceInfo * >     ServiceInfoArray;
+
+// TextRecord
+
+struct  TextRecord
+{
+    uint8_t *       mData;
+    uint16_t mSize;
+
+    TextRecord( void )
+    {
+        mData = NULL;
+        mSize = 0;
+    }
+
+    ~TextRecord( void )
+    {
+        if( mData )
+        {
+            free( mData );
+        }
+    }
+
+    void    GetData( void *outData, uint16_t *outSize )
+    {
+        if( outData )
+        {
+            *( (void **) outData ) = mData;
+        }
+        if( outSize )
+        {
+            *outSize = mSize;
+        }
+    }
+
+    OSStatus    SetData( const void *inData, uint16_t inSize )
+    {
+        OSStatus err;
+        uint8_t *       newData;
+
+        newData = (uint8_t *) malloc( inSize );
+        require_action( newData, exit, err = kNoMemoryErr );
+        memcpy( newData, inData, inSize );
+
+        if( mData )
+        {
+            free( mData );
+        }
+        mData = newData;
+        mSize = inSize;
+        err  = kNoErr;
+
+exit:
+        return( err );
+    }
+};
+
+// ResolveInfo
+
+struct  ResolveInfo
+{
+    CString host;
+    uint16_t port;
+    uint32_t ifi;
+    TextRecord txt;
+    ServiceHandlerEntry *       handler;
+};
+
+// ServiceHandlerEntry
+
+struct  ServiceHandlerEntry
+{
+    const char *            type;
+    const char *            urlScheme;
+    DNSServiceRef ref;
+    ServiceInfoArray array;
+    ExplorerBarWindow *     obj;
+    bool needsLogin;
+
+    ServiceHandlerEntry( void )
+    {
+        type        = NULL;
+        urlScheme   = NULL;
+        ref         = NULL;
+        obj         = NULL;
+        needsLogin  = false;
+    }
+
+    ~ServiceHandlerEntry( void )
+    {
+        int i;
+        int n;
+
+        n = (int) array.GetSize();
+        for( i = 0; i < n; ++i )
+        {
+            delete array[ i ];
+        }
+    }
+};
+
+typedef CArray < ServiceHandlerEntry *, ServiceHandlerEntry * >     ServiceHandlerArray;
+
+//===========================================================================================================================
+//	ExplorerBarWindow
+//===========================================================================================================================
+
+class ExplorerBar;      // Forward Declaration
+
+class ExplorerBarWindow : public CWnd
+{
+protected:
+
+ExplorerBar *           mOwner;
+CTreeCtrl mTree;
+
+ServiceHandlerArray mServiceHandlers;
+DNSServiceRef mResolveServiceRef;
+
+public:
+
+ExplorerBarWindow( void );
+virtual ~ExplorerBarWindow( void );
+
+protected:
+
+// General
+
+afx_msg int     OnCreate( LPCREATESTRUCT inCreateStruct );
+afx_msg void    OnDestroy( void );
+afx_msg void    OnSize( UINT inType, int inX, int inY );
+afx_msg void    OnDoubleClick( NMHDR *inNMHDR, LRESULT *outResult );
+afx_msg LRESULT OnServiceEvent( WPARAM inWParam, LPARAM inLParam );
+
+// Browsing
+
+static void DNSSD_API
+BrowseCallBack(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char *            inName,
+    const char *            inType,
+    const char *            inDomain,
+    void *                  inContext );
+LONG OnServiceAdd( ServiceInfo * service );
+LONG OnServiceRemove( ServiceInfo * service );
+
+// Resolving
+
+OSStatus    StartResolve( ServiceInfo *inService );
+void        StopResolve( void );
+
+
+void        Stop( DNSServiceRef ref );
+
+
+static void DNSSD_API
+ResolveCallBack(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char *            inFullName,
+    const char *            inHostName,
+    uint16_t inPort,
+    uint16_t inTXTSize,
+    const char *            inTXT,
+    void *                  inContext );
+LONG OnResolve( ResolveInfo * resolve );
+
+// Accessors
+
+public:
+
+ExplorerBar *   GetOwner( void ) const { return( mOwner ); }
+void            SetOwner( ExplorerBar *inOwner )    { mOwner = inOwner; }
+
+DECLARE_MESSAGE_MAP()
+private:
+
+typedef std::list< DNSServiceRef >  ServiceRefList;
+
+HTREEITEM m_about;
+ServiceRefList m_serviceRefs;
+CImageList m_imageList;
+};
+
+#endif  // __EXPLORER_BAR_WINDOW__
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.cpp b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.cpp
new file mode 100644
index 00000000..fb1b7c24
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.cpp
@@ -0,0 +1,600 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"StdAfx.h"
+
+// The following 2 includes have to be in this order and INITGUID must be defined here, before including the file
+// that specifies the GUID(s), and nowhere else. The reason for this is that initguid.h doesn't provide separate 
+// define and declare macros for GUIDs so you have to #define INITGUID in the single file where you want to define 
+// your GUID then in all the other files that just need the GUID declared, INITGUID must not be defined.
+
+#define	INITGUID
+#include	<initguid.h>
+#include	"ExplorerPlugin.h"
+
+#include	<comcat.h>
+#include	<Shlwapi.h>
+
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+
+#include	"ClassFactory.h"
+#include	"Resource.h"
+
+#include	"loclibrary.h"
+
+// MFC Debugging
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+// Utilities
+
+DEBUG_LOCAL OSStatus	RegisterServer( HINSTANCE inInstance, CLSID inCLSID, LPCTSTR inName );
+DEBUG_LOCAL OSStatus	RegisterCOMCategory( CLSID inCLSID, CATID inCategoryID, BOOL inRegister );
+DEBUG_LOCAL OSStatus	UnregisterServer( CLSID inCLSID );
+DEBUG_LOCAL OSStatus	MyRegDeleteKey( HKEY hKeyRoot, LPTSTR lpSubKey );
+
+// Stash away pointers to our resource DLLs
+
+static HINSTANCE g_nonLocalizedResources	= NULL;
+static CString	 g_nonLocalizedResourcesName;
+static HINSTANCE g_localizedResources		= NULL;
+
+HINSTANCE
+GetNonLocalizedResources()
+{
+	return g_nonLocalizedResources;
+}
+
+HINSTANCE
+GetLocalizedResources()
+{
+	return g_localizedResources;
+}
+
+// This is the class GUID for an undocumented hook into IE that will allow us to register
+// and have IE notice our new ExplorerBar without rebooting.
+// {8C7461EF-2B13-11d2-BE35-3078302C2030}
+
+DEFINE_GUID(CLSID_CompCatCacheDaemon, 
+0x8C7461EF, 0x2b13, 0x11d2, 0xbe, 0x35, 0x30, 0x78, 0x30, 0x2c, 0x20, 0x30);
+
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+HINSTANCE			gInstance		= NULL;
+int					gDLLRefCount	= 0;
+CExplorerPluginApp	gApp;
+
+#if 0
+#pragma mark -
+#pragma mark == DLL Exports ==
+#endif
+
+//===========================================================================================================================
+//	CExplorerPluginApp::CExplorerPluginApp
+//===========================================================================================================================
+
+IMPLEMENT_DYNAMIC(CExplorerPluginApp, CWinApp);
+
+CExplorerPluginApp::CExplorerPluginApp()
+{
+}
+
+
+//===========================================================================================================================
+//	CExplorerPluginApp::~CExplorerPluginApp
+//===========================================================================================================================
+
+CExplorerPluginApp::~CExplorerPluginApp()
+{
+}
+
+
+//===========================================================================================================================
+//	CExplorerPluginApp::InitInstance
+//===========================================================================================================================
+
+BOOL
+CExplorerPluginApp::InitInstance()
+{
+	wchar_t					resource[MAX_PATH];
+	OSStatus				err;
+	int						res;
+	HINSTANCE inInstance;
+
+	inInstance = AfxGetInstanceHandle();
+	gInstance = inInstance;
+
+	debug_initialize( kDebugOutputTypeWindowsEventLog, "DNSServices Bar", inInstance );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelTrace );
+	dlog( kDebugLevelTrace, "\nCCPApp::InitInstance\n" );
+
+	res = PathForResource( inInstance, L"ExplorerPluginResources.dll", resource, MAX_PATH );
+
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_nonLocalizedResources = LoadLibrary( resource );
+	translate_errno( g_nonLocalizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	g_nonLocalizedResourcesName = resource;
+
+	res = PathForResource( inInstance, L"ExplorerPluginLocalized.dll", resource, MAX_PATH );
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_localizedResources = LoadLibrary( resource );
+	translate_errno( g_localizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	AfxSetResourceHandle( g_localizedResources );
+
+exit:
+
+	return TRUE;
+}
+
+
+//===========================================================================================================================
+//	CExplorerPluginApp::ExitInstance
+//===========================================================================================================================
+
+int
+CExplorerPluginApp::ExitInstance()
+{
+	return 0;
+}
+
+
+
+//===========================================================================================================================
+//	DllCanUnloadNow
+//===========================================================================================================================
+
+STDAPI	DllCanUnloadNow( void )
+{
+	dlog( kDebugLevelTrace, "DllCanUnloadNow (refCount=%d)\n", gDLLRefCount );
+	
+	return( gDLLRefCount == 0 );
+}
+
+//===========================================================================================================================
+//	DllGetClassObject
+//===========================================================================================================================
+
+STDAPI	DllGetClassObject( REFCLSID inCLSID, REFIID inIID, LPVOID *outResult )
+{
+	HRESULT				err;
+	BOOL				ok;
+	ClassFactory *		factory;
+	
+	dlog( kDebugLevelTrace, "DllGetClassObject\n" );
+	
+	*outResult = NULL;
+	
+	// Check if the class ID is supported.
+	
+	ok = IsEqualCLSID( inCLSID, CLSID_ExplorerBar );
+	require_action_quiet( ok, exit, err = CLASS_E_CLASSNOTAVAILABLE );
+	
+	// Create the ClassFactory object.
+	
+	factory = NULL;
+	try
+	{
+		factory = new ClassFactory( inCLSID );
+	}
+	catch( ... )
+	{
+		// Do not let exception escape.
+	}
+	require_action( factory, exit, err = E_OUTOFMEMORY );
+	
+	// Query for the specified interface. Release the factory since QueryInterface retains it.
+	
+	err = factory->QueryInterface( inIID, outResult );
+	factory->Release();
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	DllRegisterServer
+//===========================================================================================================================
+
+STDAPI	DllRegisterServer( void )
+{
+	IRunnableTask * pTask = NULL;
+	HRESULT			err;
+	BOOL			ok;
+	CString			s;
+	
+	dlog( kDebugLevelTrace, "DllRegisterServer\n" );
+	
+	ok = s.LoadString( IDS_NAME );
+	require_action( ok, exit, err = E_UNEXPECTED );
+	
+	err = RegisterServer( gInstance, CLSID_ExplorerBar, s );
+	require_noerr( err, exit );
+	
+	err = RegisterCOMCategory( CLSID_ExplorerBar, CATID_InfoBand, TRUE );
+	require_noerr( err, exit );
+
+	// <rdar://problem/4130635> Clear IE cache so it will rebuild the cache when it runs next.  This
+	// will allow us to install and not reboot
+
+	err = CoCreateInstance(CLSID_CompCatCacheDaemon, NULL, CLSCTX_INPROC, IID_IRunnableTask, (void**) &pTask);
+	require_noerr( err, exit );
+
+	pTask->Run();
+	pTask->Release();
+
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	DllUnregisterServer
+//===========================================================================================================================
+
+STDAPI	DllUnregisterServer( void )
+{
+	HRESULT		err;
+	
+	dlog( kDebugLevelTrace, "DllUnregisterServer\n" );
+	
+	err = RegisterCOMCategory( CLSID_ExplorerBar, CATID_InfoBand, FALSE );
+	require_noerr( err, exit );
+
+	err = UnregisterServer( CLSID_ExplorerBar );
+	require_noerr( err, exit );
+	
+exit:
+	return( err );
+}
+
+
+#if 0
+#pragma mark -
+#pragma mark == Utilities ==
+#endif
+
+//===========================================================================================================================
+//	RegisterServer
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	RegisterServer( HINSTANCE inInstance, CLSID inCLSID, LPCTSTR inName )
+{
+	typedef struct	RegistryBuilder		RegistryBuilder;
+	struct	RegistryBuilder
+	{
+		HKEY		rootKey;
+		LPCTSTR		subKey;
+		LPCTSTR		valueName;
+		LPCTSTR		data;
+	};
+	
+	OSStatus			err;
+	LPWSTR				clsidWideString;
+	TCHAR				clsidString[ 64 ];
+	DWORD				nChars;
+	size_t				n;
+	size_t				i;
+	HKEY				key;
+	TCHAR				keyName[ MAX_PATH ];
+	TCHAR				moduleName[ MAX_PATH ] = TEXT( "" );
+	TCHAR				data[ MAX_PATH ];
+	RegistryBuilder		entries[] = 
+	{
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),					NULL,						inName },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\InprocServer32" ),	NULL,						moduleName },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\InprocServer32" ),  	TEXT( "ThreadingModel" ),	TEXT( "Apartment" ) }
+	};
+	DWORD				size;
+	OSVERSIONINFO		versionInfo;
+	
+	// Convert the CLSID to a string based on the encoding of this code (ANSI or Unicode).
+	
+	err = StringFromIID( inCLSID, &clsidWideString );
+	require_noerr( err, exit );
+	require_action( clsidWideString, exit, err = kNoMemoryErr );
+	
+	#ifdef UNICODE
+		lstrcpyn( clsidString, clsidWideString, sizeof_array( clsidString ) );
+		CoTaskMemFree( clsidWideString );
+	#else
+		nChars = WideCharToMultiByte( CP_ACP, 0, clsidWideString, -1, clsidString, sizeof_array( clsidString ), NULL, NULL );
+		err = translate_errno( nChars > 0, (OSStatus) GetLastError(), kUnknownErr );
+		CoTaskMemFree( clsidWideString );
+		require_noerr( err, exit );
+	#endif
+	
+	// Register the CLSID entries.
+	
+	nChars = GetModuleFileName( inInstance, moduleName, sizeof_array( moduleName ) );
+	err = translate_errno( nChars > 0, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	n = sizeof_array( entries );
+	for( i = 0; i < n; ++i )
+	{
+		wsprintf( keyName, entries[ i ].subKey, clsidString );		
+		err = RegCreateKeyEx( entries[ i ].rootKey, keyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL );
+		require_noerr( err, exit );
+		
+		size = (DWORD)( ( lstrlen( entries[ i ].data ) + 1 ) * sizeof( TCHAR ) );
+		err = RegSetValueEx( key, entries[ i ].valueName, 0, REG_SZ, (LPBYTE) entries[ i ].data, size );
+		RegCloseKey( key );
+		require_noerr( err, exit );
+	}
+	
+	// If running on NT, register the extension as approved.
+	
+	versionInfo.dwOSVersionInfoSize = sizeof( versionInfo );
+	GetVersionEx( &versionInfo );
+	if( versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
+	{
+		lstrcpyn( keyName, TEXT( "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved" ), sizeof_array( keyName ) );
+		err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, keyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL );
+		require_noerr( err, exit );
+		
+		lstrcpyn( data, inName, sizeof_array( data ) );
+		size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+		err = RegSetValueEx( key, clsidString, 0, REG_SZ, (LPBYTE) data, size );
+		RegCloseKey( key );
+	}
+
+	// register toolbar button
+	lstrcpyn( keyName, TEXT( "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\{7F9DB11C-E358-4ca6-A83D-ACC663939424}"), sizeof_array( keyName ) );
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, keyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	lstrcpyn( data, L"Yes", sizeof_array( data ) );
+	size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+	RegSetValueEx( key, L"Default Visible", 0, REG_SZ, (LPBYTE) data, size );
+
+	lstrcpyn( data, inName, sizeof_array( data ) );
+	size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+	RegSetValueEx( key, L"ButtonText", 0, REG_SZ, (LPBYTE) data, size );
+	
+	lstrcpyn( data, L"{E0DD6CAB-2D10-11D2-8F1A-0000F87ABD16}", sizeof_array( data ) );
+	size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+	RegSetValueEx( key, L"CLSID", 0, REG_SZ, (LPBYTE) data, size );
+
+	lstrcpyn( data, clsidString, sizeof_array( data ) );
+	size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+	RegSetValueEx( key, L"BandCLSID", 0, REG_SZ, (LPBYTE) data, size );
+
+	// check if we're running XP or later
+	if ( ( versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) &&
+		 ( versionInfo.dwMajorVersion == 5 ) &&
+	     ( versionInfo.dwMinorVersion >= 1 ) )
+	{
+		wsprintf( data, L"%s,%d", (LPCTSTR) g_nonLocalizedResourcesName, IDI_BUTTON_XP );
+		size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+		RegSetValueEx( key, L"Icon", 0, REG_SZ, (LPBYTE) data, size);
+
+		wsprintf( data, L"%s,%d", (LPCTSTR) g_nonLocalizedResourcesName, IDI_BUTTON_XP );
+		size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+		RegSetValueEx( key, L"HotIcon", 0, REG_SZ, (LPBYTE) data, size);
+	}
+	else
+	{
+		wsprintf( data, L"%s,%d", (LPCTSTR) g_nonLocalizedResourcesName, IDI_BUTTON_2K );
+		size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+		RegSetValueEx( key, L"Icon", 0, REG_SZ, (LPBYTE) data, size);
+
+		wsprintf( data, L"%s,%d", (LPCTSTR) g_nonLocalizedResourcesName, IDI_BUTTON_2K );
+		size = (DWORD)( ( lstrlen( data ) + 1 ) * sizeof( TCHAR ) );
+		RegSetValueEx( key, L"HotIcon", 0, REG_SZ, (LPBYTE) data, size);
+	}
+
+	RegCloseKey( key );
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	RegisterCOMCategory
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	RegisterCOMCategory( CLSID inCLSID, CATID inCategoryID, BOOL inRegister )
+{
+	HRESULT				err;
+	ICatRegister *		cat;
+
+	err = CoInitialize( NULL );
+	require( SUCCEEDED( err ), exit );
+	
+	err = CoCreateInstance( CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (LPVOID *) &cat );
+	check( SUCCEEDED( err ) );
+	if( SUCCEEDED( err ) )
+	{
+		if( inRegister )
+		{
+			err = cat->RegisterClassImplCategories( inCLSID, 1, &inCategoryID );
+			check_noerr( err );
+		}
+		else
+		{
+			err = cat->UnRegisterClassImplCategories( inCLSID, 1, &inCategoryID );
+			check_noerr( err );
+		}
+		cat->Release();
+	}
+	CoUninitialize();
+
+exit:
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	UnregisterServer
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	UnregisterServer( CLSID inCLSID )
+{
+	OSStatus			err = 0;
+	LPWSTR				clsidWideString;
+	TCHAR				clsidString[ 64 ];
+	HKEY				key;
+	TCHAR				keyName[ MAX_PATH * 2 ];
+	OSVERSIONINFO		versionInfo;
+
+	// Convert the CLSID to a string based on the encoding of this code (ANSI or Unicode).
+	
+	err = StringFromIID( inCLSID, &clsidWideString );
+	require_noerr( err, exit );
+	require_action( clsidWideString, exit, err = kNoMemoryErr );
+	
+	#ifdef UNICODE
+		lstrcpyn( clsidString, clsidWideString, sizeof_array( clsidString ) );
+		CoTaskMemFree( clsidWideString );
+	#else
+		nChars = WideCharToMultiByte( CP_ACP, 0, clsidWideString, -1, clsidString, sizeof_array( clsidString ), NULL, NULL );
+		err = translate_errno( nChars > 0, (OSStatus) GetLastError(), kUnknownErr );
+		CoTaskMemFree( clsidWideString );
+		require_noerr( err, exit );
+	#endif
+
+	wsprintf( keyName, L"CLSID\\%s", clsidString );
+	MyRegDeleteKey( HKEY_CLASSES_ROOT, keyName );
+	
+	// If running on NT, de-register the extension as approved.
+	
+	versionInfo.dwOSVersionInfoSize = sizeof( versionInfo );
+	GetVersionEx( &versionInfo );
+	if( versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
+	{
+		lstrcpyn( keyName, TEXT( "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved" ), sizeof_array( keyName ) );
+		err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, keyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL );
+		require_noerr( err, exit );
+
+		RegDeleteValue( key, clsidString );
+
+		err = RegCloseKey( key );
+		require_noerr( err, exit );
+	}
+
+	// de-register toolbar button
+
+	lstrcpyn( keyName, TEXT( "SOFTWARE\\Microsoft\\Internet Explorer\\Extensions\\{7F9DB11C-E358-4ca6-A83D-ACC663939424}"), sizeof_array( keyName ) );
+	MyRegDeleteKey( HKEY_LOCAL_MACHINE, keyName );
+	
+exit:
+	return( err );
+}
+
+
+
+//===========================================================================================================================
+//	MyRegDeleteKey
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus MyRegDeleteKey( HKEY hKeyRoot, LPTSTR lpSubKey )
+{
+    LPTSTR lpEnd;
+    OSStatus err;
+    DWORD dwSize;
+    TCHAR szName[MAX_PATH];
+    HKEY hKey;
+    FILETIME ftWrite;
+
+    // First, see if we can delete the key without having to recurse.
+
+    err = RegDeleteKey( hKeyRoot, lpSubKey );
+
+    if ( !err )
+	{
+		goto exit;
+	}
+
+    err = RegOpenKeyEx( hKeyRoot, lpSubKey, 0, KEY_READ, &hKey );
+	require_noerr( err, exit );
+
+    // Check for an ending slash and add one if it is missing.
+
+    lpEnd = lpSubKey + lstrlen(lpSubKey);
+
+    if ( *( lpEnd - 1 ) != TEXT( '\\' ) ) 
+    {
+        *lpEnd =  TEXT('\\');
+        lpEnd++;
+        *lpEnd =  TEXT('\0');
+    }
+
+    // Enumerate the keys
+
+    dwSize = MAX_PATH;
+    err = RegEnumKeyEx(hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite);
+
+    if ( !err ) 
+    {
+        do
+		{
+            lstrcpy (lpEnd, szName);
+
+            if ( !MyRegDeleteKey( hKeyRoot, lpSubKey ) )
+			{
+                break;
+            }
+
+            dwSize = MAX_PATH;
+
+            err = RegEnumKeyEx( hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite );
+
+        }
+		while ( !err );
+    }
+
+    lpEnd--;
+    *lpEnd = TEXT('\0');
+
+    RegCloseKey( hKey );
+
+    // Try again to delete the key.
+
+    err = RegDeleteKey(hKeyRoot, lpSubKey);
+	require_noerr( err, exit );
+
+exit:
+
+	return err;
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.def b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.def
new file mode 100644
index 00000000..8b931d10
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.def
@@ -0,0 +1,24 @@
+;
+;
+; Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+LIBRARY		ExplorerPlugin
+
+EXPORTS
+	DllCanUnloadNow		PRIVATE
+	DllGetClassObject	PRIVATE
+	DllRegisterServer	PRIVATE
+	DllUnregisterServer	PRIVATE
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.h b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.h
new file mode 100644
index 00000000..9fa56aea
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+// {9999A076-A9E2-4c99-8A2B-632FC9429223}
+DEFINE_GUID(CLSID_ExplorerBar,
+            0x9999a076, 0xa9e2, 0x4c99, 0x8a, 0x2b, 0x63, 0x2f, 0xc9, 0x42, 0x92, 0x23);
+
+extern HINSTANCE gInstance;
+extern int gDLLRefCount;
+extern HINSTANCE        GetNonLocalizedResources();
+extern HINSTANCE        GetLocalizedResources();
+
+
+class CExplorerPluginApp : public CWinApp
+{
+public:
+
+CExplorerPluginApp();
+virtual ~CExplorerPluginApp();
+
+protected:
+
+virtual BOOL    InitInstance();
+virtual int     ExitInstance();
+
+DECLARE_DYNAMIC(CExplorerPluginApp);
+};
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.rc b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.rc
new file mode 100644
index 00000000..03320d5c
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.rc
@@ -0,0 +1,122 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_dll.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_dll.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Explorer Bar"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ExplorerPlugin.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ExplorerPlugin.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcproj
new file mode 100644
index 00000000..c157cfb2
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcproj
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ExplorerPlugin"

+	ProjectGUID="{BB8AC1B5-6587-4163-BDC6-788B157705CA}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+				CommandLine=""

+				Outputs=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="_USRDLL;WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 /NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib uafxcwd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ExplorerPlugin.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="uafxcwd.lib"

+				ModuleDefinitionFile="./$(ProjectName).def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ExplorerPlugin.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+				CommandLine=""

+				Outputs=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="_USRDLL;WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/IGNORE:4089 /NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib uafxcwd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ExplorerPlugin.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="uafxcwd.lib"

+				ModuleDefinitionFile="./$(ProjectName).def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ExplorerPlugin64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="_USRDLL;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="true"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 /NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib uafxcw.lib"

+				OutputFile="$(OutDir)/$(ProjectName).dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="uafxcw.lib"

+				ModuleDefinitionFile="./$(ProjectName).def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ExplorerPlugin.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="_USRDLL;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="true"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/IGNORE:4089 /NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib uafxcw.lib"

+				OutputFile="$(OutDir)/$(ProjectName).dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames="uafxcw.lib"

+				ModuleDefinitionFile="./$(ProjectName).def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ExplorerPlugin64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Support"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\isocode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\loclibrary.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\loclibrary.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\WinServices.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\WinServices.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

+			<File

+				RelativePath="About.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ClassFactory.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerBar.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerBarWindow.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerPlugin.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerPlugin.def"

+				>

+			</File>

+			<File

+				RelativePath="LoginDialog.cpp"

+				>

+			</File>

+			<File

+				RelativePath="StdAfx.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath=".\About.h"

+				>

+			</File>

+			<File

+				RelativePath="ClassFactory.h"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerBar.h"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerBarWindow.h"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerPlugin.h"

+				>

+			</File>

+			<File

+				RelativePath="LoginDialog.h"

+				>

+			</File>

+			<File

+				RelativePath="Resource.h"

+				>

+			</File>

+			<File

+				RelativePath="resource_dll.h"

+				>

+			</File>

+			<File

+				RelativePath="StdAfx.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="ExplorerPlugin.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="ExplorerPlugin.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj
new file mode 100755
index 00000000..810c90e1
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{BB8AC1B5-6587-4163-BDC6-788B157705CA}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <CustomBuildStep>

+      <Message>

+      </Message>

+      <Command>

+      </Command>

+      <Outputs>%(Outputs)</Outputs>

+    </CustomBuildStep>

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_USRDLL;WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;uafxcwd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPlugin.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>./$(ProjectName).def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ExplorerPlugin.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <CustomBuildStep>

+      <Message>

+      </Message>

+      <Command>

+      </Command>

+      <Outputs>%(Outputs)</Outputs>

+    </CustomBuildStep>

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_USRDLL;WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/IGNORE:4089 /NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;uafxcwd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPlugin.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>uafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>./$(ProjectName).def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ExplorerPlugin64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <CustomBuildStep>

+      <Message>

+      </Message>

+    </CustomBuildStep>

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_USRDLL;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;uafxcw.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>uafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>./$(ProjectName).def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ExplorerPlugin.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <CustomBuildStep>

+      <Message>

+      </Message>

+    </CustomBuildStep>

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_USRDLL;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/IGNORE:4089 /NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;uafxcw.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>uafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>./$(ProjectName).def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ExplorerPlugin64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\mDNSWindows\isocode.h" />

+    <ClInclude Include="..\..\mDNSWindows\loclibrary.h" />

+    <ClInclude Include="..\..\mDNSWindows\WinServices.h" />

+    <ClInclude Include="About.h" />

+    <ClInclude Include="ClassFactory.h" />

+    <ClInclude Include="ExplorerBar.h" />

+    <ClInclude Include="ExplorerBarWindow.h" />

+    <ClInclude Include="ExplorerPlugin.h" />

+    <ClInclude Include="LoginDialog.h" />

+    <ClInclude Include="Resource.h" />

+    <ClInclude Include="resource_dll.h" />

+    <ClInclude Include="StdAfx.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="..\..\mDNSWindows\loclibrary.c" />

+    <ClCompile Include="..\..\mDNSWindows\WinServices.cpp" />

+    <ClCompile Include="About.cpp" />

+    <ClCompile Include="ClassFactory.cpp" />

+    <ClCompile Include="ExplorerBar.cpp" />

+    <ClCompile Include="ExplorerBarWindow.cpp" />

+    <ClCompile Include="ExplorerPlugin.cpp" />

+    <ClCompile Include="LoginDialog.cpp" />

+    <ClCompile Include="StdAfx.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="ExplorerPlugin.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPlugin.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLLStub\DLLStub.vcxproj">

+      <Project>{3a2b6325-3053-4236-84bd-aa9be2e323e5}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="ExplorerPlugin.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj.filters b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj.filters
new file mode 100755
index 00000000..f86a9f56
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPlugin.vcxproj.filters
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Support">

+      <UniqueIdentifier>{b3978812-899a-4e8b-9f75-9458141da3b4}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{62896a08-c5fd-4a48-8f8b-33f3fc2f8b1f}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{8aded36a-5c99-4074-8892-31cb394d0eed}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{31823db1-cc70-4c1b-990d-ad0e8f840b66}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\isocode.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\loclibrary.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\WinServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="About.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ClassFactory.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ExplorerBar.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ExplorerBarWindow.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ExplorerPlugin.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="LoginDialog.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource_dll.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="StdAfx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\loclibrary.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\WinServices.cpp">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="About.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ClassFactory.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ExplorerBar.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ExplorerBarWindow.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ExplorerPlugin.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="LoginDialog.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="StdAfx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="ExplorerPlugin.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPlugin.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.rc b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.rc
new file mode 100755
index 00000000..9f4c4f5b
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.rc
@@ -0,0 +1,213 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_loc_res.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_loc_res.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ExplorerPluginLocalized.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ExplorerPluginLocalized.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+IDD_LOGIN DIALOGEX 0, 0, 180, 89

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION

+CAPTION "Login"

+FONT 8, "MS Shell Dlg", 0, 0, 0x0

+BEGIN

+    LTEXT           "Enter a username and password. Leave blank to use the default username and/or password.",

+                    IDC_STATIC,8,8,156,16,NOT WS_GROUP

+    RTEXT           "Username:",IDC_STATIC,10,34,36,8,NOT WS_GROUP

+    EDITTEXT        IDC_LOGIN_USERNAME_TEXT,50,32,118,12,ES_AUTOHSCROLL

+    RTEXT           "Password:",IDC_STATIC,10,50,36,8,NOT WS_GROUP

+    EDITTEXT        IDC_LOGIN_PASSWORD_TEXT,50,48,118,12,ES_PASSWORD | 

+                    ES_AUTOHSCROLL

+    DEFPUSHBUTTON   "OK",IDOK,129,70,44,14

+    PUSHBUTTON      "Cancel",IDCANCEL,77,70,44,14

+END

+

+IDD_ABOUT DIALOGEX 0, 0, 219, 87

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR

+CAPTION "About Bonjour"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_ABOUT_BACKGROUND,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,0,

+                    220,86

+    CONTROL         "Explorer Plugin",IDC_COMPONENT,"Static",

+                    SS_SIMPLE | WS_GROUP,92,10,122,8

+    CONTROL         "",IDC_COMPONENT_VERSION,"Static",

+                    SS_SIMPLE | WS_GROUP,142,10,122,8

+    LTEXT           "Copyright (c) 2004-2007 Apple Inc. All rights reserved. Apple and the Apple logo are trademarks of Apple Inc., registered in the U.S. and other countries.",

+                    IDC_LEGAL,92,31,123,50,0

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+GUIDELINES DESIGNINFO 

+BEGIN

+    IDD_LOGIN, DIALOG

+    BEGIN

+        BOTTOMMARGIN, 62

+    END

+

+    IDD_ABOUT, DIALOG

+    BEGIN

+        BOTTOMMARGIN, 132

+    END

+END

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Menu

+//

+

+IDR_CONTEXT_MENU MENU 

+BEGIN

+    POPUP "ContextMenu"

+    BEGIN

+        MENUITEM "About Bonjour...",         ID_Menu

+        MENUITEM SEPARATOR

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_ABOUT               "About Bonjour"

+    IDS_ABOUT_URL           "http://www.apple.com/macosx/features/bonjour"

+    IDS_NAME                "Bonjour"

+    IDS_WEB_SITES           "Web Sites"

+    IDS_PRINTERS            "Printers"

+    IDS_MDNSRESPONDER_NOT_AVAILABLE "Bonjour Service is not available."

+    IDS_FIREWALL            "Check firewall settings"

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcproj
new file mode 100755
index 00000000..f354cf2a
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcproj
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ExplorerPluginLocRes"

+	ProjectGUID="{1643427B-F226-4AD6-B413-97DA64D5C6B4}"

+	RootNamespace="ExplorerPluginLocRes"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ExplorerPlugin.Resources mkdir $(OutDir)\ExplorerPlugin.Resources&#x0D;&#x0A;if not exist $(OutDir)\ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)\ExplorerPlugin.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\en.lproj\ExplorerPluginLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ExplorerPlugin.Resources mkdir $(OutDir)\ExplorerPlugin.Resources&#x0D;&#x0A;if not exist $(OutDir)\ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)\ExplorerPlugin.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\en.lproj\ExplorerPluginLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ExplorerPlugin.Resources mkdir $(OutDir)\ExplorerPlugin.Resources&#x0D;&#x0A;if not exist $(OutDir)\ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)\ExplorerPlugin.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\en.lproj\ExplorerPluginLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                          &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ExplorerPlugin.Resources mkdir $(OutDir)\ExplorerPlugin.Resources&#x0D;&#x0A;if not exist $(OutDir)\ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)\ExplorerPlugin.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\en.lproj\ExplorerPluginLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                          &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_loc_res.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="ExplorerPluginLocRes.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="ExplorerPluginLocRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj
new file mode 100755
index 00000000..fb96fd3b
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{1643427B-F226-4AD6-B413-97DA64D5C6B4}</ProjectGuid>

+    <RootNamespace>ExplorerPluginLocRes</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">ExplorerPluginLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ExplorerPlugin.Resources mkdir $(OutDir)ExplorerPlugin.Resources

+if not exist $(OutDir)ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)ExplorerPlugin.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ExplorerPlugin.Resources mkdir $(OutDir)ExplorerPlugin.Resources

+if not exist $(OutDir)ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)ExplorerPlugin.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ExplorerPlugin.Resources mkdir $(OutDir)ExplorerPlugin.Resources

+if not exist $(OutDir)ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)ExplorerPlugin.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ExplorerPlugin.Resources mkdir $(OutDir)ExplorerPlugin.Resources

+if not exist $(OutDir)ExplorerPlugin.Resources\en.lproj mkdir $(OutDir)ExplorerPlugin.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">

+    <Link>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">

+    <Link>

+      <OutputFile>$(OutDir)ExplorerPluginLocalized.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_res.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPluginLocRes.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="ExplorerPluginLocRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj.filters b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj.filters
new file mode 100755
index 00000000..c2dd2ad9
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginLocRes.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{fdb2f45e-acf9-4bf2-87a1-fb0df2aca928}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{ee265e77-1d8e-4a0c-8c10-27b123ab1232}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_res.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPluginLocRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.rc b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.rc
new file mode 100755
index 00000000..bf0d64ca
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.rc
@@ -0,0 +1,140 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_res.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_res.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ExplorerPluginResources.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ExplorerPluginResources.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_LOGO                BITMAP                  "res\\logo.bmp"

+IDB_ABOUT               BITMAP                  "res\\about.bmp"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_BUTTON_2K           ICON                    "res\\button-2k.ico"

+IDI_BUTTON_XP           ICON                    "res\\button-xp.ico"

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcproj
new file mode 100755
index 00000000..6b940ac8
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcproj
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ExplorerPluginRes"

+	ProjectGUID="{871B1492-B4A4-4B57-9237-FA798484D7D7}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Debug\ExplorerPlugin.Resources mkdir Debug\ExplorerPlugin.Resources"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\ExplorerPluginResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Debug\ExplorerPlugin.Resources mkdir Debug\ExplorerPlugin.Resources"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\ExplorerPluginResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Release mkdir Release&#x0D;&#x0A;if not exist &quot;Release\ExplorerPlugin.Resources&quot; mkdir &quot;Release\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\ExplorerPluginResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                            &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Release mkdir Release&#x0D;&#x0A;if not exist &quot;Release\ExplorerPlugin.Resources&quot; mkdir &quot;Release\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ExplorerPlugin.Resources\ExplorerPluginResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                            &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ExplorerPlugin.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_res.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath=".\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\button-2k.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\button-xp.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\res\cold.ico"

+				>

+			</File>

+			<File

+				RelativePath="ExplorerPluginRes.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\hot.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\logo.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\logo.bmp"

+				>

+			</File>

+			<File

+				RelativePath="Web.ico"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="ExplorerPluginRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj
new file mode 100755
index 00000000..4fb64902
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{871B1492-B4A4-4B57-9237-FA798484D7D7}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\ExplorerPlugin.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">ExplorerPluginResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Debug\ExplorerPlugin.Resources mkdir Debug\ExplorerPlugin.Resources</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Debug\ExplorerPlugin.Resources mkdir Debug\ExplorerPlugin.Resources</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Release mkdir Release

+if not exist "Release\ExplorerPlugin.Resources" mkdir "Release\ExplorerPlugin.Resources"

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                            "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Release mkdir Release

+if not exist "Release\ExplorerPlugin.Resources" mkdir "Release\ExplorerPlugin.Resources"

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                            "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ExplorerPlugin.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">

+    <Link>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">

+    <Link>

+      <OutputFile>$(OutDir)ExplorerPluginResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_res.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="about.bmp" />

+    <None Include="res\about.bmp" />

+    <None Include="res\button-2k.ico" />

+    <None Include="res\button-xp.ico" />

+    <None Include="res\cold.ico" />

+    <None Include="hot.ico" />

+    <None Include="logo.bmp" />

+    <None Include="res\logo.bmp" />

+    <None Include="Web.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPluginRes.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="ExplorerPluginRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj.filters b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj.filters
new file mode 100755
index 00000000..72a0998f
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ExplorerPluginRes.vcxproj.filters
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{89aee21a-a42b-4f10-87db-f6d3b27eb612}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{27ad7c9e-deb4-4963-8cf0-adf004ed2437}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_res.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\button-2k.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\button-xp.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\cold.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="hot.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="logo.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\logo.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="Web.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ExplorerPluginRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.cpp b/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.cpp
new file mode 100644
index 00000000..a2cc89ef
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.cpp
@@ -0,0 +1,111 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<assert.h>
+#include	<stdlib.h>
+
+#include	"stdafx.h"
+
+#include	"LoginDialog.h"
+
+// MFC Debugging
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP( LoginDialog, CDialog )
+END_MESSAGE_MAP()
+
+//===========================================================================================================================
+//	LoginDialog
+//===========================================================================================================================
+
+LoginDialog::LoginDialog( CWnd *inParent )
+	: CDialog( LoginDialog::IDD, inParent )
+{
+	//
+}
+
+//===========================================================================================================================
+//	OnInitDialog
+//===========================================================================================================================
+
+BOOL	LoginDialog::OnInitDialog( void )
+{
+	CDialog::OnInitDialog();
+	return( TRUE );
+}
+
+//===========================================================================================================================
+//	DoDataExchange
+//===========================================================================================================================
+
+void	LoginDialog::DoDataExchange( CDataExchange *inDX )
+{
+	CDialog::DoDataExchange( inDX );
+}
+
+//===========================================================================================================================
+//	OnOK
+//===========================================================================================================================
+
+void	LoginDialog::OnOK( void )
+{
+	const CWnd *		control;
+		
+	// Username
+	
+	control = GetDlgItem( IDC_LOGIN_USERNAME_TEXT );
+	assert( control );
+	if( control )
+	{
+		control->GetWindowText( mUsername );
+	}
+	
+	// Password
+	
+	control = GetDlgItem( IDC_LOGIN_PASSWORD_TEXT );
+	assert( control );
+	if( control )
+	{
+		control->GetWindowText( mPassword );
+	}
+	
+	CDialog::OnOK();
+}
+
+//===========================================================================================================================
+//	GetLogin
+//===========================================================================================================================
+
+BOOL	LoginDialog::GetLogin( CString &outUsername, CString &outPassword )
+{
+	if( DoModal() == IDOK )
+	{
+		outUsername = mUsername;
+		outPassword = mPassword;
+		return( TRUE );
+	}
+	return( FALSE );
+}
diff --git a/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.h b/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.h
new file mode 100644
index 00000000..3aeb6966
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/LoginDialog.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __LOGIN_DIALOG__
+#define __LOGIN_DIALOG__
+
+#pragma once
+
+#include    "Resource.h"
+
+//===========================================================================================================================
+//	LoginDialog
+//===========================================================================================================================
+
+class LoginDialog : public CDialog
+{
+protected:
+
+CString mUsername;
+CString mPassword;
+
+public:
+
+enum { IDD = IDD_LOGIN };
+
+LoginDialog( CWnd *inParent = NULL );
+
+virtual BOOL    GetLogin( CString &outUsername, CString &outPassword );
+
+protected:
+
+virtual BOOL    OnInitDialog( void );
+virtual void    DoDataExchange( CDataExchange *inDX );
+virtual void    OnOK( void );
+
+DECLARE_MESSAGE_MAP()
+};
+
+#endif  // __LOGIN_DIALOG__
diff --git a/mDNSResponder/Clients/ExplorerPlugin/ReadMe.txt b/mDNSResponder/Clients/ExplorerPlugin/ReadMe.txt
new file mode 100644
index 00000000..2fbe6660
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/ReadMe.txt
@@ -0,0 +1,9 @@
+The DNSServices Explorer Plugin is a vertical Explorer bar. It lets you browse for DNS-SD advertised services directly within Internet Explorer. 
+
+This DLL needs to be registered to work. The Visual Studio project automatically registers the DLL after each successful build. If you need to manually register the DLL for some reason, you can execute the following line from the DOS command line prompt ("<path>" is the actual parent path of the DLL):
+
+regsvr32.exe /s /c <path>\ExplorerPlugin.dll
+
+For more information, see the Band Objects topic in the Microsoft Platform SDK documentation and check the following URL:
+
+<http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_adv/bands.asp>
diff --git a/mDNSResponder/Clients/ExplorerPlugin/Resource.h b/mDNSResponder/Clients/ExplorerPlugin/Resource.h
new file mode 100644
index 00000000..aff47a42
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/Resource.h
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Include the core resources
+
+#include "resource_dll.h"
+
+// Include the non-localizable resources
+
+#include "resource_res.h"
+
+// Include the localizable resources
+
+#include "resource_loc_res.h"
diff --git a/mDNSResponder/Clients/ExplorerPlugin/StdAfx.cpp b/mDNSResponder/Clients/ExplorerPlugin/StdAfx.cpp
new file mode 100644
index 00000000..768fa3f9
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/StdAfx.cpp
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"StdAfx.h"
diff --git a/mDNSResponder/Clients/ExplorerPlugin/StdAfx.h b/mDNSResponder/Clients/ExplorerPlugin/StdAfx.h
new file mode 100644
index 00000000..29608927
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/StdAfx.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __STDAFX__
+#define __STDAFX__
+
+#pragma once
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
+#endif
+
+#if !defined(_WSPIAPI_COUNTOF)
+#   define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#endif
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdtctl.h>       // MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+    #include <afxcmn.h>     // MFC support for Windows Common Controls
+#endif
+
+#include <winsock2.h>
+#include <afxsock.h>        // MFC socket extensions
+
+#endif  // __STDAFX__
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin.manifest b/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin.manifest
new file mode 100644
index 00000000..90a067ee
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+<assemblyIdentity 
+    version="1.0.0.0" 
+    processorArchitecture="X86" 
+    name="Microsoft.Windows.Wiz97_3"
+    type="win32" 
+/> 
+<description>Your app description here</description> 
+<dependency> 
+    <dependentAssembly> 
+        <assemblyIdentity 
+            type="win32" 
+            name="Microsoft.Windows.Common-Controls" 
+            version="6.0.0.0" 
+            processorArchitecture="X86" 
+            publicKeyToken="6595b64144ccf1df" 
+            language="*" 
+        /> 
+    </dependentAssembly> 
+</dependency> 
+</assembly>
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin64.manifest b/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin64.manifest
new file mode 100644
index 00000000..ddc54b59
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/ExplorerPlugin64.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+<assemblyIdentity 
+    version="1.0.0.0" 
+    processorArchitecture="amd64" 
+    name="Microsoft.Windows.Wiz97_3"
+    type="win32" 
+/> 
+<description>Your app description here</description> 
+<dependency> 
+    <dependentAssembly> 
+        <assemblyIdentity 
+            type="win32" 
+            name="Microsoft.Windows.Common-Controls" 
+            version="6.0.0.0" 
+            processorArchitecture="amd64" 
+            publicKeyToken="6595b64144ccf1df" 
+            language="*" 
+        /> 
+    </dependentAssembly> 
+</dependency> 
+</assembly>
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/about.bmp b/mDNSResponder/Clients/ExplorerPlugin/res/about.bmp
new file mode 100644
index 00000000..ab5e430b
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/about.bmp
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/button-2k.ico b/mDNSResponder/Clients/ExplorerPlugin/res/button-2k.ico
new file mode 100755
index 00000000..3699b441
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/button-2k.ico
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/button-xp.ico b/mDNSResponder/Clients/ExplorerPlugin/res/button-xp.ico
new file mode 100755
index 00000000..5d6360ee
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/button-xp.ico
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/cold.ico b/mDNSResponder/Clients/ExplorerPlugin/res/cold.ico
new file mode 100644
index 00000000..3699b441
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/cold.ico
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/hot.ico b/mDNSResponder/Clients/ExplorerPlugin/res/hot.ico
new file mode 100644
index 00000000..95b03d05
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/hot.ico
diff --git a/mDNSResponder/Clients/ExplorerPlugin/res/logo.bmp b/mDNSResponder/Clients/ExplorerPlugin/res/logo.bmp
new file mode 100644
index 00000000..f866bd79
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/res/logo.bmp
diff --git a/mDNSResponder/Clients/ExplorerPlugin/resource_dll.h b/mDNSResponder/Clients/ExplorerPlugin/resource_dll.h
new file mode 100755
index 00000000..fc3c0a99
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/resource_dll.h
@@ -0,0 +1,26 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ExplorerPlugin.rc
+//
+#define IDS_NAME                        106
+#define IDS_WEB_SITES                   107
+#define IDS_PRINTERS                    109
+#define IDS_MDNSRESPONDER_NOT_AVAILABLE 110
+#define IDS_FIREWALL                    111
+#define IDC_COMPONENT                   1001
+#define IDC_LEGAL                       1002
+#define IDC_COMPONENT_VERSION           1003
+#define IDC_LOGIN_USERNAME_TEXT         1182
+#define IDC_LOGIN_PASSWORD_TEXT         1183
+#define ID_Menu                         40001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        119
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/ExplorerPlugin/resource_loc_res.h b/mDNSResponder/Clients/ExplorerPlugin/resource_loc_res.h
new file mode 100755
index 00000000..6fc2d09b
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/resource_loc_res.h
@@ -0,0 +1,32 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ExplorerPluginLocRes.rc
+//
+#define IDS_NAME                        106
+#define IDS_WEB_SITES                   107
+#define IDS_PRINTERS                    109
+#define IDS_MDNSRESPONDER_NOT_AVAILABLE 110
+#define IDS_FIREWALL                    111
+#define IDD_ABOUT                       118
+#define IDR_CONTEXT_MENU                120
+#define IDD_LOGIN                       145
+#define IDC_ABOUT_BACKGROUND                146
+#define IDS_ABOUT                       147
+#define IDS_ABOUT_URL                   148
+#define IDC_COMPONENT                   1001
+#define IDC_LEGAL                       1002
+#define IDC_COMPONENT_VERSION           1003
+#define IDC_LOGIN_USERNAME_TEXT         1182
+#define IDC_LOGIN_PASSWORD_TEXT         1183
+#define ID_Menu                         40001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        119
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/ExplorerPlugin/resource_res.h b/mDNSResponder/Clients/ExplorerPlugin/resource_res.h
new file mode 100755
index 00000000..f2d4abd4
--- /dev/null
+++ b/mDNSResponder/Clients/ExplorerPlugin/resource_res.h
@@ -0,0 +1,30 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ExplorerPluginRes.rc
+//
+#define IDS_NAME                        106
+#define IDS_WEB_SITES                   107
+#define IDS_PRINTERS                    109
+#define IDS_MDNSRESPONDER_NOT_AVAILABLE 110
+#define IDS_FIREWALL                    111
+#define IDB_LOGO                        115
+#define IDI_BUTTON_2K                   115
+#define IDI_BUTTON_XP                   118
+#define IDB_ABOUT                       119
+#define IDC_COMPONENT                   1001
+#define IDC_LEGAL                       1002
+#define IDC_COMPONENT_VERSION           1003
+#define IDC_LOGIN_USERNAME_TEXT         1182
+#define IDC_LOGIN_PASSWORD_TEXT         1183
+#define ID_Menu                         40001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        119
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.cpp b/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.cpp
new file mode 100755
index 00000000..ae57da94
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.cpp
@@ -0,0 +1,394 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "CDNSSDService.h"
+#include "nsThreadUtils.h"
+#include "nsIEventTarget.h"
+#include "private/pprio.h"
+#include <string>
+#include <stdio.h>
+
+
+NS_IMPL_ISUPPORTS2(CDNSSDService, IDNSSDService, nsIRunnable)
+
+CDNSSDService::CDNSSDService()
+:
+	m_master( 1 ),
+	m_threadPool( NULL ),
+	m_mainRef( NULL ),
+	m_subRef( NULL ),
+	m_listener( NULL ),
+	m_fileDesc( NULL ),
+	m_job( NULL )
+{
+	nsresult err;
+
+	if ( DNSServiceCreateConnection( &m_mainRef ) != kDNSServiceErr_NoError )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+
+	if ( ( m_fileDesc = PR_ImportTCPSocket( DNSServiceRefSockFD( m_mainRef ) ) ) == NULL )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+
+	if ( ( m_threadPool = PR_CreateThreadPool( 1, 1, 8192 ) ) == NULL )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+	
+	err = SetupNotifications();
+
+exit:
+
+	if ( err != NS_OK )
+	{
+		Cleanup();
+	}
+}
+
+
+CDNSSDService::CDNSSDService( DNSServiceRef ref, nsISupports * listener )
+:
+	m_master( 0 ),
+	m_threadPool( NULL ),
+	m_mainRef( ref ),
+	m_subRef( ref ),
+	m_listener( listener ),
+	m_fileDesc( NULL ),
+	m_job( NULL )
+{
+}
+
+
+CDNSSDService::~CDNSSDService()
+{
+	Cleanup();
+}
+
+
+void
+CDNSSDService::Cleanup()
+{
+	if ( m_master )
+	{
+		if ( m_job )
+		{
+			PR_CancelJob( m_job );
+			m_job = NULL;
+		}
+
+		if ( m_threadPool != NULL )
+		{	
+			PR_ShutdownThreadPool( m_threadPool );
+			m_threadPool = NULL;
+		}
+	
+		if ( m_fileDesc != NULL )
+		{
+			PR_Close( m_fileDesc );
+			m_fileDesc = NULL;
+		}
+
+		if ( m_mainRef )
+		{
+			DNSServiceRefDeallocate( m_mainRef );
+			m_mainRef = NULL;
+		}
+	}
+	else
+	{
+		if ( m_subRef )
+		{
+			DNSServiceRefDeallocate( m_subRef );
+			m_subRef = NULL;
+		}
+	}
+}
+
+
+nsresult
+CDNSSDService::SetupNotifications()
+{
+	NS_PRECONDITION( m_threadPool != NULL, "m_threadPool is NULL" );
+	NS_PRECONDITION( m_fileDesc != NULL, "m_fileDesc is NULL" );
+	NS_PRECONDITION( m_job == NULL, "m_job is not NULL" );
+
+	m_iod.socket	= m_fileDesc;
+	m_iod.timeout	= PR_INTERVAL_MAX;
+	m_job			= PR_QueueJob_Read( m_threadPool, &m_iod, Read, this, PR_FALSE );	
+	return ( m_job ) ? NS_OK : NS_ERROR_FAILURE;
+}
+
+
+/* IDNSSDService browse (in long interfaceIndex, in AString regtype, in AString domain, in IDNSSDBrowseListener listener); */
+NS_IMETHODIMP
+CDNSSDService::Browse(PRInt32 interfaceIndex, const nsAString & regtype, const nsAString & domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM)
+{
+	CDNSSDService	*	service	= NULL;
+	DNSServiceErrorType dnsErr	= 0;
+	nsresult			err		= 0;
+
+	*_retval = NULL;
+	
+	if ( !m_mainRef )
+	{
+		err = NS_ERROR_NOT_AVAILABLE;
+		goto exit;
+	}
+
+	try
+	{
+		service = new CDNSSDService( m_mainRef, listener );
+	}
+	catch ( ... )
+	{
+		service = NULL;
+	}
+	
+	if ( service == NULL )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+	
+	dnsErr = DNSServiceBrowse( &service->m_subRef, kDNSServiceFlagsShareConnection, interfaceIndex, NS_ConvertUTF16toUTF8( regtype ).get(), NS_ConvertUTF16toUTF8( domain ).get(), ( DNSServiceBrowseReply ) BrowseReply, service );
+	
+	if ( dnsErr != kDNSServiceErr_NoError )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+	
+	listener->AddRef();
+	service->AddRef();
+	*_retval = service;
+	err = NS_OK;
+	
+exit:
+
+	if ( err && service )
+	{
+		delete service;
+		service = NULL;
+	}
+	
+	return err;
+}
+
+
+/* IDNSSDService resolve (in long interfaceIndex, in AString name, in AString regtype, in AString domain, in IDNSSDResolveListener listener); */
+NS_IMETHODIMP
+CDNSSDService::Resolve(PRInt32 interfaceIndex, const nsAString & name, const nsAString & regtype, const nsAString & domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM)
+{
+    CDNSSDService	*	service;
+	DNSServiceErrorType dnsErr;
+	nsresult			err;
+
+	*_retval = NULL;
+	
+	if ( !m_mainRef )
+	{
+		err = NS_ERROR_NOT_AVAILABLE;
+		goto exit;
+	}
+
+	try
+	{
+		service = new CDNSSDService( m_mainRef, listener );
+	}
+	catch ( ... )
+	{
+		service = NULL;
+	}
+	
+	if ( service == NULL )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+
+	dnsErr = DNSServiceResolve( &service->m_subRef, kDNSServiceFlagsShareConnection, interfaceIndex, NS_ConvertUTF16toUTF8( name ).get(), NS_ConvertUTF16toUTF8( regtype ).get(), NS_ConvertUTF16toUTF8( domain ).get(), ( DNSServiceResolveReply ) ResolveReply, service );
+	
+	if ( dnsErr != kDNSServiceErr_NoError )
+	{
+		err = NS_ERROR_FAILURE;
+		goto exit;
+	}
+	
+	listener->AddRef();
+	service->AddRef();
+	*_retval = service;
+	err = NS_OK;
+	
+exit:
+	
+	if ( err && service )
+	{
+		delete service;
+		service = NULL;
+	}
+	
+	return err;
+}
+
+
+/* void stop (); */
+NS_IMETHODIMP
+CDNSSDService::Stop()
+{
+    if ( m_subRef )
+	{
+		DNSServiceRefDeallocate( m_subRef );
+		m_subRef = NULL;
+	}
+	
+	return NS_OK;
+}
+
+
+void
+CDNSSDService::Read( void * arg )
+{
+	NS_PRECONDITION( arg != NULL, "arg is NULL" );
+	
+	NS_DispatchToMainThread( ( CDNSSDService* ) arg );
+}
+
+
+NS_IMETHODIMP
+CDNSSDService::Run()
+{
+	nsresult err = NS_OK;
+	
+	NS_PRECONDITION( m_mainRef != NULL, "m_mainRef is NULL" );
+
+	m_job = NULL;
+
+	if ( PR_Available( m_fileDesc ) > 0 )
+	{
+		if ( DNSServiceProcessResult( m_mainRef ) != kDNSServiceErr_NoError )
+		{
+			err = NS_ERROR_FAILURE;
+		}
+	}
+
+	if ( !err )
+	{
+		err = SetupNotifications();
+	}
+	
+	return err;
+}
+
+
+void DNSSD_API
+CDNSSDService::BrowseReply
+		(
+		DNSServiceRef		sdRef,
+		DNSServiceFlags		flags,
+		uint32_t			interfaceIndex,
+		DNSServiceErrorType	errorCode,
+		const char		*	serviceName,
+		const char		*	regtype,
+		const char		*	replyDomain,
+		void			*	context
+		)
+{
+	CDNSSDService * self = ( CDNSSDService* ) context;
+
+	// This should never be NULL, but let's be defensive.
+	
+	if ( self != NULL )
+	{
+		IDNSSDBrowseListener * listener = ( IDNSSDBrowseListener* ) self->m_listener;
+
+		// Same for this
+
+		if ( listener != NULL )
+		{
+			listener->OnBrowse( self, ( flags & kDNSServiceFlagsAdd ) ? PR_TRUE : PR_FALSE, interfaceIndex, errorCode, NS_ConvertUTF8toUTF16( serviceName ), NS_ConvertUTF8toUTF16( regtype ), NS_ConvertUTF8toUTF16( replyDomain ) );
+		}
+	}
+}
+
+
+void DNSSD_API
+CDNSSDService::ResolveReply
+		(
+		DNSServiceRef			sdRef,
+		DNSServiceFlags			flags,
+		uint32_t				interfaceIndex,
+		DNSServiceErrorType		errorCode,
+		const char			*	fullname,
+		const char			*	hosttarget,
+		uint16_t				port,
+		uint16_t				txtLen,
+		const unsigned char	*	txtRecord,
+		void				*	context
+		)
+{
+	CDNSSDService * self = ( CDNSSDService* ) context;
+	
+	// This should never be NULL, but let's be defensive.
+	
+	if ( self != NULL )
+	{
+		IDNSSDResolveListener * listener = ( IDNSSDResolveListener* ) self->m_listener;
+		
+		// Same for this
+
+		if ( listener != NULL )
+		{
+			std::string		path = "";
+			const void	*	value = NULL;
+			uint8_t			valueLen = 0;
+
+			value = TXTRecordGetValuePtr( txtLen, txtRecord, "path", &valueLen );
+			
+			if ( value && valueLen )
+			{
+				char * temp;
+				
+				temp = new char[ valueLen + 2 ];
+				
+				if ( temp )
+				{
+					char * dst = temp;
+
+					memset( temp, 0, valueLen + 2 );
+
+					if ( ( ( char* ) value )[ 0 ] != '/' )
+					{
+						*dst++ = '/';
+					}
+
+					memcpy( dst, value, valueLen );
+					path = temp;
+					delete [] temp;
+				}
+			}
+
+			listener->OnResolve( self, interfaceIndex, errorCode, NS_ConvertUTF8toUTF16( fullname ), NS_ConvertUTF8toUTF16( hosttarget ) , ntohs( port ), NS_ConvertUTF8toUTF16( path.c_str() ) );
+		}
+	}
+}
+
diff --git a/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.h b/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.h
new file mode 100755
index 00000000..33eaa712
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/CDNSSDService.h
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef _CDNSSDSERVICE_H
+#define _CDNSSDSERVICE_H
+
+#include "IDNSSDService.h"
+#include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIThread.h"
+#include "nsIRunnable.h"
+#include "prtpool.h"
+#include <dns_sd.h>
+#include <stdio.h>
+#include <string>
+
+
+#define CDNSSDSERVICE_CONTRACTID "@apple.com/DNSSDService;1"
+#define CDNSSDSERVICE_CLASSNAME "CDNSSDService"
+#define CDNSSDSERVICE_CID { 0x944ED267, 0x465A, 0x4989, { 0x82, 0x72, 0x7E, 0xE9, 0x28, 0x6C, 0x99, 0xA5 } }
+
+
+/* Header file */
+class CDNSSDService : public IDNSSDService, nsIRunnable
+{
+public:
+NS_DECL_ISUPPORTS
+NS_DECL_IDNSSDSERVICE
+NS_DECL_NSIRUNNABLE
+
+CDNSSDService();
+CDNSSDService( DNSServiceRef mainRef, nsISupports * listener );
+
+virtual ~CDNSSDService();
+
+private:
+
+static void DNSSD_API
+BrowseReply
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char      *   serviceName,
+    const char      *   regtype,
+    const char      *   replyDomain,
+    void            *   context
+);
+
+static void DNSSD_API
+ResolveReply
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char          *   fullname,
+    const char          *   hosttarget,
+    uint16_t port,
+    uint16_t txtLen,
+    const unsigned char *   txtRecord,
+    void                *   context
+);
+
+static void
+Read
+(
+    void * arg
+);
+
+nsresult
+SetupNotifications();
+
+void
+Cleanup();
+
+char m_master;
+PRThreadPool    *   m_threadPool;
+DNSServiceRef m_mainRef;
+DNSServiceRef m_subRef;
+nsISupports     *   m_listener;
+PRFileDesc      *   m_fileDesc;
+PRJobIoDesc m_iod;
+PRJob           *   m_job;
+};
+
+
+#endif
diff --git a/mDNSResponder/Clients/FirefoxExtension/CDNSSDServiceModule.cpp b/mDNSResponder/Clients/FirefoxExtension/CDNSSDServiceModule.cpp
new file mode 100755
index 00000000..3833c5aa
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/CDNSSDServiceModule.cpp
@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "nsIGenericFactory.h"
+#include "CDNSSDService.h"
+
+NS_COM_GLUE nsresult
+NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result);
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(CDNSSDService)
+
+static nsModuleComponentInfo components[] =
+{
+    {
+       CDNSSDSERVICE_CLASSNAME, 
+       CDNSSDSERVICE_CID,
+       CDNSSDSERVICE_CONTRACTID,
+       CDNSSDServiceConstructor,
+    }
+};
+
+NS_IMPL_NSGETMODULE("CDNSSDServiceModule", components) 
+
diff --git a/mDNSResponder/Clients/FirefoxExtension/DNSSDService.sln b/mDNSResponder/Clients/FirefoxExtension/DNSSDService.sln
new file mode 100755
index 00000000..68534f46
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/DNSSDService.sln
@@ -0,0 +1,20 @@
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNSSDService", "DNSSDService.vcproj", "{7826EA27-D4CC-4FAA-AD23-DF813823227B}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Win32.Build.0 = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Win32.ActiveCfg = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.rc b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.rc
new file mode 100644
index 00000000..998e5e98
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.rc
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "WinVersRes.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""WinVersRes.h""\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "Firefox Extension Library"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "DNSSDService.dll"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "DNSSDService.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcproj b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcproj
new file mode 100755
index 00000000..352fdd61
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcproj
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="FirefoxExtension"

+	ProjectGUID="{7826EA27-D4CC-4FAA-AD23-DF813823227B}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\$(OutDir)\DNSSDService.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\mDNSShared;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\xpcom&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\nspr&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\string&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\pref&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\sdk\include&quot;"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DNSSDSERVICE_EXPORTS;XP_WIN;XP_WIN32"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				ForcedIncludeFiles=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="$(SRCROOT)\AppleInternal\XULRunner\lib\nspr4.lib $(SRCROOT)\AppleInternal\XULRunner\lib\xpcom.lib $(SRCROOT)\AppleInternal\XULRunner\lib\xpcomglue_s.lib ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\DNSSDService.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

+				ProgramDatabaseFile=".\$(OutDir)/DNSSDService.pdb"

+				ImportLibrary=".\$(OutDir)/DNSSDService.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\$(OutDir)\DNSSDService.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /I/Y $(PlatformName)\$(ConfigurationName)\DNSSDService.dll extension\platform\WINNT\components&#x0D;&#x0A;if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\FirefoxExtension&quot;                      mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\FirefoxExtension&quot;&#x0D;&#x0A;xcopy /E/I/Y &quot;extension&quot;                                 &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\FirefoxExtension&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\$(OutDir)\DNSSDService.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\xpcom&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\nspr&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\string&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\include\pref&quot;;&quot;$(SRCROOT)\AppleInternal\XULRunner\sdk\include&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DNSSDSERVICE_EXPORTS;XP_WIN;XP_WIN32"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				ForcedIncludeFiles=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="$(SRCROOT)\AppleInternal\XULRunner\lib\nspr4.lib $(SRCROOT)\AppleInternal\XULRunner\lib\xpcom.lib $(SRCROOT)\AppleInternal\XULRunner\lib\xpcomglue_s.lib ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\DNSSDService.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\$(OutDir)\DNSSDService.pdb"

+				ImportLibrary=".\$(OutDir)/DNSSDService.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\$(OutDir)\DNSSDService.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="xcopy /I/Y $(PlatformName)\$(ConfigurationName)\DNSSDService.dll extension\platform\WINNT\components"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath=".\CDNSSDService.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\CDNSSDServiceModule.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath=".\CDNSSDService.h"

+				>

+			</File>

+			<File

+				RelativePath=".\IDNSSDService.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="IDL"

+			Filter="idl"

+			>

+			<File

+				RelativePath=".\IDNSSDService.idl"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath=".\FirefoxExtension.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj
new file mode 100755
index 00000000..1d02a4ec
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{7826EA27-D4CC-4FAA-AD23-DF813823227B}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DNSSDService</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DNSSDService</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\$(OutDir)DNSSDService.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;$(SRCROOT)\AppleInternal\XULRunner\include\xpcom;$(SRCROOT)\AppleInternal\XULRunner\include\nspr;$(SRCROOT)\AppleInternal\XULRunner\include\string;$(SRCROOT)\AppleInternal\XULRunner\include\pref;$(SRCROOT)\AppleInternal\XULRunner\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;DNSSDSERVICE_EXPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>$(SRCROOT)\AppleInternal\XULRunner\lib\nspr4.lib;$(SRCROOT)\AppleInternal\XULRunner\lib\xpcom.lib;$(SRCROOT)\AppleInternal\XULRunner\lib\xpcomglue_s.lib;ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)DNSSDService.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ProgramDatabaseFile>.\$(OutDir)DNSSDService.pdb</ProgramDatabaseFile>

+      <ImportLibrary>.\$(OutDir)DNSSDService.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <OutputFile>.\$(OutDir)DNSSDService.bsc</OutputFile>

+    </Bscmake>

+    <PostBuildEvent>

+      <Command>xcopy /I/Y $(Platform)\$(Configuration)\DNSSDService.dll extension\platform\WINNT\components

+if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\FirefoxExtension"                      mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\FirefoxExtension"

+xcopy /E/I/Y "extension"                                 "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\FirefoxExtension"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\$(OutDir)DNSSDService.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;$(SRCROOT)\AppleInternal\XULRunner\include\xpcom;$(SRCROOT)\AppleInternal\XULRunner\include\nspr;$(SRCROOT)\AppleInternal\XULRunner\include\string;$(SRCROOT)\AppleInternal\XULRunner\include\pref;$(SRCROOT)\AppleInternal\XULRunner\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DNSSDSERVICE_EXPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>$(SRCROOT)\AppleInternal\XULRunner\lib\nspr4.lib;$(SRCROOT)\AppleInternal\XULRunner\lib\xpcom.lib;$(SRCROOT)\AppleInternal\XULRunner\lib\xpcomglue_s.lib;ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)DNSSDService.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>.\$(OutDir)DNSSDService.pdb</ProgramDatabaseFile>

+      <ImportLibrary>.\$(OutDir)DNSSDService.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <OutputFile>.\$(OutDir)DNSSDService.bsc</OutputFile>

+    </Bscmake>

+    <PostBuildEvent>

+      <Command>xcopy /I/Y $(Platform)\$(Configuration)\DNSSDService.dll extension\platform\WINNT\components</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="CDNSSDService.cpp" />

+    <ClCompile Include="CDNSSDServiceModule.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="CDNSSDService.h" />

+    <ClInclude Include="IDNSSDService.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuildStep Include="IDNSSDService.idl" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="FirefoxExtension.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLLStub\DLLStub.vcxproj">

+      <Project>{3a2b6325-3053-4236-84bd-aa9be2e323e5}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj.filters b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj.filters
new file mode 100755
index 00000000..02c1c55a
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/FirefoxExtension.vcxproj.filters
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{89e57cc2-d6b1-4e68-ad57-71223df12d28}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{4d103fe8-9737-47c7-9190-6f7b5666ecf5}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="IDL">

+      <UniqueIdentifier>{4dae44a8-3da8-43c0-a749-2d1e0610c66f}</UniqueIdentifier>

+      <Extensions>idl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{ac7dbdd1-2fe3-416d-9cab-2d663c05f252}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="CDNSSDService.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="CDNSSDServiceModule.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="CDNSSDService.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="IDNSSDService.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="FirefoxExtension.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuildStep Include="IDNSSDService.idl">

+      <Filter>IDL</Filter>

+    </CustomBuildStep>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.h b/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.h
new file mode 100755
index 00000000..e4784d4d
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.h
@@ -0,0 +1,263 @@
+/*
+ * DO NOT EDIT.  THIS FILE IS GENERATED FROM IDNSSDService.idl
+ */
+
+#ifndef __gen_IDNSSDService_h__
+#define __gen_IDNSSDService_h__
+
+
+#ifndef __gen_nsISupports_h__
+#include "nsISupports.h"
+#endif
+
+/* For IDL files that don't want to include root IDL files. */
+#ifndef NS_NO_VTABLE
+#define NS_NO_VTABLE
+#endif
+class IDNSSDService; /* forward declaration */
+
+
+/* starting interface:    IDNSSDBrowseListener */
+#define IDNSSDBROWSELISTENER_IID_STR "27346495-a1ed-458a-a5bc-587df9a26b4f"
+
+#define IDNSSDBROWSELISTENER_IID \
+    {0x27346495, 0xa1ed, 0x458a, \
+     { 0xa5, 0xbc, 0x58, 0x7d, 0xf9, 0xa2, 0x6b, 0x4f }}
+
+class NS_NO_VTABLE NS_SCRIPTABLE IDNSSDBrowseListener : public nsISupports {
+public:
+
+NS_DECLARE_STATIC_IID_ACCESSOR(IDNSSDBROWSELISTENER_IID)
+
+/* void onBrowse (in IDNSSDService service, in boolean add, in long interfaceIndex, in long error, in AString serviceName, in AString regtype, in AString domain); */
+NS_SCRIPTABLE NS_IMETHOD OnBrowse(IDNSSDService *service, PRBool add, PRInt32 interfaceIndex, PRInt32 error, const nsAString & serviceName, const nsAString & regtype, const nsAString & domain) = 0;
+
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(IDNSSDBrowseListener, IDNSSDBROWSELISTENER_IID)
+
+/* Use this macro when declaring classes that implement this interface. */
+#define NS_DECL_IDNSSDBROWSELISTENER \
+    NS_SCRIPTABLE NS_IMETHOD OnBrowse(IDNSSDService *service, PRBool add, PRInt32 interfaceIndex, PRInt32 error, const nsAString &serviceName, const nsAString &regtype, const nsAString &domain);
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object. */
+#define NS_FORWARD_IDNSSDBROWSELISTENER(_to) \
+    NS_SCRIPTABLE NS_IMETHOD OnBrowse(IDNSSDService *service, PRBool add, PRInt32 interfaceIndex, PRInt32 error, const nsAString &serviceName, const nsAString &regtype, const nsAString &domain) { return _to OnBrowse(service, add, interfaceIndex, error, serviceName, regtype, domain); }
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
+#define NS_FORWARD_SAFE_IDNSSDBROWSELISTENER(_to) \
+    NS_SCRIPTABLE NS_IMETHOD OnBrowse(IDNSSDService *service, PRBool add, PRInt32 interfaceIndex, PRInt32 error, const nsAString &serviceName, const nsAString &regtype, const nsAString &domain) { return !_to ? NS_ERROR_NULL_POINTER : _to->OnBrowse(service, add, interfaceIndex, error, serviceName, regtype, domain); }
+
+#if 0
+/* Use the code below as a template for the implementation class for this interface. */
+
+/* Header file */
+class _MYCLASS_ : public IDNSSDBrowseListener
+{
+public:
+NS_DECL_ISUPPORTS
+NS_DECL_IDNSSDBROWSELISTENER
+
+_MYCLASS_();
+
+private:
+~_MYCLASS_();
+
+protected:
+/* additional members */
+};
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(_MYCLASS_, IDNSSDBrowseListener)
+
+_MYCLASS_::_MYCLASS_()
+{
+    /* member initializers and constructor code */
+}
+
+_MYCLASS_::~_MYCLASS_()
+{
+    /* destructor code */
+}
+
+/* void onBrowse (in IDNSSDService service, in boolean add, in long interfaceIndex, in long error, in AString serviceName, in AString regtype, in AString domain); */
+NS_IMETHODIMP _MYCLASS_::OnBrowse(IDNSSDService *service, PRBool add, PRInt32 interfaceIndex, PRInt32 error, const nsAString & serviceName, const nsAString & regtype, const nsAString & domain)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* End of implementation class template. */
+#endif
+
+
+/* starting interface:    IDNSSDResolveListener */
+#define IDNSSDRESOLVELISTENER_IID_STR "6620e18f-47f3-47c6-941f-126a5fd4fcf7"
+
+#define IDNSSDRESOLVELISTENER_IID \
+    {0x6620e18f, 0x47f3, 0x47c6, \
+     { 0x94, 0x1f, 0x12, 0x6a, 0x5f, 0xd4, 0xfc, 0xf7 }}
+
+class NS_NO_VTABLE NS_SCRIPTABLE IDNSSDResolveListener : public nsISupports {
+public:
+
+NS_DECLARE_STATIC_IID_ACCESSOR(IDNSSDRESOLVELISTENER_IID)
+
+/* void onResolve (in IDNSSDService service, in long interfaceIndex, in long error, in AString fullname, in AString host, in short port, in AString path); */
+NS_SCRIPTABLE NS_IMETHOD OnResolve(IDNSSDService *service, PRInt32 interfaceIndex, PRInt32 error, const nsAString & fullname, const nsAString & host, PRInt16 port, const nsAString & path) = 0;
+
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(IDNSSDResolveListener, IDNSSDRESOLVELISTENER_IID)
+
+/* Use this macro when declaring classes that implement this interface. */
+#define NS_DECL_IDNSSDRESOLVELISTENER \
+    NS_SCRIPTABLE NS_IMETHOD OnResolve(IDNSSDService *service, PRInt32 interfaceIndex, PRInt32 error, const nsAString &fullname, const nsAString &host, PRInt16 port, const nsAString &path);
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object. */
+#define NS_FORWARD_IDNSSDRESOLVELISTENER(_to) \
+    NS_SCRIPTABLE NS_IMETHOD OnResolve(IDNSSDService *service, PRInt32 interfaceIndex, PRInt32 error, const nsAString &fullname, const nsAString &host, PRInt16 port, const nsAString &path) { return _to OnResolve(service, interfaceIndex, error, fullname, host, port, path); }
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
+#define NS_FORWARD_SAFE_IDNSSDRESOLVELISTENER(_to) \
+    NS_SCRIPTABLE NS_IMETHOD OnResolve(IDNSSDService *service, PRInt32 interfaceIndex, PRInt32 error, const nsAString &fullname, const nsAString &host, PRInt16 port, const nsAString &path) { return !_to ? NS_ERROR_NULL_POINTER : _to->OnResolve(service, interfaceIndex, error, fullname, host, port, path); }
+
+#if 0
+/* Use the code below as a template for the implementation class for this interface. */
+
+/* Header file */
+class _MYCLASS_ : public IDNSSDResolveListener
+{
+public:
+NS_DECL_ISUPPORTS
+NS_DECL_IDNSSDRESOLVELISTENER
+
+_MYCLASS_();
+
+private:
+~_MYCLASS_();
+
+protected:
+/* additional members */
+};
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(_MYCLASS_, IDNSSDResolveListener)
+
+_MYCLASS_::_MYCLASS_()
+{
+    /* member initializers and constructor code */
+}
+
+_MYCLASS_::~_MYCLASS_()
+{
+    /* destructor code */
+}
+
+/* void onResolve (in IDNSSDService service, in long interfaceIndex, in long error, in AString fullname, in AString host, in short port, in AString path); */
+NS_IMETHODIMP _MYCLASS_::OnResolve(IDNSSDService *service, PRInt32 interfaceIndex, PRInt32 error, const nsAString & fullname, const nsAString & host, PRInt16 port, const nsAString & path)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* End of implementation class template. */
+#endif
+
+
+/* starting interface:    IDNSSDService */
+#define IDNSSDSERVICE_IID_STR "3a3539ff-f8d8-40b4-8d02-5ea73c51fa12"
+
+#define IDNSSDSERVICE_IID \
+    {0x3a3539ff, 0xf8d8, 0x40b4, \
+     { 0x8d, 0x02, 0x5e, 0xa7, 0x3c, 0x51, 0xfa, 0x12 }}
+
+class NS_NO_VTABLE NS_SCRIPTABLE IDNSSDService : public nsISupports {
+public:
+
+NS_DECLARE_STATIC_IID_ACCESSOR(IDNSSDSERVICE_IID)
+
+/* IDNSSDService browse (in long interfaceIndex, in AString regtype, in AString domain, in IDNSSDBrowseListener listener); */
+NS_SCRIPTABLE NS_IMETHOD Browse(PRInt32 interfaceIndex, const nsAString & regtype, const nsAString & domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM) = 0;
+
+/* IDNSSDService resolve (in long interfaceIndex, in AString name, in AString regtype, in AString domain, in IDNSSDResolveListener listener); */
+NS_SCRIPTABLE NS_IMETHOD Resolve(PRInt32 interfaceIndex, const nsAString & name, const nsAString & regtype, const nsAString & domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM) = 0;
+
+/* void stop (); */
+NS_SCRIPTABLE NS_IMETHOD Stop(void) = 0;
+
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(IDNSSDService, IDNSSDSERVICE_IID)
+
+/* Use this macro when declaring classes that implement this interface. */
+#define NS_DECL_IDNSSDSERVICE \
+    NS_SCRIPTABLE NS_IMETHOD Browse(PRInt32 interfaceIndex, const nsAString &regtype, const nsAString &domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM); \
+    NS_SCRIPTABLE NS_IMETHOD Resolve(PRInt32 interfaceIndex, const nsAString &name, const nsAString &regtype, const nsAString &domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM); \
+    NS_SCRIPTABLE NS_IMETHOD Stop(void);
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object. */
+#define NS_FORWARD_IDNSSDSERVICE(_to) \
+    NS_SCRIPTABLE NS_IMETHOD Browse(PRInt32 interfaceIndex, const nsAString &regtype, const nsAString &domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM) { return _to Browse(interfaceIndex, regtype, domain, listener, _retval); } \
+    NS_SCRIPTABLE NS_IMETHOD Resolve(PRInt32 interfaceIndex, const nsAString &name, const nsAString &regtype, const nsAString &domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM) { return _to Resolve(interfaceIndex, name, regtype, domain, listener, _retval); } \
+    NS_SCRIPTABLE NS_IMETHOD Stop(void) { return _to Stop(); }
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
+#define NS_FORWARD_SAFE_IDNSSDSERVICE(_to) \
+    NS_SCRIPTABLE NS_IMETHOD Browse(PRInt32 interfaceIndex, const nsAString &regtype, const nsAString &domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM) { return !_to ? NS_ERROR_NULL_POINTER : _to->Browse(interfaceIndex, regtype, domain, listener, _retval); } \
+    NS_SCRIPTABLE NS_IMETHOD Resolve(PRInt32 interfaceIndex, const nsAString &name, const nsAString &regtype, const nsAString &domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM) { return !_to ? NS_ERROR_NULL_POINTER : _to->Resolve(interfaceIndex, name, regtype, domain, listener, _retval); } \
+    NS_SCRIPTABLE NS_IMETHOD Stop(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Stop(); }
+
+#if 0
+/* Use the code below as a template for the implementation class for this interface. */
+
+/* Header file */
+class _MYCLASS_ : public IDNSSDService
+{
+public:
+NS_DECL_ISUPPORTS
+NS_DECL_IDNSSDSERVICE
+
+_MYCLASS_();
+
+private:
+~_MYCLASS_();
+
+protected:
+/* additional members */
+};
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(_MYCLASS_, IDNSSDService)
+
+_MYCLASS_::_MYCLASS_()
+{
+    /* member initializers and constructor code */
+}
+
+_MYCLASS_::~_MYCLASS_()
+{
+    /* destructor code */
+}
+
+/* IDNSSDService browse (in long interfaceIndex, in AString regtype, in AString domain, in IDNSSDBrowseListener listener); */
+NS_IMETHODIMP _MYCLASS_::Browse(PRInt32 interfaceIndex, const nsAString & regtype, const nsAString & domain, IDNSSDBrowseListener *listener, IDNSSDService **_retval NS_OUTPARAM)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* IDNSSDService resolve (in long interfaceIndex, in AString name, in AString regtype, in AString domain, in IDNSSDResolveListener listener); */
+NS_IMETHODIMP _MYCLASS_::Resolve(PRInt32 interfaceIndex, const nsAString & name, const nsAString & regtype, const nsAString & domain, IDNSSDResolveListener *listener, IDNSSDService **_retval NS_OUTPARAM)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void stop (); */
+NS_IMETHODIMP _MYCLASS_::Stop()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* End of implementation class template. */
+#endif
+
+
+#endif /* __gen_IDNSSDService_h__ */
diff --git a/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.idl b/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.idl
new file mode 100755
index 00000000..d0f62c82
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/IDNSSDService.idl
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 4 -*-

+ *

+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ * 

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+#include "nsISupports.idl"

+

+interface IDNSSDService;

+

+

+[scriptable, function, uuid(27346495-A1ED-458A-A5BC-587DF9A26B4F)]

+interface IDNSSDBrowseListener : nsISupports

+{

+	void

+	onBrowse( in IDNSSDService service, in boolean add, in long interfaceIndex, in long error, in AString serviceName, in AString regtype, in AString domain );

+};

+

+

+[scriptable, function, uuid(6620E18F-47F3-47C6-941F-126A5FD4FCF7)]

+interface IDNSSDResolveListener : nsISupports

+{

+	void

+	onResolve( in IDNSSDService service, in long interfaceIndex, in long error, in AString fullname, in AString host, in short port, in AString path );

+};

+

+

+[scriptable, uuid(3A3539FF-F8D8-40B4-8D02-5EA73C51FA12)]

+interface IDNSSDService : nsISupports

+{

+	IDNSSDService

+	browse( in long interfaceIndex, in AString regtype, in AString domain, in IDNSSDBrowseListener listener );

+

+	IDNSSDService

+	resolve( in long interfaceIndex, in AString name, in AString regtype, in AString domain, in IDNSSDResolveListener listener );

+

+	void

+	stop();

+};

diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/chrome.manifest b/mDNSResponder/Clients/FirefoxExtension/extension/chrome.manifest
new file mode 100755
index 00000000..f1daf86c
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/chrome.manifest
@@ -0,0 +1,6 @@
+content	bonjour4firefox	content/
+locale	bonjour4firefox	en-US	locale/en-US/
+skin	bonjour4firefox	classic/1.0	skin/ 
+skin	bonjour4firefox classic/1.0 skin-darwin/ os=darwin
+overlay	chrome://browser/content/browser.xul	chrome://bonjour4firefox/content/browserOverlay.xul
+style	chrome://global/content/customizeToolbar.xul	chrome://bonjour4firefox/skin/overlay.css
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/components/IDNSSDService.xpt b/mDNSResponder/Clients/FirefoxExtension/extension/components/IDNSSDService.xpt
new file mode 100755
index 00000000..bfda3e58
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/components/IDNSSDService.xpt
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_bonjour4firefox.png b/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_bonjour4firefox.png
new file mode 100755
index 00000000..baf8b215
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_bonjour4firefox.png
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_listImage.png b/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_listImage.png
new file mode 100755
index 00000000..278efe37
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/_internal_listImage.png
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.css b/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.css
new file mode 100755
index 00000000..2e7eb2c4
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.css
@@ -0,0 +1,16 @@
+tree.sidebar-placesTree treechildren::-moz-tree-row(selected)
+{
+	background-color: #6f81a9;
+	background-image: url("chrome://browser/skin/places/selected-gradient.png");
+	background-repeat: repeat-x;
+	background-position: bottom left;
+	border-top: 1px solid #979797;
+}
+
+
+tree.sidebar-placesTree treechildren::-moz-tree-separator
+{
+	border-top: 1px solid #505d6d;
+	margin: 0 10px;
+}
+
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.xul b/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.xul
new file mode 100755
index 00000000..2be0c691
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/bonjour4firefox.xul
@@ -0,0 +1,222 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
+<?xml-stylesheet href="browseList.css"?>
+<!DOCTYPE page SYSTEM "chrome://bonjour4firefox/locale/bonjour4firefox.dtd">
+	<page
+		orient="vertical"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        style="background-color: transparent !important; -moz-appearance: none !important;"
+		onload="BonjourBrowser.init()"
+		onunload="BonjourBrowser.cleanup()">
+		
+
+	<menupopup id="targetmenu">
+        <menuitem label="&bonjour4firefoxSidebarOpenDefault.label;" value="current"/>
+        <menuitem label="&bonjour4firefoxSidebarOpenTab.label;" value="tab"/>
+        <menuitem label="&bonjour4firefoxSidebarOpenWindow.label;" value="window"/>
+	</menupopup>
+
+	<tree id="treeBrowseList" flex="1" class="sidebar-placesTree" hidecolumnpicker="true">
+		<treecols hide="true">
+			<treecol id="title" flex="1" primary="true" hideheader="true"/>
+        </treecols>
+
+        <treechildren class="sidebar-placesTreechildren" context="targetmenu" flex="1" id="treeChildrenBrowseList">
+			<treeitem>
+				<treerow>
+					<treecell src="chrome://bonjour4firefox/content/_internal_bonjour4firefox.png" label="About Bonjour"/>
+				</treerow>
+			</treeitem>
+		</treechildren>
+	</tree>
+
+	<script><![CDATA[
+
+		var BonjourBrowser =
+		{
+			Service: null,
+			Browse: null,
+			BrowseListener: null,
+			Resolve: null,
+			ResolveListener: null,
+
+			init: function()
+			{
+				document.getElementById("treeChildrenBrowseList").addEventListener( "click", this.listListener, false );
+
+				try
+				{
+        			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+					const cid = "@apple.com/DNSSDService;1";
+        			Service = Components.classes[cid].createInstance();
+					Service = Service.QueryInterface(Components.interfaces.IDNSSDService);
+				}
+				catch (err)
+				{
+        			alert(err);
+        			return;
+    			}
+
+				BrowseListener = this.browseListener;
+				ResolveListener = this.resolveListener;
+
+				try
+				{
+					Browse = Service.browse(0, "_http._tcp", "", BrowseListener );
+				}
+				catch ( err )
+				{
+					alert( err );
+					return;
+				}
+			},
+
+			cleanup: function()
+			{
+				if ( Browse != null )
+				{
+					Browse.stop();
+					Browse = null;
+				}
+			},
+
+
+			browseListener: function( service, add, interfaceIndex, error, serviceName, regtype, domain )
+			{
+				if ( error == 0 )
+				{
+					// First see if we can look this guy up
+
+					var treeView = document.getElementById( 'treeChildrenBrowseList' );
+					var treeItem = null;
+
+					for ( i = 1; i < treeView.childNodes.length; i++ )
+					{
+						var ti = treeView.childNodes[ i ];
+						var tr = ti.childNodes[ 0 ];
+						var tc = tr.childNodes[ 0 ];
+
+						if ( tc.getAttribute( 'label' ) == serviceName )
+						{
+							treeItem = ti;
+							break;
+						}
+					}
+	
+					if ( add )
+					{
+						// If we've already seen this guy, then bump up his reference count
+
+						if ( treeItem )
+						{
+							var refcnt = treeItem.getUserData( 'refcnt' );
+							refcnt++;
+						}
+						else
+						{
+							var newTreeItem = document.createElement('treeitem');
+							var newTreeRow = document.createElement('treerow');
+							newTreeRow.setAttribute( 'properties', 'bonjourRow' );
+							var newTreeCell = document.createElement('treecell');
+                			newTreeCell.setAttribute( 'label', serviceName );
+							newTreeCell.setAttribute( 'src', 'chrome://bonjour4firefox/content/_internal_bonjour4firefox.png' );
+				
+							newTreeItem.appendChild( newTreeRow );
+							newTreeRow.appendChild( newTreeCell );
+							newTreeItem.setUserData( 'interfaceIndex', interfaceIndex, null );
+                			newTreeItem.setUserData( 'serviceName', serviceName, null );
+							newTreeItem.setUserData( 'regtype', regtype, null );
+							newTreeItem.setUserData( 'domain', domain, null );
+							newTreeItem.setUserData( 'refcnt', 1, null );
+
+							// Insert in alphabetical order
+
+							var insertBefore = null;
+
+							for ( i = 1; i < treeView.childNodes.length; i++ )
+							{
+								var ti = treeView.childNodes[ i ];
+								var tr = ti.childNodes[ 0 ];
+								var tc = tr.childNodes[ 0 ];
+		
+								if ( serviceName.toLowerCase() < tc.getAttribute( 'label' ).toLowerCase() )
+								{
+									insertBefore = ti;
+									break;
+								}
+        					}
+	
+							if ( insertBefore != null )
+							{
+								treeView.insertBefore( newTreeItem, insertBefore );
+							}
+							else
+							{
+								treeView.appendChild( newTreeItem );
+							}
+						}
+					}
+					else if ( treeItem )
+					{
+						var refcnt = treeItem.getUserData( 'refcnt' );
+						
+						if ( --refcnt == 0 )
+						{
+							treeView.removeChild( treeItem );
+						}
+					}
+				}
+				else
+				{
+					alert( 'There was an error browsing for websites: ' + error );
+				}
+			},
+
+			listListener: function( event )
+			{
+				var treeBrowseList = document.getElementById( 'treeBrowseList' );
+
+				if ( treeBrowseList.currentIndex == 0 )
+				{
+					window._content.location="http://www.apple.com/macosx/features/bonjour";
+				}
+				else
+				{
+ 					var item = treeBrowseList.view.getItemAtIndex(treeBrowseList.currentIndex);
+
+					var interfaceIndex = item.getUserData("interfaceIndex");
+					var serviceName = item.getUserData("serviceName");
+					var regtype = item.getUserData("regtype");
+					var domain = item.getUserData("domain");
+
+					try
+					{
+						Resolve = Service.resolve( interfaceIndex, serviceName, regtype, domain, ResolveListener );
+					}
+					catch ( err )
+					{
+						alert( err );
+						return;
+					}
+				}
+			},
+
+			resolveListener: function( service, interfaceIndex, error, fullname, host, port, path )
+			{
+				if ( error == 0 )
+				{
+					window._content.location='http://' + host + ':' + port + path;
+				}
+				else
+				{
+					alert( 'There was an error resolving ' + fullname );
+				}
+
+				Resolve.stop();
+			},
+		};
+
+	]]></script>
+</page>
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/browserOverlay.xul b/mDNSResponder/Clients/FirefoxExtension/extension/content/browserOverlay.xul
new file mode 100755
index 00000000..3b4d6683
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/browserOverlay.xul
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://bonjour4firefox/skin/overlay.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://bonjour4firefox/locale/bonjour4firefox.dtd">
+<overlay id="bonjour4firefox-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  	<script src="overlay.js"/>
+  	<stringbundleset id="stringbundleset">
+    	<stringbundle id="bonjour4firefox-strings" src="chrome://bonjour4firefox/locale/bonjour4firefox.properties"/>
+  	</stringbundleset>
+
+  	<menupopup id="viewSidebarMenu">
+		<menuitem observes="viewBonjour4FirefoxSidebar"/>
+	</menupopup>
+
+  	<toolbarpalette id="BrowserToolbarPalette">
+  		<toolbarbutton id="bonjour4firefox-toolbar-button"
+    		label="&bonjour4firefoxToolbar.label;"
+    		tooltiptext="&bonjour4firefoxToolbar.tooltip;"
+    		oncommand="toggleSidebar('viewBonjour4FirefoxSidebar');"
+    		class="toolbarbutton-1 chromeclass-toolbar-additional"/>
+  	</toolbarpalette>
+
+	<broadcasterset id="mainBroadcasterSet">
+		<broadcaster id="viewBonjour4FirefoxSidebar"
+			autoCheck="false"
+			label="Bonjour"
+			type="checkbox" group="sidebar"
+			sidebarurl="chrome://bonjour4firefox/content/bonjour4firefox.xul"
+			sidebartitle="&bonjour4firefox.label;"
+			oncommand="toggleSidebar('viewBonjour4FirefoxSidebar');"/>
+	</broadcasterset>
+</overlay>
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/content/overlay.js b/mDNSResponder/Clients/FirefoxExtension/extension/content/overlay.js
new file mode 100755
index 00000000..f989caaf
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/content/overlay.js
@@ -0,0 +1,21 @@
+var bonjour4firefox = 
+{
+	onLoad: function()
+	{
+    	// initialization code
+    	this.initialized = true;
+    	this.strings = document.getElementById("bonjour4firefox-strings");
+  	},
+  	onMenuItemCommand: function(e)
+	{
+    	var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
+		promptService.alert(window, this.strings.getString("helloMessageTitle"), this.strings.getString("helloMessage"));
+	},
+  	onToolbarButtonCommand: function(e)
+	{
+    	// just reuse the function above.  you can change this, obviously!
+    	bonjour4firefox.onMenuItemCommand(e);
+	}
+};
+
+window.addEventListener("load", function(e) { bonjour4firefox.onLoad(e); }, false);
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/defaults/preferences/bonjour4firefox.js b/mDNSResponder/Clients/FirefoxExtension/extension/defaults/preferences/bonjour4firefox.js
new file mode 100755
index 00000000..2965608a
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/defaults/preferences/bonjour4firefox.js
@@ -0,0 +1,2 @@
+// See http://kb.mozillazine.org/Localize_extension_descriptions
+pref("extensions.bonjour4firefox@apple.com.description", "chrome://bonjour4firefox/locale/bonjour4firefox.properties");
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/install.rdf b/mDNSResponder/Clients/FirefoxExtension/extension/install.rdf
new file mode 100755
index 00000000..37c0955e
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/install.rdf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bonjour4firefox@apple.com</em:id>
+    <em:name>Bonjour Extension for Firefox</em:name>
+    <em:version>1.0</em:version>
+    <em:creator>Apple Inc.</em:creator>
+    <em:description>Bonjour Browsing Extension for Firefox</em:description>
+    <em:iconURL>chrome://bonjour4firefox/content/_internal_bonjour4firefox.png</em:iconURL>
+    <em:targetApplication>
+      <Description>
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
+        <em:minVersion>3.5</em:minVersion>
+        <em:maxVersion>3.6.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.dtd b/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.dtd
new file mode 100755
index 00000000..2e133f99
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.dtd
@@ -0,0 +1,6 @@
+<!ENTITY bonjour4firefox.label "Bonjour">
+<!ENTITY bonjour4firefoxToolbar.label "Bonjour">
+<!ENTITY bonjour4firefoxToolbar.tooltip "Display Bonjour enabled websites">
+<!ENTITY bonjour4firefoxSidebarOpenDefault.label "Open in current window">
+<!ENTITY bonjour4firefoxSidebarOpenTab.label "Open in new tab">
+<!ENTITY bonjour4firefoxSidebarOpenWindow.label "Open in new window">
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.properties b/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.properties
new file mode 100755
index 00000000..afed1abd
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/locale/en-US/bonjour4firefox.properties
@@ -0,0 +1,4 @@
+helloMessage=Hello World!
+helloMessageTitle=Hello
+prefMessage=Int Pref Value: %d
+extensions.bonjour4firefox.description=Bonjour Browsing Extension for Firefox
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/readme.txt b/mDNSResponder/Clients/FirefoxExtension/extension/readme.txt
new file mode 100755
index 00000000..71f1edc7
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/readme.txt
@@ -0,0 +1,21 @@
+This extension was generated by the Extension Wizard at
+http://ted.mielczarek.org/code/mozilla/extensionwiz/ .
+This extension is compatible only with Firefox 1.5 and
+above.  Most of the files in this package are based on
+the 'helloworld' extension from the Mozillazine Knowledge Base.
+
+You can build an XPI for installation by running the
+build.sh script located in this folder.  For development
+you should do the following:
+  1. Unzip the entire contents of this package to somewhere,
+	       e.g, c:\dev or /home/user/dev
+  2. Put the full path to the folder (e.g. c:\dev\bonjour4firefox on
+     Windows, /home/user/dev/bonjour4firefox on Linux) in a file named
+     bonjour4firefox@apple.com and copy that file to
+     [your profile folder]\extensions\
+  3. Restart Firefox.
+
+For more information, see the Mozillazine Knowledge Base:
+http://kb.mozillazine.org/Getting_started_with_extension_development
+
+-Ted Mielczarek <ted.mielczarek@gmail.com>
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/_internal_toobar-button.png b/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/_internal_toobar-button.png
new file mode 100644
index 00000000..2bd6c9dc
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/_internal_toobar-button.png
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/overlay.css b/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/overlay.css
new file mode 100644
index 00000000..f5f4a281
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/skin-darwin/overlay.css
@@ -0,0 +1,17 @@
+#bonjour4firefox-hello
+{
+  color: red ! important;
+}
+#bonjour4firefox-toolbar-button
+{
+  list-style-image: url("chrome://bonjour4firefox/skin/_internal_toolbar-button.png");
+  -moz-image-region: rect(0px 36px 23px 0px);
+}
+#bonjour4firefox-toolbar-button[disabled="true"]
+{
+  -moz-image-region: rect(23px 36px 46px 0px);
+}
+#bonjour4firefox-toolbar-button:hover:active
+{
+  -moz-image-region: rect(46px 36px 69px 0px);
+}
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/skin/_internal_toobar-button.png b/mDNSResponder/Clients/FirefoxExtension/extension/skin/_internal_toobar-button.png
new file mode 100755
index 00000000..d99a0c98
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/skin/_internal_toobar-button.png
diff --git a/mDNSResponder/Clients/FirefoxExtension/extension/skin/overlay.css b/mDNSResponder/Clients/FirefoxExtension/extension/skin/overlay.css
new file mode 100755
index 00000000..b2865603
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/extension/skin/overlay.css
@@ -0,0 +1,21 @@
+#bonjour4firefox-hello
+{
+  color: black ! important;
+}
+#bonjour4firefox-toolbar-button
+{
+  list-style-image: url("chrome://bonjour4firefox/skin/_internal_toolbar-button.png");
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+#bonjour4firefox-toolbar-button:hover
+{
+  -moz-image-region: rect(24px 24px 48px  0px);
+}
+[iconsize="small"] #bonjour4firefox-toolbar-button
+{
+  -moz-image-region: rect( 0px 40px 16px 24px);
+}
+[iconsize="small"] #bonjour4firefox-toolbar-button:hover
+{
+  -moz-image-region: rect(24px 40px 40px 24px);
+}
diff --git a/mDNSResponder/Clients/FirefoxExtension/readme.txt b/mDNSResponder/Clients/FirefoxExtension/readme.txt
new file mode 100644
index 00000000..f898f330
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/readme.txt
@@ -0,0 +1,16 @@
+Building the Bonjour Firefox Extension on Windows
+
+There is a Visual Studio 2005 project file that will build the extension correctly as long as the Visual Studio environment is setup correctly.  This code was built against the 1.9 version of the XULRunner SDK.  The Visual Studio environment should be modified to add the include and lib paths of the XULRunner SDK.  Specifically, the following include paths should be added to VC++ include directories:
+
+…\xulrunner-sdk\include\xpcom
+…\xulrunner-sdk\include\nspr
+…\xulrunner-sdk\include\string
+…\xulrunner-sdk\include\pref
+…\xulrunner-sdk\sdk\include
+
+The following path should be added to VC++ lib directories:
+
+…\xulrunner-sdk\lib
+
+After the code has been built, it can be installed like any other Firefox extension.  Please consult Firefox extension documentation for more information on how to package and install Firefox extensions.
+
diff --git a/mDNSResponder/Clients/FirefoxExtension/resource.h b/mDNSResponder/Clients/FirefoxExtension/resource.h
new file mode 100644
index 00000000..42710b88
--- /dev/null
+++ b/mDNSResponder/Clients/FirefoxExtension/resource.h
@@ -0,0 +1,27 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FirefoxExtension.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_WMDMLOGGER                  101
+#define IDS_LOG_SEV_INFO                201
+#define IDS_LOG_SEV_WARN                202
+#define IDS_LOG_SEV_ERROR               203
+#define IDS_LOG_DATETIME                204
+#define IDS_LOG_SRCNAME                 205
+#define IDS_DEF_LOGFILE                 301
+#define IDS_DEF_MAXSIZE                 302
+#define IDS_DEF_SHRINKTOSIZE            303
+#define IDS_DEF_LOGENABLED              304
+#define IDS_MUTEX_TIMEOUT               401
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/Java/BrowserApp.java b/mDNSResponder/Clients/Java/BrowserApp.java
new file mode 100644
index 00000000..8f512151
--- /dev/null
+++ b/mDNSResponder/Clients/Java/BrowserApp.java
@@ -0,0 +1,420 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	BrowserApp demonstrates how to use DNS-SD to browse for and resolve services.
+
+	To do:
+	- display resolved TXTRecord
+ */
+
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import java.text.*;
+import javax.swing.*;
+import javax.swing.event.*;
+
+import com.apple.dnssd.*;
+
+
+class	BrowserApp implements ListSelectionListener, ResolveListener, Runnable
+{
+	static BrowserApp	app;
+	JFrame				frame;
+	DomainListModel		domainList;
+	BrowserListModel	servicesList, serviceList;
+	JList				domainPane, servicesPane, servicePane;
+	DNSSDService		servicesBrowser, serviceBrowser, domainBrowser;
+	JLabel				hostLabel, portLabel;
+	String				hostNameForUpdate;
+	int					portForUpdate;
+
+	public		BrowserApp()
+	{
+		frame = new JFrame("DNS-SD Service Browser");
+		frame.addWindowListener(new WindowAdapter() {
+			public void windowClosing(WindowEvent e) {System.exit(0);}
+		});
+
+		domainList = new DomainListModel();
+		servicesList = new ServicesBrowserListModel();
+		serviceList = new BrowserListModel();
+
+		try {
+			domainBrowser = DNSSD.enumerateDomains( DNSSD.BROWSE_DOMAINS, 0, domainList);
+
+			servicesBrowser = DNSSD.browse( 0, 0, "_services._dns-sd._udp.", "", servicesList);
+			serviceBrowser = null;
+		}
+		catch ( Exception ex) { terminateWithException( ex); }
+
+		this.setupSubPanes( frame.getContentPane());
+		frame.pack();
+		frame.setVisible(true);
+	}
+
+	protected void	setupSubPanes( Container parent)
+	{
+		parent.setLayout( new BoxLayout( parent, BoxLayout.Y_AXIS));
+
+		JPanel browserRow = new JPanel();
+		browserRow.setLayout( new BoxLayout( browserRow, BoxLayout.X_AXIS));
+		domainPane = new JList( domainList);
+		domainPane.addListSelectionListener( this);
+		JScrollPane domainScroller = new JScrollPane( domainPane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+		browserRow.add( domainScroller);
+		servicesPane = new JList( servicesList);
+		servicesPane.addListSelectionListener( this);
+		JScrollPane servicesScroller = new JScrollPane( servicesPane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+		browserRow.add( servicesScroller);
+		servicePane = new JList( serviceList);
+		servicePane.addListSelectionListener( this);
+		JScrollPane serviceScroller = new JScrollPane( servicePane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+		browserRow.add( serviceScroller);
+
+/*
+		JPanel buttonRow = new JPanel();
+		buttonRow.setLayout( new BoxLayout( buttonRow, BoxLayout.X_AXIS));
+		buttonRow.add( Box.createHorizontalGlue());
+		JButton connectButton = new JButton( "Don't Connect");
+		buttonRow.add( connectButton);
+		buttonRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+*/
+
+		JPanel labelRow = new JPanel();
+		labelRow.setLayout( new BoxLayout( labelRow, BoxLayout.X_AXIS));
+		labelRow.add( new JLabel( "  Host: "));
+		hostLabel = new JLabel();
+		labelRow.add( hostLabel);
+		labelRow.add( Box.createRigidArea( new Dimension( 32, 0)));
+		labelRow.add( new JLabel( "Port: "));
+		portLabel = new JLabel();
+		labelRow.add( portLabel);
+		labelRow.add( Box.createHorizontalGlue());
+
+		parent.add( browserRow);
+		parent.add( Box.createRigidArea( new Dimension( 0, 8)));
+		parent.add( labelRow);
+//		parent.add( buttonRow);
+		parent.add( Box.createRigidArea( new Dimension( 0, 16)));
+	}
+
+	public void valueChanged( ListSelectionEvent e)
+	{
+		try {
+			if ( e.getSource() == domainPane && !e.getValueIsAdjusting())
+			{
+				int		newSel = domainPane.getSelectedIndex();
+				if ( -1 != newSel)
+				{
+					if ( serviceBrowser != null)
+						serviceBrowser.stop();
+					serviceList.removeAllElements();
+					servicesBrowser = DNSSD.browse( 0, 0, "_services._dns-sd._udp.", "", servicesList);
+				}
+			}
+			else if ( e.getSource() == servicesPane && !e.getValueIsAdjusting())
+			{
+				int		newSel = servicesPane.getSelectedIndex();
+				if ( serviceBrowser != null)
+					serviceBrowser.stop();
+				serviceList.removeAllElements();
+				if ( -1 != newSel)
+					serviceBrowser = DNSSD.browse( 0, 0, servicesList.getNthRegType( newSel), "", serviceList);
+			}
+			else if ( e.getSource() == servicePane && !e.getValueIsAdjusting())
+			{
+				int		newSel = servicePane.getSelectedIndex();
+
+				hostLabel.setText( "");
+				portLabel.setText( "");
+
+				if ( -1 != newSel)
+				{
+					DNSSD.resolve( 0, serviceList.getNthInterface( newSel), 
+										serviceList.getNthServiceName( newSel), 
+										serviceList.getNthRegType( newSel), 
+										serviceList.getNthDomain( newSel), 
+										this);
+				}
+			}
+		}
+		catch ( Exception ex) { terminateWithException( ex); }
+	}
+
+	public void run()
+	{
+		hostLabel.setText( hostNameForUpdate);
+		portLabel.setText( String.valueOf( portForUpdate));		
+	}
+
+	public void	serviceResolved( DNSSDService resolver, int flags, int ifIndex, String fullName, 
+								String hostName, int port, TXTRecord txtRecord)
+	{
+		// We want to update GUI on the AWT event dispatching thread, but we can't stop
+		// the resolve from that thread, since stop() is synchronized with this callback.
+		// So, we stop the resolve on this thread, then invokeAndWait on the AWT event thread.
+
+		resolver.stop();
+
+		hostNameForUpdate = hostName;
+		portForUpdate = port;
+
+		try {
+			SwingUtilities.invokeAndWait(this);
+		}
+		catch ( Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		service.stop();
+		// handle failure here
+	}
+
+	protected static void	terminateWithException( Exception e)
+	{
+		e.printStackTrace();
+		System.exit( -1);
+	}
+
+    public static void main(String s[]) 
+    {
+		app = new BrowserApp();
+    }
+}
+
+
+class	BrowserListModel extends DefaultListModel implements BrowseListener, Runnable
+{
+	public		BrowserListModel()
+	{
+		addCache = new Vector();
+		removeCache = new Vector();
+	}
+
+	/* The Browser invokes this callback when a service is discovered. */
+	public void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	{
+		addCache.add( new BrowserListElem( serviceName, domain, regType, ifIndex));
+		if ( ( flags & DNSSD.MORE_COMING) == 0)
+			this.scheduleOnEventThread();
+	}
+
+	public void	serviceLost( DNSSDService browser, int flags, int ifIndex,
+							String serviceName, String regType, String domain)
+	{
+		removeCache.add( serviceName);
+		if ( ( flags & DNSSD.MORE_COMING) == 0)
+			this.scheduleOnEventThread();
+	}
+
+	public void	run()
+	{
+		while ( removeCache.size() > 0)
+		{
+			String	serviceName = (String) removeCache.remove( removeCache.size() - 1);
+			int		matchInd = this.findMatching( serviceName);	// probably doesn't handle near-duplicates well.
+			if ( matchInd != -1)
+				this.removeElementAt( matchInd);
+		}
+		while ( addCache.size() > 0)
+		{
+			BrowserListElem	elem = (BrowserListElem) addCache.remove( addCache.size() - 1);
+			if ( -1 == this.findMatching( elem.fServiceName))	// probably doesn't handle near-duplicates well.
+				this.addInSortOrder( elem);
+		}
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		// handle failure here
+	}
+
+	/* The list contains BrowserListElem's */
+	class	BrowserListElem
+	{
+		public	BrowserListElem( String serviceName, String domain, String type, int ifIndex)
+		{ fServiceName = serviceName; fDomain = domain; fType = type; fInt = ifIndex; }
+		
+		public String	toString() { return fServiceName; }
+		
+		public String	fServiceName, fDomain, fType;
+		public int		fInt;
+	}
+
+	public String	getNthServiceName( int n)
+	{
+		BrowserListElem sel = (BrowserListElem) this.get( n);
+		return sel.fServiceName;
+	}
+
+	public String	getNthRegType( int n)
+	{
+		BrowserListElem sel = (BrowserListElem) this.get( n);
+		return sel.fType;
+	}
+
+	public String	getNthDomain( int n)
+	{
+		BrowserListElem sel = (BrowserListElem) this.get( n);
+		return sel.fDomain;
+	}
+
+	public int		getNthInterface( int n)
+	{
+		BrowserListElem sel = (BrowserListElem) this.get( n);
+		return sel.fInt;
+	}
+
+	protected void	addInSortOrder( Object obj)
+	{
+		int	i;
+		for ( i = 0; i < this.size(); i++)
+			if ( sCollator.compare( obj.toString(), this.getElementAt( i).toString()) < 0)
+				break;
+		this.add( i, obj);
+	}
+
+	protected int	findMatching( String match)
+	{
+		for ( int i = 0; i < this.size(); i++)
+			if ( match.equals( this.getElementAt( i).toString()))
+				return i;
+		return -1;
+	}
+
+	protected void	scheduleOnEventThread()
+	{
+		try {
+			SwingUtilities.invokeAndWait( this);
+		}
+		catch ( Exception e)
+		{
+			e.printStackTrace();
+		}
+	}		
+
+	protected Vector	removeCache;	// list of serviceNames to remove
+	protected Vector	addCache;		// list of BrowserListElem's to add
+
+	protected static Collator	sCollator;
+
+	static	// Initialize our static variables
+	{
+		sCollator = Collator.getInstance();
+		sCollator.setStrength( Collator.PRIMARY);
+	}
+}
+
+
+class	ServicesBrowserListModel extends BrowserListModel
+{
+	/* The Browser invokes this callback when a service is discovered. */
+	public void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	// Overridden to stuff serviceName into regType and make serviceName human-readable.
+	{
+		regType = serviceName + ( regType.startsWith( "_udp.") ? "._udp." : "._tcp.");
+		super.serviceFound( browser, flags, ifIndex, this.mapTypeToName( serviceName), regType, domain);
+	}
+
+	public void	serviceLost( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	// Overridden to make serviceName human-readable.
+	{
+		super.serviceLost( browser, flags, ifIndex, this.mapTypeToName( serviceName), regType, domain);
+	}
+
+	protected String	mapTypeToName( String type)
+	// Convert a registration type into a human-readable string. Returns original string on no-match.
+	{
+		final String[]	namedServices = {
+			"_afpovertcp",	"Apple File Sharing",
+			"_http",		"World Wide Web servers",
+			"_daap",		"Digital Audio Access",
+			"_apple-sasl",	"Apple Password Servers",
+			"_distcc",		"Distributed Compiler nodes",
+			"_finger",		"Finger servers",
+			"_ichat",		"iChat clients",
+			"_presence",	"iChat AV clients",
+			"_ssh",			"SSH servers",
+			"_telnet",		"Telnet servers",
+			"_workstation",	"Macintosh Manager clients",
+			"_bootps",		"BootP servers",
+			"_xserveraid",	"XServe RAID devices",
+			"_eppc",		"Remote AppleEvents",
+			"_ftp",			"FTP services",
+			"_tftp",		"TFTP services"
+		};
+
+		for ( int i = 0; i < namedServices.length; i+=2)
+			if ( namedServices[i].equals( type))
+				return namedServices[i + 1];
+		return type;
+	}
+}
+
+
+class	DomainListModel extends DefaultListModel implements DomainListener
+{
+	/* Called when a domain is discovered. */
+	public void	domainFound( DNSSDService domainEnum, int flags, int ifIndex, String domain)
+	{
+		if ( !this.contains( domain))
+			this.addElement( domain);
+	}
+	
+	public void	domainLost( DNSSDService domainEnum, int flags, int ifIndex, String domain)
+	{
+		if ( this.contains( domain))
+			this.removeElement( domain);
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		// handle failure here
+	}
+}
+
diff --git a/mDNSResponder/Clients/Java/BrowserApp.manifest b/mDNSResponder/Clients/Java/BrowserApp.manifest
new file mode 100644
index 00000000..7c392a19
--- /dev/null
+++ b/mDNSResponder/Clients/Java/BrowserApp.manifest
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: BrowserApp
diff --git a/mDNSResponder/Clients/Java/DNSSDUnitTest.java b/mDNSResponder/Clients/Java/DNSSDUnitTest.java
new file mode 100644
index 00000000..2b1839a0
--- /dev/null
+++ b/mDNSResponder/Clients/Java/DNSSDUnitTest.java
@@ -0,0 +1,334 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * DNSSDUnitTest is a simple program that exercises parts of the DNSSD API.
+ */
+
+import com.apple.dnssd.*;
+
+import java.net.*;
+import java.util.*;
+
+
+class	DNSSDUnitTest
+{
+	public static final String	TEST_TYPE = "_unittest._udp";
+	public static final String	WIRE_CHAR_SET = "ISO-8859-1";
+
+	public DNSSDUnitTest	fInstance = null;
+
+	public		DNSSDUnitTest() throws Exception
+	{
+		fStage = 0;
+		fInstance = this;
+		
+		Enumeration	en = NetworkInterface.getNetworkInterfaces();
+		while ( en.hasMoreElements())
+			System.out.println( ((NetworkInterface) en.nextElement()).getName());
+	}
+
+	public void	testTxtRecord()
+	{
+		byte[]		src = { 6, 'a', 't', '=', 'X', 'Y', 'Z' };
+		TXTRecord	txtRecord = new TXTRecord( src);
+		String		a;
+		
+		txtRecord.set( "path", "~/names");
+		txtRecord.set( "rw", (String) null);
+		txtRecord.set( "empty", "");
+		txtRecord.set( "ttl", "4");
+
+		byte[]	rawBytes = txtRecord.getRawBytes();
+		System.out.println( ( new String( rawBytes, 0, rawBytes.length)) + " has count " + 
+								String.valueOf( txtRecord.size()));
+
+		System.out.println( txtRecord);
+		boolean		ttlPresent = txtRecord.contains( "ttl");
+		System.out.println( "ttl is present: " + ( ttlPresent ? "true" : "false"));
+		boolean		timeoutPresent = txtRecord.contains( "timeout");
+		System.out.println( "timeout is present: " + ( timeoutPresent ? "true" : "false"));
+
+		txtRecord.set( "path", "~/numbers");
+		System.out.println( txtRecord);
+
+		txtRecord.remove( "ttl");
+		System.out.println( txtRecord);
+
+		txtRecord.remove( "path");
+		System.out.println( txtRecord);
+
+		txtRecord.remove( "at");
+		System.out.println( txtRecord);
+
+		txtRecord.set( "rw", "1");
+		System.out.println( txtRecord);
+	}
+
+	public void	run() throws DNSSDException
+	{
+		System.out.println( "Running DNSSD unit test for " + System.getProperty( "user.name"));
+
+		this.testTxtRecord();
+
+		fRegTest = new RegTest();
+		new BrowseTest();
+		new DomainTest();
+		new RegistrarTest();
+		
+		this.waitForEnd();
+	}
+
+	protected int		fStage;
+	protected RegTest	fRegTest;
+
+	public synchronized void bumpStage()
+	{
+		fStage++;
+		this.notifyAll();
+	}
+
+	protected synchronized void waitForEnd()
+	{
+		int stage = fStage;
+		while ( stage == fStage)
+		{
+			try {
+				wait();
+			} catch (InterruptedException e) {}
+		}
+	}
+
+    public static void main(String s[]) 
+    {
+    	try {
+			new DNSSDUnitTest().run();
+		}
+		catch ( Exception e) { terminateWithException( e); }
+    }
+
+	protected static void	terminateWithException( Exception e)
+	{
+		e.printStackTrace();
+		System.exit( -1);
+	}
+}
+
+class	TermReporter implements BaseListener
+{
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		System.out.println( this.getClass().getName() + " encountered error " + String.valueOf( errorCode));
+	}
+
+	protected void finalize() throws Throwable
+	{
+		System.out.println( "Instance of " + this.getClass().getName() + " has been destroyed");
+	}
+}
+
+class	RegTest extends TermReporter implements RegisterListener
+{
+	public static final int		TEST_PORT = 5678;
+
+	public		RegTest() throws DNSSDException
+	{
+		fReg = DNSSD.register( 0, 0, "Test service", DNSSDUnitTest.TEST_TYPE, "", "", TEST_PORT, null, this);
+	}
+
+	public void	serviceRegistered( DNSSDRegistration registration, int flags, String serviceName, 
+								String regType, String domain)
+	{
+		String s = "RegTest result flags:" + String.valueOf( flags) + 
+					" serviceName:" + serviceName + " regType:" + regType + " domain:" + domain;
+		System.out.println( s);
+
+		try {
+			new DupRegTest();
+			
+			byte[]	kResponsiblePerson = { 'c','o','o','k','i','e',' ','m','o','n','s','t','e','r' };
+			fReg.addRecord( 0, 17 /*ns_t_rp*/, kResponsiblePerson, 3600);
+			new QueryTest( 0, 0, "Test service", 17 /*ns_t_rp*/, 1);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	protected DNSSDRegistration	fReg;
+}
+
+class	DupRegTest extends TermReporter implements RegisterListener
+{
+	public static final int		TEST_PORT = 5678;
+
+	public		DupRegTest() throws DNSSDException
+	{
+		DNSSD.register( DNSSD.NO_AUTO_RENAME | DNSSD.UNIQUE, 0, "Test service", DNSSDUnitTest.TEST_TYPE, "", "", TEST_PORT + 1, null, this);
+	}
+
+	public void	serviceRegistered( DNSSDRegistration registration, int flags, String serviceName, 
+								String regType, String domain)
+	{
+		System.out.println( "Oik - registered a duplicate!");
+		String s = "DupRegTest result flags:" + String.valueOf( flags) + 
+					" serviceName:" + serviceName + " regType:" + regType + " domain:" + domain;
+		System.out.println( s);
+	}
+}
+
+class	BrowseTest extends TermReporter implements BrowseListener
+{
+	public		BrowseTest()
+	{
+		try {
+			DNSSD.browse( 0, 0, DNSSDUnitTest.TEST_TYPE, "", this);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	public void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	{
+		String s = "BrowseTest found flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" serviceName:" + serviceName + " regType:" + regType + " domain:" + domain;
+		System.out.println( s);
+		
+		System.out.println( "Resolving " + serviceName);
+		new ResolveTest( 0, ifIndex, serviceName, regType, domain);
+	}
+
+	public void	serviceLost( DNSSDService browser, int flags, int ifIndex,
+							String serviceName, String regType, String domain)
+	{
+		String s = "BrowseTest lost flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" serviceName:" + serviceName + " regType:" + regType + " domain:" + domain;
+		System.out.println( s);
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		System.out.println( "Browse failed " + String.valueOf( errorCode));
+	}
+}
+
+class	DomainTest extends TermReporter implements DomainListener
+{
+	public		DomainTest()
+	{
+		try {
+			DNSSD.enumerateDomains( DNSSD.BROWSE_DOMAINS, 0, this);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	public void	domainFound( DNSSDService enumerator, int flags, int ifIndex, String domain)
+	{
+		String s = "Domain found flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" domain:" + domain;
+		System.out.println( s);
+	}
+
+	public void	domainLost( DNSSDService enumerator, int flags, int ifIndex, String domain)
+	{
+		String s = "Domain lost flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" domain:" + domain;
+		System.out.println( s);
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		System.out.println( "Domain enum op failed " + String.valueOf( errorCode));
+	}
+}
+
+class	ResolveTest extends TermReporter implements ResolveListener
+{
+	public		ResolveTest( int flags, int ifIndex, String serviceName, String regType, 
+							String domain)
+	{
+		try {
+			DNSSD.resolve( flags, ifIndex, serviceName, regType, domain, this);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	public void	serviceResolved( DNSSDService resolver, int flags, int ifIndex, String fullName, 
+								String hostName, int port, TXTRecord txtRecord)
+	{
+		String a;
+		String s = "ResolveTest result flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" fullName:" + fullName + " hostName:" + hostName + " port:" + String.valueOf( port);
+		for ( int i=0; null != ( a = txtRecord.getKey( i)); i++)
+			s += " attr/val " + String.valueOf( i) + ": " + a + "," + txtRecord.getValueAsString( i);
+
+		System.out.println( s);
+
+		System.out.println( "Querying " + hostName);
+		new QueryTest( 0, ifIndex, hostName, 1 /* ns_t_a */, 1 /* ns_c_in */);
+	}
+}
+
+class	QueryTest extends TermReporter implements QueryListener
+{
+	public		QueryTest( int flags, int ifIndex, String serviceName, int rrtype, int rrclass)
+	{
+		try {
+			DNSSD.queryRecord( flags, ifIndex, serviceName, rrtype, rrclass, this);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	public void	queryAnswered( DNSSDService query, int flags, int ifIndex, String fullName, 
+								int rrtype, int rrclass, byte[] rdata, int ttl)
+	{
+		String s = "QueryTest result flags:" + String.valueOf( flags) + 
+					" ifIndex:" + String.valueOf( ifIndex) + 
+					" fullName:" + fullName + " rrtype:" + String.valueOf( rrtype) + 
+					" rrclass:" + String.valueOf( rrclass) + " ttl:" + String.valueOf( ttl);
+		System.out.println( s);
+
+		try {
+			String	dataTxt = new String( rdata, 0, rdata.length, DNSSDUnitTest.WIRE_CHAR_SET);
+			System.out.println( "Query data is:" + dataTxt);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+}
+
+class	RegistrarTest extends TermReporter implements RegisterRecordListener
+{
+	public		RegistrarTest()
+	{
+		try {
+			byte[]	kResponsiblePerson = { 'g','r','o','v','e','r' };
+			fRegistrar = DNSSD.createRecordRegistrar( this);
+			fRegistrar.registerRecord( DNSSD.UNIQUE, 0,
+					"test.registrartest.local", 17 /*ns_t_rp*/, 1, kResponsiblePerson, 3600);
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	public void	recordRegistered( DNSRecord record, int flags)
+	{
+		String s = "RegistrarTest result flags:" + String.valueOf( flags);
+		System.out.println( s);
+
+		try {
+			byte[]	kResponsiblePerson = { 'e','l','m','o' };
+			record.update( 0, kResponsiblePerson, 3600);
+			record.remove();
+		} catch( Exception e) { e.printStackTrace(); }
+	}
+
+	protected DNSSDRecordRegistrar	fRegistrar;
+}
+
diff --git a/mDNSResponder/Clients/Java/JavaSamples.vcproj b/mDNSResponder/Clients/Java/JavaSamples.vcproj
new file mode 100755
index 00000000..fbb68257
--- /dev/null
+++ b/mDNSResponder/Clients/Java/JavaSamples.vcproj
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaSamples"

+	ProjectGUID="{A987A0C1-344F-475C-869C-F082EB11EEBA}"

+	Keyword="MakeFileProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar"

+				ReBuildCommandLine="nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar"

+				CleanCommandLine="nmake /f nmakefile DEBUG=1 CLEAN"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar"

+				ReBuildCommandLine="nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar"

+				CleanCommandLine="nmake /f nmakefile CLEAN"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar"

+				ReBuildCommandLine="nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar"

+				CleanCommandLine="nmake /f nmakefile DEBUG=1 CLEAN"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar"

+				ReBuildCommandLine="nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar"

+				CleanCommandLine="nmake /f nmakefile CLEAN"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/Java/JavaSamples.vcxproj b/mDNSResponder/Clients/Java/JavaSamples.vcxproj
new file mode 100755
index 00000000..046cbd5d
--- /dev/null
+++ b/mDNSResponder/Clients/Java/JavaSamples.vcxproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{A987A0C1-344F-475C-869C-F082EB11EEBA}</ProjectGuid>

+    <Keyword>MakeFileProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f nmakefile DEBUG=1 CLEAN</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f nmakefile CLEAN</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f nmakefile DEBUG=1 DNS_SD=..\..\mDNSWindows\Java\build\debug\dns_sd.jar</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f nmakefile DEBUG=1 CLEAN</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f nmakefile DNS_SD=..\..\mDNSWindows\Java\build\prod\dns_sd.jar</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f nmakefile CLEAN</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+  </PropertyGroup>

+  <ItemDefinitionGroup>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\Java\Java.vcxproj">

+      <Project>{9ce2568a-3170-41c6-9f20-a0188a9ec114}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/Java/SimpleChat.java b/mDNSResponder/Clients/Java/SimpleChat.java
new file mode 100644
index 00000000..a1fee5c0
--- /dev/null
+++ b/mDNSResponder/Clients/Java/SimpleChat.java
@@ -0,0 +1,333 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	SimpleChat is a simple peer-to-peer chat program that demonstrates 
+	DNS-SD registration, browsing, resolving and record-querying.
+
+	To do:
+	- implement better coloring algorithm
+ */
+
+
+import java.awt.*;
+import java.awt.event.*;
+import java.text.*;
+import java.net.*;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.text.*;
+
+import com.apple.dnssd.*;
+
+
+class	SimpleChat implements	ResolveListener, RegisterListener, QueryListener, 
+								ActionListener, ItemListener, Runnable
+{
+	Document			textDoc;			// Holds all the chat text
+	JTextField			inputField;			// Holds a pending chat response
+	String				ourName;			// name used to identify this user in chat
+	DNSSDService		browser;			// object that actively browses for other chat clients
+	DNSSDService		resolver;			// object that resolves other chat clients
+	DNSSDRegistration	registration;		// object that maintains our connection advertisement
+	JComboBox			targetPicker;		// Indicates who we're talking to
+	TargetListModel		targetList;			// and its list model
+	JButton				sendButton;			// Will send text in inputField to target
+	InetAddress			buddyAddr;			// and address
+	int					buddyPort;			// and port
+	DatagramPacket		dataPacket;			// Inbound data packet
+	DatagramSocket		outSocket;			// Outbound data socket
+	SimpleAttributeSet	textAttribs;
+
+	static final String	kChatExampleRegType = "_p2pchat._udp";
+	static final String	kWireCharSet = "ISO-8859-1";
+
+	public		SimpleChat() throws Exception
+	{
+		JFrame frame = new JFrame("SimpleChat");
+		frame.addWindowListener(new WindowAdapter() {
+			public void windowClosing(WindowEvent e) {System.exit(0);}
+		});
+
+    	ourName = System.getProperty( "user.name");
+		targetList = new TargetListModel();
+		textAttribs = new SimpleAttributeSet();
+		DatagramSocket inSocket = new DatagramSocket();
+		dataPacket = new DatagramPacket( new byte[ 4096], 4096);
+		outSocket = new DatagramSocket();
+
+		this.setupSubPanes( frame.getContentPane(), frame.getRootPane());
+		frame.pack();
+		frame.setVisible(true);
+		inputField.requestFocusInWindow();
+
+		browser = DNSSD.browse( 0, 0, kChatExampleRegType, "", new SwingBrowseListener( targetList));
+
+		registration = DNSSD.register( 0, 0, ourName, kChatExampleRegType, "", "", inSocket.getLocalPort(), null, this);
+
+		new ListenerThread( this, inSocket, dataPacket).start();
+	}
+
+	protected void	setupSubPanes( Container parent, JRootPane rootPane)
+	{	
+		parent.setLayout( new BoxLayout( parent, BoxLayout.Y_AXIS));
+
+		JPanel textRow = new JPanel();
+		textRow.setLayout( new BoxLayout( textRow, BoxLayout.X_AXIS));
+		textRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+		JEditorPane textPane = new JEditorPane( "text/html", "<BR>");
+		textPane.setPreferredSize( new Dimension( 400, 300));
+		textPane.setEditable( false);
+		JScrollPane textScroller = new JScrollPane( textPane);
+		textRow.add( textScroller);
+		textRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+		textDoc = textPane.getDocument();
+
+		JPanel addressRow = new JPanel();
+		addressRow.setLayout( new BoxLayout( addressRow, BoxLayout.X_AXIS));
+		targetPicker = new JComboBox( targetList);
+		targetPicker.addItemListener( this);
+		addressRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+		addressRow.add( new JLabel( "Talk to: "));
+		addressRow.add( targetPicker);
+		addressRow.add( Box.createHorizontalGlue());
+
+		JPanel buttonRow = new JPanel();
+		buttonRow.setLayout( new BoxLayout( buttonRow, BoxLayout.X_AXIS));
+		buttonRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+		inputField = new JTextField();
+		// prevent inputField from hijacking <Enter> key
+		inputField.getKeymap().removeKeyStrokeBinding( KeyStroke.getKeyStroke( KeyEvent.VK_ENTER, 0));
+		buttonRow.add( inputField);
+		sendButton = new JButton( "Send");
+		buttonRow.add( Box.createRigidArea( new Dimension( 8, 0)));
+		buttonRow.add( sendButton);
+		buttonRow.add( Box.createRigidArea( new Dimension( 16, 0)));
+		rootPane.setDefaultButton( sendButton);
+		sendButton.addActionListener( this);
+		sendButton.setEnabled( false);
+
+		parent.add( Box.createRigidArea( new Dimension( 0, 16)));
+		parent.add( textRow);
+		parent.add( Box.createRigidArea( new Dimension( 0, 8)));
+		parent.add( addressRow);
+		parent.add( Box.createRigidArea( new Dimension( 0, 8)));
+		parent.add( buttonRow);
+		parent.add( Box.createRigidArea( new Dimension( 0, 16)));
+	}
+
+	public void	serviceRegistered( DNSSDRegistration registration, int flags, 
+									String serviceName, String regType, String domain)
+	{
+		ourName = serviceName;		// might have been renamed on collision
+	}
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		System.out.println( "Service reported error " + String.valueOf( errorCode));
+	}
+
+	public void	serviceResolved( DNSSDService resolver, int flags, int ifIndex, String fullName, 
+										String hostName, int port, TXTRecord txtRecord)
+	{
+		buddyPort = port;
+		try {
+			// Start a record query to obtain IP address from hostname
+			DNSSD.queryRecord( 0, ifIndex, hostName, 1 /* ns_t_a */, 1 /* ns_c_in */, 
+								new SwingQueryListener( this));
+		}
+		catch ( Exception e) { terminateWithException( e); }
+		resolver.stop();
+	}
+
+	public void	queryAnswered( DNSSDService query, int flags, int ifIndex, String fullName, 
+									int rrtype, int rrclass, byte[] rdata, int ttl)
+	{
+		try {
+			buddyAddr = InetAddress.getByAddress( rdata);
+		}
+		catch ( Exception e) { terminateWithException( e); }
+		sendButton.setEnabled( true);
+	}
+
+	public void		actionPerformed( ActionEvent e) 	// invoked when Send button is hit
+	{
+		try
+		{
+			String	sendString = ourName + ": " + inputField.getText();
+			byte[] sendData = sendString.getBytes( kWireCharSet);
+			outSocket.send( new DatagramPacket( sendData, sendData.length, buddyAddr, buddyPort));
+			StyleConstants.setForeground( textAttribs, Color.black);
+			textDoc.insertString( textDoc.getLength(), inputField.getText() + "\n", textAttribs);
+			inputField.setText( "");
+		}
+		catch ( Exception exception) { terminateWithException( exception); }
+	}
+
+	public void		itemStateChanged( ItemEvent e) 	// invoked when Target selection changes
+	{
+		sendButton.setEnabled( false);
+		if ( e.getStateChange() == ItemEvent.SELECTED)
+		{
+			try {
+				TargetListElem	sel = (TargetListElem) targetList.getSelectedItem();
+				resolver = DNSSD.resolve( 0, sel.fInt, sel.fServiceName, sel.fType, sel.fDomain, this);
+			}
+			catch ( Exception exception) { terminateWithException( exception); }
+		}
+	}
+
+	public void		run()		// invoked on event thread when inbound packet arrives
+	{
+		try
+		{
+			String	inMessage = new String( dataPacket.getData(), 0, dataPacket.getLength(), kWireCharSet);
+			StyleConstants.setForeground( textAttribs, this.getColorFor( dataPacket.getData(), dataPacket.getLength()));
+			textDoc.insertString( textDoc.getLength(), inMessage + "\n", textAttribs);
+		}
+		catch ( Exception e) { terminateWithException( e); }
+	}
+
+	protected Color		getColorFor( byte[] chars, int length)
+	// Produce a mapping from a string to a color, suitable for text display
+	{
+		int		rgb = 0;
+		for ( int i=0; i < length && chars[i] != ':'; i++)
+			rgb = rgb ^ ( (int) chars[i] << (i%3+2) * 8);
+		return new Color( rgb & 0x007F7FFF);	// mask off high bits so it is a dark color
+		
+//		for ( int i=0; i < length && chars[i] != ':'; i++)
+		
+	}
+
+	protected static void	terminateWithException( Exception e)
+	{
+		e.printStackTrace();
+		System.exit( -1);
+	}
+
+    public static void main(String s[]) 
+    {
+    	try {
+			new SimpleChat();
+		}
+		catch ( Exception e) { terminateWithException( e); }
+    }
+}
+
+
+
+class	TargetListElem
+{
+	public	TargetListElem( String serviceName, String domain, String type, int ifIndex)
+	{ fServiceName = serviceName; fDomain = domain; fType = type; fInt = ifIndex; }
+	
+	public String	toString() { return fServiceName; }
+	
+	public String	fServiceName, fDomain, fType;
+	public int		fInt;
+}
+
+class		TargetListModel extends DefaultComboBoxModel implements BrowseListener
+{
+	/* The Browser invokes this callback when a service is discovered. */
+	public void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	{
+		TargetListElem		match = this.findMatching( serviceName);	// probably doesn't handle near-duplicates well.
+
+		if ( match == null)
+			this.addElement( new TargetListElem( serviceName, domain, regType, ifIndex));
+	}
+
+	/* The Browser invokes this callback when a service disappears. */
+	public void	serviceLost( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+	{
+		TargetListElem		match = this.findMatching( serviceName);	// probably doesn't handle near-duplicates well.
+
+		if ( match != null)
+			this.removeElement( match);
+	}
+
+	/* The Browser invokes this callback when a service disappears. */
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		System.out.println( "Service reported error " + String.valueOf( errorCode));
+	}
+
+	protected TargetListElem	findMatching( String match)
+	{
+		for ( int i = 0; i < this.getSize(); i++)
+			if ( match.equals( this.getElementAt( i).toString()))
+				return (TargetListElem) this.getElementAt( i);
+		return null;
+	}
+
+}
+
+
+// A ListenerThread runs its owner when datagram packet p appears on socket s.
+class	ListenerThread extends Thread
+{
+	public			ListenerThread( Runnable owner, DatagramSocket s, DatagramPacket p) 
+	{ fOwner = owner; fSocket = s; fPacket = p; }
+
+	public void		run()
+	{		
+		while ( true )
+		{
+			try 
+			{
+				fSocket.receive( fPacket);
+				SwingUtilities.invokeAndWait( fOwner);	// process data on main thread
+			}
+			catch( Exception e)
+			{
+				break;	// terminate thread
+			}
+		}
+	}
+
+	protected Runnable			fOwner;
+	protected DatagramSocket	fSocket;
+	protected DatagramPacket	fPacket;
+}
+
+
+
diff --git a/mDNSResponder/Clients/Java/SimpleChat.manifest b/mDNSResponder/Clients/Java/SimpleChat.manifest
new file mode 100644
index 00000000..45c02025
--- /dev/null
+++ b/mDNSResponder/Clients/Java/SimpleChat.manifest
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: SimpleChat
diff --git a/mDNSResponder/Clients/Java/SwingBrowseListener.java b/mDNSResponder/Clients/Java/SwingBrowseListener.java
new file mode 100644
index 00000000..db971b2b
--- /dev/null
+++ b/mDNSResponder/Clients/Java/SwingBrowseListener.java
@@ -0,0 +1,124 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+import javax.swing.*;
+import com.apple.dnssd.*;
+
+
+/**	Use this to schedule BrowseListener callbacks via SwingUtilities.invokeAndWait(). */
+
+public class SwingBrowseListener implements Runnable, BrowseListener
+{
+	/** Create a listener for DNSSD that will call your listener on the Swing/AWT event thread. */
+	public	SwingBrowseListener( BrowseListener listener)
+	{ fListener = listener; fErrorCode = 0; }
+
+	/** (Clients should not call this method directly.) */
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		fBrowser = service;
+		fErrorCode = errorCode;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain)
+
+	{
+		fBrowser = browser;
+		fIsAdd = true;
+		fFlags = flags;
+		fIndex = ifIndex;
+		fService = serviceName;
+		fRegType = regType;
+		fDomain = domain;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void	serviceLost( DNSSDService browser, int flags, int ifIndex,
+							String serviceName, String regType, String domain)
+	{
+		fBrowser = browser;
+		fIsAdd = false;
+		fFlags = flags;
+		fIndex = ifIndex;
+		fService = serviceName;
+		fRegType = regType;
+		fDomain = domain;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void		run()
+	{
+		if ( fErrorCode != 0)
+			fListener.operationFailed( fBrowser, fErrorCode);
+		else if ( fIsAdd)
+			fListener.serviceFound( fBrowser, fFlags, fIndex, fService, fRegType, fDomain);
+		else
+			fListener.serviceLost( fBrowser, fFlags, fIndex, fService, fRegType, fDomain);
+	}
+
+	protected void	schedule()
+	{		
+		try {
+			SwingUtilities.invokeAndWait( this);
+		}
+		catch ( Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	protected BrowseListener	fListener;
+
+	protected boolean			fIsAdd;
+	protected DNSSDService		fBrowser;
+	protected int				fFlags;
+	protected int				fIndex;
+	protected int				fErrorCode;
+	protected String			fService;
+	protected String			fRegType;
+	protected String			fDomain;
+}
+
diff --git a/mDNSResponder/Clients/Java/SwingDomainListener.java b/mDNSResponder/Clients/Java/SwingDomainListener.java
new file mode 100644
index 00000000..b67313b7
--- /dev/null
+++ b/mDNSResponder/Clients/Java/SwingDomainListener.java
@@ -0,0 +1,116 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+import javax.swing.*;
+import com.apple.dnssd.*;
+
+
+/**	Use this to schedule DomainListener callbacks via SwingUtilities.invokeAndWait(). */
+
+public class SwingDomainListener implements Runnable, DomainListener
+{
+	/** Create a listener for DNSSD that will call your listener on the Swing/AWT event thread. */
+	public	SwingDomainListener( DomainListener listener)
+	{ fListener = listener; fErrorCode = 0; }
+
+	/** (Clients should not call this method directly.) */
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		fEnumerator = service;
+		fErrorCode = errorCode;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void		domainFound( DNSSDService domainEnum, int flags, int ifIndex, String domain)
+
+	{
+		fEnumerator = domainEnum;
+		fIsAdd = true;
+		fFlags = flags;
+		fIndex = ifIndex;
+		fDomain = domain;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void		domainLost( DNSSDService domainEnum, int flags, int ifIndex, String domain)
+	{
+		fEnumerator = domainEnum;
+		fIsAdd = false;
+		fFlags = flags;
+		fIndex = ifIndex;
+		fDomain = domain;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void		run()
+	{
+		if ( fErrorCode != 0)
+			fListener.operationFailed( fEnumerator, fErrorCode);
+		else if ( fIsAdd)
+			fListener.domainFound( fEnumerator, fFlags, fIndex, fDomain);
+		else
+			fListener.domainLost( fEnumerator, fFlags, fIndex, fDomain);
+	}
+
+	protected void	schedule()
+	{		
+		try {
+			SwingUtilities.invokeAndWait( this);
+		}
+		catch ( Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	protected DomainListener	fListener;
+
+	protected boolean			fIsAdd;
+	protected DNSSDService		fEnumerator;
+	protected int				fFlags;
+	protected int				fIndex;
+	protected int				fErrorCode;
+	protected String			fDomain;
+}
+
diff --git a/mDNSResponder/Clients/Java/SwingQueryListener.java b/mDNSResponder/Clients/Java/SwingQueryListener.java
new file mode 100644
index 00000000..fcac75b8
--- /dev/null
+++ b/mDNSResponder/Clients/Java/SwingQueryListener.java
@@ -0,0 +1,108 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+import javax.swing.*;
+import com.apple.dnssd.*;
+
+
+/**	Use this to schedule QueryListener callbacks via SwingUtilities.invokeAndWait(). */
+
+public class SwingQueryListener implements Runnable, QueryListener
+{
+	/** Create a listener for DNSSD that will call your listener on the Swing/AWT event thread. */
+	public	SwingQueryListener( QueryListener listener)
+	{ fListener = listener; }
+
+	public void	operationFailed( DNSSDService service, int errorCode)
+	{
+		fQuery = service;
+		fErrorCode = errorCode;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void	queryAnswered( DNSSDService query, int flags, int ifIndex, String fullName, 
+								int rrtype, int rrclass, byte[] rdata, int ttl)
+	{
+		fQuery = query;
+		fFlags = flags;
+		fIndex = ifIndex;
+		fFullName = fullName;
+		fType = rrtype;
+		fClass = rrclass;
+		fData = rdata;
+		fTTL = ttl;
+		this.schedule();
+	}
+
+	/** (Clients should not call this method directly.) */
+	public void		run()
+	{
+		if ( fErrorCode != 0)
+			fListener.operationFailed( fQuery, fErrorCode);
+		else
+			fListener.queryAnswered( fQuery, fFlags, fIndex, fFullName, fType, fClass, fData, fTTL);
+	}
+
+	protected void	schedule()
+	{
+		try {
+			SwingUtilities.invokeAndWait( this);
+		}
+		catch ( Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	protected QueryListener		fListener;
+
+	protected DNSSDService		fQuery;
+	protected int				fFlags;
+	protected int				fIndex;
+	protected int				fErrorCode;
+	protected String			fFullName;
+	protected int				fType;
+	protected int				fClass;
+	protected byte[]			fData;
+	protected int				fTTL;
+}
+
diff --git a/mDNSResponder/Clients/Java/nmakefile b/mDNSResponder/Clients/Java/nmakefile
new file mode 100644
index 00000000..89168e0b
--- /dev/null
+++ b/mDNSResponder/Clients/Java/nmakefile
@@ -0,0 +1,109 @@
+# -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This Makefile builds .jar files for the DNS-SD Java sample apps.
+# You must have the Java support installed.
+#
+# nmake with no arguments builds all production targets.
+# 'nmake DEBUG=1' to build debugging targets.
+# 'nmake clean' or 'nmake clean DEBUG=1' to delete prod/debug objects & targets
+#
+# To run nmake, you may need to set up your PATH correctly, using a script 
+# such as: "\Program Files\Microsoft Visual Studio .NET\Common7\tools\vsvars32.bat"
+# 
+# The default location of the JDK is \javasdk. You can override this on the
+# command line (e.g. 'nmake JDK=\j2dk1.4.2_03').
+
+############################################################################
+
+JDK = $(JAVA_HOME)
+
+CP = copy
+RM = del /Q
+RMDIR = rmdir /S /Q
+JAVAC = $(JDK)\bin\javac
+JAVAH = $(JDK)\bin\javah
+JAR = $(JDK)\bin\jar
+
+# Set up diverging paths for debug vs. prod builds
+DEBUG=0
+!if $(DEBUG) == 1
+JFLAGS = -g
+OBJDIR = objects\debug
+BUILDDIR = build\debug
+!else
+JFLAGS = 
+OBJDIR = objects\prod
+BUILDDIR = build\prod
+!endif
+
+SCOBJ = $(OBJDIR)\SimpleChat
+BAOBJ = $(OBJDIR)\BrowserApp
+
+#############################################################################
+
+all: setup Java postbuild
+
+# 'setup' sets up the build directory structure the way we want
+setup:
+	@if not exist objects		mkdir objects
+	@if not exist build			mkdir build
+	@if not exist $(OBJDIR)		mkdir $(OBJDIR)
+	@if not exist $(SCOBJ)		mkdir $(SCOBJ)
+	@if not exist $(BAOBJ)		mkdir $(BAOBJ)
+	@if not exist $(BUILDDIR)	mkdir $(BUILDDIR)
+
+postbuild:
+	@if not "%RC_XBS%"=="YES" GOTO END
+	@if not exist "$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@copy "nmakefile"			"$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@copy "BrowserApp.java"		"$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@copy "SimpleChat.java"		"$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@copy "Swing*.java"			"$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@copy "$(BUILDDIR)\*.jar"	"$(DSTROOT)\Program Files\Bonjour SDK\Samples\Java"
+	@:END
+
+# clean removes targets and objects
+clean:
+	@if exist $(OBJDIR)		$(RMDIR) $(OBJDIR)
+	@if exist $(BUILDDIR)	$(RMDIR) $(BUILDDIR)
+
+#############################################################################
+
+Java: setup $(BUILDDIR)\SimpleChat.jar $(BUILDDIR)\BrowserApp.jar
+	@echo "Build complete"
+
+SIMPLECHATOBJ =	$(SCOBJ)\SwingBrowseListener.class \
+				$(SCOBJ)\SwingQueryListener.class \
+				$(SCOBJ)\SimpleChat.class 
+SIMPLECHATMAN = SimpleChat.manifest
+
+$(BUILDDIR)\SimpleChat.jar: $(SIMPLECHATOBJ) $(SIMPLECHATMAN)
+	$(JAR) -cfm $@ $(SIMPLECHATMAN) -C $(SCOBJ) .
+
+BROWSERAPPOBJ =	$(BAOBJ)\BrowserApp.class 
+BROWSERAPPMAN = BrowserApp.manifest
+
+$(BUILDDIR)\BrowserApp.jar: $(BROWSERAPPOBJ) $(BROWSERAPPMAN)
+	$(JAR) -cfm $@ $(BROWSERAPPMAN) -C $(BAOBJ) .
+
+JAVASRC	= .
+.SUFFIXES : .java
+{$(JAVASRC)}.java{$(BAOBJ)}.class:	
+	$(JAVAC) -d $(BAOBJ) -classpath $(BAOBJ);$(DNS_SD) $<
+{$(JAVASRC)}.java{$(SCOBJ)}.class:	
+	$(JAVAC) -d $(SCOBJ) -classpath $(SCOBJ);$(DNS_SD) $<
+
diff --git a/mDNSResponder/Clients/Makefile b/mDNSResponder/Clients/Makefile
new file mode 100755
index 00000000..ce0b5f0c
--- /dev/null
+++ b/mDNSResponder/Clients/Makefile
@@ -0,0 +1,54 @@
+# -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Notes:
+# $@ means "The file name of the target of the rule"
+# $< means "The name of the first prerequisite"
+# $+ means "The names of all the prerequisites, with spaces between them, exactly as given"
+# For more magic automatic variables, see
+# <http://www.gnu.org/software/make/manual/html_chapter/make_10.html#SEC111>
+
+#############################################################################
+
+# On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable
+# If /usr/lib/libSystem.dylib exists, then we're on OS X, so we don't need also to link the "dns_sd" shared library
+ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
+TARGETS = build/dns-sd build/dns-sd64
+LIBS =
+else
+TARGETS = build/dns-sd
+LIBS = -L../mDNSPosix/build/prod/ -ldns_sd
+endif
+
+all: $(TARGETS)
+
+clean:
+	rm -rf build
+
+build:
+	mkdir build
+
+build/dns-sd: build dns-sd.c ClientCommon.c
+	cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
+
+build/dns-sd64: build dns-sd.c ClientCommon.c
+	cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
+
+# Note, we can make a 'fat' version of dns-sd using 'lipo', as shown below, but we
+# don't, because we don't want or need a 'fat' version of dns-sd, because it will
+# never need to access more than 4GB of data. We build the 64-bit version purely so
+# we have a test tool for making sure that the APIs work properly from 64-bit clients.
+# lipo -create dns-sd dns-sd64 -output dns-sd-fat
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/About.cpp b/mDNSResponder/Clients/PrinterSetupWizard/About.cpp
new file mode 100644
index 00000000..6fda7101
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/About.cpp
@@ -0,0 +1,31 @@
+// About.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "About.h"
+
+
+// CAbout dialog
+
+IMPLEMENT_DYNAMIC(CAbout, CDialog)
+CAbout::CAbout(CWnd* pParent /*=NULL*/)
+	: CDialog(CAbout::IDD, pParent)
+{
+}
+
+CAbout::~CAbout()
+{
+}
+
+void CAbout::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+}
+
+
+BEGIN_MESSAGE_MAP(CAbout, CDialog)
+END_MESSAGE_MAP()
+
+
+// CAbout message handlers
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/About.h b/mDNSResponder/Clients/PrinterSetupWizard/About.h
new file mode 100644
index 00000000..72e893da
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/About.h
@@ -0,0 +1,21 @@
+#pragma once
+
+
+// CAbout dialog
+
+class CAbout : public CDialog
+{
+DECLARE_DYNAMIC(CAbout)
+
+public:
+CAbout(CWnd* pParent = NULL);       // standard constructor
+virtual ~CAbout();
+
+// Dialog Data
+enum { IDD = IDD_DIALOG1 };
+
+protected:
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+
+DECLARE_MESSAGE_MAP()
+};
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.cpp b/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.cpp
new file mode 100644
index 00000000..a4e6e43d
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.cpp
@@ -0,0 +1,98 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "FirstPage.h"
+
+#include <DebugServices.h>
+
+
+// CFirstPage dialog
+
+IMPLEMENT_DYNAMIC(CFirstPage, CPropertyPage)
+CFirstPage::CFirstPage()
+	: CPropertyPage(CFirstPage::IDD)
+{
+	CString fontName;
+
+	m_psp.dwFlags &= ~(PSP_HASHELP);
+	m_psp.dwFlags |= PSP_DEFAULT|PSP_HIDEHEADER;
+
+	fontName.LoadString(IDS_LARGE_FONT);
+
+	// create the large font
+	m_largeFont.CreateFont(-16, 0, 0, 0, 
+		FW_BOLD, FALSE, FALSE, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, 
+		CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, fontName);
+}
+
+CFirstPage::~CFirstPage()
+{
+}
+
+void CFirstPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_GREETING, m_greeting);
+}
+
+
+BOOL
+CFirstPage::OnSetActive()
+{
+	CPrinterSetupWizardSheet * psheet;
+	CString greetingText;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );   
+   
+	psheet->SetWizardButtons(PSWIZB_NEXT);
+
+	m_greeting.SetFont(&m_largeFont);
+
+	greetingText.LoadString(IDS_GREETING);
+	m_greeting.SetWindowText(greetingText);
+
+exit:
+
+	return CPropertyPage::OnSetActive();
+}
+
+
+BOOL
+CFirstPage::OnKillActive()
+{
+	CPrinterSetupWizardSheet * psheet;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );   
+   
+	psheet->SetLastPage(this);
+
+exit:
+
+	return CPropertyPage::OnKillActive();
+}
+
+
+BEGIN_MESSAGE_MAP(CFirstPage, CPropertyPage)
+END_MESSAGE_MAP()
+
+
+// CFirstPage message handlers
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.h b/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.h
new file mode 100644
index 00000000..0186c026
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/FirstPage.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include "afxwin.h"
+
+
+// CFirstPage dialog
+
+class CFirstPage : public CPropertyPage
+{
+DECLARE_DYNAMIC(CFirstPage)
+
+public:
+CFirstPage();
+virtual ~CFirstPage();
+
+// Dialog Data
+enum { IDD = IDD_FIRST_PAGE };
+
+protected:
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+virtual BOOL OnSetActive();
+virtual BOOL OnKillActive();
+
+
+DECLARE_MESSAGE_MAP()
+
+private:
+
+CFont m_largeFont;
+
+public:
+
+CStatic m_greeting;
+};
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.cpp b/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.cpp
new file mode 100644
index 00000000..3817246e
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.cpp
@@ -0,0 +1,212 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "FourthPage.h"
+
+#if !defined( PBS_MARQUEE )
+#	define PBS_MARQUEE  0x08
+#endif
+
+#if !defined( PBM_SETMARQUEE )
+#	define PBM_SETMARQUEE WM_USER + 10
+#endif
+
+
+
+// CFourthPage dialog
+
+IMPLEMENT_DYNAMIC(CFourthPage, CPropertyPage)
+CFourthPage::CFourthPage()
+	: CPropertyPage(CFourthPage::IDD),
+		m_initialized(false)
+{
+	CString fontName;
+
+	m_psp.dwFlags &= ~(PSP_HASHELP);
+	m_psp.dwFlags |= PSP_DEFAULT|PSP_HIDEHEADER;
+
+	fontName.LoadString(IDS_LARGE_FONT);
+
+	// create the large font
+	m_largeFont.CreateFont(-16, 0, 0, 0, 
+		FW_BOLD, FALSE, FALSE, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, 
+		CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, fontName);
+}
+
+CFourthPage::~CFourthPage()
+{
+}
+
+void CFourthPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_GOODBYE, m_goodbye);
+	DDX_Control(pDX, IDC_PRINTER_NAME, m_printerNameCtrl);
+	DDX_Control(pDX, IDC_PRINTER_MANUFACTURER, m_printerManufacturerCtrl);
+	DDX_Control(pDX, IDC_PRINTER_MODEL, m_printerModelCtrl);
+	DDX_Control(pDX, IDC_PRINTER_PROTOCOL, m_printerProtocolCtrl);
+	DDX_Control(pDX, IDC_PRINTER_DEFAULT, m_printerDefault);
+}
+
+
+BEGIN_MESSAGE_MAP(CFourthPage, CPropertyPage)
+END_MESSAGE_MAP()
+
+
+// CFourthPage message handlers
+OSStatus 
+CFourthPage::OnInitPage()
+{
+	CWnd * window; 
+	OSStatus err = kNoErr;
+
+	window = GetDlgItem( IDC_INSTALLING );
+	require_action( window, exit, err = kUnknownErr );
+	window->ShowWindow( SW_HIDE );
+
+	window = GetDlgItem( IDC_PROGRESS );
+	require_action( window, exit, err = kUnknownErr );
+	SetWindowLong( *window, GWL_STYLE, GetWindowLong( *window, GWL_STYLE ) | PBS_MARQUEE );
+	SetWindowLongPtr( *window, GWL_STYLE, GetWindowLongPtr( *window, GWL_STYLE ) | PBS_MARQUEE );
+	window->SendMessage( ( UINT ) PBM_SETMARQUEE, ( WPARAM ) FALSE,( LPARAM ) 35 );
+	window->ShowWindow( SW_HIDE );
+
+exit:
+
+	return err;
+}
+
+
+BOOL
+CFourthPage::OnSetActive()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	CString							goodbyeText;
+	Printer						*	printer;
+	CString							defaultText;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+   
+	printer = psheet->GetSelectedPrinter();
+	require_quiet( psheet, exit );
+	
+	psheet->SetWizardButtons(PSWIZB_BACK|PSWIZB_FINISH);
+
+	if (m_initialized == false)
+	{
+		m_initialized = true;
+		OnInitPage();
+	}
+
+	m_goodbye.SetFont(&m_largeFont);
+
+	goodbyeText.LoadString(IDS_GOODBYE);
+	m_goodbye.SetWindowText(goodbyeText);
+
+	m_printerNameCtrl.SetWindowText( printer->actualName );
+	m_printerManufacturerCtrl.SetWindowText ( printer->manufacturer );
+	m_printerModelCtrl.SetWindowText ( printer->displayModelName );
+
+	Service * service = printer->services.front();
+	require_quiet( service, exit );
+	m_printerProtocolCtrl.SetWindowText ( service->protocol );
+
+	if (printer->deflt)
+	{
+		defaultText.LoadString(IDS_YES);
+	}
+	else
+	{
+		defaultText.LoadString(IDS_NO);
+	}
+
+	m_printerDefault.SetWindowText ( defaultText );
+
+exit:
+
+	return CPropertyPage::OnSetActive();
+}
+
+
+BOOL
+CFourthPage::OnKillActive()
+{
+	CPrinterSetupWizardSheet * psheet;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );   
+   
+	psheet->SetLastPage(this);
+
+exit:
+
+	return CPropertyPage::OnKillActive();
+}
+
+
+BOOL
+CFourthPage::StartActivityIndicator()
+{
+	CWnd * window; 
+	BOOL ok = TRUE;
+
+	window = GetDlgItem( IDC_COMPLETE1 );
+	require_action( window, exit, ok = FALSE );
+	window->ShowWindow( SW_HIDE );
+
+	window = GetDlgItem( IDC_COMPLETE2 );
+	require_action( window, exit, ok = FALSE );
+	window->ShowWindow( SW_HIDE );
+
+	window = GetDlgItem( IDC_INSTALLING );
+	require_action( window, exit, ok = FALSE );
+	window->ShowWindow( SW_SHOW );
+
+	window = GetDlgItem( IDC_PROGRESS );
+	require_action( window, exit, ok = FALSE );
+	window->SendMessage( ( UINT ) PBM_SETMARQUEE, ( WPARAM ) TRUE,( LPARAM ) 50 );
+	window->ShowWindow( SW_SHOW );
+
+exit:
+
+	return ok;
+}
+
+
+BOOL
+CFourthPage::StopActivityIndicator()
+{
+	CWnd * window; 
+	BOOL ok = TRUE;
+
+	window = GetDlgItem( IDC_INSTALLING );
+	require_action( window, exit, ok = FALSE );
+	window->ShowWindow( SW_HIDE );
+
+	window = GetDlgItem( IDC_PROGRESS );
+	require_action( window, exit, ok = FALSE );
+	window->SendMessage( ( UINT ) PBM_SETMARQUEE, ( WPARAM ) FALSE,( LPARAM ) 35 );
+	window->ShowWindow( SW_HIDE );
+
+exit:
+
+	return ok;
+}
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.h b/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.h
new file mode 100644
index 00000000..5b4ea99b
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/FourthPage.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include "afxwin.h"
+
+
+// CFourthPage dialog
+
+class CFourthPage : public CPropertyPage
+{
+DECLARE_DYNAMIC(CFourthPage)
+
+public:
+CFourthPage();
+virtual ~CFourthPage();
+
+// Dialog Data
+enum { IDD = IDD_FOURTH_PAGE };
+
+virtual BOOL OnSetActive();
+virtual BOOL OnKillActive();
+
+BOOL StartActivityIndicator();
+BOOL StopActivityIndicator();
+
+protected:
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+
+DECLARE_MESSAGE_MAP()
+
+private:
+
+OSStatus    OnInitPage();
+CFont m_largeFont;
+bool m_initialized;
+
+
+public:
+CStatic m_goodbye;
+private:
+CStatic m_printerNameCtrl;
+CStatic m_printerManufacturerCtrl;
+CStatic m_printerModelCtrl;
+CStatic m_printerProtocolCtrl;
+CStatic m_printerDefault;
+};
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/Logger.cpp b/mDNSResponder/Clients/PrinterSetupWizard/Logger.cpp
new file mode 100644
index 00000000..3385d31c
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/Logger.cpp
@@ -0,0 +1,85 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "Logger.h"
+#include "DebugServices.h"
+#include <string>
+
+
+Logger::Logger()
+{
+	std::string	tmp;
+	char		path[ MAX_PATH ];
+	HRESULT		err;
+	BOOL		ok;
+
+	err = SHGetFolderPathA( NULL, CSIDL_LOCAL_APPDATA, NULL, 0, path );
+	require_noerr( err, exit );
+
+	tmp = path;
+
+	// Create Logs subdir
+	tmp += "\\Apple";
+	ok = CreateDirectoryA( tmp.c_str(), NULL );
+	require_action( ( ok || ( GetLastError() == ERROR_ALREADY_EXISTS ) ), exit, err = -1 );
+
+	// Create Logs subdir
+	tmp += "\\Bonjour";
+	ok = CreateDirectoryA( tmp.c_str(), NULL );
+	require_action( ( ok || ( GetLastError() == ERROR_ALREADY_EXISTS ) ), exit, err = -1 );
+
+	// Create log file
+	tmp += "\\PrinterSetupLog.txt";
+	open( tmp.c_str());
+
+	*this << currentTime() << " Log started" << std::endl;
+
+exit:
+
+	return;
+}
+
+
+Logger::~Logger()
+{
+	*this << currentTime() << " Log finished" << std::endl;
+	flush();
+}
+
+
+std::string
+Logger::currentTime()
+{
+	time_t					ltime;
+	struct tm				now;
+	int						err;
+	std::string				ret;
+	
+	time( &ltime );
+	err = localtime_s( &now, &ltime );
+
+	if ( !err )
+	{
+		char temp[ 64 ];
+		
+		strftime( temp, sizeof( temp ), "%m/%d/%y %I:%M:%S %p", &now );
+		ret = temp;
+	}
+
+	return ret;
+}
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/Logger.h b/mDNSResponder/Clients/PrinterSetupWizard/Logger.h
new file mode 100644
index 00000000..2f338c1f
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/Logger.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _Logger_h
+#define _Logger_h
+
+#include <fstream>
+#include <string>
+
+
+class Logger : public std::ofstream
+{
+public:
+
+Logger();
+~Logger();
+
+std::string
+currentTime();
+};
+
+
+#define require_noerr_with_log( LOG, MESSAGE, ERR, LABEL )  \
+    do                      \
+    {                       \
+        int_least32_t localErr;         \
+        localErr = (int_least32_t)( ERR );  \
+        if( localErr != 0 )             \
+        {                   \
+            log << log.currentTime() << " [ERROR] " << MESSAGE << " returned " << ERR << std::endl;                     \
+            log << log.currentTime() << " [WHERE] " << "\"" << __FILE__ << "\", \"" << __FUNCTION__ << "\", line " << __LINE__ << std::endl << std::endl;   \
+            goto LABEL;         \
+        }                   \
+    } while( 0 )
+
+
+#define require_action_with_log( LOG, X, LABEL, ACTION )    \
+    do                      \
+    {                       \
+        if( !( X ) )                \
+        {                   \
+            log << log.currentTime() << " [ERROR] " << # X << std::endl; \
+            log << log.currentTime() << " [WHERE] " << "\"" << __FILE__ << "\", \"" << __FUNCTION__ << "\", line " << __LINE__ << std::endl << std::endl;   \
+            { ACTION; }         \
+            goto LABEL;         \
+        }                   \
+    } while( 0 )
+
+#endif
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.ncb b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.ncb
new file mode 100644
index 00000000..9057ebac
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.ncb
@@ -0,0 +1 @@
+Microsoft C/C++ MSF 7.00
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.rc b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.rc
new file mode 100644
index 00000000..88b13795
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.rc
@@ -0,0 +1,157 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_exe.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// Russian resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

+#ifdef _WIN32

+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#pragma code_page(1251)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_exe.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""res\\PrinterSetupWizard.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+#endif    // Russian resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDR_MAINFRAME           ICON                    "res\\NetworkPrinter.ico"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Printer Wizard"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "PrinterWizard.exe"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "PrinterWizard.exe"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_REINSTALL    "Bonjour Printer Wizard cannot run because some of its required files are missing.  Please reinstall Bonjour Printer Wizard."

+	IDS_REINSTALL_CAPTION "Bonjour Printer Wizard"

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "res\PrinterSetupWizard.rc2"  // non-Microsoft Visual C++ edited resources

+#include "afxres.rc"         // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcproj
new file mode 100644
index 00000000..f570ab67
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcproj
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="windows-1251"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="PrinterSetupWizard"

+	ProjectGUID="{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}"

+	Keyword="MFCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../../mDNSWindows;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib iphlpapi.lib winspool.lib setupapi.lib"

+				OutputFile="$(OutDir)/PrinterWizard.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\PrinterSetupWizard.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../../mDNSWindows;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib iphlpapi.lib winspool.lib setupapi.lib"

+				OutputFile="$(OutDir)/PrinterWizard.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\PrinterSetupWizard64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".;../../mDNSWindows;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib iphlpapi.lib winspool.lib setupapi.lib"

+				OutputFile="$(OutDir)/PrinterWizard.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\PrinterSetupWizard.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".;../../mDNSWindows;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib iphlpapi.lib winspool.lib setupapi.lib"

+				OutputFile="$(OutDir)/PrinterWizard.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\PrinterSetupWizard64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

+			<File

+				RelativePath=".\About.cpp"

+				>

+			</File>

+			<File

+				RelativePath="FirstPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\FourthPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizardApp.cpp"

+				>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizardSheet.cpp"

+				>

+			</File>

+			<File

+				RelativePath="SecondPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.cpp"

+				>

+			</File>

+			<File

+				RelativePath="ThirdPage.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath=".\About.h"

+				>

+			</File>

+			<File

+				RelativePath="FirstPage.h"

+				>

+			</File>

+			<File

+				RelativePath=".\FourthPage.h"

+				>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizardApp.h"

+				>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizardSheet.h"

+				>

+			</File>

+			<File

+				RelativePath="resource.h"

+				>

+			</File>

+			<File

+				RelativePath="resource_exe.h"

+				>

+			</File>

+			<File

+				RelativePath="SecondPage.h"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.h"

+				>

+			</File>

+			<File

+				RelativePath="ThirdPage.h"

+				>

+			</File>

+			<File

+				RelativePath=".\UtilTypes.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="res\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\banner_icon.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\Info.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\NetworkPrinter.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\PrinterSetupWizard.manifest"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizard.rc"

+				>

+			</File>

+			<File

+				RelativePath="res\watermark.bmp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Support"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dns_sd.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\isocode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\loclibrary.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						DisableSpecificWarnings="4201"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						DisableSpecificWarnings="4201"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\loclibrary.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Logger.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Logger.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\WinServices.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\WinServices.h"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="ReadMe.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="PrinterSetupWizard.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj
new file mode 100755
index 00000000..563597e3
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}</ProjectGuid>

+    <Keyword>MFCProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PrinterWizard</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PrinterWizard</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">PrinterWizard</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PrinterWizard</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PrinterWizard</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">PrinterWizard</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../../mDNSWindows;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;iphlpapi.lib;winspool.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)PrinterWizard.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\PrinterSetupWizard.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../../mDNSWindows;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;iphlpapi.lib;winspool.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)PrinterWizard.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\PrinterSetupWizard64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>.;../../mDNSWindows;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;iphlpapi.lib;winspool.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)PrinterWizard.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\PrinterSetupWizard.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>.;../../mDNSWindows;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;iphlpapi.lib;winspool.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)PrinterWizard.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\PrinterSetupWizard64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="About.cpp" />

+    <ClCompile Include="FirstPage.cpp" />

+    <ClCompile Include="FourthPage.cpp" />

+    <ClCompile Include="PrinterSetupWizardApp.cpp" />

+    <ClCompile Include="PrinterSetupWizardSheet.cpp" />

+    <ClCompile Include="SecondPage.cpp" />

+    <ClCompile Include="stdafx.cpp" />

+    <ClCompile Include="ThirdPage.cpp" />

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="..\..\mDNSWindows\loclibrary.c">

+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ClCompile Include="Logger.cpp" />

+    <ClCompile Include="..\..\mDNSWindows\WinServices.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="About.h" />

+    <ClInclude Include="FirstPage.h" />

+    <ClInclude Include="FourthPage.h" />

+    <ClInclude Include="PrinterSetupWizardApp.h" />

+    <ClInclude Include="PrinterSetupWizardSheet.h" />

+    <ClInclude Include="resource.h" />

+    <ClInclude Include="resource_exe.h" />

+    <ClInclude Include="SecondPage.h" />

+    <ClInclude Include="stdafx.h" />

+    <ClInclude Include="tcpxcv.h" />

+    <ClInclude Include="ThirdPage.h" />

+    <ClInclude Include="UtilTypes.h" />

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h" />

+    <ClInclude Include="..\..\mDNSWindows\isocode.h" />

+    <ClInclude Include="..\..\mDNSWindows\loclibrary.h" />

+    <ClInclude Include="Logger.h" />

+    <ClInclude Include="..\..\mDNSWindows\WinServices.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp" />

+    <None Include="res\banner_icon.bmp" />

+    <None Include="res\Info.ico" />

+    <None Include="res\NetworkPrinter.ico" />

+    <None Include="res\watermark.bmp" />

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuildStep Include="res\PrinterSetupWizard.manifest">

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

+    </CustomBuildStep>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizard.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLLStub\DLLStub.vcxproj">

+      <Project>{3a2b6325-3053-4236-84bd-aa9be2e323e5}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="PrinterSetupWizard.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj.filters b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj.filters
new file mode 100755
index 00000000..d2102791
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizard.vcxproj.filters
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{2a6fb856-bfd6-4cf1-bd97-b1c798cadff4}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{cc2ba15e-c8ac-4990-9bf2-a27b18361b12}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{18aa6a23-2325-46e6-a1e2-45d743d9ff32}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+    <Filter Include="Support">

+      <UniqueIdentifier>{5c8be428-d955-40e2-bbb6-349f5867d422}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="About.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="FirstPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="FourthPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="PrinterSetupWizardApp.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="PrinterSetupWizardSheet.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="SecondPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ThirdPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\loclibrary.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="Logger.cpp">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\WinServices.cpp">

+      <Filter>Support</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="About.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="FirstPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="FourthPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="PrinterSetupWizardApp.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="PrinterSetupWizardSheet.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource_exe.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="SecondPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ThirdPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="UtilTypes.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\isocode.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\loclibrary.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="Logger.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\WinServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="tcpxcv.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\banner_icon.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\Info.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\NetworkPrinter.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\watermark.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizard.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuildStep Include="res\PrinterSetupWizard.manifest">

+      <Filter>Resource Files</Filter>

+    </CustomBuildStep>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp
new file mode 100644
index 00000000..d2a896d0
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp
@@ -0,0 +1,172 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "DebugServices.h"
+#include "loclibrary.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+#ifndef HeapEnableTerminationOnCorruption
+#	define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS) 1
+#endif
+
+
+// Stash away pointers to our resource DLLs
+
+static HINSTANCE g_nonLocalizedResources	= NULL;
+static HINSTANCE g_localizedResources		= NULL;
+
+
+HINSTANCE
+GetNonLocalizedResources()
+{
+	return g_nonLocalizedResources;
+}
+
+
+HINSTANCE
+GetLocalizedResources()
+{
+	return g_localizedResources;
+}
+
+
+// CPrinterSetupWizardApp
+
+BEGIN_MESSAGE_MAP(CPrinterSetupWizardApp, CWinApp)
+	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+
+// CPrinterSetupWizardApp construction
+
+CPrinterSetupWizardApp::CPrinterSetupWizardApp()
+{
+	// TODO: add construction code here,
+	// Place all significant initialization in InitInstance
+}
+
+
+// The one and only CPrinterSetupWizardApp object
+
+CPrinterSetupWizardApp theApp;
+
+
+// CPrinterSetupWizardApp initialization
+
+BOOL CPrinterSetupWizardApp::InitInstance()
+{
+	CString		errorMessage;
+	CString		errorCaption;
+	wchar_t		resource[MAX_PATH];
+	int			res;
+	OSStatus	err = kNoErr;
+
+	HeapSetInformation( NULL, HeapEnableTerminationOnCorruption, NULL, 0 );
+
+	//
+	// initialize the debugging framework
+	//
+	debug_initialize( kDebugOutputTypeWindowsDebugger, "PrinterSetupWizard", NULL );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelTrace );
+
+	// Before we load the resources, let's load the error string
+
+	errorMessage.LoadString( IDS_REINSTALL );
+	errorCaption.LoadString( IDS_REINSTALL_CAPTION );
+
+	// Load Resources
+
+	res = PathForResource( NULL, L"PrinterWizardResources.dll", resource, MAX_PATH );
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_nonLocalizedResources = LoadLibrary( resource );
+	translate_errno( g_nonLocalizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	res = PathForResource( NULL, L"PrinterWizardLocalized.dll", resource, MAX_PATH );
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_localizedResources = LoadLibrary( resource );
+	translate_errno( g_localizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	AfxSetResourceHandle( g_localizedResources );
+
+	// InitCommonControls() is required on Windows XP if an application
+	// manifest specifies use of ComCtl32.dll version 6 or later to enable
+	// visual styles.  Otherwise, any window creation will fail.
+	InitCommonControls();
+
+	CWinApp::InitInstance();
+
+	AfxEnableControlContainer();
+
+	{
+		CPrinterSetupWizardSheet dlg(IDS_CAPTION);
+
+		m_pMainWnd = &dlg;
+
+		try
+		{
+			INT_PTR nResponse = dlg.DoModal();
+		
+			if (nResponse == IDOK)
+			{
+				// TODO: Place code here to handle when the dialog is
+				//  dismissed with OK
+			}
+			else if (nResponse == IDCANCEL)
+			{
+				// TODO: Place code here to handle when the dialog is
+				//  dismissed with Cancel
+			}
+		}
+		catch (CPrinterSetupWizardSheet::WizardException & exc)
+		{
+			MessageBox(NULL, exc.text, exc.caption, MB_OK|MB_ICONEXCLAMATION);
+		}
+	}
+
+exit:
+
+	if ( err )
+	{
+		MessageBox( NULL, errorMessage, errorCaption, MB_ICONERROR | MB_OK );
+	}
+
+	if ( g_nonLocalizedResources )
+	{
+		FreeLibrary( g_nonLocalizedResources );
+	}
+
+	if ( g_localizedResources )
+	{
+		FreeLibrary( g_localizedResources );
+	}
+
+	// Since the dialog has been closed, return FALSE so that we exit the
+	//  application, rather than start the application's message pump.
+	return FALSE;
+}
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.h b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.h
new file mode 100644
index 00000000..379c9e4b
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardApp.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+    #error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "resource.h"       // main symbols
+
+
+// CWiz97_3App:
+// See Wiz97_3.cpp for the implementation of this class
+//
+
+class CPrinterSetupWizardApp : public CWinApp
+{
+public:
+CPrinterSetupWizardApp();
+
+// Overrides
+public:
+virtual BOOL InitInstance();
+
+// Implementation
+
+DECLARE_MESSAGE_MAP()
+};
+
+
+extern CPrinterSetupWizardApp theApp;
+extern HINSTANCE                GetNonLocalizedResources();
+extern HINSTANCE                GetLocalizedResources();
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.rc b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.rc
new file mode 100755
index 00000000..198890fd
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.rc
@@ -0,0 +1,310 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_loc_res.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// Russian resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

+#ifdef _WIN32

+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#pragma code_page(1251)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_loc_res.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""res\\PrinterSetupWizardLocRes.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+#endif    // Russian resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+IDD_ABOUTBOX DIALOGEX 0, 0, 235, 55

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

+    WS_SYSMENU

+CAPTION "About Printer Wizard"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    ICON            128,IDC_STATIC,11,17,20,20

+    LTEXT           "Printer Wizard Version 1.0",IDC_STATIC,40,10,119,

+                    8,SS_NOPREFIX

+    LTEXT           "Copyright (C) 2002",IDC_STATIC,40,25,119,8

+    DEFPUSHBUTTON   "OK",IDOK,178,7,50,16,WS_GROUP

+END

+

+IDD_PRINTERSETUPWIZARD_DIALOG DIALOGEX 0, 0, 320, 200

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | 

+    WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_APPWINDOW

+CAPTION "Bonjour Printer Wizard"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    DEFPUSHBUTTON   "OK",IDOK,263,7,50,16

+    PUSHBUTTON      "Cancel",IDCANCEL,263,25,50,16

+    PUSHBUTTON      "Start Wizard",IDC_BUTTON1,100,86,109,35

+END

+

+IDD_SECOND_PAGE DIALOGEX 0, 0, 290, 154

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Bonjour Printer Wizard"

+FONT 8, "MS Shell Dlg", 0, 0, 0x0

+BEGIN

+    LTEXT           "Shared printers:",IDC_STATIC,3,0,171,8

+    CONTROL         "",IDC_BROWSE_LIST,"SysTreeView32",TVS_DISABLEDRAGDROP | 

+                    TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | 

+                    WS_TABSTOP,2,11,286,101

+    LTEXT           "Description:",IDC_DESCRIPTION_LABEL,13,128,39,8

+    LTEXT           "Location:",IDC_LOCATION_LABEL,13,139,30,8

+    GROUPBOX        "Printer information",IDC_PRINTER_INFORMATION,2,116,286,

+                    37

+    LTEXT           "",IDC_DESCRIPTION_FIELD,57,128,226,8

+    LTEXT           "",IDC_LOCATION_FIELD,57,139,226,8

+END

+

+IDD_FIRST_PAGE DIALOGEX 0, 0, 290, 199

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Bonjour Printer Wizard"

+FONT 8, "MS Shell Dlg", 0, 0, 0x0

+BEGIN

+    LTEXT           "Welcome to the Bonjour Printer Wizard",

+                    IDC_GREETING,114,7,171,46

+    LTEXT           "To continue, click Next.",IDC_STATIC,115,188,143,8

+    LTEXT           "This wizard helps you connect to a shared printer using Bonjour.  Make sure your printer is turned on and connected to your network.",

+                    IDC_STATIC,114,60,171,62

+END

+

+IDD_THIRD_PAGE DIALOGEX 0, 0, 290, 154

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

+    WS_SYSMENU

+CAPTION "Bonjour Printer Wizard"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_PRINTER_MODEL,"SysListView32",LVS_REPORT | 

+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | 

+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,110,58,178,76

+    CONTROL         "",IDC_PRINTER_MANUFACTURER,"SysListView32",LVS_REPORT | 

+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | 

+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,2,58,105,76

+    ICON            1017,1,3,5,20,27

+    LTEXT           "",IDC_PRINTER_NAME,40,5,173,8

+    LTEXT           "The Bonjour Printer Wizard has auto-selected the following printer settings.  To continue installing this printer, click Next.",

+                    IDC_PRINTER_SELECTION_TEXT,40,18,243,33

+    CONTROL         "Use this printer as the default printer",

+                    IDC_DEFAULT_PRINTER,"Button",BS_AUTOCHECKBOX | 

+                    WS_TABSTOP,3,142,140,10

+    PUSHBUTTON      "Have Disk...",IDC_HAVE_DISK,238,140,50,14

+END

+

+IDD_FOURTH_PAGE DIALOGEX 0, 0, 290, 199

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Bonjour Printer Wizard"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    LTEXT           "Completing the Bonjour Printer Wizard",IDC_GOODBYE,

+                    116,7,171,27

+    LTEXT           "You are ready to complete the Bonjour Printer Wizard.  The printer has the following settings:",

+                    IDC_STATIC,116,42,171,31

+    LTEXT           "Name:",IDC_STATIC,116,78,22,8

+    LTEXT           "Manufacturer:",IDC_STATIC,116,91,47,8

+    LTEXT           "Model:",IDC_STATIC,116,104,22,8

+    LTEXT           "Protocol:",IDC_STATIC,116,117,38,8

+    LTEXT           "Default:",IDC_STATIC,116,130,27,8

+    LTEXT           "",IDC_PRINTER_NAME,172,78,113,8,SS_ENDELLIPSIS

+    LTEXT           "",IDC_PRINTER_MANUFACTURER,172,91,113,8

+    LTEXT           "",IDC_PRINTER_MODEL,172,104,113,8

+    LTEXT           "",IDC_PRINTER_PROTOCOL,172,117,113,8

+    LTEXT           "",IDC_PRINTER_DEFAULT,172,130,113,8

+    LTEXT           "To complete the installation, click Finish.",IDC_COMPLETE1,116,180,171,8

+    LTEXT           "To change these settings, click Back.",IDC_COMPLETE2,116,190,171,8

+	LTEXT			"Please wait a few moments while the Bonjour Printer Wizard installs the printer.",IDC_INSTALLING,116,170,171,31

+	CONTROL			"",IDC_PROGRESS,"msctls_progress32",WS_BORDER,116,190,165,8

+END

+

+IDD_DIALOG1 DIALOGEX 0, 0, 265, 130

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

+    WS_SYSMENU

+CAPTION "Dialog"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         138,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,0,

+                    265,131

+    LTEXT           "Static",IDC_STATIC,77,12,19,8

+    LTEXT           "Static",IDC_STATIC,71,46,19,8

+    LTEXT           "Static",IDC_STATIC,71,89,19,8

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "PrinterWizardLocalized.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "PrinterWizardLocalized.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_ABOUTBOX            "&About Bonjour Printer Wizard..."

+    IDS_GOODBYE             "Completing the Bonjour Printer Wizard."

+    IDS_GREETING            "Welcome to the Bonjour Printer Wizard"

+    IDS_BROWSE_TITLE        "Browse for Bonjour Printers"

+    IDS_BROWSE_SUBTITLE     "Select the printer you want to use from the list below."

+    IDS_CAPTION             "Bonjour Printer Wizard"

+    IDS_GOODBYE_GOOD1       "You are ready to complete the Bonjour Printer Wizard.  The printer has the following settings:"

+    IDS_SEARCHING           "Searching for printers..."

+    IDS_GOODBYTE_GOOD2      "To complete the installation, click Finish."

+    IDS_INSTALL_TITLE       "Install Bonjour Printer"

+    IDS_INSTALL_SUBTITLE    "The manufacturer and model determine which printer software to use."

+END

+

+STRINGTABLE 

+BEGIN

+    IDS_ERROR_SELECTING_PRINTER_TEXT 

+                            "There was an error selecting this printer."

+    IDS_ERROR_SELECTING_PRINTER_CAPTION "Error"

+    IDS_INSTALL_ERROR_CAPTION "Error"

+    IDS_INSTALL_ERROR_MESSAGE 

+                            "You do not have sufficient access to your computer to connect to the selected printer."

+	IDS_NO_MATCH_INF_FILE	"The software that you chose does not match the selected printer."

+	IDS_NO_MATCH_INF_FILE_CAPTION "Select Device"

+	IDS_BAD_INF_FILE		"The specified location does not contain information about your printer"

+	IDS_BAD_INF_FILE_CAPTION "Select Device"

+    IDS_MANUFACTURER_HEADING "Manufacturer"

+    IDS_MODEL_HEADING       "Model"

+    IDS_NO_PRINTERS         "No Bonjour Printers are available"

+    IDS_NO_MDNSRESPONDER_SERVICE_TEXT "Bonjour Service is not available."

+    IDS_NO_MDNSRESPONDER_SERVICE_CAPTION "Error"

+    IDS_PRINTER_MATCH_GOOD  "The Bonjour Printer Wizard has auto-selected the following printer settings.  Click 'Next' to continue installing this printer."

+    IDS_PRINTER_MATCH_BAD   "The Bonjour Printer Wizard cannot find a driver for this printer.  Manually select from the list, or click 'Have Disk' if your printer came with an installation disk. "

+    IDS_PRINTER_MATCH_MAYBE "The Bonjour Printer Wizard has selected a generic printer driver for this printer. If your printer came with an installation disk, click 'Have Disk' now to load the manufacturer's drivers."

+    IDS_YES                 "Yes"

+    IDS_NO                  "No"

+    IDS_LARGE_FONT          "MS Sans Serif"

+    IDS_FIREWALL            "Please check firewall setting to ensure the Bonjour Printer Wizard operates correctly."

+    IDS_ERROR_CAPTION       "Error"

+    IDS_PRINTER_UNAVAILABLE "The Bonjour printer you have selected is no longer available. Please make sure the printer is powered-on and plugged-in."

+END

+

+STRINGTABLE 

+BEGIN

+    IDS_FIREWALL_CAPTION    "Firewall Detected"

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "res\PrinterSetupWizardLocRes.rc2"  // non-Microsoft Visual C++ edited resources

+#include "afxres.rc"         // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcproj
new file mode 100755
index 00000000..3b3c68f9
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcproj
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="windows-1251"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="PrinterSetupWizardLocRes"

+	ProjectGUID="{967F5375-0176-43D3-ADA3-22EE25551C37}"

+	Keyword="MFCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\PrinterWizard.Resources mkdir $(OutDir)\PrinterWizard.Resources&#x0D;&#x0A;if not exist $(OutDir)\PrinterWizard.Resources\en.lproj mkdir $(OutDir)\PrinterWizard.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\en.lproj\PrinterWizardLocalized.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/Localized.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\PrinterWizard.Resources mkdir $(OutDir)\PrinterWizard.Resources&#x0D;&#x0A;if not exist $(OutDir)\PrinterWizard.Resources\en.lproj mkdir $(OutDir)\PrinterWizard.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\en.lproj\PrinterWizardLocalized.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/Localized.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\PrinterWizard.Resources mkdir $(OutDir)\PrinterWizard.Resources&#x0D;&#x0A;if not exist $(OutDir)\PrinterWizard.Resources\en.lproj mkdir $(OutDir)\PrinterWizard.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\en.lproj\PrinterWizardLocalized.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="false"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                         &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\PrinterWizard.Resources mkdir $(OutDir)\PrinterWizard.Resources&#x0D;&#x0A;if not exist $(OutDir)\PrinterWizard.Resources\en.lproj mkdir $(OutDir)\PrinterWizard.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\en.lproj\PrinterWizardLocalized.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="false"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                         &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_loc_dll.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="PrinterSetupWizardLocRes.rc"

+				>

+			</File>

+			<File

+				RelativePath="res\PrinterSetupWizardLocRes.rc2"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="ReadMe.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="PrinterSetupWizardLocRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj
new file mode 100755
index 00000000..86affb8c
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{967F5375-0176-43D3-ADA3-22EE25551C37}</ProjectGuid>

+    <Keyword>MFCProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">PrinterWizardLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)PrinterWizard.Resources mkdir $(OutDir)PrinterWizard.Resources

+if not exist $(OutDir)PrinterWizard.Resources\en.lproj mkdir $(OutDir)PrinterWizard.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)Localized.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)PrinterWizard.Resources mkdir $(OutDir)PrinterWizard.Resources

+if not exist $(OutDir)PrinterWizard.Resources\en.lproj mkdir $(OutDir)PrinterWizard.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)Localized.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)PrinterWizard.Resources mkdir $(OutDir)PrinterWizard.Resources

+if not exist $(OutDir)PrinterWizard.Resources\en.lproj mkdir $(OutDir)PrinterWizard.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+      <GenerateDebugInformation>false</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                         "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)PrinterWizard.Resources mkdir $(OutDir)PrinterWizard.Resources

+if not exist $(OutDir)PrinterWizard.Resources\en.lproj mkdir $(OutDir)PrinterWizard.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+      <GenerateDebugInformation>false</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                         "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardLocalized.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_dll.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizardLocRes.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\PrinterSetupWizardLocRes.rc2" />

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="PrinterSetupWizardLocRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj.filters b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj.filters
new file mode 100755
index 00000000..b0c2900e
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardLocRes.vcxproj.filters
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{7a783aeb-7735-4f37-9b8d-ae201c3bf118}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{e9d0d017-9740-4270-9ab9-b3b50c3bff30}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_dll.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizardLocRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\PrinterSetupWizardLocRes.rc2">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.rc b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.rc
new file mode 100755
index 00000000..067aabfe
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.rc
@@ -0,0 +1,173 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource_res.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// Russian resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

+#ifdef _WIN32

+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#pragma code_page(1251)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource_res.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""res\\PrinterSetupWizardRes.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+#endif    // Russian resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDR_MAINFRAME           ICON                    "res\\NetworkPrinter.ico"

+IDI_INFO                ICON                    "res\\Info.ico"

+IDI_PRINTER             ICON                    "res\\NetworkPrinter.ico"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_WATERMARK           BITMAP                  "res\\watermark.bmp"

+IDB_BANNER_ICON         BITMAP                  "res\\banner_icon.bmp"

+IDB_ABOUT               BITMAP                  "res\\about.bmp"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "PrinterWizardLocalized.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "PrinterWizardLocalized.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+#endif    // APSTUDIO_INVOKED

+

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "res\PrinterSetupWizardRes.rc2"  // non-Microsoft Visual C++ edited resources

+#include "afxres.rc"         // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcproj
new file mode 100755
index 00000000..07d05f07
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcproj
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="windows-1251"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="PrinterSetupWizardRes"

+	ProjectGUID="{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}"

+	Keyword="MFCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Debug\PrinterWizard.Resources mkdir Debug\PrinterWizard.Resources"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\PrinterWizardResources.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/Localized.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Debug\PrinterWizard.Resources mkdir Debug\PrinterWizard.Resources"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\PrinterWizardResources.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/Localized.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Release mkdir Release&#x0D;&#x0A;if not exist &quot;Release\PrinterWizard.Resources&quot; mkdir &quot;Release\PrinterWizard.Resources&quot;&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\PrinterWizardResources.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="false"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                           &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir);../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist Release mkdir Release&#x0D;&#x0A;if not exist &quot;Release\PrinterWizard.Resources&quot; mkdir &quot;Release\PrinterWizard.Resources&quot;&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\PrinterWizard.Resources\PrinterWizardResources.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="false"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol=""

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                           &quot;$(DSTROOT)\Program Files\Bonjour Print Services\$(PlatformName)\PrinterWizard.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_dll.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath=".\res\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\banner_icon.bmp"

+				>

+			</File>

+			<File

+				RelativePath=".\res\Info.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\res\NetworkPrinter.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\res\Printer.bmp"

+				>

+			</File>

+			<File

+				RelativePath="PrinterSetupWizardRes.rc"

+				>

+			</File>

+			<File

+				RelativePath="res\PrinterSetupWizardRes.rc2"

+				>

+			</File>

+			<File

+				RelativePath="res\watermark.bmp"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="ReadMe.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="PrinterSetupWizardRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj
new file mode 100755
index 00000000..16befa70
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}</ProjectGuid>

+    <Keyword>MFCProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\PrinterWizard.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">PrinterWizardResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Debug\PrinterWizard.Resources mkdir Debug\PrinterWizard.Resources</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)Localized.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUGS;DEBUG=1;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Debug\PrinterWizard.Resources mkdir Debug\PrinterWizard.Resources</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)Localized.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Release mkdir Release

+if not exist "Release\PrinterWizard.Resources" mkdir "Release\PrinterWizard.Resources"

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+      <GenerateDebugInformation>false</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                           "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WINVER=0x0400;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>$(IntDir);../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist Release mkdir Release

+if not exist "Release\PrinterWizard.Resources" mkdir "Release\PrinterWizard.Resources"

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+      <GenerateDebugInformation>false</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>

+      </EntryPointSymbol>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                           "$(DSTROOT)\Program Files\Bonjour Print Services\$(Platform)\PrinterWizard.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">

+    <Link>

+      <OutputFile>$(OutDir)PrinterWizardResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_dll.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp" />

+    <None Include="res\banner_icon.bmp" />

+    <None Include="res\Info.ico" />

+    <None Include="res\NetworkPrinter.ico" />

+    <None Include="res\Printer.bmp" />

+    <None Include="res\PrinterSetupWizardRes.rc2" />

+    <None Include="res\watermark.bmp" />

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizardRes.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="PrinterSetupWizardRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj.filters b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj.filters
new file mode 100755
index 00000000..e5b0f595
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardRes.vcxproj.filters
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{f366b81b-a033-4fe2-83f9-f249205c8f41}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{dd34ed24-7798-4514-b9b3-ecc1172409a0}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_dll.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\banner_icon.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\Info.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\NetworkPrinter.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\Printer.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\PrinterSetupWizardRes.rc2">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\watermark.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="PrinterSetupWizardRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.cpp b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.cpp
new file mode 100644
index 00000000..47e5f911
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.cpp
@@ -0,0 +1,1949 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "CommonServices.h"
+#include "DebugServices.h"
+#include "WinServices.h"
+#include "About.h"
+#include "tcpxcv.h"
+#include <winspool.h>
+#include <string>
+#include <shlwapi.h>
+
+// unreachable code
+#pragma warning(disable:4702)
+
+
+#if( !TARGET_OS_WINDOWS_CE )
+#	include	<mswsock.h>
+#	include	<process.h>
+#endif
+
+
+#if defined( UNICODE ) || defined( _UNICODE )
+#	define GetEnv	_wgetenv
+#else
+#	define GetEnv	getenv
+#endif
+
+static TCHAR*
+g_printerDriverFiles[] =		// Printer driver files
+{
+	TEXT( "ps5ui.dll" ),
+	TEXT( "pscript.hlp" ),
+	TEXT( "pscript.ntf" ),
+	TEXT( "pscript5.dll" ),
+	TEXT( "cups6.ini" ),
+	TEXT( "cupsui6.dll" ),
+	TEXT( "cupsps6.dll" )
+};
+
+
+// Private Messages
+
+#define WM_SOCKET_EVENT		( WM_USER + 0x100 )
+#define WM_PROCESS_EVENT	( WM_USER + 0x101 )
+
+
+static BOOL
+Is64BitWindows()
+{
+#if defined(_WIN64)
+	return TRUE;  // 64-bit programs run only on Win64
+#else
+	typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)( HANDLE, PBOOL );
+	LPFN_ISWOW64PROCESS fnIsWow64Process;
+	BOOL bIsWow64 = FALSE;
+
+    fnIsWow64Process = ( LPFN_ISWOW64PROCESS ) GetProcAddress( GetModuleHandle( TEXT( "kernel32" ) ), "IsWow64Process" );
+  
+    if ( fnIsWow64Process != NULL )
+    {
+		BOOL ok;
+
+        ok = fnIsWow64Process( GetCurrentProcess(), &bIsWow64 );
+
+		if ( !ok )
+		{
+			bIsWow64 = FALSE;
+		}
+	}
+
+	return bIsWow64;
+#endif
+}
+
+
+// CPrinterSetupWizardSheet
+CPrinterSetupWizardSheet * CPrinterSetupWizardSheet::m_self;
+
+IMPLEMENT_DYNAMIC(CPrinterSetupWizardSheet, CPropertySheet)
+CPrinterSetupWizardSheet::CPrinterSetupWizardSheet(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage)
+	:CPropertySheet(nIDCaption, pParentWnd, iSelectPage),
+	m_selectedPrinter(NULL),
+	m_driverThreadExitCode( 0 ),
+	m_driverThreadFinished( false ),
+	m_pdlBrowser( NULL ),
+	m_ippBrowser( NULL ),
+	m_lprBrowser( NULL ),
+	m_lastPage( NULL )
+{
+	m_arrow		=	LoadCursor(0, IDC_ARROW);
+	m_wait		=	LoadCursor(0, IDC_APPSTARTING);
+	m_active	=	m_arrow;
+	m_self		=	this;
+	
+	Init();
+
+	LoadPrinterNames();
+}
+
+
+CPrinterSetupWizardSheet::~CPrinterSetupWizardSheet()
+{
+	Printer * printer;
+
+	while ( m_printers.size() > 0 )
+	{
+		printer = m_printers.front();
+		m_printers.pop_front();
+
+		delete printer;
+	}
+
+	m_self = NULL;
+}
+
+
+// ------------------------------------------------------
+// SetSelectedPrinter
+//
+// Manages setting a printer as the printer to install.  Stops
+// any pending resolves.  
+//	
+void
+CPrinterSetupWizardSheet::SetSelectedPrinter(Printer * printer)
+{
+	check( !printer || ( printer != m_selectedPrinter ) );
+
+	m_selectedPrinter = printer;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::LoadPrinterNames()
+{
+	PBYTE		buffer	=	NULL;
+	OSStatus	err		= 0;
+
+	//
+	// rdar://problem/3701926 - Printer can't be installed twice
+	//
+	// First thing we want to do is make sure the printer isn't already installed.
+	// If the printer name is found, we'll try and rename it until we
+	// find a unique name
+	//
+	DWORD dwNeeded = 0, dwNumPrinters = 0;
+
+	BOOL ok = EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 4, NULL, 0, &dwNeeded, &dwNumPrinters);
+	err = translate_errno( ok, errno_compat(), kUnknownErr );
+
+	if ((err == ERROR_INSUFFICIENT_BUFFER) && (dwNeeded > 0))
+	{
+		try
+		{
+			buffer = new unsigned char[dwNeeded];
+		}
+		catch (...)
+		{
+			buffer = NULL;
+		}
+	
+		require_action( buffer, exit, kNoMemoryErr );
+		ok = EnumPrinters(PRINTER_ENUM_LOCAL, NULL, 4, buffer, dwNeeded, &dwNeeded, &dwNumPrinters);
+		err = translate_errno( ok, errno_compat(), kUnknownErr );
+		require_noerr( err, exit );
+
+		for (DWORD index = 0; index < dwNumPrinters; index++)
+		{
+			PRINTER_INFO_4 * lppi4 = (PRINTER_INFO_4*) (buffer + index * sizeof(PRINTER_INFO_4));
+
+			m_printerNames.push_back( lppi4->pPrinterName );
+		}
+	}
+
+exit:
+
+	if (buffer != NULL)
+	{
+		delete [] buffer;
+	}
+
+	return err;
+}
+
+
+
+// ------------------------------------------------------
+// InstallPrinter
+//
+// Installs a printer with Windows.
+//
+// Note: this works one of two ways, depending on whether
+// there are drivers already installed for this printer.
+// If there are, then we can just create a port with XcvData,
+// and then call AddPrinter.  If not, we use the printui.dll
+// to install the printer. Actually installing drivers that
+// are not currently installed is painful, and it's much
+// easier and less error prone to just let printui.dll do
+// the hard work for us.
+//	
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinter(Printer * printer)
+{
+	Logger		log;
+	CUPSLibrary	cupsLib;
+	Service	*	service		= NULL;
+	BOOL		ok;
+	OSStatus	err = 0;
+
+	service = printer->services.front();
+	check( service );
+
+	if ( printer->isCUPSPrinter && cupsLib.IsInstalled() )
+	{
+		err = InstallPrinterCUPS( printer, service, cupsLib );
+		require_noerr( err, exit );
+	}
+	else
+	{
+		//
+		// if the driver isn't installed, then install it
+		//
+
+		if ( !printer->driverInstalled )
+		{
+			DWORD		dwResult;
+			HANDLE		hThread;
+			unsigned	threadID;
+
+			m_driverThreadFinished = false;
+		
+			//
+			// create the thread
+			//
+			hThread = (HANDLE) _beginthreadex_compat( NULL, 0, InstallDriverThread, printer, 0, &threadID );
+			err = translate_errno( hThread, (OSStatus) GetLastError(), kUnknownErr );
+			require_noerr_with_log( log, "_beginthreadex_compat()", err, exit );
+				
+			//
+			// go modal
+			//
+			while (!m_driverThreadFinished)
+			{
+				MSG msg;
+		
+				GetMessage( &msg, m_hWnd, 0, 0 );
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
+
+			//
+			// Wait until child process exits.
+			//
+			dwResult = WaitForSingleObject( hThread, INFINITE );
+			err = translate_errno( dwResult == WAIT_OBJECT_0, errno_compat(), err = kUnknownErr );
+			require_noerr_with_log( log, "WaitForSingleObject()", err, exit );
+
+			//
+			// check the return value of thread
+			//
+			require_noerr_with_log( log, "thread exit code", m_driverThreadExitCode, exit );
+
+			//
+			// now we know that the driver was successfully installed
+			//
+			printer->driverInstalled = true;
+		}
+
+		if ( service->type == kPDLServiceType )
+		{
+			err = InstallPrinterPort( printer, service, PROTOCOL_RAWTCP_TYPE, log );
+			require_noerr_with_log( log, "InstallPrinterPort()", err, exit );
+			err = InstallPrinterPDLAndLPR( printer, service, log );
+			require_noerr_with_log( log, "InstallPrinterPDLAndLPR()", err, exit );
+		}
+		else if ( service->type == kLPRServiceType )
+		{
+			err = InstallPrinterPort( printer, service, PROTOCOL_LPR_TYPE, log );
+			require_noerr_with_log( log, "InstallPrinterPort()", err, exit );
+			err = InstallPrinterPDLAndLPR( printer, service, log );
+			require_noerr_with_log( log, "InstallPrinterPDLAndLPR()", err, exit );
+		}
+		else if ( service->type == kIPPServiceType )
+		{
+			// There's no need to install a printer port for IPP printers, because
+			// the call to AddPrinter() will do that for us.
+
+			err = InstallPrinterIPP( printer, service, log );
+			require_noerr_with_log( log, "InstallPrinterIPP()", err, exit );
+		}
+		else
+		{
+			require_action_with_log( log, ( service->type == kPDLServiceType ) || ( service->type == kLPRServiceType ) || ( service->type == kIPPServiceType ), exit, err = kUnknownErr );
+		}
+	}
+
+	printer->installed = true;
+
+	//
+	// if the user specified a default printer, set it
+	//
+	if (printer->deflt)
+	{
+		ok = SetDefaultPrinter( printer->actualName );
+		err = translate_errno( ok, errno_compat(), err = kUnknownErr );
+		require_noerr_with_log( log, "SetDefaultPrinter()", err, exit );
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinterPort( Printer * printer, Service * service, DWORD protocol, Logger & log )
+{
+	PRINTER_DEFAULTS	printerDefaults =	{ NULL,  NULL, SERVER_ACCESS_ADMINISTER };
+	PORT_DATA_1			portData;
+	DWORD				dwStatus;
+	DWORD				cbInputData		=	100;
+	PBYTE				pOutputData		=	NULL;
+	DWORD				cbOutputNeeded	=	0;
+	HANDLE				hXcv			=	NULL;
+	Queue			*	q;
+	BOOL				ok;
+	OSStatus			err;
+
+	ZeroMemory(&portData, sizeof(PORT_DATA_1));
+
+	require_action_with_log( log, wcslen(printer->portName) < sizeof_array(portData.sztPortName), exit, err = kSizeErr );
+	wcscpy_s(portData.sztPortName, printer->portName);
+
+	q = service->queues.front();
+	check( q );
+
+	ok = OpenPrinter(L",XcvMonitor Standard TCP/IP Port", &hXcv, &printerDefaults);
+	err = translate_errno( ok, errno_compat(), kUnknownErr );
+	require_noerr_with_log( log, "OpenPrinter()", err, exit );
+
+	//
+	// BUGBUG: MSDN said this is not required, but my experience shows it is required
+	//
+	try
+	{
+		pOutputData = new BYTE[cbInputData];
+	}
+	catch (...)
+	{
+		pOutputData = NULL;
+	}
+
+	require_action_with_log( log, pOutputData, exit, err = kNoMemoryErr );
+    	
+	portData.dwPortNumber	=	service->portNumber;
+	portData.dwVersion		=	1;
+	portData.dwDoubleSpool	=	1;
+    	
+	portData.dwProtocol	= protocol;
+	portData.cbSize		= sizeof PORT_DATA_1;
+	portData.dwReserved	= 0L;
+
+	require_action_with_log( log, wcslen(q->name) < sizeof_array(portData.sztQueue), exit, err = kSizeErr );
+	wcscpy_s(portData.sztQueue, q->name);
+
+	require_action_with_log( log, wcslen( service->hostname ) < sizeof_array(portData.sztHostAddress), exit, err = kSizeErr );
+	wcscpy_s( portData.sztHostAddress, service->hostname );
+
+	ok = XcvData(hXcv, L"AddPort", (PBYTE) &portData, sizeof(PORT_DATA_1), pOutputData, cbInputData,  &cbOutputNeeded, &dwStatus);
+	err = translate_errno( ok, errno_compat(), kUnknownErr );
+	require_noerr_with_log( log, "XcvData()", err, exit );
+
+exit:
+
+	if (hXcv != NULL)
+	{
+		ClosePrinter(hXcv);
+	}
+
+	if (pOutputData != NULL)
+	{
+		delete [] pOutputData;
+	}
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinterPDLAndLPR(Printer * printer, Service * service, Logger & log )
+{
+	PRINTER_INFO_2		pInfo;
+	HANDLE				hPrinter = NULL;
+	Queue			*	q;
+	OSStatus			err;
+
+	check(printer != NULL);
+	check(printer->installed == false);
+
+	q = service->queues.front();
+	check( q );
+
+	//
+	// add the printer
+	//
+	ZeroMemory(&pInfo, sizeof(pInfo));
+		
+	pInfo.pPrinterName			=	printer->actualName.GetBuffer();
+	pInfo.pServerName			=	NULL;
+	pInfo.pShareName			=	NULL;
+	pInfo.pPortName				=	printer->portName.GetBuffer();
+	pInfo.pDriverName			=	printer->modelName.GetBuffer();
+	pInfo.pComment				=	printer->displayModelName.GetBuffer();
+	pInfo.pLocation				=	q->location.GetBuffer();
+	pInfo.pDevMode				=	NULL;
+	pInfo.pDevMode				=	NULL;
+	pInfo.pSepFile				=	L"";
+	pInfo.pPrintProcessor		=	L"winprint";
+	pInfo.pDatatype				=	L"RAW";
+	pInfo.pParameters			=	L"";
+	pInfo.pSecurityDescriptor	=	NULL;
+	pInfo.Attributes			=	PRINTER_ATTRIBUTE_QUEUED;
+	pInfo.Priority				=	0;
+	pInfo.DefaultPriority		=	0;
+	pInfo.StartTime				=	0;
+	pInfo.UntilTime				=	0;
+
+	hPrinter = AddPrinter(NULL, 2, (LPBYTE) &pInfo);
+	err = translate_errno( hPrinter, errno_compat(), kUnknownErr );
+	require_noerr_with_log( log, "AddPrinter()", err, exit );
+
+exit:
+
+	if (hPrinter != NULL)
+	{
+		ClosePrinter(hPrinter);
+	}
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinterIPP(Printer * printer, Service * service, Logger & log)
+{
+	DEBUG_UNUSED( service );
+
+	Queue		*	q		 = service->SelectedQueue();
+	HANDLE			hPrinter = NULL;
+	PRINTER_INFO_2	pInfo;
+	OSStatus		err;
+
+	check( q );
+	
+	//
+	// add the printer
+	//
+	ZeroMemory(&pInfo, sizeof(PRINTER_INFO_2));
+	
+	pInfo.pPrinterName		= printer->actualName.GetBuffer();
+	pInfo.pPortName			= printer->portName.GetBuffer();
+	pInfo.pDriverName		= printer->modelName.GetBuffer();
+	pInfo.pPrintProcessor	= L"winprint";
+	pInfo.pLocation			= q->location.GetBuffer();
+	pInfo.pComment			= printer->displayModelName.GetBuffer();
+	pInfo.Attributes		= PRINTER_ATTRIBUTE_NETWORK | PRINTER_ATTRIBUTE_LOCAL;
+	
+	hPrinter = AddPrinter(NULL, 2, (LPBYTE)&pInfo);
+	err = translate_errno( hPrinter, errno_compat(), kUnknownErr );
+	require_noerr_with_log( log, "AddPrinter()", err, exit );
+
+exit:
+
+	if ( hPrinter != NULL )
+	{
+		ClosePrinter(hPrinter);
+	}
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinterCUPS(Printer * printer, Service * service, CUPSLibrary & cupsLib )
+{
+	OSStatus err = kNoErr;
+
+	check( printer );
+	check( service );
+	check( cupsLib.IsInstalled() );
+
+	err = InstallPrinterCUPS( printer, service, cupsLib, TEXT( "Windows NT x86" ) );
+	require_noerr( err, exit );
+
+	if ( Is64BitWindows() )
+	{
+		err = InstallPrinterCUPS( printer, service, cupsLib, TEXT( "Windows x64" ) );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::InstallPrinterCUPS(Printer * printer, Service * service, CUPSLibrary & cupsLib, TCHAR * env )
+{
+	
+	Queue		*	q;
+	CString			ppdfile;				// PPD file for printer drivers
+	TCHAR			driverdir[1024];		// Directory for driver files
+	DWORD			needed;					// Bytes needed
+	DRIVER_INFO_3	driverinfo;				// Driver information
+	PRINTER_INFO_2	printerinfo;			// Printer information
+	HANDLE			printerHandle = NULL;	// Handle to printer
+	CString			filename;				// Driver filename
+	CString			dependentFiles;			// List of dependent files
+	CString			portName;				// Port Name
+	int				bytes;					// Bytes copied
+	TCHAR			datadir[ MAX_PATH ];	// Driver files location
+	CFile			in;						// Input file
+	CFile			out;					// Output file
+	void		*	http;					// Connection to server
+	char			buffer[4096];			// Copy/error buffer
+	CString			platform;
+	char			hostname[ 1024 ];
+	CString			dest;
+	char			destANSI[ 1024 ];
+	int				i;
+	DWORD			num;
+	OSStatus		err	= 0;
+	BOOL			ok;
+
+	check( printer );
+	check( service );
+	check( cupsLib.IsInstalled() );
+	check( env );
+
+	// What do we do here for multiple queues?
+	q = service->queues.front();
+	require_action( q != NULL, exit, err = kUnknownErr );
+
+	num = GetModuleFileName( NULL, datadir, MAX_PATH );
+	err = translate_errno( num > 0, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	ok = PathRemoveFileSpec( datadir );
+	require_action( ok, exit, err = kUnknownErr );
+
+	ok = GetPrinterDriverDirectory(NULL, env, 1, ( LPBYTE ) driverdir, sizeof( driverdir ), &needed );
+	err = translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	platform = env;
+	platform = platform.Right( 3 );
+
+	// Append the supported banner pages to the PPD file...
+	err = StringObjectToUTF8String( service->hostname, hostname, sizeof( hostname ) );
+	require_noerr( err, exit );
+	http = cupsLib.httpConnectEncrypt( hostname, service->portNumber, cupsLib.cupsEncryption() );
+	err = translate_errno( http != NULL, errno, kUnknownErr );
+	require_noerr( err, exit );
+
+	if ( ( service->portNumber == 443 ) || ( cupsLib.cupsEncryption() >= HTTP_ENCRYPT_REQUIRED ) )
+	{
+		// This forces the use the https: URLs below...
+		cupsLib.cupsSetEncryption( HTTP_ENCRYPT_ALWAYS );
+	}
+
+	// Strip the leading "printers/" or "classes/" from the beginning
+	// of the name
+
+	dest = q->name;
+	dest.Replace( TEXT( "printers/" ), TEXT( "" ) );
+	dest.Replace( TEXT( "classes/" ), TEXT( "" ) );
+
+	err = StringObjectToUTF8String( dest, destANSI, sizeof( destANSI ) );
+	require_noerr( err, exit );
+
+	// Get the PPD file...
+	for ( i = 0; i < 10; i++ )
+	{
+		char ppdfileANSI[ 1024 ];
+
+		if ( cupsLib.cupsAdminCreateWindowsPPD( http, destANSI, ppdfileANSI, sizeof( ppdfileANSI ) ) )
+		{
+			err = UTF8StringToStringObject( ppdfileANSI, ppdfile );
+			require_noerr( err, exit );
+			break;
+		}
+	}
+
+	err = translate_errno( i < 10, errno, kUnknownErr );
+	require_noerr( err, exit );
+
+	// Copy the PPD file to the Windows driver directory...
+	filename.Format( TEXT( "%s/%s.ppd" ), driverdir, dest );
+
+	ok = in.Open( ppdfile, CFile::modeRead | CFile::typeBinary );
+	translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	ok = out.Open( filename, CFile::modeCreate | CFile::modeWrite | CFile::typeBinary );
+	translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	while ( ( bytes = in.Read( buffer, sizeof(buffer) ) ) > 0 )
+	{
+		out.Write(buffer, bytes );
+	}
+
+	in.Close();
+	out.Close();
+
+	// Cleanup temp file...
+	CFile::Remove( ppdfile );
+
+	// Copy the driver files to the driver directory...
+	for ( i = 0; i < ( sizeof( g_printerDriverFiles ) / sizeof( g_printerDriverFiles[0] ) ); i++ )
+	{
+		filename.Format( TEXT( "%s/drivers/%s/%s" ), datadir, platform, g_printerDriverFiles[i]);
+	
+		ok = in.Open(filename, CFile::modeRead | CFile::typeBinary );
+		err = translate_errno( ok, GetLastError(), kUnknownErr );
+		require_noerr( err, exit );
+
+		filename.Format( TEXT( "%s/%s" ), driverdir, g_printerDriverFiles[i] );
+		ok = out.Open(filename, CFile::modeCreate | CFile::modeWrite | CFile::typeBinary );
+		err = translate_errno( ok, errno, kUnknownErr );
+
+		while ( ( bytes = in.Read(buffer, sizeof( buffer ) ) ) > 0 )
+		{
+			out.Write( buffer, bytes );
+		}
+
+		in.Close();
+		out.Close();
+	}
+
+	// Do the Windows system calls needed to add the printer driver...
+	filename.Format( TEXT( "%s.ppd" ), dest);
+	dependentFiles.Format( TEXT( "pscript5.dll%c" ) TEXT( "%s.ppd%c" ) TEXT( "ps5ui.dll%c" ) TEXT( "pscript.hlp%c" ) TEXT( "pscript.ntf%c" ) TEXT( "cups6.ini%c" ) TEXT( "cupsps6.dll%c" ) TEXT( "cupsui6.dll%c" ), 0, dest, 0, 0, 0, 0, 0, 0, 0);
+
+	driverinfo.cVersion         = 3;
+	driverinfo.pName            = printer->actualName.GetBuffer();
+	driverinfo.pEnvironment     = env;
+	driverinfo.pDriverPath      = TEXT( "pscript5.dll" );
+	driverinfo.pDataFile        = filename.GetBuffer();
+	driverinfo.pConfigFile      = TEXT( "ps5ui.dll" );
+	driverinfo.pHelpFile        = TEXT( "pscript.hlp" );
+	driverinfo.pDependentFiles  = dependentFiles.GetBuffer();
+	driverinfo.pMonitorName     = NULL;
+	driverinfo.pDefaultDataType = TEXT( "raw" );
+
+	ok = AddPrinterDriverEx(NULL, 3, (LPBYTE) &driverinfo, APD_COPY_ALL_FILES );
+	err = translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// See if the printer has already been added?
+	if ( OpenPrinter( printer->actualName.GetBuffer(), &printerHandle, NULL ) )
+    {
+		// Printer already exists, so we are done now...
+		goto exit;
+    }
+
+    // Add the printer using the HTTP/IPP port...
+	portName.Format( TEXT( "%s://%s:%d/printers/%s" ), cupsLib.cupsEncryption() == HTTP_ENCRYPT_ALWAYS ? TEXT( "https" ) : TEXT( "http" ), service->hostname.GetBuffer(), service->portNumber, dest );
+
+    memset(&printerinfo, 0, sizeof(printerinfo));
+    printerinfo.pPrinterName	= printer->actualName.GetBuffer();
+    printerinfo.pPortName		= portName.GetBuffer();
+    printerinfo.pDriverName		= printer->actualName.GetBuffer();
+    printerinfo.Attributes		= PRINTER_ATTRIBUTE_NETWORK | PRINTER_ATTRIBUTE_LOCAL;
+	printerinfo.pComment		= q->description.GetBuffer();
+	printerinfo.pLocation		= q->location.GetBuffer();
+	printerinfo.pPrintProcessor = TEXT( "winprint" );
+
+    printerHandle = AddPrinter( NULL, 2, (LPBYTE) &printerinfo );
+	err = translate_errno( printerHandle, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( printerHandle != NULL )
+	{
+		ClosePrinter( printerHandle );
+		printerHandle = NULL;
+	}
+
+	return err;
+}
+
+BEGIN_MESSAGE_MAP(CPrinterSetupWizardSheet, CPropertySheet)
+ON_MESSAGE( WM_SOCKET_EVENT, OnSocketEvent )
+ON_MESSAGE( WM_PROCESS_EVENT, OnProcessEvent )
+ON_WM_SETCURSOR()
+ON_WM_TIMER()
+END_MESSAGE_MAP()
+
+
+// ------------------------------------------------------
+// OnCommand
+//
+// Traps when the user hits Finish  
+//	
+BOOL CPrinterSetupWizardSheet::OnCommand(WPARAM wParam, LPARAM lParam)
+{
+	//
+	// Check if this is OK
+	//
+	if (wParam == ID_WIZFINISH)              // If OK is hit...
+	{
+		OnOK();
+	}
+ 
+	return CPropertySheet::OnCommand(wParam, lParam);
+}
+
+
+// ------------------------------------------------------
+// OnInitDialog
+//
+// Initializes this Dialog object.
+//	
+BOOL CPrinterSetupWizardSheet::OnInitDialog()
+{
+	OSStatus err;
+
+	CPropertySheet::OnInitDialog();
+
+	err = StartBrowse();
+	require_noerr( err, exit );
+
+exit:
+
+	if ( err )
+	{
+		StopBrowse();
+
+		if ( err == kDNSServiceErr_Firewall )
+		{
+			CString text, caption;
+
+			text.LoadString( IDS_FIREWALL );
+			caption.LoadString( IDS_FIREWALL_CAPTION );
+
+			MessageBox(text, caption, MB_OK|MB_ICONEXCLAMATION);
+		}
+		else
+		{
+			CString text, caption;
+
+			text.LoadString( IDS_NO_MDNSRESPONDER_SERVICE_TEXT );
+			caption.LoadString( IDS_ERROR_CAPTION );
+
+			MessageBox(text, caption, MB_OK|MB_ICONEXCLAMATION);
+
+			_exit( 0 );
+		}
+	}
+
+	return TRUE;
+}
+
+
+// ------------------------------------------------------
+// OnSetCursor
+//
+// This is called when Windows wants to know what cursor
+// to display.  So we tell it.  
+//	
+BOOL
+CPrinterSetupWizardSheet::OnSetCursor(CWnd * pWnd, UINT nHitTest, UINT message)
+{
+	DEBUG_UNUSED(pWnd);
+	DEBUG_UNUSED(nHitTest);
+	DEBUG_UNUSED(message);
+
+	SetCursor(m_active);
+	return TRUE;
+}
+
+
+// ------------------------------------------------------
+// OnContextMenu
+//
+// This is not fully implemented yet.  
+//	
+
+void
+CPrinterSetupWizardSheet::OnContextMenu(CWnd * pWnd, CPoint pos)
+{
+	DEBUG_UNUSED(pWnd);
+	DEBUG_UNUSED(pos);
+
+	CAbout dlg;
+
+	dlg.DoModal();
+}
+
+
+// ------------------------------------------------------
+// OnOK
+//
+// This is called when the user hits the "Finish" button  
+//	
+void
+CPrinterSetupWizardSheet::OnOK()
+{
+	CWnd * window;
+	OSStatus err;
+
+	check ( m_selectedPrinter != NULL );
+
+	SetWizardButtons( PSWIZB_DISABLEDFINISH );
+
+	window = GetDlgItem( IDCANCEL );
+ 
+	if ( window )
+	{
+		window->EnableWindow( FALSE );
+	}
+
+	m_pgFourth.StartActivityIndicator();
+	
+	err = InstallPrinter( m_selectedPrinter );
+
+	m_pgFourth.StopActivityIndicator();
+
+	if ( err != kNoErr )
+	{
+		CString caption;
+		CString message;
+
+		caption.LoadString(IDS_INSTALL_ERROR_CAPTION);
+		caption.AppendFormat( TEXT( " (%d)" ), err );
+		message.LoadString(IDS_INSTALL_ERROR_MESSAGE);
+		MessageBox(message, caption, MB_OK|MB_ICONEXCLAMATION);
+	}
+
+	StopBrowse();
+}
+
+
+// CPrinterSetupWizardSheet message handlers
+
+void CPrinterSetupWizardSheet::Init(void)
+{
+	AddPage(&m_pgSecond);
+	AddPage(&m_pgThird);
+	AddPage(&m_pgFourth);
+
+	m_psh.dwFlags &= (~PSH_HASHELP);
+
+	m_psh.dwFlags |= PSH_WIZARD97|PSH_WATERMARK|PSH_HEADER;
+	m_psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
+	m_psh.pszbmHeader = MAKEINTRESOURCE(IDB_BANNER_ICON);
+
+	m_psh.hInstance = GetNonLocalizedResources();
+
+	SetWizardMode();
+}
+
+
+LRESULT
+CPrinterSetupWizardSheet::OnSocketEvent(WPARAM inWParam, LPARAM inLParam)
+{
+	if (WSAGETSELECTERROR(inLParam) && !(HIWORD(inLParam)))
+    {
+		dlog( kDebugLevelError, "OnServiceEvent: window error\n" );
+    }
+    else
+    {
+		SOCKET sock = (SOCKET) inWParam;
+
+		// iterate thru list
+		ServiceRefList::iterator begin = m_serviceRefList.begin();
+		ServiceRefList::iterator end   = m_serviceRefList.end();
+
+		while (begin != end)
+		{
+			DNSServiceRef ref = *begin++;
+
+			check(ref != NULL);
+
+			if ((SOCKET) DNSServiceRefSockFD(ref) == sock)
+			{
+				DNSServiceProcessResult(ref);
+				break;
+			}
+		}
+	}
+
+	return ( 0 );
+}
+
+
+LRESULT
+CPrinterSetupWizardSheet::OnProcessEvent(WPARAM inWParam, LPARAM inLParam)
+{
+	DEBUG_UNUSED(inLParam);
+
+	m_driverThreadExitCode	=	(DWORD) inWParam;
+	m_driverThreadFinished	=	true;
+
+	return 0;
+}
+
+
+unsigned WINAPI
+CPrinterSetupWizardSheet::InstallDriverThread( LPVOID inParam )
+{	
+	Printer			*	printer = (Printer*) inParam;
+	DWORD				exitCode = 0;
+	DWORD				dwResult;
+	OSStatus			err;
+	STARTUPINFO			si;
+	PROCESS_INFORMATION pi;
+	BOOL				ok;
+
+	check( printer );
+	check( m_self );
+
+	//
+	// because we're calling endthreadex(), C++ objects won't be cleaned up
+	// correctly.  we'll nest the CString 'command' inside a block so
+	// that it's destructor will be invoked.
+	//
+	{
+		CString command;
+
+		ZeroMemory( &si, sizeof(si) );
+		si.cb = sizeof(si);
+		ZeroMemory( &pi, sizeof(pi) );
+
+		command.Format(L"rundll32.exe printui.dll,PrintUIEntry /ia /m \"%s\" /f \"%s\"", (LPCTSTR) printer->modelName, (LPCTSTR) printer->infFileName );
+
+		ok = CreateProcess(NULL, command.GetBuffer(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+		err = translate_errno( ok, errno_compat(), kUnknownErr );
+		require_noerr( err, exit );
+
+		dwResult = WaitForSingleObject( pi.hProcess, INFINITE );
+		translate_errno( dwResult == WAIT_OBJECT_0, errno_compat(), err = kUnknownErr );
+		require_noerr( err, exit );
+
+		ok = GetExitCodeProcess( pi.hProcess, &exitCode );
+		err = translate_errno( ok, errno_compat(), kUnknownErr );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	//
+	// Close process and thread handles. 
+	//
+	if ( pi.hProcess )
+	{
+		CloseHandle( pi.hProcess );
+	}
+
+	if ( pi.hThread )
+	{
+		CloseHandle( pi.hThread );
+	}
+
+	//
+	// alert the main thread
+	//
+	m_self->PostMessage( WM_PROCESS_EVENT, err, exitCode );
+
+	_endthreadex_compat( 0 );
+
+	return 0;
+}
+
+
+void DNSSD_API
+CPrinterSetupWizardSheet::OnBrowse(
+							DNSServiceRef 			inRef,
+							DNSServiceFlags 		inFlags,
+							uint32_t 				inInterfaceIndex,
+							DNSServiceErrorType 	inErrorCode,
+							const char *			inName,	
+							const char *			inType,	
+							const char *			inDomain,	
+							void *					inContext )
+{
+	DEBUG_UNUSED(inRef);
+
+	CPrinterSetupWizardSheet	*	self;
+	bool							moreComing = (bool) (inFlags & kDNSServiceFlagsMoreComing);
+	CPropertyPage				*	active;
+	Printer						*	printer = NULL;
+	Service						*	service = NULL;
+	OSStatus						err = kNoErr;
+
+	require_noerr( inErrorCode, exit );
+
+	self = reinterpret_cast <CPrinterSetupWizardSheet*>( inContext );
+	require_quiet( self, exit );
+
+	active = self->GetActivePage();
+	require_quiet( active, exit );
+
+	// Have we seen this printer before?
+
+	printer = self->Lookup( inName );
+
+	if ( printer )
+	{
+		service = printer->LookupService( inType );
+	}
+
+	if ( inFlags & kDNSServiceFlagsAdd )
+	{
+		BOOL newPrinter = FALSE;
+
+		if ( !printer )
+		{
+			printer = self->OnAddPrinter( inInterfaceIndex, inName, inType, inDomain, moreComing );
+			require_action( printer, exit, err = kUnknownErr );
+			newPrinter = TRUE;
+		}
+		
+		// If we're looking at the browse list on page 2, then we need to call
+		// CPage2::OnAddPrinter() regardless of whether we've seen the printer
+		// or not because the moreComing flag might have changed from a previous
+		// call. If we only call CPage2::OnAddPrinter() when there's a new printer,
+		// we might not correctly update our UI, so if we've seen the printer before,
+		// call OnAddPrinter with a NULL parameter.
+
+		if ( self->GetActivePage() == &self->m_pgSecond )
+		{
+			self->m_pgSecond.OnAddPrinter( newPrinter ? printer : NULL, moreComing );
+		}
+
+		if ( !service )
+		{
+			err = self->OnAddService( printer, inInterfaceIndex, inName, inType, inDomain );
+			require_noerr( err, exit );
+		}
+		else
+		{
+			service->refs++;
+		}
+	}
+	else if ( printer )
+	{
+		check( service );
+
+		err = self->OnRemoveService( service );
+		require_noerr( err, exit );
+
+		if ( printer->services.size() == 0 )
+		{
+			err = self->OnRemovePrinter( printer, moreComing );
+			require_noerr( err, exit );
+		}
+	}
+
+exit:
+	
+	return;
+}
+
+
+void DNSSD_API
+CPrinterSetupWizardSheet::OnResolve(
+								DNSServiceRef			inRef,
+								DNSServiceFlags			inFlags,
+								uint32_t				inInterfaceIndex,
+								DNSServiceErrorType		inErrorCode,
+								const char *			inFullName,	
+								const char *			inHostName, 
+								uint16_t 				inPort,
+								uint16_t 				inTXTSize,
+								const char *			inTXT,
+								void *					inContext )
+{
+	DEBUG_UNUSED(inFullName);
+	DEBUG_UNUSED(inInterfaceIndex);
+	DEBUG_UNUSED(inFlags);
+	DEBUG_UNUSED(inRef);
+
+	CPrinterSetupWizardSheet	*	self;
+	Service						*	service;
+	Queue						*	q;
+	int								idx;
+	OSStatus						err;
+
+	require_noerr( inErrorCode, exit );
+
+	service = reinterpret_cast<Service*>( inContext );
+	require_quiet( service, exit);
+
+	check( service->refs != 0 );
+
+	self = service->printer->window;
+	require_quiet( self, exit );
+
+	err = self->StopOperation( service->serviceRef );
+	require_noerr( err, exit );
+	
+	//
+	// hold on to the hostname...
+	//
+	err = UTF8StringToStringObject( inHostName, service->hostname );
+	require_noerr( err, exit );
+
+	//
+	// <rdar://problem/3739200> remove the trailing dot on hostname
+	//
+	idx = service->hostname.ReverseFind('.');
+
+	if ((idx > 1) && ((service->hostname.GetLength() - 1) == idx))
+	{
+		service->hostname.Delete(idx, 1);
+	}
+
+	//
+	// hold on to the port
+	//
+	service->portNumber = ntohs(inPort);
+
+	if ( service->qtotal == 1 )
+	{	
+		//
+		// create a new queue
+		//
+		try
+		{
+			q = new Queue;
+		}
+		catch (...)
+		{
+			q = NULL;
+		}
+
+		require_action( q, exit, err = E_OUTOFMEMORY );
+
+		//
+		// parse the text record.
+		//
+
+		err = self->ParseTextRecord( service, q, inTXTSize, inTXT );
+		require_noerr( err, exit );
+
+		service->queues.push_back( q );
+
+		//
+		// we've completely resolved this service
+		//
+
+		self->OnResolveService( service );
+	}
+	else
+	{
+		//
+		// if qtotal is more than 1, then we need to get additional
+		// text records.  if not, then this service is considered
+		// resolved
+		//
+
+		err = DNSServiceQueryRecord(&service->serviceRef, 0, inInterfaceIndex, inFullName, kDNSServiceType_TXT, kDNSServiceClass_IN, OnQuery, (void*) service );
+		require_noerr( err, exit );
+
+		err = self->StartOperation( service->serviceRef );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CPrinterSetupWizardSheet::OnQuery(
+							DNSServiceRef		inRef, 
+							DNSServiceFlags		inFlags, 
+							uint32_t			inInterfaceIndex, 
+							DNSServiceErrorType inErrorCode,
+							const char		*	inFullName, 
+							uint16_t			inRRType, 
+							uint16_t			inRRClass, 
+							uint16_t			inRDLen, 
+							const void		*	inRData, 
+							uint32_t			inTTL, 
+							void			*	inContext)
+{
+	DEBUG_UNUSED( inTTL );
+	DEBUG_UNUSED( inRRClass );
+	DEBUG_UNUSED( inRRType );
+	DEBUG_UNUSED( inFullName );
+	DEBUG_UNUSED( inInterfaceIndex );
+	DEBUG_UNUSED( inRef );
+
+	Service						*	service = NULL;
+	Queue						*	q;
+	CPrinterSetupWizardSheet	*	self;
+	OSStatus						err = kNoErr;
+
+	require_noerr( inErrorCode, exit );
+
+	service = reinterpret_cast<Service*>( inContext );
+	require_quiet( service, exit);
+
+	self = service->printer->window;
+	require_quiet( self, exit );
+
+	if ( ( inFlags & kDNSServiceFlagsAdd ) && ( inRDLen > 0 ) && ( inRData != NULL ) )
+	{
+		const char * inTXT = ( const char * ) inRData;
+
+		//
+		// create a new queue
+		//
+		try
+		{
+			q = new Queue;
+		}
+		catch (...)
+		{
+			q = NULL;
+		}
+
+		require_action( q, exit, err = E_OUTOFMEMORY );
+
+		err = service->printer->window->ParseTextRecord( service, q, inRDLen, inTXT );
+		require_noerr( err, exit );
+
+		//
+		// add this queue
+		//
+
+		service->queues.push_back( q );
+
+		if ( service->queues.size() == service->qtotal )
+		{
+			//
+			// else if moreComing is not set, then we're going
+			// to assume that we're done
+			//
+
+			self->StopOperation( service->serviceRef );
+
+			//
+			// sort the queues
+			//
+
+			service->queues.sort( OrderQueueFunc );
+
+			//
+			// we've completely resolved this service
+			//
+
+			self->OnResolveService( service );
+		}
+	}
+
+exit:
+
+	if ( err && service && ( service->serviceRef != NULL ) )
+	{
+		service->printer->window->StopOperation( service->serviceRef );
+	}
+
+	return;
+}
+
+
+Printer*
+CPrinterSetupWizardSheet::OnAddPrinter(
+								uint32_t 		inInterfaceIndex,
+								const char *	inName,	
+								const char *	inType,	
+								const char *	inDomain,
+								bool			moreComing)
+{
+	Printer	*	printer = NULL;
+	DWORD		printerNameCount;
+	OSStatus	err;
+
+	DEBUG_UNUSED( inInterfaceIndex );
+	DEBUG_UNUSED( inType );
+	DEBUG_UNUSED( inDomain );
+	DEBUG_UNUSED( moreComing );
+
+	try
+	{
+		printer = new Printer;
+	}
+	catch (...)
+	{
+		printer = NULL;
+	}
+
+	require_action( printer, exit, err = E_OUTOFMEMORY );
+
+	printer->window		=	this;
+	printer->name		=	inName;
+	
+	err = UTF8StringToStringObject(inName, printer->displayName);
+	check_noerr( err );
+	printer->actualName	=	printer->displayName;
+	printer->installed	=	false;
+	printer->deflt		=	false;
+	printer->resolving	=	0;
+
+	// Compare this name against printers that are already installed
+	// to avoid name clashes.  Rename as necessary
+	// to come up with a unique name.
+
+	printerNameCount = 2;
+
+	for (;;)
+	{
+		CPrinterSetupWizardSheet::PrinterNames::iterator it;
+
+		// <rdar://problem/4141221> Don't use find to do comparisons because we need to
+		// do a case insensitive string comparison
+
+		for ( it = m_printerNames.begin(); it != m_printerNames.end(); it++ )
+		{
+			if ( (*it).CompareNoCase( printer->actualName ) == 0 )
+			{
+				break;
+			}
+		}
+
+		if (it != m_printerNames.end())
+		{
+			printer->actualName.Format(L"%s (%d)", printer->displayName, printerNameCount);
+		}
+		else
+		{
+			break;
+		}
+
+		printerNameCount++;
+	}
+
+	m_printers.push_back( printer );
+
+exit:
+
+	return printer;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::OnAddService(
+								Printer		*	printer,
+								uint32_t 		inInterfaceIndex,
+								const char	*	inName,	
+								const char	*	inType,	
+								const char	*	inDomain)
+{
+	Service	*	service = NULL;
+	OSStatus	err     = kNoErr;
+
+	DEBUG_UNUSED( inName );
+	DEBUG_UNUSED( inDomain );
+
+	try
+	{
+		service = new Service;
+	}
+	catch (...)
+	{
+		service = NULL;
+	}
+
+	require_action( service, exit, err = E_OUTOFMEMORY );
+	
+	service->printer	=	printer;
+	service->ifi		=	inInterfaceIndex;
+	service->type		=	inType;
+	service->domain		=	inDomain;
+	service->qtotal		=	1;
+	service->refs		=	1;
+	service->serviceRef	=	NULL;
+
+	printer->services.push_back( service );
+
+	//
+	// if the printer is selected, then we'll want to start a
+	// resolve on this guy
+	//
+
+	if ( printer == m_selectedPrinter )
+	{
+		StartResolve( service );
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::OnRemovePrinter( Printer * printer, bool moreComing )
+{
+	CPropertyPage	*	active	= GetActivePage();
+	OSStatus			err		= kNoErr;
+
+	if ( active == &m_pgSecond )
+	{
+		m_pgSecond.OnRemovePrinter( printer, moreComing );
+	}
+
+	m_printers.remove( printer );
+
+	if ( m_selectedPrinter == printer )
+	{
+		m_selectedPrinter = NULL;
+
+		if ( ( active == &m_pgThird ) || ( active == &m_pgFourth ) )
+		{
+			CString caption;
+			CString message;
+
+			caption.LoadString( IDS_ERROR_CAPTION );
+			message.LoadString( IDS_PRINTER_UNAVAILABLE );
+
+			MessageBox(message, caption, MB_OK|MB_ICONEXCLAMATION);
+
+			SetActivePage( &m_pgSecond );
+		}
+	}
+
+	delete printer;
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::OnRemoveService( Service * service )
+{
+	OSStatus err = kNoErr;
+
+	if ( service && ( --service->refs == 0 ) )
+	{
+		if ( service->serviceRef != NULL )
+		{
+			err = StopResolve( service );
+			require_noerr( err, exit );
+		}
+
+		service->printer->services.remove( service );
+
+		delete service;
+	}
+
+exit:
+
+	return err;	
+}
+
+
+void
+CPrinterSetupWizardSheet::OnResolveService( Service * service )
+{
+	// Make sure that the active page is page 2
+
+	require_quiet( GetActivePage() == &m_pgSecond, exit );
+
+	if ( !--service->printer->resolving )
+	{
+		// sort the services now.  we want the service that
+		// has the highest priority queue to be first in
+		// the list.
+
+		service->printer->services.sort( OrderServiceFunc );
+
+		// Now we can hit next
+
+		SetWizardButtons( PSWIZB_BACK|PSWIZB_NEXT );
+	
+		// Reset the cursor	
+		
+		m_active = m_arrow;
+
+		// And tell page 2 about it
+
+		m_pgSecond.OnResolveService( service );
+	}		
+
+exit:
+
+	return;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StartBrowse()
+{
+	OSStatus err;
+
+	//
+	// setup the DNS-SD browsing
+	//
+	err = DNSServiceBrowse( &m_pdlBrowser, 0, 0, kPDLServiceType, NULL, OnBrowse, this );
+	require_noerr( err, exit );
+
+	err = StartOperation( m_pdlBrowser );
+	require_noerr( err, exit );
+
+	err = DNSServiceBrowse( &m_lprBrowser, 0, 0, kLPRServiceType, NULL, OnBrowse, this );
+	require_noerr( err, exit );
+
+	err = StartOperation( m_lprBrowser );
+	require_noerr( err, exit );
+
+	err = DNSServiceBrowse( &m_ippBrowser, 0, 0, kIPPServiceType, NULL, OnBrowse, this );
+	require_noerr( err, exit );
+
+	err = StartOperation( m_ippBrowser );
+	require_noerr( err, exit );
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StopBrowse()
+{
+	OSStatus err;
+
+	err = StopOperation( m_pdlBrowser );
+	require_noerr( err, exit );
+
+	err = StopOperation( m_lprBrowser );
+	require_noerr( err, exit );
+
+	err = StopOperation( m_ippBrowser );
+	require_noerr( err, exit );
+
+	while ( m_printers.size() > 0 )
+	{
+		Printer * printer = m_printers.front();
+
+		m_printers.pop_front();
+
+		if ( printer->resolving )
+		{
+			StopResolve( printer );
+		}
+
+		delete printer;
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StartResolve( Printer * printer )
+{
+	OSStatus			err = kNoErr;
+	Services::iterator	it;
+
+	check( printer );
+
+	for ( it = printer->services.begin(); it != printer->services.end(); it++ )
+	{
+		if ( (*it)->serviceRef == NULL )
+		{
+			err = StartResolve( *it );
+			require_noerr( err, exit );
+		}
+	}
+
+	m_selectedPrinter = printer;
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StartResolve( Service * service )
+{
+	OSStatus err = kNoErr;
+
+	check( service->serviceRef == NULL );
+
+	//
+	// clean out any queues that were collected during a previous
+	// resolve
+	//
+
+	service->EmptyQueues();
+
+	//
+	// now start the new resolve
+	//
+
+	err = DNSServiceResolve( &service->serviceRef, 0, 0, service->printer->name.c_str(), service->type.c_str(), service->domain.c_str(), (DNSServiceResolveReply) OnResolve, service );
+	require_noerr( err, exit );
+
+	err = StartOperation( service->serviceRef );
+	require_noerr( err, exit );
+
+	//
+	// If we're not currently resolving, then disable the next button
+	// and set the cursor to hourglass
+	//
+
+	if ( !service->printer->resolving )
+	{
+		SetWizardButtons( PSWIZB_BACK );
+
+		m_active = m_wait;
+		SetCursor(m_active);
+	}
+
+	service->printer->resolving++;
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StopResolve(Printer * printer)
+{
+	OSStatus err = kNoErr;
+
+	check( printer );
+
+	Services::iterator it;
+
+	for ( it = printer->services.begin(); it != printer->services.end(); it++ )
+	{
+		if ( (*it)->serviceRef )
+		{
+			err = StopResolve( *it );
+			require_noerr( err, exit );
+		}
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StopResolve( Service * service )
+{
+	OSStatus err;
+
+	check( service->serviceRef );
+
+	err = StopOperation( service->serviceRef );
+	require_noerr( err, exit );
+
+	service->printer->resolving--;
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StartOperation( DNSServiceRef ref )
+{
+	OSStatus err;
+
+	err = WSAAsyncSelect((SOCKET) DNSServiceRefSockFD(ref), m_hWnd, WM_SOCKET_EVENT, FD_READ|FD_CLOSE);
+	require_noerr( err, exit );
+
+	m_serviceRefList.push_back( ref );
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::StopOperation( DNSServiceRef & ref )
+{
+	OSStatus err = kNoErr;
+
+	if ( ref )
+	{
+		m_serviceRefList.remove( ref );
+
+		if ( IsWindow( m_hWnd ) )
+		{
+			err = WSAAsyncSelect((SOCKET) DNSServiceRefSockFD( ref ), m_hWnd, 0, 0 );
+			require_noerr( err, exit );
+		}
+
+		DNSServiceRefDeallocate( ref );
+		ref = NULL;
+	}
+
+exit:
+
+	return err;
+}
+
+
+OSStatus
+CPrinterSetupWizardSheet::ParseTextRecord( Service * service, Queue * q, uint16_t inTXTSize, const char * inTXT )
+{
+	check( service );
+	check( q );
+
+	// <rdar://problem/3946587> Use TXTRecord APIs declared in dns_sd.h
+	
+	bool			qtotalDefined	= false;
+	const void	*	val;
+	char			buf[256];
+	uint8_t			len;
+	OSStatus		err				= kNoErr;
+
+	// <rdar://problem/3987680> Default to queue "lp"
+
+	q->name = L"lp";
+
+	// <rdar://problem/4003710> Default pdl key to be "application/postscript"
+
+	q->pdl = L"application/postscript";
+
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "rp", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->name );
+		require_noerr( err, exit );
+	}
+	
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "pdl", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->pdl );
+		require_noerr( err, exit );
+	}
+	
+	if ( ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "usb_mfg", &len ) ) != NULL ) ||
+	     ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "usb_manufacturer", &len ) ) != NULL ) )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->usb_MFG );
+		require_noerr( err, exit );
+	}
+	
+	if ( ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "usb_mdl", &len ) ) != NULL ) ||
+	     ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "usb_model", &len ) ) != NULL ) )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->usb_MDL );
+		require_noerr( err, exit );
+	}
+
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "ty", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->description );
+		require_noerr( err, exit );
+	}
+		
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "product", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->product );
+		require_noerr( err, exit );
+	}
+
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "note", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		err = UTF8StringToStringObject( buf, q->location );
+		require_noerr( err, exit );
+	}
+
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "qtotal", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		service->qtotal = (unsigned short) atoi( buf );
+		qtotalDefined = true;
+	}
+
+	if ( ( val = TXTRecordGetValuePtr( inTXTSize, inTXT, "priority", &len ) ) != NULL )
+	{
+		// Stringize val ( doesn't have trailing '\0' yet )
+
+		memcpy( buf, val, len );
+		buf[len] = '\0';
+
+		q->priority = atoi( buf );
+	}
+
+	// <rdar://problem/4124524> Was this printer discovered via OS X Printer Sharing?
+
+	if ( TXTRecordContainsKey( inTXTSize, inTXT, "printer-state" ) || TXTRecordContainsKey( inTXTSize, inTXT, "printer-type" ) )
+	{
+		service->printer->isCUPSPrinter = true;
+	}
+
+exit:
+
+	// The following code is to fix a problem with older HP 
+	// printers that don't include "qtotal" in their text
+	// record.  We'll check to see if the q->name is "TEXT"
+	// and if so, we're going to modify it to be "lp" so
+	// that we don't use the wrong queue
+
+	if ( !err && !qtotalDefined && ( q->name == L"TEXT" ) )
+	{
+		q->name = "lp";
+	}
+
+	return err;
+}
+
+
+Printer*
+CPrinterSetupWizardSheet::Lookup(const char * inName)
+{
+	check( inName );
+
+	Printer			*	printer = NULL;
+	Printers::iterator	it;
+
+	for ( it = m_printers.begin(); it != m_printers.end(); it++ )
+	{
+		if ( (*it)->name == inName )
+		{
+			printer = *it;
+			break;
+		}
+	}
+
+	return printer;
+}
+
+
+bool
+CPrinterSetupWizardSheet::OrderServiceFunc( const Service * a, const Service * b )
+{
+	Queue * q1, * q2;
+
+	q1 = (a->queues.size() > 0) ? a->queues.front() : NULL;
+
+	q2 = (b->queues.size() > 0) ? b->queues.front() : NULL;
+
+	if ( !q1 && !q2 )
+	{
+		return true;
+	}
+	else if ( q1 && !q2 )
+	{
+		return true;
+	}
+	else if ( !q1 && q2 )
+	{
+		return false;
+	}
+	else if ( q1->priority < q2->priority )
+	{
+		return true;
+	}
+	else if ( q1->priority > q2->priority )
+	{
+		return false;
+	}
+	else if ( ( a->type == kPDLServiceType ) || ( ( a->type == kLPRServiceType ) && ( b->type == kIPPServiceType ) ) )
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
+bool
+CPrinterSetupWizardSheet::OrderQueueFunc( const Queue * q1, const Queue * q2 )
+{
+	return ( q1->priority <= q2->priority ) ? true : false;
+}
+
+
+
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.h b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.h
new file mode 100644
index 00000000..45110434
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/PrinterSetupWizardSheet.h
@@ -0,0 +1,352 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+
+#include "secondpage.h"
+#include "thirdpage.h"
+#include "fourthpage.h"
+#include "UtilTypes.h"
+#include "Logger.h"
+#include "dns_sd.h"
+#include <stdexcept>
+#include <map>
+
+using namespace PrinterSetupWizard;
+
+// CPrinterSetupWizardSheet
+
+class CPrinterSetupWizardSheet : public CPropertySheet
+{
+DECLARE_DYNAMIC(CPrinterSetupWizardSheet)
+
+public:
+
+struct WizardException
+{
+    CString text;
+    CString caption;
+};
+
+public:
+
+CPrinterSetupWizardSheet(UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
+virtual ~CPrinterSetupWizardSheet();
+
+CPropertyPage*
+GetLastPage();
+
+void
+SetLastPage(CPropertyPage * page );
+
+void
+SetSelectedPrinter(Printer * printer);
+
+Printer*
+GetSelectedPrinter();
+
+OSStatus
+LoadPrinterDriver(const CString & filename);
+
+HCURSOR
+GetCursor();
+
+//
+// handles end of process event
+//
+virtual LRESULT
+OnProcessEvent(WPARAM inWParam, LPARAM inLParam);
+
+virtual LRESULT
+OnSocketEvent(WPARAM inWParam, LPARAM inLParam);
+
+virtual BOOL
+OnCommand(WPARAM wParam, LPARAM lParam);
+
+virtual BOOL
+OnInitDialog();
+
+virtual BOOL
+OnSetCursor(CWnd * pWnd, UINT nHitTest, UINT message);
+
+virtual void
+OnContextMenu(CWnd * pWnd, CPoint pos);
+
+afx_msg void
+OnOK();
+
+OSStatus
+StartResolve( Printer * printer );
+
+OSStatus
+StopResolve( Printer * printer );
+
+Printers m_printers;
+
+HCURSOR m_active;
+HCURSOR m_arrow;
+HCURSOR m_wait;
+
+protected:
+DECLARE_MESSAGE_MAP()
+CSecondPage m_pgSecond;
+CThirdPage m_pgThird;
+CFourthPage m_pgFourth;
+
+void
+OnServiceResolved(
+    Service             *   service);
+
+void Init(void);
+
+private:
+
+// This is from <cups/http.h>
+typedef enum http_encryption_e          /**** HTTP encryption values ****/
+{
+    HTTP_ENCRYPT_IF_REQUESTED,          /* Encrypt if requested (TLS upgrade) */
+    HTTP_ENCRYPT_NEVER,             /* Never encrypt */
+    HTTP_ENCRYPT_REQUIRED,          /* Encryption is required (TLS upgrade) */
+    HTTP_ENCRYPT_ALWAYS             /* Always encrypt (SSL) */
+} http_encryption_t;
+
+typedef void*               ( *httpConnectEncryptFunc )( const char* host, int port, http_encryption_t encryption );
+typedef http_encryption_t ( *cupsEncryptionFunc )( void );
+typedef void ( *cupsSetEncryptionFunc )( http_encryption_t e );
+typedef char*               ( *cupsAdminCreateWindowsPPDFunc )( void * http, const char *dest, char *buffer, int bufsize );
+
+class CUPSLibrary
+{
+public:
+
+CUPSLibrary()
+    :
+    httpConnectEncrypt( NULL ),
+    cupsEncryption( NULL ),
+    cupsSetEncryption( NULL ),
+    cupsAdminCreateWindowsPPD( NULL ),
+    library( NULL )
+{
+#if defined( LIBCUPS_ENABLED )
+    if ( ( library = LoadLibrary( TEXT( "libcups2.dll" ) ) ) != NULL )
+    {
+        httpConnectEncrypt = ( httpConnectEncryptFunc ) GetProcAddress( library, "httpConnectEncrypt" );
+        cupsEncryption = ( cupsEncryptionFunc ) GetProcAddress( library, "cupsEncryption" );
+        cupsSetEncryption = ( cupsSetEncryptionFunc ) GetProcAddress( library, "cupsSetEncryption" );
+        cupsAdminCreateWindowsPPD = ( cupsAdminCreateWindowsPPDFunc ) GetProcAddress( library, "cupsAdminCreateWindowsPPD" );
+    }
+#endif
+}
+
+~CUPSLibrary()
+{
+    if ( library )
+    {
+        FreeLibrary( library );
+        library = NULL;
+    }
+}
+
+BOOL
+IsInstalled()
+{
+    return ( ( httpConnectEncrypt != NULL ) && ( cupsEncryption != NULL ) && ( cupsSetEncryption != NULL ) && ( cupsAdminCreateWindowsPPD != NULL ) );
+}
+
+httpConnectEncryptFunc httpConnectEncrypt;
+cupsEncryptionFunc cupsEncryption;
+cupsSetEncryptionFunc cupsSetEncryption;
+cupsAdminCreateWindowsPPDFunc cupsAdminCreateWindowsPPD;
+
+private:
+
+HMODULE library;
+};
+
+
+static void DNSSD_API
+OnBrowse(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char *            inName,
+    const char *            inType,
+    const char *            inDomain,
+    void *                  inContext );
+
+static void DNSSD_API
+OnResolve(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char *            inFullName,
+    const char *            inHostName,
+    uint16_t inPort,
+    uint16_t inTXTSize,
+    const char *            inTXT,
+    void *                  inContext );
+
+static void DNSSD_API
+OnQuery(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char          *   inFullName,
+    uint16_t inRRType,
+    uint16_t inRRClass,
+    uint16_t inRDLen,
+    const void          *   inRData,
+    uint32_t inTTL,
+    void                *   inContext);
+
+Printer*
+OnAddPrinter(
+    uint32_t inInterfaceIndex,
+    const char          *   inName,
+    const char          *   inType,
+    const char          *   inDomain,
+    bool moreComing);
+
+OSStatus
+OnRemovePrinter(
+    Printer             *   printer,
+    bool moreComing);
+
+OSStatus
+OnAddService(
+    Printer             *   printer,
+    uint32_t inInterfaceIndex,
+    const char          *   inName,
+    const char          *   inType,
+    const char          *   inDomain);
+
+OSStatus
+OnRemoveService(
+    Service             *   service);
+
+void
+OnResolveService(
+    Service             *   service );
+
+static bool
+OrderServiceFunc( const Service * a, const Service * b );
+
+static bool
+OrderQueueFunc( const Queue * q1, const Queue * q2 );
+
+OSStatus
+StartOperation( DNSServiceRef ref );
+
+OSStatus
+StopOperation( DNSServiceRef & ref );
+
+OSStatus
+StartBrowse();
+
+OSStatus
+StopBrowse();
+
+OSStatus
+StartResolve( Service * service );
+
+OSStatus
+StopResolve( Service * service );
+
+OSStatus
+ParseTextRecord( Service * service, Queue * q, uint16_t inTXTSize, const char * inTXT );
+
+OSStatus
+LoadPrinterNames();
+
+Printer*
+Lookup( const char * name );
+
+OSStatus
+InstallPrinter(Printer * printer);
+
+OSStatus
+InstallPrinterPort( Printer * printer, Service * service, DWORD protocol, Logger & log );
+
+OSStatus
+InstallPrinterPDLAndLPR(Printer * printer, Service * service, Logger & log);
+
+OSStatus
+InstallPrinterIPP(Printer * printer, Service * service, Logger & log);
+
+OSStatus
+InstallPrinterCUPS( Printer * printer, Service * service, CUPSLibrary & cupsLib );
+
+OSStatus
+InstallPrinterCUPS(Printer * printer, Service * service, CUPSLibrary & cupsLib, TCHAR * env );
+
+static unsigned WINAPI
+InstallDriverThread( LPVOID inParam );
+
+typedef std::list<CString>          PrinterNames;
+typedef std::list<DNSServiceRef>    ServiceRefList;
+static CPrinterSetupWizardSheet *   m_self;
+PrinterNames m_printerNames;
+Printer                         *   m_selectedPrinter;
+bool m_driverThreadFinished;
+DWORD m_driverThreadExitCode;
+ServiceRefList m_serviceRefList;
+DNSServiceRef m_pdlBrowser;
+DNSServiceRef m_lprBrowser;
+DNSServiceRef m_ippBrowser;
+DNSServiceRef m_resolver;
+
+CPropertyPage                   *   m_lastPage;
+};
+
+
+inline Printer*
+CPrinterSetupWizardSheet::GetSelectedPrinter()
+{
+    return m_selectedPrinter;
+}
+
+
+inline HCURSOR
+CPrinterSetupWizardSheet::GetCursor()
+{
+    return m_active;
+}
+
+
+inline CPropertyPage*
+CPrinterSetupWizardSheet::GetLastPage()
+{
+    return m_lastPage;
+}
+
+
+inline void
+CPrinterSetupWizardSheet::SetLastPage(CPropertyPage * lastPage)
+{
+    m_lastPage = lastPage;
+}
+
+
+// Service Types
+
+#define kPDLServiceType     "_pdl-datastream._tcp."
+#define kLPRServiceType     "_printer._tcp."
+#define kIPPServiceType     "_ipp._tcp."
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/ReadMe.txt b/mDNSResponder/Clients/PrinterSetupWizard/ReadMe.txt
new file mode 100644
index 00000000..9b5eb412
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/ReadMe.txt
@@ -0,0 +1,94 @@
+================================================================================
+    MICROSOFT FOUNDATION CLASS LIBRARY : Wiz97_3 Project Overview
+===============================================================================
+
+The application wizard has created this Wiz97_3 application for 
+you.  This application not only demonstrates the basics of using the Microsoft 
+Foundation Classes but is also a starting point for writing your application.
+
+This file contains a summary of what you will find in each of the files that
+make up your Wiz97_3 application.
+
+Wiz97_3.vcproj
+    This is the main project file for VC++ projects generated using an application wizard. 
+    It contains information about the version of Visual C++ that generated the file, and 
+    information about the platforms, configurations, and project features selected with the
+    application wizard.
+
+Wiz97_3.h
+    This is the main header file for the application.  It includes other
+    project specific headers (including Resource.h) and declares the
+    CWiz97_3App application class.
+
+Wiz97_3.cpp
+    This is the main application source file that contains the application
+    class CWiz97_3App.
+
+Wiz97_3.rc
+    This is a listing of all of the Microsoft Windows resources that the
+    program uses.  It includes the icons, bitmaps, and cursors that are stored
+    in the RES subdirectory.  This file can be directly edited in Microsoft
+    Visual C++. Your project resources are in 1033.
+
+res\Wiz97_3.ico
+    This is an icon file, which is used as the application's icon.  This
+    icon is included by the main resource file Wiz97_3.rc.
+
+res\Wiz97_3.rc2
+    This file contains resources that are not edited by Microsoft 
+    Visual C++. You should place all resources not editable by
+    the resource editor in this file.
+
+/////////////////////////////////////////////////////////////////////////////
+
+The application wizard creates one dialog class:
+Wiz97_3Dlg.h, Wiz97_3Dlg.cpp - the dialog
+    These files contain your CWiz97_3Dlg class.  This class defines
+    the behavior of your application's main dialog.  The dialog's template is
+    in Wiz97_3.rc, which can be edited in Microsoft Visual C++.
+/////////////////////////////////////////////////////////////////////////////
+
+Other Features:
+
+ActiveX Controls
+    The application includes support to use ActiveX controls.
+
+Printing and Print Preview support
+    The application wizard has generated code to handle the print, print setup, and print preview
+    commands by calling member functions in the CView class from the MFC library.
+/////////////////////////////////////////////////////////////////////////////
+
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named Wiz97_3.pch and a precompiled types file named StdAfx.obj.
+
+Resource.h
+    This is the standard header file, which defines new resource IDs.
+    Microsoft Visual C++ reads and updates this file.
+
+Wiz97_3.manifest
+	Application manifest files are used by Windows XP to describe an applications 
+	dependency on specific versions of Side-by-Side assemblies. The loader uses this 
+	information to load the appropriate assembly from the assembly cache or private 
+	from the application. The Application manifest  maybe included for redistribution 
+	as an external .manifest file that is installed in the same folder as the application 
+	executable or it may be included in the executable in the form of a resource. 
+/////////////////////////////////////////////////////////////////////////////
+
+Other notes:
+
+The application wizard uses "TODO:" to indicate parts of the source code you
+should add to or customize.
+
+If your application uses MFC in a shared DLL, and your application is in a 
+language other than the operating system's current language, you will need 
+to copy the corresponding localized resources MFC70XXX.DLL from the Microsoft
+Visual C++ CD-ROM under the Win\System directory to your computer's system or 
+system32 directory, and rename it to be MFCLOC.DLL.  ("XXX" stands for the 
+language abbreviation.  For example, MFC70DEU.DLL contains resources 
+translated to German.)  If you don't do this, some of the UI elements of 
+your application will remain in the language of the operating system.
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.cpp b/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.cpp
new file mode 100644
index 00000000..1521d0d9
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.cpp
@@ -0,0 +1,513 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "SecondPage.h"
+#include "DebugServices.h"
+#include "WinServices.h"
+#include <winspool.h>
+
+// local variable is initialize but not referenced
+#pragma warning(disable:4189)
+
+// CSecondPage dialog
+
+IMPLEMENT_DYNAMIC(CSecondPage, CPropertyPage)
+CSecondPage::CSecondPage()
+	: CPropertyPage(CSecondPage::IDD)
+{
+	m_psp.dwFlags &= ~(PSP_HASHELP);
+	m_psp.dwFlags |= PSP_DEFAULT|PSP_USEHEADERTITLE|PSP_USEHEADERSUBTITLE;
+
+	m_psp.pszHeaderTitle	= MAKEINTRESOURCE(IDS_BROWSE_TITLE);
+	m_psp.pszHeaderSubTitle	= MAKEINTRESOURCE(IDS_BROWSE_SUBTITLE);
+
+	m_emptyListItem		=	NULL;
+	m_initialized		=	false;
+	m_waiting			=	false;
+}
+
+
+CSecondPage::~CSecondPage()
+{
+}
+
+
+void
+CSecondPage::InitBrowseList()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	CString							text;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	// Initialize so that nothing is selected when we add to the list
+
+	psheet->SetSelectedPrinter( NULL );
+	m_gotChoice = false;
+	m_browseList.Select( NULL, TVGN_FIRSTVISIBLE );
+
+	//
+	// load the no printers message until something shows up in the browse list
+	//
+	text.LoadString(IDS_NO_PRINTERS);
+
+	LoadTextAndDisableWindow( text );
+
+	//
+	// disable the next button until there's a printer to select
+	//
+	psheet->SetWizardButtons(PSWIZB_BACK);
+
+	//
+	// disable the printer information box
+	//
+	SetPrinterInformationState( FALSE );
+	m_descriptionField.SetWindowText( L"" );
+	m_locationField.SetWindowText( L"" );
+
+exit:
+
+	return;
+}
+
+
+void CSecondPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_BROWSE_LIST, m_browseList);
+	DDX_Control(pDX, IDC_PRINTER_INFORMATION, m_printerInformation);
+
+	DDX_Control(pDX, IDC_DESCRIPTION_LABEL, m_descriptionLabel);
+
+	DDX_Control(pDX, IDC_DESCRIPTION_FIELD, m_descriptionField);
+
+	DDX_Control(pDX, IDC_LOCATION_LABEL, m_locationLabel);
+
+	DDX_Control(pDX, IDC_LOCATION_FIELD, m_locationField);
+
+}
+
+
+afx_msg BOOL
+CSecondPage::OnSetCursor(CWnd * pWnd, UINT nHitTest, UINT message)
+{
+	DEBUG_UNUSED(pWnd);
+	DEBUG_UNUSED(nHitTest);
+	DEBUG_UNUSED(message);
+
+	CPrinterSetupWizardSheet * psheet;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	SetCursor(psheet->GetCursor());
+
+exit:
+
+	return TRUE;
+}
+
+
+BOOL
+CSecondPage::OnSetActive()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+	CWnd						*	pWnd;
+	Printers::iterator				it;
+	OSStatus						err = kNoErr;
+	BOOL							b;
+
+	b = CPropertyPage::OnSetActive();
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_action( psheet, exit, err = kUnknownErr );
+
+	// Stash the selected printer if any
+
+	printer = psheet->GetSelectedPrinter();
+
+	// initialize the browse list...this will remove everything currently
+	// in it, and add the no printers item
+
+	InitBrowseList();
+
+	// Populate the list with any printers that we currently know about
+
+	for ( it = psheet->m_printers.begin(); it != psheet->m_printers.end(); it++ )
+	{
+		OnAddPrinter( *it, false );
+	}
+
+	if ( ( !printer && ( psheet->m_printers.size() > 0 ) ) || ( printer != psheet->GetSelectedPrinter() ) )
+	{
+		if ( !printer )
+		{
+			printer = psheet->m_printers.front();
+		}
+
+		psheet->SetSelectedPrinter( printer );
+	}
+	
+	if ( printer )
+	{
+		m_browseList.SelectItem( printer->item );
+		::SetFocus( m_browseList );
+	}
+
+	// Hide the back button
+	pWnd = ((CPropertySheet*)GetParent())->GetDlgItem(ID_WIZBACK);
+	if ( pWnd != NULL )
+	{
+		pWnd->ShowWindow(SW_HIDE);
+	}
+
+exit:
+
+	return b;
+}
+
+
+BOOL
+CSecondPage::OnKillActive()
+{
+	CPrinterSetupWizardSheet	* psheet;
+	CWnd						* pWnd;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );   
+   
+	psheet->SetLastPage(this);
+
+	// Show the back button
+	pWnd = ((CPropertySheet*)GetParent())->GetDlgItem(ID_WIZBACK);
+	if ( pWnd != NULL )
+	{
+		pWnd->ShowWindow(SW_SHOW);
+	}
+
+exit:
+
+	return CPropertyPage::OnKillActive();
+}
+
+
+BEGIN_MESSAGE_MAP(CSecondPage, CPropertyPage)
+	ON_NOTIFY(TVN_SELCHANGED, IDC_BROWSE_LIST, OnTvnSelchangedBrowseList)
+	ON_NOTIFY(NM_CLICK, IDC_BROWSE_LIST, OnNmClickBrowseList)
+	ON_NOTIFY(TVN_KEYDOWN, IDC_BROWSE_LIST, OnTvnKeyDownBrowseList)
+	ON_WM_SETCURSOR()
+END_MESSAGE_MAP()
+
+
+// Printer::EventHandler implementation
+OSStatus
+CSecondPage::OnAddPrinter(
+					Printer	*	printer,
+					bool		moreComing )
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	selectedPrinter;
+	OSStatus						err = kNoErr;
+
+	check( IsWindow( m_hWnd ) );
+
+	m_browseList.SetRedraw(FALSE);
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	if ( printer )
+	{
+		selectedPrinter = psheet->GetSelectedPrinter();
+
+		printer->item = m_browseList.InsertItem(printer->displayName);
+
+		m_browseList.SetItemData( printer->item, (DWORD_PTR) printer );
+
+		m_browseList.SortChildren(TVI_ROOT);
+
+		//
+		// if the searching item is still in the list
+		// get rid of it
+		//
+		// note that order is important here.  Insert the printer
+		// item before removing the placeholder so we always have
+		// an item in the list to avoid experiencing the bug
+		// in Microsoft's implementation of CTreeCtrl
+		//
+		if (m_emptyListItem != NULL)
+		{
+			m_browseList.DeleteItem(m_emptyListItem);
+			m_emptyListItem = NULL;
+			m_browseList.EnableWindow(TRUE);
+		}
+
+		if ( !selectedPrinter )
+		{
+			psheet->SetSelectedPrinter( printer );
+			m_browseList.SelectItem( printer->item );
+			::SetFocus( m_browseList );
+		}
+	}
+
+exit:
+
+	if (!moreComing)
+	{
+		m_browseList.SetRedraw(TRUE);
+		m_browseList.Invalidate();
+	}
+
+	return err;
+}
+
+
+OSStatus
+CSecondPage::OnRemovePrinter(
+				Printer	*	printer,
+				bool		moreComing)
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	OSStatus						err = kNoErr;
+
+	check( IsWindow( m_hWnd ) );
+	check( printer );
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	m_browseList.SetRedraw(FALSE);
+
+	if ( printer )
+	{
+		//
+		// check to make sure if we're the only item in the control...i.e.
+		// the list size is 1.
+		//
+		if (m_browseList.GetCount() > 1)
+		{
+			//
+			// if we're not the only thing in the list, then
+			// simply remove it from the list
+			//
+			m_browseList.DeleteItem( printer->item );
+		}
+		else
+		{
+			//
+			// if we're the only thing in the list, then redisplay
+			// it with the no printers message
+			//
+			InitBrowseList();
+		}
+	}
+
+exit:
+
+	if ( !moreComing )
+	{
+		m_browseList.SetRedraw(TRUE);
+		m_browseList.Invalidate();
+	}
+
+	return err;
+}
+
+
+void
+CSecondPage::OnResolveService( Service * service )
+{
+	CPrinterSetupWizardSheet * psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	check( service );
+
+	Queue *	q = service->SelectedQueue();
+
+	check( q );
+	
+
+	//
+	// and set it to selected
+	//
+
+	m_selectedName	= service->printer->name;
+
+	//
+	// and update the printer information box
+	//
+	SetPrinterInformationState( TRUE );
+
+	m_descriptionField.SetWindowText( q->description );
+	m_locationField.SetWindowText( q->location );
+
+	//
+	// reset the cursor
+	//
+
+	SetCursor(psheet->m_active);
+
+exit:
+
+	return;
+}
+
+
+void CSecondPage::OnTvnSelchangedBrowseList(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	LPNMTREEVIEW					pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+	int								err = 0;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_action( psheet, exit, err = kUnknownErr );
+
+	// The strange code here is to workaround a bug in the CTreeCtrl, whereupon the item
+	// we selected isn't passed through correctly to this callback routine.
+
+	if ( !m_gotChoice )
+	{
+		printer = psheet->GetSelectedPrinter();
+
+		// If we really haven't selected a printer, then re-select NULL and exit
+
+		if ( !printer )
+		{
+			m_browseList.SelectItem( NULL );
+
+			goto exit;
+		}
+
+		// If we already have selected a printer, fake like we've clicked on it, but only
+		// if the CTreeCtrl hasn't already selected it
+		
+		else if ( printer->item != m_browseList.GetSelectedItem() )
+		{
+			m_gotChoice = true;
+
+			m_browseList.SelectItem( printer->item );
+
+			goto exit;
+		}
+	}
+
+	HTREEITEM item = m_browseList.GetSelectedItem();
+	require_quiet( item, exit );
+
+	printer = reinterpret_cast<Printer*>(m_browseList.GetItemData( item ) );
+	require_quiet( printer, exit );
+
+	//
+	// this call will trigger a resolve.  When the resolve is complete,
+	// our OnResolve will be called.
+	//
+	err = psheet->StartResolve( printer );
+	require_noerr( err, exit );
+
+	//
+	// And clear out the printer information box
+	//
+	SetPrinterInformationState( FALSE );
+	m_descriptionField.SetWindowText(L"");
+	m_locationField.SetWindowText(L"");
+
+exit:
+
+	if (err != 0)
+	{
+		CString text;
+		CString caption;
+
+		text.LoadString(IDS_ERROR_SELECTING_PRINTER_TEXT);
+		caption.LoadString(IDS_ERROR_SELECTING_PRINTER_CAPTION);
+
+		MessageBox(text, caption, MB_OK|MB_ICONEXCLAMATION);
+	}
+
+	*pResult = 0;
+}
+
+
+void CSecondPage::OnNmClickBrowseList(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	DEBUG_UNUSED( pNMHDR );
+
+	m_gotChoice = true;
+
+	*pResult = 0;
+}
+
+
+void CSecondPage::OnTvnKeyDownBrowseList( NMHDR * pNMHDR, LRESULT * pResult)
+{
+	DEBUG_UNUSED( pNMHDR );
+
+	m_gotChoice = true;
+
+	*pResult = 0;
+}
+
+
+void
+CSecondPage::LoadTextAndDisableWindow( CString & text )
+{
+	m_emptyListItem = m_browseList.InsertItem( text, 0, 0, NULL, TVI_FIRST );
+	m_browseList.SelectItem( NULL );
+
+	//
+	// this will remove everything else in the list...we might be navigating
+	// back to this window, and the browse list might have changed since
+	// we last displayed it.
+	//
+	if ( m_emptyListItem )
+	{
+		HTREEITEM item = m_browseList.GetNextVisibleItem( m_emptyListItem );
+  
+		while ( item )
+		{
+			m_browseList.DeleteItem( item );
+			item = m_browseList.GetNextVisibleItem( m_emptyListItem );
+		}
+	}
+
+	m_browseList.EnableWindow( FALSE );
+}
+
+
+void
+CSecondPage::SetPrinterInformationState( BOOL state )
+{
+	m_printerInformation.EnableWindow( state );
+
+	m_descriptionLabel.EnableWindow( state );
+
+	m_descriptionField.EnableWindow( state );
+
+	m_locationLabel.EnableWindow( state );
+
+	m_locationField.EnableWindow( state );
+
+}
+
+
+
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.h b/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.h
new file mode 100644
index 00000000..3fb4c462
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/SecondPage.h
@@ -0,0 +1,105 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "PrinterSetupWizardSheet.h"
+#include "CommonServices.h"
+#include "UtilTypes.h"
+#include "afxcmn.h"
+#include "dns_sd.h"
+#include "afxwin.h"
+#include <map>
+
+using namespace PrinterSetupWizard;
+
+// CSecondPage dialog
+
+class CSecondPage : public CPropertyPage
+{
+DECLARE_DYNAMIC(CSecondPage)
+
+public:
+CSecondPage();
+virtual ~CSecondPage();
+
+// Dialog Data
+enum { IDD = IDD_SECOND_PAGE };
+
+protected:
+
+void         InitBrowseList();
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+afx_msg BOOL OnSetCursor(CWnd * pWnd, UINT nHitTest, UINT message);
+virtual BOOL OnSetActive();
+virtual BOOL OnKillActive();
+
+DECLARE_MESSAGE_MAP()
+
+public:
+
+HTREEITEM m_emptyListItem;
+bool m_selectOkay;
+CTreeCtrl m_browseList;
+bool m_initialized;
+bool m_waiting;
+
+afx_msg void    OnTvnSelchangedBrowseList(NMHDR *pNMHDR, LRESULT *pResult);
+afx_msg void    OnNmClickBrowseList(NMHDR * pNMHDR, LRESULT * pResult);
+afx_msg void    OnTvnKeyDownBrowseList(NMHDR * pNMHDR, LRESULT * pResult );
+
+OSStatus
+OnAddPrinter(
+    Printer     *   printer,
+    bool moreComing);
+
+OSStatus
+OnRemovePrinter(
+    Printer     *   printer,
+    bool moreComing);
+
+void
+OnResolveService( Service * service );
+
+private:
+
+void
+LoadTextAndDisableWindow( CString & text );
+
+void
+SetPrinterInformationState( BOOL state );
+
+std::string m_selectedName;
+
+
+private:
+
+
+
+CStatic m_printerInformation;
+
+CStatic m_descriptionLabel;
+
+CStatic m_descriptionField;
+
+CStatic m_locationLabel;
+
+CStatic m_locationField;
+
+
+bool m_gotChoice;
+};
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.cpp b/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.cpp
new file mode 100644
index 00000000..6caf55cb
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.cpp
@@ -0,0 +1,1583 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include "PrinterSetupWizardApp.h"
+#include "PrinterSetupWizardSheet.h"
+#include "ThirdPage.h"
+#include "tcpxcv.h"
+#include <dns_sd.h>
+#include <winspool.h>
+#include <setupapi.h>
+
+// local variable is initialize but not referenced
+#pragma warning(disable:4189)
+
+//
+// This is the printer description file that is shipped
+// with Windows XP and below
+//
+#define kNTPrintFile		L"inf\\ntprint.inf"
+
+//
+// Windows Vista ships with a set of prn*.inf files
+//
+#define kVistaPrintFiles	L"inf\\prn*.inf"
+
+//
+// These are pre-defined names for Generic manufacturer and model
+//
+#define kGenericManufacturer		L"Generic"
+#define kGenericText				L"Generic / Text Only"
+#define kGenericPostscript			L"Generic / Postscript"
+#define kGenericPCL					L"Generic / PCL"
+#define kPDLPostscriptKey			L"application/postscript"
+#define kPDLPCLKey					L"application/vnd.hp-pcl"
+#define kGenericPSColorDriver		L"HP Color LaserJet 4550 PS"
+#define kGenericPSDriver			L"HP LaserJet 4050 Series PS"
+#define kGenericPCLColorDriver		L"HP Color LaserJet 4550 PCL"
+#define kGenericPCLDriver			L"HP LaserJet 4050 Series PCL"
+
+
+// CThirdPage dialog
+
+IMPLEMENT_DYNAMIC(CThirdPage, CPropertyPage)
+CThirdPage::CThirdPage()
+	: CPropertyPage(CThirdPage::IDD),
+		m_manufacturerSelected( NULL ),
+		m_modelSelected( NULL ),
+		m_genericPostscript( NULL ),
+		m_genericPCL( NULL ),
+		m_initialized(false),
+		m_printerImage( NULL )
+{
+	static const int	bufferSize	= 32768;
+	TCHAR				windowsDirectory[bufferSize];
+	CString				header;
+	WIN32_FIND_DATA		findFileData;
+	HANDLE				findHandle;
+	CString				prnFiles;
+	CString				ntPrint;
+	OSStatus			err;
+	BOOL				ok;
+
+	m_psp.dwFlags &= ~(PSP_HASHELP);
+	m_psp.dwFlags |= PSP_DEFAULT|PSP_USEHEADERTITLE|PSP_USEHEADERSUBTITLE;
+	
+	m_psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALL_TITLE);
+	m_psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_INSTALL_SUBTITLE);
+
+	//
+	// load printers from ntprint.inf
+	//
+	ok = GetWindowsDirectory( windowsDirectory, bufferSize );
+	err = translate_errno( ok, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+ 
+	//
+	// <rdar://problem/4826126>
+	//
+	// If there are no *prn.inf files, we'll assume that the information
+	// is in ntprint.inf
+	//
+	prnFiles.Format( L"%s\\%s", windowsDirectory, kVistaPrintFiles );
+	findHandle = FindFirstFile( prnFiles, &findFileData );
+ 
+	if ( findHandle != INVALID_HANDLE_VALUE )
+	{
+		CString absolute;
+
+		absolute.Format( L"%s\\inf\\%s", windowsDirectory, findFileData.cFileName );
+		err = LoadPrintDriverDefsFromFile( m_manufacturers, absolute, false );
+		require_noerr( err, exit );
+
+		while ( FindNextFile( findHandle, &findFileData ) )
+		{
+			absolute.Format( L"%s\\inf\\%s", windowsDirectory, findFileData.cFileName );
+			err = LoadPrintDriverDefsFromFile( m_manufacturers, absolute, false );
+			require_noerr( err, exit );
+		}
+
+		FindClose( findHandle );
+	}
+	else
+	{
+		ntPrint.Format(L"%s\\%s", windowsDirectory, kNTPrintFile);
+		err = LoadPrintDriverDefsFromFile( m_manufacturers, ntPrint, false );
+		require_noerr(err, exit);
+	}
+
+	//
+	// load printer drivers that have been installed on this machine
+	//
+	err = LoadPrintDriverDefs( m_manufacturers );
+	require_noerr(err, exit);
+
+	//
+	// load our own special generic printer defs
+	//
+	err = LoadGenericPrintDriverDefs( m_manufacturers );
+	require_noerr( err, exit );
+
+exit:
+
+	return;
+}
+
+
+void
+CThirdPage::FreeManufacturers( Manufacturers & manufacturers )
+{
+	for ( Manufacturers::iterator it = manufacturers.begin(); it != manufacturers.end(); it++ )
+	{
+		for ( Models::iterator it2 = it->second->models.begin(); it2 != it->second->models.end(); it2++ )
+		{
+			delete *it2;
+		}
+
+		delete it->second;
+	}
+}
+
+
+CThirdPage::~CThirdPage()
+{
+	FreeManufacturers( m_manufacturers );
+}
+
+// ----------------------------------------------------
+// SelectMatch
+//
+// SelectMatch will do all the UI work associated with
+// selected a manufacturer and model of printer.  It also
+// makes sure the printer object is update with the
+// latest settings
+//
+// ----------------------------------------------------
+void
+CThirdPage::SelectMatch(Printer * printer, Service * service, Manufacturer * manufacturer, Model * model)
+{
+	LVFINDINFO	info;
+	int			nIndex;
+
+	check( printer != NULL );
+	check( manufacturer != NULL );
+	check( model != NULL );
+
+	//
+	// select the manufacturer
+	//
+	info.flags	= LVFI_STRING;
+	info.psz	= manufacturer->name;
+
+	nIndex = m_manufacturerListCtrl.FindItem(&info);
+	
+	if (nIndex != -1)
+	{
+		m_manufacturerListCtrl.SetItemState(nIndex, LVIS_SELECTED, LVIS_SELECTED);
+		//
+		//<rdar://problem/4528853> mDNS: When auto-highlighting items in lists, scroll list so highlighted item is in the middle
+		//
+		AutoScroll(m_manufacturerListCtrl, nIndex);
+	}
+
+	//
+	// select the model
+	//
+	info.flags	= LVFI_STRING;
+	info.psz	= model->displayName;
+
+	nIndex = m_modelListCtrl.FindItem(&info);
+
+	if (nIndex != -1)
+	{
+		m_modelListCtrl.SetItemState(nIndex, LVIS_SELECTED, LVIS_SELECTED);
+		AutoScroll( m_modelListCtrl, nIndex );
+
+		m_modelListCtrl.SetFocus();
+	}
+
+	CopyPrinterSettings( printer, service, manufacturer, model );
+}
+
+void
+CThirdPage::SelectMatch(Manufacturers & manufacturers, Printer * printer, Service * service, Manufacturer * manufacturer, Model * model)
+{
+	PopulateUI( manufacturers );
+
+	SelectMatch( printer, service, manufacturer, model );
+}
+
+// --------------------------------------------------------
+// CopyPrinterSettings
+//
+// This function makes sure that the printer object has the
+// latest settings from the manufacturer and model objects
+// --------------------------------------------------------
+
+void
+CThirdPage::CopyPrinterSettings( Printer * printer, Service * service, Manufacturer * manufacturer, Model * model )
+{
+	DWORD portNameLen;
+
+	printer->manufacturer		=	manufacturer->name;
+	printer->displayModelName	=	model->displayName;
+	printer->modelName			=	model->name;
+	printer->driverInstalled	=	model->driverInstalled;
+	printer->infFileName		=	model->infFileName;
+
+	if ( service->type == kPDLServiceType )
+	{
+		printer->portName.Format(L"IP_%s.%d", static_cast<LPCTSTR>(service->hostname), service->portNumber);
+		service->protocol = L"Raw";
+	}
+	else if ( service->type == kLPRServiceType )
+	{
+		Queue * q = service->queues.front();
+		check( q );
+
+		if ( q->name.GetLength() > 0 )
+		{
+			printer->portName.Format(L"LPR_%s.%d.%s", static_cast<LPCTSTR>(service->hostname), service->portNumber, static_cast<LPCTSTR>(q->name) );
+		}
+		else
+		{
+			printer->portName.Format(L"LPR_%s.%d", static_cast<LPCTSTR>(service->hostname), service->portNumber);
+		}
+
+		service->protocol = L"LPR";
+	}
+	else if ( service->type == kIPPServiceType )
+	{
+		Queue * q = service->queues.front();
+		check( q );
+
+		if ( q->name.GetLength() > 0 )
+		{
+			printer->portName.Format(L"http://%s:%d/%s", static_cast<LPCTSTR>(service->hostname), service->portNumber, static_cast<LPCTSTR>(q->name) );
+		}
+		else
+		{
+			printer->portName.Format(L"http://%s:%d/", static_cast<LPCTSTR>(service->hostname), service->portNumber );
+		}
+
+		service->protocol = L"IPP";
+	}
+
+	// If it's not an IPP printr, truncate the portName so that it's valid
+
+	if ( service->type != kIPPServiceType )
+	{
+		portNameLen = printer->portName.GetLength() + 1;
+		
+		if ( portNameLen > MAX_PORTNAME_LEN )
+		{
+			printer->portName.Delete( MAX_PORTNAME_LEN - 1, ( portNameLen - MAX_PORTNAME_LEN ) );
+		}
+	}
+}
+
+// --------------------------------------------------------
+// DefaultPrinterExists
+//
+// Checks to see if a default printer has been configured
+// on this machine
+// --------------------------------------------------------
+BOOL
+CThirdPage::DefaultPrinterExists()
+{
+	CPrintDialog dlg(FALSE);
+	
+	dlg.m_pd.Flags |= PD_RETURNDEFAULT;
+
+	return dlg.GetDefaults();
+}
+
+// --------------------------------------------------------
+// AutoScroll
+//
+// Ensure selected item is in middle of list
+// --------------------------------------------------------
+void
+CThirdPage::AutoScroll( CListCtrl & list, int nIndex )
+{
+	//
+	//<rdar://problem/4528853> mDNS: When auto-highlighting items in lists, scroll list so highlighted item is in the middle
+	//
+
+	int		top;
+	int		count;
+
+	list.EnsureVisible( nIndex, FALSE );
+	
+	top		= list.GetTopIndex();
+	count	= list.GetCountPerPage();
+
+	if ( ( nIndex == top ) || ( ( nIndex + 1 ) == ( top + count ) ) )
+	{
+		CRect	rect;
+		int		rows;
+		
+		rows = ( count / 2 );
+
+		if ( nIndex == top )
+		{
+			list.GetItemRect(0, rect, LVIR_BOUNDS);
+			list.Scroll( CPoint( 0, rows * rect.Height() * -1 ) );
+		}
+		else
+		{
+			list.GetItemRect(0, rect, LVIR_BOUNDS);
+			list.Scroll( CPoint( 0, rows * rect.Height() ) );
+		}
+	}
+}
+
+// ------------------------------------------------------
+// LoadPrintDriverDefsFromFile
+//
+// The only potentially opaque thing about this function is the
+// checkForDuplicateModels flag.  The problem here is that ntprint.inf
+// doesn't contain duplicate models, and it has hundreds of models
+// listed.  You wouldn't check for duplicates there.  But oftentimes,
+// loading different windows print driver files contain multiple
+// entries for the same printer.  You don't want the UI to display
+// the same printer multiple times, so in that case, you would ask
+// this function to check for multiple models.
+
+OSStatus
+CThirdPage::LoadPrintDriverDefsFromFile(Manufacturers & manufacturers, const CString & filename, bool checkForDuplicateModels )
+{
+	HINF			handle	= INVALID_HANDLE_VALUE;
+	const TCHAR *	section = TEXT( "Manufacturer" );
+	LONG			sectionCount;
+	TCHAR			line[ 1000 ];
+	CString			klass;
+	INFCONTEXT		manufacturerContext;
+	BOOL			ok;
+	OSStatus		err		= 0;
+	
+	// Make sure we can open the file
+	handle = SetupOpenInfFile( filename, NULL, INF_STYLE_WIN4, NULL );
+	translate_errno( handle != INVALID_HANDLE_VALUE, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// Make sure it's a printer file
+	ok = SetupGetLineText( NULL, handle, TEXT( "Version" ), TEXT( "Class" ), line, sizeof( line ), NULL );
+	translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	klass = line;
+	require_action( klass == TEXT( "Printer" ), exit, err = kUnknownErr );
+
+	sectionCount = SetupGetLineCount( handle, section );
+	translate_errno( sectionCount != -1, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	memset( &manufacturerContext, 0, sizeof( manufacturerContext ) );
+			
+	for ( LONG i = 0; i < sectionCount; i++ )
+	{
+		Manufacturers::iterator	iter;
+		Manufacturer	*	manufacturer;
+		CString				manufacturerName;
+		CString				temp;
+		CStringList			modelSectionNameDecl;
+		CString				modelSectionName;
+		CString				baseModelName;
+		CString				model;
+		INFCONTEXT			modelContext;
+		LONG				modelCount;
+		POSITION			p;
+
+		if ( i == 0 )
+		{
+			ok = SetupFindFirstLine( handle, section, NULL, &manufacturerContext );
+			err = translate_errno( ok, GetLastError(), kUnknownErr );
+			require_noerr( err, exit );
+		}
+		else
+		{
+			ok = SetupFindNextLine( &manufacturerContext, &manufacturerContext );
+			err = translate_errno( ok, GetLastError(), kUnknownErr );
+			require_noerr( err, exit );
+		}
+
+		ok = SetupGetStringField( &manufacturerContext, 0, line, sizeof( line ), NULL );
+		err = translate_errno( ok, GetLastError(), kUnknownErr );
+		require_noerr( err, exit );
+		manufacturerName = line;
+
+		ok = SetupGetLineText( &manufacturerContext, handle, NULL, NULL, line, sizeof( line ), NULL );
+		err = translate_errno( ok, GetLastError(), kUnknownErr );
+		require_noerr( err, exit );
+
+		// Try to find some model section name that has entries. Explanation of int file structure
+		// can be found at:
+		//
+		// <http://msdn.microsoft.com/en-us/library/ms794359.aspx>
+		Split( line, ',', modelSectionNameDecl );
+
+		p					= modelSectionNameDecl.GetHeadPosition();
+		modelSectionName	= modelSectionNameDecl.GetNext( p );
+		modelCount			= SetupGetLineCount( handle, modelSectionName );
+		baseModelName		= modelSectionName;
+		
+		while ( modelCount <= 0 && p )
+		{
+			CString targetOSVersion;
+
+			targetOSVersion		= modelSectionNameDecl.GetNext( p );
+			modelSectionName	= baseModelName + TEXT( "." ) + targetOSVersion;
+			modelCount			= SetupGetLineCount( handle, modelSectionName );
+		}
+
+		if ( modelCount > 0 )
+		{
+			manufacturerName = NormalizeManufacturerName( manufacturerName );
+
+			iter = manufacturers.find( manufacturerName );
+
+			if ( iter != manufacturers.end() )
+			{
+				manufacturer = iter->second;
+				require_action( manufacturer, exit, err = kUnknownErr );
+			}
+			else
+			{
+				try
+				{
+					manufacturer = new Manufacturer;
+				}
+				catch (...)
+				{
+					manufacturer = NULL;
+				}
+
+				require_action( manufacturer, exit, err = kNoMemoryErr );
+
+				manufacturer->name					= manufacturerName;
+				manufacturers[ manufacturerName ]	= manufacturer;
+			}
+
+			memset( &modelContext, 0, sizeof( modelContext ) );
+
+			for ( LONG j = 0; j < modelCount; j++ )
+			{
+				CString modelName;
+				Model * model;
+
+				if ( j == 0 )
+				{
+					ok = SetupFindFirstLine( handle, modelSectionName, NULL, &modelContext );
+					err = translate_errno( ok, GetLastError(), kUnknownErr );
+					require_noerr( err, exit );
+				}
+				else
+				{
+					SetupFindNextLine( &modelContext, &modelContext );
+					err = translate_errno( ok, GetLastError(), kUnknownErr );
+					require_noerr( err, exit );
+				}
+
+				ok = SetupGetStringField( &modelContext, 0, line, sizeof( line ), NULL );
+				err = translate_errno( ok, GetLastError(), kUnknownErr );
+				require_noerr( err, exit );
+
+				modelName = line;
+
+				if (checkForDuplicateModels == true)
+				{
+					if ( MatchModel( manufacturer, ConvertToModelName( modelName ) ) != NULL )
+					{
+						continue;
+					}
+				}
+
+				//
+				// Stock Vista printer inf files embed guids in the model
+				// declarations for Epson printers. Let's ignore those.
+				//
+				if ( modelName.Find( TEXT( "{" ), 0 ) != -1 )
+				{
+					continue;
+				}
+
+				try
+				{
+					model = new Model;
+				}
+				catch (...)
+				{
+					model = NULL;
+				}
+
+				require_action( model, exit, err = kNoMemoryErr );
+
+				model->infFileName		=	filename;
+				model->displayName		=	modelName;
+				model->name				=	modelName;
+				model->driverInstalled	=	false;
+
+				manufacturer->models.push_back(model);
+			}
+		}
+	}
+
+exit:
+
+	if ( handle != INVALID_HANDLE_VALUE )
+	{
+		SetupCloseInfFile( handle );
+		handle = NULL;
+	}
+
+	return err;
+}
+
+
+// -------------------------------------------------------
+// LoadPrintDriverDefs
+//
+// This function is responsible for loading the print driver
+// definitions of all print drivers that have been installed
+// on this machine.
+// -------------------------------------------------------
+OSStatus
+CThirdPage::LoadPrintDriverDefs( Manufacturers & manufacturers )
+{
+	BYTE	*	buffer			=	NULL;
+	DWORD		bytesReceived	=	0;
+	DWORD		numPrinters		=	0;
+	OSStatus	err				=	0;
+	BOOL		ok;
+
+	//
+	// like a lot of win32 calls, we call this first to get the
+	// size of the buffer we need.
+	//
+	EnumPrinterDrivers(NULL, L"all", 6, NULL, 0, &bytesReceived, &numPrinters);
+
+	if (bytesReceived > 0)
+	{
+		try
+		{
+			buffer = new BYTE[bytesReceived];
+		}
+		catch (...)
+		{
+			buffer = NULL;
+		}
+	
+		require_action( buffer, exit, err = kNoMemoryErr );
+		
+		//
+		// this call gets the real info
+		//
+		ok = EnumPrinterDrivers(NULL, L"all", 6, buffer, bytesReceived, &bytesReceived, &numPrinters);
+		err = translate_errno( ok, errno_compat(), kUnknownErr );
+		require_noerr( err, exit );
+	
+		DRIVER_INFO_6 * info = (DRIVER_INFO_6*) buffer;
+	
+		for (DWORD i = 0; i < numPrinters; i++)
+		{
+			Manufacturer	*	manufacturer;
+			Model			*	model;
+			CString				name;
+	
+			//
+			// skip over anything that doesn't have a manufacturer field.  This
+			// fixes a bug that I noticed that occurred after I installed
+			// ProComm.  This program add a print driver with no manufacturer
+			// that screwed up this wizard.
+			//
+			if (info[i].pszMfgName == NULL)
+			{
+				continue;
+			}
+	
+			//
+			// look for manufacturer
+			//
+			Manufacturers::iterator iter;
+	
+			//
+			// save the name
+			//
+			name = NormalizeManufacturerName( info[i].pszMfgName );
+	
+			iter = manufacturers.find(name);
+	
+			if (iter != manufacturers.end())
+			{
+				manufacturer = iter->second;
+			}
+			else
+			{
+				try
+				{
+					manufacturer = new Manufacturer;
+				}
+				catch (...)
+				{
+					manufacturer = NULL;
+				}
+	
+				require_action( manufacturer, exit, err = kNoMemoryErr );
+	
+				manufacturer->name	=	name;
+	
+				manufacturers[name]	=	manufacturer;
+			}
+	
+			//
+			// now look to see if we have already seen this guy.  this could
+			// happen if we have already installed printers that are described
+			// in ntprint.inf.  the extant drivers will show up in EnumPrinterDrivers
+			// but we have already loaded their info
+			//
+			//
+			if ( MatchModel( manufacturer, ConvertToModelName( info[i].pName ) ) == NULL )
+			{
+				try
+				{
+					model = new Model;
+				}
+				catch (...)
+				{
+					model = NULL;
+				}
+	
+				require_action( model, exit, err = kNoMemoryErr );
+	
+				model->displayName		=	info[i].pName;
+				model->name				=	info[i].pName;
+				model->driverInstalled	=	true;
+	
+				manufacturer->models.push_back(model);
+			}
+		}
+	}
+
+exit:
+
+	if (buffer != NULL)
+	{
+		delete [] buffer;
+	}
+
+	return err;
+}
+
+// -------------------------------------------------------
+// LoadGenericPrintDriverDefs
+//
+// This function is responsible for loading polymorphic
+// generic print drivers defs.  The UI will read
+// something like "Generic / Postscript" and we can map
+// that to any print driver we want.
+// -------------------------------------------------------
+OSStatus
+CThirdPage::LoadGenericPrintDriverDefs( Manufacturers & manufacturers )
+{
+	Manufacturer		*	manufacturer;
+	Model				*	model;
+	Manufacturers::iterator	iter;
+	CString					psDriverName;
+	CString					pclDriverName;
+	OSStatus				err	= 0;
+
+	// <rdar://problem/4030388> Generic drivers don't do color
+
+	// First try and find our generic driver names
+
+	iter = m_manufacturers.find(L"HP");
+	require_action( iter != m_manufacturers.end(), exit, err = kUnknownErr );
+	manufacturer = iter->second;
+
+	// Look for Postscript
+
+	model = manufacturer->find( kGenericPSColorDriver );
+
+	if ( !model )
+	{
+		model = manufacturer->find( kGenericPSDriver );
+	}
+
+	if ( model )
+	{
+		psDriverName = model->name;
+	}
+
+	// Look for PCL
+	
+	model = manufacturer->find( kGenericPCLColorDriver );
+
+	if ( !model )
+	{
+		model = manufacturer->find( kGenericPCLDriver );
+	}
+
+	if ( model )
+	{
+		pclDriverName = model->name;
+	}
+
+	// If we found either a generic PS driver, or a generic PCL driver,
+	// then add them to the list
+
+	if ( psDriverName.GetLength() || pclDriverName.GetLength() )
+	{
+		// Try and find generic manufacturer if there is one
+
+		iter = manufacturers.find(L"Generic");
+		
+		if (iter != manufacturers.end())
+		{
+			manufacturer = iter->second;
+		}
+		else
+		{
+			try
+			{
+				manufacturer = new Manufacturer;
+			}
+			catch (...)
+			{
+				manufacturer = NULL;
+			}
+		
+			require_action( manufacturer, exit, err = kNoMemoryErr );
+		
+			manufacturer->name					=	"Generic";
+			manufacturers[manufacturer->name]	=	manufacturer;
+		}
+
+		if ( psDriverName.GetLength() > 0 )
+		{
+			try
+			{
+				m_genericPostscript = new Model;
+			}
+			catch (...)
+			{
+				m_genericPostscript = NULL;
+			}
+			
+			require_action( m_genericPostscript, exit, err = kNoMemoryErr );
+
+			m_genericPostscript->displayName		=	kGenericPostscript;
+			m_genericPostscript->name				=	psDriverName;
+			m_genericPostscript->driverInstalled	=	false;
+
+			manufacturer->models.push_back( m_genericPostscript );
+		}
+
+		if ( pclDriverName.GetLength() > 0 )
+		{
+			try
+			{
+				m_genericPCL = new Model;
+			}
+			catch (...)
+			{
+				m_genericPCL = NULL;
+			}
+			
+			require_action( m_genericPCL, exit, err = kNoMemoryErr );
+
+			m_genericPCL->displayName		=	kGenericPCL;
+			m_genericPCL->name				=	pclDriverName;
+			m_genericPCL->driverInstalled	=	false;
+
+			manufacturer->models.push_back( m_genericPCL );
+		}
+	}
+
+exit:
+
+	return err;
+}
+
+// ------------------------------------------------------
+// ConvertToManufacturerName
+//
+// This function is responsible for tweaking the
+// name so that subsequent string operations won't fail because
+// of capitalizations/different names for the same manufacturer
+// (i.e.  Hewlett-Packard/HP/Hewlett Packard)
+//
+CString
+CThirdPage::ConvertToManufacturerName( const CString & name )
+{
+	//
+	// first we're going to convert all the characters to lower
+	// case
+	//
+	CString lower = name;
+	lower.MakeLower();
+
+	//
+	// now we're going to check to see if the string says "hewlett-packard",
+	// because sometimes they refer to themselves as "hewlett-packard", and
+	// sometimes they refer to themselves as "hp".
+	//
+	if ( lower == L"hewlett-packard")
+	{
+		lower = "hp";
+	}
+
+	//
+	// tweak for Xerox Phaser, which doesn't announce itself
+	// as a xerox
+	//
+	else if ( lower.Find( L"phaser", 0 ) != -1 )
+	{
+		lower = "xerox";
+	}
+
+	return lower;
+}
+
+// ------------------------------------------------------
+// ConvertToModelName
+//
+// This function is responsible for ensuring that subsequent
+// string operations don't fail because of differing capitalization
+// schemes and the like
+// ------------------------------------------------------
+
+CString
+CThirdPage::ConvertToModelName( const CString & name )
+{
+	//
+	// convert it to lowercase
+	//
+	CString lower = name;
+	lower.MakeLower();
+
+	return lower;
+}
+
+// ------------------------------------------------------
+// NormalizeManufacturerName
+//
+// This function is responsible for tweaking the manufacturer
+// name so that there are no aliases for vendors
+//
+CString
+CThirdPage::NormalizeManufacturerName( const CString & name )
+{
+	CString normalized = name;
+
+	//
+	// now we're going to check to see if the string says "hewlett-packard",
+	// because sometimes they refer to themselves as "hewlett-packard", and
+	// sometimes they refer to themselves as "hp".
+	//
+	if ( normalized == L"Hewlett-Packard")
+	{
+		normalized = "HP";
+	}
+
+	return normalized;
+}
+
+// -------------------------------------------------------
+// MatchPrinter
+//
+// This function is responsible for matching a printer
+// to a list of manufacturers and models.  It calls
+// MatchManufacturer and MatchModel in turn.
+//
+
+OSStatus CThirdPage::MatchPrinter(Manufacturers & manufacturers, Printer * printer, Service * service, bool useCUPSWorkaround)
+{
+	CString					normalizedProductName;
+	Manufacturer		*	manufacturer		=	NULL;
+	Manufacturer		*	genericManufacturer	=	NULL;
+	Model				*	model				=	NULL;
+	Model				*	genericModel		=	NULL;
+	bool					found				=	false;
+	CString					text;
+	OSStatus				err					=	kNoErr;
+
+	check( printer );
+	check( service );
+
+	Queue * q = service->SelectedQueue();
+
+	check( q );
+
+	//
+	// first look to see if we have a usb_MFG descriptor
+	//
+	if ( q->usb_MFG.GetLength() > 0)
+	{
+		manufacturer = MatchManufacturer( manufacturers, ConvertToManufacturerName ( q->usb_MFG ) );
+	}
+
+	if ( manufacturer == NULL )
+	{
+		q->product.Remove('(');
+		q->product.Remove(')');
+
+		manufacturer = MatchManufacturer( manufacturers, ConvertToManufacturerName ( q->product ) );
+	}
+	
+	//
+	// if we found the manufacturer, then start looking for the model
+	//
+	if ( manufacturer != NULL )
+	{
+		if ( q->usb_MDL.GetLength() > 0 )
+		{
+			model = MatchModel ( manufacturer, ConvertToModelName ( q->usb_MDL ) );
+		}
+
+		if ( ( model == NULL ) && ( q->product.GetLength() > 0 ) )
+		{
+			q->product.Remove('(');
+			q->product.Remove(')');
+
+			model = MatchModel ( manufacturer, ConvertToModelName ( q->product ) );
+		}
+
+		if ( model != NULL )
+		{
+			// <rdar://problem/4124524> Offer Generic printers if printer advertises Postscript or PCL.  Workaround
+			// bug in OS X CUPS printer sharing by selecting Generic driver instead of matched printer.
+ 
+			bool hasGenericDriver = false;
+
+			if ( MatchGeneric( manufacturers, printer, service, &genericManufacturer, &genericModel ) )
+			{
+				hasGenericDriver = true;
+			}
+
+			// <rdar://problem/4190104> Use "application/octet-stream" to determine if CUPS
+			// shared queue supports raw
+
+			if ( q->pdl.Find( L"application/octet-stream" ) != -1 )
+			{
+				useCUPSWorkaround = false;
+			}
+
+			if ( useCUPSWorkaround && printer->isCUPSPrinter && hasGenericDriver )
+			{
+				//
+				// <rdar://problem/4496652> mDNS: Don't allow user to choose non-working driver
+				//
+				Manufacturers genericManufacturers;
+
+				LoadGenericPrintDriverDefs( genericManufacturers );
+
+				SelectMatch( genericManufacturers, printer, service, genericManufacturer, genericModel );
+
+				FreeManufacturers( genericManufacturers );
+			}
+			else
+			{
+				SelectMatch(manufacturers, printer, service, manufacturer, model);
+			}
+
+			found = true;
+		}
+	}
+
+	//
+	// display a message to the user based on whether we could match
+	// this printer
+	//
+	if (found)
+	{
+		text.LoadString(IDS_PRINTER_MATCH_GOOD);
+		err = kNoErr;
+	}
+	else if ( MatchGeneric( manufacturers, printer, service, &genericManufacturer, &genericModel ) )
+	{
+		if ( printer->isCUPSPrinter )
+		{
+			//
+			// <rdar://problem/4496652> mDNS: Don't allow user to choose non-working driver
+			//
+			Manufacturers genericManufacturers;
+
+			LoadGenericPrintDriverDefs( genericManufacturers );
+
+			SelectMatch( genericManufacturers, printer, service, genericManufacturer, genericModel );
+			
+			text.LoadString(IDS_PRINTER_MATCH_GOOD);
+
+			FreeManufacturers( genericManufacturers );
+		}
+		else
+		{
+			SelectMatch( manufacturers, printer, service, genericManufacturer, genericModel );
+			text.LoadString(IDS_PRINTER_MATCH_MAYBE);
+		}
+
+		err = kNoErr;
+	}
+	else
+	{
+		text.LoadString(IDS_PRINTER_MATCH_BAD);
+
+		//
+		// if there was any crud in this list from before, get rid of it now
+		//
+		m_modelListCtrl.DeleteAllItems();
+		
+		//
+		// select the manufacturer if we found one
+		//
+		if (manufacturer != NULL)
+		{
+			LVFINDINFO	info;
+			int			nIndex;
+
+			//
+			// select the manufacturer
+			//
+			info.flags	= LVFI_STRING;
+			info.psz	= manufacturer->name;
+
+			nIndex = m_manufacturerListCtrl.FindItem(&info);
+	
+			if (nIndex != -1)
+			{
+				m_manufacturerListCtrl.SetItemState(nIndex, LVIS_SELECTED, LVIS_SELECTED);
+
+				//
+				//<rdar://problem/4528853> mDNS: When auto-highlighting items in lists, scroll list so highlighted item is in the middle
+				//
+				AutoScroll(m_manufacturerListCtrl, nIndex);
+			}
+		}
+
+		err = kUnknownErr;
+	}
+
+	m_printerSelectionText.SetWindowText(text);
+
+	return err;
+}
+
+// ------------------------------------------------------
+// MatchManufacturer
+//
+// This function is responsible for finding a manufacturer
+// object from a string name.  It does a CString::Find, which
+// is like strstr, so it doesn't have to do an exact match
+//
+// If it can't find a match, NULL is returned
+// ------------------------------------------------------
+
+Manufacturer*
+CThirdPage::MatchManufacturer( Manufacturers & manufacturers, const CString & name)
+{
+	Manufacturers::iterator iter;
+
+	for (iter = manufacturers.begin(); iter != manufacturers.end(); iter++)
+	{
+		//
+		// we're going to convert all the manufacturer names to lower case,
+		// so we match the name passed in.
+		//
+		CString lower = iter->second->name;
+		lower.MakeLower();
+
+		//
+		// now try and find the lowered string in the name passed in.
+		//
+		if (name.Find(lower) != -1)
+		{
+			return iter->second;
+		}
+	}
+
+	return NULL;
+}
+
+// -------------------------------------------------------
+// MatchModel
+//
+// This function is responsible for matching a model from
+// a name.  It does a CString::Find(), which works like strstr,
+// so it doesn't rely on doing an exact string match.
+//
+
+Model*
+CThirdPage::MatchModel(Manufacturer * manufacturer, const CString & name)
+{
+	Models::iterator iter;
+
+	iter = manufacturer->models.begin();
+
+	for (iter = manufacturer->models.begin(); iter != manufacturer->models.end(); iter++)
+	{
+		Model * model = *iter;
+
+		//
+		// convert the model name to lower case
+		//
+		CString lowered = model->name;
+		lowered.MakeLower();
+
+		if (lowered.Find( name ) != -1)
+		{
+			return model;
+		}
+
+		//
+		// <rdar://problem/3841218>
+		// try removing the first substring and search again
+		//
+
+		if ( name.Find(' ') != -1 )
+		{
+			CString altered = name;
+			altered.Delete( 0, altered.Find(' ') + 1 );
+
+			if ( lowered.Find( altered ) != -1 )
+			{
+				return model;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+// -------------------------------------------------------
+// MatchGeneric
+//
+// This function will attempt to find a generic printer
+// driver for a printer that we weren't able to match
+// specifically
+//
+BOOL
+CThirdPage::MatchGeneric( Manufacturers & manufacturers, Printer * printer, Service * service, Manufacturer ** manufacturer, Model ** model )
+{
+	CString	pdl;
+	BOOL	ok = FALSE;
+
+	DEBUG_UNUSED( printer );
+
+	check( service );
+
+	Queue * q = service->SelectedQueue();
+
+	check( q );
+
+	Manufacturers::iterator iter = manufacturers.find( kGenericManufacturer );
+	require_action_quiet( iter != manufacturers.end(), exit, ok = FALSE );
+
+	*manufacturer = iter->second;
+
+	pdl = q->pdl;
+	pdl.MakeLower();
+
+	if ( m_genericPCL && ( pdl.Find( kPDLPCLKey ) != -1 ) )
+	{
+		*model	= m_genericPCL;
+		ok		= TRUE;
+	}
+	else if ( m_genericPostscript && ( pdl.Find( kPDLPostscriptKey ) != -1 ) )
+	{
+		*model	= m_genericPostscript;
+		ok		= TRUE;
+	}
+
+exit:
+
+	return ok;
+}
+
+// -----------------------------------------------------------
+// OnInitPage
+//
+// This function is responsible for doing initialization that
+// only occurs once during a run of the wizard
+//
+
+OSStatus CThirdPage::OnInitPage()
+{
+	CString		header;
+	CString		ntPrint;
+	OSStatus	err = kNoErr;
+
+	// Load printer icon
+	check( m_printerImage == NULL );
+	
+	m_printerImage = (CStatic*) GetDlgItem( 1 );	// 1 == IDR_MANIFEST
+	check( m_printerImage );
+
+	if ( m_printerImage != NULL )
+	{
+		m_printerImage->SetIcon( LoadIcon( GetNonLocalizedResources(), MAKEINTRESOURCE( IDI_PRINTER ) ) );
+	}
+
+	//
+	// The CTreeCtrl widget automatically sends a selection changed
+	// message which initially we want to ignore, because the user
+	// hasn't selected anything
+	//
+	// this flag gets reset in the message handler.  Every subsequent
+	// message gets handled.
+	//
+
+	//
+	// we have to make sure that we only do this once.  Typically,
+	// we would do this in something like OnInitDialog, but we don't
+	// have this in Wizards, because the window is a PropertySheet.
+	// We're considered fully initialized when we receive the first
+	// selection notice
+	//
+	header.LoadString(IDS_MANUFACTURER_HEADING);
+	m_manufacturerListCtrl.InsertColumn(0, header, LVCFMT_LEFT, -1 );
+	m_manufacturerSelected = NULL;
+
+	header.LoadString(IDS_MODEL_HEADING);
+	m_modelListCtrl.InsertColumn(0, header, LVCFMT_LEFT, -1 );
+	m_modelSelected = NULL;
+
+	return (err);
+}
+
+void CThirdPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_PRINTER_MANUFACTURER, m_manufacturerListCtrl);
+	DDX_Control(pDX, IDC_PRINTER_MODEL, m_modelListCtrl);
+	DDX_Control(pDX, IDC_PRINTER_NAME, m_printerName);
+	DDX_Control(pDX, IDC_DEFAULT_PRINTER, m_defaultPrinterCtrl);
+	DDX_Control(pDX, IDC_PRINTER_SELECTION_TEXT, m_printerSelectionText);
+
+}
+
+// ----------------------------------------------------------
+// OnSetActive
+//
+// This function is called by MFC after the window has been
+// activated.
+//
+
+BOOL
+CThirdPage::OnSetActive()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+	Service						*	service;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+   
+	psheet->SetWizardButtons( PSWIZB_BACK );
+
+	printer = psheet->GetSelectedPrinter();
+	require_quiet( printer, exit );
+
+	service = printer->services.front();
+	require_quiet( service, exit );
+
+	//
+	// call OnInitPage once
+	//
+	if (!m_initialized)
+	{
+		OnInitPage();
+		m_initialized = true;
+	}
+
+	//
+	// <rdar://problem/4580061> mDNS: Printers added using Bonjour should be set as the default printer.
+	//
+	if ( DefaultPrinterExists() )
+	{
+		m_defaultPrinterCtrl.SetCheck( BST_UNCHECKED );
+		printer->deflt = false;
+	}
+	else
+	{
+		m_defaultPrinterCtrl.SetCheck( BST_CHECKED );
+		printer->deflt = true;
+	}
+
+	//
+	// update the UI with the printer name
+	//
+	m_printerName.SetWindowText(printer->displayName);
+
+	//
+	// populate the list controls with the manufacturers and models
+	// from ntprint.inf
+	//
+	PopulateUI( m_manufacturers );
+
+	//
+	// and try and match the printer
+	//
+
+	if ( psheet->GetLastPage() == psheet->GetPage(0) )
+	{
+		MatchPrinter( m_manufacturers, printer, service, true );
+
+		if ( ( m_manufacturerSelected != NULL ) && ( m_modelSelected != NULL  ) )
+		{
+			GetParent()->PostMessage(PSM_SETCURSEL, 2 );
+		}
+	}
+	else
+	{
+		SelectMatch(printer, service, m_manufacturerSelected, m_modelSelected);
+	}
+
+exit:
+
+	return CPropertyPage::OnSetActive();
+}
+
+BOOL
+CThirdPage::OnKillActive()
+{
+	CPrinterSetupWizardSheet * psheet;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+   
+	psheet->SetLastPage(this);
+
+exit:
+
+	return CPropertyPage::OnKillActive();
+}
+
+// -------------------------------------------------------
+// PopulateUI
+//
+// This function is called to populate the list of manufacturers
+//
+OSStatus
+CThirdPage::PopulateUI(Manufacturers & manufacturers)
+{
+	Manufacturers::iterator iter;
+	
+	m_manufacturerListCtrl.DeleteAllItems();
+
+	for (iter = manufacturers.begin(); iter != manufacturers.end(); iter++)
+	{
+		int nIndex;
+
+		Manufacturer * manufacturer = iter->second;
+
+		nIndex = m_manufacturerListCtrl.InsertItem(0, manufacturer->name);
+
+		m_manufacturerListCtrl.SetItemData(nIndex, (DWORD_PTR) manufacturer);
+
+		m_manufacturerListCtrl.SetColumnWidth( 0, LVSCW_AUTOSIZE_USEHEADER );
+	}
+
+	return 0;
+}
+
+BEGIN_MESSAGE_MAP(CThirdPage, CPropertyPage)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_PRINTER_MANUFACTURER, OnLvnItemchangedManufacturer)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_PRINTER_MODEL, OnLvnItemchangedPrinterModel)
+	ON_BN_CLICKED(IDC_DEFAULT_PRINTER, OnBnClickedDefaultPrinter)
+	ON_BN_CLICKED(IDC_HAVE_DISK, OnBnClickedHaveDisk)
+END_MESSAGE_MAP()
+
+// CThirdPage message handlers
+void CThirdPage::OnLvnItemchangedManufacturer(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+
+	POSITION p = m_manufacturerListCtrl.GetFirstSelectedItemPosition();
+	int nSelected = m_manufacturerListCtrl.GetNextSelectedItem(p);
+
+	if (nSelected != -1)
+	{
+		m_manufacturerSelected = (Manufacturer*) m_manufacturerListCtrl.GetItemData(nSelected);
+
+		m_modelListCtrl.SetRedraw(FALSE);
+		
+		m_modelListCtrl.DeleteAllItems();
+		m_modelSelected = NULL;
+
+		Models::iterator iter;
+
+		for (iter = m_manufacturerSelected->models.begin(); iter != m_manufacturerSelected->models.end(); iter++)
+		{
+			Model * model = *iter;
+
+			int nItem = m_modelListCtrl.InsertItem( 0, model->displayName );
+
+			m_modelListCtrl.SetItemData(nItem, (DWORD_PTR) model);
+
+			m_modelListCtrl.SetColumnWidth( 0, LVSCW_AUTOSIZE_USEHEADER );
+		}
+
+		m_modelListCtrl.SetRedraw(TRUE);
+	}
+
+	*pResult = 0;
+}
+
+void CThirdPage::OnLvnItemchangedPrinterModel(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	LPNMLISTVIEW					pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+	
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+	Service						*	service;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	printer = psheet->GetSelectedPrinter();
+	require_quiet( printer, exit );
+
+	service = printer->services.front();
+	require_quiet( service, exit );
+
+	check ( m_manufacturerSelected );
+
+	POSITION p = m_modelListCtrl.GetFirstSelectedItemPosition();
+	int nSelected = m_modelListCtrl.GetNextSelectedItem(p);
+
+	if (nSelected != -1)
+	{
+		m_modelSelected = (Model*) m_modelListCtrl.GetItemData(nSelected);
+
+		CopyPrinterSettings( printer, service, m_manufacturerSelected, m_modelSelected );
+
+		psheet->SetWizardButtons(PSWIZB_BACK|PSWIZB_NEXT);
+	}
+	else
+	{
+		psheet->SetWizardButtons(PSWIZB_BACK);
+	}
+
+exit:
+
+	*pResult = 0;
+}
+
+void CThirdPage::OnBnClickedDefaultPrinter()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	printer = psheet->GetSelectedPrinter();
+	require_quiet( printer, exit );
+
+	printer->deflt = ( m_defaultPrinterCtrl.GetCheck() == BST_CHECKED ) ? true : false;
+
+exit:
+
+	return;
+}
+
+void CThirdPage::OnBnClickedHaveDisk()
+{
+	CPrinterSetupWizardSheet	*	psheet;
+	Printer						*	printer;
+	Service						*	service;
+	Manufacturers					manufacturers;
+
+	CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY|OFN_FILEMUSTEXIST, L"Setup Information (*.inf)|*.inf||", this);
+
+	psheet = reinterpret_cast<CPrinterSetupWizardSheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	printer = psheet->GetSelectedPrinter();
+	require_quiet( printer, exit );
+	
+	service = printer->services.front();
+	require_quiet( service, exit );
+
+	for ( ;; )
+	{
+		if ( dlg.DoModal() == IDOK )
+		{
+			CString filename = dlg.GetPathName();
+
+			LoadPrintDriverDefsFromFile( manufacturers, filename, true );
+   
+			// Sanity check
+
+			if ( manufacturers.size() > 0 )
+			{
+				PopulateUI( manufacturers );
+
+				if ( MatchPrinter( manufacturers, printer, service, false ) != kNoErr )
+				{
+					CString errorMessage;
+					CString errorCaption;
+					
+					errorMessage.LoadString( IDS_NO_MATCH_INF_FILE );
+					errorCaption.LoadString( IDS_NO_MATCH_INF_FILE_CAPTION );
+
+					MessageBox( errorMessage, errorCaption, MB_OK );
+				}
+
+				break;
+			}
+			else
+			{
+				CString errorMessage;
+				CString errorCaption;
+
+				errorMessage.LoadString( IDS_BAD_INF_FILE );
+				errorCaption.LoadString( IDS_BAD_INF_FILE_CAPTION );
+
+				MessageBox( errorMessage, errorCaption, MB_OK );
+			}
+		}
+		else
+		{
+			break;
+		}
+	}
+
+exit:
+
+	FreeManufacturers( manufacturers );
+	return;
+}
+
+
+void
+CThirdPage::Split( const CString & string, TCHAR ch, CStringList & components )
+{
+	CString	temp;
+	int		n;
+
+	temp = string;
+	
+	while ( ( n = temp.Find( ch ) ) != -1 )
+	{
+		components.AddTail( temp.Left( n ) );
+		temp = temp.Right( temp.GetLength() - ( n + 1 ) );
+	}
+
+	components.AddTail( temp );
+}
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.h b/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.h
new file mode 100644
index 00000000..476e2337
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/ThirdPage.h
@@ -0,0 +1,159 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include "afxcmn.h"
+#include "UtilTypes.h"
+#include <CommonServices.h>
+#include <DebugServices.h>
+#include <dns_sd.h>
+#include <map>
+#include "afxwin.h"
+
+
+// CThirdPage dialog
+
+class CThirdPage : public CPropertyPage
+{
+DECLARE_DYNAMIC(CThirdPage)
+
+public:
+CThirdPage();
+virtual ~CThirdPage();
+
+// Dialog Data
+enum { IDD = IDD_THIRD_PAGE };
+
+protected:
+virtual void DoDataExchange(CDataExchange* pDX);        // DDX/DDV support
+virtual BOOL OnSetActive();
+virtual BOOL OnKillActive();
+
+DECLARE_MESSAGE_MAP()
+
+private:
+
+//
+//<rdar://problem/4189721> mDNS: Epson shows up twice in the list.  Use case insensitive compare
+//
+struct compare_func
+{
+    bool operator()( const CString & s1, const CString & s2 ) const
+    {
+        return s1.CompareNoCase( s2 ) < 0;
+    }
+};
+
+typedef std::map<CString, Manufacturer*, compare_func> Manufacturers;
+
+//
+// LoadPrintDriverDefsFromFile
+//
+// Parses INF file and populates manufacturers
+//
+OSStatus LoadPrintDriverDefsFromFile(Manufacturers & manufacturers, const CString & filename, bool checkForDuplicateModels );
+
+//
+// LoadPrintDriverDefs
+//
+// Loads extant print driver definitions
+//
+OSStatus LoadPrintDriverDefs(Manufacturers & manufacturers);
+
+//
+// LoadGenericPrintDriversDefs
+//
+// Loads generic postscript and pcl print driver defs
+//
+OSStatus LoadGenericPrintDriverDefs( Manufacturers & manufacturers );
+
+//
+// PopulateUI
+//
+// Load print driver defs into UI for browsing/selection
+//
+OSStatus PopulateUI(Manufacturers & manufacturers);
+
+//
+// MatchPrinter
+//
+// Tries to match printer based on manufacturer and model
+//
+OSStatus MatchPrinter(Manufacturers & manufacturers, Printer * printer, Service * service, bool useCUPSWorkaround);
+
+//
+// OnInitPage
+//
+// Called first time page is activated.
+OSStatus OnInitPage();
+
+//
+// these functions will tweak the names so that everything is
+// consistent
+//
+CString             ConvertToManufacturerName( const CString & name );
+CString             ConvertToModelName( const CString & name );
+CString             NormalizeManufacturerName( const CString & name );
+
+Manufacturer    *   MatchManufacturer( Manufacturers & manufacturer, const CString & name );
+Model           *   MatchModel( Manufacturer * manufacturer, const CString & name );
+BOOL                MatchGeneric( Manufacturers & manufacturers, Printer * printer, Service * service, Manufacturer ** manufacturer, Model ** model );
+void                SelectMatch(Printer * printer, Service * service, Manufacturer * manufacturer, Model * model);
+void                SelectMatch(Manufacturers & manufacturers, Printer * printer, Service * service, Manufacturer * manufacturer, Model * model);
+void                CopyPrinterSettings(Printer * printer, Service * service, Manufacturer * manufacturer, Model * model);
+//
+// <rdar://problem/4580061> mDNS: Printers added using Bonjour should be set as the default printer.
+//
+BOOL                DefaultPrinterExists();
+//
+//<rdar://problem/4528853> mDNS: When auto-highlighting items in lists, scroll list so highlighted item is in the middle
+//
+void                AutoScroll(CListCtrl & list, int nIndex);
+
+void                FreeManufacturers( Manufacturers & manufacturers );
+
+Manufacturers m_manufacturers;
+
+CListCtrl m_manufacturerListCtrl;
+Manufacturer    *   m_manufacturerSelected;
+
+CListCtrl m_modelListCtrl;
+Model           *   m_modelSelected;
+
+Model           *   m_genericPostscript;
+Model           *   m_genericPCL;
+
+bool m_initialized;
+
+public:
+
+afx_msg void OnLvnItemchangedManufacturer(NMHDR *pNMHDR, LRESULT *pResult);
+CStatic m_printerName;
+afx_msg void OnLvnItemchangedPrinterModel(NMHDR *pNMHDR, LRESULT *pResult);
+afx_msg void OnBnClickedDefaultPrinter();
+private:
+
+void
+Split( const CString & string, TCHAR ch, CStringList & components );
+
+CButton m_defaultPrinterCtrl;
+
+public:
+CStatic m_printerSelectionText;
+CStatic *   m_printerImage;
+afx_msg void OnBnClickedHaveDisk();
+};
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/UtilTypes.h b/mDNSResponder/Clients/PrinterSetupWizard/UtilTypes.h
new file mode 100644
index 00000000..dc0ae10e
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/UtilTypes.h
@@ -0,0 +1,280 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <dns_sd.h>
+#include <string>
+#include <list>
+#include <DebugServices.h>
+
+class CPrinterSetupWizardSheet;
+
+#define kDefaultPriority    50
+#define kDefaultQTotal      1
+
+namespace PrinterSetupWizard
+{
+struct Printer;
+struct Service;
+struct Queue;
+struct Manufacturer;
+struct Model;
+
+typedef std::list<Queue*>   Queues;
+typedef std::list<Printer*> Printers;
+typedef std::list<Service*> Services;
+typedef std::list<Model*>   Models;
+
+struct Printer
+{
+    Printer();
+
+    ~Printer();
+
+    Service*
+    LookupService
+    (
+        const std::string   &   type
+    );
+
+    CPrinterSetupWizardSheet    *   window;
+    HTREEITEM item;
+
+    //
+    // These are from the browse reply
+    //
+    std::string name;
+    CString displayName;
+    CString actualName;
+
+    //
+    // These keep track of the different services associated with this printer.
+    // the services are ordered according to preference.
+    //
+    Services services;
+
+    //
+    // these are derived from the printer matching code
+    //
+    // if driverInstalled is false, then infFileName should
+    // have an absolute path to the printers inf file.  this
+    // is used to install the printer from printui.dll
+    //
+    // if driverInstalled is true, then model is the name
+    // of the driver to use in AddPrinter
+    //
+    bool driverInstalled;
+    CString infFileName;
+    CString manufacturer;
+    CString displayModelName;
+    CString modelName;
+    CString portName;
+    bool deflt;
+
+    // This let's us know that this printer was discovered via OSX Printer Sharing.
+    // We use this knowledge to workaround a problem with OS X Printer sharing.
+
+    bool isCUPSPrinter;
+
+    //
+    // state
+    //
+    unsigned resolving;
+    bool installed;
+};
+
+
+struct Service
+{
+    Service();
+
+    ~Service();
+
+    Queue*
+    SelectedQueue();
+
+    void
+    EmptyQueues();
+
+    Printer     *   printer;
+    uint32_t ifi;
+    std::string type;
+    std::string domain;
+
+    //
+    // these are from the resolve
+    //
+    DNSServiceRef serviceRef;
+    CString hostname;
+    unsigned short portNumber;
+    CString protocol;
+    unsigned short qtotal;
+
+    //
+    // There will usually one be one of these, however
+    // this will handle printers that have multiple
+    // queues.  These are ordered according to preference.
+    //
+    Queues queues;
+
+    //
+    // Reference count
+    //
+    unsigned refs;
+};
+
+
+struct Queue
+{
+    Queue();
+
+    ~Queue();
+
+    CString name;
+    uint32_t priority;
+    CString pdl;
+    CString usb_MFG;
+    CString usb_MDL;
+    CString description;
+    CString location;
+    CString product;
+};
+
+
+struct Manufacturer
+{
+    CString name;
+    Models models;
+
+    Model*
+    find( const CString & name );
+};
+
+
+struct Model
+{
+    bool driverInstalled;
+    CString infFileName;
+    CString displayName;
+    CString name;
+};
+
+
+inline
+Printer::Printer()
+    :
+    isCUPSPrinter( false )
+{
+}
+
+inline
+Printer::~Printer()
+{
+    while ( services.size() > 0 )
+    {
+        Service * service = services.front();
+        services.pop_front();
+        delete service;
+    }
+}
+
+inline Service*
+Printer::LookupService
+(
+    const std::string   &   type
+)
+{
+    Services::iterator it;
+
+    for ( it = services.begin(); it != services.end(); it++ )
+    {
+        Service * service = *it;
+
+        if ( strcmp(service->type.c_str(), type.c_str()) == 0 )
+        {
+            return service;
+        }
+    }
+
+    return NULL;
+}
+
+inline
+Service::Service()
+    :
+    qtotal(kDefaultQTotal)
+{
+}
+
+inline
+Service::~Service()
+{
+    check( serviceRef == NULL );
+
+    EmptyQueues();
+}
+
+inline Queue*
+Service::SelectedQueue()
+{
+    return queues.front();
+}
+
+inline void
+Service::EmptyQueues()
+{
+    while ( queues.size() > 0 )
+    {
+        Queue * q = queues.front();
+        queues.pop_front();
+        delete q;
+    }
+}
+
+inline
+Queue::Queue()
+    :
+    priority(kDefaultPriority)
+{
+}
+
+inline
+Queue::~Queue()
+{
+}
+
+inline Model*
+Manufacturer::find( const CString & name )
+{
+    Models::iterator it;
+
+    for ( it = models.begin(); it != models.end(); it++ )
+    {
+        Model * model = *it;
+
+        if ( model->name == name )
+        {
+            return model;
+        }
+    }
+
+    return NULL;
+}
+}
+
+
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/Info.ico b/mDNSResponder/Clients/PrinterSetupWizard/res/Info.ico
new file mode 100644
index 00000000..1a532189
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/Info.ico
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/NetworkPrinter.ico b/mDNSResponder/Clients/PrinterSetupWizard/res/NetworkPrinter.ico
new file mode 100644
index 00000000..d2926def
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/NetworkPrinter.ico
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/Print.ico b/mDNSResponder/Clients/PrinterSetupWizard/res/Print.ico
new file mode 100644
index 00000000..b737f473
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/Print.ico
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.ico b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.ico
new file mode 100644
index 00000000..22130b3d
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.ico
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.manifest b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.manifest
new file mode 100644
index 00000000..a72bccad
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.PrinterSetupWizard" type="win32"/> 
+	<description>Printer Setup Wizard</description> 
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<dependency> 
+    	<dependentAssembly> 
+        	<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/> 
+    	</dependentAssembly> 
+	</dependency> 
+</assembly>
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.rc2 b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.rc2
new file mode 100644
index 00000000..27e049a6
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard.rc2
@@ -0,0 +1,13 @@
+//
+// Wiz97_3.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard64.manifest b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard64.manifest
new file mode 100644
index 00000000..f535d80c
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizard64.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="amd64" name="Apple.Bonjour.PrinterSetupWizard" type="win32"/> 
+	<description>Printer Setup Wizard</description> 
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<dependency> 
+    	<dependentAssembly> 
+        	<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df" language="*"/> 
+    	</dependentAssembly> 
+	</dependency> 
+</assembly>
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardLocRes.rc2 b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardLocRes.rc2
new file mode 100755
index 00000000..27e049a6
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardLocRes.rc2
@@ -0,0 +1,13 @@
+//
+// Wiz97_3.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardRes.rc2 b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardRes.rc2
new file mode 100755
index 00000000..27e049a6
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/PrinterSetupWizardRes.rc2
@@ -0,0 +1,13 @@
+//
+// Wiz97_3.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/Thumbs.db b/mDNSResponder/Clients/PrinterSetupWizard/res/Thumbs.db
new file mode 100644
index 00000000..f9f63303
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/Thumbs.db
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/about.bmp b/mDNSResponder/Clients/PrinterSetupWizard/res/about.bmp
new file mode 100644
index 00000000..83e0bb08
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/about.bmp
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/banner_icon.bmp b/mDNSResponder/Clients/PrinterSetupWizard/res/banner_icon.bmp
new file mode 100644
index 00000000..8e62c35c
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/banner_icon.bmp
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/res/watermark.bmp b/mDNSResponder/Clients/PrinterSetupWizard/res/watermark.bmp
new file mode 100644
index 00000000..e76046b6
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/res/watermark.bmp
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/resource.h b/mDNSResponder/Clients/PrinterSetupWizard/resource.h
new file mode 100644
index 00000000..b1190fb9
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/resource.h
@@ -0,0 +1,29 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+// Include resources for Wizard app
+
+#include "resource_exe.h"
+
+// Include resources for non-localizable resource DLL
+
+#include "resource_res.h"
+
+// Include resources for localizable resource DLL
+
+#include "resource_loc_res.h"
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/resource_exe.h b/mDNSResponder/Clients/PrinterSetupWizard/resource_exe.h
new file mode 100755
index 00000000..33c0c288
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/resource_exe.h
@@ -0,0 +1,94 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PrinterSetupWizard.rc
+//
+#define IDM_ABOUTBOX                    0x0010
+#define IDD_ABOUTBOX                    100
+#define IDS_ABOUTBOX                    101
+#define IDD_PRINTERSETUPWIZARD_DIALOG   102
+#define IDS_GOODBYE                     102
+#define IDS_GREETING                    103
+#define IDS_BROWSE_TITLE                104
+#define IDS_BROWSE_SUBTITLE             105
+#define IDS_CAPTION                     106
+#define IDD_FIRST_PAGE                  107
+#define IDS_GOODBYE_GOOD1               107
+#define IDS_SEARCHING                   108
+#define IDD_SECOND_PAGE                 109
+#define IDS_GOODBYTE_GOOD2              109
+#define IDS_INSTALL_TITLE               110
+#define IDS_INSTALL_SUBTITLE            111
+#define IDS_ERROR_SELECTING_PRINTER_TEXT 112
+#define IDS_ERROR_SELECTING_PRINTER_CAPTION 113
+#define IDS_INSTALL_ERROR_CAPTION       114
+#define IDS_INSTALL_ERROR_MESSAGE       115
+#define IDS_MANUFACTURER_HEADING        116
+#define IDS_MODEL_HEADING               117
+#define IDS_NO_PRINTERS                 118
+#define IDS_NO_MDNSRESPONDER_SERVICE_TEXT 119
+#define IDS_NO_MDNSRESPONDER_SERVICE_CAPTION 120
+#define IDS_PRINTER_MATCH_GOOD          121
+#define IDS_PRINTER_MATCH_BAD           122
+#define IDS_YES                         123
+#define IDS_NO                          124
+#define IDS_LARGE_FONT                  125
+#define IDS_FIREWALL                    126
+#define IDS_ERROR_CAPTION               127
+#define IDR_MAINFRAME                   128
+#define IDS_FIREWALL_CAPTION            128
+#define IDB_BANNER_ICON                 129
+#define IDD_THIRD_PAGE                  130
+#define IDB_WATERMARK                   131
+#define IDD_FOURTH_PAGE                 132
+#define IDI_INFO                        136
+#define IDB_ABOUT                       138
+#define IDD_DIALOG1                     139
+#define IDI_ICON2                       141
+#define IDI_PRINTER                     141
+#define IDS_REINSTALL                   142
+#define IDS_REINSTALL_CAPTION           143
+#define IDC_INFO                        144
+#define IDS_PRINTER_UNAVAILABLE         145
+#define IDS_BAD_INF_FILE                150
+#define IDS_BAD_INF_FILE_CAPTION        151
+#define IDS_NO_MATCH_INF_FILE           152
+#define IDS_NO_MATCH_INF_FILE_CAPTION   153
+#define IDC_BUTTON1                     1000
+#define IDC_LIST1                       1000
+#define IDC_BROWSE_LIST                 1000
+#define IDC_RADIO1                      1001
+#define IDC_COMBO1                      1001
+#define IDC_RADIO2                      1002
+#define IDC_GREETING                    1003
+#define IDC_CHECK1                      1016
+#define IDC_DEFAULT_PRINTER             1016
+#define IDC_PRINTER_IMAGE               1017
+#define IDC_PRINTER_NAME                1018
+#define IDC_PRINTER_MANUFACTURER        1019
+#define IDC_PRINTER_MODEL               1020
+#define IDC_GOODBYE                     1021
+#define IDC_PRINTER_PORT                1022
+#define IDC_PRINTER_PROTOCOL            1022
+#define IDC_PRINTER_DEFAULT             1023
+#define IDC_PRINTER_SELECTION_TEXT      1024
+#define IDC_HAVE_DISK                   1025
+#define IDC_PRINTER_INFORMATION         1026
+#define IDC_LOCATION_LABEL              1029
+#define IDC_DESCRIPTION_FIELD           1030
+#define IDC_LOCATION_FIELD              1032
+#define IDC_DESCRIPTION_LABEL           1033
+#define IDC_COMPLETE1                   1034
+#define IDC_COMPLETE2                   1035
+#define IDC_INSTALLING                  1036
+#define IDC_PROGRESS                    1037
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        142
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1034
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/resource_loc_res.h b/mDNSResponder/Clients/PrinterSetupWizard/resource_loc_res.h
new file mode 100755
index 00000000..deb2e6e6
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/resource_loc_res.h
@@ -0,0 +1,95 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PrinterSetupWizardLocRes.rc
+//
+#define IDM_ABOUTBOX                    0x0010
+#define IDD_ABOUTBOX                    100
+#define IDS_ABOUTBOX                    101
+#define IDD_PRINTERSETUPWIZARD_DIALOG   102
+#define IDS_GOODBYE                     102
+#define IDS_GREETING                    103
+#define IDS_BROWSE_TITLE                104
+#define IDS_BROWSE_SUBTITLE             105
+#define IDS_CAPTION                     106
+#define IDD_FIRST_PAGE                  107
+#define IDS_GOODBYE_GOOD1               107
+#define IDS_SEARCHING                   108
+#define IDD_SECOND_PAGE                 109
+#define IDS_GOODBYTE_GOOD2              109
+#define IDS_INSTALL_TITLE               110
+#define IDS_INSTALL_SUBTITLE            111
+#define IDS_ERROR_SELECTING_PRINTER_TEXT 112
+#define IDS_ERROR_SELECTING_PRINTER_CAPTION 113
+#define IDS_INSTALL_ERROR_CAPTION       114
+#define IDS_INSTALL_ERROR_MESSAGE       115
+#define IDS_MANUFACTURER_HEADING        116
+#define IDS_MODEL_HEADING               117
+#define IDS_NO_PRINTERS                 118
+#define IDS_NO_MDNSRESPONDER_SERVICE_TEXT 119
+#define IDS_NO_MDNSRESPONDER_SERVICE_CAPTION 120
+#define IDS_PRINTER_MATCH_GOOD          121
+#define IDS_PRINTER_MATCH_BAD           122
+#define IDS_PRINTER_MATCH_MAYBE         146
+#define IDS_YES                         123
+#define IDS_NO                          124
+#define IDS_LARGE_FONT                  125
+#define IDS_FIREWALL                    126
+#define IDS_ERROR_CAPTION               127
+#define IDR_MAINFRAME                   128
+#define IDS_FIREWALL_CAPTION            128
+#define IDB_BANNER_ICON                 129
+#define IDD_THIRD_PAGE                  130
+#define IDB_WATERMARK                   131
+#define IDD_FOURTH_PAGE                 132
+#define IDI_INFO                        136
+#define IDB_ABOUT                       138
+#define IDD_DIALOG1                     139
+#define IDI_ICON2                       141
+#define IDI_PRINTER                     141
+#define IDS_REINSTALL                   142
+#define IDS_REINSTALL_CAPTION           143
+#define IDC_INFO                                 144
+#define IDS_PRINTER_UNAVAILABLE         145
+#define IDS_BAD_INF_FILE                150
+#define IDS_BAD_INF_FILE_CAPTION        151
+#define IDS_NO_MATCH_INF_FILE           152
+#define IDS_NO_MATCH_INF_FILE_CAPTION   153
+#define IDC_BUTTON1                     1000
+#define IDC_LIST1                       1000
+#define IDC_BROWSE_LIST                 1000
+#define IDC_RADIO1                      1001
+#define IDC_COMBO1                      1001
+#define IDC_RADIO2                      1002
+#define IDC_GREETING                    1003
+#define IDC_CHECK1                      1016
+#define IDC_DEFAULT_PRINTER             1016
+#define IDC_PRINTER_IMAGE               1017
+#define IDC_PRINTER_NAME                1018
+#define IDC_PRINTER_MANUFACTURER        1019
+#define IDC_PRINTER_MODEL               1020
+#define IDC_GOODBYE                     1021
+#define IDC_PRINTER_PORT                1022
+#define IDC_PRINTER_PROTOCOL            1022
+#define IDC_PRINTER_DEFAULT             1023
+#define IDC_PRINTER_SELECTION_TEXT      1024
+#define IDC_HAVE_DISK                   1025
+#define IDC_PRINTER_INFORMATION         1026
+#define IDC_LOCATION_LABEL              1029
+#define IDC_DESCRIPTION_FIELD           1030
+#define IDC_LOCATION_FIELD              1032
+#define IDC_DESCRIPTION_LABEL           1033
+#define IDC_COMPLETE1                   1034
+#define IDC_COMPLETE2                   1035
+#define IDC_INSTALLING                  1036
+#define IDC_PROGRESS                    1037
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        142
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1034
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/resource_res.h b/mDNSResponder/Clients/PrinterSetupWizard/resource_res.h
new file mode 100755
index 00000000..33c0c288
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/resource_res.h
@@ -0,0 +1,94 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PrinterSetupWizard.rc
+//
+#define IDM_ABOUTBOX                    0x0010
+#define IDD_ABOUTBOX                    100
+#define IDS_ABOUTBOX                    101
+#define IDD_PRINTERSETUPWIZARD_DIALOG   102
+#define IDS_GOODBYE                     102
+#define IDS_GREETING                    103
+#define IDS_BROWSE_TITLE                104
+#define IDS_BROWSE_SUBTITLE             105
+#define IDS_CAPTION                     106
+#define IDD_FIRST_PAGE                  107
+#define IDS_GOODBYE_GOOD1               107
+#define IDS_SEARCHING                   108
+#define IDD_SECOND_PAGE                 109
+#define IDS_GOODBYTE_GOOD2              109
+#define IDS_INSTALL_TITLE               110
+#define IDS_INSTALL_SUBTITLE            111
+#define IDS_ERROR_SELECTING_PRINTER_TEXT 112
+#define IDS_ERROR_SELECTING_PRINTER_CAPTION 113
+#define IDS_INSTALL_ERROR_CAPTION       114
+#define IDS_INSTALL_ERROR_MESSAGE       115
+#define IDS_MANUFACTURER_HEADING        116
+#define IDS_MODEL_HEADING               117
+#define IDS_NO_PRINTERS                 118
+#define IDS_NO_MDNSRESPONDER_SERVICE_TEXT 119
+#define IDS_NO_MDNSRESPONDER_SERVICE_CAPTION 120
+#define IDS_PRINTER_MATCH_GOOD          121
+#define IDS_PRINTER_MATCH_BAD           122
+#define IDS_YES                         123
+#define IDS_NO                          124
+#define IDS_LARGE_FONT                  125
+#define IDS_FIREWALL                    126
+#define IDS_ERROR_CAPTION               127
+#define IDR_MAINFRAME                   128
+#define IDS_FIREWALL_CAPTION            128
+#define IDB_BANNER_ICON                 129
+#define IDD_THIRD_PAGE                  130
+#define IDB_WATERMARK                   131
+#define IDD_FOURTH_PAGE                 132
+#define IDI_INFO                        136
+#define IDB_ABOUT                       138
+#define IDD_DIALOG1                     139
+#define IDI_ICON2                       141
+#define IDI_PRINTER                     141
+#define IDS_REINSTALL                   142
+#define IDS_REINSTALL_CAPTION           143
+#define IDC_INFO                        144
+#define IDS_PRINTER_UNAVAILABLE         145
+#define IDS_BAD_INF_FILE                150
+#define IDS_BAD_INF_FILE_CAPTION        151
+#define IDS_NO_MATCH_INF_FILE           152
+#define IDS_NO_MATCH_INF_FILE_CAPTION   153
+#define IDC_BUTTON1                     1000
+#define IDC_LIST1                       1000
+#define IDC_BROWSE_LIST                 1000
+#define IDC_RADIO1                      1001
+#define IDC_COMBO1                      1001
+#define IDC_RADIO2                      1002
+#define IDC_GREETING                    1003
+#define IDC_CHECK1                      1016
+#define IDC_DEFAULT_PRINTER             1016
+#define IDC_PRINTER_IMAGE               1017
+#define IDC_PRINTER_NAME                1018
+#define IDC_PRINTER_MANUFACTURER        1019
+#define IDC_PRINTER_MODEL               1020
+#define IDC_GOODBYE                     1021
+#define IDC_PRINTER_PORT                1022
+#define IDC_PRINTER_PROTOCOL            1022
+#define IDC_PRINTER_DEFAULT             1023
+#define IDC_PRINTER_SELECTION_TEXT      1024
+#define IDC_HAVE_DISK                   1025
+#define IDC_PRINTER_INFORMATION         1026
+#define IDC_LOCATION_LABEL              1029
+#define IDC_DESCRIPTION_FIELD           1030
+#define IDC_LOCATION_FIELD              1032
+#define IDC_DESCRIPTION_LABEL           1033
+#define IDC_COMPLETE1                   1034
+#define IDC_COMPLETE2                   1035
+#define IDC_INSTALLING                  1036
+#define IDC_PROGRESS                    1037
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        142
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1034
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/stdafx.cpp b/mDNSResponder/Clients/PrinterSetupWizard/stdafx.cpp
new file mode 100644
index 00000000..e05ec3d1
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/stdafx.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+
+
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/stdafx.h b/mDNSResponder/Clients/PrinterSetupWizard/stdafx.h
new file mode 100644
index 00000000..1eec4c39
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/stdafx.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
+#endif
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
+#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#endif
+
+#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
+#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#endif
+
+#ifndef _WIN32_WINDOWS      // Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+// Step 3: We want to see one image, but not a tile
+#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
+#define _WIN32_IE 0x0500    // Change this to the appropriate value to target IE 5.0 or later.
+#endif
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
+
+// turns off MFC's hiding of some common and often safely ignored warning messages
+#define _AFX_ALL_WARNINGS
+
+#if !defined(_WSPIAPI_COUNTOF)
+#   define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#endif
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdisp.h>        // MFC Automation classes
+
+#include <afxdtctl.h>       // MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>         // MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+#include <afxdlgs.h>
+
diff --git a/mDNSResponder/Clients/PrinterSetupWizard/tcpxcv.h b/mDNSResponder/Clients/PrinterSetupWizard/tcpxcv.h
new file mode 100755
index 00000000..a4b7b5f3
--- /dev/null
+++ b/mDNSResponder/Clients/PrinterSetupWizard/tcpxcv.h
@@ -0,0 +1,107 @@
+/*++
+
+   Copyright (c) 1997 - 1999  Hewlett-Packard Company.
+   Copyright (c) 1997 - 1999  Microsoft Corporation
+   All rights reserved
+
+   Module Name:
+
+   tcpxcv.h
+
+   --*/
+/*
+ * This file is contained in WinDDK 6001.18002
+ */
+
+#ifndef _TCPXCV_
+#define _TCPXCV_
+
+#if (!defined(UNKNOWN_PROTOCOL))
+    #define UNKNOWN_PROTOCOL        0
+    #define PROTOCOL_UNKNOWN_TYPE   UNKNOWN_PROTOCOL
+#endif
+
+#if (!defined(RAWTCP))
+#define RAWTCP                          1
+#define PROTOCOL_RAWTCP_TYPE            RAWTCP
+#endif
+
+#if (!defined(LPR))
+#define LPR                             2
+#define PROTOCOL_LPR_TYPE               LPR
+#endif
+
+#define MAX_PORTNAME_LEN                63 +1       // port name length
+#define MAX_NETWORKNAME_LEN             48 +1       // host name length
+#define MAX_NETWORKNAME2_LEN            128         // host name or IPv6 address
+#define MAX_SNMP_COMMUNITY_STR_LEN      32 +1       // SNMP Community String Name
+#define MAX_QUEUENAME_LEN               32 +1       // lpr print que name
+#define MAX_IPADDR_STR_LEN              15 +1       // ip address; string version
+#define MAX_ADDRESS_STR_LEN             12 +1       // hw address length
+#define MAX_DEVICEDESCRIPTION_STR_LEN   256+1
+
+
+
+typedef struct _PORT_DATA_1
+{
+    WCHAR sztPortName[MAX_PORTNAME_LEN];
+    DWORD dwVersion;
+    DWORD dwProtocol;
+    DWORD cbSize;
+    DWORD dwReserved;
+    WCHAR sztHostAddress[MAX_NETWORKNAME_LEN];
+    WCHAR sztSNMPCommunity[MAX_SNMP_COMMUNITY_STR_LEN];
+    DWORD dwDoubleSpool;
+    WCHAR sztQueue[MAX_QUEUENAME_LEN];
+    WCHAR sztIPAddress[MAX_IPADDR_STR_LEN];
+    BYTE Reserved[540];
+    DWORD dwPortNumber;
+    DWORD dwSNMPEnabled;
+    DWORD dwSNMPDevIndex;
+}   PORT_DATA_1, *PPORT_DATA_1;
+
+typedef struct _PORT_DATA_2
+{
+    WCHAR sztPortName[MAX_PORTNAME_LEN];
+    DWORD dwVersion;
+    DWORD dwProtocol;
+    DWORD cbSize;
+    DWORD dwReserved;
+    WCHAR sztHostAddress [MAX_NETWORKNAME2_LEN];
+    WCHAR sztSNMPCommunity[MAX_SNMP_COMMUNITY_STR_LEN];
+    DWORD dwDoubleSpool;
+    WCHAR sztQueue[MAX_QUEUENAME_LEN];
+    BYTE Reserved[514];
+    DWORD dwPortNumber;
+    DWORD dwSNMPEnabled;
+    DWORD dwSNMPDevIndex;
+    DWORD dwPortMonitorMibIndex;
+}   PORT_DATA_2, *PPORT_DATA_2;
+
+
+typedef struct _PORT_DATA_LIST_1
+{
+    DWORD dwVersion;
+    DWORD cPortData;
+    PORT_DATA_2 pPortData[1];
+}   PORT_DATA_LIST_1, *PPORT_DATA_LIST_1;
+
+
+typedef struct _DELETE_PORT_DATA_1
+{
+    WCHAR psztPortName[MAX_PORTNAME_LEN];
+    BYTE Reserved[98];
+    DWORD dwVersion;
+    DWORD dwReserved;
+}   DELETE_PORT_DATA_1, *PDELETE_PORT_DATA_1;
+
+
+typedef struct _CONFIG_INFO_DATA_1
+{
+    BYTE Reserved[128];
+    DWORD dwVersion;
+}   CONFIG_INFO_DATA_1, *PCONFIG_INFO_DATA_1;
+
+
+
+#endif
diff --git a/mDNSResponder/Clients/ReadMe.txt b/mDNSResponder/Clients/ReadMe.txt
new file mode 100644
index 00000000..83dd2428
--- /dev/null
+++ b/mDNSResponder/Clients/ReadMe.txt
@@ -0,0 +1,25 @@
+This directory contains a variety of clients that use the
+"/usr/include/dns_sd.h" APIs.
+
+Some of the clients are command-line oriented; some are graphical.
+
+Some of the clients, like the "dns-sd" command-line tool, can be built
+for a variety of platforms. Some of the clients only build for one
+platform, like "DNS Service Browser" and "DNS Service Registration",
+which use Objective C and Cocoa and only run on OS X 10.3 or later.
+
+Some of the clients can be built more than one way. For example, the
+"dns-sd" command-line tool can be built for OS X using both the XCode
+IDE, or using a simple command-line "make" command.
+
+What all clients have in common is that they all demonstrate how you
+can use the "/usr/include/dns_sd.h" APIs.
+
+The table below gives a summary of which clients build for which platforms.
+
+Client                    Type          OS X   OS X   Posix
+                                        XCode  Make   Make
+
+dns-sd                    Command-line   X      X      X
+DNS Service Browser       Graphical      X
+DNS Service Registration  Graphical      X
diff --git a/mDNSResponder/Clients/SimpleChat.NET/App.ico b/mDNSResponder/Clients/SimpleChat.NET/App.ico
new file mode 100755
index 00000000..3a5525fd
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.NET/App.ico
diff --git a/mDNSResponder/Clients/SimpleChat.NET/AssemblyInfo.cs b/mDNSResponder/Clients/SimpleChat.NET/AssemblyInfo.cs
new file mode 100755
index 00000000..da6a08c9
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.NET/AssemblyInfo.cs
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.NET.csproj b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.NET.csproj
new file mode 100755
index 00000000..e3887f3b
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.NET.csproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+  <PropertyGroup>

+    <ProjectType>Local</ProjectType>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{726DED99-34D0-45F3-9F4D-C7068DF4BCDA}</ProjectGuid>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ApplicationIcon>App.ico</ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>SimpleChat.NET</AssemblyName>

+    <AssemblyOriginatorKeyFile>

+    </AssemblyOriginatorKeyFile>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>WinExe</OutputType>

+    <RootNamespace>SimpleChat.NET</RootNamespace>

+    <StartupObject>

+    </StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <OldToolsVersion>2.0</OldToolsVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <OutputPath>bin\Debug\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>true</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>false</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>full</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <OutputPath>bin\Release\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>false</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>true</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>none</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System">

+      <Name>System</Name>

+    </Reference>

+    <Reference Include="System.Data">

+      <Name>System.Data</Name>

+    </Reference>

+    <Reference Include="System.Drawing">

+      <Name>System.Drawing</Name>

+    </Reference>

+    <Reference Include="System.Windows.Forms">

+      <Name>System.Windows.Forms</Name>

+    </Reference>

+    <Reference Include="System.XML">

+      <Name>System.XML</Name>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <Content Include="App.ico" />

+    <Compile Include="AssemblyInfo.cs" />

+    <Compile Include="SimpleChat.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <EmbeddedResource Include="SimpleChat.resx">

+      <DependentUpon>SimpleChat.cs</DependentUpon>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

+  </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="Bonjour">

+      <Guid>{18FBED6D-F2B7-4EC8-A4A4-46282E635308}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.cs b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.cs
new file mode 100755
index 00000000..338bdb78
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.cs
@@ -0,0 +1,601 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Net;
+using System.Net.Sockets;
+using System.Data;
+using System.Text;
+using Bonjour;
+
+namespace SimpleChat.NET
+{
+	/// <summary>
+	/// Summary description for Form1.
+	/// </summary>
+	/// 
+
+	public class SimpleChat : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.ComboBox   comboBox1;
+		private System.Windows.Forms.TextBox    textBox2;
+		private System.Windows.Forms.Button     button1;
+		private System.Windows.Forms.Label      label1;
+
+        private Bonjour.DNSSDEventManager       m_eventManager = null;
+        private Bonjour.DNSSDService            m_service = null;
+        private Bonjour.DNSSDService            m_registrar = null;
+        private Bonjour.DNSSDService            m_browser = null;
+        private Bonjour.DNSSDService            m_resolver = null;
+		private String					        m_name;
+        private Socket                          m_socket = null;
+        private const int                       BUFFER_SIZE = 1024;
+        public byte[]                           m_buffer = new byte[BUFFER_SIZE];
+        public bool                             m_complete = false;
+        public StringBuilder                    m_sb = new StringBuilder();
+
+        delegate void                           ReadMessageCallback(String data);
+
+        ReadMessageCallback                     m_readMessageCallback;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+		private System.Windows.Forms.RichTextBox richTextBox1;
+
+		// ServiceRegistered
+		//
+		// Called by DNSServices core as a result of Register()
+		// call
+		//
+        public void
+        ServiceRegistered
+                    (
+                    DNSSDService service,
+                    DNSSDFlags flags,
+                    String name,
+                    String regType,
+                    String domain
+                    )
+        {
+            m_name = name;
+
+			//
+			// Try to start browsing for other instances of this service
+			//
+            try
+            {
+                m_browser = m_service.Browse(0, 0, "_p2pchat._udp", null, m_eventManager);
+            }
+            catch
+            {
+                MessageBox.Show("Browse Failed", "Error");
+                Application.Exit();
+            }
+        }
+
+		//
+		// ServiceFound
+		//
+		// Called by DNSServices core as a result of a Browse call
+		//
+		public void
+        ServiceFound
+				    (
+				    DNSSDService    sref,
+				    DNSSDFlags  	flags,
+				    uint			ifIndex,
+                    String          serviceName,
+                    String          regType,
+                    String          domain
+				    )
+		{
+            if (serviceName != m_name)
+            {
+                PeerData peer = new PeerData();
+
+                peer.InterfaceIndex = ifIndex;
+                peer.Name = serviceName;
+                peer.Type = regType;
+                peer.Domain = domain;
+                peer.Address = null;
+
+                comboBox1.Items.Add(peer);
+
+                if (comboBox1.Items.Count == 1)
+                {
+                    comboBox1.SelectedIndex = 0;
+                }
+            }
+		}
+
+        //
+        // ServiceLost
+        //
+        // Called by DNSServices core as a result of a Browse call
+        //
+        public void
+        ServiceLost
+                    (
+                    DNSSDService sref,
+                    DNSSDFlags flags,
+                    uint ifIndex,
+                    String serviceName,
+                    String regType,
+                    String domain
+                    )
+        {
+            PeerData peer = new PeerData();
+
+            peer.InterfaceIndex = ifIndex;
+            peer.Name = serviceName;
+            peer.Type = regType;
+            peer.Domain = domain;
+            peer.Address = null;
+
+            comboBox1.Items.Remove(peer);
+        }
+
+		//
+		// ServiceResolved
+		//
+		// Called by DNSServices core as a result of DNSService.Resolve()
+		// call
+		//
+        public void
+        ServiceResolved
+                    (
+                    DNSSDService sref,
+                    DNSSDFlags flags,
+                    uint ifIndex,
+                    String fullName,
+                    String hostName,
+                    ushort port,
+                    TXTRecord txtRecord
+                    )
+		{
+            m_resolver.Stop();
+            m_resolver = null;
+
+            PeerData peer = (PeerData)comboBox1.SelectedItem;
+
+            peer.Port = port;
+
+			//
+			// Query for the IP address associated with "hostName"
+			//
+            try
+            {
+                m_resolver = m_service.QueryRecord(0, ifIndex, hostName, DNSSDRRType.kDNSSDType_A, DNSSDRRClass.kDNSSDClass_IN, m_eventManager );
+            }
+            catch
+            {
+                MessageBox.Show("QueryRecord Failed", "Error");
+                Application.Exit();
+            }
+		}
+
+		//
+		// QueryAnswered
+		//
+		// Called by DNSServices core as a result of DNSService.QueryRecord()
+		// call
+		//
+		public void
+		QueryAnswered
+			(
+            DNSSDService    service, 
+            DNSSDFlags      flags,
+            uint            ifIndex,
+            String          fullName,
+            DNSSDRRType     rrtype,
+            DNSSDRRClass    rrclass,
+            Object          rdata,
+            uint            ttl
+            )
+        {
+			//
+			// Stop the resolve to reduce the burden on the network
+			//
+            m_resolver.Stop();
+            m_resolver = null;
+
+            PeerData peer = (PeerData) comboBox1.SelectedItem;
+			uint bits = BitConverter.ToUInt32( (Byte[])rdata, 0);
+			System.Net.IPAddress address = new System.Net.IPAddress(bits);
+
+            peer.Address = address;
+		}
+
+        public void
+        OperationFailed
+                    (
+                    DNSSDService service,
+                    DNSSDError error
+                    )
+        {
+            MessageBox.Show("Operation returned an error code " + error, "Error");
+        }
+
+        //
+        // OnReadMessage
+        //
+        // Called when there is data to be read on a socket
+        //
+        // This is called (indirectly) from OnReadSocket()
+        //
+        private void
+        OnReadMessage
+                (
+                String msg
+                )
+        {
+            int rgb = 0;
+
+            for (int i = 0; i < msg.Length && msg[i] != ':'; i++)
+            {
+                rgb = rgb ^ ((int)msg[i] << (i % 3 + 2) * 8);
+
+            }
+
+            Color color = Color.FromArgb(rgb & 0x007F7FFF);
+
+            richTextBox1.SelectionColor = color;
+            richTextBox1.AppendText(msg + Environment.NewLine);
+        }
+
+		//
+		// OnReadSocket
+		//
+		// Called by the .NET core when there is data to be read on a socket
+		//
+		// This is called from a worker thread by the .NET core
+		//
+		private void
+		OnReadSocket
+				(
+				IAsyncResult ar
+				)
+		{
+			try
+			{
+				int read = m_socket.EndReceive(ar);
+
+				if (read > 0)
+				{
+					String msg = Encoding.UTF8.GetString(m_buffer, 0, read);
+					Invoke(m_readMessageCallback, new Object[]{msg});
+				}
+
+				m_socket.BeginReceive(m_buffer, 0, BUFFER_SIZE, 0, new AsyncCallback(OnReadSocket), this);
+			}
+			catch
+			{
+			}
+		}
+
+
+		public SimpleChat()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+            try
+            {
+                m_service = new DNSSDService();
+            }
+            catch
+            {
+                MessageBox.Show("Bonjour Service is not available", "Error");
+                Application.Exit();
+            }
+
+			//
+			// Associate event handlers with all the Bonjour events that the app is interested in.
+			//
+            m_eventManager = new DNSSDEventManager();
+            m_eventManager.ServiceRegistered += new _IDNSSDEvents_ServiceRegisteredEventHandler(this.ServiceRegistered);
+            m_eventManager.ServiceFound += new _IDNSSDEvents_ServiceFoundEventHandler(this.ServiceFound);
+            m_eventManager.ServiceLost += new _IDNSSDEvents_ServiceLostEventHandler(this.ServiceLost);
+            m_eventManager.ServiceResolved += new _IDNSSDEvents_ServiceResolvedEventHandler(this.ServiceResolved);
+            m_eventManager.QueryRecordAnswered += new _IDNSSDEvents_QueryRecordAnsweredEventHandler(this.QueryAnswered);
+            m_eventManager.OperationFailed += new _IDNSSDEvents_OperationFailedEventHandler(this.OperationFailed);
+
+			//
+			// Socket read handler
+			//
+			m_readMessageCallback = new ReadMessageCallback(OnReadMessage);
+
+			this.Load += new System.EventHandler(this.Form1_Load);
+
+			this.AcceptButton = button1;
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void
+		Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+
+				if (m_registrar != null)
+				{
+					m_registrar.Stop();
+				}
+
+				if (m_browser != null)
+				{
+					m_browser.Stop();
+				}
+
+                if (m_resolver != null)
+                {
+                    m_resolver.Stop();
+                }
+
+                m_eventManager.ServiceFound -= new _IDNSSDEvents_ServiceFoundEventHandler(this.ServiceFound);
+                m_eventManager.ServiceLost -= new _IDNSSDEvents_ServiceLostEventHandler(this.ServiceLost);
+                m_eventManager.ServiceResolved -= new _IDNSSDEvents_ServiceResolvedEventHandler(this.ServiceResolved);
+                m_eventManager.QueryRecordAnswered -= new _IDNSSDEvents_QueryRecordAnsweredEventHandler(this.QueryAnswered);
+                m_eventManager.OperationFailed -= new _IDNSSDEvents_OperationFailedEventHandler(this.OperationFailed);
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.comboBox1 = new System.Windows.Forms.ComboBox();
+			this.textBox2 = new System.Windows.Forms.TextBox();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+			this.SuspendLayout();
+			// 
+			// comboBox1
+			// 
+			this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+				| System.Windows.Forms.AnchorStyles.Right);
+			this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.comboBox1.Location = new System.Drawing.Point(59, 208);
+			this.comboBox1.Name = "comboBox1";
+			this.comboBox1.Size = new System.Drawing.Size(224, 21);
+			this.comboBox1.Sorted = true;
+			this.comboBox1.TabIndex = 5;
+			this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+			// 
+			// textBox2
+			// 
+			this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+				| System.Windows.Forms.AnchorStyles.Right);
+			this.textBox2.Location = new System.Drawing.Point(8, 248);
+			this.textBox2.Name = "textBox2";
+			this.textBox2.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
+			this.textBox2.Size = new System.Drawing.Size(192, 20);
+			this.textBox2.TabIndex = 2;
+			this.textBox2.Text = "";
+			this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
+			// 
+			// button1
+			// 
+			this.button1.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.button1.Enabled = false;
+			this.button1.Location = new System.Drawing.Point(208, 248);
+			this.button1.Name = "button1";
+			this.button1.TabIndex = 3;
+			this.button1.Text = "Send";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// label1
+			// 
+			this.label1.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
+			this.label1.Location = new System.Drawing.Point(8, 210);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(48, 16);
+			this.label1.TabIndex = 4;
+			this.label1.Text = "Talk To:";
+			// 
+			// richTextBox1
+			// 
+			this.richTextBox1.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+				| System.Windows.Forms.AnchorStyles.Left) 
+				| System.Windows.Forms.AnchorStyles.Right);
+			this.richTextBox1.Location = new System.Drawing.Point(8, 8);
+			this.richTextBox1.Name = "richTextBox1";
+			this.richTextBox1.ReadOnly = true;
+			this.richTextBox1.Size = new System.Drawing.Size(272, 184);
+			this.richTextBox1.TabIndex = 1;
+			this.richTextBox1.Text = "";
+			// 
+			// Form1
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(292, 273);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.richTextBox1,
+																		  this.label1,
+																		  this.button1,
+																		  this.textBox2,
+																		  this.comboBox1});
+			this.Name = "Form1";
+			this.Text = "SimpleChat.NET";
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void Form1_Load(object sender, EventArgs e) 
+		{
+			IPEndPoint localEP = new IPEndPoint(System.Net.IPAddress.Any, 0);
+			
+			//
+			// create the socket and bind to INADDR_ANY
+			//
+			m_socket	= new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+			m_socket.Bind(localEP);
+			localEP = (IPEndPoint) m_socket.LocalEndPoint;
+
+			//
+			// start asynchronous read
+			//
+			m_socket.BeginReceive(m_buffer, 0, BUFFER_SIZE, 0, new AsyncCallback(this.OnReadSocket), this);   
+
+			try
+			{
+				//
+				// start the register and browse operations
+				//
+				m_registrar	=	m_service.Register( 0, 0, System.Environment.UserName, "_p2pchat._udp", null, null, ( ushort ) localEP.Port, null, m_eventManager );	
+			}
+			catch
+			{
+				MessageBox.Show("Bonjour service is not available", "Error");
+				Application.Exit();
+			}
+		}
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main() 
+		{
+			Application.Run(new SimpleChat());
+		}
+
+		//
+		// send the message to a peer
+		//
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			PeerData peer = (PeerData) comboBox1.SelectedItem;
+
+			String message = m_name + ": " + textBox2.Text;
+
+			Byte[] bytes = Encoding.UTF8.GetBytes(message);
+
+            IPEndPoint endPoint = new IPEndPoint( peer.Address, peer.Port );
+
+
+
+            m_socket.SendTo(bytes, endPoint);
+
+			richTextBox1.SelectionColor = Color.Black;
+
+			richTextBox1.AppendText(textBox2.Text + "\n");
+
+			textBox2.Text = "";
+		}
+
+		//
+		// called when typing in message box
+		//
+		private void textBox2_TextChanged(object sender, System.EventArgs e)
+		{
+			PeerData peer = (PeerData) comboBox1.SelectedItem;
+            button1.Enabled = ((peer.Address != null) && (textBox2.Text.Length > 0));
+		}
+
+		//
+		// called when peer target changes
+		//
+		/// <summary>
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void comboBox1_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			PeerData peer = (PeerData) comboBox1.SelectedItem;
+
+			try
+			{
+				m_resolver = m_service.Resolve(0, peer.InterfaceIndex, peer.Name, peer.Type, peer.Domain, m_eventManager);
+			}
+			catch
+			{
+				MessageBox.Show("Unable to Resolve service", "Error");
+				Application.Exit();
+			}
+		}
+	}
+
+    //
+    // PeerData
+    //
+    // Holds onto the information associated with a peer on the network
+    //
+    public class PeerData
+    {
+        public uint InterfaceIndex;
+        public String Name;
+        public String Type;
+        public String Domain;
+        public IPAddress Address;
+        public int Port;
+
+        public override String
+        ToString()
+        {
+            return Name;
+        }
+
+        public override bool
+        Equals(object other)
+        {
+            bool result = false;
+
+            if (other != null)
+            {
+                if ((object)this == other)
+                {
+                    result = true;
+                }
+                else if (other is PeerData)
+                {
+                    PeerData otherPeerData = (PeerData)other;
+
+                    result = (this.Name == otherPeerData.Name);
+                }
+            }
+
+            return result;
+        }
+
+
+        public override int
+        GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    };
+}
diff --git a/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.resx b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.resx
new file mode 100755
index 00000000..56718181
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.NET/SimpleChat.resx
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+            Microsoft ResX Schema 

+        

+            Version 1.3

+                

+            The primary goals of this format is to allow a simple XML format 

+            that is mostly human readable. The generation and parsing of the 

+            various data types are done through the TypeConverter classes 

+            associated with the data types.

+        

+            Example:

+        

+                ... ado.net/XML headers & schema ...

+                <resheader name="resmimetype">text/microsoft-resx</resheader>

+                <resheader name="version">1.3</resheader>

+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+                <data name="Name1">this is my long string</data>

+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+                    [base64 mime encoded serialized .NET Framework object]

+                </data>

+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]

+                </data>

+        

+            There are any number of "resheader" rows that contain simple 

+            name/value pairs.

+            

+            Each data row contains a name, and value. The row also contains a 

+            type or mimetype. Type corresponds to a .NET class that support 

+            text/value conversion through the TypeConverter architecture. 

+            Classes that don't support this are serialized and stored with the 

+            mimetype set.

+                     

+            The mimetype is used for serialized objects, and tells the 

+            ResXResourceReader how to depersist the object. This is currently not 

+            extensible. For a given mimetype the value must be set accordingly:

+        

+            Note - application/x-microsoft.net.object.binary.base64 is the format 

+                   that the ResXResourceWriter will generate, however the reader can 

+                   read any of the formats listed below.

+        

+            mimetype: application/x-microsoft.net.object.binary.base64

+            value   : The object must be serialized with 

+                    : System.Serialization.Formatters.Binary.BinaryFormatter

+                    : and then encoded with base64 encoding.

+        

+            mimetype: application/x-microsoft.net.object.soap.base64

+            value   : The object must be serialized with 

+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+                    : and then encoded with base64 encoding.

+            mimetype: application/x-microsoft.net.object.bytearray.base64

+            value   : The object must be serialized into a byte array 

+                    : using a System.ComponentModel.TypeConverter

+                    : and then encoded with base64 encoding.

+        -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>1.3</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <data name="$this.Name">

+    <value>SimpleChat.NET</value>

+  </data>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.Designer.vb b/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.Designer.vb
new file mode 100644
index 00000000..9fc20193
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.Designer.vb
@@ -0,0 +1,38 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:4.0.30319.235

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+

+Namespace My

+    

+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,

+    ' or if you encounter build errors in this file, go to the Project Designer

+    ' (go to Project Properties or double-click the My Project node in

+    ' Solution Explorer), and make changes on the Application tab.

+    '

+    Partial Friend Class MyApplication

+        

+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _

+        Public Sub New()

+            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)

+            Me.IsSingleInstance = false

+            Me.EnableVisualStyles = true

+            Me.SaveMySettingsOnExit = true

+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses

+        End Sub

+        

+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _

+        Protected Overrides Sub OnCreateMainForm()

+            Me.MainForm = Global.SimpleChat.VB.SimpleChat

+        End Sub

+    End Class

+End Namespace

diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.myapp b/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.myapp
new file mode 100644
index 00000000..890288cc
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-16"?>

+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+  <MySubMain>true</MySubMain>

+  <MainForm>SimpleChat</MainForm>

+  <SingleInstance>false</SingleInstance>

+  <ShutdownMode>0</ShutdownMode>

+  <EnableVisualStyles>true</EnableVisualStyles>

+  <AuthenticationMode>0</AuthenticationMode>

+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>

+</MyApplicationData>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/AssemblyInfo.vb b/mDNSResponder/Clients/SimpleChat.VB/My Project/AssemblyInfo.vb
new file mode 100644
index 00000000..869313ad
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/AssemblyInfo.vb
@@ -0,0 +1,35 @@
+Imports System

+Imports System.Reflection

+Imports System.Runtime.InteropServices

+

+' General Information about an assembly is controlled through the following 

+' set of attributes. Change these attribute values to modify the information

+' associated with an assembly.

+

+' Review the values of the assembly attributes

+

+<Assembly: AssemblyTitle("SimpleChat.VB")> 

+<Assembly: AssemblyDescription("")> 

+<Assembly: AssemblyCompany("Microsoft")> 

+<Assembly: AssemblyProduct("SimpleChat.VB")> 

+<Assembly: AssemblyCopyright("Copyright © Microsoft 2009")> 

+<Assembly: AssemblyTrademark("")> 

+

+<Assembly: ComVisible(False)>

+

+'The following GUID is for the ID of the typelib if this project is exposed to COM

+<Assembly: Guid("a07d7322-054b-4fda-a670-d75f589804c8")> 

+

+' Version information for an assembly consists of the following four values:

+'

+'      Major Version

+'      Minor Version 

+'      Build Number

+'      Revision

+'

+' You can specify all the values or you can default the Build and Revision Numbers 

+' by using the '*' as shown below:

+' <Assembly: AssemblyVersion("1.0.*")> 

+

+<Assembly: AssemblyVersion("1.0.0.0")> 

+<Assembly: AssemblyFileVersion("1.0.0.0")> 

diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.Designer.vb b/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.Designer.vb
new file mode 100644
index 00000000..537826c1
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:4.0.30319.235

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+Imports System

+

+Namespace My.Resources

+    

+    'This class was auto-generated by the StronglyTypedResourceBuilder

+    'class via a tool like ResGen or Visual Studio.

+    'To add or remove a member, edit your .ResX file then rerun ResGen

+    'with the /str option, or rebuild your VS project.

+    '''<summary>

+    '''  A strongly-typed resource class, for looking up localized strings, etc.

+    '''</summary>

+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _

+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _

+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

+    Friend Module Resources

+        

+        Private resourceMan As Global.System.Resources.ResourceManager

+        

+        Private resourceCulture As Global.System.Globalization.CultureInfo

+        

+        '''<summary>

+        '''  Returns the cached ResourceManager instance used by this class.

+        '''</summary>

+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager

+            Get

+                If Object.ReferenceEquals(resourceMan, Nothing) Then

+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SimpleChat.VB.Resources", GetType(Resources).Assembly)

+                    resourceMan = temp

+                End If

+                Return resourceMan

+            End Get

+        End Property

+        

+        '''<summary>

+        '''  Overrides the current thread's CurrentUICulture property for all

+        '''  resource lookups using this strongly typed resource class.

+        '''</summary>

+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+        Friend Property Culture() As Global.System.Globalization.CultureInfo

+            Get

+                Return resourceCulture

+            End Get

+            Set

+                resourceCulture = value

+            End Set

+        End Property

+    End Module

+End Namespace

diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.resx b/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.resx
new file mode 100644
index 00000000..ffecec85
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

+    The primary goals of this format is to allow a simple XML format 

+    that is mostly human readable. The generation and parsing of the 

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

+    ... ado.net/XML headers & schema ...

+    <resheader name="resmimetype">text/microsoft-resx</resheader>

+    <resheader name="version">2.0</resheader>

+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+        <value>[base64 mime encoded serialized .NET Framework object]</value>

+    </data>

+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

+        <comment>This is a comment</comment>

+    </data>

+                

+    There are any number of "resheader" rows that contain simple 

+    name/value pairs.

+    

+    Each data row contains a name, and value. The row also contains a 

+    type or mimetype. Type corresponds to a .NET class that support 

+    text/value conversion through the TypeConverter architecture. 

+    Classes that don't support this are serialized and stored with the 

+    mimetype set.

+    

+    The mimetype is used for serialized objects, and tells the 

+    ResXResourceReader how to depersist the object. This is currently not 

+    extensible. For a given mimetype the value must be set accordingly:

+    

+    Note - application/x-microsoft.net.object.binary.base64 is the format 

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

+    mimetype: application/x-microsoft.net.object.binary.base64

+    value   : The object must be serialized with 

+            : System.Serialization.Formatters.Binary.BinaryFormatter

+            : and then encoded with base64 encoding.

+    

+    mimetype: application/x-microsoft.net.object.soap.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+            : and then encoded with base64 encoding.

+

+    mimetype: application/x-microsoft.net.object.bytearray.base64

+    value   : The object must be serialized into a byte array 

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" />

+              <xsd:attribute name="type" type="xsd:string" />

+              <xsd:attribute name="mimetype" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

+              <xsd:attribute name="alias" type="xsd:string" />

+              <xsd:attribute name="name" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.Designer.vb b/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.Designer.vb
new file mode 100644
index 00000000..54768dd9
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------

+' <auto-generated>

+'     This code was generated by a tool.

+'     Runtime Version:4.0.30319.235

+'

+'     Changes to this file may cause incorrect behavior and will be lost if

+'     the code is regenerated.

+' </auto-generated>

+'------------------------------------------------------------------------------

+

+Option Strict On

+Option Explicit On

+

+

+Namespace My

+    

+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _

+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"),  _

+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _

+    Partial Friend NotInheritable Class MySettings

+        Inherits Global.System.Configuration.ApplicationSettingsBase

+        

+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)

+        

+#Region "My.Settings Auto-Save Functionality"

+#If _MyType = "WindowsForms" Then

+    Private Shared addedHandler As Boolean

+

+    Private Shared addedHandlerLockObject As New Object

+

+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _

+    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)

+        If My.Application.SaveMySettingsOnExit Then

+            My.Settings.Save()

+        End If

+    End Sub

+#End If

+#End Region

+        

+        Public Shared ReadOnly Property [Default]() As MySettings

+            Get

+                

+#If _MyType = "WindowsForms" Then

+               If Not addedHandler Then

+                    SyncLock addedHandlerLockObject

+                        If Not addedHandler Then

+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings

+                            addedHandler = True

+                        End If

+                    End SyncLock

+                End If

+#End If

+                Return defaultInstance

+            End Get

+        End Property

+    End Class

+End Namespace

+

+Namespace My

+    

+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _

+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _

+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _

+    Friend Module MySettingsProperty

+        

+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _

+        Friend ReadOnly Property Settings() As Global.SimpleChat.VB.My.MySettings

+            Get

+                Return Global.SimpleChat.VB.My.MySettings.Default

+            End Get

+        End Property

+    End Module

+End Namespace

diff --git a/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.settings b/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.settings
new file mode 100644
index 00000000..377f56d6
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/My Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>

+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">

+  <Profiles>

+    <Profile Name="(Default)" />

+  </Profiles>

+  <Settings />

+</SettingsFile>

diff --git a/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.Designer.vb b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.Designer.vb
new file mode 100644
index 00000000..4cdc2aa9
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.Designer.vb
@@ -0,0 +1,102 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _

+Partial Class SimpleChat

+    Inherits System.Windows.Forms.Form

+

+    'Form overrides dispose to clean up the component list.

+    <System.Diagnostics.DebuggerNonUserCode()> _

+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)

+        Try

+            If disposing AndAlso components IsNot Nothing Then

+                components.Dispose()

+            End If

+        Finally

+            MyBase.Dispose(disposing)

+        End Try

+    End Sub

+

+    'Required by the Windows Form Designer

+    Private components As System.ComponentModel.IContainer

+

+    'NOTE: The following procedure is required by the Windows Form Designer

+    'It can be modified using the Windows Form Designer.  

+    'Do not modify it using the code editor.

+    <System.Diagnostics.DebuggerStepThrough()> _

+    Private Sub InitializeComponent()

+        Me.TextBox1 = New System.Windows.Forms.TextBox

+        Me.TextBox2 = New System.Windows.Forms.TextBox

+        Me.TalkTo = New System.Windows.Forms.Label

+        Me.ComboBox1 = New System.Windows.Forms.ComboBox

+        Me.Button1 = New System.Windows.Forms.Button

+        Me.SuspendLayout()

+        '

+        'TextBox1

+        '

+        Me.TextBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

+        Me.TextBox1.Location = New System.Drawing.Point(12, 12)

+        Me.TextBox1.Multiline = True

+        Me.TextBox1.Name = "TextBox1"

+        Me.TextBox1.ReadOnly = True

+        Me.TextBox1.Size = New System.Drawing.Size(459, 362)

+        Me.TextBox1.TabIndex = 0

+        '

+        'TextBox2

+        '

+        Me.TextBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _

+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

+        Me.TextBox2.Location = New System.Drawing.Point(13, 431)

+        Me.TextBox2.Name = "TextBox2"

+        Me.TextBox2.Size = New System.Drawing.Size(374, 20)

+        Me.TextBox2.TabIndex = 1

+        '

+        'TalkTo

+        '

+        Me.TalkTo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.TalkTo.AutoSize = True

+        Me.TalkTo.Location = New System.Drawing.Point(13, 395)

+        Me.TalkTo.Name = "TalkTo"

+        Me.TalkTo.Size = New System.Drawing.Size(43, 13)

+        Me.TalkTo.TabIndex = 2

+        Me.TalkTo.Text = "Talk to:"

+        '

+        'ComboBox1

+        '

+        Me.ComboBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)

+        Me.ComboBox1.FormattingEnabled = True

+        Me.ComboBox1.Location = New System.Drawing.Point(63, 392)

+        Me.ComboBox1.Name = "ComboBox1"

+        Me.ComboBox1.Size = New System.Drawing.Size(324, 21)

+        Me.ComboBox1.TabIndex = 3

+        '

+        'Button1

+        '

+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)

+        Me.Button1.Location = New System.Drawing.Point(409, 430)

+        Me.Button1.Name = "Button1"

+        Me.Button1.Size = New System.Drawing.Size(59, 23)

+        Me.Button1.TabIndex = 4

+        Me.Button1.Text = "Send"

+        Me.Button1.UseVisualStyleBackColor = True

+        '

+        'SimpleChat

+        '

+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font

+        Me.ClientSize = New System.Drawing.Size(483, 462)

+        Me.Controls.Add(Me.Button1)

+        Me.Controls.Add(Me.ComboBox1)

+        Me.Controls.Add(Me.TalkTo)

+        Me.Controls.Add(Me.TextBox2)

+        Me.Controls.Add(Me.TextBox1)

+        Me.Name = "SimpleChat"

+        Me.Text = "SimpleChat.VB"

+        Me.ResumeLayout(False)

+        Me.PerformLayout()

+

+    End Sub

+    Friend WithEvents TextBox1 As System.Windows.Forms.TextBox

+    Friend WithEvents TextBox2 As System.Windows.Forms.TextBox

+    Friend WithEvents TalkTo As System.Windows.Forms.Label

+    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox

+    Friend WithEvents Button1 As System.Windows.Forms.Button

+

+End Class

diff --git a/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.VB.vbproj b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.VB.vbproj
new file mode 100644
index 00000000..ee6267c5
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.VB.vbproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{5ACED234-EB98-415E-9974-B54A70789821}</ProjectGuid>

+    <OutputType>WinExe</OutputType>

+    <StartupObject>SimpleChat.VB.My.MyApplication</StartupObject>

+    <RootNamespace>SimpleChat.VB</RootNamespace>

+    <AssemblyName>SimpleChat.VB</AssemblyName>

+    <MyType>WindowsForms</MyType>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>2.0</OldToolsVersion>

+    <UpgradeBackupLocation />

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <DefineDebug>true</DefineDebug>

+    <DefineTrace>true</DefineTrace>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DocumentationFile>SimpleChat.VB.xml</DocumentationFile>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <DefineDebug>false</DefineDebug>

+    <DefineTrace>true</DefineTrace>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DocumentationFile>SimpleChat.VB.xml</DocumentationFile>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Deployment" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Windows.Forms" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Import Include="Microsoft.VisualBasic" />

+    <Import Include="System" />

+    <Import Include="System.Collections" />

+    <Import Include="System.Collections.Generic" />

+    <Import Include="System.Data" />

+    <Import Include="System.Drawing" />

+    <Import Include="System.Diagnostics" />

+    <Import Include="System.Windows.Forms" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="SimpleChat.vb">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="SimpleChat.Designer.vb">

+      <DependentUpon>SimpleChat.vb</DependentUpon>

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="My Project\AssemblyInfo.vb" />

+    <Compile Include="My Project\Application.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Application.myapp</DependentUpon>

+    </Compile>

+    <Compile Include="My Project\Resources.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Resources.resx</DependentUpon>

+    </Compile>

+    <Compile Include="My Project\Settings.Designer.vb">

+      <AutoGen>True</AutoGen>

+      <DependentUpon>Settings.settings</DependentUpon>

+      <DesignTimeSharedInput>True</DesignTimeSharedInput>

+    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="SimpleChat.resx">

+      <SubType>Designer</SubType>

+      <DependentUpon>SimpleChat.vb</DependentUpon>

+    </EmbeddedResource>

+    <EmbeddedResource Include="My Project\Resources.resx">

+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>

+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>

+      <CustomToolNamespace>My.Resources</CustomToolNamespace>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="My Project\Application.myapp">

+      <Generator>MyApplicationCodeGenerator</Generator>

+      <LastGenOutput>Application.Designer.vb</LastGenOutput>

+    </None>

+    <None Include="My Project\Settings.settings">

+      <Generator>SettingsSingleFileGenerator</Generator>

+      <CustomToolNamespace>My</CustomToolNamespace>

+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="Bonjour">

+      <Guid>{18FBED6D-F2B7-4EC8-A4A4-46282E635308}</Guid>

+      <VersionMajor>1</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>tlbimp</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+       Other similar extension points exist, see Microsoft.Common.targets.

+  <Target Name="BeforeBuild">

+  </Target>

+  <Target Name="AfterBuild">

+  </Target>

+  -->

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.resx b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.resx
new file mode 100644
index 00000000..ff31a6db
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+    Microsoft ResX Schema 

+    

+    Version 2.0

+    

+    The primary goals of this format is to allow a simple XML format 

+    that is mostly human readable. The generation and parsing of the 

+    various data types are done through the TypeConverter classes 

+    associated with the data types.

+    

+    Example:

+    

+    ... ado.net/XML headers & schema ...

+    <resheader name="resmimetype">text/microsoft-resx</resheader>

+    <resheader name="version">2.0</resheader>

+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+        <value>[base64 mime encoded serialized .NET Framework object]</value>

+    </data>

+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

+        <comment>This is a comment</comment>

+    </data>

+                

+    There are any number of "resheader" rows that contain simple 

+    name/value pairs.

+    

+    Each data row contains a name, and value. The row also contains a 

+    type or mimetype. Type corresponds to a .NET class that support 

+    text/value conversion through the TypeConverter architecture. 

+    Classes that don't support this are serialized and stored with the 

+    mimetype set.

+    

+    The mimetype is used for serialized objects, and tells the 

+    ResXResourceReader how to depersist the object. This is currently not 

+    extensible. For a given mimetype the value must be set accordingly:

+    

+    Note - application/x-microsoft.net.object.binary.base64 is the format 

+    that the ResXResourceWriter will generate, however the reader can 

+    read any of the formats listed below.

+    

+    mimetype: application/x-microsoft.net.object.binary.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

+            : and then encoded with base64 encoding.

+    

+    mimetype: application/x-microsoft.net.object.soap.base64

+    value   : The object must be serialized with 

+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+            : and then encoded with base64 encoding.

+

+    mimetype: application/x-microsoft.net.object.bytearray.base64

+    value   : The object must be serialized into a byte array 

+            : using a System.ComponentModel.TypeConverter

+            : and then encoded with base64 encoding.

+    -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="metadata">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" />

+              </xsd:sequence>

+              <xsd:attribute name="name" use="required" type="xsd:string" />

+              <xsd:attribute name="type" type="xsd:string" />

+              <xsd:attribute name="mimetype" type="xsd:string" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="assembly">

+            <xsd:complexType>

+              <xsd:attribute name="alias" type="xsd:string" />

+              <xsd:attribute name="name" type="xsd:string" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+              <xsd:attribute ref="xml:space" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>2.0</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+</root>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.vb b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.vb
new file mode 100644
index 00000000..dae62f38
--- /dev/null
+++ b/mDNSResponder/Clients/SimpleChat.VB/SimpleChat.vb
@@ -0,0 +1,157 @@
+'
+' Copyright (c) 2010 Apple Inc. All rights reserved.
+'
+' Licensed under the Apache License, Version 2.0 (the "License");
+' you may not use this file except in compliance with the License.
+' You may obtain a copy of the License at
+' 
+'     http://www.apache.org/licenses/LICENSE-2.0
+' 
+' Unless required by applicable law or agreed to in writing, software
+' distributed under the License is distributed on an "AS IS" BASIS,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+' See the License for the specific language governing permissions and
+' limitations under the License.
+'
+
+Imports System.Net
+Imports System.Net.Sockets
+Imports System.Data
+Imports System.Text
+
+Public Class SimpleChat
+	'
+	' Associate Bonjour events with event handlers
+	'
+    Public WithEvents MyEventManager As New Bonjour.DNSSDEventManager
+    Private m_service As New Bonjour.DNSSDService
+    Private m_registrar As Bonjour.DNSSDService
+    Private m_browser As Bonjour.DNSSDService
+    Private m_resolver As Bonjour.DNSSDService
+    Private m_socket As New Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
+    Private m_port As Integer
+    Private m_buffer(1024 * 32) As Byte
+    Private m_async As IAsyncResult
+    Public Delegate Sub SocketDelegate(ByVal msg As String)
+    Private m_socketDelegate As SocketDelegate
+    Private m_name As String
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        Button1.Enabled = False
+
+        m_socketDelegate = New SocketDelegate(AddressOf MessageReceived)
+
+        Dim endPoint As New IPEndPoint(IPAddress.Any, 0)
+        m_socket.Bind(endPoint)
+        endPoint = m_socket.LocalEndPoint
+        m_port = endPoint.Port
+
+        Dim txtRecord As Bonjour.TXTRecord
+        m_async = m_socket.BeginReceive(m_buffer, 0, m_buffer.Length, SocketFlags.Partial, New AsyncCallback(AddressOf OnReceive), Me)
+        m_registrar = m_service.Register(0, 0, Environment.UserName, "_p2pchat._udp", vbNullString, vbNullString, m_port, txtRecord, MyEventManager)
+    End Sub
+
+	'
+	' Called when Bonjour core finished registering a service successfully
+	'
+    Public Sub MyEventManager_ServiceRegistered(ByVal registrar As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal name As String, ByVal regType As String, ByVal domain As String) Handles MyEventManager.ServiceRegistered
+        m_name = name
+        m_browser = m_service.Browse(0, 0, regType, vbNullString, MyEventManager)
+    End Sub
+
+	'
+	' Called when a service is found
+	'
+    Public Sub MyEventManager_ServiceFound(ByVal browser As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal serviceName As String, ByVal regtype As String, ByVal domain As String) Handles MyEventManager.ServiceFound
+        If (serviceName <> m_name) Then
+            Dim peer As PeerData = New PeerData
+            peer.InterfaceIndex = ifIndex
+            peer.Name = serviceName
+            peer.Type = regtype
+            peer.Domain = domain
+            ComboBox1.Items.Add(peer)
+            ComboBox1.SelectedIndex = 0
+        End If
+    End Sub
+
+	'
+	' Called when a service is lost
+	'
+    Public Sub MyEventManager_ServiceLost(ByVal browser As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal serviceName As String, ByVal regtype As String, ByVal domain As String) Handles MyEventManager.ServiceLost
+        ComboBox1.Items.Remove(serviceName)
+    End Sub
+
+	'
+	' Called when a service is resolved
+	'
+    Public Sub MyEventManager_ServiceResolved(ByVal resolver As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal fullname As String, ByVal hostname As String, ByVal port As UShort, ByVal record As Bonjour.TXTRecord) Handles MyEventManager.ServiceResolved
+        m_resolver.Stop()
+        Dim peer As PeerData = ComboBox1.SelectedItem
+        peer.Port = port
+        m_resolver = m_service.QueryRecord(0, ifIndex, hostname, Bonjour.DNSSDRRType.kDNSSDType_A, Bonjour.DNSSDRRClass.kDNSSDClass_IN, MyEventManager)
+    End Sub
+
+    Public Sub MyEventManager_QueryAnswered(ByVal resolver As Bonjour.DNSSDService, ByVal flags As Bonjour.DNSSDFlags, ByVal ifIndex As UInteger, ByVal fullName As String, ByVal rrtype As Bonjour.DNSSDRRType, ByVal rrclass As Bonjour.DNSSDRRClass, ByVal rdata As Object, ByVal ttl As UInteger) Handles MyEventManager.QueryRecordAnswered
+        m_resolver.Stop()
+        Dim peer As PeerData = ComboBox1.SelectedItem
+        Dim bits As UInteger = BitConverter.ToUInt32(rdata, 0)
+        Dim address As IPAddress = New System.Net.IPAddress(bits)
+        peer.Address = address
+    End Sub
+
+    Public Sub MyEventManager_OperationFailed(ByVal registrar As Bonjour.DNSSDService, ByVal errorCode As Bonjour.DNSSDError) Handles MyEventManager.OperationFailed
+        MessageBox.Show("Operation failed error code: " + errorCode)
+    End Sub
+
+    Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button1.Click
+        Dim peer As PeerData = ComboBox1.SelectedItem
+        Dim message As String = m_name + ": " + TextBox2.Text
+        Dim bytes As Byte() = Encoding.UTF8.GetBytes(message)
+        Dim endPoint As IPEndPoint = New IPEndPoint(peer.Address, peer.Port)
+        m_socket.SendTo(bytes, 0, bytes.Length, 0, endPoint)
+        TextBox1.AppendText(TextBox2.Text + Environment.NewLine)
+        TextBox2.Text = ""
+    End Sub
+
+    Private Sub ComboBox1_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ComboBox1.SelectedIndexChanged
+        Dim peer As PeerData = ComboBox1.SelectedItem
+        m_resolver = m_service.Resolve(0, peer.InterfaceIndex, peer.Name, peer.Type, peer.Domain, MyEventManager)
+    End Sub
+    Private Sub TextBox2_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TextBox2.TextChanged
+        Dim peer As PeerData = ComboBox1.SelectedItem
+        If ((peer.Address IsNot Nothing) And TextBox2.Text.Length > 0) Then
+            Button1.Enabled = True
+        Else
+            Button1.Enabled = False
+        End If
+    End Sub
+    Public Sub MessageReceived(ByVal msg As System.String)
+        TextBox1.AppendText(msg)
+    End Sub
+    Private Sub OnReceive(ByVal ar As IAsyncResult)
+        Dim bytesReceived As Integer = m_socket.EndReceive(ar)
+        If (bytesReceived > 0) Then
+            Dim msg As String = Encoding.UTF8.GetString(m_buffer, 0, bytesReceived)
+            Me.Invoke(m_socketDelegate, msg)
+        End If
+        m_async = m_socket.BeginReceive(m_buffer, 0, m_buffer.Length, SocketFlags.Partial, New AsyncCallback(AddressOf OnReceive), Me)
+    End Sub
+End Class
+
+Public Class PeerData
+    Public InterfaceIndex As UInteger
+    Public Name As String
+    Public Type As String
+    Public Domain As String
+    Public Address As IPAddress
+    Public Port As UShort
+
+    Overrides Function ToString() As String
+        Return Name
+    End Function
+End Class
diff --git a/mDNSResponder/Clients/dns-sd.c b/mDNSResponder/Clients/dns-sd.c
new file mode 100644
index 00000000..8d5e75fe
--- /dev/null
+++ b/mDNSResponder/Clients/dns-sd.c
@@ -0,0 +1,1815 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Inc. All rights reserved.
+ *
+ * Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+ * ("Apple") in consideration of your agreement to the following terms, and your
+ * use, installation, modification or redistribution of this Apple software
+ * constitutes acceptance of these terms.  If you do not agree with these terms,
+ * please do not use, install, modify or redistribute this Apple software.
+ *
+ * In consideration of your agreement to abide by the following terms, and subject
+ * to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ * copyrights in this original Apple software (the "Apple Software"), to use,
+ * reproduce, modify and redistribute the Apple Software, with or without
+ * modifications, in source and/or binary forms; provided that if you redistribute
+ * the Apple Software in its entirety and without modifications, you must retain
+ * this notice and the following text and disclaimers in all such redistributions of
+ * the Apple Software.  Neither the name, trademarks, service marks or logos of
+ * Apple Computer, Inc. may be used to endorse or promote products derived from the
+ * Apple Software without specific prior written permission from Apple.  Except as
+ * expressly stated in this notice, no other rights or licenses, express or implied,
+ * are granted by Apple herein, including but not limited to any patent rights that
+ * may be infringed by your derivative works or by other works in which the Apple
+ * Software may be incorporated.
+ *
+ * The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ * WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ * COMBINATION WITH YOUR PRODUCTS.
+ *
+ * IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ * OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ * (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+   To build this tool, copy and paste the following into a command line:
+
+   OS X:
+   gcc dns-sd.c -o dns-sd
+
+   POSIX systems:
+   gcc dns-sd.c -o dns-sd -I../mDNSShared -ldns_sd
+
+   Windows:
+   cl dns-sd.c -I../mDNSShared -DNOT_HAVE_GETOPT ws2_32.lib ..\mDNSWindows\DLL\Release\dnssd.lib
+   (may require that you run a Visual Studio script such as vsvars32.bat first)
+ */
+
+// For testing changes to dnssd_clientstub.c, uncomment this line and the code will be compiled
+// with an embedded copy of the client stub instead of linking the system library version at runtime.
+// This also useful to work around link errors when you're working on an older version of Mac OS X,
+// and trying to build a newer version of the "dns-sd" command which uses new API entry points that
+// aren't in the system's /usr/lib/libSystem.dylib.
+//#define TEST_NEW_CLIENTSTUB 1
+
+// When building mDNSResponder for Mac OS X 10.4 and earlier, /usr/lib/libSystem.dylib is built using its own private
+// copy of dnssd_clientstub.c, which is old and doesn't have all the entry points defined in the latest version, so
+// when we're building dns-sd.c on Mac OS X 10.4 or earlier, we automatically set TEST_NEW_CLIENTSTUB so that we'll
+// embed a copy of the latest dnssd_clientstub.c instead of trying to link to the incomplete version in libSystem.dylib
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ <= 1040
+#define TEST_NEW_CLIENTSTUB 1
+#endif
+
+#include <ctype.h>
+#include <stdio.h>          // For stdout, stderr
+#include <stdlib.h>         // For exit()
+#include <string.h>         // For strlen(), strcpy()
+#include <errno.h>          // For errno, EINTR
+#include <time.h>
+#include <sys/types.h>      // For u_char
+
+#ifdef _WIN32
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+    #include <Iphlpapi.h>
+    #include <process.h>
+typedef int pid_t;
+    #define getpid     _getpid
+    #define strcasecmp _stricmp
+    #define snprintf   _snprintf
+static const char kFilePathSep = '\\';
+    #ifndef HeapEnableTerminationOnCorruption
+    #     define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
+    #endif
+    #if !defined(IFNAMSIZ)
+     #define IFNAMSIZ 16
+    #endif
+    #define if_nametoindex if_nametoindex_win
+    #define if_indextoname if_indextoname_win
+
+typedef PCHAR (WINAPI * if_indextoname_funcptr_t)(ULONG index, PCHAR name);
+typedef ULONG (WINAPI * if_nametoindex_funcptr_t)(PCSTR name);
+
+unsigned if_nametoindex_win(const char *ifname)
+{
+    HMODULE library;
+    unsigned index = 0;
+
+    // Try and load the IP helper library dll
+    if ((library = LoadLibrary(TEXT("Iphlpapi")) ) != NULL )
+    {
+        if_nametoindex_funcptr_t if_nametoindex_funcptr;
+
+        // On Vista and above there is a Posix like implementation of if_nametoindex
+        if ((if_nametoindex_funcptr = (if_nametoindex_funcptr_t) GetProcAddress(library, "if_nametoindex")) != NULL )
+        {
+            index = if_nametoindex_funcptr(ifname);
+        }
+
+        FreeLibrary(library);
+    }
+
+    return index;
+}
+
+char * if_indextoname_win( unsigned ifindex, char *ifname)
+{
+    HMODULE library;
+    char * name = NULL;
+
+    // Try and load the IP helper library dll
+    if ((library = LoadLibrary(TEXT("Iphlpapi")) ) != NULL )
+    {
+        if_indextoname_funcptr_t if_indextoname_funcptr;
+
+        // On Vista and above there is a Posix like implementation of if_indextoname
+        if ((if_indextoname_funcptr = (if_indextoname_funcptr_t) GetProcAddress(library, "if_indextoname")) != NULL )
+        {
+            name = if_indextoname_funcptr(ifindex, ifname);
+        }
+
+        FreeLibrary(library);
+    }
+
+    return name;
+}
+
+static size_t _sa_len(const struct sockaddr *addr)
+{
+    if (addr->sa_family == AF_INET) return (sizeof(struct sockaddr_in));
+    else if (addr->sa_family == AF_INET6) return (sizeof(struct sockaddr_in6));
+    else return (sizeof(struct sockaddr));
+}
+
+#   define SA_LEN(addr) (_sa_len(addr))
+
+#else
+    #include <unistd.h>         // For getopt() and optind
+    #include <netdb.h>          // For getaddrinfo()
+    #include <sys/time.h>       // For struct timeval
+    #include <sys/socket.h>     // For AF_INET
+    #include <netinet/in.h>     // For struct sockaddr_in()
+    #include <arpa/inet.h>      // For inet_addr()
+    #include <net/if.h>         // For if_nametoindex()
+static const char kFilePathSep = '/';
+// #ifndef NOT_HAVE_SA_LEN
+//  #define SA_LEN(addr) ((addr)->sa_len)
+// #else
+    #define SA_LEN(addr) (((addr)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
+// #endif
+#endif
+
+#if (TEST_NEW_CLIENTSTUB && !defined(__APPLE_API_PRIVATE))
+#define __APPLE_API_PRIVATE 1
+#endif
+
+// DNSServiceSetDispatchQueue is not supported on 10.6 & prior
+#if !TEST_NEW_CLIENTSTUB && defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ % 10) <= 1060)
+#undef _DNS_SD_LIBDISPATCH
+#endif
+#include "dns_sd.h"
+#include "ClientCommon.h"
+
+#if TEST_NEW_CLIENTSTUB
+#include "../mDNSShared/dnssd_ipc.c"
+#include "../mDNSShared/dnssd_clientlib.c"
+#include "../mDNSShared/dnssd_clientstub.c"
+#endif
+
+#if _DNS_SD_LIBDISPATCH
+#include <dispatch/private.h>
+#endif
+
+// The "+0" is to cope with the case where _DNS_SD_H is defined but empty (e.g. on Mac OS X 10.4 and earlier)
+#if _DNS_SD_H+0 >= 116
+#define HAS_NAT_PMP_API 1
+#define HAS_ADDRINFO_API 1
+#else
+#define kDNSServiceFlagsReturnIntermediates 0
+#endif
+
+//*************************************************************************************************************
+// Globals
+
+#define DS_FIXED_SIZE   4
+typedef struct
+{
+    unsigned short keyTag;
+    unsigned char alg; 
+    unsigned char digestType;
+    unsigned char  *digest;
+} rdataDS;
+
+#define DNSKEY_FIXED_SIZE    4
+typedef struct
+{
+    unsigned short flags;
+    unsigned char proto;
+    unsigned char alg;
+    unsigned char *data;
+} rdataDNSKey;
+
+//size of rdataRRSIG excluding signerName and signature (which are variable fields) 
+#define RRSIG_FIXED_SIZE      18
+typedef struct
+{
+    unsigned short typeCovered;
+    unsigned char alg; 
+    unsigned char labels;
+    unsigned int origTTL;
+    unsigned int sigExpireTime;
+    unsigned int sigInceptTime;
+    unsigned short keyTag;
+    char signerName[256];
+    //unsigned char *signature
+} rdataRRSig;
+
+#define RR_TYPE_SIZE 16
+
+typedef union { unsigned char b[2]; unsigned short NotAnInteger; } Opaque16;
+
+static int operation;
+static uint32_t opinterface = kDNSServiceInterfaceIndexAny;
+static DNSServiceRef client    = NULL;
+static DNSServiceRef client_pa = NULL;  // DNSServiceRef for RegisterProxyAddressRecord
+static DNSServiceRef sc1, sc2, sc3;     // DNSServiceRefs for kDNSServiceFlagsShareConnection testing
+
+static int num_printed;
+static char addtest = 0;
+static DNSRecordRef record = NULL;
+static char myhinfoW[14] = "\002PC\012Windows XP";
+static char myhinfoX[ 9] = "\003Mac\004OS X";
+static char updatetest[3] = "\002AA";
+static char bigNULL[8192];  // 8K is maximum rdata we support
+
+#if _DNS_SD_LIBDISPATCH
+dispatch_queue_t main_queue;
+dispatch_source_t timer_source;
+#endif
+
+// Note: the select() implementation on Windows (Winsock2) fails with any timeout much larger than this
+#define LONG_TIME 100000000
+
+static volatile int stopNow = 0;
+static volatile int timeOut = LONG_TIME;
+
+#if _DNS_SD_LIBDISPATCH
+#define EXIT_IF_LIBDISPATCH_FATAL_ERROR(E) \
+    if (main_queue && (E) == kDNSServiceErr_ServiceNotRunning) { fprintf(stderr, "Error code %d\n", (E)); exit(0); }
+#else
+#define EXIT_IF_LIBDISPATCH_FATAL_ERROR(E)
+#endif
+
+//*************************************************************************************************************
+// Supporting Utility Functions
+static uint16_t GetRRClass(const char *s)   
+{
+    if (!strcasecmp(s, "IN")) 
+        return kDNSServiceClass_IN;
+    else
+        return(atoi(s));
+}     
+
+static uint16_t GetRRType(const char *s)
+{
+    if      (!strcasecmp(s, "A"       )) return(kDNSServiceType_A);
+    else if (!strcasecmp(s, "NS"      )) return(kDNSServiceType_NS);
+    else if (!strcasecmp(s, "MD"      )) return(kDNSServiceType_MD);
+    else if (!strcasecmp(s, "MF"      )) return(kDNSServiceType_MF);
+    else if (!strcasecmp(s, "CNAME"   )) return(kDNSServiceType_CNAME);
+    else if (!strcasecmp(s, "SOA"     )) return(kDNSServiceType_SOA);
+    else if (!strcasecmp(s, "MB"      )) return(kDNSServiceType_MB);
+    else if (!strcasecmp(s, "MG"      )) return(kDNSServiceType_MG);
+    else if (!strcasecmp(s, "MR"      )) return(kDNSServiceType_MR);
+    else if (!strcasecmp(s, "NULL"    )) return(kDNSServiceType_NULL);
+    else if (!strcasecmp(s, "WKS"     )) return(kDNSServiceType_WKS);
+    else if (!strcasecmp(s, "PTR"     )) return(kDNSServiceType_PTR);
+    else if (!strcasecmp(s, "HINFO"   )) return(kDNSServiceType_HINFO);
+    else if (!strcasecmp(s, "MINFO"   )) return(kDNSServiceType_MINFO);
+    else if (!strcasecmp(s, "MX"      )) return(kDNSServiceType_MX);
+    else if (!strcasecmp(s, "TXT"     )) return(kDNSServiceType_TXT);
+    else if (!strcasecmp(s, "RP"      )) return(kDNSServiceType_RP);
+    else if (!strcasecmp(s, "AFSDB"   )) return(kDNSServiceType_AFSDB);
+    else if (!strcasecmp(s, "X25"     )) return(kDNSServiceType_X25);
+    else if (!strcasecmp(s, "ISDN"    )) return(kDNSServiceType_ISDN);
+    else if (!strcasecmp(s, "RT"      )) return(kDNSServiceType_RT);
+    else if (!strcasecmp(s, "NSAP"    )) return(kDNSServiceType_NSAP);
+    else if (!strcasecmp(s, "NSAP_PTR")) return(kDNSServiceType_NSAP_PTR);
+    else if (!strcasecmp(s, "SIG"     )) return(kDNSServiceType_SIG);
+    else if (!strcasecmp(s, "KEY"     )) return(kDNSServiceType_KEY);
+    else if (!strcasecmp(s, "PX"      )) return(kDNSServiceType_PX);
+    else if (!strcasecmp(s, "GPOS"    )) return(kDNSServiceType_GPOS);
+    else if (!strcasecmp(s, "AAAA"    )) return(kDNSServiceType_AAAA);
+    else if (!strcasecmp(s, "LOC"     )) return(kDNSServiceType_LOC);
+    else if (!strcasecmp(s, "NXT"     )) return(kDNSServiceType_NXT);
+    else if (!strcasecmp(s, "EID"     )) return(kDNSServiceType_EID);
+    else if (!strcasecmp(s, "NIMLOC"  )) return(kDNSServiceType_NIMLOC);
+    else if (!strcasecmp(s, "SRV"     )) return(kDNSServiceType_SRV);
+    else if (!strcasecmp(s, "ATMA"    )) return(kDNSServiceType_ATMA);
+    else if (!strcasecmp(s, "NAPTR"   )) return(kDNSServiceType_NAPTR);
+    else if (!strcasecmp(s, "KX"      )) return(kDNSServiceType_KX);
+    else if (!strcasecmp(s, "CERT"    )) return(kDNSServiceType_CERT);
+    else if (!strcasecmp(s, "A6"      )) return(kDNSServiceType_A6);
+    else if (!strcasecmp(s, "DNAME"   )) return(kDNSServiceType_DNAME);
+    else if (!strcasecmp(s, "SINK"    )) return(kDNSServiceType_SINK);
+    else if (!strcasecmp(s, "OPT"     )) return(kDNSServiceType_OPT);
+    else if (!strcasecmp(s, "TKEY"    )) return(kDNSServiceType_TKEY);
+    else if (!strcasecmp(s, "TSIG"    )) return(kDNSServiceType_TSIG);
+    else if (!strcasecmp(s, "IXFR"    )) return(kDNSServiceType_IXFR);
+    else if (!strcasecmp(s, "AXFR"    )) return(kDNSServiceType_AXFR);
+    else if (!strcasecmp(s, "MAILB"   )) return(kDNSServiceType_MAILB);
+    else if (!strcasecmp(s, "MAILA"   )) return(kDNSServiceType_MAILA);
+    else if (!strcasecmp(s, "dnskey"  )) return(kDNSServiceType_DNSKEY);
+    else if (!strcasecmp(s, "ds"      )) return(kDNSServiceType_DS);
+    else if (!strcasecmp(s, "rrsig"   )) return(kDNSServiceType_RRSIG);
+    else if (!strcasecmp(s, "nsec"    )) return(kDNSServiceType_NSEC);
+    else if (!strcasecmp(s, "ANY"     )) return(kDNSServiceType_ANY);
+    else return(atoi(s));
+}
+
+static char *DNSTypeName(unsigned short rr_type)
+{
+    switch (rr_type)
+    {
+        case kDNSServiceType_A:         return("Addr");
+        case kDNSServiceType_NS:        return("NS");
+        case kDNSServiceType_MX:        return("MX");
+        case kDNSServiceType_CNAME:     return("CNAME");
+        case kDNSServiceType_SOA:       return("SOA");
+        case kDNSServiceType_PTR:       return("PTR");
+        case kDNSServiceType_AAAA:      return("AAAA");
+        case kDNSServiceType_NSEC:      return("NSEC");
+        case kDNSServiceType_TSIG:      return("TSIG");
+        case kDNSServiceType_RRSIG:     return("RRSIG");
+        case kDNSServiceType_DNSKEY:    return("DNSKEY");
+        case kDNSServiceType_DS:        return("DS");
+        default:            
+        {
+            static char buffer[RR_TYPE_SIZE];
+            snprintf(buffer, sizeof(buffer), "TYPE%d", rr_type);
+            return(buffer);
+        }
+    }
+}
+
+static unsigned short swap16(unsigned short x)
+{
+    unsigned char *ptr = (unsigned char *)&x;
+    return (unsigned short)((unsigned short)ptr[0] << 8 | ptr[1]);
+}
+
+static unsigned int swap32(unsigned int x) 
+{
+    unsigned char *ptr = (unsigned char *)&x;
+    return (unsigned int)((unsigned int)ptr[0] << 24 | (unsigned int)ptr[1] << 16 | (unsigned int)ptr[2] << 8 | ptr[3]);
+}
+static unsigned int keytag(unsigned char *key, unsigned int keysize)  
+{
+    unsigned long ac;
+    unsigned int i;
+
+    for (ac = 0, i = 0; i < keysize; ++i)
+        ac += (i & 1) ? key[i] : key[i] << 8;
+    ac += (ac >> 16) & 0xFFFF;
+    return ac & 0xFFFF;
+}
+
+static void base64Encode(char *buffer, int buflen, void *rdata, unsigned int rdlen)
+{
+#if _DNS_SD_LIBDISPATCH
+    const void *result = NULL;
+    size_t size;
+    dispatch_data_t src_data = NULL, dest_data = NULL, null_str = NULL, data = NULL, map = NULL;
+
+    src_data = dispatch_data_create(rdata, rdlen, dispatch_get_global_queue(0, 0), ^{});
+    if (!src_data)
+        goto done;
+
+    dest_data = dispatch_data_create_with_transform(src_data, DISPATCH_DATA_FORMAT_TYPE_NONE, DISPATCH_DATA_FORMAT_TYPE_BASE64);
+    if (!dest_data)
+        goto done;
+
+    null_str = dispatch_data_create("", 1, dispatch_get_global_queue(0, 0), ^{});
+    if (!null_str)
+        goto done;
+ 
+    data = dispatch_data_create_concat(dest_data, null_str);
+    if (!data)
+        goto done;    
+
+    map = dispatch_data_create_map(data, &result, &size);    
+    if (!map)
+        goto done;
+
+    snprintf(buffer, buflen, " %s", (char *)result);
+    
+done:
+    if (src_data) dispatch_release(src_data);
+    if (dest_data) dispatch_release(dest_data);
+    if (data)     dispatch_release(data);
+    if (null_str) dispatch_release(null_str);
+    if (map)      dispatch_release(map);
+    return;
+#else  //_DNS_SD_LIBDISPATCH
+    snprintf(buffer, buflen, " %s", ".");
+    return;
+#endif //_DNS_SD_LIBDISPATCH 
+}
+
+#if HAS_NAT_PMP_API | HAS_ADDRINFO_API
+static DNSServiceProtocol GetProtocol(const char *s)
+{
+    if      (!strcasecmp(s, "v4"      )) return(kDNSServiceProtocol_IPv4);
+    else if (!strcasecmp(s, "v6"      )) return(kDNSServiceProtocol_IPv6);
+    else if (!strcasecmp(s, "v4v6"    )) return(kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6);
+    else if (!strcasecmp(s, "v6v4"    )) return(kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6);
+    else if (!strcasecmp(s, "udp"     )) return(kDNSServiceProtocol_UDP);
+    else if (!strcasecmp(s, "tcp"     )) return(kDNSServiceProtocol_TCP);
+    else if (!strcasecmp(s, "udptcp"  )) return(kDNSServiceProtocol_UDP | kDNSServiceProtocol_TCP);
+    else if (!strcasecmp(s, "tcpudp"  )) return(kDNSServiceProtocol_UDP | kDNSServiceProtocol_TCP);
+    else return(atoi(s));
+}
+#endif
+
+
+//*************************************************************************************************************
+// Sample callback functions for each of the operation types
+
+static void printtimestamp(void)
+{
+    struct tm tm;
+    int ms;
+    static char date[16];
+    static char new_date[16];
+#ifdef _WIN32
+    SYSTEMTIME sysTime;
+    time_t uct = time(NULL);
+    tm = *localtime(&uct);
+    GetLocalTime(&sysTime);
+    ms = sysTime.wMilliseconds;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    localtime_r((time_t*)&tv.tv_sec, &tm);
+    ms = tv.tv_usec/1000;
+#endif
+    strftime(new_date, sizeof(new_date), "%a %d %b %Y", &tm);
+    if (strncmp(date, new_date, sizeof(new_date)))
+    {
+        printf("DATE: ---%s---\n", new_date); //display date only if it has changed
+        strncpy(date, new_date, sizeof(date));
+    }
+    printf("%2d:%02d:%02d.%03d  ", tm.tm_hour, tm.tm_min, tm.tm_sec, ms);
+}
+
+// formating time to RFC 4034 format
+static void FormatTime(unsigned long te, unsigned char *buf, int bufsize) 
+{
+    struct tm tmTime;
+#ifdef _WIN32
+	__time32_t t = (__time32_t) te;
+	_gmtime32_s(&tmTime, &t);
+#else
+    // Time since epoch : strftime takes "tm". Convert seconds to "tm" using
+    // gmtime_r first and then use strftime
+	time_t t = (time_t)te;
+	gmtime_r(&t, &tmTime);
+#endif
+    strftime((char *)buf, bufsize, "%Y%m%d%H%M%S", &tmTime);
+}
+
+static void print_usage(const char *arg0, int print_all)
+{
+    fprintf(stderr, "%s -E                              (Enumerate recommended registration domains)\n", arg0);
+    fprintf(stderr, "%s -F                                  (Enumerate recommended browsing domains)\n", arg0);
+    fprintf(stderr, "%s -R <Name> <Type> <Domain> <Port> [<TXT>...]             (Register a service)\n", arg0);
+    fprintf(stderr, "%s -B        <Type> <Domain>                    (Browse for services instances)\n", arg0);
+    fprintf(stderr, "%s -L <Name> <Type> <Domain>                       (Look up a service instance)\n", arg0);
+    fprintf(stderr, "%s -P <Name> <Type> <Domain> <Port> <Host> <IP> [<TXT>...]              (Proxy)\n", arg0);
+    fprintf(stderr, "%s -q <name> <rrtype> <rrclass>             (Generic query for any record type)\n", arg0);
+    fprintf(stderr, "%s -D <name> <rrtype> <rrclass>(Validate query for any record type with DNSSEC)\n", arg0);
+    fprintf(stderr, "%s -Z        <Type> <Domain>               (Output results in Zone File format)\n", arg0);
+#if HAS_ADDRINFO_API
+    fprintf(stderr, "%s -G     v4/v6/v4v6 <name>              (Get address information for hostname)\n", arg0);
+    fprintf(stderr, "%s -g v4/v6/v4v6 <name>        (Validate address info for hostname with DNSSEC)\n", arg0);
+#endif
+    fprintf(stderr, "%s -V                (Get version of currently running daemon / system service)\n", arg0);
+
+    if (print_all)  //Print all available options for dns-sd tool
+    {
+        fprintf(stderr, "%s -C <FQDN> <rrtype> <rrclass>               (Query; reconfirming each result)\n", arg0);
+#if HAS_NAT_PMP_API
+        fprintf(stderr, "%s -X udp/tcp/udptcp <IntPort> <ExtPort> <TTL>               (NAT Port Mapping)\n", arg0);
+#endif
+        fprintf(stderr, "%s -A                                  (Test Adding/Updating/Deleting a record)\n", arg0);
+        fprintf(stderr, "%s -U                                              (Test updating a TXT record)\n", arg0);
+        fprintf(stderr, "%s -N                                         (Test adding a large NULL record)\n", arg0);
+        fprintf(stderr, "%s -T                                        (Test creating a large TXT record)\n", arg0);
+        fprintf(stderr, "%s -M                  (Test creating a registration with multiple TXT records)\n", arg0);
+        fprintf(stderr, "%s -I               (Test registering and then immediately updating TXT record)\n", arg0);
+        fprintf(stderr, "%s -S                             (Test multiple operations on a shared socket)\n", arg0);
+        fprintf(stderr, "%s -i <Interface>             (Run dns-sd cmd on a specific interface (en0/en1)\n", arg0);
+        fprintf(stderr, "%s -lo                              (Run dns-sd cmd using local only interface)\n", arg0);
+        fprintf(stderr, "%s -p2p                                      (Use kDNSServiceInterfaceIndexP2P)\n", arg0);
+        fprintf(stderr, "%s -includep2p                            (Set kDNSServiceFlagsIncludeP2P flag)\n", arg0);
+        fprintf(stderr, "%s -includeAWDL                          (Set kDNSServiceFlagsIncludeAWDL flag)\n", arg0);
+        fprintf(stderr, "%s -optional                        (Set kDNSServiceFlagsValidateOptional flag)\n", arg0);
+        fprintf(stderr, "%s -tc                        (Set kDNSServiceFlagsBackgroundTrafficClass flag)\n", arg0);
+        fprintf(stderr, "%s -unicastResponse                  (Set kDNSServiceFlagsUnicastResponse flag)\n", arg0);
+        fprintf(stderr, "%s -t1                                  (Set kDNSServiceFlagsThresholdOne flag)\n", arg0);
+        fprintf(stderr, "%s -tFinder                          (Set kDNSServiceFlagsThresholdFinder flag)\n", arg0);
+        fprintf(stderr, "%s -timeout                                  (Set kDNSServiceFlagsTimeout flag)\n", arg0);
+    }
+}
+
+#define DomainMsg(X) (((X) &kDNSServiceFlagsDefault) ? "(Default)" : \
+                      ((X) &kDNSServiceFlagsAdd)     ? "Added"     : "Removed")
+
+#define MAX_LABELS 128
+
+static void DNSSD_API enum_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex,
+                                 DNSServiceErrorType errorCode, const char *replyDomain, void *context)
+{
+    DNSServiceFlags partialflags = flags & ~(kDNSServiceFlagsMoreComing | kDNSServiceFlagsAdd | kDNSServiceFlagsDefault);
+    int labels = 0, depth = 0, i, initial = 0;
+    char text[64];
+    const char *label[MAX_LABELS];
+
+    (void)sdref;        // Unused
+    (void)ifIndex;      // Unused
+    (void)context;      // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    // 1. Print the header
+    if (num_printed++ == 0) printf("Timestamp     Recommended %s domain\n", operation == 'E' ? "Registration" : "Browsing");
+    printtimestamp();
+    if (errorCode)
+        printf("Error code %d\n", errorCode);
+    else if (!*replyDomain)
+        printf("Error: No reply domain\n");
+    else
+    {
+        printf("%-10s", DomainMsg(flags));
+        printf("%-8s", (flags & kDNSServiceFlagsMoreComing) ? "(More)" : "");
+        if (partialflags) printf("Flags: %4X  ", partialflags);
+        else printf("             ");
+
+        // 2. Count the labels
+        while (replyDomain && *replyDomain && labels < MAX_LABELS)
+        {
+            label[labels++] = replyDomain;
+            replyDomain = GetNextLabel(replyDomain, text);
+        }
+
+        // 3. Decide if we're going to clump the last two or three labels (e.g. "apple.com", or "nicta.com.au")
+        if      (labels >= 3 && replyDomain - label[labels-1] <= 3 && label[labels-1] - label[labels-2] <= 4) initial = 3;
+        else if (labels >= 2 && replyDomain - label[labels-1] <= 4) initial = 2;
+        else initial = 1;
+        labels -= initial;
+
+        // 4. Print the initial one-, two- or three-label clump
+        for (i=0; i<initial; i++)
+        {
+            GetNextLabel(label[labels+i], text);
+            if (i>0) printf(".");
+            printf("%s", text);
+        }
+        printf("\n");
+
+        // 5. Print the remainder of the hierarchy
+        for (depth=0; depth<labels; depth++)
+        {
+            printf("                                             ");
+            for (i=0; i<=depth; i++) printf("- ");
+            GetNextLabel(label[labels-1-depth], text);
+            printf("> %s\n", text);
+        }
+    }
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+
+static int CopyLabels(char *dst, const char *lim, const char **srcp, int labels)
+{
+    const char *src = *srcp;
+    while (*src != '.' || --labels > 0)
+    {
+        if (*src == '\\') *dst++ = *src++;  // Make sure "\." doesn't confuse us
+        if (!*src || dst >= lim) return -1;
+        *dst++ = *src++;
+        if (!*src || dst >= lim) return -1;
+    }
+    *dst++ = 0;
+    *srcp = src + 1;    // skip over final dot
+    return 0;
+}
+
+static void DNSSD_API zonedata_resolve(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
+                                       const char *fullname, const char *hosttarget, uint16_t opaqueport, uint16_t txtLen, const unsigned char *txt, void *context)
+{
+    union { uint16_t s; u_char b[2]; } port = { opaqueport };
+    uint16_t PortAsNumber = ((uint16_t)port.b[0]) << 8 | port.b[1];
+
+    const char *p = fullname;
+    char n[kDNSServiceMaxDomainName];
+    char t[kDNSServiceMaxDomainName];
+
+    const unsigned char *max = txt + txtLen;
+
+    (void)sdref;        // Unused
+    (void)ifIndex;      // Unused
+    (void)context;      // Unused
+
+    //if (!(flags & kDNSServiceFlagsAdd)) return;
+    if (errorCode) { printf("Error code %d\n", errorCode); return; }
+
+    if (CopyLabels(n, n + kDNSServiceMaxDomainName, &p, 3)) return;     // Fetch name+type
+    p = fullname;
+    if (CopyLabels(t, t + kDNSServiceMaxDomainName, &p, 1)) return;     // Skip first label
+    if (CopyLabels(t, t + kDNSServiceMaxDomainName, &p, 2)) return;     // Fetch next two labels (service type)
+
+    if (num_printed++ == 0)
+    {
+        printf("\n");
+        printf("; To direct clients to browse a different domain, substitute that domain in place of '@'\n");
+        printf("%-47s PTR     %s\n", "lb._dns-sd._udp", "@");
+        printf("\n");
+        printf("; In the list of services below, the SRV records will typically reference dot-local Multicast DNS names.\n");
+        printf("; When transferring this zone file data to your unicast DNS server, you'll need to replace those dot-local\n");
+        printf("; names with the correct fully-qualified (unicast) domain name of the target host offering the service.\n");
+    }
+
+    printf("\n");
+    printf("%-47s PTR     %s\n", t, n);
+    printf("%-47s SRV     0 0 %d %s ; Replace with unicast FQDN of target host\n", n, PortAsNumber, hosttarget);
+    printf("%-47s TXT    ", n);
+
+    while (txt < max)
+    {
+        const unsigned char *const end = txt + 1 + txt[0];
+        txt++;      // Skip over length byte
+        printf(" \"");
+        while (txt<end)
+        {
+            if (*txt == '\\' || *txt == '\"') printf("\\");
+            printf("%c", *txt++);
+        }
+        printf("\"");
+    }
+    printf("\n");
+
+    DNSServiceRefDeallocate(sdref);
+    free(context);
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+
+static void DNSSD_API zonedata_browse(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
+                                      const char *replyName, const char *replyType, const char *replyDomain, void *context)
+{
+    DNSServiceRef *newref;
+
+    (void)sdref;        // Unused
+    (void)context;      // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (!(flags & kDNSServiceFlagsAdd)) return;
+    if (errorCode) { printf("Error code %d\n", errorCode); return; }
+
+    newref = malloc(sizeof(*newref));
+    *newref = client;
+    DNSServiceResolve(newref, kDNSServiceFlagsShareConnection, ifIndex, replyName, replyType, replyDomain, zonedata_resolve, newref);
+}
+
+static void DNSSD_API browse_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
+                                   const char *replyName, const char *replyType, const char *replyDomain, void *context)
+{
+    char *op = (flags & kDNSServiceFlagsAdd) ? "Add" : "Rmv";
+    (void)sdref;        // Unused
+    (void)context;      // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (num_printed++ == 0) printf("Timestamp     A/R    Flags  if %-20s %-20s %s\n", "Domain", "Service Type", "Instance Name");
+    printtimestamp();
+    if (errorCode) 
+        printf("Error code %d\n", errorCode);
+    else 
+        printf("%s %8X %3d %-20s %-20s %s\n", 
+                op, flags, ifIndex, replyDomain, replyType, replyName);
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+
+    // To test selective cancellation of operations of shared sockets,
+    // cancel the current operation when we've got a multiple of five results
+    //if (operation == 'S' && num_printed % 5 == 0) DNSServiceRefDeallocate(sdref);
+}
+
+static void ShowTXTRecord(uint16_t txtLen, const unsigned char *txtRecord)
+{
+    const unsigned char *ptr = txtRecord;
+    const unsigned char *max = txtRecord + txtLen;
+    while (ptr < max)
+    {
+        const unsigned char *const end = ptr + 1 + ptr[0];
+        if (end > max) { printf("<< invalid data >>"); break; }
+        if (++ptr < end) printf(" ");   // As long as string is non-empty, begin with a space
+        while (ptr<end)
+        {
+            // We'd like the output to be shell-friendly, so that it can be copied and pasted unchanged into a "dns-sd -R" command.
+            // However, this is trickier than it seems. Enclosing a string in double quotes doesn't necessarily make it
+            // shell-safe, because shells still expand variables like $foo even when they appear inside quoted strings.
+            // Enclosing a string in single quotes is better, but when using single quotes even backslash escapes are ignored,
+            // meaning there's simply no way to represent a single quote (or apostrophe) inside a single-quoted string.
+            // The only remaining solution is not to surround the string with quotes at all, but instead to use backslash
+            // escapes to encode spaces and all other known shell metacharacters.
+            // (If we've missed any known shell metacharacters, please let us know.)
+            // In addition, non-printing ascii codes (0-31) are displayed as \xHH, using a two-digit hex value.
+            // Because '\' is itself a shell metacharacter (the shell escape character), it has to be escaped as "\\" to survive
+            // the round-trip to the shell and back. This means that a single '\' is represented here as EIGHT backslashes:
+            // The C compiler eats half of them, resulting in four appearing in the output.
+            // The shell parses those four as a pair of "\\" sequences, passing two backslashes to the "dns-sd -R" command.
+            // The "dns-sd -R" command interprets this single "\\" pair as an escaped literal backslash. Sigh.
+            if (strchr(" &;`'\"|*?~<>^()[]{}$", *ptr)) printf("\\");
+            if      (*ptr == '\\') printf("\\\\\\\\");
+            else if (*ptr >= ' ' ) printf("%c",        *ptr);
+            else printf("\\\\x%02X", *ptr);
+            ptr++;
+        }
+    }
+}
+
+static void DNSSD_API resolve_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
+                                    const char *fullname, const char *hosttarget, uint16_t opaqueport, uint16_t txtLen, const unsigned char *txtRecord, void *context)
+{
+    union { uint16_t s; u_char b[2]; } port = { opaqueport };
+    uint16_t PortAsNumber = ((uint16_t)port.b[0]) << 8 | port.b[1];
+
+    (void)sdref;        // Unused
+    (void)ifIndex;      // Unused
+    (void)context;      // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (errorCode)
+        printf("Error code %d\n", errorCode);
+    else
+    {
+        printtimestamp();
+        printf("%s can be reached at %s:%u (interface %d)", fullname, hosttarget, PortAsNumber, ifIndex);
+        if (flags) printf(" Flags: %X", flags);
+        // Don't show degenerate TXT records containing nothing but a single empty string
+        if (txtLen > 1) { printf("\n"); ShowTXTRecord(txtLen, txtRecord); }
+        printf("\n");
+    }
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+
+static void myTimerCallBack(void)
+{
+    DNSServiceErrorType err = kDNSServiceErr_Unknown;
+
+    switch (operation)
+    {
+    case 'A':
+    {
+        switch (addtest)
+        {
+        case 0: printf("Adding Test HINFO record\n");
+            err = DNSServiceAddRecord(client, &record, 0, kDNSServiceType_HINFO, sizeof(myhinfoW), &myhinfoW[0], 0);
+            addtest = 1;
+            break;
+        case 1: printf("Updating Test HINFO record\n");
+            err = DNSServiceUpdateRecord(client, record, 0, sizeof(myhinfoX), &myhinfoX[0], 0);
+            addtest = 2;
+            break;
+        case 2: printf("Removing Test HINFO record\n");
+            err = DNSServiceRemoveRecord(client, record, 0);
+            addtest = 0;
+            break;
+        }
+    }
+    break;
+
+    case 'U':
+    {
+        if (updatetest[1] != 'Z') updatetest[1]++;
+        else updatetest[1] = 'A';
+        updatetest[0] = 3 - updatetest[0];
+        updatetest[2] = updatetest[1];
+        printtimestamp();
+        printf("Updating Test TXT record to %c\n", updatetest[1]);
+        err = DNSServiceUpdateRecord(client, NULL, 0, 1+updatetest[0], &updatetest[0], 0);
+    }
+    break;
+
+    case 'N':
+    {
+        printf("Adding big NULL record\n");
+        err = DNSServiceAddRecord(client, &record, 0, kDNSServiceType_NULL, sizeof(bigNULL), &bigNULL[0], 0);
+        if (err) printf("Failed: %d\n", err);else printf("Succeeded\n");
+        timeOut = LONG_TIME;
+#if _DNS_SD_LIBDISPATCH
+        if (timer_source)
+            dispatch_source_set_timer(timer_source, dispatch_time(DISPATCH_TIME_NOW, (uint64_t)timeOut * NSEC_PER_SEC),
+                                      (uint64_t)timeOut * NSEC_PER_SEC, 0);
+#endif
+    }
+    break;
+    }
+
+    if (err != kDNSServiceErr_NoError)
+    {
+        fprintf(stderr, "DNSService add/update/remove failed %ld\n", (long int)err);
+        stopNow = 1;
+    }
+}
+
+static void DNSSD_API reg_reply(DNSServiceRef sdref, const DNSServiceFlags flags, DNSServiceErrorType errorCode,
+                                const char *name, const char *regtype, const char *domain, void *context)
+{
+    (void)sdref;    // Unused
+    (void)flags;    // Unused
+    (void)context;  // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    printtimestamp();
+    printf("Got a reply for service %s.%s%s: ", name, regtype, domain);
+
+    if (errorCode == kDNSServiceErr_NoError)
+    {
+        if (flags & kDNSServiceFlagsAdd) printf("Name now registered and active\n");
+        else printf("Name registration removed\n");
+        if (operation == 'A' || operation == 'U' || operation == 'N')
+        {
+            timeOut = 5;
+#if _DNS_SD_LIBDISPATCH
+            if (timer_source)
+                dispatch_source_set_timer(timer_source, dispatch_time(DISPATCH_TIME_NOW, (uint64_t)timeOut * NSEC_PER_SEC),
+                                          (uint64_t)timeOut * NSEC_PER_SEC, 0);
+#endif
+        }
+    }
+    else if (errorCode == kDNSServiceErr_NameConflict)
+    {
+        printf("Name in use, please choose another\n");
+        exit(-1);
+    }
+    else
+        printf("Error %d\n", errorCode);
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+
+// Output the wire-format domainname pointed to by rd
+static int snprintd(char *p, int max, const unsigned char **rd)
+{
+    const char *const buf = p;
+    const char *const end = p + max;
+    while (**rd) 
+    { 
+        p += snprintf(p, end-p, "%.*s.", **rd, *rd+1); 
+        *rd += 1 + **rd; 
+    }
+    *rd += 1;   // Advance over the final zero byte
+    return(p-buf);
+}
+
+static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned const char *rd, uint16_t rdlen)
+{
+    int rdb_size = 1000;
+    switch (rrtype) 
+    {
+        case kDNSServiceType_DS:
+        {
+            unsigned char *ptr;
+            int i;
+            rdataDS *rrds = (rdataDS *)rd;
+            p += snprintf(p, rdb + rdb_size - p, "%d  %d  %d  ",
+                          rrds->alg, swap16(rrds->keyTag), rrds->digestType);
+            ptr = (unsigned char *)(rd + DS_FIXED_SIZE);
+            for (i = 0; i < (rdlen - DS_FIXED_SIZE); i++)
+                p += snprintf(p, rdb + rdb_size - p, "%x", ptr[i]);   
+            break; 
+        } 
+            
+        case kDNSServiceType_DNSKEY:
+        {
+            rdataDNSKey *rrkey = (rdataDNSKey *)rd;
+            p += snprintf(p, rdb + rdb_size - p, "%d  %d  %d  %u", swap16(rrkey->flags), rrkey->proto,
+                          rrkey->alg, (unsigned int)keytag((unsigned char *)rrkey, rdlen));
+            base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + DNSKEY_FIXED_SIZE), rdlen - DNSKEY_FIXED_SIZE);
+            break;
+        }
+            
+        case kDNSServiceType_NSEC: 
+        {
+            unsigned char *next = (unsigned char *)rd;
+            int len, bitmaplen;
+            int win, wlen, type;
+            unsigned char *bmap;
+            char *l = NULL;
+            
+            l = p;
+            p += snprintd(p, rdb + rdb_size - p, &rd);
+            len = p - l + 1;
+            
+            bitmaplen = rdlen - len;
+            bmap = (unsigned char *)((unsigned char *)next + len);
+            
+            while (bitmaplen > 0)
+            {
+                int i;
+                
+                if (bitmaplen < 3)
+                {
+                    printf("Case NSEC: malformed nsec, bitmaplen %d short\n", bitmaplen);
+                    break;
+                }   
+                
+                win = *bmap++;
+                wlen = *bmap++;
+                bitmaplen -= 2;
+                if (bitmaplen < wlen || wlen < 1 || wlen > 32)
+                {
+                    printf("Case NSEC: malformed nsec, bitmaplen %d wlen %d\n", bitmaplen, wlen);
+                    break;
+                }
+                if (win < 0 || win >= 256)
+                {
+                    printf("Case NSEC: malformed nsec, bad window win %d\n", win);
+                    break;
+                }
+                type = win * 256;
+                for (i = 0; i < wlen * 8; i++)
+                {
+                    if (bmap[i>>3] & (128 >> (i&7)))
+                        p += snprintf(p, rdb + rdb_size - p, " %s ", DNSTypeName(type + i));
+                }
+                bmap += wlen;
+                bitmaplen -= wlen;
+            }
+            break;
+        }
+            
+        case kDNSServiceType_RRSIG:    
+        {
+            rdataRRSig *rrsig = (rdataRRSig *)rd;
+            unsigned char expTimeBuf[64];
+            unsigned char inceptTimeBuf[64];
+            unsigned long inceptClock;
+            unsigned long expClock;
+            const unsigned char *q = NULL;
+            char *k = NULL;
+            int len;
+            
+            expClock = (unsigned long)swap32(rrsig->sigExpireTime);
+            FormatTime(expClock, expTimeBuf, sizeof(expTimeBuf));
+            
+            inceptClock = (unsigned long)swap32(rrsig->sigInceptTime);
+            FormatTime(inceptClock, inceptTimeBuf, sizeof(inceptTimeBuf));
+            
+            p += snprintf(p, rdb + rdb_size - p, " %-7s  %d  %d  %d  %s  %s  %7d  ",
+                          DNSTypeName(swap16(rrsig->typeCovered)), rrsig->alg, rrsig->labels, swap32(rrsig->origTTL),
+                          expTimeBuf, inceptTimeBuf, swap16(rrsig->keyTag));
+            
+            q = (const unsigned char *)&rrsig->signerName;
+            k = p;
+            p += snprintd(p, rdb + rdb_size - p, &q);
+            len = p - k + 1;
+            
+            base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + len + RRSIG_FIXED_SIZE), rdlen - (len + RRSIG_FIXED_SIZE));
+            break;
+        }
+    }
+    return;                           
+}
+
+static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
+                               const char *fullname, uint16_t rrtype, uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
+{
+    char *op = (flags & kDNSServiceFlagsAdd) ? "Add" : "Rmv";
+    const unsigned char *rd  = rdata;
+    const unsigned char *end = (const unsigned char *) rdata + rdlen;
+    char rdb[1000] = "0.0.0.0", *p = rdb;
+    int unknowntype = 0;
+    char dnssec_status[15] = "Unknown";
+    char rr_type[RR_TYPE_SIZE];
+    char rr_class[3];
+    DNSServiceFlags check_flags = flags;//local flags for dnssec status checking
+
+    (void)sdref;    // Unused
+    (void)ifIndex;  // Unused
+    (void)ttl;      // Unused
+    (void)context;  // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (num_printed++ == 0)
+    {
+        if (operation == 'D') 
+            printf("Timestamp     A/R if %-30s%-6s%-7s%-18s Rdata\n", "Name", "Type", "Class", "DNSSECStatus"); 
+        else     
+            printf("Timestamp     A/R Flags if %-30s%-6s%-7s Rdata\n", "Name", "Type", "Class");
+    }
+    printtimestamp();
+
+    switch (rrclass)
+    {
+        case kDNSServiceClass_IN:
+            strncpy(rr_class, "IN", sizeof(rr_class));
+            break;
+        default:
+            snprintf(rr_class, sizeof(rr_class), "%d", rrclass);
+            break;
+    }
+    strncpy(rr_type, DNSTypeName(rrtype), sizeof(rr_type));
+
+    if (!errorCode) //to avoid printing garbage in rdata
+    {
+        if (!(check_flags & (kDNSServiceFlagsValidate | kDNSServiceFlagsValidateOptional)))
+        {
+            switch (rrtype)
+            {
+                case kDNSServiceType_A:
+                    snprintf(rdb, sizeof(rdb), "%d.%d.%d.%d", rd[0], rd[1], rd[2], rd[3]);
+                    break;
+    
+                case kDNSServiceType_NS:
+                case kDNSServiceType_CNAME:
+                case kDNSServiceType_PTR:
+                case kDNSServiceType_DNAME:
+                    p += snprintd(p, sizeof(rdb), &rd);
+                    break;
+
+                case kDNSServiceType_SOA:
+                    p += snprintd(p, rdb + sizeof(rdb) - p, &rd);           // mname
+                    p += snprintf(p, rdb + sizeof(rdb) - p, " ");
+                    p += snprintd(p, rdb + sizeof(rdb) - p, &rd);           // rname
+                    p += snprintf(p, rdb + sizeof(rdb) - p, " Ser %d Ref %d Ret %d Exp %d Min %d",
+                          ntohl(((uint32_t*)rd)[0]), ntohl(((uint32_t*)rd)[1]), ntohl(((uint32_t*)rd)[2]), ntohl(((uint32_t*)rd)[3]), ntohl(((uint32_t*)rd)[4]));
+                    break;
+
+                case kDNSServiceType_AAAA:
+                    snprintf(rdb, sizeof(rdb), "%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X",
+                        rd[0x0], rd[0x1], rd[0x2], rd[0x3], rd[0x4], rd[0x5], rd[0x6], rd[0x7],
+                        rd[0x8], rd[0x9], rd[0xA], rd[0xB], rd[0xC], rd[0xD], rd[0xE], rd[0xF]);
+                    break;
+
+                case kDNSServiceType_SRV:
+                    p += snprintf(p, rdb + sizeof(rdb) - p, "%d %d %d ",        // priority, weight, port
+                          ntohs(*(unsigned short*)rd), ntohs(*(unsigned short*)(rd+2)), ntohs(*(unsigned short*)(rd+4)));
+                    rd += 6;
+                    p += snprintd(p, rdb + sizeof(rdb) - p, &rd);               // target host
+                    break;
+
+                case kDNSServiceType_DS:
+                case kDNSServiceType_DNSKEY:
+                case kDNSServiceType_NSEC:
+                case kDNSServiceType_RRSIG:
+                    ParseDNSSECRecords(rrtype, rdb, p, rd, rdlen);
+                    break;
+
+                default: 
+                    snprintf(rdb, sizeof(rdb), "%d bytes%s", rdlen, rdlen ? ":" : ""); 
+                    unknowntype = 1;
+                    break;
+            }   
+        }   
+        else 
+        {
+            strncpy(rdb, "----", sizeof(rdb));
+            //Clear all o/p bits, and then check for dnssec status
+            check_flags &= ~kDNSServiceOutputFlags;
+            if (check_flags & kDNSServiceFlagsSecure)
+                strncpy(dnssec_status, "Secure", sizeof(dnssec_status));
+            else if (check_flags & kDNSServiceFlagsInsecure)
+                strncpy(dnssec_status, "Insecure", sizeof(dnssec_status));
+            else if (check_flags & kDNSServiceFlagsIndeterminate)
+                strncpy(dnssec_status, "Indeterminate", sizeof(dnssec_status));
+            else if (check_flags & kDNSServiceFlagsBogus) 
+                strncpy(dnssec_status, "Bogus", sizeof(dnssec_status));
+        }
+    }
+
+    if (operation == 'D')
+        printf("%s%3d %-30s%-6s%-7s%-18s %s", op, ifIndex, fullname, rr_type, rr_class, dnssec_status, rdb);
+    else
+        printf("%s%6X%3d %-30s%-7s%-6s %s", op, flags, ifIndex, fullname, rr_type, rr_class, rdb);
+    if (unknowntype)
+    { 
+        while (rd < end) 
+            printf(" %02X", *rd++);
+    }
+    if (errorCode)
+    {
+        if (errorCode == kDNSServiceErr_NoSuchRecord) 
+            printf("    No Such Record");
+        else if (errorCode == kDNSServiceErr_Timeout)
+        {
+            printf("    No Such Record\n");
+            printf("Query Timed Out\n");
+            exit(1);
+        }
+    }
+    printf("\n");
+
+    if (operation == 'C')
+        if (flags & kDNSServiceFlagsAdd)
+            DNSServiceReconfirmRecord(flags, ifIndex, fullname, rrtype, rrclass, rdlen, rdata);
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) 
+        fflush(stdout);
+}
+
+#if HAS_NAT_PMP_API
+static void DNSSD_API port_mapping_create_reply(DNSServiceRef sdref, DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode, uint32_t publicAddress, uint32_t protocol, uint16_t privatePort, uint16_t publicPort, uint32_t ttl, void *context)
+{
+    (void)sdref;       // Unused
+    (void)flags;       // Unused
+    (void)context;     // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (num_printed++ == 0) printf("Timestamp     if   %-20s %-15s %-15s %-15s %-6s\n", "External Address", "Protocol", "Internal Port", "External Port", "TTL");
+    printtimestamp();
+    if (errorCode && errorCode != kDNSServiceErr_DoubleNAT) printf("Error code %d\n", errorCode);
+    else
+    {
+        const unsigned char *digits = (const unsigned char *)&publicAddress;
+        char addr[256];
+
+        snprintf(addr, sizeof(addr), "%d.%d.%d.%d", digits[0], digits[1], digits[2], digits[3]);
+        printf("%-4d %-20s %-15d %-15d %-15d %-6d%s\n", ifIndex, addr, protocol, ntohs(privatePort), ntohs(publicPort), ttl, errorCode == kDNSServiceErr_DoubleNAT ? " Double NAT" : "");
+    }
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+#endif
+
+#if HAS_ADDRINFO_API
+static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char *hostname, const struct sockaddr *address, uint32_t ttl, void *context)
+{
+    char *op = (flags & kDNSServiceFlagsAdd) ? "Add" : "Rmv";
+    char addr[256] = "";
+    char dnssec_status[15] = "Unknown"; 
+    DNSServiceFlags check_flags = flags;
+	(void) sdref;
+	(void) context;
+
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    if (num_printed++ == 0)
+    {
+        if (operation == 'g') 
+            printf("Timestamp     A/R if %-25s %-44s %-18s\n", "Hostname", "Address", "DNSSECStatus");
+        else  
+            printf("Timestamp     A/R Flags if %-38s %-44s %s\n", "Hostname", "Address", "TTL");
+    }
+    printtimestamp();
+   
+    if (address && address->sa_family == AF_INET)
+    {
+        const unsigned char *b = (const unsigned char *) &((struct sockaddr_in *)address)->sin_addr;
+        snprintf(addr, sizeof(addr), "%d.%d.%d.%d", b[0], b[1], b[2], b[3]);
+    }
+    else if (address && address->sa_family == AF_INET6)
+    {
+        char if_name[IFNAMSIZ];     // Older Linux distributions don't define IF_NAMESIZE
+        const struct sockaddr_in6 *s6 = (const struct sockaddr_in6 *)address;
+        const unsigned char       *b  = (const unsigned char *      )&s6->sin6_addr;
+        if (!if_indextoname(s6->sin6_scope_id, if_name))
+            snprintf(if_name, sizeof(if_name), "<%d>", s6->sin6_scope_id);
+            snprintf(addr, sizeof(addr), "%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X%%%s",
+            b[0x0], b[0x1], b[0x2], b[0x3], b[0x4], b[0x5], b[0x6], b[0x7],
+            b[0x8], b[0x9], b[0xA], b[0xB], b[0xC], b[0xD], b[0xE], b[0xF], if_name);
+    }
+
+    //go through this only if you have a dnssec validation status
+    if (!errorCode && (check_flags & (kDNSServiceFlagsValidate | kDNSServiceFlagsValidateOptional)))
+    {
+        strncpy(addr, "----", sizeof(addr));
+        //Clear all o/p bits, and then check for dnssec status
+        check_flags &= ~kDNSServiceOutputFlags;
+        if (check_flags & kDNSServiceFlagsSecure)
+            strncpy(dnssec_status, "Secure", sizeof(dnssec_status));
+        else if (check_flags & kDNSServiceFlagsInsecure)
+            strncpy(dnssec_status, "Insecure", sizeof(dnssec_status));
+        else if (check_flags & kDNSServiceFlagsIndeterminate)
+            strncpy(dnssec_status, "Indeterminate", sizeof(dnssec_status));
+        else if (check_flags & kDNSServiceFlagsBogus) 
+            strncpy(dnssec_status, "Bogus", sizeof(dnssec_status));
+    }
+    
+    if (operation == 'g')
+        printf("%s%3d %-25s %-44s %-18s", op, interfaceIndex, hostname, addr, dnssec_status);
+    else
+        printf("%s%6X%3d %-38s %-44s %d", op, flags, interfaceIndex, hostname, addr, ttl);
+    if (errorCode)
+    {
+        if (errorCode == kDNSServiceErr_NoSuchRecord) 
+            printf("   No Such Record");
+        else 
+            printf("   Error code %d", errorCode);
+    }
+    printf("\n");
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) 
+        fflush(stdout);
+}
+#endif
+
+//*************************************************************************************************************
+// The main test function
+
+static void HandleEvents(void)
+#if _DNS_SD_LIBDISPATCH
+{
+    main_queue = dispatch_get_main_queue();
+    if (client) DNSServiceSetDispatchQueue(client, main_queue);
+    if (client_pa) DNSServiceSetDispatchQueue(client_pa, main_queue);
+    if (operation == 'A' || operation == 'U' || operation == 'N')
+    {
+        timer_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, main_queue);
+        if (timer_source)
+        {
+            // Start the timer "timeout" seconds into the future and repeat it every "timeout" seconds
+            dispatch_source_set_timer(timer_source, dispatch_time(DISPATCH_TIME_NOW, (uint64_t)timeOut * NSEC_PER_SEC),
+                                      (uint64_t)timeOut * NSEC_PER_SEC, 0);
+            dispatch_source_set_event_handler(timer_source, ^{myTimerCallBack();});
+            dispatch_resume(timer_source);
+        }
+    }
+    dispatch_main();
+}
+#else
+{
+    int dns_sd_fd  = client    ? DNSServiceRefSockFD(client   ) : -1;
+    int dns_sd_fd2 = client_pa ? DNSServiceRefSockFD(client_pa) : -1;
+    int nfds = dns_sd_fd + 1;
+    fd_set readfds;
+    struct timeval tv;
+    int result;
+
+    if (dns_sd_fd2 > dns_sd_fd) nfds = dns_sd_fd2 + 1;
+
+    while (!stopNow)
+    {
+        // 1. Set up the fd_set as usual here.
+        // This example client has no file descriptors of its own,
+        // but a real application would call FD_SET to add them to the set here
+        FD_ZERO(&readfds);
+
+        // 2. Add the fd for our client(s) to the fd_set
+        if (client   ) FD_SET(dns_sd_fd, &readfds);
+        if (client_pa) FD_SET(dns_sd_fd2, &readfds);
+
+        // 3. Set up the timeout.
+        tv.tv_sec  = timeOut;
+        tv.tv_usec = 0;
+
+        result = select(nfds, &readfds, (fd_set*)NULL, (fd_set*)NULL, &tv);
+        if (result > 0)
+        {
+            DNSServiceErrorType err = kDNSServiceErr_NoError;
+            if      (client    && FD_ISSET(dns_sd_fd, &readfds)) err = DNSServiceProcessResult(client   );
+            else if (client_pa && FD_ISSET(dns_sd_fd2, &readfds)) err = DNSServiceProcessResult(client_pa);
+            if (err) { fprintf(stderr, "DNSServiceProcessResult returned %d\n", err); stopNow = 1; }
+        }
+        else if (result == 0)
+            myTimerCallBack();
+        else
+        {
+            printf("select() returned %d errno %d %s\n", result, errno, strerror(errno));
+            if (errno != EINTR) stopNow = 1;
+        }
+    }
+}
+#endif
+
+static int getfirstoption(int argc, char **argv, const char *optstr, int *pOptInd)
+// Return the recognized option in optstr and the option index of the next arg.
+#if NOT_HAVE_GETOPT
+{
+    int i;
+    for (i=1; i < argc; i++)
+    {
+        if (argv[i][0] == '-' && &argv[i][1] &&
+            NULL != strchr(optstr, argv[i][1]))
+        {
+            *pOptInd = i + 1;
+            return argv[i][1];
+        }
+    }
+    return -1;
+}
+#else
+{
+    int o = getopt(argc, (char *const *)argv, optstr);
+    *pOptInd = optind;
+    return o;
+}
+#endif
+
+static void DNSSD_API MyRegisterRecordCallback(DNSServiceRef service, DNSRecordRef rec, const DNSServiceFlags flags,
+                                               DNSServiceErrorType errorCode, void *context)
+{
+    char *name = (char *)context;
+
+    (void)service;  // Unused
+    (void)rec;      // Unused
+    (void)flags;    // Unused
+    EXIT_IF_LIBDISPATCH_FATAL_ERROR(errorCode);
+
+    printtimestamp();
+    printf("Got a reply for record %s: ", name);
+
+    switch (errorCode)
+    {
+    case kDNSServiceErr_NoError:      printf("Name now registered and active\n"); break;
+    case kDNSServiceErr_NameConflict: printf("Name in use, please choose another\n"); exit(-1);
+    default:                          printf("Error %d\n", errorCode); break;
+    }
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+    // DNSServiceRemoveRecord(service, rec, 0); to test record removal
+
+#if 0   // To test updating of individual records registered via DNSServiceRegisterRecord
+    if (!errorCode)
+    {
+        int x = 0x11111111;
+        printf("Updating\n");
+        DNSServiceUpdateRecord(service, rec, 0, sizeof(x), &x, 0);
+    }
+#endif
+
+    if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
+}
+
+static void getip(const char *const name, struct sockaddr_storage *result)
+{
+    struct addrinfo *addrs = NULL;
+    int err = getaddrinfo(name, NULL, NULL, &addrs);
+    if (err) fprintf(stderr, "getaddrinfo error %d for %s", err, name);
+    else memcpy(result, addrs->ai_addr, SA_LEN(addrs->ai_addr));
+    if (addrs) freeaddrinfo(addrs);
+}
+
+static DNSServiceErrorType RegisterProxyAddressRecord(DNSServiceRef sdref, const char *host, const char *ip, DNSServiceFlags flags)
+{
+    // Call getip() after the call DNSServiceCreateConnection().
+    // On the Win32 platform, WinSock must be initialized for getip() to succeed.
+    // Any DNSService* call will initialize WinSock for us, so we make sure
+    // DNSServiceCreateConnection() is called before getip() is.
+    struct sockaddr_storage hostaddr;
+    getip(ip, &hostaddr);
+    flags |= kDNSServiceFlagsUnique;
+    if (hostaddr.ss_family == AF_INET)
+        return(DNSServiceRegisterRecord(sdref, &record, flags, opinterface, host,
+                                        kDNSServiceType_A,    kDNSServiceClass_IN,  4, &((struct sockaddr_in *)&hostaddr)->sin_addr,  240, MyRegisterRecordCallback, (void*)host));
+    else if (hostaddr.ss_family == AF_INET6)
+        return(DNSServiceRegisterRecord(sdref, &record, flags, opinterface, host,
+                                        kDNSServiceType_AAAA, kDNSServiceClass_IN, 16, &((struct sockaddr_in6*)&hostaddr)->sin6_addr, 240, MyRegisterRecordCallback, (void*)host));
+    else return(kDNSServiceErr_BadParam);
+}
+
+#define HexVal(X) ( ((X) >= '0' && (X) <= '9') ? ((X) - '0'     ) :  \
+                    ((X) >= 'A' && (X) <= 'F') ? ((X) - 'A' + 10) :  \
+                    ((X) >= 'a' && (X) <= 'f') ? ((X) - 'a' + 10) : 0)
+
+#define HexPair(P) ((HexVal((P)[0]) << 4) | HexVal((P)[1]))
+
+static DNSServiceErrorType RegisterService(DNSServiceRef *sdref,
+                                           const char *nam, const char *typ, const char *dom, const char *host, const char *port, int argc, char **argv, DNSServiceFlags flags)
+{
+    uint16_t PortAsNumber = atoi(port);
+    Opaque16 registerPort = { { PortAsNumber >> 8, PortAsNumber & 0xFF } };
+    unsigned char txt[2048] = "";
+    unsigned char *ptr = txt;
+    int i;
+
+    if (nam[0] == '.' && nam[1] == 0) nam = "";   // We allow '.' on the command line as a synonym for empty string
+    if (dom[0] == '.' && dom[1] == 0) dom = "";   // We allow '.' on the command line as a synonym for empty string
+
+    printf("Registering Service %s.%s%s%s", nam[0] ? nam : "<<Default>>", typ, dom[0] ? "." : "", dom);
+    if (host && *host) printf(" host %s", host);
+    printf(" port %s", port);
+
+    if (argc)
+    {
+        for (i = 0; i < argc; i++)
+        {
+            const char *p = argv[i];
+            *ptr = 0;
+            while (*p && *ptr < 255 && ptr + 1 + *ptr < txt+sizeof(txt))
+            {
+                if      (p[0] != '\\' || p[1] == 0)                       { ptr[++*ptr] = *p;           p+=1; }
+                else if (p[1] == 'x' && isxdigit(p[2]) && isxdigit(p[3])) { ptr[++*ptr] = HexPair(p+2); p+=4; }
+                else                                                      { ptr[++*ptr] = p[1];         p+=2; }
+            }
+            ptr += 1 + *ptr;
+        }
+        printf(" TXT");
+        ShowTXTRecord(ptr-txt, txt);
+    }
+    printf("\n");
+
+    //flags |= kDNSServiceFlagsAllowRemoteQuery;
+    //flags |= kDNSServiceFlagsNoAutoRename;
+
+    return(DNSServiceRegister(sdref, flags, opinterface, nam, typ, dom, host, registerPort.NotAnInteger, (uint16_t) (ptr-txt), txt, reg_reply, NULL));
+}
+
+#define TypeBufferSize 80
+static char *gettype(char *buffer, char *typ)
+{
+    if (!typ || !*typ || (typ[0] == '.' && typ[1] == 0)) typ = "_http._tcp";
+    if (!strchr(typ, '.')) { snprintf(buffer, TypeBufferSize, "%s._tcp", typ); typ = buffer; }
+    return(typ);
+}
+
+int main(int argc, char **argv)
+{
+    DNSServiceErrorType err;
+    char buffer[TypeBufferSize], *typ, *dom;
+    int opi;
+    DNSServiceFlags flags = 0;
+    int optional = 0;
+
+    // Extract the program name from argv[0], which by convention contains the path to this executable.
+    // Note that this is just a voluntary convention, not enforced by the kernel --
+    // the process calling exec() can pass bogus data in argv[0] if it chooses to.
+    const char *a0 = strrchr(argv[0], kFilePathSep) + 1;
+    if (a0 == (const char *)1) a0 = argv[0];
+
+#if defined(_WIN32)
+    HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+#endif
+
+#if TEST_NEW_CLIENTSTUB
+    printf("Using embedded copy of dnssd_clientstub instead of system library\n");
+    if (sizeof(argv) == 8) printf("Running in 64-bit mode\n");
+#endif
+
+    // Test code for TXTRecord functions
+    //TXTRecordRef txtRecord;
+    //TXTRecordCreate(&txtRecord, 0, NULL);
+    //TXTRecordSetValue(&txtRecord, "aaa", 1, "b");
+    //printf("%d\n", TXTRecordContainsKey(TXTRecordGetLength(&txtRecord), TXTRecordGetBytesPtr(&txtRecord), "Aaa"));
+
+    if (argc > 1 && !strcmp(argv[1], "-lo"))
+    {
+        argc--;
+        argv++;
+        opinterface = kDNSServiceInterfaceIndexLocalOnly;
+        printf("Using LocalOnly\n");
+    }
+
+    if (argc > 1 && (!strcmp(argv[1], "-p2p") || !strcmp(argv[1], "-P2P")))
+    {
+        argc--;
+        argv++;
+        opinterface = kDNSServiceInterfaceIndexP2P;
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-includep2p"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsIncludeP2P;
+        printf("Setting kDNSServiceFlagsIncludeP2P\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-includeAWDL"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsIncludeAWDL;
+        printf("Setting kDNSServiceFlagsIncludeAWDL\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-tc"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsBackgroundTrafficClass;
+        printf("Setting kDNSServiceFlagsBackgroundTrafficClass\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-t1"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsThresholdOne;
+        printf("Setting kDNSServiceFlagsThresholdOne\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-tFinder"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsThresholdFinder;
+        printf("Setting kDNSServiceFlagsThresholdFinder\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-wo"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsWakeOnlyService;
+        printf("Setting kDNSServiceFlagsWakeOnlyService\n");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-unicastResponse"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsUnicastResponse;
+        printf("Setting kDNSServiceFlagsUnicastResponse\n");
+    }
+    if (argc > 1 && !strcasecmp(argv[1], "-timeout"))
+    {
+        argc--;
+        argv++;
+        flags |= kDNSServiceFlagsTimeout;
+        printf("Setting kDNSServiceFlagsTimeout\n");
+    }
+    if (argc > 1 && !strcasecmp(argv[1], "-optional"))
+    {
+        argc--;
+        argv++;
+        optional = 1;
+        printf("Setting DNSSEC optional flag\n");
+    }
+
+    if (argc > 2 && !strcmp(argv[1], "-i"))
+    {
+        opinterface = if_nametoindex(argv[2]);
+        if (!opinterface) opinterface = atoi(argv[2]);
+        if (!opinterface) { fprintf(stderr, "Unknown interface %s\n", argv[2]); goto Fail; }
+        argc -= 2;
+        argv += 2;
+    }
+
+    if (argc < 2) goto Fail;        // Minimum command line is the command name and one argument
+    operation = getfirstoption(argc, argv, "EFBZLlRPQqCAUNTMISVHhD"
+                                #if HAS_NAT_PMP_API
+                               "X"
+                                #endif
+                                #if HAS_ADDRINFO_API
+                               "Gg"
+                                #endif
+                               , &opi);
+    if (operation == -1) goto Fail;
+
+    if (opinterface) printf("Using interface %d\n", opinterface);
+
+    switch (operation)
+    {
+    case 'E':   printf("Looking for recommended registration domains:\n");
+        err = DNSServiceEnumerateDomains(&client, kDNSServiceFlagsRegistrationDomains, opinterface, enum_reply, NULL);
+        break;
+
+    case 'F':   printf("Looking for recommended browsing domains:\n");
+        err = DNSServiceEnumerateDomains(&client, kDNSServiceFlagsBrowseDomains, opinterface, enum_reply, NULL);
+        //enum_reply(client, kDNSServiceFlagsAdd, 0, 0, "nicta.com.au.", NULL);
+        //enum_reply(client, kDNSServiceFlagsAdd, 0, 0, "bonjour.nicta.com.au.", NULL);
+        //enum_reply(client, kDNSServiceFlagsAdd, 0, 0, "ibm.com.", NULL);
+        //enum_reply(client, kDNSServiceFlagsAdd, 0, 0, "dns-sd.ibm.com.", NULL);
+        break;
+
+    case 'B':   typ = (argc < opi+1) ? "" : argv[opi+0];
+        dom = (argc < opi+2) ? "" : argv[opi+1];              // Missing domain argument is the same as empty string i.e. use system default(s)
+        typ = gettype(buffer, typ);
+        if (dom[0] == '.' && dom[1] == 0) dom[0] = 0;               // We allow '.' on the command line as a synonym for empty string
+        printf("Browsing for %s%s%s\n", typ, dom[0] ? "." : "", dom);
+        err = DNSServiceBrowse(&client, flags, opinterface, typ, dom, browse_reply, NULL);
+        break;
+
+    case 'Z':   typ = (argc < opi+1) ? "" : argv[opi+0];
+        dom = (argc < opi+2) ? "" : argv[opi+1];              // Missing domain argument is the same as empty string i.e. use system default(s)
+        typ = gettype(buffer, typ);
+        if (dom[0] == '.' && dom[1] == 0) dom[0] = 0;               // We allow '.' on the command line as a synonym for empty string
+        printf("Browsing for %s%s%s\n", typ, dom[0] ? "." : "", dom);
+        err = DNSServiceCreateConnection(&client);
+        sc1 = client;
+        err = DNSServiceBrowse(&sc1, kDNSServiceFlagsShareConnection, opinterface, typ, dom, zonedata_browse, NULL);
+        break;
+
+    case 'l':
+    case 'L':   {
+        if (argc < opi+2) goto Fail;
+        typ = (argc < opi+2) ? ""      : argv[opi+1];
+        dom = (argc < opi+3) ? "local" : argv[opi+2];
+        typ = gettype(buffer, typ);
+        if (dom[0] == '.' && dom[1] == 0) dom = "local";               // We allow '.' on the command line as a synonym for "local"
+        printf("Lookup %s.%s.%s\n", argv[opi+0], typ, dom);
+        if (operation == 'l') flags |= kDNSServiceFlagsWakeOnResolve;
+        err = DNSServiceResolve(&client, flags, opinterface, argv[opi+0], typ, dom, resolve_reply, NULL);
+        break;
+    }
+
+    case 'R':   if (argc < opi+4) goto Fail;
+        typ = (argc < opi+2) ? "" : argv[opi+1];
+        dom = (argc < opi+3) ? "" : argv[opi+2];
+        typ = gettype(buffer, typ);
+        if (dom[0] == '.' && dom[1] == 0) dom[0] = 0;               // We allow '.' on the command line as a synonym for empty string
+        err = RegisterService(&client, argv[opi+0], typ, dom, NULL, argv[opi+3], argc-(opi+4), argv+(opi+4), flags);
+        break;
+
+
+    case 'P':   if (argc < opi+6) goto Fail;
+        err = DNSServiceCreateConnection(&client_pa);
+        if (err) { fprintf(stderr, "DNSServiceCreateConnection returned %d\n", err); return(err); }
+        err = RegisterProxyAddressRecord(client_pa, argv[opi+4], argv[opi+5], flags);
+        if (err) break;
+        err = RegisterService(&client, argv[opi+0], gettype(buffer, argv[opi+1]), argv[opi+2], argv[opi+4], argv[opi+3], argc-(opi+6), argv+(opi+6), flags);
+        break;
+
+    case 'D':
+    case 'q':
+    case 'Q':
+    case 'C':   {
+        uint16_t rrtype, rrclass;
+        flags |= kDNSServiceFlagsReturnIntermediates;
+        if (operation == 'q') 
+            flags |= kDNSServiceFlagsSuppressUnusable;
+        if (argc < opi+1) 
+            goto Fail;
+        rrtype = (argc <= opi+1) ? kDNSServiceType_A  : GetRRType(argv[opi+1]);
+        rrclass = (argc <= opi+2) ? kDNSServiceClass_IN : GetRRClass(argv[opi+2]);
+        if (rrtype == kDNSServiceType_TXT || rrtype == kDNSServiceType_PTR)
+            flags |= kDNSServiceFlagsLongLivedQuery;
+        if (operation == 'D')
+        {
+            flags |= kDNSServiceFlagsSuppressUnusable;
+            if (optional)
+                flags |= kDNSServiceFlagsValidateOptional;
+            else
+                flags |= kDNSServiceFlagsValidate;
+        }
+        err = DNSServiceQueryRecord(&client, flags, opinterface, argv[opi+0], rrtype, rrclass, qr_reply, NULL);
+        break;
+    }
+
+    case 'A':
+    case 'U':
+    case 'N':   {
+        Opaque16 registerPort = { { 0x12, 0x34 } };
+        static const char TXT[] = "\xC" "First String" "\xD" "Second String" "\xC" "Third String";
+        printf("Registering Service Test._testupdate._tcp.local.\n");
+        err = DNSServiceRegister(&client, 0, opinterface, "Test", "_testupdate._tcp.", "", NULL, registerPort.NotAnInteger, sizeof(TXT)-1, TXT, reg_reply, NULL);
+        break;
+    }
+
+    case 'T':   {
+        Opaque16 registerPort = { { 0x23, 0x45 } };
+        char TXT[1024];
+        unsigned int i;
+        for (i=0; i<sizeof(TXT); i++)
+            if ((i & 0x1F) == 0) TXT[i] = 0x1F;else TXT[i] = 'A' + (i >> 5);
+        printf("Registering Service Test._testlargetxt._tcp.local.\n");
+        err = DNSServiceRegister(&client, 0, opinterface, "Test", "_testlargetxt._tcp.", "", NULL, registerPort.NotAnInteger, sizeof(TXT), TXT, reg_reply, NULL);
+        break;
+    }
+
+    case 'M':   {
+        pid_t pid = getpid();
+        Opaque16 registerPort = { { pid >> 8, pid & 0xFF } };
+        static const char TXT1[] = "\xC" "First String"  "\xD" "Second String" "\xC" "Third String";
+        static const char TXT2[] = "\xD" "Fourth String" "\xC" "Fifth String"  "\xC" "Sixth String";
+        printf("Registering Service Test._testdualtxt._tcp.local.\n");
+        err = DNSServiceRegister(&client, flags, opinterface, "Test", "_testdualtxt._tcp.", "", NULL, registerPort.NotAnInteger, sizeof(TXT1)-1, TXT1, reg_reply, NULL);
+        if (!err) err = DNSServiceAddRecord(client, &record, flags, kDNSServiceType_TXT, sizeof(TXT2)-1, TXT2, 0);
+        break;
+    }
+
+    case 'I':   {
+        pid_t pid = getpid();
+        Opaque16 registerPort = { { pid >> 8, pid & 0xFF } };
+        static const char TXT[] = "\x09" "Test Data";
+        printf("Registering Service Test._testtxt._tcp.local.\n");
+        err = DNSServiceRegister(&client, 0, opinterface, "Test", "_testtxt._tcp.", "", NULL, registerPort.NotAnInteger, 0, NULL, reg_reply, NULL);
+        if (!err) err = DNSServiceUpdateRecord(client, NULL, 0, sizeof(TXT)-1, TXT, 0);
+        break;
+    }
+
+#if HAS_NAT_PMP_API
+    case 'X':   {
+        if (argc == opi)                // If no arguments, just fetch IP address
+            err = DNSServiceNATPortMappingCreate(&client, 0, 0, 0, 0, 0, 0, port_mapping_create_reply, NULL);
+        else if (argc >= opi+2 && atoi(argv[opi+0]) == 0)
+        {
+            DNSServiceProtocol prot  = GetProtocol(argv[opi+0]);                                    // Must specify TCP or UDP
+            uint16_t IntPortAsNumber = atoi(argv[opi+1]);                                       // Must specify internal port
+            uint16_t ExtPortAsNumber = (argc < opi+3) ? 0 : atoi(argv[opi+2]);              // Optional desired external port
+            uint32_t ttl             = (argc < opi+4) ? 0 : atoi(argv[opi+3]);              // Optional desired lease lifetime
+            Opaque16 intp = { { IntPortAsNumber >> 8, IntPortAsNumber & 0xFF } };
+            Opaque16 extp = { { ExtPortAsNumber >> 8, ExtPortAsNumber & 0xFF } };
+            err = DNSServiceNATPortMappingCreate(&client, 0, 0, prot, intp.NotAnInteger, extp.NotAnInteger, ttl, port_mapping_create_reply, NULL);
+        }
+        else goto Fail;
+        break;
+    }
+#endif
+
+#if HAS_ADDRINFO_API
+    case 'g':
+    case 'G':   {
+        flags |= kDNSServiceFlagsReturnIntermediates;
+        if (operation == 'g')
+        {
+            flags |= kDNSServiceFlagsSuppressUnusable;
+            if (optional)
+                flags |= kDNSServiceFlagsValidateOptional;
+            else
+                flags |= kDNSServiceFlagsValidate;
+        }
+        if (argc != opi+2) 
+            goto Fail;
+        else 
+            err = DNSServiceGetAddrInfo(&client, flags, opinterface, GetProtocol(argv[opi+0]), argv[opi+1], addrinfo_reply, NULL);
+        break;
+    }
+#endif
+
+    case 'S':   {
+        Opaque16 registerPort = { { 0x23, 0x45 } };                 // 9029 decimal
+        unsigned char txtrec[16] = "\xF" "/path=test.html";
+        DNSRecordRef rec;
+        unsigned char nulrec[4] = "1234";
+
+        err = DNSServiceCreateConnection(&client);
+        if (err) { fprintf(stderr, "DNSServiceCreateConnection failed %ld\n", (long int)err); return (-1); }
+
+        sc1 = client;
+        err = DNSServiceBrowse(&sc1, kDNSServiceFlagsShareConnection, opinterface, "_http._tcp", "", browse_reply, NULL);
+        if (err) { fprintf(stderr, "DNSServiceBrowse _http._tcp failed %ld\n", (long int)err); return (-1); }
+
+        sc2 = client;
+        err = DNSServiceBrowse(&sc2, kDNSServiceFlagsShareConnection, opinterface, "_ftp._tcp", "", browse_reply, NULL);
+        if (err) { fprintf(stderr, "DNSServiceBrowse _ftp._tcp failed %ld\n", (long int)err); return (-1); }
+
+        sc3 = client;
+        err = DNSServiceRegister(&sc3, kDNSServiceFlagsShareConnection, opinterface, "kDNSServiceFlagsShareConnection",
+                                 "_http._tcp", "local", NULL, registerPort.NotAnInteger, 0, NULL, reg_reply, NULL);
+        if (err) { fprintf(stderr, "SharedConnection DNSServiceRegister failed %ld\n", (long int)err); return (-1); }
+
+        err = DNSServiceUpdateRecord(sc3, NULL, 0, sizeof(txtrec), txtrec, 0);
+        if (err) { fprintf(stderr, "SharedConnection DNSServiceUpdateRecord failed %ld\n", (long int)err); return (-1); }
+
+        err = DNSServiceAddRecord(sc3, &rec, 0, kDNSServiceType_NULL, sizeof(nulrec), nulrec, 0);
+        if (err) { fprintf(stderr, "SharedConnection DNSServiceAddRecord failed %ld\n", (long int)err); return (-1); }
+
+        err = DNSServiceRemoveRecord(sc3, rec, 0);
+        if (err) { fprintf(stderr, "SharedConnection DNSServiceRemoveRecord failed %ld\n", (long int)err); return (-1); }
+
+        break;
+    }
+
+    case 'V':   {
+        uint32_t v;
+        uint32_t size = sizeof(v);
+        err = DNSServiceGetProperty(kDNSServiceProperty_DaemonVersion, &v, &size);
+        if (err) fprintf(stderr, "DNSServiceGetProperty failed %ld\n", (long int)err);
+        else printf("Currently running daemon (system service) is version %d.%d.%d\n",  v / 10000, v / 100 % 100, v % 100);
+        exit(0);
+    }
+
+    case 'H': goto Fail;
+
+    default: goto Fail;
+    }
+
+    if (!client || err != kDNSServiceErr_NoError) { fprintf(stderr, "DNSService call failed %ld\n", (long int)err); return (-1); }
+    printtimestamp();
+    printf("...STARTING...\n");
+    HandleEvents();
+
+    // Be sure to deallocate the DNSServiceRef when you're finished
+    if (client   ) DNSServiceRefDeallocate(client   );
+    if (client_pa) DNSServiceRefDeallocate(client_pa);
+    return 0;
+
+Fail:
+    if (operation == 'H') print_usage(a0,1);
+    else print_usage(a0,0);
+    return 0;
+
+}
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// NOT static -- otherwise the compiler may optimize it out
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS[] = "@(#) dns-sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = VersionString_SCCS + 5;
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
diff --git a/mDNSResponder/Clients/dnsctl.c b/mDNSResponder/Clients/dnsctl.c
new file mode 100644
index 00000000..f040e1fb
--- /dev/null
+++ b/mDNSResponder/Clients/dnsctl.c
@@ -0,0 +1,177 @@
+/* -*- Mode: C; tab-width: 4 -*- 
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ * dnsctl.c 
+ * Command-line tool using libdns_services.dylib 
+ *   
+ * To build only this tool, copy and paste the following on the command line:
+ * On Apple 64bit Platforms ONLY OSX/iOS:
+ * clang -Wall dnsctl.c /usr/lib/libdns_services.dylib -o dnsctl
+ * 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <net/if.h> // if_nametoindex()
+
+#include <dispatch/dispatch.h>
+#include "dns_services.h"
+
+//*************************************************************************************************************
+// Globals:
+//*************************************************************************************************************
+
+static const char kFilePathSep   =  '/';
+static DNSXConnRef ClientRef     =  NULL;
+
+//*************************************************************************************************************
+// Utility Funcs:
+//*************************************************************************************************************
+
+static void printtimestamp(void) 
+{
+    struct tm tm; 
+    int ms; 
+    static char date[16];
+    static char new_date[16];
+    struct timeval tv; 
+    gettimeofday(&tv, NULL);
+    localtime_r((time_t*)&tv.tv_sec, &tm);
+    ms = tv.tv_usec/1000;
+    strftime(new_date, sizeof(new_date), "%a %d %b %Y", &tm);
+    //display date only if it has changed
+    if (strncmp(date, new_date, sizeof(new_date)))
+    {        
+        printf("DATE: ---%s---\n", new_date);
+        strncpy(date, new_date, sizeof(date));
+    }        
+    printf("%2d:%02d:%02d.%03d  ", tm.tm_hour, tm.tm_min, tm.tm_sec, ms); 
+}
+
+static void print_usage(const char *arg0)
+{
+    fprintf(stderr, "%s USAGE:                                                                  \n", arg0);
+    fprintf(stderr, "%s -DP Enable DNS Proxy with Default Parameters                            \n", arg0);
+    fprintf(stderr, "%s -DP [-o <output interface>] [-i <input interface(s)>] Enable DNS Proxy  \n", arg0);
+}
+
+//*************************************************************************************************************
+// CallBack Funcs:
+//*************************************************************************************************************
+
+// DNSXEnableProxy Callback from the Daemon
+static void dnsproxy_reply(DNSXConnRef connRef, DNSXErrorType errCode)
+{
+    (void) connRef;
+    printtimestamp();
+    switch (errCode)
+    {
+        case kDNSX_NoError          :  printf("  SUCCESS   \n");     break;
+        case kDNSX_DictError        :  printf(" DICT ERROR \n");     break;
+        case kDNSX_DaemonNotRunning :  printf(" NO DAEMON  \n");
+                                       DNSXRefDeAlloc(ClientRef);    break;
+        case kDNSX_Engaged          :  printf(" ENGAGED    \n");
+                                       DNSXRefDeAlloc(ClientRef);    break;
+        case kDNSX_UnknownErr       :
+        default                     :  printf("UNKNOWN ERR \n");
+                                       DNSXRefDeAlloc(ClientRef);    break;
+    }
+
+}
+
+//*************************************************************************************************************
+
+int main(int argc, char **argv)
+{
+    DNSXErrorType err;
+
+    // Default i/p intf is lo0 and o/p intf is primary interface
+    IfIndex Ipintfs[MaxInputIf] =  {1, 0, 0, 0, 0};
+    IfIndex Opintf = kDNSIfindexAny;
+
+    // Extract program name from argv[0], which by convention contains the path to this executable
+    const char *a0 = strrchr(argv[0], kFilePathSep) + 1; 
+    if (a0 == (const char *)1)
+        a0 = argv[0];
+
+    // Must run as root
+    if (0 != geteuid()) 
+    {        
+        fprintf(stderr, "%s MUST run as root!!\n", a0); 
+        exit(-1); 
+    }
+    if ((sizeof(argv) == 8))
+        printf("dnsctl running in 64-bit mode\n");
+    else if ((sizeof(argv) == 4))
+        printf("dnsctl running in 32-bit mode\n");
+
+    // expects atleast one argument
+    if (argc < 2)
+        goto Usage;
+
+    if ( !strcmp(argv[1], "-DP") || !strcmp(argv[1], "-dp") )
+    {
+        if (argc == 2)
+        {
+            printtimestamp();
+            printf("Proceeding to Enable DNSProxy on mDNSResponder with Default Parameters\n");
+            dispatch_queue_t my_Q = dispatch_queue_create("com.apple.dnsctl.callback_queue", NULL);
+            err = DNSXEnableProxy(&ClientRef, kDNSProxyEnable, Ipintfs, Opintf, my_Q, dnsproxy_reply);
+        }            
+        else if (argc > 2)
+        {
+            argc--;
+            argv++;
+            if (!strcmp(argv[1], "-o"))
+            {
+                Opintf = if_nametoindex(argv[2]);
+                if (!Opintf) 
+                    Opintf = atoi(argv[2]);
+                if (!Opintf) 
+                { 
+                    fprintf(stderr, "Could not parse o/p interface [%s]: Passing default primary \n", argv[2]); 
+                    Opintf = kDNSIfindexAny;
+                }
+                argc -= 2;
+                argv += 2;
+            }
+            if (argc > 2 && !strcmp(argv[1], "-i")) 
+            {
+                int i;
+                argc--;
+                argv++;
+                for (i = 0; i < MaxInputIf && argc > 1; i++)
+                {
+                    Ipintfs[i] = if_nametoindex(argv[1]);
+                    if (!Ipintfs[i])
+                        Ipintfs[i] = atoi(argv[1]);  
+                    if (!Ipintfs[i])
+                    {
+                        fprintf(stderr, "Could not parse i/p interface [%s]: Passing default lo0 \n", argv[2]); 
+                        Ipintfs[i] = 1;
+                    }
+                    argc--;
+                    argv++;
+                }
+            }  
+            printtimestamp();
+            printf("Proceeding to Enable DNSProxy on mDNSResponder \n");
+            dispatch_queue_t my_Q = dispatch_queue_create("com.apple.dnsctl.callback_queue", NULL);
+            err = DNSXEnableProxy(&ClientRef, kDNSProxyEnable, Ipintfs, Opintf, my_Q, dnsproxy_reply);                
+        }
+    }
+    else
+    {
+        goto Usage;
+    }
+
+    dispatch_main(); 
+
+Usage:
+    print_usage(a0);
+    return 0;
+}
+
diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.manifest b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.manifest
new file mode 100755
index 00000000..554f590b
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.mDNSNetMonitor" type="win32"/>
+	<description>mDNSNetMonitor command line utility.</description>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.rc b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.rc
new file mode 100644
index 00000000..2c0b25c3
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.rc
@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Network Utility"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "mDNSNetMonitor.exe"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "mDNSNetMonitor.exe"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcproj b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcproj
new file mode 100755
index 00000000..82e17e38
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="mDNSNetMonitor"

+	ProjectGUID="{AF35C285-528D-46A1-8A0E-47B0733DC718}"

+	RootNamespace="mDNSNetMonitor"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_USE_32BIT_TIME_T"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib crypt32.lib netapi32.lib powrprof.lib"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="mDNSNetMonitor.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_USE_32BIT_TIME_T"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSWindows"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib crypt32.lib netapi32.lib powrprof.lib"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="mDNSNetMonitor.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                          &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\mDNSCore\DNSCommon.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\DNSDigest.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\SystemService\Firewall.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\mDNSDebug.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\mDNSWin32.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSPosix\NetMonitor.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\PosixCompat.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\Secret.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\uDNS.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\mDNSCore\DNSCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\SystemService\Firewall.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\mDNSDebug.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\mDNSEmbeddedAPI.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\mDNSWin32.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\PosixCompat.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\RegNames.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSWindows\Secret.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\uDNS.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\mDNSNetMonitor.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj
new file mode 100755
index 00000000..89a27a4d
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{AF35C285-528D-46A1-8A0E-47B0733DC718}</ProjectGuid>

+    <RootNamespace>mDNSNetMonitor</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>mDNSNetMonitor.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>mDNSNetMonitor.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>mDNSNetMonitor.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows/SystemService;../../mDNSWindows;../../mDNSShared;../../mDNSCore;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../../mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>mDNSNetMonitor.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSCore\anonymous.c" />

+    <ClCompile Include="..\..\mDNSCore\CryptoAlg.c" />

+    <ClCompile Include="..\..\mDNSCore\DNSCommon.c" />

+    <ClCompile Include="..\..\mDNSCore\DNSDigest.c" />

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c" />

+    <ClCompile Include="..\..\mDNSWindows\Poll.c" />

+    <ClCompile Include="..\..\mDNSWindows\SystemService\Firewall.cpp" />

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c" />

+    <ClCompile Include="..\..\mDNSShared\mDNSDebug.c" />

+    <ClCompile Include="..\..\mDNSWindows\mDNSWin32.c" />

+    <ClCompile Include="..\..\mDNSPosix\NetMonitor.c" />

+    <ClCompile Include="..\..\mDNSWindows\PosixCompat.c" />

+    <ClCompile Include="..\..\mDNSWindows\Secret.c" />

+    <ClCompile Include="..\..\mDNSCore\uDNS.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSCore\anonymous.h" />

+    <ClInclude Include="..\..\mDNSCore\CryptoAlg.h" />

+    <ClInclude Include="..\..\mDNSCore\DNSCommon.h" />

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h" />

+    <ClInclude Include="..\..\mDNSWindows\Poll.h" />

+    <ClInclude Include="..\..\mDNSWindows\SystemService\Firewall.h" />

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h" />

+    <ClInclude Include="..\..\mDNSCore\mDNSDebug.h" />

+    <ClInclude Include="..\..\mDNSCore\mDNSEmbeddedAPI.h" />

+    <ClInclude Include="..\..\mDNSWindows\mDNSWin32.h" />

+    <ClInclude Include="..\..\mDNSWindows\PosixCompat.h" />

+    <ClInclude Include="..\..\mDNSWindows\RegNames.h" />

+    <ClInclude Include="..\..\mDNSWindows\Secret.h" />

+    <ClInclude Include="..\..\mDNSCore\uDNS.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="mDNSNetMonitor.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\mDNSWindows\SystemService\Service.vcxproj">

+      <Project>{c1d98254-ba27-4427-a3be-a68ca2cc5f69}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj.filters b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj.filters
new file mode 100755
index 00000000..b9a25beb
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/mDNSNetMonitor.vcxproj.filters
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSCore\DNSCommon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\DNSDigest.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\SystemService\Firewall.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\mDNSDebug.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\mDNSWin32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSPosix\NetMonitor.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\PosixCompat.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\Secret.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\uDNS.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSWindows\Poll.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\anonymous.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\CryptoAlg.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSCore\DNSCommon.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\SystemService\Firewall.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\mDNSDebug.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\mDNSEmbeddedAPI.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\mDNSWin32.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\PosixCompat.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\RegNames.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\Secret.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\uDNS.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSWindows\Poll.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\anonymous.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\CryptoAlg.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="mDNSNetMonitor.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/resource.h b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/resource.h
new file mode 100644
index 00000000..31ad9f0e
--- /dev/null
+++ b/mDNSResponder/Clients/mDNSNetMonitor.VisualStudio/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by mDNSNetMonitor.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/LICENSE b/mDNSResponder/LICENSE
new file mode 100644
index 00000000..f4589044
--- /dev/null
+++ b/mDNSResponder/LICENSE
@@ -0,0 +1,13 @@
+The majority of the source code in the mDNSResponder project is licensed
+under the terms of the Apache License, Version 2.0, available from:
+   <http://www.apache.org/licenses/LICENSE-2.0>
+
+To accommodate license compatibility with the widest possible range
+of client code licenses, the shared library code, which is linked
+at runtime into the same address space as the client using it, is
+licensed under the terms of the "Three-Clause BSD License".
+
+The Linux Name Service Switch code, contributed by National ICT
+Australia Ltd (NICTA) is licensed under the terms of the NICTA Public
+Software Licence (which is substantially similar to the "Three-Clause
+BSD License", with some additional language pertaining to Australian law).
diff --git a/mDNSResponder/Makefile b/mDNSResponder/Makefile
new file mode 100644
index 00000000..606c129c
--- /dev/null
+++ b/mDNSResponder/Makefile
@@ -0,0 +1,49 @@
+#
+# Top level makefile for Build & Integration.
+# 
+# This file is used to facilitate checking the mDNSResponder project
+# directly out of CVS and submitting to B&I at Apple.
+#
+# The various platform directories contain makefiles or projects
+# specific to that platform.
+#
+#    B&I builds must respect the following target:
+#         install:
+#         installsrc:
+#         installhdrs:
+#         clean:
+#
+
+include $(MAKEFILEPATH)/pb_makefiles/platform.make
+
+MVERS = "mDNSResponder-544"
+
+DDNSWRITECONFIG = "$(DSTROOT)/Library/Application Support/Bonjour/ddnswriteconfig"
+VER = 
+ifneq ($(strip $(GCC_VERSION)),)
+	VER = -- GCC_VERSION=$(GCC_VERSION)
+endif
+echo "VER = $(VER)"
+
+installSome:
+	cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install     OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT) -target Build\ Some $(VER) 
+
+SystemLibraries:
+	cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install     OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT) -target SystemLibraries $(VER) 
+
+install:
+	cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install     OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT) $(VER) 
+	# Make sure ddnswriteconfig is owned by root:wheel, then make it setuid root executable
+	if test -e $(DDNSWRITECONFIG) ; then chown 0:80 $(DDNSWRITECONFIG) ; chmod 4555 $(DDNSWRITECONFIG) ; fi
+
+installsrc:
+	ditto . "$(SRCROOT)"
+
+installhdrs::
+	cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild installhdrs OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT)  -target SystemLibraries $(VER)
+
+java:
+	cd "$(SRCROOT)/mDNSMacOSX"; xcodebuild install  OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT) -target libjdns_sd.jnilib $(VER)
+
+clean::
+	echo clean
diff --git a/mDNSResponder/PrivateDNS.txt b/mDNSResponder/PrivateDNS.txt
new file mode 100644
index 00000000..e66bec80
--- /dev/null
+++ b/mDNSResponder/PrivateDNS.txt
@@ -0,0 +1,275 @@
+Private DNS
+
+Summary
+
+Private DNS is an extension to standard Wide Area Bonjour that allows
+for secure, encrypted, and authorized communications. Private data sent
+from a client to a DNS server is encrypted using Transport Layer
+Security (TLS), ensuring that the data is hidden from prying eyes, and
+contains Transaction Signatures (TSIG), so the server can authorize the
+request. TSIGs are typically associated with Dynamic Updates; we are
+using them for standard and long-lived queries as well. Private DNS also
+protects Dynamic Updates from eavesdropping, by wrapping the update in a
+TLS communication channel if the server has been configured appropriately.
+
+Architectural Overview
+
+mDNSResponder has been modified to automatically issue a private query
+when necessary. After receiving an NXDOMAIN error, mDNSResponder checks
+in the system keychain to see if the user has a DNS query key (TSIG key)
+for the name in question, or for a parent of that name. If a suitable
+key is found, mDNSResponder looks up the zone data associated with the
+name of the question. After determining the correct name server,
+mDNSResponder looks up an additional SRV record "_dns-private._tcp". If
+it finds this record, mDNSResponder will re-issue the query privately.
+If either there is no _dns-private._tcp record, or there is no secret
+key, the call fails as it initially did, with an NXDOMAIN error.
+
+Once the secret key is found and the SRV record is looked up, mDNSResponder
+opens a TLS connection to the server on the port specified in the SRV
+record just looked up. After the connection succeeds, mDNSResponder
+can proceed to use that communication channel to make requests of
+the server. Every private packet must also have a TSIG record;
+the DNS server uses this TSIG record to allow access to its data.
+
+When setting up a long-lived query over TCP (with or without TLS)
+TCP's standard three-way handshake makes the full four-packet LLQ setup
+exchange described in <http://files.dns-sd.org/draft-sekar-dns-llq.txt>
+unnecessary. Instead, when connecting over TCP, the client simply sends
+a setup message and expects to receive ACK + Answers. The setup message
+sent is formatted as described in the LLQ document, however there is
+an additional TSIG' resource record added to the end of it. The TSIG
+resource records looks and acts exactly as it does in a secure update.
+So when the server receives an LLQ (or a standard query), it looks to
+see if the zone that is being referenced is public or private. If it's
+private, then it makes sure that the client is authorized to query that
+zone (by using the TSIG signature) and returns the appropriate data.
+When a zone is configured as private, the server will do this type of
+authorization checking for every query except those queries that are
+looking for SOA and NS records.
+
+Implementation Issues
+
+dnsextd
+
+dnsextd has been modified to behave much like a DNS firewall. The "real"
+DNS server is configured to listen on non-standard ports on the loopback
+interface. dnsextd then listens on the standard DNS ports (TCP/UDP port
+53) and intercepts all DNS traffic. It is responsible for determining
+what zone a DNS request is associated with, determining whether the
+client is allowed access to that zone, and returning the appropriate
+information back to the caller. If the packet is allowed access, dnsextd
+forwards the request to the "real" nameserver, and returns the result to
+the caller.
+
+It was tempting to use BIND9's facility for configuring TSIG enabled
+queries while doing this work. However after proceeding down that path,
+enough subtle interaction problems were found that it was not practical
+to pursue this direction, so instead dnsextd does all TSIG processing
+for queries itself. It does continue to use BIND9 for processing TSIG
+enabled dynamic updates, though one minor downside with this is that
+there are two configuration files (named.conf or dnsextd.conf) that have
+the same secret key information. That seems redundant and error-prone,
+and moving all TSIG processing for both queries and updates into dnsextd
+would fix this.
+
+All private LLQ operations are TSIG-enabled and sent over a secure
+encrypted TLS channel. To accommodate service providers who don't want
+to have to keep open a large number of TLS connections to a large number
+of client machines, the server has the option of dropping the TLS
+connection after initial LLQ setup and sending subsequent events and
+refreshes using unencrypted UDP packets. This results in less load on
+the server, at the cost of slightly lower security (LLQs can only be set
+up by an authorized client, but once set up, subsequent change event
+packets sent over unencrypted UDP could be observed by an eavesdropper).
+A potential solution to this deficiency might be in using DTLS, which is
+a protocol based on TLS that is capable of securing datagram traffic.
+More investigation needs to be done to see if DTLS is suitable for
+private DNS.
+
+It was necessary to relax one of the checks that dnsextd performs during
+processing of an LLQ refresh. Prior to these changes, dnsextd would
+verify that the refresh request came from the same entity that setup the
+LLQ by comparing both the IP Address and port number of the request
+packet with the IP Address and port number of the setup packet. Because
+of the preceding issue, a refresh request might be sent over two
+different sockets. While their IP addresses would be the same, their
+port numbers could potentially differ. This check has been modified to
+only check that the IP addresses match.
+
+When setting up a semi-private LLQ (where the request and initial answer
+set is sent over TLS/TCP, but subsequent change events are sent over
+unencrypted UDP), dnsextd uses the port number of the client's TCP
+socket to determine the UDP event port number. While this eliminates the
+need to pass the UDP event port number in the LLQ setup request
+(obviating a potential data mismatch error), I think it does more harm
+than good, for three reasons:
+
+1) We are relying that all the routers out there implement the Port
+   Mapping Protocol spec correctly.
+
+2) Upon setup every LLQ must NAT map two ports. Upon tear down every LLQ
+   must tear down two NAT mappings.
+
+3) Every LLQ opens up two sockets (TCP and UDP), rather than just the
+   one TCP socket.
+
+All of this just to avoid sending two bytes in the LLQ setup packet
+doesn't seem logical. The approach also necessitates creating an
+additional UDP socket for every private LLQ, port mapping both the TCP
+socket as well as the UDP socket, and moderately increasing the
+complexity and efficiency of the code. Because of this we plan to allow
+the LLQ setup packet to specify a different UDP port for change event
+packets. This will allow mDNSResponder to receive all UDP change event
+packets on a single UDP port, instead of a different one for each LLQ.
+
+Currently, dnsextd is buggy on multi-homed hosts. If it receives a
+packet on interface 2, it will reply on interface 1 causing an error in
+the client program.
+
+dnsextd doesn't fully process all of its option parameters.
+Specifically, it doesn't process the keywords: "listen-on",
+"nameserver", "private", and "llq". It defaults to expecting the "real"
+nameserver to be listening on 127.0.0.1:5030.
+
+
+mDNSResponder
+
+Currently, mDNSResponder attempts to issue private queries for all
+queries that initially result in an NXDOMAIN error. This behavior might
+be modified in future versions, however it seems patently incorrect to
+do this for reverse name lookups. The code that attempts to get the zone
+data associated with the name will never find the zone for a reverse
+name lookup, and so will issue a number of wasteful DNS queries.
+
+mDNSResponder doesn't handle SERV_FULL or STATIC return codes after
+setting up an LLQ over TCP. This isn't a terrible problem right now,
+because dnsextd doesn't ever return them, but this should be fixed so
+that mDNSResponder will work when talking to other servers that do
+return these error codes.
+
+
+Configuration:
+
+Sample named.conf:
+
+//
+// Include keys file
+//
+include "/etc/rndc.key";
+// Declares control channels to be used by the rndc utility.
+//
+// It is recommended that 127.0.0.1 be the only address used.
+// This also allows non-privileged users on the local host to manage
+// your name server.
+
+//
+// Default controls
+//
+controls
+	{
+	inet 127.0.0.1 port 54 allow { any; } keys { "rndc-key"; };
+	};
+
+options
+	{
+	directory "/var/named";
+	/*
+	 * If there is a firewall between you and nameservers you want
+	 * to talk to, you might need to uncomment the query-source
+	 * directive below. Previous versions of BIND always asked
+	 * questions using port 53, but BIND 8.1 uses an unprivileged
+	 * port by default.
+	 */
+	
+	forwarders
+			{
+			65.23.128.2;
+			65.23.128.3;
+			};
+	
+	listen-on port 5030 { 127.0.0.1; };
+	recursion true;
+	};
+
+// 
+// a caching only nameserver config
+// 
+zone "." IN
+	{
+	type hint;
+	file "named.ca";
+	};
+
+zone "localhost" IN
+	{
+	type master;
+	file "localhost.zone";
+	allow-update { none; };
+	};
+
+zone "0.0.127.in-addr.arpa" IN
+	{
+	type master;
+	file "named.local";
+	allow-update { none; };
+	};
+
+zone "hungrywolf.org." in
+	{
+	type master;
+	file "db.hungrywolf.org";
+	allow-update { key hungrywolf.org.; };
+	};
+
+zone "157.23.65.in-addr.arpa" IN
+	{
+	file "db.65.23.157";
+	type master;
+	};
+
+zone "100.255.17.in-addr.arpa" IN
+	{
+	file "db.17.255.100";
+	type master;
+	};
+
+zone "66.6.24.in-addr.arpa" IN
+	{
+	file "db.24.6.66";
+	type master;
+	};
+
+key hungrywolf.org.
+	{
+	algorithm hmac-md5;
+	secret "c8LWr16K6ju6KMO5zT6Tyg==";
+	};
+
+logging
+	{
+	category default { _default_log; };
+
+	channel _default_log
+		{
+		file "/Library/Logs/named.log";
+		severity info;
+		print-time yes;
+		};
+	};
+
+
+Sample dnsextd.conf:
+
+options { };
+
+key "hungrywolf.org."
+	{
+	secret "c8LWr16K6ju6KMO5zT6Tyg==";
+	};
+
+zone "hungrywolf.org."
+	{
+	type private;
+	allow-query { key hungrywolf.org.; };
+	};
diff --git a/mDNSResponder/README.txt b/mDNSResponder/README.txt
new file mode 100644
index 00000000..86b041ee
--- /dev/null
+++ b/mDNSResponder/README.txt
@@ -0,0 +1,166 @@
+What is mDNSResponder?
+----------------------
+
+The mDNSResponder project is a component of Bonjour,
+Apple's ease-of-use IP networking initiative:
+<http://developer.apple.com/bonjour/>
+
+Apple's Bonjour software derives from the ongoing standardization
+work of the IETF Zero Configuration Networking Working Group:
+<http://zeroconf.org/>
+
+The Zeroconf Working Group has identified three requirements for Zero
+Configuration Networking:
+1. An IP address (even when there is no DHCP server to assign one)
+2. Name-to-address translation (even when there is no DNS server)
+3. Discovery of Services on the network (again, without infrastucture)
+
+Requirement 1 is met by self-assigned link-local addresses, as
+described in "Dynamic Configuration of IPv4 Link-Local Addresses"
+<http://files.zeroconf.org/draft-ietf-zeroconf-ipv4-linklocal.txt>
+
+Requirement 2 is met by sending DNS-like queries via Multicast (mDNS).
+
+Requirement 3 is met by DNS Service Dicsovery (DNS-SD).
+
+Self-assigned link-local address capability has been available since
+1998, when it first appeared in Windows '98 and in Mac OS 8.5.
+Implementations for other platforms also exist.
+
+The mDNSResponder project allows us to meet requirements 2 and 3.
+It provides the ability for the user to identify hosts using names
+instead of dotted-decimal IP addresses, even if the user doesn't have a
+conventional DNS server set up. It also provides the ability for the
+user to discover what services are being advertised on the network,
+without having to know about them in advance, or configure the machines.
+
+The name "mDNS" was chosen because this protocol is designed to be,
+as much as possible, similar to conventional DNS. The main difference is
+that queries are sent via multicast to all local hosts, instead of via
+unicast to a specific known server. Every host on the local link runs an
+mDNSResponder which is constantly listening for those multicast queries,
+and if the mDNSResponder receives a query for which it knows the answer,
+then it responds. The mDNS protocol uses the same packet format as
+unicast DNS, and the same name structure, and the same DNS record types.
+The main difference is that queries are sent to a different UDP port
+(5353 instead of 53) and they are sent via multicast to address
+224.0.0.251. Another important difference is that all "mDNS" names
+end in ".local." When a user types "yourcomputer.local." into their Web
+browser, the presence of ".local." on the end of the name tells the host
+OS that the name should be looked up using local multicast instead of by
+sending that name to the worldwide DNS service for resolution. This
+helps reduce potential user confusion about whether a particular name
+is globally unique (e.g. "www.apple.com.") or whether that name has only
+local significance (e.g. "yourcomputer.local.").
+
+
+About the mDNSResponder Code
+----------------------------
+
+Because Apple benefits more from widespread adoption of Bonjour than
+it would benefit from keeping Bonjour proprietary, Apple is making
+this code open so that other developers can use it too.
+
+Because Apple recognises that networks are hetrogenous environments
+where devices run many different kinds of OS, this code has been made
+as portable as possible.
+
+A typical mDNS program contains three components:
+
+    +------------------+
+    |   Application    |
+    +------------------+
+    |    mDNS Core     |
+    +------------------+
+    | Platform Support |
+    +------------------+
+
+The "mDNS Core" layer is absolutely identical for all applications and
+all Operating Systems.
+
+The "Platform Support" layer provides the necessary supporting routines
+that are specific to each platform -- what routine do you call to send
+a UDP packet, what routine do you call to join multicast group, etc.
+
+The "Application" layer does whatever that particular application wants
+to do. It calls routines provided by the "mDNS Core" layer to perform
+the functions it needs --
+ * advertise services,
+ * browse for named instances of a particular type of service
+ * resolve a named instance to a specific IP address and port number,
+ * etc.
+The "mDNS Core" layer in turn calls through to the "Platform Support"
+layer to send and receive the multicast UDP packets to do the actual work.
+
+Apple currently provides "Platform Support" layers for Mac OS 9, Mac OS X,
+Microsoft Windows, VxWorks, and for POSIX platforms like Linux, Solaris,
+FreeBSD, etc.
+
+Note: Developers writing applications for OS X do not need to incorporate
+this code into their applications, since OS X provides a system service to
+handle this for them. If every application developer were to link-in the
+mDNSResponder code into their application, then we would end up with a
+situation like the picture below:
+
+  +------------------+    +------------------+    +------------------+
+  |   Application 1  |    |   Application 2  |    |   Application 3  |
+  +------------------+    +------------------+    +------------------+
+  |    mDNS Core     |    |    mDNS Core     |    |    mDNS Core     |
+  +------------------+    +------------------+    +------------------+
+  | Platform Support |    | Platform Support |    | Platform Support |
+  +------------------+    +------------------+    +------------------+
+
+This would not be very efficient. Each separate application would be sending
+their own separate multicast UDP packets and maintaining their own list of
+answers. Because of this, OS X provides a common system service which client
+software should access through the "/usr/include/dns_sd.h" APIs.
+
+The situation on OS X looks more like the picture below:
+
+                                   -------------------
+                                  /                   \
+  +---------+    +------------------+    +---------+   \  +---------+
+  |  App 1  |<-->|    daemon.c      |<-->|  App 2  |    ->|  App 3  |
+  +---------+    +------------------+    +---------+      +---------+
+                 |    mDNS Core     |
+                 +------------------+
+                 | Platform Support |
+                 +------------------+
+
+Applications on OS X make calls to the single mDNSResponder daemon
+which implements the mDNS and DNS-SD protocols. 
+
+Vendors of products such as printers, which are closed environments not
+expecting to be running third-party application software, can reasonably
+implement a single monolithic mDNSResponder to advertise all the
+services of that device. Vendors of open systems which run third-party
+application software should implement a system service such as the one
+provided by the OS X mDNSResponder daemon, and application software on
+that platform should, where possible, make use of that system service
+instead of embedding their own mDNSResponder.
+
+See ReadMe.txt in the mDNSPosix directory for specific details of
+building an mDNSResponder on a POSIX Operating System.
+
+
+Compiling on Older C Compilers
+------------------------------
+
+We go to some lengths to make the code portable, but //-style comments
+are one of the modern conveniences we can't live without.
+
+If your C compiler doesn't understand these comments, you can transform
+them into classical K&R /* style */ comments with a quick GREP
+search-and-replace pattern.
+
+In BBEdit on the Mac:
+1. Open the "Find" dialog window and make sure "Use Grep" is selected
+2. Search For  : ([^:])//(.*)
+3. Replace With: \1/*\2 */
+4. Drag your mDNSResponder source code folder to the Multi-File search pane
+5. Click "Replace All"
+
+For the more command-line oriented, cd into your mDNSResponder source code
+directory and execute the following command (all one line):
+
+find mDNSResponder \( -name \*.c\* -or -name \*.h \) -exec sed -i .orig -e 's,^//\(.*\),/*\1 */,' -e '/\/\*/\!s,\([^:]\)//\(.*\),\1/*\2 */,' {} \;
diff --git a/mDNSResponder/mDNSCore/CryptoAlg.c b/mDNSResponder/mDNSCore/CryptoAlg.c
new file mode 100644
index 00000000..38533fc8
--- /dev/null
+++ b/mDNSResponder/mDNSCore/CryptoAlg.c
@@ -0,0 +1,280 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// CryptoAlg.c:
+// Interface to DNSSEC cryptographic algorithms. The crypto support itself is
+// provided by the platform and the functions in this file just provide an
+// interface to access them in a more generic way.
+// ***************************************************************************
+
+#include "mDNSEmbeddedAPI.h"
+#include "CryptoAlg.h"
+
+AlgFuncs *DigestAlgFuncs[DIGEST_TYPE_MAX];
+AlgFuncs *CryptoAlgFuncs[CRYPTO_ALG_MAX];
+AlgFuncs *EncAlgFuncs[ENC_ALG_MAX];
+
+mDNSexport mStatus DigestAlgInit(mDNSu8 digestType, AlgFuncs *func)
+{
+    if (digestType >= DIGEST_TYPE_MAX)
+    {
+        LogMsg("DigestAlgInit: digestType %d exceeds bounds", digestType);
+        return mStatus_BadParamErr;
+    }
+    // As digestTypes may not be consecutive, check for specific digest types
+    // that we support
+    if (digestType != SHA1_DIGEST_TYPE &&
+        digestType != SHA256_DIGEST_TYPE)
+    {
+        LogMsg("DigestAlgInit: digestType %d not supported", digestType);
+        return mStatus_BadParamErr;
+    }
+    DigestAlgFuncs[digestType] = func;
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus CryptoAlgInit(mDNSu8 alg, AlgFuncs *func)
+{
+    if (alg >= CRYPTO_ALG_MAX)
+    {
+        LogMsg("CryptoAlgInit: alg %d exceeds bounds", alg);
+        return mStatus_BadParamErr;
+    }
+    // As algs may not be consecutive, check for specific algorithms
+    // that we support
+    if (alg != CRYPTO_RSA_SHA1 && alg != CRYPTO_RSA_SHA256 && alg != CRYPTO_RSA_SHA512 &&
+        alg != CRYPTO_DSA_NSEC3_SHA1 && alg != CRYPTO_RSA_NSEC3_SHA1)
+    {
+        LogMsg("CryptoAlgInit: alg %d not supported", alg);
+        return mStatus_BadParamErr;
+    }
+
+    CryptoAlgFuncs[alg] = func;
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus EncAlgInit(mDNSu8 alg, AlgFuncs *func)
+{
+    if (alg >= ENC_ALG_MAX)
+    {
+        LogMsg("EncAlgInit: alg %d exceeds bounds", alg);
+        return mStatus_BadParamErr;
+    }
+
+    // As algs may not be consecutive, check for specific algorithms
+    // that we support
+    if (alg != ENC_BASE32 && alg != ENC_BASE64)
+    {
+        LogMsg("EncAlgInit: alg %d not supported", alg);
+        return mStatus_BadParamErr;
+    }
+
+    EncAlgFuncs[alg] = func;
+    return mStatus_NoError;
+}
+
+mDNSexport AlgContext *AlgCreate(AlgType type, mDNSu8 alg)
+{
+    AlgFuncs *func = mDNSNULL;
+    AlgContext *ctx;
+
+    if (type == CRYPTO_ALG)
+    {
+        if (alg >= CRYPTO_ALG_MAX) return mDNSNULL;
+        func = CryptoAlgFuncs[alg];
+    }
+    else if (type == DIGEST_ALG)
+    {
+        if (alg >= DIGEST_TYPE_MAX) return mDNSNULL;
+        func = DigestAlgFuncs[alg];
+    }
+    else if (type == ENC_ALG)
+    {
+        if (alg >= ENC_ALG_MAX) return mDNSNULL;
+        func = EncAlgFuncs[alg];
+    }
+
+    if (!func)
+    {
+        // If there is no support from the platform, this case can happen.
+        LogInfo("AlgCreate: func is NULL");
+        return mDNSNULL;
+    }
+
+    if (func->Create)
+    {
+        mStatus err;
+        ctx = mDNSPlatformMemAllocate(sizeof(AlgContext));
+        if (!ctx) return mDNSNULL;
+        // Create expects ctx->alg to be initialized
+        ctx->alg = alg;
+        err = func->Create(ctx);
+        if (err == mStatus_NoError)
+        {
+            ctx->type = type;
+            return ctx;
+        }
+        mDNSPlatformMemFree(ctx);
+    }
+    return mDNSNULL;
+}
+
+mDNSexport mStatus AlgDestroy(AlgContext *ctx)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    if (!func)
+    {
+        LogMsg("AlgDestroy: ERROR!! func is NULL");
+        mDNSPlatformMemFree(ctx);
+        return mStatus_BadParamErr;
+    }
+
+    if (func->Destroy)
+        func->Destroy(ctx);
+
+    mDNSPlatformMemFree(ctx);
+    return mStatus_NoError;
+}
+
+mDNSexport mDNSu32 AlgLength(AlgContext *ctx)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    // This should never happen as AlgCreate would have failed
+    if (!func)
+    {
+        LogMsg("AlgLength: ERROR!! func is NULL");
+        return 0;
+    }
+
+    if (func->Length)
+        return (func->Length(ctx));
+    else
+        return 0;
+}
+
+mDNSexport mStatus AlgAdd(AlgContext *ctx, const void *data, mDNSu32 len)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    // This should never happen as AlgCreate would have failed
+    if (!func)
+    {
+        LogMsg("AlgAdd: ERROR!! func is NULL");
+        return mStatus_BadParamErr;
+    }
+
+    if (func->Add)
+        return (func->Add(ctx, data, len));
+    else
+        return mStatus_BadParamErr;
+}
+
+mDNSexport mStatus AlgVerify(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *signature, mDNSu32 siglen)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    // This should never happen as AlgCreate would have failed
+    if (!func)
+    {
+        LogMsg("AlgVerify: ERROR!! func is NULL");
+        return mStatus_BadParamErr;
+    }
+
+    if (func->Verify)
+        return (func->Verify(ctx, key, keylen, signature, siglen));
+    else
+        return mStatus_BadParamErr;
+}
+
+mDNSexport mDNSu8* AlgEncode(AlgContext *ctx)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    // This should never happen as AlgCreate would have failed
+    if (!func)
+    {
+        LogMsg("AlgEncode: ERROR!! func is NULL");
+        return mDNSNULL;
+    }
+
+    if (func->Encode)
+        return (func->Encode(ctx));
+    else
+        return mDNSNULL;
+}
+
+mDNSexport mStatus AlgFinal(AlgContext *ctx, void *data, mDNSu32 len)
+{
+    AlgFuncs *func = mDNSNULL;
+
+    if (ctx->type == CRYPTO_ALG)
+        func = CryptoAlgFuncs[ctx->alg];
+    else if (ctx->type == DIGEST_ALG)
+        func = DigestAlgFuncs[ctx->alg];
+    else if (ctx->type == ENC_ALG)
+        func = EncAlgFuncs[ctx->alg];
+
+    // This should never happen as AlgCreate would have failed
+    if (!func)
+    {
+        LogMsg("AlgEncode: ERROR!! func is NULL");
+        return mDNSNULL;
+    }
+
+    if (func->Final)
+        return (func->Final(ctx, data, len));
+    else
+        return mStatus_BadParamErr;
+}
diff --git a/mDNSResponder/mDNSCore/CryptoAlg.h b/mDNSResponder/mDNSCore/CryptoAlg.h
new file mode 100644
index 00000000..6cb3dc9d
--- /dev/null
+++ b/mDNSResponder/mDNSCore/CryptoAlg.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __CRYPTO_ALG_H
+#define __CRYPTO_ALG_H
+
+typedef enum
+{
+    CRYPTO_ALG,
+    DIGEST_ALG,
+    ENC_ALG,
+} AlgType;
+
+typedef struct
+{
+    void *context;
+    AlgType type;
+    mDNSu8 alg;
+} AlgContext;
+
+typedef struct
+{
+    mStatus (*Create)(AlgContext *ctx);
+    mStatus (*Destroy)(AlgContext *ctx);
+    mDNSu32 (*Length)(AlgContext *ctx);
+    mStatus (*Add)(AlgContext *ctx, const void *data, mDNSu32 len);
+    // Verify the ctx using the key and compare it against signature/siglen
+    mStatus (*Verify)(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *signature, mDNSu32 siglen);
+    // Encode the data and return the encoded data
+    mDNSu8* (*Encode)(AlgContext *ctx);
+    // Return the finalized data in data whose length is len (used by hash algorithms)
+    mStatus (*Final)(AlgContext *ctx, void *data, mDNSu32 len);
+} AlgFuncs;
+
+mDNSexport mStatus DigestAlgInit(mDNSu8 digestType, AlgFuncs *func);
+mDNSexport mStatus CryptoAlgInit(mDNSu8 algType, AlgFuncs *func);
+mDNSexport mStatus EncAlgInit(mDNSu8 algType, AlgFuncs *func);
+
+
+extern AlgContext *AlgCreate(AlgType type, mDNSu8 alg);
+extern mStatus AlgDestroy(AlgContext *ctx);
+extern mDNSu32 AlgLength(AlgContext *ctx);
+extern mStatus AlgAdd(AlgContext *ctx, const void *data, mDNSu32 len);
+extern mStatus AlgVerify(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *signature, mDNSu32 siglen);
+extern mDNSu8* AlgEncode(AlgContext *ctx);
+extern mStatus AlgFinal(AlgContext *ctx, void *data, mDNSu32 len);
+
+#endif // __CRYPTO_ALG_H
diff --git a/mDNSResponder/mDNSCore/DNSCommon.c b/mDNSResponder/mDNSCore/DNSCommon.c
new file mode 100644
index 00000000..947607cf
--- /dev/null
+++ b/mDNSResponder/mDNSCore/DNSCommon.c
@@ -0,0 +1,4319 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Set mDNS_InstantiateInlines to tell mDNSEmbeddedAPI.h to instantiate inline functions, if necessary
+#define mDNS_InstantiateInlines 1
+#include "DNSCommon.h"
+#include "CryptoAlg.h"
+#include "anonymous.h"
+
+// Disable certain benign warnings with Microsoft compilers
+#if (defined(_MSC_VER))
+// Disable "conditional expression is constant" warning for debug macros.
+// Otherwise, this generates warnings for the perfectly natural construct "while(1)"
+// If someone knows a variant way of writing "while(1)" that doesn't generate warning messages, please let us know
+    #pragma warning(disable:4127)
+// Disable "array is too small to include a terminating null character" warning
+// -- domain labels have an initial length byte, not a terminating null character
+    #pragma warning(disable:4295)
+#endif
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Program Constants
+#endif
+
+mDNSexport const mDNSInterfaceID mDNSInterface_Any       = 0;
+mDNSexport const mDNSInterfaceID mDNSInterfaceMark       = (mDNSInterfaceID)-1;
+mDNSexport const mDNSInterfaceID mDNSInterface_LocalOnly = (mDNSInterfaceID)-2;
+mDNSexport const mDNSInterfaceID mDNSInterface_Unicast   = (mDNSInterfaceID)-3;
+mDNSexport const mDNSInterfaceID mDNSInterface_P2P       = (mDNSInterfaceID)-4;
+mDNSexport const mDNSInterfaceID uDNSInterfaceMark       = (mDNSInterfaceID)-5;
+
+// Note: Microsoft's proposed "Link Local Multicast Name Resolution Protocol" (LLMNR) is essentially a limited version of
+// Multicast DNS, using the same packet formats, naming syntax, and record types as Multicast DNS, but on a different UDP
+// port and multicast address, which means it won't interoperate with the existing installed base of Multicast DNS responders.
+// LLMNR uses IPv4 multicast address 224.0.0.252, IPv6 multicast address FF02::0001:0003, and UDP port 5355.
+// Uncomment the appropriate lines below to build a special Multicast DNS responder for testing interoperability
+// with Microsoft's LLMNR client code.
+
+#define   DiscardPortAsNumber               9
+#define   SSHPortAsNumber                  22
+#define   UnicastDNSPortAsNumber           53
+#define   SSDPPortAsNumber               1900
+#define   IPSECPortAsNumber              4500
+#define   NSIPCPortAsNumber              5030       // Port used for dnsextd to talk to local nameserver bound to loopback
+#define   NATPMPAnnouncementPortAsNumber 5350
+#define   NATPMPPortAsNumber             5351
+#define   DNSEXTPortAsNumber             5352       // Port used for end-to-end DNS operations like LLQ, Updates with Leases, etc.
+#define   MulticastDNSPortAsNumber       5353
+#define   LoopbackIPCPortAsNumber        5354
+//#define MulticastDNSPortAsNumber       5355		// LLMNR
+#define   PrivateDNSPortAsNumber         5533
+
+mDNSexport const mDNSIPPort DiscardPort            = { { DiscardPortAsNumber            >> 8, DiscardPortAsNumber            & 0xFF } };
+mDNSexport const mDNSIPPort SSHPort                = { { SSHPortAsNumber                >> 8, SSHPortAsNumber                & 0xFF } };
+mDNSexport const mDNSIPPort UnicastDNSPort         = { { UnicastDNSPortAsNumber         >> 8, UnicastDNSPortAsNumber         & 0xFF } };
+mDNSexport const mDNSIPPort SSDPPort               = { { SSDPPortAsNumber               >> 8, SSDPPortAsNumber               & 0xFF } };
+mDNSexport const mDNSIPPort IPSECPort              = { { IPSECPortAsNumber              >> 8, IPSECPortAsNumber              & 0xFF } };
+mDNSexport const mDNSIPPort NSIPCPort              = { { NSIPCPortAsNumber              >> 8, NSIPCPortAsNumber              & 0xFF } };
+mDNSexport const mDNSIPPort NATPMPAnnouncementPort = { { NATPMPAnnouncementPortAsNumber >> 8, NATPMPAnnouncementPortAsNumber & 0xFF } };
+mDNSexport const mDNSIPPort NATPMPPort             = { { NATPMPPortAsNumber             >> 8, NATPMPPortAsNumber             & 0xFF } };
+mDNSexport const mDNSIPPort DNSEXTPort             = { { DNSEXTPortAsNumber             >> 8, DNSEXTPortAsNumber             & 0xFF } };
+mDNSexport const mDNSIPPort MulticastDNSPort       = { { MulticastDNSPortAsNumber       >> 8, MulticastDNSPortAsNumber       & 0xFF } };
+mDNSexport const mDNSIPPort LoopbackIPCPort        = { { LoopbackIPCPortAsNumber        >> 8, LoopbackIPCPortAsNumber        & 0xFF } };
+mDNSexport const mDNSIPPort PrivateDNSPort         = { { PrivateDNSPortAsNumber         >> 8, PrivateDNSPortAsNumber         & 0xFF } };
+
+mDNSexport const OwnerOptData zeroOwner         = { 0, 0, { { 0 } }, { { 0 } }, { { 0 } } };
+
+mDNSexport const mDNSIPPort zeroIPPort        = { { 0 } };
+mDNSexport const mDNSv4Addr zerov4Addr        = { { 0 } };
+mDNSexport const mDNSv6Addr zerov6Addr        = { { 0 } };
+mDNSexport const mDNSEthAddr zeroEthAddr       = { { 0 } };
+mDNSexport const mDNSv4Addr onesIPv4Addr      = { { 255, 255, 255, 255 } };
+mDNSexport const mDNSv6Addr onesIPv6Addr      = { { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 } };
+mDNSexport const mDNSEthAddr onesEthAddr       = { { 255, 255, 255, 255, 255, 255 } };
+mDNSexport const mDNSAddr zeroAddr          = { mDNSAddrType_None, {{{ 0 }}} };
+
+mDNSexport const mDNSv4Addr AllDNSAdminGroup   = { { 239, 255, 255, 251 } };
+mDNSexport const mDNSv4Addr AllHosts_v4        = { { 224,   0,   0,   1 } };  // For NAT-PMP & PCP Annoucements
+mDNSexport const mDNSv6Addr AllHosts_v6        = { { 0xFF,0x02,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x01 } };
+mDNSexport const mDNSv6Addr NDP_prefix         = { { 0xFF,0x02,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x01, 0xFF,0x00,0x00,0xFB } };  // FF02:0:0:0:0:1:FF00::/104
+mDNSexport const mDNSEthAddr AllHosts_v6_Eth    = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0x01 } };
+mDNSexport const mDNSAddr AllDNSLinkGroup_v4 = { mDNSAddrType_IPv4, { { { 224,   0,   0, 251 } } } };
+//mDNSexport const mDNSAddr  AllDNSLinkGroup_v4 = { mDNSAddrType_IPv4, { { { 224,   0,   0, 252 } } } }; // LLMNR
+mDNSexport const mDNSAddr AllDNSLinkGroup_v6 = { mDNSAddrType_IPv6, { { { 0xFF,0x02,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0xFB } } } };
+//mDNSexport const mDNSAddr  AllDNSLinkGroup_v6 = { mDNSAddrType_IPv6, { { { 0xFF,0x02,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x01,0x00,0x03 } } } }; // LLMNR
+
+mDNSexport const mDNSOpaque16 zeroID          = { { 0, 0 } };
+mDNSexport const mDNSOpaque16 onesID          = { { 255, 255 } };
+mDNSexport const mDNSOpaque16 QueryFlags      = { { kDNSFlag0_QR_Query    | kDNSFlag0_OP_StdQuery,                0 } };
+mDNSexport const mDNSOpaque16 uQueryFlags     = { { kDNSFlag0_QR_Query    | kDNSFlag0_OP_StdQuery | kDNSFlag0_RD, 0 } };
+mDNSexport const mDNSOpaque16 DNSSecQFlags    = { { kDNSFlag0_QR_Query    | kDNSFlag0_OP_StdQuery | kDNSFlag0_RD, kDNSFlag1_CD } };
+mDNSexport const mDNSOpaque16 ResponseFlags   = { { kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery | kDNSFlag0_AA, 0 } };
+mDNSexport const mDNSOpaque16 UpdateReqFlags  = { { kDNSFlag0_QR_Query    | kDNSFlag0_OP_Update,                  0 } };
+mDNSexport const mDNSOpaque16 UpdateRespFlags = { { kDNSFlag0_QR_Response | kDNSFlag0_OP_Update,                  0 } };
+
+mDNSexport const mDNSOpaque64 zeroOpaque64    = { { 0 } };
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Utility Functions
+#endif
+
+// return true for RFC1918 private addresses
+mDNSexport mDNSBool mDNSv4AddrIsRFC1918(const mDNSv4Addr * const addr)
+{
+    return ((addr->b[0] == 10) ||                                 // 10/8 prefix
+            (addr->b[0] == 172 && (addr->b[1] & 0xF0) == 16) ||   // 172.16/12
+            (addr->b[0] == 192 && addr->b[1] == 168));            // 192.168/16
+}
+
+mDNSexport void mDNSAddrMapIPv4toIPv6(mDNSv4Addr* in, mDNSv6Addr* out)
+{
+    out->l[0] = 0;
+    out->l[1] = 0;
+    out->w[4] = 0;
+    out->w[5] = 0xffff;
+    out->b[12] = in->b[0];
+    out->b[13] = in->b[1];
+    out->b[14] = in->b[2];
+    out->b[15] = in->b[3];
+}
+
+mDNSexport mDNSBool mDNSAddrIPv4FromMappedIPv6(mDNSv6Addr *in, mDNSv4Addr* out)
+{
+    if (in->l[0] != 0 || in->l[1] != 0 || in->w[4] != 0 || in->w[5] != 0xffff)
+        return mDNSfalse;
+
+    out->NotAnInteger = in->l[3];
+    return mDNStrue;
+}
+
+mDNSexport NetworkInterfaceInfo *GetFirstActiveInterface(NetworkInterfaceInfo *intf)
+{
+    while (intf && !intf->InterfaceActive) intf = intf->next;
+    return(intf);
+}
+
+mDNSexport mDNSInterfaceID GetNextActiveInterfaceID(const NetworkInterfaceInfo *intf)
+{
+    const NetworkInterfaceInfo *next = GetFirstActiveInterface(intf->next);
+    if (next) return(next->InterfaceID);else return(mDNSNULL);
+}
+
+mDNSexport mDNSu32 NumCacheRecordsForInterfaceID(const mDNS *const m, mDNSInterfaceID id)
+{
+    mDNSu32 slot, used = 0;
+    CacheGroup *cg;
+    const CacheRecord *rr;
+    FORALL_CACHERECORDS(slot, cg, rr)
+    {
+        if (rr->resrec.InterfaceID == id)
+            used++;
+    }
+    return(used);
+}
+
+mDNSexport char *DNSTypeName(mDNSu16 rrtype)
+{
+    switch (rrtype)
+    {
+    case kDNSType_A:    return("Addr");
+    case kDNSType_NS:   return("NS");
+    case kDNSType_CNAME: return("CNAME");
+    case kDNSType_SOA:  return("SOA");
+    case kDNSType_NULL: return("NULL");
+    case kDNSType_PTR:  return("PTR");
+    case kDNSType_HINFO: return("HINFO");
+    case kDNSType_TXT:  return("TXT");
+    case kDNSType_AAAA: return("AAAA");
+    case kDNSType_SRV:  return("SRV");
+    case kDNSType_OPT:  return("OPT");
+    case kDNSType_NSEC: return("NSEC");
+    case kDNSType_NSEC3: return("NSEC3");
+    case kDNSType_NSEC3PARAM: return("NSEC3PARAM");
+    case kDNSType_TSIG: return("TSIG");
+    case kDNSType_RRSIG: return("RRSIG");
+    case kDNSType_DNSKEY: return("DNSKEY");
+    case kDNSType_DS: return("DS");
+    case kDNSQType_ANY: return("ANY");
+    default:            {
+        static char buffer[16];
+        mDNS_snprintf(buffer, sizeof(buffer), "TYPE%d", rrtype);
+        return(buffer);
+    }
+    }
+}
+
+mDNSlocal char *DNSSECAlgName(mDNSu8 alg)
+{
+    switch (alg)
+    {
+    case CRYPTO_RSA_SHA1: return "RSA_SHA1";
+    case CRYPTO_DSA_NSEC3_SHA1: return "DSA_NSEC3_SHA1";
+    case CRYPTO_RSA_NSEC3_SHA1: return "RSA_NSEC3_SHA1";
+    case CRYPTO_RSA_SHA256: return "RSA_SHA256";
+    case CRYPTO_RSA_SHA512: return "RSA_SHA512";
+    default: {
+        static char algbuffer[16];
+        mDNS_snprintf(algbuffer, sizeof(algbuffer), "ALG%d", alg);
+        return(algbuffer);
+    }
+    }
+}
+
+mDNSlocal char *DNSSECDigestName(mDNSu8 digest)
+{
+    switch (digest)
+    {
+    case SHA1_DIGEST_TYPE: return "SHA1";
+    case SHA256_DIGEST_TYPE: return "SHA256";
+    default:
+        {
+        static char digbuffer[16];
+        mDNS_snprintf(digbuffer, sizeof(digbuffer), "DIG%d", digest);
+        return(digbuffer);
+        }
+    }
+}
+
+mDNSexport mDNSu32 swap32(mDNSu32 x)
+{
+    mDNSu8 *ptr = (mDNSu8 *)&x;
+    return (mDNSu32)((mDNSu32)ptr[0] << 24 | (mDNSu32)ptr[1] << 16 | (mDNSu32)ptr[2] << 8 | ptr[3]);
+}
+
+mDNSexport mDNSu16 swap16(mDNSu16 x)
+{
+    mDNSu8 *ptr = (mDNSu8 *)&x;
+    return (mDNSu16)((mDNSu16)ptr[0] << 8 | ptr[1]);
+}
+
+// RFC 4034 Appendix B: Get the keyid of a DNS KEY. It is not transmitted
+// explicitly on the wire.
+//
+// Note: This just helps narrow down the list of keys to look at. It is possible
+// for two DNS keys to have the same ID i.e., key ID is not a unqiue tag. We ignore
+// MD5 keys.
+//
+// 1st argument - the RDATA part of the DNSKEY RR
+// 2nd argument - the RDLENGTH
+//
+mDNSlocal mDNSu32 keytag(mDNSu8 *key, mDNSu32 keysize)
+{
+    unsigned long ac;
+    unsigned int i;
+
+    for (ac = 0, i = 0; i < keysize; ++i)
+        ac += (i & 1) ? key[i] : key[i] << 8;
+    ac += (ac >> 16) & 0xFFFF;
+    return ac & 0xFFFF;
+}
+
+mDNSexport int baseEncode(char *buffer, int blen, const mDNSu8 *data, int len, int encAlg)
+{
+    AlgContext *ctx;
+    mDNSu8 *outputBuffer;
+    int length;
+
+    ctx = AlgCreate(ENC_ALG, encAlg);
+    if (!ctx)
+    {
+        LogMsg("baseEncode: AlgCreate failed\n");
+        return 0;
+    }
+    AlgAdd(ctx, data, len);
+    outputBuffer = AlgEncode(ctx);
+    length = 0;
+    if (outputBuffer)
+    {
+        // Note: don't include any spaces in the format string below. This
+        // is also used by NSEC3 code for proving non-existence where it
+        // needs the base32 encoding without any spaces etc.
+        length = mDNS_snprintf(buffer, blen, "%s", outputBuffer);
+    }
+    AlgDestroy(ctx);
+    return length;
+}
+
+mDNSlocal void PrintTypeBitmap(const mDNSu8 *bmap, int bitmaplen, char *const buffer, mDNSu32 length)
+{
+    int win, wlen, type;
+
+    while (bitmaplen > 0)
+    {
+        int i;
+
+        if (bitmaplen < 3)
+        {
+            LogMsg("PrintTypeBitmap: malformed bitmap, bitmaplen %d short", bitmaplen);
+            break;
+        }
+
+        win = *bmap++;
+        wlen = *bmap++;
+        bitmaplen -= 2;
+        if (bitmaplen < wlen || wlen < 1 || wlen > 32)
+        {
+            LogInfo("PrintTypeBitmap: malformed nsec, bitmaplen %d wlen %d", bitmaplen, wlen);
+            break;
+        }
+        if (win < 0 || win >= 256)
+        {
+            LogInfo("PrintTypeBitmap: malformed nsec, bad window win %d", win);
+            break;
+        }
+        type = win * 256;
+        for (i = 0; i < wlen * 8; i++)
+        {
+            if (bmap[i>>3] & (128 >> (i&7)))
+                length += mDNS_snprintf(buffer+length, (MaxMsg - 1) - length, "%s ", DNSTypeName(type + i));
+        }
+        bmap += wlen;
+        bitmaplen -= wlen;
+    }
+}
+
+// Parse the fields beyond the base header. NSEC3 should have been validated.
+mDNSexport void NSEC3Parse(const ResourceRecord *const rr, mDNSu8 **salt, int *hashLength, mDNSu8 **nxtName, int *bitmaplen, mDNSu8 **bitmap)
+{
+	const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+	rdataNSEC3 *nsec3 = (rdataNSEC3 *)rdb->data;
+    mDNSu8 *p = (mDNSu8 *)&nsec3->salt;
+    int hlen;
+
+    if (salt)
+    {
+        if (nsec3->saltLength)
+            *salt = p;
+        else
+            *salt = mDNSNULL;
+    }
+    p += nsec3->saltLength;
+    // p is pointing at hashLength
+    hlen = (int)*p;
+    if (hashLength)
+        *hashLength = hlen;
+    p++;
+    if (nxtName)
+        *nxtName = p;
+    p += hlen;
+    if (bitmaplen)
+        *bitmaplen = rr->rdlength - (int)(p - rdb->data);
+    if (bitmap)
+        *bitmap = p;
+}
+
+// Note slight bug: this code uses the rdlength from the ResourceRecord object, to display
+// the rdata from the RDataBody object. Sometimes this could be the wrong length -- but as
+// long as this routine is only used for debugging messages, it probably isn't a big problem.
+mDNSexport char *GetRRDisplayString_rdb(const ResourceRecord *const rr, const RDataBody *const rd1, char *const buffer)
+{
+    const RDataBody2 *const rd = (RDataBody2 *)rd1;
+    #define RemSpc (MaxMsg-1-length)
+    char *ptr = buffer;
+    mDNSu32 length = mDNS_snprintf(buffer, MaxMsg-1, "%4d %##s %s ", rr->rdlength, rr->name->c, DNSTypeName(rr->rrtype));
+    if (rr->RecordType == kDNSRecordTypePacketNegative) return(buffer);
+    if (!rr->rdlength) { mDNS_snprintf(buffer+length, RemSpc, "<< ZERO RDATA LENGTH >>"); return(buffer); }
+
+    switch (rr->rrtype)
+    {
+    case kDNSType_A:    mDNS_snprintf(buffer+length, RemSpc, "%.4a", &rd->ipv4);          break;
+
+    case kDNSType_NS:       // Same as PTR
+    case kDNSType_CNAME:    // Same as PTR
+    case kDNSType_PTR:  mDNS_snprintf(buffer+length, RemSpc, "%##s", rd->name.c);       break;
+
+    case kDNSType_SOA:  mDNS_snprintf(buffer+length, RemSpc, "%##s %##s %d %d %d %d %d",
+                                      rd->soa.mname.c, rd->soa.rname.c,
+                                      rd->soa.serial, rd->soa.refresh, rd->soa.retry, rd->soa.expire, rd->soa.min);
+        break;
+
+    case kDNSType_HINFO:    // Display this the same as TXT (show all constituent strings)
+    case kDNSType_TXT:  {
+        const mDNSu8 *t = rd->txt.c;
+        while (t < rd->txt.c + rr->rdlength)
+        {
+            length += mDNS_snprintf(buffer+length, RemSpc, "%s%#s", t > rd->txt.c ? "¦" : "", t);
+            t += 1 + t[0];
+        }
+    } break;
+
+    case kDNSType_AAAA: mDNS_snprintf(buffer+length, RemSpc, "%.16a", &rd->ipv6);       break;
+    case kDNSType_SRV:  mDNS_snprintf(buffer+length, RemSpc, "%u %u %u %##s",
+                                      rd->srv.priority, rd->srv.weight, mDNSVal16(rd->srv.port), rd->srv.target.c); break;
+
+    case kDNSType_OPT:  {
+        const rdataOPT *opt;
+        const rdataOPT *const end = (const rdataOPT *)&rd->data[rr->rdlength];
+        length += mDNS_snprintf(buffer+length, RemSpc, "Max %d", rr->rrclass);
+        for (opt = &rd->opt[0]; opt < end; opt++)
+        {
+            switch(opt->opt)
+            {
+            case kDNSOpt_LLQ:
+                length += mDNS_snprintf(buffer+length, RemSpc, " Vers %d",     opt->u.llq.vers);
+                length += mDNS_snprintf(buffer+length, RemSpc, " Op %d",       opt->u.llq.llqOp);
+                length += mDNS_snprintf(buffer+length, RemSpc, " Err/Port %d", opt->u.llq.err);
+                length += mDNS_snprintf(buffer+length, RemSpc, " ID %08X%08X", opt->u.llq.id.l[0], opt->u.llq.id.l[1]);
+                length += mDNS_snprintf(buffer+length, RemSpc, " Lease %d",    opt->u.llq.llqlease);
+                break;
+            case kDNSOpt_Lease:
+                length += mDNS_snprintf(buffer+length, RemSpc, " Lease %d",    opt->u.updatelease);
+                break;
+            case kDNSOpt_Owner:
+                length += mDNS_snprintf(buffer+length, RemSpc, " Vers %d",     opt->u.owner.vers);
+                length += mDNS_snprintf(buffer+length, RemSpc, " Seq %3d", (mDNSu8)opt->u.owner.seq);                           // Display as unsigned
+                length += mDNS_snprintf(buffer+length, RemSpc, " MAC %.6a",    opt->u.owner.HMAC.b);
+                if (opt->optlen >= DNSOpt_OwnerData_ID_Wake_Space-4)
+                {
+                    length += mDNS_snprintf(buffer+length, RemSpc, " I-MAC %.6a", opt->u.owner.IMAC.b);
+                    if (opt->optlen > DNSOpt_OwnerData_ID_Wake_Space-4)
+                        length += mDNS_snprintf(buffer+length, RemSpc, " Password %.6a", opt->u.owner.password.b);
+                }
+                break;
+            case kDNSOpt_Trace:
+                length += mDNS_snprintf(buffer+length, RemSpc, " Platform %d",    opt->u.tracer.platf);
+                length += mDNS_snprintf(buffer+length, RemSpc, " mDNSVers %d",    opt->u.tracer.mDNSv);
+                break;
+            default:
+                length += mDNS_snprintf(buffer+length, RemSpc, " Unknown %d",  opt->opt);
+                break;
+            }
+        }
+    }
+    break;
+
+    case kDNSType_NSEC: {
+        domainname *next = (domainname *)rd->data;
+        int len, bitmaplen;
+        mDNSu8 *bmap;
+        len = DomainNameLength(next);
+        bitmaplen = rr->rdlength - len;
+        bmap = (mDNSu8 *)((mDNSu8 *)next + len);
+
+        if (UNICAST_NSEC(rr))
+            length += mDNS_snprintf(buffer+length, RemSpc, "%##s ", next->c);
+        PrintTypeBitmap(bmap, bitmaplen, buffer, length);
+
+    }
+    break;
+    case kDNSType_NSEC3: {
+        rdataNSEC3 *nsec3 = (rdataNSEC3 *)rd->data;
+        const mDNSu8 *p = (mDNSu8 *)&nsec3->salt;
+        int hashLength, bitmaplen, i;
+
+        length += mDNS_snprintf(buffer+length, RemSpc, "\t%s  %d  %d ", 
+                                DNSSECDigestName(nsec3->alg), nsec3->flags, swap16(nsec3->iterations));
+        
+        if (!nsec3->saltLength)
+        {
+            length += mDNS_snprintf(buffer+length, RemSpc, "-");
+        }
+        else
+        {
+            for (i = 0; i < nsec3->saltLength; i++)
+            {
+                length += mDNS_snprintf(buffer+length, RemSpc, "%x", p[i]);
+            }
+        }
+
+        // put a space at the end
+        length += mDNS_snprintf(buffer+length, RemSpc, " ");
+
+        p += nsec3->saltLength;
+        // p is pointing at hashLength
+        hashLength = (int)*p++;
+        
+        length += baseEncode(buffer + length, RemSpc, p, hashLength, ENC_BASE32);
+
+        // put a space at the end
+        length += mDNS_snprintf(buffer+length, RemSpc, " ");
+
+        p += hashLength;
+        bitmaplen = rr->rdlength - (int)(p - rd->data);
+        PrintTypeBitmap(p, bitmaplen, buffer, length);
+    }
+    break;
+    case kDNSType_RRSIG:    {
+        rdataRRSig *rrsig = (rdataRRSig *)rd->data;
+        mDNSu8 expTimeBuf[64];
+        mDNSu8 inceptTimeBuf[64];
+        unsigned long inceptClock;
+        unsigned long expClock;
+        int len;
+
+        expClock = (unsigned long)swap32(rrsig->sigExpireTime);
+        mDNSPlatformFormatTime(expClock, expTimeBuf, sizeof(expTimeBuf));
+
+        inceptClock = (unsigned long)swap32(rrsig->sigInceptTime);
+        mDNSPlatformFormatTime(inceptClock, inceptTimeBuf, sizeof(inceptTimeBuf));
+
+        length += mDNS_snprintf(buffer+length, RemSpc, "\t%s  %s  %d  %d  %s  %s  %d  %##s ",
+                                DNSTypeName(swap16(rrsig->typeCovered)), DNSSECAlgName(rrsig->alg), rrsig->labels, swap32(rrsig->origTTL),
+                                expTimeBuf, inceptTimeBuf, swap16(rrsig->keyTag), ((domainname *)(&rrsig->signerName))->c);
+
+        len = DomainNameLength((domainname *)&rrsig->signerName);
+        length += baseEncode(buffer + length, RemSpc, (const mDNSu8 *)(rd->data + len + RRSIG_FIXED_SIZE),
+                               rr->rdlength - (len + RRSIG_FIXED_SIZE), ENC_BASE64);
+    }
+    break;
+    case kDNSType_DNSKEY:   {
+        rdataDNSKey *rrkey = (rdataDNSKey *)rd->data;
+        length += mDNS_snprintf(buffer+length, RemSpc, "\t%d  %d  %s  %u ", swap16(rrkey->flags), rrkey->proto,
+                                DNSSECAlgName(rrkey->alg), (unsigned int)keytag((mDNSu8 *)rrkey, rr->rdlength));
+        length += baseEncode(buffer + length, RemSpc, (const mDNSu8 *)(rd->data + DNSKEY_FIXED_SIZE),
+                               rr->rdlength - DNSKEY_FIXED_SIZE, ENC_BASE64);
+    }
+    break;
+    case kDNSType_DS:       {
+        mDNSu8 *p;
+        int i;
+        rdataDS *rrds = (rdataDS *)rd->data;
+
+        length += mDNS_snprintf(buffer+length, RemSpc, "\t%s\t%d\t%s ", DNSSECAlgName(rrds->alg), swap16(rrds->keyTag),
+                                DNSSECDigestName(rrds->digestType));
+
+        p = (mDNSu8 *)(rd->data + DS_FIXED_SIZE);
+        for (i = 0; i < (rr->rdlength - DS_FIXED_SIZE); i++)
+        {
+            length += mDNS_snprintf(buffer+length, RemSpc, "%x", p[i]);
+        }
+    }
+    break;
+
+    default:            mDNS_snprintf(buffer+length, RemSpc, "RDLen %d: %s", rr->rdlength, rd->data);
+        // Really should scan buffer to check if text is valid UTF-8 and only replace with dots if not
+        for (ptr = buffer; *ptr; ptr++) if (*ptr < ' ') *ptr = '.';
+        break;
+    }
+    return(buffer);
+}
+
+// See comments in mDNSEmbeddedAPI.h
+#if _PLATFORM_HAS_STRONG_PRNG_
+#define mDNSRandomNumber mDNSPlatformRandomNumber
+#else
+mDNSlocal mDNSu32 mDNSRandomFromSeed(mDNSu32 seed)
+{
+    return seed * 21 + 1;
+}
+
+mDNSlocal mDNSu32 mDNSMixRandomSeed(mDNSu32 seed, mDNSu8 iteration)
+{
+    return iteration ? mDNSMixRandomSeed(mDNSRandomFromSeed(seed), --iteration) : seed;
+}
+
+mDNSlocal mDNSu32 mDNSRandomNumber()
+{
+    static mDNSBool seeded = mDNSfalse;
+    static mDNSu32 seed = 0;
+    if (!seeded)
+    {
+        seed = mDNSMixRandomSeed(mDNSPlatformRandomSeed(), 100);
+        seeded = mDNStrue;
+    }
+    return (seed = mDNSRandomFromSeed(seed));
+}
+#endif // ! _PLATFORM_HAS_STRONG_PRNG_
+
+mDNSexport mDNSu32 mDNSRandom(mDNSu32 max)      // Returns pseudo-random result from zero to max inclusive
+{
+    mDNSu32 ret = 0;
+    mDNSu32 mask = 1;
+
+    while (mask < max) mask = (mask << 1) | 1;
+
+    do ret = mDNSRandomNumber() & mask;
+    while (ret > max);
+
+    return ret;
+}
+
+mDNSexport mDNSBool mDNSSameAddress(const mDNSAddr *ip1, const mDNSAddr *ip2)
+{
+    if (ip1->type == ip2->type)
+    {
+        switch (ip1->type)
+        {
+        case mDNSAddrType_None: return(mDNStrue);      // Empty addresses have no data and are therefore always equal
+        case mDNSAddrType_IPv4: return (mDNSBool)(mDNSSameIPv4Address(ip1->ip.v4, ip2->ip.v4));
+        case mDNSAddrType_IPv6: return (mDNSBool)(mDNSSameIPv6Address(ip1->ip.v6, ip2->ip.v6));
+        }
+    }
+    return(mDNSfalse);
+}
+
+mDNSexport mDNSBool mDNSAddrIsDNSMulticast(const mDNSAddr *ip)
+{
+    switch(ip->type)
+    {
+    case mDNSAddrType_IPv4: return (mDNSBool)(mDNSSameIPv4Address(ip->ip.v4, AllDNSLinkGroup_v4.ip.v4));
+    case mDNSAddrType_IPv6: return (mDNSBool)(mDNSSameIPv6Address(ip->ip.v6, AllDNSLinkGroup_v6.ip.v6));
+    default: return(mDNSfalse);
+    }
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Domain Name Utility Functions
+#endif
+
+mDNSexport mDNSBool SameDomainLabel(const mDNSu8 *a, const mDNSu8 *b)
+{
+    int i;
+    const int len = *a++;
+
+    if (len > MAX_DOMAIN_LABEL)
+    { debugf("Malformed label (too long)"); return(mDNSfalse); }
+
+    if (len != *b++) return(mDNSfalse);
+    for (i=0; i<len; i++)
+    {
+        mDNSu8 ac = *a++;
+        mDNSu8 bc = *b++;
+        if (mDNSIsUpperCase(ac)) ac += 'a' - 'A';
+        if (mDNSIsUpperCase(bc)) bc += 'a' - 'A';
+        if (ac != bc) return(mDNSfalse);
+    }
+    return(mDNStrue);
+}
+
+mDNSexport mDNSBool SameDomainName(const domainname *const d1, const domainname *const d2)
+{
+    const mDNSu8 *      a   = d1->c;
+    const mDNSu8 *      b   = d2->c;
+    const mDNSu8 *const max = d1->c + MAX_DOMAIN_NAME;          // Maximum that's valid
+
+    while (*a || *b)
+    {
+        if (a + 1 + *a >= max)
+        { debugf("Malformed domain name (more than 256 characters)"); return(mDNSfalse); }
+        if (!SameDomainLabel(a, b)) return(mDNSfalse);
+        a += 1 + *a;
+        b += 1 + *b;
+    }
+
+    return(mDNStrue);
+}
+
+mDNSexport mDNSBool SameDomainNameCS(const domainname *const d1, const domainname *const d2)
+{
+    mDNSu16 l1 = DomainNameLength(d1);
+    mDNSu16 l2 = DomainNameLength(d2);
+    return(l1 <= MAX_DOMAIN_NAME && l1 == l2 && mDNSPlatformMemSame(d1, d2, l1));
+}
+
+mDNSexport mDNSBool IsLocalDomain(const domainname *d)
+{
+    // Domains that are defined to be resolved via link-local multicast are:
+    // local., 254.169.in-addr.arpa., and {8,9,A,B}.E.F.ip6.arpa.
+    static const domainname *nL = (const domainname*)"\x5" "local";
+    static const domainname *nR = (const domainname*)"\x3" "254" "\x3" "169"         "\x7" "in-addr" "\x4" "arpa";
+    static const domainname *n8 = (const domainname*)"\x1" "8"   "\x1" "e" "\x1" "f" "\x3" "ip6"     "\x4" "arpa";
+    static const domainname *n9 = (const domainname*)"\x1" "9"   "\x1" "e" "\x1" "f" "\x3" "ip6"     "\x4" "arpa";
+    static const domainname *nA = (const domainname*)"\x1" "a"   "\x1" "e" "\x1" "f" "\x3" "ip6"     "\x4" "arpa";
+    static const domainname *nB = (const domainname*)"\x1" "b"   "\x1" "e" "\x1" "f" "\x3" "ip6"     "\x4" "arpa";
+
+    const domainname *d1, *d2, *d3, *d4, *d5;   // Top-level domain, second-level domain, etc.
+    d1 = d2 = d3 = d4 = d5 = mDNSNULL;
+    while (d->c[0])
+    {
+        d5 = d4; d4 = d3; d3 = d2; d2 = d1; d1 = d;
+        d = (const domainname*)(d->c + 1 + d->c[0]);
+    }
+
+    if (d1 && SameDomainName(d1, nL)) return(mDNStrue);
+    if (d4 && SameDomainName(d4, nR)) return(mDNStrue);
+    if (d5 && SameDomainName(d5, n8)) return(mDNStrue);
+    if (d5 && SameDomainName(d5, n9)) return(mDNStrue);
+    if (d5 && SameDomainName(d5, nA)) return(mDNStrue);
+    if (d5 && SameDomainName(d5, nB)) return(mDNStrue);
+    return(mDNSfalse);
+}
+
+mDNSexport const mDNSu8 *LastLabel(const domainname *d)
+{
+    const mDNSu8 *p = d->c;
+    while (d->c[0])
+    {
+        p = d->c;
+        d = (const domainname*)(d->c + 1 + d->c[0]);
+    }
+    return(p);
+}
+
+// Returns length of a domain name INCLUDING the byte for the final null label
+// e.g. for the root label "." it returns one
+// For the FQDN "com." it returns 5 (length byte, three data bytes, final zero)
+// Legal results are 1 (just root label) to 256 (MAX_DOMAIN_NAME)
+// If the given domainname is invalid, result is 257 (MAX_DOMAIN_NAME+1)
+mDNSexport mDNSu16 DomainNameLengthLimit(const domainname *const name, const mDNSu8 *limit)
+{
+    const mDNSu8 *src = name->c;
+    while (src < limit && *src <= MAX_DOMAIN_LABEL)
+    {
+        if (*src == 0) return((mDNSu16)(src - name->c + 1));
+        src += 1 + *src;
+    }
+    return(MAX_DOMAIN_NAME+1);
+}
+
+// CompressedDomainNameLength returns the length of a domain name INCLUDING the byte
+// for the final null label, e.g. for the root label "." it returns one.
+// E.g. for the FQDN "foo.com." it returns 9
+// (length, three data bytes, length, three more data bytes, final zero).
+// In the case where a parent domain name is provided, and the given name is a child
+// of that parent, CompressedDomainNameLength returns the length of the prefix portion
+// of the child name, plus TWO bytes for the compression pointer.
+// E.g. for the name "foo.com." with parent "com.", it returns 6
+// (length, three data bytes, two-byte compression pointer).
+mDNSexport mDNSu16 CompressedDomainNameLength(const domainname *const name, const domainname *parent)
+{
+    const mDNSu8 *src = name->c;
+    if (parent && parent->c[0] == 0) parent = mDNSNULL;
+    while (*src)
+    {
+        if (*src > MAX_DOMAIN_LABEL) return(MAX_DOMAIN_NAME+1);
+        if (parent && SameDomainName((const domainname *)src, parent)) return((mDNSu16)(src - name->c + 2));
+        src += 1 + *src;
+        if (src - name->c >= MAX_DOMAIN_NAME) return(MAX_DOMAIN_NAME+1);
+    }
+    return((mDNSu16)(src - name->c + 1));
+}
+
+// CountLabels() returns number of labels in name, excluding final root label
+// (e.g. for "apple.com." CountLabels returns 2.)
+mDNSexport int CountLabels(const domainname *d)
+{
+    int count = 0;
+    const mDNSu8 *ptr;
+    for (ptr = d->c; *ptr; ptr = ptr + ptr[0] + 1) count++;
+    return count;
+}
+
+// SkipLeadingLabels skips over the first 'skip' labels in the domainname,
+// returning a pointer to the suffix with 'skip' labels removed.
+mDNSexport const domainname *SkipLeadingLabels(const domainname *d, int skip)
+{
+    while (skip > 0 && d->c[0]) { d = (const domainname *)(d->c + 1 + d->c[0]); skip--; }
+    return(d);
+}
+
+// AppendLiteralLabelString appends a single label to an existing (possibly empty) domainname.
+// The C string contains the label as-is, with no escaping, etc.
+// Any dots in the name are literal dots, not label separators
+// If successful, AppendLiteralLabelString returns a pointer to the next unused byte
+// in the domainname bufer (i.e. the next byte after the terminating zero).
+// If unable to construct a legal domain name (i.e. label more than 63 bytes, or total more than 256 bytes)
+// AppendLiteralLabelString returns mDNSNULL.
+mDNSexport mDNSu8 *AppendLiteralLabelString(domainname *const name, const char *cstr)
+{
+    mDNSu8       *      ptr  = name->c + DomainNameLength(name) - 1;    // Find end of current name
+    const mDNSu8 *const lim1 = name->c + MAX_DOMAIN_NAME - 1;           // Limit of how much we can add (not counting final zero)
+    const mDNSu8 *const lim2 = ptr + 1 + MAX_DOMAIN_LABEL;
+    const mDNSu8 *const lim  = (lim1 < lim2) ? lim1 : lim2;
+    mDNSu8       *lengthbyte = ptr++;                                   // Record where the length is going to go
+
+    while (*cstr && ptr < lim) *ptr++ = (mDNSu8)*cstr++;    // Copy the data
+    *lengthbyte = (mDNSu8)(ptr - lengthbyte - 1);           // Fill in the length byte
+    *ptr++ = 0;                                             // Put the null root label on the end
+    if (*cstr) return(mDNSNULL);                            // Failure: We didn't successfully consume all input
+    else return(ptr);                                       // Success: return new value of ptr
+}
+
+// AppendDNSNameString appends zero or more labels to an existing (possibly empty) domainname.
+// The C string is in conventional DNS syntax:
+// Textual labels, escaped as necessary using the usual DNS '\' notation, separated by dots.
+// If successful, AppendDNSNameString returns a pointer to the next unused byte
+// in the domainname bufer (i.e. the next byte after the terminating zero).
+// If unable to construct a legal domain name (i.e. label more than 63 bytes, or total more than 256 bytes)
+// AppendDNSNameString returns mDNSNULL.
+mDNSexport mDNSu8 *AppendDNSNameString(domainname *const name, const char *cstring)
+{
+    const char   *cstr      = cstring;
+    mDNSu8       *      ptr = name->c + DomainNameLength(name) - 1; // Find end of current name
+    const mDNSu8 *const lim = name->c + MAX_DOMAIN_NAME - 1;        // Limit of how much we can add (not counting final zero)
+    while (*cstr && ptr < lim)                                      // While more characters, and space to put them...
+    {
+        mDNSu8 *lengthbyte = ptr++;                                 // Record where the length is going to go
+        if (*cstr == '.') { LogMsg("AppendDNSNameString: Illegal empty label in name \"%s\"", cstring); return(mDNSNULL); }
+        while (*cstr && *cstr != '.' && ptr < lim)                  // While we have characters in the label...
+        {
+            mDNSu8 c = (mDNSu8)*cstr++;                             // Read the character
+            if (c == '\\')                                          // If escape character, check next character
+            {
+                c = (mDNSu8)*cstr++;                                // Assume we'll just take the next character
+                if (mDNSIsDigit(cstr[-1]) && mDNSIsDigit(cstr[0]) && mDNSIsDigit(cstr[1]))
+                {                                                   // If three decimal digits,
+                    int v0 = cstr[-1] - '0';                        // then interpret as three-digit decimal
+                    int v1 = cstr[ 0] - '0';
+                    int v2 = cstr[ 1] - '0';
+                    int val = v0 * 100 + v1 * 10 + v2;
+                    if (val <= 255) { c = (mDNSu8)val; cstr += 2; } // If valid three-digit decimal value, use it
+                }
+            }
+            *ptr++ = c;                                             // Write the character
+        }
+        if (*cstr) cstr++;                                          // Skip over the trailing dot (if present)
+        if (ptr - lengthbyte - 1 > MAX_DOMAIN_LABEL)                // If illegal label, abort
+            return(mDNSNULL);
+        *lengthbyte = (mDNSu8)(ptr - lengthbyte - 1);               // Fill in the length byte
+    }
+
+    *ptr++ = 0;                                                     // Put the null root label on the end
+    if (*cstr) return(mDNSNULL);                                    // Failure: We didn't successfully consume all input
+    else return(ptr);                                               // Success: return new value of ptr
+}
+
+// AppendDomainLabel appends a single label to a name.
+// If successful, AppendDomainLabel returns a pointer to the next unused byte
+// in the domainname bufer (i.e. the next byte after the terminating zero).
+// If unable to construct a legal domain name (i.e. label more than 63 bytes, or total more than 256 bytes)
+// AppendDomainLabel returns mDNSNULL.
+mDNSexport mDNSu8 *AppendDomainLabel(domainname *const name, const domainlabel *const label)
+{
+    int i;
+    mDNSu8 *ptr = name->c + DomainNameLength(name) - 1;
+
+    // Check label is legal
+    if (label->c[0] > MAX_DOMAIN_LABEL) return(mDNSNULL);
+
+    // Check that ptr + length byte + data bytes + final zero does not exceed our limit
+    if (ptr + 1 + label->c[0] + 1 > name->c + MAX_DOMAIN_NAME) return(mDNSNULL);
+
+    for (i=0; i<=label->c[0]; i++) *ptr++ = label->c[i];    // Copy the label data
+    *ptr++ = 0;                             // Put the null root label on the end
+    return(ptr);
+}
+
+mDNSexport mDNSu8 *AppendDomainName(domainname *const name, const domainname *const append)
+{
+    mDNSu8       *      ptr = name->c + DomainNameLength(name) - 1; // Find end of current name
+    const mDNSu8 *const lim = name->c + MAX_DOMAIN_NAME - 1;        // Limit of how much we can add (not counting final zero)
+    const mDNSu8 *      src = append->c;
+    while (src[0])
+    {
+        int i;
+        if (ptr + 1 + src[0] > lim) return(mDNSNULL);
+        for (i=0; i<=src[0]; i++) *ptr++ = src[i];
+        *ptr = 0;   // Put the null root label on the end
+        src += i;
+    }
+    return(ptr);
+}
+
+// MakeDomainLabelFromLiteralString makes a single domain label from a single literal C string (with no escaping).
+// If successful, MakeDomainLabelFromLiteralString returns mDNStrue.
+// If unable to convert the whole string to a legal domain label (i.e. because length is more than 63 bytes) then
+// MakeDomainLabelFromLiteralString makes a legal domain label from the first 63 bytes of the string and returns mDNSfalse.
+// In some cases silently truncated oversized names to 63 bytes is acceptable, so the return result may be ignored.
+// In other cases silent truncation may not be acceptable, so in those cases the calling function needs to check the return result.
+mDNSexport mDNSBool MakeDomainLabelFromLiteralString(domainlabel *const label, const char *cstr)
+{
+    mDNSu8       *      ptr   = label->c + 1;                       // Where we're putting it
+    const mDNSu8 *const limit = label->c + 1 + MAX_DOMAIN_LABEL;    // The maximum we can put
+    while (*cstr && ptr < limit) *ptr++ = (mDNSu8)*cstr++;          // Copy the label
+    label->c[0] = (mDNSu8)(ptr - label->c - 1);                     // Set the length byte
+    return(*cstr == 0);                                             // Return mDNStrue if we successfully consumed all input
+}
+
+// MakeDomainNameFromDNSNameString makes a native DNS-format domainname from a C string.
+// The C string is in conventional DNS syntax:
+// Textual labels, escaped as necessary using the usual DNS '\' notation, separated by dots.
+// If successful, MakeDomainNameFromDNSNameString returns a pointer to the next unused byte
+// in the domainname bufer (i.e. the next byte after the terminating zero).
+// If unable to construct a legal domain name (i.e. label more than 63 bytes, or total more than 256 bytes)
+// MakeDomainNameFromDNSNameString returns mDNSNULL.
+mDNSexport mDNSu8 *MakeDomainNameFromDNSNameString(domainname *const name, const char *cstr)
+{
+    name->c[0] = 0;                                 // Make an empty domain name
+    return(AppendDNSNameString(name, cstr));        // And then add this string to it
+}
+
+mDNSexport char *ConvertDomainLabelToCString_withescape(const domainlabel *const label, char *ptr, char esc)
+{
+    const mDNSu8 *      src = label->c;                         // Domain label we're reading
+    const mDNSu8 len = *src++;                                  // Read length of this (non-null) label
+    const mDNSu8 *const end = src + len;                        // Work out where the label ends
+    if (len > MAX_DOMAIN_LABEL) return(mDNSNULL);               // If illegal label, abort
+    while (src < end)                                           // While we have characters in the label
+    {
+        mDNSu8 c = *src++;
+        if (esc)
+        {
+            if (c == '.' || c == esc)                           // If character is a dot or the escape character
+                *ptr++ = esc;                                   // Output escape character
+            else if (c <= ' ')                                  // If non-printing ascii,
+            {                                                   // Output decimal escape sequence
+                *ptr++ = esc;
+                *ptr++ = (char)  ('0' + (c / 100)     );
+                *ptr++ = (char)  ('0' + (c /  10) % 10);
+                c      = (mDNSu8)('0' + (c      ) % 10);
+            }
+        }
+        *ptr++ = (char)c;                                       // Copy the character
+    }
+    *ptr = 0;                                                   // Null-terminate the string
+    return(ptr);                                                // and return
+}
+
+// Note: To guarantee that there will be no possible overrun, cstr must be at least MAX_ESCAPED_DOMAIN_NAME (1009 bytes)
+mDNSexport char *ConvertDomainNameToCString_withescape(const domainname *const name, char *ptr, char esc)
+{
+    const mDNSu8 *src         = name->c;                            // Domain name we're reading
+    const mDNSu8 *const max   = name->c + MAX_DOMAIN_NAME;          // Maximum that's valid
+
+    if (*src == 0) *ptr++ = '.';                                    // Special case: For root, just write a dot
+
+    while (*src)                                                    // While more characters in the domain name
+    {
+        if (src + 1 + *src >= max) return(mDNSNULL);
+        ptr = ConvertDomainLabelToCString_withescape((const domainlabel *)src, ptr, esc);
+        if (!ptr) return(mDNSNULL);
+        src += 1 + *src;
+        *ptr++ = '.';                                               // Write the dot after the label
+    }
+
+    *ptr++ = 0;                                                     // Null-terminate the string
+    return(ptr);                                                    // and return
+}
+
+// RFC 1034 rules:
+// Host names must start with a letter, end with a letter or digit,
+// and have as interior characters only letters, digits, and hyphen.
+// This was subsequently modified in RFC 1123 to allow the first character to be either a letter or a digit
+
+mDNSexport void ConvertUTF8PstringToRFC1034HostLabel(const mDNSu8 UTF8Name[], domainlabel *const hostlabel)
+{
+    const mDNSu8 *      src  = &UTF8Name[1];
+    const mDNSu8 *const end  = &UTF8Name[1] + UTF8Name[0];
+    mDNSu8 *      ptr  = &hostlabel->c[1];
+    const mDNSu8 *const lim  = &hostlabel->c[1] + MAX_DOMAIN_LABEL;
+    while (src < end)
+    {
+        // Delete apostrophes from source name
+        if (src[0] == '\'') { src++; continue; }        // Standard straight single quote
+        if (src + 2 < end && src[0] == 0xE2 && src[1] == 0x80 && src[2] == 0x99)
+        { src += 3; continue; }     // Unicode curly apostrophe
+        if (ptr < lim)
+        {
+            if (mDNSValidHostChar(*src, (ptr > &hostlabel->c[1]), (src < end-1))) *ptr++ = *src;
+            else if (ptr > &hostlabel->c[1] && ptr[-1] != '-') *ptr++ = '-';
+        }
+        src++;
+    }
+    while (ptr > &hostlabel->c[1] && ptr[-1] == '-') ptr--; // Truncate trailing '-' marks
+    hostlabel->c[0] = (mDNSu8)(ptr - &hostlabel->c[1]);
+}
+
+#define ValidTransportProtocol(X) ( (X)[0] == 4 && (X)[1] == '_' && \
+                                    ((((X)[2] | 0x20) == 'u' && ((X)[3] | 0x20) == 'd') || (((X)[2] | 0x20) == 't' && ((X)[3] | 0x20) == 'c')) && \
+                                    ((X)[4] | 0x20) == 'p')
+
+mDNSexport mDNSu8 *ConstructServiceName(domainname *const fqdn,
+                                        const domainlabel *name, const domainname *type, const domainname *const domain)
+{
+    int i, len;
+    mDNSu8 *dst = fqdn->c;
+    const mDNSu8 *src;
+    const char *errormsg;
+#if APPLE_OSX_mDNSResponder
+    mDNSBool loggedUnderscore = mDNSfalse;
+    static char typeBuf[MAX_ESCAPED_DOMAIN_NAME];
+#endif
+
+    // In the case where there is no name (and ONLY in that case),
+    // a single-label subtype is allowed as the first label of a three-part "type"
+    if (!name && type)
+    {
+        const mDNSu8 *s0 = type->c;
+        if (s0[0] && s0[0] < 0x40)      // If legal first label (at least one character, and no more than 63)
+        {
+            const mDNSu8 * s1 = s0 + 1 + s0[0];
+            if (s1[0] && s1[0] < 0x40)  // and legal second label (at least one character, and no more than 63)
+            {
+                const mDNSu8 *s2 = s1 + 1 + s1[0];
+                if (s2[0] && s2[0] < 0x40 && s2[1+s2[0]] == 0)  // and we have three and only three labels
+                {
+                    static const mDNSu8 SubTypeLabel[5] = mDNSSubTypeLabel;
+                    src = s0;                                   // Copy the first label
+                    len = *src;
+                    for (i=0; i <= len;                      i++) *dst++ = *src++;
+                    for (i=0; i < (int)sizeof(SubTypeLabel); i++) *dst++ = SubTypeLabel[i];
+                    type = (const domainname *)s1;
+
+                    // Special support to enable the DNSServiceBrowse call made by Bonjour Browser
+                    // For these queries, we retract the "._sub" we just added between the subtype and the main type
+                    // Remove after Bonjour Browser is updated to use DNSServiceQueryRecord instead of DNSServiceBrowse
+                    if (SameDomainName((domainname*)s0, (const domainname*)"\x09_services\x07_dns-sd\x04_udp"))
+                        dst -= sizeof(SubTypeLabel);
+                }
+            }
+        }
+    }
+
+    if (name && name->c[0])
+    {
+        src = name->c;                                  // Put the service name into the domain name
+        len = *src;
+        if (len >= 0x40) { errormsg = "Service instance name too long"; goto fail; }
+        for (i=0; i<=len; i++) *dst++ = *src++;
+    }
+    else
+        name = (domainlabel*)"";    // Set this up to be non-null, to avoid errors if we have to call LogMsg() below
+
+    src = type->c;                                      // Put the service type into the domain name
+    len = *src;
+    if (len < 2 || len > 16)
+    {
+        LogMsg("Bad service type in %#s.%##s%##s Application protocol name must be underscore plus 1-15 characters. "
+               "See <http://www.dns-sd.org/ServiceTypes.html>", name->c, type->c, domain->c);
+#if APPLE_OSX_mDNSResponder
+        ConvertDomainNameToCString(type, typeBuf);
+        mDNSASLLog(mDNSNULL, "serviceType.nameTooLong", "noop", typeBuf, "");
+#endif
+    }
+    if (len < 2 || len >= 0x40 || (len > 16 && !SameDomainName(domain, &localdomain))) return(mDNSNULL);
+    if (src[1] != '_') { errormsg = "Application protocol name must begin with underscore"; goto fail; }
+    for (i=2; i<=len; i++)
+    {
+        // Letters and digits are allowed anywhere
+        if (mDNSIsLetter(src[i]) || mDNSIsDigit(src[i])) continue;
+        // Hyphens are only allowed as interior characters
+        // Underscores are not supposed to be allowed at all, but for backwards compatibility with some old products we do allow them,
+        // with the same rule as hyphens
+        if ((src[i] == '-' || src[i] == '_') && i > 2 && i < len)
+        {
+#if APPLE_OSX_mDNSResponder
+            if (src[i] == '_' && loggedUnderscore == mDNSfalse)
+            {
+                ConvertDomainNameToCString(type, typeBuf);
+                mDNSASLLog(mDNSNULL, "serviceType.nameWithUnderscore", "noop", typeBuf, "");
+                loggedUnderscore = mDNStrue;
+            }
+#endif
+            continue;
+        }
+        errormsg = "Application protocol name must contain only letters, digits, and hyphens";
+#if APPLE_OSX_mDNSResponder
+        {
+            ConvertDomainNameToCString(type, typeBuf);
+            mDNSASLLog(mDNSNULL, "serviceType.nameWithIllegalCharacters", "noop", typeBuf, "");
+        }
+#endif
+        goto fail;
+    }
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    len = *src;
+    if (!ValidTransportProtocol(src)) { errormsg = "Transport protocol name must be _udp or _tcp"; goto fail; }
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    if (*src) { errormsg = "Service type must have only two labels"; goto fail; }
+
+    *dst = 0;
+    if (!domain->c[0]) { errormsg = "Service domain must be non-empty"; goto fail; }
+    if (SameDomainName(domain, (const domainname*)"\x05" "local" "\x04" "arpa"))
+    { errormsg = "Illegal domain \"local.arpa.\" Use \"local.\" (or empty string)"; goto fail; }
+    dst = AppendDomainName(fqdn, domain);
+    if (!dst) { errormsg = "Service domain too long"; goto fail; }
+    return(dst);
+
+fail:
+    LogMsg("ConstructServiceName: %s: %#s.%##s%##s", errormsg, name->c, type->c, domain->c);
+    return(mDNSNULL);
+}
+
+// A service name has the form: instance.application-protocol.transport-protocol.domain
+// DeconstructServiceName is currently fairly forgiving: It doesn't try to enforce character
+// set or length limits for the protocol names, and the final domain is allowed to be empty.
+// However, if the given FQDN doesn't contain at least three labels,
+// DeconstructServiceName will reject it and return mDNSfalse.
+mDNSexport mDNSBool DeconstructServiceName(const domainname *const fqdn,
+                                           domainlabel *const name, domainname *const type, domainname *const domain)
+{
+    int i, len;
+    const mDNSu8 *src = fqdn->c;
+    const mDNSu8 *max = fqdn->c + MAX_DOMAIN_NAME;
+    mDNSu8 *dst;
+
+    dst = name->c;                                      // Extract the service name
+    len = *src;
+    if (!len)         { debugf("DeconstructServiceName: FQDN empty!");                             return(mDNSfalse); }
+    if (len >= 0x40)  { debugf("DeconstructServiceName: Instance name too long");                  return(mDNSfalse); }
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    dst = type->c;                                      // Extract the service type
+    len = *src;
+    if (!len)         { debugf("DeconstructServiceName: FQDN contains only one label!");           return(mDNSfalse); }
+    if (len >= 0x40)  { debugf("DeconstructServiceName: Application protocol name too long");      return(mDNSfalse); }
+    if (src[1] != '_') { debugf("DeconstructServiceName: No _ at start of application protocol");   return(mDNSfalse); }
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    len = *src;
+    if (!len)         { debugf("DeconstructServiceName: FQDN contains only two labels!");          return(mDNSfalse); }
+    if (!ValidTransportProtocol(src))
+    { debugf("DeconstructServiceName: Transport protocol must be _udp or _tcp"); return(mDNSfalse); }
+    for (i=0; i<=len; i++) *dst++ = *src++;
+    *dst++ = 0;                                         // Put terminator on the end of service type
+
+    dst = domain->c;                                    // Extract the service domain
+    while (*src)
+    {
+        len = *src;
+        if (len >= 0x40)
+        { debugf("DeconstructServiceName: Label in service domain too long"); return(mDNSfalse); }
+        if (src + 1 + len + 1 >= max)
+        { debugf("DeconstructServiceName: Total service domain too long"); return(mDNSfalse); }
+        for (i=0; i<=len; i++) *dst++ = *src++;
+    }
+    *dst++ = 0;     // Put the null root label on the end
+
+    return(mDNStrue);
+}
+
+mDNSexport mStatus DNSNameToLowerCase(domainname *d, domainname *result)
+{
+    const mDNSu8 *a = d->c;
+    mDNSu8 *b = result->c;
+    const mDNSu8 *const max = d->c + MAX_DOMAIN_NAME;
+    int i, len;
+
+    while (*a)
+    {
+        if (a + 1 + *a >= max)
+        {
+            LogMsg("DNSNameToLowerCase: ERROR!! Malformed Domain name");
+            return mStatus_BadParamErr;
+        }
+        len = *a++;
+        *b++ = len;
+        for (i = 0; i < len; i++)
+        {
+            mDNSu8 ac = *a++;
+            if (mDNSIsUpperCase(ac)) ac += 'a' - 'A';
+            *b++ = ac;
+        }
+    }
+    *b = 0;
+
+    return mStatus_NoError;
+}
+
+mDNSexport const mDNSu8 *NSEC3HashName(const domainname *name, rdataNSEC3 *nsec3, const mDNSu8 *AnonData, int AnonDataLen,
+    const mDNSu8 hash[NSEC3_MAX_HASH_LEN], int *dlen)
+{
+    AlgContext *ctx;
+    int i;
+    domainname lname;
+    mDNSu8 *p = (mDNSu8 *)&nsec3->salt;
+    const mDNSu8 *digest;
+    int digestlen;
+    mDNSBool first = mDNStrue;
+
+    if (DNSNameToLowerCase((domainname *)name, &lname) != mStatus_NoError)
+    {
+        LogMsg("NSEC3HashName: ERROR!! DNSNameToLowerCase failed");
+        return mDNSNULL;
+    }
+
+    digest = lname.c;
+    digestlen = DomainNameLength(&lname);
+
+    // Note that it is "i <=". The first iteration is for digesting the name and salt.
+    // The iteration count does not include that.
+    for (i = 0; i <= swap16(nsec3->iterations); i++)
+    {
+        ctx = AlgCreate(DIGEST_ALG, nsec3->alg);
+        if (!ctx)
+        {
+            LogMsg("NSEC3HashName: ERROR!! Cannot allocate context");
+            return mDNSNULL;
+        }
+
+        AlgAdd(ctx, digest, digestlen);
+        if (nsec3->saltLength)
+            AlgAdd(ctx, p, nsec3->saltLength);
+        if (AnonDataLen)
+            AlgAdd(ctx, AnonData, AnonDataLen);
+        if (first)
+        {
+            first = mDNSfalse;
+            digest = hash;
+            digestlen = AlgLength(ctx);
+        }
+        AlgFinal(ctx, (void *)digest, digestlen);
+        AlgDestroy(ctx);
+    }
+    *dlen = digestlen;
+    return digest;
+}
+
+// Notes on UTF-8:
+// 0xxxxxxx represents a 7-bit ASCII value from 0x00 to 0x7F
+// 10xxxxxx is a continuation byte of a multi-byte character
+// 110xxxxx is the first byte of a 2-byte character (11 effective bits; values 0x     80 - 0x     800-1)
+// 1110xxxx is the first byte of a 3-byte character (16 effective bits; values 0x    800 - 0x   10000-1)
+// 11110xxx is the first byte of a 4-byte character (21 effective bits; values 0x  10000 - 0x  200000-1)
+// 111110xx is the first byte of a 5-byte character (26 effective bits; values 0x 200000 - 0x 4000000-1)
+// 1111110x is the first byte of a 6-byte character (31 effective bits; values 0x4000000 - 0x80000000-1)
+//
+// UTF-16 surrogate pairs are used in UTF-16 to encode values larger than 0xFFFF.
+// Although UTF-16 surrogate pairs are not supposed to appear in legal UTF-8, we want to be defensive
+// about that too. (See <http://www.unicode.org/faq/utf_bom.html#34>, "What are surrogates?")
+// The first of pair is a UTF-16 value in the range 0xD800-0xDBFF (11101101 1010xxxx 10xxxxxx in UTF-8),
+// and the second    is a UTF-16 value in the range 0xDC00-0xDFFF (11101101 1011xxxx 10xxxxxx in UTF-8).
+
+mDNSexport mDNSu32 TruncateUTF8ToLength(mDNSu8 *string, mDNSu32 length, mDNSu32 max)
+{
+    if (length > max)
+    {
+        mDNSu8 c1 = string[max];                                        // First byte after cut point
+        mDNSu8 c2 = (max+1 < length) ? string[max+1] : (mDNSu8)0xB0;    // Second byte after cut point
+        length = max;   // Trim length down
+        while (length > 0)
+        {
+            // Check if the byte right after the chop point is a UTF-8 continuation byte,
+            // or if the character right after the chop point is the second of a UTF-16 surrogate pair.
+            // If so, then we continue to chop more bytes until we get to a legal chop point.
+            mDNSBool continuation    = ((c1 & 0xC0) == 0x80);
+            mDNSBool secondsurrogate = (c1 == 0xED && (c2 & 0xF0) == 0xB0);
+            if (!continuation && !secondsurrogate) break;
+            c2 = c1;
+            c1 = string[--length];
+        }
+        // Having truncated characters off the end of our string, also cut off any residual white space
+        while (length > 0 && string[length-1] <= ' ') length--;
+    }
+    return(length);
+}
+
+// Returns true if a rich text label ends in " (nnn)", or if an RFC 1034
+// name ends in "-nnn", where n is some decimal number.
+mDNSexport mDNSBool LabelContainsSuffix(const domainlabel *const name, const mDNSBool RichText)
+{
+    mDNSu16 l = name->c[0];
+
+    if (RichText)
+    {
+        if (l < 4) return mDNSfalse;                            // Need at least " (2)"
+        if (name->c[l--] != ')') return mDNSfalse;              // Last char must be ')'
+        if (!mDNSIsDigit(name->c[l])) return mDNSfalse;         // Preceeded by a digit
+        l--;
+        while (l > 2 && mDNSIsDigit(name->c[l])) l--;           // Strip off digits
+        return (name->c[l] == '(' && name->c[l - 1] == ' ');
+    }
+    else
+    {
+        if (l < 2) return mDNSfalse;                            // Need at least "-2"
+        if (!mDNSIsDigit(name->c[l])) return mDNSfalse;         // Last char must be a digit
+        l--;
+        while (l > 2 && mDNSIsDigit(name->c[l])) l--;           // Strip off digits
+        return (name->c[l] == '-');
+    }
+}
+
+// removes an auto-generated suffix (appended on a name collision) from a label.  caller is
+// responsible for ensuring that the label does indeed contain a suffix.  returns the number
+// from the suffix that was removed.
+mDNSexport mDNSu32 RemoveLabelSuffix(domainlabel *name, mDNSBool RichText)
+{
+    mDNSu32 val = 0, multiplier = 1;
+
+    // Chop closing parentheses from RichText suffix
+    if (RichText && name->c[0] >= 1 && name->c[name->c[0]] == ')') name->c[0]--;
+
+    // Get any existing numerical suffix off the name
+    while (mDNSIsDigit(name->c[name->c[0]]))
+    { val += (name->c[name->c[0]] - '0') * multiplier; multiplier *= 10; name->c[0]--; }
+
+    // Chop opening parentheses or dash from suffix
+    if (RichText)
+    {
+        if (name->c[0] >= 2 && name->c[name->c[0]] == '(' && name->c[name->c[0]-1] == ' ') name->c[0] -= 2;
+    }
+    else
+    {
+        if (name->c[0] >= 1 && name->c[name->c[0]] == '-') name->c[0] -= 1;
+    }
+
+    return(val);
+}
+
+// appends a numerical suffix to a label, with the number following a whitespace and enclosed
+// in parentheses (rich text) or following two consecutive hyphens (RFC 1034 domain label).
+mDNSexport void AppendLabelSuffix(domainlabel *const name, mDNSu32 val, const mDNSBool RichText)
+{
+    mDNSu32 divisor = 1, chars = 2; // Shortest possible RFC1034 name suffix is 2 characters ("-2")
+    if (RichText) chars = 4;        // Shortest possible RichText suffix is 4 characters (" (2)")
+
+    // Truncate trailing spaces from RichText names
+    if (RichText) while (name->c[name->c[0]] == ' ') name->c[0]--;
+
+    while (divisor < 0xFFFFFFFFUL/10 && val >= divisor * 10) { divisor *= 10; chars++; }
+
+    name->c[0] = (mDNSu8) TruncateUTF8ToLength(name->c+1, name->c[0], MAX_DOMAIN_LABEL - chars);
+
+    if (RichText) { name->c[++name->c[0]] = ' '; name->c[++name->c[0]] = '('; }
+    else          { name->c[++name->c[0]] = '-'; }
+
+    while (divisor)
+    {
+        name->c[++name->c[0]] = (mDNSu8)('0' + val / divisor);
+        val     %= divisor;
+        divisor /= 10;
+    }
+
+    if (RichText) name->c[++name->c[0]] = ')';
+}
+
+mDNSexport void IncrementLabelSuffix(domainlabel *name, mDNSBool RichText)
+{
+    mDNSu32 val = 0;
+
+    if (LabelContainsSuffix(name, RichText))
+        val = RemoveLabelSuffix(name, RichText);
+
+    // If no existing suffix, start by renaming "Foo" as "Foo (2)" or "Foo-2" as appropriate.
+    // If existing suffix in the range 2-9, increment it.
+    // If we've had ten conflicts already, there are probably too many hosts trying to use the same name,
+    // so add a random increment to improve the chances of finding an available name next time.
+    if      (val == 0) val = 2;
+    else if (val < 10) val++;
+    else val += 1 + mDNSRandom(99);
+
+    AppendLabelSuffix(name, val, RichText);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Resource Record Utility Functions
+#endif
+
+// Set up a AuthRecord with sensible default values.
+// These defaults may be overwritten with new values before mDNS_Register is called
+mDNSexport void mDNS_SetupResourceRecord(AuthRecord *rr, RData *RDataStorage, mDNSInterfaceID InterfaceID,
+                                         mDNSu16 rrtype, mDNSu32 ttl, mDNSu8 RecordType, AuthRecType artype, mDNSRecordCallback Callback, void *Context)
+{
+    //
+    // LocalOnly auth record can be created with LocalOnly InterfaceID or a valid InterfaceID.
+    // Most of the applications normally create with LocalOnly InterfaceID and we store them as
+    // such, so that we can deliver the response to questions that specify LocalOnly InterfaceID.
+    // LocalOnly resource records can also be created with valid InterfaceID which happens today
+    // when we create LocalOnly records for /etc/hosts.
+
+    if (InterfaceID == mDNSInterface_LocalOnly && artype != AuthRecordLocalOnly)
+    {
+        LogMsg("mDNS_SetupResourceRecord: ERROR!! Mismatch LocalOnly record InterfaceID %p called with artype %d", InterfaceID, artype);
+        return;
+    }
+    else if (InterfaceID == mDNSInterface_P2P && artype != AuthRecordP2P)
+    {
+        LogMsg("mDNS_SetupResourceRecord: ERROR!! Mismatch P2P record InterfaceID %p called with artype %d", InterfaceID, artype);
+        return;
+    }
+    else if (!InterfaceID && (artype == AuthRecordP2P || artype == AuthRecordLocalOnly))
+    {
+        LogMsg("mDNS_SetupResourceRecord: ERROR!! Mismatch InterfaceAny record InterfaceID %p called with artype %d", InterfaceID, artype);
+        return;
+    }
+
+    // Don't try to store a TTL bigger than we can represent in platform time units
+    if (ttl > 0x7FFFFFFFUL / mDNSPlatformOneSecond)
+        ttl = 0x7FFFFFFFUL / mDNSPlatformOneSecond;
+    else if (ttl == 0)      // And Zero TTL is illegal
+        ttl = DefaultTTLforRRType(rrtype);
+
+    // Field Group 1: The actual information pertaining to this resource record
+    rr->resrec.RecordType        = RecordType;
+    rr->resrec.InterfaceID       = InterfaceID;
+    rr->resrec.name              = &rr->namestorage;
+    rr->resrec.rrtype            = rrtype;
+    rr->resrec.rrclass           = kDNSClass_IN;
+    rr->resrec.rroriginalttl     = ttl;
+    rr->resrec.rDNSServer        = mDNSNULL;
+    rr->resrec.AnonInfo          = mDNSNULL;
+//	rr->resrec.rdlength          = MUST set by client and/or in mDNS_Register_internal
+//	rr->resrec.rdestimate        = set in mDNS_Register_internal
+//	rr->resrec.rdata             = MUST be set by client
+
+    if (RDataStorage)
+        rr->resrec.rdata = RDataStorage;
+    else
+    {
+        rr->resrec.rdata = &rr->rdatastorage;
+        rr->resrec.rdata->MaxRDLength = sizeof(RDataBody);
+    }
+
+    // Field Group 2: Persistent metadata for Authoritative Records
+    rr->Additional1       = mDNSNULL;
+    rr->Additional2       = mDNSNULL;
+    rr->DependentOn       = mDNSNULL;
+    rr->RRSet             = mDNSNULL;
+    rr->RecordCallback    = Callback;
+    rr->RecordContext     = Context;
+
+    rr->AutoTarget        = Target_Manual;
+    rr->AllowRemoteQuery  = mDNSfalse;
+    rr->ForceMCast        = mDNSfalse;
+
+    rr->WakeUp            = zeroOwner;
+    rr->AddressProxy      = zeroAddr;
+    rr->TimeRcvd          = 0;
+    rr->TimeExpire        = 0;
+    rr->ARType            = artype;
+    rr->AuthFlags         = 0;
+
+    // Field Group 3: Transient state for Authoritative Records (set in mDNS_Register_internal)
+    // Field Group 4: Transient uDNS state for Authoritative Records (set in mDNS_Register_internal)
+
+    // For now, until the uDNS code is fully integrated, it's helpful to zero the uDNS state fields here too, just in case
+    // (e.g. uDNS_RegisterService short-circuits the usual mDNS_Register_internal record registration calls, so a bunch
+    // of fields don't get set up properly. In particular, if we don't zero rr->QueuedRData then the uDNS code crashes.)
+    rr->state             = regState_Zero;
+    rr->uselease          = 0;
+    rr->expire            = 0;
+    rr->Private           = 0;
+    rr->updateid          = zeroID;
+    rr->zone              = rr->resrec.name;
+    rr->nta               = mDNSNULL;
+    rr->tcp               = mDNSNULL;
+    rr->OrigRData         = 0;
+    rr->OrigRDLen         = 0;
+    rr->InFlightRData     = 0;
+    rr->InFlightRDLen     = 0;
+    rr->QueuedRData       = 0;
+    rr->QueuedRDLen       = 0;
+    mDNSPlatformMemZero(&rr->NATinfo, sizeof(rr->NATinfo));
+    rr->SRVChanged = mDNSfalse;
+    rr->mState = mergeState_Zero;
+
+    rr->namestorage.c[0]  = 0;      // MUST be set by client before calling mDNS_Register()
+}
+
+mDNSexport void mDNS_SetupQuestion(DNSQuestion *const q, const mDNSInterfaceID InterfaceID, const domainname *const name,
+                                   const mDNSu16 qtype, mDNSQuestionCallback *const callback, void *const context)
+{
+    q->InterfaceID         = InterfaceID;
+    q->flags               = 0;
+    q->Target              = zeroAddr;
+    AssignDomainName(&q->qname, name);
+    q->qtype               = qtype;
+    q->qclass              = kDNSClass_IN;
+    q->LongLived           = (qtype == kDNSType_PTR);
+    q->ExpectUnique        = (qtype != kDNSType_PTR);
+    q->ForceMCast          = mDNSfalse;
+    q->ReturnIntermed      = mDNSfalse;
+    q->SuppressUnusable    = mDNSfalse;
+    q->SearchListIndex     = 0;
+    q->AppendSearchDomains = 0;
+    q->RetryWithSearchDomains = mDNSfalse;
+    q->TimeoutQuestion     = 0;
+    q->WakeOnResolve       = 0;
+    q->UseBackgroundTrafficClass = mDNSfalse;
+    q->ValidationRequired  = 0;
+    q->ValidatingResponse  = 0;
+    q->ProxyQuestion       = 0;
+    q->qnameOrig           = mDNSNULL;
+    q->AnonInfo            = mDNSNULL;
+    q->pid                 = mDNSPlatformGetPID();
+    q->DisallowPID         = mDNSfalse;
+    q->ServiceID           = -1;
+    q->QuestionCallback    = callback;
+    q->QuestionContext     = context;
+}
+
+mDNSexport mDNSu32 RDataHashValue(const ResourceRecord *const rr)
+{
+    int len = rr->rdlength;
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    const mDNSu8 *ptr = rdb->data;
+    mDNSu32 sum = 0;
+
+    switch(rr->rrtype)
+    {
+    case kDNSType_NS:
+    case kDNSType_MD:
+    case kDNSType_MF:
+    case kDNSType_CNAME:
+    case kDNSType_MB:
+    case kDNSType_MG:
+    case kDNSType_MR:
+    case kDNSType_PTR:
+    case kDNSType_NSAP_PTR:
+    case kDNSType_DNAME: return DomainNameHashValue(&rdb->name);
+
+    case kDNSType_SOA:   return rdb->soa.serial  +
+               rdb->soa.refresh +
+               rdb->soa.retry   +
+               rdb->soa.expire  +
+               rdb->soa.min     +
+               DomainNameHashValue(&rdb->soa.mname) +
+               DomainNameHashValue(&rdb->soa.rname);
+
+    case kDNSType_MX:
+    case kDNSType_AFSDB:
+    case kDNSType_RT:
+    case kDNSType_KX:    return DomainNameHashValue(&rdb->mx.exchange);
+
+    case kDNSType_MINFO:
+    case kDNSType_RP:    return DomainNameHashValue(&rdb->rp.mbox)   + DomainNameHashValue(&rdb->rp.txt);
+
+    case kDNSType_PX:    return DomainNameHashValue(&rdb->px.map822) + DomainNameHashValue(&rdb->px.mapx400);
+
+    case kDNSType_SRV:   return DomainNameHashValue(&rdb->srv.target);
+
+    case kDNSType_OPT:   return 0;      // OPT is a pseudo-RR container structure; makes no sense to compare
+
+    case kDNSType_NSEC: {
+        int dlen;
+        dlen = DomainNameLength((domainname *)rdb->data);
+        sum = DomainNameHashValue((domainname *)rdb->data);
+        ptr += dlen;
+        len -= dlen;
+        /* FALLTHROUGH */
+    }
+
+    default:
+    {
+        int i;
+        for (i=0; i+1 < len; i+=2)
+        {
+            sum += (((mDNSu32)(ptr[i])) << 8) | ptr[i+1];
+            sum = (sum<<3) | (sum>>29);
+        }
+        if (i < len)
+        {
+            sum += ((mDNSu32)(ptr[i])) << 8;
+        }
+        return(sum);
+    }
+    }
+}
+
+// r1 has to be a full ResourceRecord including rrtype and rdlength
+// r2 is just a bare RDataBody, which MUST be the same rrtype and rdlength as r1
+mDNSexport mDNSBool SameRDataBody(const ResourceRecord *const r1, const RDataBody *const r2, DomainNameComparisonFn *samename)
+{
+    const RDataBody2 *const b1 = (RDataBody2 *)r1->rdata->u.data;
+    const RDataBody2 *const b2 = (RDataBody2 *)r2;
+    switch(r1->rrtype)
+    {
+    case kDNSType_NS:
+    case kDNSType_MD:
+    case kDNSType_MF:
+    case kDNSType_CNAME:
+    case kDNSType_MB:
+    case kDNSType_MG:
+    case kDNSType_MR:
+    case kDNSType_PTR:
+    case kDNSType_NSAP_PTR:
+    case kDNSType_DNAME: return(SameDomainName(&b1->name, &b2->name));
+
+    case kDNSType_SOA:  return (mDNSBool)(   b1->soa.serial   == b2->soa.serial             &&
+                                             b1->soa.refresh  == b2->soa.refresh            &&
+                                             b1->soa.retry    == b2->soa.retry              &&
+                                             b1->soa.expire   == b2->soa.expire             &&
+                                             b1->soa.min      == b2->soa.min                &&
+                                             samename(&b1->soa.mname, &b2->soa.mname) &&
+                                             samename(&b1->soa.rname, &b2->soa.rname));
+
+    case kDNSType_MX:
+    case kDNSType_AFSDB:
+    case kDNSType_RT:
+    case kDNSType_KX:   return (mDNSBool)(   b1->mx.preference == b2->mx.preference &&
+                                             samename(&b1->mx.exchange, &b2->mx.exchange));
+
+    case kDNSType_MINFO:
+    case kDNSType_RP:   return (mDNSBool)(   samename(&b1->rp.mbox, &b2->rp.mbox) &&
+                                             samename(&b1->rp.txt,  &b2->rp.txt));
+
+    case kDNSType_PX:   return (mDNSBool)(   b1->px.preference == b2->px.preference          &&
+                                             samename(&b1->px.map822,  &b2->px.map822) &&
+                                             samename(&b1->px.mapx400, &b2->px.mapx400));
+
+    case kDNSType_SRV:  return (mDNSBool)(   b1->srv.priority == b2->srv.priority       &&
+                                             b1->srv.weight   == b2->srv.weight         &&
+                                             mDNSSameIPPort(b1->srv.port, b2->srv.port) &&
+                                             samename(&b1->srv.target, &b2->srv.target));
+
+    case kDNSType_OPT:  return mDNSfalse;       // OPT is a pseudo-RR container structure; makes no sense to compare
+    case kDNSType_NSEC: {
+        // If the "nxt" name changes in case, we want to delete the old
+        // and store just the new one. If the caller passes in SameDomainCS for "samename",
+        // we would return "false" when the only change between the two rdata is the case
+        // change in "nxt".
+        //
+        // Note: rdlength of both the RData are same (ensured by the caller) and hence we can
+        // use just r1->rdlength below
+
+        int dlen1 = DomainNameLength((domainname *)b1->data);
+        int dlen2 = DomainNameLength((domainname *)b2->data);
+        return (mDNSBool)(dlen1 == dlen2 &&
+                          samename((domainname *)b1->data, (domainname *)b2->data) &&
+                          mDNSPlatformMemSame(b1->data + dlen1, b2->data + dlen2, r1->rdlength - dlen1));
+    }
+
+    default:            return(mDNSPlatformMemSame(b1->data, b2->data, r1->rdlength));
+    }
+}
+
+mDNSexport mDNSBool BitmapTypeCheck(mDNSu8 *bmap, int bitmaplen, mDNSu16 type)
+{
+    int win, wlen;
+    int wintype;
+
+    // The window that this type belongs to. NSEC has 256 windows that
+    // comprises of 256 types.
+    wintype = type >> 8;
+
+    while (bitmaplen > 0)
+    {
+        if (bitmaplen < 3)
+        {
+            LogInfo("BitmapTypeCheck: malformed nsec, bitmaplen %d short", bitmaplen);
+            return mDNSfalse;
+        }
+
+        win = *bmap++;
+        wlen = *bmap++;
+        bitmaplen -= 2;
+        if (bitmaplen < wlen || wlen < 1 || wlen > 32)
+        {
+            LogInfo("BitmapTypeCheck: malformed nsec, bitmaplen %d wlen %d, win %d", bitmaplen, wlen, win);
+            return mDNSfalse;
+        }
+        if (win < 0 || win >= 256)
+        {
+            LogInfo("BitmapTypeCheck: malformed nsec, wlen %d", wlen);
+            return mDNSfalse;
+        }
+        if (win == wintype)
+        {
+            // First byte in the window serves 0 to 7, the next one serves 8 to 15 and so on.
+            // Calculate the right byte offset first.
+            int boff = (type & 0xff ) >> 3;
+            if (wlen <= boff)
+                return mDNSfalse;
+            // The last three bits values 0 to 7 corresponds to bit positions
+            // within the byte.
+            return (bmap[boff] & (0x80 >> (type & 7)));
+        }
+        else
+        {
+            // If the windows are ordered, then we could check to see
+            // if wintype > win and then return early.
+            bmap += wlen;
+            bitmaplen -= wlen;
+        }
+    }
+    return mDNSfalse;
+}
+
+// Don't call this function if the resource record is not NSEC. It will return false
+// which means that the type does not exist.
+mDNSexport mDNSBool RRAssertsExistence(const ResourceRecord *const rr, mDNSu16 type)
+{
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    mDNSu8 *nsec = (mDNSu8 *)rdb->data;
+    int len, bitmaplen;
+    mDNSu8 *bmap;
+
+    if (rr->rrtype != kDNSType_NSEC) return mDNSfalse;
+
+    len = DomainNameLength((domainname *)nsec);
+
+    bitmaplen = rr->rdlength - len;
+    bmap = nsec + len;
+    return (BitmapTypeCheck(bmap, bitmaplen, type));
+}
+
+// Don't call this function if the resource record is not NSEC. It will return false
+// which means that the type exists.
+mDNSexport mDNSBool RRAssertsNonexistence(const ResourceRecord *const rr, mDNSu16 type)
+{
+    if (rr->rrtype != kDNSType_NSEC) return mDNSfalse;
+
+    return !RRAssertsExistence(rr, type);
+}
+
+// Checks whether the RRSIG or NSEC record answers the question "q".
+mDNSlocal mDNSBool DNSSECRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q, mDNSBool *checkType)
+{
+    *checkType = mDNStrue;
+
+    // This function is called for all questions and as long as the type matches,
+    // return true. For the types (RRSIG and NSEC) that are specifically checked in
+    // this function, returning true still holds good.
+    if (q->qtype == rr->rrtype)
+        return mDNStrue;
+
+    // For DS and DNSKEY questions, the types should match i.e., don't answer using CNAME
+    // records as it answers any question type.
+    //
+    // - DS record comes from the parent zone where CNAME record cannot coexist and hence
+    //  cannot possibly answer it.
+    //
+    // - For DNSKEY, one could potentially follow CNAME but there could be a DNSKEY at
+    //   the "qname" itself. To keep it simple, we don't follow CNAME.
+
+    if ((q->qtype == kDNSType_DS || q->qtype == kDNSType_DNSKEY) && (q->qtype != rr->rrtype))
+    {
+        debugf("DNSSECRecordAnswersQuestion: %d type resource record matched question %##s (%s), ignoring", rr->rrtype,
+            q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+
+    // If we are validating a response using DNSSEC, we might already have the records
+    // for the "q->qtype" in the cache but we issued a query with DO bit set
+    // to get the RRSIGs e.g., if you have two questions one of which does not require
+    // DNSSEC validation. When the RRSIG is added to the cache, we need to deliver
+    // the response to the question. The RRSIG type won't match the q->qtype and hence
+    // we need to bypass the check in that case.
+    if (rr->rrtype == kDNSType_RRSIG && q->ValidatingResponse)
+    {
+        const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+        rdataRRSig *rrsig = (rdataRRSig *)rdb->data;
+        mDNSu16 typeCovered = swap16(rrsig->typeCovered);
+        debugf("DNSSECRecordAnswersQuestion: Matching RRSIG typeCovered %s", DNSTypeName(typeCovered));
+        if (typeCovered != kDNSType_CNAME && typeCovered != q->qtype)
+        {
+            debugf("DNSSECRecordAnswersQuestion: RRSIG did not match question %##s (%s)", q->qname.c,
+                    DNSTypeName(q->qtype));
+            return mDNSfalse;
+        }
+        LogInfo("DNSSECRecordAnswersQuestion: RRSIG matched question %##s (%s)", q->qname.c,
+                DNSTypeName(q->qtype));
+        *checkType = mDNSfalse;
+        return mDNStrue;
+    }
+    // If the NSEC record asserts the non-existence of a name looked up by the question, we would
+    // typically answer that e.g., the bitmap asserts that q->qtype does not exist. If we have
+    // to prove the non-existence as required by ValidatingResponse and ValidationRequired question,
+    // then we should not answer that as it may not be the right one always. We may need more than
+    // one NSEC to prove the non-existence.
+    if (rr->rrtype == kDNSType_NSEC && DNSSECQuestion(q))
+    {
+        debugf("DNSSECRecordAnswersQuestion: Question %##s (%s) matched record %##s (NSEC)", q->qname.c,
+                DNSTypeName(q->qtype), rr->name->c);
+        return mDNSfalse;
+    }
+    return mDNStrue;
+}
+
+// ResourceRecordAnswersQuestion returns mDNStrue if the given resource record is a valid answer to the given question.
+// SameNameRecordAnswersQuestion is the same, except it skips the expensive SameDomainName() call.
+// SameDomainName() is generally cheap when the names don't match, but expensive when they do match,
+// because it has to check all the way to the end of the names to be sure.
+// In cases where we know in advance that the names match it's especially advantageous to skip the
+// SameDomainName() call because that's precisely the time when it's most expensive and least useful.
+
+mDNSexport mDNSBool SameNameRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    mDNSBool checkType = mDNStrue;
+
+    // LocalOnly/P2P questions can be answered with AuthRecordAny in this function. LocalOnly/P2P records
+    // are handled in LocalOnlyRecordAnswersQuestion
+    if ((rr->InterfaceID == mDNSInterface_LocalOnly) || (rr->InterfaceID == mDNSInterface_P2P))
+    {
+        LogMsg("SameNameRecordAnswersQuestion: ERROR!! called with LocalOnly ResourceRecord %p, Question %p", rr->InterfaceID, q->InterfaceID);
+        return mDNSfalse;
+    }
+    if (QuerySuppressed(q))
+        return mDNSfalse;
+
+    if (rr->InterfaceID &&
+        q->InterfaceID && q->InterfaceID != mDNSInterface_LocalOnly &&
+        rr->InterfaceID != q->InterfaceID) return(mDNSfalse);
+
+    // Resource record received via unicast, the resolver group ID should match ?
+    if (!rr->InterfaceID)
+    {
+        mDNSu16 idr = (rr->rDNSServer ? rr->rDNSServer->resGroupID : 0);
+        mDNSu16 idq = (q->qDNSServer ? q->qDNSServer->resGroupID : 0);
+        if (idr != idq) return(mDNSfalse);
+        if (!DNSSECRecordAnswersQuestion(rr, q, &checkType)) return mDNSfalse;
+    }
+
+    // If ResourceRecord received via multicast, but question was unicast, then shouldn't use record to answer this question
+    if (rr->InterfaceID && !mDNSOpaque16IsZero(q->TargetQID)) return(mDNSfalse);
+
+    // CNAME answers question of any type and a negative cache record should not prevent us from querying other
+    // valid types at the same name.
+    if (rr->rrtype == kDNSType_CNAME && rr->RecordType == kDNSRecordTypePacketNegative && rr->rrtype != q->qtype)
+        return mDNSfalse;
+
+    // RR type CNAME matches any query type. QTYPE ANY matches any RR type. QCLASS ANY matches any RR class.
+    if (checkType && !RRTypeAnswersQuestionType(rr,q->qtype)) return(mDNSfalse);
+    if (rr->rrclass != q->qclass && q->qclass != kDNSQClass_ANY) return(mDNSfalse);
+
+#if APPLE_OSX_mDNSResponder
+    if (!mDNSPlatformValidRecordForQuestion(rr, q))
+        return mDNSfalse;
+#endif // APPLE_OSX_mDNSResponder
+
+    if (!AnonInfoAnswersQuestion(rr, q))
+        return mDNSfalse;
+
+    return(mDNStrue);
+}
+
+mDNSexport mDNSBool ResourceRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    if (!SameNameRecordAnswersQuestion(rr, q))
+        return mDNSfalse;
+
+    return(rr->namehash == q->qnamehash && SameDomainName(rr->name, &q->qname));
+}
+
+// We have a separate function to handle LocalOnly AuthRecords because they can be created with
+// a valid InterfaceID (e.g., scoped /etc/hosts) and can be used to answer unicast questions unlike
+// multicast resource records (which has a valid InterfaceID) which can't be used to answer
+// unicast questions. ResourceRecordAnswersQuestion/SameNameRecordAnswersQuestion can't tell whether
+// a resource record is multicast or LocalOnly by just looking at the ResourceRecord because
+// LocalOnly records are truly identified by ARType in the AuthRecord.  As P2P and LocalOnly record
+// are kept in the same hash table, we use the same function to make it easy for the callers when
+// they walk the hash table to answer LocalOnly/P2P questions
+//
+mDNSexport mDNSBool LocalOnlyRecordAnswersQuestion(AuthRecord *const ar, const DNSQuestion *const q)
+{
+    ResourceRecord *rr = &ar->resrec;
+
+    // mDNSInterface_Any questions can be answered with LocalOnly/P2P records in this function. AuthRecord_Any
+    // records are handled in ResourceRecordAnswersQuestion/SameNameRecordAnswersQuestion
+    if (RRAny(ar))
+    {
+        LogMsg("LocalOnlyRecordAnswersQuestion: ERROR!! called with regular AuthRecordAny %##s", rr->name->c);
+        return mDNSfalse;
+    }
+
+    // Questions with mDNSInterface_LocalOnly InterfaceID should be answered with all resource records that are
+    // *local* to the machine. These include resource records that have InterfaceID set to mDNSInterface_LocalOnly,
+    // mDNSInterface_Any and any other real InterfaceID. Hence, LocalOnly questions should not be checked against
+    // the InterfaceID in the resource record.
+    //
+    // mDNSInterface_Unicast does not indicate any scope and hence treat them like mDNSInterface_Any.
+
+    if (rr->InterfaceID &&
+        q->InterfaceID && q->InterfaceID != mDNSInterface_LocalOnly && q->InterfaceID != mDNSInterface_Unicast &&
+        rr->InterfaceID != q->InterfaceID) return(mDNSfalse);
+
+    // Entries in /etc/hosts are added as LocalOnly resource records. The LocalOnly resource records
+    // may have a scope e.g., fe80::1%en0. The question may be scoped or not: the InterfaceID may be set
+    // to mDNSInterface_Any, mDNSInterface_LocalOnly or a real InterfaceID (scoped).
+    //
+    // 1) Question: Any, LocalOnly Record: no scope. This question should be answered with this record.
+    //
+    // 2) Question: Any, LocalOnly Record: scoped.  This question should be answered with the record because
+    //    traditionally applications never specify scope e.g., getaddrinfo, but need to be able
+    //    to get to /etc/hosts entries.
+    //
+    // 3) Question: Scoped (LocalOnly or InterfaceID), LocalOnly Record: no scope. This is the inverse of (2).
+    //    If we register a LocalOnly record, we need to answer a LocalOnly question. If the /etc/hosts has a
+    //    non scoped entry, it may not make sense to answer a scoped question. But we can't tell these two
+    //    cases apart. As we currently answer LocalOnly question with LocalOnly record, we continue to do so.
+    //
+    // 4) Question: Scoped (LocalOnly or InterfaceID), LocalOnly Record: scoped. LocalOnly questions should be
+    //    answered with any resource record where as if it has a valid InterfaceID, the scope should match.
+    //
+    // (1) and (2) is bypassed because we check for a non-NULL InterfaceID above. For (3), the InterfaceID is NULL
+    // and hence bypassed above. For (4) we bypassed LocalOnly questions and checked the scope of the record
+    // against the question.
+    //
+    // For P2P, InterfaceIDs of the question and the record should match.
+
+    // If ResourceRecord received via multicast, but question was unicast, then shouldn't use record to answer this question.
+    // LocalOnly authoritative answers are exempt. LocalOnly authoritative answers are used for /etc/host entries.
+    // We don't want a local process to be able to create a fake LocalOnly address record for "www.bigbank.com" which would then
+    // cause other applications (e.g. Safari) to connect to the wrong address. The rpc to register records filters out records
+    // with names that don't end in local and have mDNSInterface_LocalOnly set.
+    //
+    // Note: The check is bypassed for LocalOnly and for P2P it is not needed as only .local records are registered and for
+    // a question to match its names, it also has to end in .local and that question can't be a unicast question (See
+    // Question_uDNS macro and its usage). As P2P does not enforce .local only registrations we still make this check
+    // and also makes it future proof.
+
+    if (ar->ARType != AuthRecordLocalOnly && rr->InterfaceID && !mDNSOpaque16IsZero(q->TargetQID)) return(mDNSfalse);
+
+    // RR type CNAME matches any query type. QTYPE ANY matches any RR type. QCLASS ANY matches any RR class.
+    if (!RRTypeAnswersQuestionType(rr,q->qtype)) return(mDNSfalse);
+    if (rr->rrclass != q->qclass && q->qclass != kDNSQClass_ANY) return(mDNSfalse);
+
+    if (!AnonInfoAnswersQuestion(rr, q))
+        return mDNSfalse;
+
+    return(rr->namehash == q->qnamehash && SameDomainName(rr->name, &q->qname));
+}
+
+mDNSexport mDNSBool AnyTypeRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    // LocalOnly/P2P questions can be answered with AuthRecordAny in this function. LocalOnly/P2P records
+    // are handled in LocalOnlyRecordAnswersQuestion
+    if ((rr->InterfaceID == mDNSInterface_LocalOnly) || (rr->InterfaceID == mDNSInterface_P2P))
+    {
+        LogMsg("AnyTypeRecordAnswersQuestion: ERROR!! called with LocalOnly ResourceRecord %p, Question %p", rr->InterfaceID, q->InterfaceID);
+        return mDNSfalse;
+    }
+    if (rr->InterfaceID &&
+        q->InterfaceID && q->InterfaceID != mDNSInterface_LocalOnly &&
+        rr->InterfaceID != q->InterfaceID) return(mDNSfalse);
+
+    // Resource record received via unicast, the resolver group ID should match ?
+    // Note that Auth Records are normally setup with NULL InterfaceID and
+    // both the DNSServers are assumed to be NULL in that case
+    if (!rr->InterfaceID)
+    {
+        mDNSu16 idr = (rr->rDNSServer ? rr->rDNSServer->resGroupID : 0);
+        mDNSu16 idq = (q->qDNSServer ? q->qDNSServer->resGroupID : 0);
+        if (idr != idq) return(mDNSfalse);
+    }
+
+    // If ResourceRecord received via multicast, but question was unicast, then shouldn't use record to answer this question
+    if (rr->InterfaceID && !mDNSOpaque16IsZero(q->TargetQID)) return(mDNSfalse);
+
+    if (rr->rrclass != q->qclass && q->qclass != kDNSQClass_ANY) return(mDNSfalse);
+
+    if (!AnonInfoAnswersQuestion(rr, q))
+        return mDNSfalse;
+
+    return(rr->namehash == q->qnamehash && SameDomainName(rr->name, &q->qname));
+}
+
+// This is called with both unicast resource record and multicast resource record. The question that
+// received the unicast response could be the regular unicast response from a DNS server or a response
+// to a mDNS QU query. The main reason we need this function is that we can't compare DNSServers between the
+// question and the resource record because the resource record is not completely initialized in
+// mDNSCoreReceiveResponse when this function is called.
+mDNSexport mDNSBool ResourceRecordAnswersUnicastResponse(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    mDNSBool checkType = mDNStrue;
+
+    if (QuerySuppressed(q))
+        return mDNSfalse;
+
+    // For resource records created using multicast, the InterfaceIDs have to match
+    if (rr->InterfaceID &&
+        q->InterfaceID && rr->InterfaceID != q->InterfaceID) return(mDNSfalse);
+
+    // If ResourceRecord received via multicast, but question was unicast, then shouldn't use record to answer this question.
+    if (rr->InterfaceID && !mDNSOpaque16IsZero(q->TargetQID)) return(mDNSfalse);
+
+    if (!DNSSECRecordAnswersQuestion(rr, q, &checkType)) return mDNSfalse;
+
+    // RR type CNAME matches any query type. QTYPE ANY matches any RR type. QCLASS ANY matches any RR class.
+    if (checkType && !RRTypeAnswersQuestionType(rr,q->qtype)) return(mDNSfalse);
+
+    if (rr->rrclass != q->qclass && q->qclass != kDNSQClass_ANY) return(mDNSfalse);
+
+    return(rr->namehash == q->qnamehash && SameDomainName(rr->name, &q->qname));
+}
+
+mDNSexport mDNSu16 GetRDLength(const ResourceRecord *const rr, mDNSBool estimate)
+{
+    const RDataBody2 *const rd = (RDataBody2 *)rr->rdata->u.data;
+    const domainname *const name = estimate ? rr->name : mDNSNULL;
+    if (rr->rrclass == kDNSQClass_ANY) return(rr->rdlength);    // Used in update packets to mean "Delete An RRset" (RFC 2136)
+    else switch (rr->rrtype)
+        {
+        case kDNSType_A:    return(sizeof(rd->ipv4));
+
+        case kDNSType_NS:
+        case kDNSType_CNAME:
+        case kDNSType_PTR:
+        case kDNSType_DNAME: return(CompressedDomainNameLength(&rd->name, name));
+
+        case kDNSType_SOA:  return (mDNSu16)(CompressedDomainNameLength(&rd->soa.mname, name) +
+                                             CompressedDomainNameLength(&rd->soa.rname, name) +
+                                             5 * sizeof(mDNSOpaque32));
+
+        case kDNSType_NULL:
+        case kDNSType_TSIG:
+        case kDNSType_TXT:
+        case kDNSType_X25:
+        case kDNSType_ISDN:
+        case kDNSType_LOC:
+        case kDNSType_DHCID: return(rr->rdlength); // Not self-describing, so have to just trust rdlength
+
+        case kDNSType_HINFO: return (mDNSu16)(2 + (int)rd->data[0] + (int)rd->data[1 + (int)rd->data[0]]);
+
+        case kDNSType_MX:
+        case kDNSType_AFSDB:
+        case kDNSType_RT:
+        case kDNSType_KX:   return (mDNSu16)(2 + CompressedDomainNameLength(&rd->mx.exchange, name));
+
+        case kDNSType_RP:   return (mDNSu16)(CompressedDomainNameLength(&rd->rp.mbox, name) +
+                                             CompressedDomainNameLength(&rd->rp.txt, name));
+
+        case kDNSType_PX:   return (mDNSu16)(2 + CompressedDomainNameLength(&rd->px.map822, name) +
+                                             CompressedDomainNameLength(&rd->px.mapx400, name));
+
+        case kDNSType_AAAA: return(sizeof(rd->ipv6));
+
+        case kDNSType_SRV:  return (mDNSu16)(6 + CompressedDomainNameLength(&rd->srv.target, name));
+
+        case kDNSType_OPT:  return(rr->rdlength);
+
+        case kDNSType_NSEC: {
+            domainname *next = (domainname *)rd->data;
+            int dlen = DomainNameLength(next);
+            //
+            if (UNICAST_NSEC(rr))
+                return (mDNSu16)(CompressedDomainNameLength(next, name) + rr->rdlength - dlen);
+            else
+                return (mDNSu16)((estimate ? 2 : dlen) + rr->rdlength - dlen);
+        }
+
+        default:            debugf("Warning! Don't know how to get length of resource type %d", rr->rrtype);
+            return(rr->rdlength);
+        }
+}
+
+// When a local client registers (or updates) a record, we use this routine to do some simple validation checks
+// to help reduce the risk of bogus malformed data on the network
+mDNSexport mDNSBool ValidateRData(const mDNSu16 rrtype, const mDNSu16 rdlength, const RData *const rd)
+{
+    mDNSu16 len;
+
+    switch(rrtype)
+    {
+    case kDNSType_A:    return(rdlength == sizeof(mDNSv4Addr));
+
+    case kDNSType_NS:       // Same as PTR
+    case kDNSType_MD:       // Same as PTR
+    case kDNSType_MF:       // Same as PTR
+    case kDNSType_CNAME:    // Same as PTR
+    //case kDNSType_SOA not checked
+    case kDNSType_MB:       // Same as PTR
+    case kDNSType_MG:       // Same as PTR
+    case kDNSType_MR:       // Same as PTR
+    //case kDNSType_NULL not checked (no specified format, so always valid)
+    //case kDNSType_WKS not checked
+    case kDNSType_PTR:  len = DomainNameLengthLimit(&rd->u.name, rd->u.data + rdlength);
+        return(len <= MAX_DOMAIN_NAME && rdlength == len);
+
+    case kDNSType_HINFO:    // Same as TXT (roughly)
+    case kDNSType_MINFO:    // Same as TXT (roughly)
+    case kDNSType_TXT:  if (!rdlength) return(mDNSfalse);     // TXT record has to be at least one byte (RFC 1035)
+        {
+            const mDNSu8 *ptr = rd->u.txt.c;
+            const mDNSu8 *end = rd->u.txt.c + rdlength;
+            while (ptr < end) ptr += 1 + ptr[0];
+            return (ptr == end);
+        }
+
+    case kDNSType_AAAA: return(rdlength == sizeof(mDNSv6Addr));
+
+    case kDNSType_MX:       // Must be at least two-byte preference, plus domainname
+                            // Call to DomainNameLengthLimit() implicitly enforces both requirements for us
+        len = DomainNameLengthLimit(&rd->u.mx.exchange, rd->u.data + rdlength);
+        return(len <= MAX_DOMAIN_NAME && rdlength == 2+len);
+
+    case kDNSType_SRV:      // Must be at least priority+weight+port, plus domainname
+                            // Call to DomainNameLengthLimit() implicitly enforces both requirements for us
+        len = DomainNameLengthLimit(&rd->u.srv.target, rd->u.data + rdlength);
+        return(len <= MAX_DOMAIN_NAME && rdlength == 6+len);
+
+    //case kDNSType_NSEC not checked
+
+    default:            return(mDNStrue);       // Allow all other types without checking
+    }
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNS Message Creation Functions
+#endif
+
+mDNSexport void InitializeDNSMessage(DNSMessageHeader *h, mDNSOpaque16 id, mDNSOpaque16 flags)
+{
+    h->id             = id;
+    h->flags          = flags;
+    h->numQuestions   = 0;
+    h->numAnswers     = 0;
+    h->numAuthorities = 0;
+    h->numAdditionals = 0;
+}
+
+mDNSexport const mDNSu8 *FindCompressionPointer(const mDNSu8 *const base, const mDNSu8 *const end, const mDNSu8 *const domname)
+{
+    const mDNSu8 *result = end - *domname - 1;
+
+    if (*domname == 0) return(mDNSNULL);    // There's no point trying to match just the root label
+
+    // This loop examines each possible starting position in packet, starting end of the packet and working backwards
+    while (result >= base)
+    {
+        // If the length byte and first character of the label match, then check further to see
+        // if this location in the packet will yield a useful name compression pointer.
+        if (result[0] == domname[0] && result[1] == domname[1])
+        {
+            const mDNSu8 *name = domname;
+            const mDNSu8 *targ = result;
+            while (targ + *name < end)
+            {
+                // First see if this label matches
+                int i;
+                const mDNSu8 *pointertarget;
+                for (i=0; i <= *name; i++) if (targ[i] != name[i]) break;
+                if (i <= *name) break;                          // If label did not match, bail out
+                targ += 1 + *name;                              // Else, did match, so advance target pointer
+                name += 1 + *name;                              // and proceed to check next label
+                if (*name == 0 && *targ == 0) return(result);   // If no more labels, we found a match!
+                if (*name == 0) break;                          // If no more labels to match, we failed, so bail out
+
+                // The label matched, so now follow the pointer (if appropriate) and then see if the next label matches
+                if (targ[0] < 0x40) continue;                   // If length value, continue to check next label
+                if (targ[0] < 0xC0) break;                      // If 40-BF, not valid
+                if (targ+1 >= end) break;                       // Second byte not present!
+                pointertarget = base + (((mDNSu16)(targ[0] & 0x3F)) << 8) + targ[1];
+                if (targ < pointertarget) break;                // Pointertarget must point *backwards* in the packet
+                if (pointertarget[0] >= 0x40) break;            // Pointertarget must point to a valid length byte
+                targ = pointertarget;
+            }
+        }
+        result--;   // We failed to match at this search position, so back up the tentative result pointer and try again
+    }
+    return(mDNSNULL);
+}
+
+// Put a string of dot-separated labels as length-prefixed labels
+// domainname is a fully-qualified name (i.e. assumed to be ending in a dot, even if it doesn't)
+// msg points to the message we're building (pass mDNSNULL if we don't want to use compression pointers)
+// end points to the end of the message so far
+// ptr points to where we want to put the name
+// limit points to one byte past the end of the buffer that we must not overrun
+// domainname is the name to put
+mDNSexport mDNSu8 *putDomainNameAsLabels(const DNSMessage *const msg,
+                                         mDNSu8 *ptr, const mDNSu8 *const limit, const domainname *const name)
+{
+    const mDNSu8 *const base        = (const mDNSu8 *)msg;
+    const mDNSu8 *      np          = name->c;
+    const mDNSu8 *const max         = name->c + MAX_DOMAIN_NAME;    // Maximum that's valid
+    const mDNSu8 *      pointer     = mDNSNULL;
+    const mDNSu8 *const searchlimit = ptr;
+
+    if (!ptr) { LogMsg("putDomainNameAsLabels %##s ptr is null", name->c); return(mDNSNULL); }
+
+    if (!*np)       // If just writing one-byte root label, make sure we have space for that
+    {
+        if (ptr >= limit) return(mDNSNULL);
+    }
+    else            // else, loop through writing labels and/or a compression offset
+    {
+        do  {
+            if (*np > MAX_DOMAIN_LABEL)
+            { LogMsg("Malformed domain name %##s (label more than 63 bytes)", name->c); return(mDNSNULL); }
+
+            // This check correctly allows for the final trailing root label:
+            // e.g.
+            // Suppose our domain name is exactly 256 bytes long, including the final trailing root label.
+            // Suppose np is now at name->c[249], and we're about to write our last non-null label ("local").
+            // We know that max will be at name->c[256]
+            // That means that np + 1 + 5 == max - 1, so we (just) pass the "if" test below, write our
+            // six bytes, then exit the loop, write the final terminating root label, and the domain
+            // name we've written is exactly 256 bytes long, exactly at the correct legal limit.
+            // If the name is one byte longer, then we fail the "if" test below, and correctly bail out.
+            if (np + 1 + *np >= max)
+            { LogMsg("Malformed domain name %##s (more than 256 bytes)", name->c); return(mDNSNULL); }
+
+            if (base) pointer = FindCompressionPointer(base, searchlimit, np);
+            if (pointer)                    // Use a compression pointer if we can
+            {
+                const mDNSu16 offset = (mDNSu16)(pointer - base);
+                if (ptr+2 > limit) return(mDNSNULL);    // If we don't have two bytes of space left, give up
+                *ptr++ = (mDNSu8)(0xC0 | (offset >> 8));
+                *ptr++ = (mDNSu8)(        offset &  0xFF);
+                return(ptr);
+            }
+            else                            // Else copy one label and try again
+            {
+                int i;
+                mDNSu8 len = *np++;
+                // If we don't at least have enough space for this label *plus* a terminating zero on the end, give up
+                if (ptr + 1 + len >= limit) return(mDNSNULL);
+                *ptr++ = len;
+                for (i=0; i<len; i++) *ptr++ = *np++;
+            }
+        } while (*np);                      // While we've got characters remaining in the name, continue
+    }
+
+    *ptr++ = 0;     // Put the final root label
+    return(ptr);
+}
+
+mDNSlocal mDNSu8 *putVal16(mDNSu8 *ptr, mDNSu16 val)
+{
+    ptr[0] = (mDNSu8)((val >> 8 ) & 0xFF);
+    ptr[1] = (mDNSu8)((val      ) & 0xFF);
+    return ptr + sizeof(mDNSOpaque16);
+}
+
+mDNSlocal mDNSu8 *putVal32(mDNSu8 *ptr, mDNSu32 val)
+{
+    ptr[0] = (mDNSu8)((val >> 24) & 0xFF);
+    ptr[1] = (mDNSu8)((val >> 16) & 0xFF);
+    ptr[2] = (mDNSu8)((val >>  8) & 0xFF);
+    ptr[3] = (mDNSu8)((val      ) & 0xFF);
+    return ptr + sizeof(mDNSu32);
+}
+
+// Copy the RDATA information. The actual in memory storage for the data might be bigger than what the rdlength
+// says. Hence, the only way to copy out the data from a resource record is to use putRData.
+// msg points to the message we're building (pass mDNSNULL for "msg" if we don't want to use compression pointers)
+mDNSexport mDNSu8 *putRData(const DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, const ResourceRecord *const rr)
+{
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    switch (rr->rrtype)
+    {
+    case kDNSType_A:    if (rr->rdlength != 4)
+        { debugf("putRData: Illegal length %d for kDNSType_A", rr->rdlength); return(mDNSNULL); }
+        if (ptr + 4 > limit) return(mDNSNULL);
+        *ptr++ = rdb->ipv4.b[0];
+        *ptr++ = rdb->ipv4.b[1];
+        *ptr++ = rdb->ipv4.b[2];
+        *ptr++ = rdb->ipv4.b[3];
+        return(ptr);
+
+    case kDNSType_NS:
+    case kDNSType_CNAME:
+    case kDNSType_PTR:
+    case kDNSType_DNAME: return(putDomainNameAsLabels(msg, ptr, limit, &rdb->name));
+
+    case kDNSType_SOA:  ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->soa.mname);
+        if (!ptr) return(mDNSNULL);
+        ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->soa.rname);
+        if (!ptr || ptr + 20 > limit) return(mDNSNULL);
+        ptr = putVal32(ptr, rdb->soa.serial);
+        ptr = putVal32(ptr, rdb->soa.refresh);
+        ptr = putVal32(ptr, rdb->soa.retry);
+        ptr = putVal32(ptr, rdb->soa.expire);
+        ptr = putVal32(ptr, rdb->soa.min);
+        return(ptr);
+
+    case kDNSType_NULL:
+    case kDNSType_HINFO:
+    case kDNSType_TSIG:
+    case kDNSType_TXT:
+    case kDNSType_X25:
+    case kDNSType_ISDN:
+    case kDNSType_LOC:
+    case kDNSType_DHCID: if (ptr + rr->rdlength > limit) return(mDNSNULL);
+        mDNSPlatformMemCopy(ptr, rdb->data, rr->rdlength);
+        return(ptr + rr->rdlength);
+
+    case kDNSType_MX:
+    case kDNSType_AFSDB:
+    case kDNSType_RT:
+    case kDNSType_KX:   if (ptr + 3 > limit) return(mDNSNULL);
+        ptr = putVal16(ptr, rdb->mx.preference);
+        return(putDomainNameAsLabels(msg, ptr, limit, &rdb->mx.exchange));
+
+    case kDNSType_RP:   ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->rp.mbox);
+        if (!ptr) return(mDNSNULL);
+        ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->rp.txt);
+        return(ptr);
+
+    case kDNSType_PX:   if (ptr + 5 > limit) return(mDNSNULL);
+        ptr = putVal16(ptr, rdb->px.preference);
+        ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->px.map822);
+        if (!ptr) return(mDNSNULL);
+        ptr = putDomainNameAsLabels(msg, ptr, limit, &rdb->px.mapx400);
+        return(ptr);
+
+    case kDNSType_AAAA: if (rr->rdlength != sizeof(rdb->ipv6))
+        { debugf("putRData: Illegal length %d for kDNSType_AAAA", rr->rdlength); return(mDNSNULL); }
+        if (ptr + sizeof(rdb->ipv6) > limit) return(mDNSNULL);
+        mDNSPlatformMemCopy(ptr, &rdb->ipv6, sizeof(rdb->ipv6));
+        return(ptr + sizeof(rdb->ipv6));
+
+    case kDNSType_SRV:  if (ptr + 7 > limit) return(mDNSNULL);
+        *ptr++ = (mDNSu8)(rdb->srv.priority >> 8);
+        *ptr++ = (mDNSu8)(rdb->srv.priority &  0xFF);
+        *ptr++ = (mDNSu8)(rdb->srv.weight   >> 8);
+        *ptr++ = (mDNSu8)(rdb->srv.weight   &  0xFF);
+        *ptr++ = rdb->srv.port.b[0];
+        *ptr++ = rdb->srv.port.b[1];
+        return(putDomainNameAsLabels(msg, ptr, limit, &rdb->srv.target));
+
+    case kDNSType_OPT:  {
+        int len = 0;
+        const rdataOPT *opt;
+        const rdataOPT *const end = (const rdataOPT *)&rr->rdata->u.data[rr->rdlength];
+        for (opt = &rr->rdata->u.opt[0]; opt < end; opt++) 
+            len += DNSOpt_Data_Space(opt);
+        if (ptr + len > limit) 
+        { 
+            LogMsg("ERROR: putOptRData - out of space"); 
+            return mDNSNULL; 
+        }
+        for (opt = &rr->rdata->u.opt[0]; opt < end; opt++)
+        {
+            const int space = DNSOpt_Data_Space(opt);
+            ptr = putVal16(ptr, opt->opt);
+            ptr = putVal16(ptr, (mDNSu16)space - 4);
+            switch (opt->opt)
+            {
+            case kDNSOpt_LLQ:
+                ptr = putVal16(ptr, opt->u.llq.vers);
+                ptr = putVal16(ptr, opt->u.llq.llqOp);
+                ptr = putVal16(ptr, opt->u.llq.err);
+                mDNSPlatformMemCopy(ptr, opt->u.llq.id.b, 8);                          // 8-byte id
+                ptr += 8;
+                ptr = putVal32(ptr, opt->u.llq.llqlease);
+                break;
+            case kDNSOpt_Lease:
+                ptr = putVal32(ptr, opt->u.updatelease);
+                break;
+            case kDNSOpt_Owner:
+                *ptr++ = opt->u.owner.vers;
+                *ptr++ = opt->u.owner.seq;
+                mDNSPlatformMemCopy(ptr, opt->u.owner.HMAC.b, 6);                          // 6-byte Host identifier
+                ptr += 6;
+                if (space >= DNSOpt_OwnerData_ID_Wake_Space)
+                {
+                    mDNSPlatformMemCopy(ptr, opt->u.owner.IMAC.b, 6);                           // 6-byte interface MAC
+                    ptr += 6;
+                    if (space > DNSOpt_OwnerData_ID_Wake_Space)
+                    {
+                        mDNSPlatformMemCopy(ptr, opt->u.owner.password.b, space - DNSOpt_OwnerData_ID_Wake_Space);
+                        ptr += space - DNSOpt_OwnerData_ID_Wake_Space;
+                    }
+                }
+                break;
+            case kDNSOpt_Trace:
+                *ptr++ = opt->u.tracer.platf;
+                ptr    = putVal32(ptr, opt->u.tracer.mDNSv);
+                break;
+            }
+        }
+        return ptr;
+    }
+
+    case kDNSType_NSEC: {
+        // For NSEC records, rdlength represents the exact number of bytes
+        // of in memory storage.
+        int len = rr->rdlength;
+        mDNSu8 *nsec = (mDNSu8 *)rdb->data;
+        domainname *name = (domainname *)nsec;
+        int dlen;
+
+        dlen = DomainNameLength(name);
+        len -= dlen;
+        nsec += dlen;
+        // This function is called when we are sending a NSEC record as part of mDNS,
+        // or to copy the data to any other buffer needed which could be a mDNS or uDNS
+        // NSEC record. The only time compression is used that when we are sending it
+        // in mDNS (indicated by non-NULL "msg") and hence we handle mDNS case
+        // separately.
+        if (!UNICAST_NSEC(rr))
+        {
+            mDNSu8 *save = ptr;
+            int i, j, wlen;
+            wlen = *(nsec + 1);
+            nsec += 2;                     // Skip the window number and len
+            len -= 2;
+
+            // For our simplified use of NSEC synthetic records:
+            //
+            // nextname is always the record's own name,
+            // the block number is always 0,
+            // the count byte is a value in the range 1-32,
+            // followed by the 1-32 data bytes
+            //
+            // Note: When we send the NSEC record in mDNS, the window size is set to 32.
+            // We need to find out what the last non-NULL byte is.  If we are copying out
+            // from an RDATA, we have the right length. As we need to handle both the case,
+            // we loop to find the right value instead of blindly using len to copy.
+
+            for (i=wlen; i>0; i--) if (nsec[i-1]) break;
+
+            ptr = putDomainNameAsLabels(msg, ptr, limit, rr->name);
+            if (!ptr) { LogInfo("putRData: Can't put name, Length %d, record %##s", limit - save, rr->name->c); return(mDNSNULL); }
+            if (i)                          // Only put a block if at least one type exists for this name
+            {
+                if (ptr + 2 + i > limit) { LogInfo("putRData: Can't put window, Length %d, i %d, record %##s", limit - ptr, i, rr->name->c); return(mDNSNULL); }
+                *ptr++ = 0;
+                *ptr++ = (mDNSu8)i;
+                for (j=0; j<i; j++) *ptr++ = nsec[j];
+            }
+            return ptr;
+        }
+        else
+        {
+            int win, wlen;
+
+            // Sanity check whether the bitmap is good
+            while (len)
+            {
+                if (len < 3)
+                { LogMsg("putRData: invalid length %d", len); return mDNSNULL; }
+
+                win = *nsec++;
+                wlen = *nsec++;
+                len -= 2;
+                if (len < wlen || wlen < 1 || wlen > 32)
+                { LogMsg("putRData: invalid window length %d", wlen); return mDNSNULL; }
+                if (win < 0 || win >= 256)
+                { LogMsg("putRData: invalid window %d", win); return mDNSNULL; }
+
+                nsec += wlen;
+                len -= wlen;
+            }
+            if (ptr + rr->rdlength > limit) { LogMsg("putRData: NSEC rdlength beyond limit %##s (%s), ptr %p, rdlength %d, limit %p", rr->name->c, DNSTypeName(rr->rrtype), ptr, rr->rdlength, limit); return(mDNSNULL);}
+
+            // No compression allowed for "nxt", just copy the data.
+            mDNSPlatformMemCopy(ptr, rdb->data, rr->rdlength);
+            return(ptr + rr->rdlength);
+        }
+    }
+
+    default:            debugf("putRData: Warning! Writing unknown resource type %d as raw data", rr->rrtype);
+        if (ptr + rr->rdlength > limit) return(mDNSNULL);
+        mDNSPlatformMemCopy(ptr, rdb->data, rr->rdlength);
+        return(ptr + rr->rdlength);
+    }
+}
+
+#define IsUnicastUpdate(X) (!mDNSOpaque16IsZero((X)->h.id) && ((X)->h.flags.b[0] & kDNSFlag0_OP_Mask) == kDNSFlag0_OP_Update)
+
+mDNSexport mDNSu8 *PutResourceRecordTTLWithLimit(DNSMessage *const msg, mDNSu8 *ptr, mDNSu16 *count, ResourceRecord *rr, mDNSu32 ttl, const mDNSu8 *limit)
+{
+    mDNSu8 *endofrdata;
+    mDNSu16 actualLength;
+    // When sending SRV to conventional DNS server (i.e. in DNS update requests) we should not do name compression on the rdata (RFC 2782)
+    const DNSMessage *const rdatacompressionbase = (IsUnicastUpdate(msg) && rr->rrtype == kDNSType_SRV) ? mDNSNULL : msg;
+
+    if (rr->RecordType == kDNSRecordTypeUnregistered)
+    {
+        LogMsg("PutResourceRecordTTLWithLimit ERROR! Attempt to put kDNSRecordTypeUnregistered %##s (%s)", rr->name->c, DNSTypeName(rr->rrtype));
+        return(ptr);
+    }
+
+    if (!ptr)
+    {
+        LogMsg("PutResourceRecordTTLWithLimit ptr is null %##s (%s)", rr->name->c, DNSTypeName(rr->rrtype));
+        return(mDNSNULL);
+    }
+
+    ptr = putDomainNameAsLabels(msg, ptr, limit, rr->name);
+    // If we're out-of-space, return mDNSNULL
+    if (!ptr || ptr + 10 >= limit)
+    {
+        LogInfo("PutResourceRecordTTLWithLimit: can't put name, out of space %##s (%s), ptr %p, limit %p", rr->name->c,
+            DNSTypeName(rr->rrtype), ptr, limit);
+        return(mDNSNULL);
+    }
+    ptr[0] = (mDNSu8)(rr->rrtype  >> 8);
+    ptr[1] = (mDNSu8)(rr->rrtype  &  0xFF);
+    ptr[2] = (mDNSu8)(rr->rrclass >> 8);
+    ptr[3] = (mDNSu8)(rr->rrclass &  0xFF);
+    ptr[4] = (mDNSu8)((ttl >> 24) &  0xFF);
+    ptr[5] = (mDNSu8)((ttl >> 16) &  0xFF);
+    ptr[6] = (mDNSu8)((ttl >>  8) &  0xFF);
+    ptr[7] = (mDNSu8)( ttl        &  0xFF);
+    // ptr[8] and ptr[9] filled in *after* we find out how much space the rdata takes
+
+    endofrdata = putRData(rdatacompressionbase, ptr+10, limit, rr);
+    if (!endofrdata)
+    {
+        LogInfo("PutResourceRecordTTLWithLimit: Ran out of space in PutResourceRecord for %##s (%s), ptr %p, limit %p", rr->name->c,
+            DNSTypeName(rr->rrtype), ptr+10, limit);
+        return(mDNSNULL);
+    }
+
+    // Go back and fill in the actual number of data bytes we wrote
+    // (actualLength can be less than rdlength when domain name compression is used)
+    actualLength = (mDNSu16)(endofrdata - ptr - 10);
+    ptr[8] = (mDNSu8)(actualLength >> 8);
+    ptr[9] = (mDNSu8)(actualLength &  0xFF);
+
+    if (count) (*count)++;
+    else LogMsg("PutResourceRecordTTL: ERROR: No target count to update for %##s (%s)", rr->name->c, DNSTypeName(rr->rrtype));
+    return(endofrdata);
+}
+
+mDNSlocal mDNSu8 *putEmptyResourceRecord(DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, mDNSu16 *count, const AuthRecord *rr)
+{
+    ptr = putDomainNameAsLabels(msg, ptr, limit, rr->resrec.name);
+    if (!ptr || ptr + 10 > limit) return(mDNSNULL);     // If we're out-of-space, return mDNSNULL
+    ptr[0] = (mDNSu8)(rr->resrec.rrtype  >> 8);             // Put type
+    ptr[1] = (mDNSu8)(rr->resrec.rrtype  &  0xFF);
+    ptr[2] = (mDNSu8)(rr->resrec.rrclass >> 8);             // Put class
+    ptr[3] = (mDNSu8)(rr->resrec.rrclass &  0xFF);
+    ptr[4] = ptr[5] = ptr[6] = ptr[7] = 0;              // TTL is zero
+    ptr[8] = ptr[9] = 0;                                // RDATA length is zero
+    (*count)++;
+    return(ptr + 10);
+}
+
+mDNSexport mDNSu8 *putQuestion(DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, const domainname *const name, mDNSu16 rrtype, mDNSu16 rrclass)
+{
+    ptr = putDomainNameAsLabels(msg, ptr, limit, name);
+    if (!ptr || ptr+4 >= limit) return(mDNSNULL);           // If we're out-of-space, return mDNSNULL
+    ptr[0] = (mDNSu8)(rrtype  >> 8);
+    ptr[1] = (mDNSu8)(rrtype  &  0xFF);
+    ptr[2] = (mDNSu8)(rrclass >> 8);
+    ptr[3] = (mDNSu8)(rrclass &  0xFF);
+    msg->h.numQuestions++;
+    return(ptr+4);
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putZone(DNSMessage *const msg, mDNSu8 *ptr, mDNSu8 *limit, const domainname *zone, mDNSOpaque16 zoneClass)
+{
+    ptr = putDomainNameAsLabels(msg, ptr, limit, zone);
+    if (!ptr || ptr + 4 > limit) return mDNSNULL;       // If we're out-of-space, return NULL
+    *ptr++ = (mDNSu8)(kDNSType_SOA  >> 8);
+    *ptr++ = (mDNSu8)(kDNSType_SOA  &  0xFF);
+    *ptr++ = zoneClass.b[0];
+    *ptr++ = zoneClass.b[1];
+    msg->h.mDNS_numZones++;
+    return ptr;
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putPrereqNameNotInUse(const domainname *const name, DNSMessage *const msg, mDNSu8 *const ptr, mDNSu8 *const end)
+{
+    AuthRecord prereq;
+    mDNS_SetupResourceRecord(&prereq, mDNSNULL, mDNSInterface_Any, kDNSQType_ANY, kStandardTTL, 0, AuthRecordAny, mDNSNULL, mDNSNULL);
+    AssignDomainName(&prereq.namestorage, name);
+    prereq.resrec.rrtype = kDNSQType_ANY;
+    prereq.resrec.rrclass = kDNSClass_NONE;
+    return putEmptyResourceRecord(msg, ptr, end, &msg->h.mDNS_numPrereqs, &prereq);
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putDeletionRecord(DNSMessage *msg, mDNSu8 *ptr, ResourceRecord *rr)
+{
+    // deletion: specify record w/ TTL 0, class NONE
+    const mDNSu16 origclass = rr->rrclass;
+    rr->rrclass = kDNSClass_NONE;
+    ptr = PutResourceRecordTTLJumbo(msg, ptr, &msg->h.mDNS_numUpdates, rr, 0);
+    rr->rrclass = origclass;
+    return ptr;
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putDeletionRecordWithLimit(DNSMessage *msg, mDNSu8 *ptr, ResourceRecord *rr, mDNSu8 *limit)
+{
+    // deletion: specify record w/ TTL 0, class NONE
+    const mDNSu16 origclass = rr->rrclass;
+    rr->rrclass = kDNSClass_NONE;
+    ptr = PutResourceRecordTTLWithLimit(msg, ptr, &msg->h.mDNS_numUpdates, rr, 0, limit);
+    rr->rrclass = origclass;
+    return ptr;
+}
+
+mDNSexport mDNSu8 *putDeleteRRSetWithLimit(DNSMessage *msg, mDNSu8 *ptr, const domainname *name, mDNSu16 rrtype, mDNSu8 *limit)
+{
+    mDNSu16 class = kDNSQClass_ANY;
+
+    ptr = putDomainNameAsLabels(msg, ptr, limit, name);
+    if (!ptr || ptr + 10 >= limit) return mDNSNULL; // If we're out-of-space, return mDNSNULL
+    ptr[0] = (mDNSu8)(rrtype  >> 8);
+    ptr[1] = (mDNSu8)(rrtype  &  0xFF);
+    ptr[2] = (mDNSu8)(class >> 8);
+    ptr[3] = (mDNSu8)(class &  0xFF);
+    ptr[4] = ptr[5] = ptr[6] = ptr[7] = 0; // zero ttl
+    ptr[8] = ptr[9] = 0; // zero rdlength/rdata
+
+    msg->h.mDNS_numUpdates++;
+    return ptr + 10;
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putDeleteAllRRSets(DNSMessage *msg, mDNSu8 *ptr, const domainname *name)
+{
+    const mDNSu8 *limit = msg->data + AbsoluteMaxDNSMessageData;
+    mDNSu16 class = kDNSQClass_ANY;
+    mDNSu16 rrtype = kDNSQType_ANY;
+
+    ptr = putDomainNameAsLabels(msg, ptr, limit, name);
+    if (!ptr || ptr + 10 >= limit) return mDNSNULL; // If we're out-of-space, return mDNSNULL
+    ptr[0] = (mDNSu8)(rrtype >> 8);
+    ptr[1] = (mDNSu8)(rrtype &  0xFF);
+    ptr[2] = (mDNSu8)(class >> 8);
+    ptr[3] = (mDNSu8)(class &  0xFF);
+    ptr[4] = ptr[5] = ptr[6] = ptr[7] = 0; // zero ttl
+    ptr[8] = ptr[9] = 0; // zero rdlength/rdata
+
+    msg->h.mDNS_numUpdates++;
+    return ptr + 10;
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putUpdateLease(DNSMessage *msg, mDNSu8 *end, mDNSu32 lease)
+{
+    AuthRecord rr;
+    mDNS_SetupResourceRecord(&rr, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    rr.resrec.rrclass    = NormalMaxDNSMessageData;
+    rr.resrec.rdlength   = sizeof(rdataOPT);    // One option in this OPT record
+    rr.resrec.rdestimate = sizeof(rdataOPT);
+    rr.resrec.rdata->u.opt[0].opt           = kDNSOpt_Lease;
+    rr.resrec.rdata->u.opt[0].u.updatelease = lease;
+    end = PutResourceRecordTTLJumbo(msg, end, &msg->h.numAdditionals, &rr.resrec, 0);
+    if (!end) { LogMsg("ERROR: putUpdateLease - PutResourceRecordTTL"); return mDNSNULL; }
+    return end;
+}
+
+// for dynamic updates
+mDNSexport mDNSu8 *putUpdateLeaseWithLimit(DNSMessage *msg, mDNSu8 *end, mDNSu32 lease, mDNSu8 *limit)
+{
+    AuthRecord rr;
+    mDNS_SetupResourceRecord(&rr, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    rr.resrec.rrclass    = NormalMaxDNSMessageData;
+    rr.resrec.rdlength   = sizeof(rdataOPT);    // One option in this OPT record
+    rr.resrec.rdestimate = sizeof(rdataOPT);
+    rr.resrec.rdata->u.opt[0].opt           = kDNSOpt_Lease;
+    rr.resrec.rdata->u.opt[0].u.updatelease = lease;
+    end = PutResourceRecordTTLWithLimit(msg, end, &msg->h.numAdditionals, &rr.resrec, 0, limit);
+    if (!end) { LogMsg("ERROR: putUpdateLease - PutResourceRecordTTLWithLimit"); return mDNSNULL; }
+    return end;
+}
+
+mDNSexport mDNSu8 *putDNSSECOption(DNSMessage *msg, mDNSu8 *end, mDNSu8 *limit)
+{
+    AuthRecord rr;
+    mDNSu32 ttl = 0;
+
+    mDNS_SetupResourceRecord(&rr, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    // It is still not clear what the right size is. We will have to fine tune this once we do
+    // a lot of testing with DNSSEC.
+    rr.resrec.rrclass    = 4096;
+    rr.resrec.rdlength   = 0;
+    rr.resrec.rdestimate = 0;
+    // set the DO bit
+    ttl |= 0x8000;
+    end = PutResourceRecordTTLWithLimit(msg, end, &msg->h.numAdditionals, &rr.resrec, ttl, limit);
+    if (!end) { LogMsg("ERROR: putUpdateLease - PutResourceRecordTTLWithLimit"); return mDNSNULL; }
+    return end;
+}
+
+mDNSexport mDNSu8 *putHINFO(const mDNS *const m, DNSMessage *const msg, mDNSu8 *end, DomainAuthInfo *authInfo, mDNSu8 *limit)
+{
+    if (authInfo && authInfo->AutoTunnel)
+    {
+        AuthRecord hinfo;
+        mDNSu8 *h = hinfo.rdatastorage.u.data;
+        mDNSu16 len = 2 + m->HIHardware.c[0] + m->HISoftware.c[0];
+        mDNSu8 *newptr;
+        mDNS_SetupResourceRecord(&hinfo, mDNSNULL, mDNSInterface_Any, kDNSType_HINFO, 0, kDNSRecordTypeUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+        AppendDomainLabel(&hinfo.namestorage, &m->hostlabel);
+        AppendDomainName (&hinfo.namestorage, &authInfo->domain);
+        hinfo.resrec.rroriginalttl = 0;
+        mDNSPlatformMemCopy(h, &m->HIHardware, 1 + (mDNSu32)m->HIHardware.c[0]);
+        h += 1 + (int)h[0];
+        mDNSPlatformMemCopy(h, &m->HISoftware, 1 + (mDNSu32)m->HISoftware.c[0]);
+        hinfo.resrec.rdlength   = len;
+        hinfo.resrec.rdestimate = len;
+        newptr = PutResourceRecordTTLWithLimit(msg, end, &msg->h.numAdditionals, &hinfo.resrec, 0, limit);
+        return newptr;
+    }
+    else
+        return end;
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNS Message Parsing Functions
+#endif
+
+mDNSexport mDNSu32 DomainNameHashValue(const domainname *const name)
+{
+    mDNSu32 sum = 0;
+    const mDNSu8 *c;
+
+    for (c = name->c; c[0] != 0 && c[1] != 0; c += 2)
+    {
+        sum += ((mDNSIsUpperCase(c[0]) ? c[0] + 'a' - 'A' : c[0]) << 8) |
+               (mDNSIsUpperCase(c[1]) ? c[1] + 'a' - 'A' : c[1]);
+        sum = (sum<<3) | (sum>>29);
+    }
+    if (c[0]) sum += ((mDNSIsUpperCase(c[0]) ? c[0] + 'a' - 'A' : c[0]) << 8);
+    return(sum);
+}
+
+mDNSexport void SetNewRData(ResourceRecord *const rr, RData *NewRData, mDNSu16 rdlength)
+{
+    domainname *target;
+    if (NewRData)
+    {
+        rr->rdata    = NewRData;
+        rr->rdlength = rdlength;
+    }
+    // Must not try to get target pointer until after updating rr->rdata
+    target = GetRRDomainNameTarget(rr);
+    rr->rdlength   = GetRDLength(rr, mDNSfalse);
+    rr->rdestimate = GetRDLength(rr, mDNStrue);
+    rr->rdatahash  = target ? DomainNameHashValue(target) : RDataHashValue(rr);
+}
+
+mDNSexport const mDNSu8 *skipDomainName(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *const end)
+{
+    mDNSu16 total = 0;
+
+    if (ptr < (mDNSu8*)msg || ptr >= end)
+    { debugf("skipDomainName: Illegal ptr not within packet boundaries"); return(mDNSNULL); }
+
+    while (1)                       // Read sequence of labels
+    {
+        const mDNSu8 len = *ptr++;  // Read length of this label
+        if (len == 0) return(ptr);  // If length is zero, that means this name is complete
+        switch (len & 0xC0)
+        {
+        case 0x00:  if (ptr + len >= end)                       // Remember: expect at least one more byte for the root label
+            { debugf("skipDomainName: Malformed domain name (overruns packet end)"); return(mDNSNULL); }
+            if (total + 1 + len >= MAX_DOMAIN_NAME)             // Remember: expect at least one more byte for the root label
+            { debugf("skipDomainName: Malformed domain name (more than 256 characters)"); return(mDNSNULL); }
+            ptr += len;
+            total += 1 + len;
+            break;
+
+        case 0x40:  debugf("skipDomainName: Extended EDNS0 label types 0x%X not supported", len); return(mDNSNULL);
+        case 0x80:  debugf("skipDomainName: Illegal label length 0x%X", len); return(mDNSNULL);
+        case 0xC0:  return(ptr+1);
+        }
+    }
+}
+
+// Routine to fetch an FQDN from the DNS message, following compression pointers if necessary.
+mDNSexport const mDNSu8 *getDomainName(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *const end,
+                                       domainname *const name)
+{
+    const mDNSu8 *nextbyte = mDNSNULL;                  // Record where we got to before we started following pointers
+    mDNSu8       *np = name->c;                         // Name pointer
+    const mDNSu8 *const limit = np + MAX_DOMAIN_NAME;   // Limit so we don't overrun buffer
+
+    if (ptr < (mDNSu8*)msg || ptr >= end)
+    { debugf("getDomainName: Illegal ptr not within packet boundaries"); return(mDNSNULL); }
+
+    *np = 0;                        // Tentatively place the root label here (may be overwritten if we have more labels)
+
+    while (1)                       // Read sequence of labels
+    {
+        const mDNSu8 len = *ptr++;  // Read length of this label
+        if (len == 0) break;        // If length is zero, that means this name is complete
+        switch (len & 0xC0)
+        {
+            int i;
+            mDNSu16 offset;
+
+        case 0x00:  if (ptr + len >= end)           // Remember: expect at least one more byte for the root label
+            { debugf("getDomainName: Malformed domain name (overruns packet end)"); return(mDNSNULL); }
+            if (np + 1 + len >= limit)              // Remember: expect at least one more byte for the root label
+            { debugf("getDomainName: Malformed domain name (more than 256 characters)"); return(mDNSNULL); }
+            *np++ = len;
+            for (i=0; i<len; i++) *np++ = *ptr++;
+            *np = 0;                // Tentatively place the root label here (may be overwritten if we have more labels)
+            break;
+
+        case 0x40:  debugf("getDomainName: Extended EDNS0 label types 0x%X not supported in name %##s", len, name->c);
+            return(mDNSNULL);
+
+        case 0x80:  debugf("getDomainName: Illegal label length 0x%X in domain name %##s", len, name->c); return(mDNSNULL);
+
+        case 0xC0:  offset = (mDNSu16)((((mDNSu16)(len & 0x3F)) << 8) | *ptr++);
+            if (!nextbyte) nextbyte = ptr;              // Record where we got to before we started following pointers
+            ptr = (mDNSu8 *)msg + offset;
+            if (ptr < (mDNSu8*)msg || ptr >= end)
+            { debugf("getDomainName: Illegal compression pointer not within packet boundaries"); return(mDNSNULL); }
+            if (*ptr & 0xC0)
+            { debugf("getDomainName: Compression pointer must point to real label"); return(mDNSNULL); }
+            break;
+        }
+    }
+
+    if (nextbyte) return(nextbyte);
+    else return(ptr);
+}
+
+mDNSexport const mDNSu8 *skipResourceRecord(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end)
+{
+    mDNSu16 pktrdlength;
+
+    ptr = skipDomainName(msg, ptr, end);
+    if (!ptr) { debugf("skipResourceRecord: Malformed RR name"); return(mDNSNULL); }
+
+    if (ptr + 10 > end) { debugf("skipResourceRecord: Malformed RR -- no type/class/ttl/len!"); return(mDNSNULL); }
+    pktrdlength = (mDNSu16)((mDNSu16)ptr[8] <<  8 | ptr[9]);
+    ptr += 10;
+    if (ptr + pktrdlength > end) { debugf("skipResourceRecord: RDATA exceeds end of packet"); return(mDNSNULL); }
+
+    return(ptr + pktrdlength);
+}
+
+// Sanity check whether the NSEC/NSEC3 bitmap is good
+mDNSlocal mDNSu8 *SanityCheckBitMap(const mDNSu8 *bmap, const mDNSu8 *end, int len)
+{
+    int win, wlen;
+
+    while (bmap < end)
+    {
+        if (len < 3)
+        {
+            LogInfo("SanityCheckBitMap: invalid length %d", len);
+            return mDNSNULL;
+        }
+
+        win = *bmap++;
+        wlen = *bmap++;
+        len -= 2;
+        if (len < wlen || wlen < 1 || wlen > 32)
+        {
+            LogInfo("SanityCheckBitMap: invalid window length %d", wlen);
+            return mDNSNULL;
+        }
+        if (win < 0 || win >= 256)
+        {
+            LogInfo("SanityCheckBitMap: invalid window %d", win);
+            return mDNSNULL;
+        }
+
+        bmap += wlen;
+        len -= wlen;
+    }
+    return (mDNSu8 *)bmap;
+}
+
+// This function is called with "msg" when we receive a DNS message and needs to parse a single resource record
+// pointed to by "ptr". Some resource records like SOA, SRV are converted to host order and also expanded
+// (domainnames are expanded to 255 bytes) when stored in memory.
+//
+// This function can also be called with "NULL" msg to parse a single resource record pointed to by ptr.
+// The caller can do this only if the names in the resource records are compressed and validity of the
+// resource record has already been done before. DNSSEC currently uses it this way.
+mDNSexport mDNSBool SetRData(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *end,
+    LargeCacheRecord *const largecr, mDNSu16 rdlength)
+{
+    CacheRecord *const rr = &largecr->r;
+    RDataBody2 *const rdb = (RDataBody2 *)rr->smallrdatastorage.data;
+
+    switch (rr->resrec.rrtype)
+    {
+    case kDNSType_A:
+        if (rdlength != sizeof(mDNSv4Addr))
+            goto fail;
+        rdb->ipv4.b[0] = ptr[0];
+        rdb->ipv4.b[1] = ptr[1];
+        rdb->ipv4.b[2] = ptr[2];
+        rdb->ipv4.b[3] = ptr[3];
+        break;
+
+    case kDNSType_NS:
+    case kDNSType_MD:
+    case kDNSType_MF:
+    case kDNSType_CNAME:
+    case kDNSType_MB:
+    case kDNSType_MG:
+    case kDNSType_MR:
+    case kDNSType_PTR:
+    case kDNSType_NSAP_PTR:
+    case kDNSType_DNAME:
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->name);
+        }
+        else
+        {
+            AssignDomainName(&rdb->name, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->name);
+        }
+        if (ptr != end)
+        {
+            debugf("SetRData: Malformed CNAME/PTR RDATA name");
+            goto fail;
+        }
+        break;
+
+    case kDNSType_SOA:
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->soa.mname);
+        }
+        else
+        {
+            AssignDomainName(&rdb->soa.mname, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->soa.mname);
+        }
+        if (!ptr)
+        {
+            debugf("SetRData: Malformed SOA RDATA mname");
+            goto fail;
+        }
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->soa.rname);
+        }
+        else
+        {
+            AssignDomainName(&rdb->soa.rname, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->soa.rname);
+        }
+        if (!ptr)
+        {
+            debugf("SetRData: Malformed SOA RDATA rname");
+            goto fail;
+        }
+        if (ptr + 0x14 != end)
+        {
+            debugf("SetRData: Malformed SOA RDATA");
+            goto fail;
+        }
+        rdb->soa.serial  = (mDNSs32) ((mDNSs32)ptr[0x00] << 24 | (mDNSs32)ptr[0x01] << 16 | (mDNSs32)ptr[0x02] << 8 | ptr[0x03]);
+        rdb->soa.refresh = (mDNSu32) ((mDNSu32)ptr[0x04] << 24 | (mDNSu32)ptr[0x05] << 16 | (mDNSu32)ptr[0x06] << 8 | ptr[0x07]);
+        rdb->soa.retry   = (mDNSu32) ((mDNSu32)ptr[0x08] << 24 | (mDNSu32)ptr[0x09] << 16 | (mDNSu32)ptr[0x0A] << 8 | ptr[0x0B]);
+        rdb->soa.expire  = (mDNSu32) ((mDNSu32)ptr[0x0C] << 24 | (mDNSu32)ptr[0x0D] << 16 | (mDNSu32)ptr[0x0E] << 8 | ptr[0x0F]);
+        rdb->soa.min     = (mDNSu32) ((mDNSu32)ptr[0x10] << 24 | (mDNSu32)ptr[0x11] << 16 | (mDNSu32)ptr[0x12] << 8 | ptr[0x13]);
+        break;
+
+    case kDNSType_NULL:
+    case kDNSType_HINFO:
+    case kDNSType_TXT:
+    case kDNSType_X25:
+    case kDNSType_ISDN:
+    case kDNSType_LOC:
+    case kDNSType_DHCID:
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+
+    case kDNSType_MX:
+    case kDNSType_AFSDB:
+    case kDNSType_RT:
+    case kDNSType_KX:
+        // Preference + domainname
+        if (rdlength < 3)
+            goto fail;
+        rdb->mx.preference = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+        ptr += 2;
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->mx.exchange);
+        }
+        else
+        {
+            AssignDomainName(&rdb->mx.exchange, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->mx.exchange);
+        }
+        if (ptr != end)
+        {
+            debugf("SetRData: Malformed MX name");
+            goto fail;
+        }
+        break;
+
+    case kDNSType_MINFO:
+    case kDNSType_RP:
+        // Domainname + domainname
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->rp.mbox);
+        }
+        else
+        {
+            AssignDomainName(&rdb->rp.mbox, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->rp.mbox);
+        }
+        if (!ptr)
+        {
+            debugf("SetRData: Malformed RP mbox");
+            goto fail;
+        }
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->rp.txt);
+        }
+        else
+        {
+            AssignDomainName(&rdb->rp.txt, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->rp.txt);
+        }
+        if (ptr != end)
+        {
+            debugf("SetRData: Malformed RP txt");
+            goto fail;
+        }
+        break;
+
+    case kDNSType_PX:
+        // Preference + domainname + domainname
+        if (rdlength < 4)
+            goto fail;
+        rdb->px.preference = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+        ptr += 2;
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->px.map822);
+        }
+        else
+        {
+            AssignDomainName(&rdb->px.map822, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->px.map822);
+        }
+        if (!ptr)
+        {
+            debugf("SetRData: Malformed PX map822");
+            goto fail;
+        }
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->px.mapx400);
+        }
+        else
+        {
+            AssignDomainName(&rdb->px.mapx400, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->px.mapx400);
+        }
+        if (ptr != end)
+        {
+            debugf("SetRData: Malformed PX mapx400");
+            goto fail;
+        }
+        break;
+
+    case kDNSType_AAAA:
+        if (rdlength != sizeof(mDNSv6Addr))
+            goto fail;
+        mDNSPlatformMemCopy(&rdb->ipv6, ptr, sizeof(rdb->ipv6));
+        break;
+
+    case kDNSType_SRV:
+        // Priority + weight + port + domainname
+        if (rdlength < 7)
+            goto fail;
+        rdb->srv.priority = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+        rdb->srv.weight   = (mDNSu16)((mDNSu16)ptr[2] <<  8 | ptr[3]);
+        rdb->srv.port.b[0] = ptr[4];
+        rdb->srv.port.b[1] = ptr[5];
+        ptr += 6;
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &rdb->srv.target);
+        }
+        else
+        {
+            AssignDomainName(&rdb->srv.target, (domainname *)ptr);
+            ptr += DomainNameLength(&rdb->srv.target);
+        }
+        if (ptr != end)
+        {
+            debugf("SetRData: Malformed SRV RDATA name");
+            goto fail;
+        }
+        break;
+
+    case kDNSType_NAPTR:
+    {
+        int savelen, len;
+        domainname name;
+        const mDNSu8 *orig = ptr;
+
+        // Make sure the data is parseable and within the limits. DNSSEC code looks at
+        // the domain name in the end for a valid domainname.
+        //
+        // Fixed length: Order, preference (4 bytes)
+        // Variable length: flags, service, regexp, domainname
+
+        if (rdlength < 8)
+            goto fail;
+        // Order, preference.
+        ptr += 4;
+        // Parse flags, Service and Regexp
+        // length in the first byte does not include the length byte itself
+        len = *ptr + 1;
+        ptr += len;
+        if (ptr >= end)
+        {
+            LogInfo("SetRData: Malformed NAPTR flags");
+            goto fail;
+        }
+
+        // Service
+        len = *ptr + 1;
+        ptr += len;
+        if (ptr >= end)
+        {
+            LogInfo("SetRData: Malformed NAPTR service");
+            goto fail;
+        }
+
+        // Regexp
+        len = *ptr + 1;
+        ptr += len;
+        if (ptr >= end)
+        {
+            LogInfo("SetRData: Malformed NAPTR regexp");
+            goto fail;
+        }
+
+        savelen = ptr - orig;
+
+        // RFC 2915 states that name compression is not allowed for this field. But RFC 3597
+        // states that for NAPTR we should decompress. We make sure that we store the full
+        // name rather than the compressed name
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &name);
+        }
+        else
+        {
+            AssignDomainName(&name, (domainname *)ptr);
+            ptr += DomainNameLength(&name);
+        }
+        if (ptr != end)
+        {
+            LogInfo("SetRData: Malformed NAPTR RDATA name");
+            goto fail;
+        }
+
+        rr->resrec.rdlength = savelen + DomainNameLength(&name);
+        // The uncompressed size should not exceed the limits
+        if (rr->resrec.rdlength > MaximumRDSize)
+        {
+            LogInfo("SetRData: Malformed NAPTR rdlength %d, rr->resrec.rdlength %d, "
+                    "bmaplen %d, name %##s", rdlength, rr->resrec.rdlength, name.c);
+            goto fail;
+        }
+        mDNSPlatformMemCopy(rdb->data, orig, savelen);
+        AssignDomainName((domainname *)(rdb->data + savelen), &name);
+        break;
+    }
+    case kDNSType_OPT:  {
+        mDNSu8 *dataend     = rr->resrec.rdata->u.data;
+        rdataOPT *opt = rr->resrec.rdata->u.opt;
+        rr->resrec.rdlength = 0;
+        while (ptr < end && (mDNSu8 *)(opt+1) < &dataend[MaximumRDSize])
+        {
+            const rdataOPT *const currentopt = opt;
+            if (ptr + 4 > end) { LogInfo("SetRData: OPT RDATA ptr + 4 > end"); goto fail; }
+            opt->opt    = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+            opt->optlen = (mDNSu16)((mDNSu16)ptr[2] <<  8 | ptr[3]);
+            ptr += 4;
+            if (ptr + opt->optlen > end) { LogInfo("SetRData: ptr + opt->optlen > end"); goto fail; }
+            switch (opt->opt)
+            {
+            case kDNSOpt_LLQ:
+                if (opt->optlen == DNSOpt_LLQData_Space - 4)
+                {
+                    opt->u.llq.vers  = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+                    opt->u.llq.llqOp = (mDNSu16)((mDNSu16)ptr[2] <<  8 | ptr[3]);
+                    opt->u.llq.err   = (mDNSu16)((mDNSu16)ptr[4] <<  8 | ptr[5]);
+                    mDNSPlatformMemCopy(opt->u.llq.id.b, ptr+6, 8);
+                    opt->u.llq.llqlease = (mDNSu32) ((mDNSu32)ptr[14] << 24 | (mDNSu32)ptr[15] << 16 | (mDNSu32)ptr[16] << 8 | ptr[17]);
+                    if (opt->u.llq.llqlease > 0x70000000UL / mDNSPlatformOneSecond)
+                        opt->u.llq.llqlease = 0x70000000UL / mDNSPlatformOneSecond;
+                    opt++;
+                }
+                break;
+            case kDNSOpt_Lease:
+                if (opt->optlen == DNSOpt_LeaseData_Space - 4)
+                {
+                    opt->u.updatelease = (mDNSu32) ((mDNSu32)ptr[0] << 24 | (mDNSu32)ptr[1] << 16 | (mDNSu32)ptr[2] << 8 | ptr[3]);
+                    if (opt->u.updatelease > 0x70000000UL / mDNSPlatformOneSecond)
+                        opt->u.updatelease = 0x70000000UL / mDNSPlatformOneSecond;
+                    opt++;
+                }
+                break;
+            case kDNSOpt_Owner:
+                if (ValidOwnerLength(opt->optlen))
+                {
+                    opt->u.owner.vers = ptr[0];
+                    opt->u.owner.seq  = ptr[1];
+                    mDNSPlatformMemCopy(opt->u.owner.HMAC.b, ptr+2, 6);                         // 6-byte MAC address
+                    mDNSPlatformMemCopy(opt->u.owner.IMAC.b, ptr+2, 6);                         // 6-byte MAC address
+                    opt->u.owner.password = zeroEthAddr;
+                    if (opt->optlen >= DNSOpt_OwnerData_ID_Wake_Space-4)
+                    {
+                        mDNSPlatformMemCopy(opt->u.owner.IMAC.b, ptr+8, 6);                     // 6-byte MAC address
+                        // This mDNSPlatformMemCopy is safe because the ValidOwnerLength(opt->optlen) check above
+                        // ensures that opt->optlen is no more than DNSOpt_OwnerData_ID_Wake_PW6_Space - 4
+                        if (opt->optlen > DNSOpt_OwnerData_ID_Wake_Space-4)
+                            mDNSPlatformMemCopy(opt->u.owner.password.b, ptr+14, opt->optlen - (DNSOpt_OwnerData_ID_Wake_Space-4));
+                    }
+                    opt++;
+                }
+                break;
+            case kDNSOpt_Trace:
+                if (opt->optlen == DNSOpt_TraceData_Space - 4)
+                {
+                    opt->u.tracer.platf   = ptr[0];
+                    opt->u.tracer.mDNSv   = (mDNSu32) ((mDNSu32)ptr[1] << 24 | (mDNSu32)ptr[2] << 16 | (mDNSu32)ptr[3] << 8 | ptr[4]);
+                    opt++;
+                }
+                break;
+            }
+            ptr += currentopt->optlen;
+        }
+        rr->resrec.rdlength = (mDNSu16)((mDNSu8*)opt - rr->resrec.rdata->u.data);
+        if (ptr != end) { LogInfo("SetRData: Malformed OptRdata"); goto fail; }
+        break;
+    }
+
+    case kDNSType_NSEC: {
+        domainname name;
+        int len = rdlength;
+        int bmaplen, dlen;
+        const mDNSu8 *orig = ptr;
+        const mDNSu8 *bmap;
+
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &name);
+        }
+        else
+        {
+            AssignDomainName(&name, (domainname *)ptr);
+            ptr += DomainNameLength(&name);
+        }
+        if (!ptr)
+        {
+            LogInfo("SetRData: Malformed NSEC nextname");
+            goto fail;
+        }
+
+        dlen = DomainNameLength(&name);
+
+        // Multicast NSECs use name compression for this field unlike the unicast case which
+        // does not use compression. And multicast case always succeeds in compression. So,
+        // the rdlength includes only the compressed space in that case. So, can't
+        // use the DomainNameLength of name to reduce the length here.
+        len -= (ptr - orig);
+        bmaplen = len;                  // Save the length of the bitmap
+        bmap = ptr;
+        ptr = SanityCheckBitMap(bmap, end, len);
+        if (!ptr)
+            goto fail;
+        if (ptr != end)
+        {
+            LogInfo("SetRData: Malformed NSEC length not right");
+            goto fail;
+        }
+
+        // Initialize the right length here. When we call SetNewRData below which in turn calls
+        // GetRDLength and for NSEC case, it assumes that rdlength is intitialized
+        rr->resrec.rdlength = DomainNameLength(&name) + bmaplen;
+
+        // Do we have space after the name expansion ?
+        if (rr->resrec.rdlength > MaximumRDSize)
+        {
+            LogInfo("SetRData: Malformed NSEC rdlength %d, rr->resrec.rdlength %d, "
+                    "bmaplen %d, name %##s", rdlength, rr->resrec.rdlength, name.c);
+            goto fail;
+        }
+        AssignDomainName((domainname *)rdb->data, &name);
+        mDNSPlatformMemCopy(rdb->data + dlen, bmap, bmaplen);
+        break;
+    }
+    case kDNSType_NSEC3:
+    {
+        rdataNSEC3 *nsec3 = (rdataNSEC3 *)ptr;
+        mDNSu8 *p = (mDNSu8 *)&nsec3->salt;
+        int hashLength, bitmaplen;
+
+        if (rdlength < NSEC3_FIXED_SIZE + 1)
+        {
+            LogInfo("SetRData: NSEC3 too small length %d", rdlength);
+            goto fail;
+        }
+        if (nsec3->alg != SHA1_DIGEST_TYPE)
+        {
+            LogInfo("SetRData: nsec3 alg %d not supported", nsec3->alg);
+            goto fail;
+        }
+        if (swap16(nsec3->iterations) > NSEC3_MAX_ITERATIONS)
+        {
+            LogInfo("SetRData: nsec3 iteration count %d too big", swap16(nsec3->iterations));
+            goto fail;
+        } 
+        p += nsec3->saltLength;
+        // There should at least be one byte beyond saltLength
+        if (p >= end)
+        {
+            LogInfo("SetRData: nsec3 too small, at saltlength %d, p %p, end %p", nsec3->saltLength, p, end);
+            goto fail;
+        }
+        // p is pointing at hashLength
+        hashLength = (int)*p++;
+        if (!hashLength)
+        {
+            LogInfo("SetRData: hashLength zero");
+            goto fail;
+        }
+        p += hashLength;
+        if (p > end)
+        {
+            LogInfo("SetRData: nsec3 too small, at hashLength %d, p %p, end %p", hashLength, p, end);
+            goto fail;
+        }
+
+        bitmaplen = rdlength - (int)(p - ptr);
+        p = SanityCheckBitMap(p, end, bitmaplen);
+        if (!p)
+            goto fail;
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+    }
+    case kDNSType_TKEY:
+    case kDNSType_TSIG:
+    {
+        domainname name;
+        int dlen, rlen;
+
+        // The name should not be compressed. But we take the conservative approach
+        // and uncompress the name before we store it.
+        if (msg)
+        {
+            ptr = getDomainName(msg, ptr, end, &name);
+        }
+        else
+        {
+            AssignDomainName(&name, (domainname *)ptr);
+            ptr += DomainNameLength(&name);
+        }
+        if (!ptr)
+        {
+            LogInfo("SetRData: Malformed name for TSIG/TKEY type %d", rr->resrec.rrtype);
+            goto fail;
+        }
+        dlen = DomainNameLength(&name);
+        rlen = end - ptr;
+        rr->resrec.rdlength = dlen + rlen;
+        AssignDomainName((domainname *)rdb->data, &name);
+        mDNSPlatformMemCopy(rdb->data + dlen, ptr, rlen);
+        break;
+    }
+    case kDNSType_RRSIG:
+    {
+        const mDNSu8 *sig = ptr + RRSIG_FIXED_SIZE;
+        const mDNSu8 *orig = sig;
+        domainname name;
+        if (rdlength < RRSIG_FIXED_SIZE + 1)
+        {
+            LogInfo("SetRData: RRSIG too small length %d", rdlength);
+            goto fail;
+        }
+        if (msg)
+        {
+            sig = getDomainName(msg, sig, end, &name);
+        }
+        else
+        {
+            AssignDomainName(&name, (domainname *)sig);
+            sig += DomainNameLength(&name);
+        }
+        if (!sig)
+        {
+            LogInfo("SetRData: Malformed RRSIG record");
+            goto fail;
+        }
+
+        if ((sig - orig) != DomainNameLength(&name))
+        {
+            LogInfo("SetRData: Malformed RRSIG record, signer name compression");
+            goto fail;
+        }
+        // Just ensure that we have at least one byte of the signature
+        if (sig + 1 >= end)
+        {
+            LogInfo("SetRData: Not enough bytes for signature type %d", rr->resrec.rrtype);
+            goto fail;
+        }
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+    }
+    case kDNSType_DNSKEY:
+    {
+        if (rdlength < DNSKEY_FIXED_SIZE + 1)
+        {
+            LogInfo("SetRData: DNSKEY too small length %d", rdlength);
+            goto fail;
+        }
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+    }
+    case kDNSType_DS:
+    {
+        if (rdlength < DS_FIXED_SIZE + 1)
+        {
+            LogInfo("SetRData: DS too small length %d", rdlength);
+            goto fail;
+        }
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+    }
+    default:
+        debugf("SetRData: Warning! Reading resource type %d (%s) as opaque data",
+               rr->resrec.rrtype, DNSTypeName(rr->resrec.rrtype));
+        // Note: Just because we don't understand the record type, that doesn't
+        // mean we fail. The DNS protocol specifies rdlength, so we can
+        // safely skip over unknown records and ignore them.
+        // We also grab a binary copy of the rdata anyway, since the caller
+        // might know how to interpret it even if we don't.
+        rr->resrec.rdlength = rdlength;
+        mDNSPlatformMemCopy(rdb->data, ptr, rdlength);
+        break;
+    }
+    return mDNStrue;
+fail:
+    return mDNSfalse;
+}
+
+mDNSexport const mDNSu8 *GetLargeResourceRecord(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *ptr,
+                                                const mDNSu8 *end, const mDNSInterfaceID InterfaceID, mDNSu8 RecordType, LargeCacheRecord *const largecr)
+{
+    CacheRecord *const rr = &largecr->r;
+    mDNSu16 pktrdlength;
+
+    if (largecr == &m->rec && m->rec.r.resrec.RecordType)
+    {
+        LogMsg("GetLargeResourceRecord: m->rec appears to be already in use for %s", CRDisplayString(m, &m->rec.r));
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+    }
+
+    rr->next              = mDNSNULL;
+    rr->resrec.name       = &largecr->namestorage;
+
+    rr->NextInKAList      = mDNSNULL;
+    rr->TimeRcvd          = m ? m->timenow : 0;
+    rr->DelayDelivery     = 0;
+    rr->NextRequiredQuery = m ? m->timenow : 0;     // Will be updated to the real value when we call SetNextCacheCheckTimeForRecord()
+    rr->LastUsed          = m ? m->timenow : 0;
+    rr->CRActiveQuestion  = mDNSNULL;
+    rr->UnansweredQueries = 0;
+    rr->LastUnansweredTime= 0;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+    rr->MPUnansweredQ     = 0;
+    rr->MPLastUnansweredQT= 0;
+    rr->MPUnansweredKA    = 0;
+    rr->MPExpectingKA     = mDNSfalse;
+#endif
+    rr->NextInCFList      = mDNSNULL;
+
+    rr->resrec.InterfaceID       = InterfaceID;
+    rr->resrec.rDNSServer = mDNSNULL;
+
+    ptr = getDomainName(msg, ptr, end, &largecr->namestorage);      // Will bail out correctly if ptr is NULL
+    if (!ptr) { debugf("GetLargeResourceRecord: Malformed RR name"); return(mDNSNULL); }
+    rr->resrec.namehash = DomainNameHashValue(rr->resrec.name);
+
+    if (ptr + 10 > end) { debugf("GetLargeResourceRecord: Malformed RR -- no type/class/ttl/len!"); return(mDNSNULL); }
+
+    rr->resrec.rrtype            = (mDNSu16) ((mDNSu16)ptr[0] <<  8 | ptr[1]);
+    rr->resrec.rrclass           = (mDNSu16)(((mDNSu16)ptr[2] <<  8 | ptr[3]) & kDNSClass_Mask);
+    rr->resrec.rroriginalttl     = (mDNSu32) ((mDNSu32)ptr[4] << 24 | (mDNSu32)ptr[5] << 16 | (mDNSu32)ptr[6] << 8 | ptr[7]);
+    if (rr->resrec.rroriginalttl > 0x70000000UL / mDNSPlatformOneSecond && (mDNSs32)rr->resrec.rroriginalttl != -1)
+        rr->resrec.rroriginalttl = 0x70000000UL / mDNSPlatformOneSecond;
+    // Note: We don't have to adjust m->NextCacheCheck here -- this is just getting a record into memory for
+    // us to look at. If we decide to copy it into the cache, then we'll update m->NextCacheCheck accordingly.
+    pktrdlength           = (mDNSu16)((mDNSu16)ptr[8] <<  8 | ptr[9]);
+
+    // If mDNS record has cache-flush bit set, we mark it unique
+    // For uDNS records, all are implicitly deemed unique (a single DNS server is always
+    // authoritative for the entire RRSet), unless this is a truncated response
+    if (ptr[2] & (kDNSClass_UniqueRRSet >> 8) || (!InterfaceID && !(msg->h.flags.b[0] & kDNSFlag0_TC)))
+        RecordType |= kDNSRecordTypePacketUniqueMask;
+    ptr += 10;
+    if (ptr + pktrdlength > end) { debugf("GetLargeResourceRecord: RDATA exceeds end of packet"); return(mDNSNULL); }
+    end = ptr + pktrdlength;        // Adjust end to indicate the end of the rdata for this resource record
+
+    rr->resrec.rdata = (RData*)&rr->smallrdatastorage;
+    rr->resrec.rdata->MaxRDLength = MaximumRDSize;
+
+    if (pktrdlength > MaximumRDSize)
+    {
+        LogInfo("GetLargeResourceRecord: %s rdata size (%d) exceeds storage (%d)",
+                DNSTypeName(rr->resrec.rrtype), pktrdlength, rr->resrec.rdata->MaxRDLength);
+        goto fail;
+    }
+
+    if (!RecordType) LogMsg("GetLargeResourceRecord: No RecordType for %##s", rr->resrec.name->c);
+
+    // IMPORTANT: Any record type we understand and unpack into a structure containing domainnames needs to have corresponding
+    // cases in SameRDataBody() and RDataHashValue() to do a semantic comparison (or checksum) of the structure instead of a blind
+    // bitwise memory compare (or sum). This is because a domainname is a fixed size structure holding variable-length data.
+    // Any bytes past the logical end of the name are undefined, and a blind bitwise memory compare may indicate that
+    // two domainnames are different when semantically they are the same name and it's only the unused bytes that differ.
+    if (rr->resrec.rrclass == kDNSQClass_ANY && pktrdlength == 0)   // Used in update packets to mean "Delete An RRset" (RFC 2136)
+        rr->resrec.rdlength = 0;
+    else if (!SetRData(msg, ptr, end, largecr, pktrdlength))
+        goto fail;
+
+    SetNewRData(&rr->resrec, mDNSNULL, 0);      // Sets rdlength, rdestimate, rdatahash for us
+
+    // Success! Now fill in RecordType to show this record contains valid data
+    rr->resrec.RecordType = RecordType;
+    return(end);
+
+fail:
+    // If we were unable to parse the rdata in this record, we indicate that by
+    // returing a 'kDNSRecordTypePacketNegative' record with rdlength set to zero
+    rr->resrec.RecordType = kDNSRecordTypePacketNegative;
+    rr->resrec.rdlength   = 0;
+    rr->resrec.rdestimate = 0;
+    rr->resrec.rdatahash  = 0;
+    return(end);
+}
+
+mDNSexport const mDNSu8 *skipQuestion(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end)
+{
+    ptr = skipDomainName(msg, ptr, end);
+    if (!ptr) { debugf("skipQuestion: Malformed domain name in DNS question section"); return(mDNSNULL); }
+    if (ptr+4 > end) { debugf("skipQuestion: Malformed DNS question section -- no query type and class!"); return(mDNSNULL); }
+    return(ptr+4);
+}
+
+mDNSexport const mDNSu8 *getQuestion(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end, const mDNSInterfaceID InterfaceID,
+                                     DNSQuestion *question)
+{
+    mDNSPlatformMemZero(question, sizeof(*question));
+    question->InterfaceID = InterfaceID;
+    if (!InterfaceID) question->TargetQID = onesID; // In DNSQuestions we use TargetQID as the indicator of whether it's unicast or multicast
+    ptr = getDomainName(msg, ptr, end, &question->qname);
+    if (!ptr) { debugf("Malformed domain name in DNS question section"); return(mDNSNULL); }
+    if (ptr+4 > end) { debugf("Malformed DNS question section -- no query type and class!"); return(mDNSNULL); }
+
+    question->qnamehash = DomainNameHashValue(&question->qname);
+    question->qtype  = (mDNSu16)((mDNSu16)ptr[0] << 8 | ptr[1]);            // Get type
+    question->qclass = (mDNSu16)((mDNSu16)ptr[2] << 8 | ptr[3]);            // and class
+    return(ptr+4);
+}
+
+mDNSexport const mDNSu8 *LocateAnswers(const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    int i;
+    const mDNSu8 *ptr = msg->data;
+    for (i = 0; i < msg->h.numQuestions && ptr; i++) ptr = skipQuestion(msg, ptr, end);
+    return(ptr);
+}
+
+mDNSexport const mDNSu8 *LocateAuthorities(const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    int i;
+    const mDNSu8 *ptr = LocateAnswers(msg, end);
+    for (i = 0; i < msg->h.numAnswers && ptr; i++) ptr = skipResourceRecord(msg, ptr, end);
+    return(ptr);
+}
+
+mDNSexport const mDNSu8 *LocateAdditionals(const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    int i;
+    const mDNSu8 *ptr = LocateAuthorities(msg, end);
+    for (i = 0; i < msg->h.numAuthorities; i++) ptr = skipResourceRecord(msg, ptr, end);
+    return (ptr);
+}
+
+mDNSexport const mDNSu8 *LocateOptRR(const DNSMessage *const msg, const mDNSu8 *const end, int minsize)
+{
+    int i;
+    const mDNSu8 *ptr = LocateAdditionals(msg, end);
+
+    // Locate the OPT record.
+    // According to RFC 2671, "One OPT pseudo-RR can be added to the additional data section of either a request or a response."
+    // This implies that there may be *at most* one OPT record per DNS message, in the Additional Section,
+    // but not necessarily the *last* entry in the Additional Section.
+    for (i = 0; ptr && i < msg->h.numAdditionals; i++)
+    {
+        if (ptr + DNSOpt_Header_Space + minsize <= end &&   // Make sure we have 11+minsize bytes of data
+            ptr[0] == 0                                &&   // Name must be root label
+            ptr[1] == (kDNSType_OPT >> 8  )            &&   // rrtype OPT
+            ptr[2] == (kDNSType_OPT & 0xFF)            &&
+            ((mDNSu16)ptr[9] << 8 | (mDNSu16)ptr[10]) >= (mDNSu16)minsize)
+            return(ptr);
+        else
+            ptr = skipResourceRecord(msg, ptr, end);
+    }
+    return(mDNSNULL);
+}
+
+// On success, GetLLQOptData returns pointer to storage within shared "m->rec";
+// it is caller's responsibilty to clear m->rec.r.resrec.RecordType after use
+// Note: An OPT RDataBody actually contains one or more variable-length rdataOPT objects packed together
+// The code that currently calls this assumes there's only one, instead of iterating through the set
+mDNSexport const rdataOPT *GetLLQOptData(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    const mDNSu8 *ptr = LocateOptRR(msg, end, DNSOpt_LLQData_Space);
+    if (ptr)
+    {
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, 0, kDNSRecordTypePacketAdd, &m->rec);
+        if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative) return(&m->rec.r.resrec.rdata->u.opt[0]);
+    }
+    return(mDNSNULL);
+}
+
+// Get the lease life of records in a dynamic update
+// returns 0 on error or if no lease present
+mDNSexport mDNSu32 GetPktLease(mDNS *m, DNSMessage *msg, const mDNSu8 *end)
+{
+    mDNSu32 result = 0;
+    const mDNSu8 *ptr = LocateOptRR(msg, end, DNSOpt_LeaseData_Space);
+    if (ptr) ptr = GetLargeResourceRecord(m, msg, ptr, end, 0, kDNSRecordTypePacketAdd, &m->rec);
+    if (ptr && m->rec.r.resrec.rdlength >= DNSOpt_LeaseData_Space && m->rec.r.resrec.rdata->u.opt[0].opt == kDNSOpt_Lease)
+        result = m->rec.r.resrec.rdata->u.opt[0].u.updatelease;
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    return(result);
+}
+
+mDNSlocal const mDNSu8 *DumpRecords(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *const end, int count, char *label)
+{
+    int i;
+    LogMsg("%2d %s", count, label);
+    for (i = 0; i < count && ptr; i++)
+    {
+        // This puts a LargeCacheRecord on the stack instead of using the shared m->rec storage,
+        // but since it's only used for debugging (and probably only on OS X, not on
+        // embedded systems) putting a 9kB object on the stack isn't a big problem.
+        LargeCacheRecord largecr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, mDNSInterface_Any, kDNSRecordTypePacketAns, &largecr);
+        if (ptr) LogMsg("%2d TTL%8d %s", i, largecr.r.resrec.rroriginalttl, CRDisplayString(m, &largecr.r));
+    }
+    if (!ptr) LogMsg("DumpRecords: ERROR: Premature end of packet data");
+    return(ptr);
+}
+
+#define DNS_OP_Name(X) (                              \
+        (X) == kDNSFlag0_OP_StdQuery ? ""         :       \
+        (X) == kDNSFlag0_OP_Iquery   ? "Iquery "  :       \
+        (X) == kDNSFlag0_OP_Status   ? "Status "  :       \
+        (X) == kDNSFlag0_OP_Unused3  ? "Unused3 " :       \
+        (X) == kDNSFlag0_OP_Notify   ? "Notify "  :       \
+        (X) == kDNSFlag0_OP_Update   ? "Update "  : "?? " )
+
+#define DNS_RC_Name(X) (                             \
+        (X) == kDNSFlag1_RC_NoErr    ? "NoErr"    :      \
+        (X) == kDNSFlag1_RC_FormErr  ? "FormErr"  :      \
+        (X) == kDNSFlag1_RC_ServFail ? "ServFail" :      \
+        (X) == kDNSFlag1_RC_NXDomain ? "NXDomain" :      \
+        (X) == kDNSFlag1_RC_NotImpl  ? "NotImpl"  :      \
+        (X) == kDNSFlag1_RC_Refused  ? "Refused"  :      \
+        (X) == kDNSFlag1_RC_YXDomain ? "YXDomain" :      \
+        (X) == kDNSFlag1_RC_YXRRSet  ? "YXRRSet"  :      \
+        (X) == kDNSFlag1_RC_NXRRSet  ? "NXRRSet"  :      \
+        (X) == kDNSFlag1_RC_NotAuth  ? "NotAuth"  :      \
+        (X) == kDNSFlag1_RC_NotZone  ? "NotZone"  : "??" )
+
+// Note: DumpPacket expects the packet header fields in host byte order, not network byte order
+mDNSexport void DumpPacket(mDNS *const m, mStatus status, mDNSBool sent, char *transport,
+                           const mDNSAddr *srcaddr, mDNSIPPort srcport,
+                           const mDNSAddr *dstaddr, mDNSIPPort dstport, const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    mDNSBool IsUpdate = ((msg->h.flags.b[0] & kDNSFlag0_OP_Mask) == kDNSFlag0_OP_Update);
+    const mDNSu8 *ptr = msg->data;
+    int i;
+    DNSQuestion q;
+    char tbuffer[64], sbuffer[64], dbuffer[64] = "";
+    if (!status) tbuffer[mDNS_snprintf(tbuffer, sizeof(tbuffer), sent ? "Sent" : "Received"                        )] = 0;
+    else tbuffer[mDNS_snprintf(tbuffer, sizeof(tbuffer), "ERROR %d %sing", status, sent ? "Send" : "Receive")] = 0;
+    if (sent) sbuffer[mDNS_snprintf(sbuffer, sizeof(sbuffer), "port "        )] = 0;
+    else sbuffer[mDNS_snprintf(sbuffer, sizeof(sbuffer), "%#a:", srcaddr)] = 0;
+    if (dstaddr || !mDNSIPPortIsZero(dstport))
+        dbuffer[mDNS_snprintf(dbuffer, sizeof(dbuffer), " to %#a:%d", dstaddr, mDNSVal16(dstport))] = 0;
+
+    LogMsg("-- %s %s DNS %s%s (flags %02X%02X) RCODE: %s (%d) %s%s%s%s%s%sID: %d %d bytes from %s%d%s%s --",
+           tbuffer, transport,
+           DNS_OP_Name(msg->h.flags.b[0] & kDNSFlag0_OP_Mask),
+           msg->h.flags.b[0] & kDNSFlag0_QR_Response ? "Response" : "Query",
+           msg->h.flags.b[0], msg->h.flags.b[1],
+           DNS_RC_Name(msg->h.flags.b[1] & kDNSFlag1_RC_Mask),
+           msg->h.flags.b[1] & kDNSFlag1_RC_Mask,
+           msg->h.flags.b[0] & kDNSFlag0_AA ? "AA " : "",
+           msg->h.flags.b[0] & kDNSFlag0_TC ? "TC " : "",
+           msg->h.flags.b[0] & kDNSFlag0_RD ? "RD " : "",
+           msg->h.flags.b[1] & kDNSFlag1_RA ? "RA " : "",
+           msg->h.flags.b[1] & kDNSFlag1_AD ? "AD " : "",
+           msg->h.flags.b[1] & kDNSFlag1_CD ? "CD " : "",
+           mDNSVal16(msg->h.id),
+           end - msg->data,
+           sbuffer, mDNSVal16(srcport), dbuffer,
+           (msg->h.flags.b[0] & kDNSFlag0_TC) ? " (truncated)" : ""
+           );
+
+    LogMsg("%2d %s", msg->h.numQuestions, IsUpdate ? "Zone" : "Questions");
+    for (i = 0; i < msg->h.numQuestions && ptr; i++)
+    {
+        ptr = getQuestion(msg, ptr, end, mDNSInterface_Any, &q);
+        if (ptr) LogMsg("%2d %##s %s", i, q.qname.c, DNSTypeName(q.qtype));
+    }
+    ptr = DumpRecords(m, msg, ptr, end, msg->h.numAnswers,     IsUpdate ? "Prerequisites" : "Answers");
+    ptr = DumpRecords(m, msg, ptr, end, msg->h.numAuthorities, IsUpdate ? "Updates"       : "Authorities");
+    ptr = DumpRecords(m, msg, ptr, end, msg->h.numAdditionals, "Additionals");
+    LogMsg("--------------");
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Packet Sending Functions
+#endif
+
+// Stub definition of TCPSocket_struct so we can access flags field. (Rest of TCPSocket_struct is platform-dependent.)
+struct TCPSocket_struct { TCPSocketFlags flags; /* ... */ };
+
+struct UDPSocket_struct
+{
+    mDNSIPPort port; // MUST BE FIRST FIELD -- mDNSCoreReceive expects every UDPSocket_struct to begin with mDNSIPPort port
+};
+
+// Note: When we sign a DNS message using DNSDigest_SignMessage(), the current real-time clock value is used, which
+// is why we generally defer signing until we send the message, to ensure the signature is as fresh as possible.
+mDNSexport mStatus mDNSSendDNSMessage(mDNS *const m, DNSMessage *const msg, mDNSu8 *end,
+                                      mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
+                                      mDNSIPPort dstport, TCPSocket *sock, DomainAuthInfo *authInfo,
+                                      mDNSBool useBackgroundTrafficClass)
+{
+    mStatus status = mStatus_NoError;
+    const mDNSu16 numAdditionals = msg->h.numAdditionals;
+    mDNSu8 *newend;
+    mDNSu8 *limit = msg->data + AbsoluteMaxDNSMessageData;
+
+#if APPLE_OSX_mDNSResponder
+    // maintain outbound packet statistics
+    if (mDNSOpaque16IsZero(msg->h.id))
+        m->MulticastPacketsSent++;
+    else
+        m->UnicastPacketsSent++;
+#endif // APPLE_OSX_mDNSResponder
+
+    // Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code
+    if (end < msg->data || end - msg->data > AbsoluteMaxDNSMessageData)
+    {
+        LogMsg("mDNSSendDNSMessage: invalid message %p %p %d", msg->data, end, end - msg->data);
+        return mStatus_BadParamErr;
+    }
+
+    newend = putHINFO(m, msg, end, authInfo, limit);
+    if (!newend) LogMsg("mDNSSendDNSMessage: putHINFO failed msg %p end %p, limit %p", msg->data, end, limit); // Not fatal
+    else end = newend;
+
+    // Put all the integer values in IETF byte-order (MSB first, LSB second)
+    SwapDNSHeaderBytes(msg);
+
+    if (authInfo) DNSDigest_SignMessage(msg, &end, authInfo, 0);    // DNSDigest_SignMessage operates on message in network byte order
+    if (!end) { LogMsg("mDNSSendDNSMessage: DNSDigest_SignMessage failed"); status = mStatus_NoMemoryErr; }
+    else
+    {
+        // Send the packet on the wire
+        if (!sock)
+            status = mDNSPlatformSendUDP(m, msg, end, InterfaceID, src, dst, dstport, useBackgroundTrafficClass);
+        else
+        {
+            mDNSu16 msglen = (mDNSu16)(end - (mDNSu8 *)msg);
+            mDNSu8 lenbuf[2] = { (mDNSu8)(msglen >> 8), (mDNSu8)(msglen & 0xFF) };
+            char *buf;
+            long nsent;
+
+            // Try to send them in one packet if we can allocate enough memory
+            buf = mDNSPlatformMemAllocate(msglen + 2);
+            if (buf)
+            {
+                buf[0] = lenbuf[0];
+                buf[1] = lenbuf[1];
+                mDNSPlatformMemCopy(buf+2, msg, msglen);
+                nsent = mDNSPlatformWriteTCP(sock, buf, msglen+2);
+                if (nsent != (msglen + 2))
+                {
+                    LogMsg("mDNSSendDNSMessage: write message failed %d/%d", nsent, msglen);
+                    status = mStatus_ConnFailed;
+                }
+                mDNSPlatformMemFree(buf);
+            }
+            else
+            {
+                nsent = mDNSPlatformWriteTCP(sock, (char*)lenbuf, 2);
+                if (nsent != 2)
+                {
+                    LogMsg("mDNSSendDNSMessage: write msg length failed %d/%d", nsent, 2);
+                    status = mStatus_ConnFailed;
+                }
+                else
+                {
+                    nsent = mDNSPlatformWriteTCP(sock, (char *)msg, msglen);
+                    if (nsent != msglen)
+                    {
+                        LogMsg("mDNSSendDNSMessage: write msg body failed %d/%d", nsent, msglen);
+                        status = mStatus_ConnFailed;
+                    }
+                }
+            }
+        }
+    }
+
+    // Swap the integer values back the way they were (remember that numAdditionals may have been changed by putHINFO and/or SignMessage)
+    SwapDNSHeaderBytes(msg);
+
+    // Dump the packet with the HINFO and TSIG
+    if (mDNS_PacketLoggingEnabled && !mDNSOpaque16IsZero(msg->h.id))
+        DumpPacket(m, status, mDNStrue, sock && (sock->flags & kTCPSocketFlags_UseTLS) ? "TLS" : sock ? "TCP" : "UDP", mDNSNULL, src ? src->port : MulticastDNSPort, dst, dstport, msg, end);
+
+    // put the number of additionals back the way it was
+    msg->h.numAdditionals = numAdditionals;
+
+    return(status);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - RR List Management & Task Management
+#endif
+
+mDNSexport void mDNS_Lock_(mDNS *const m, const char * const functionname)
+{
+    // MUST grab the platform lock FIRST!
+    mDNSPlatformLock(m);
+
+    // Normally, mDNS_reentrancy is zero and so is mDNS_busy
+    // However, when we call a client callback mDNS_busy is one, and we increment mDNS_reentrancy too
+    // If that client callback does mDNS API calls, mDNS_reentrancy and mDNS_busy will both be one
+    // If mDNS_busy != mDNS_reentrancy that's a bad sign
+    if (m->mDNS_busy != m->mDNS_reentrancy)
+    {
+        LogMsg("%s: mDNS_Lock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", functionname, m->mDNS_busy, m->mDNS_reentrancy);
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+    }
+
+    // If this is an initial entry into the mDNSCore code, set m->timenow
+    // else, if this is a re-entrant entry into the mDNSCore code, m->timenow should already be set
+    if (m->mDNS_busy == 0)
+    {
+        if (m->timenow)
+            LogMsg("%s: mDNS_Lock: m->timenow already set (%ld/%ld)", functionname, m->timenow, mDNS_TimeNow_NoLock(m));
+        m->timenow = mDNS_TimeNow_NoLock(m);
+        if (m->timenow == 0) m->timenow = 1;
+    }
+    else if (m->timenow == 0)
+    {
+        LogMsg("%s: mDNS_Lock: m->mDNS_busy is %ld but m->timenow not set", functionname, m->mDNS_busy);
+        m->timenow = mDNS_TimeNow_NoLock(m);
+        if (m->timenow == 0) m->timenow = 1;
+    }
+
+    if (m->timenow_last - m->timenow > 0)
+    {
+        m->timenow_adjust += m->timenow_last - m->timenow;
+        LogMsg("%s: mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld", functionname, m->timenow_last - m->timenow, m->timenow_adjust);
+        m->timenow = m->timenow_last;
+    }
+    m->timenow_last = m->timenow;
+
+    // Increment mDNS_busy so we'll recognise re-entrant calls
+    m->mDNS_busy++;
+}
+
+mDNSlocal AuthRecord *AnyLocalRecordReady(const mDNS *const m)
+{
+    AuthRecord *rr;
+    for (rr = m->NewLocalRecords; rr; rr = rr->next)
+        if (LocalRecordReady(rr)) return rr;
+    return mDNSNULL;
+}
+
+mDNSlocal mDNSs32 GetNextScheduledEvent(const mDNS *const m)
+{
+    mDNSs32 e = m->timenow + 0x78000000;
+    if (m->mDNSPlatformStatus != mStatus_NoError) return(e);
+    if (m->NewQuestions)
+    {
+        if (m->NewQuestions->DelayAnswering) e = m->NewQuestions->DelayAnswering;
+        else return(m->timenow);
+    }
+    if (m->NewLocalOnlyQuestions) return(m->timenow);
+    if (m->NewLocalRecords && AnyLocalRecordReady(m)) return(m->timenow);
+    if (m->NewLocalOnlyRecords) return(m->timenow);
+    if (m->SPSProxyListChanged) return(m->timenow);
+    if (m->LocalRemoveEvents) return(m->timenow);
+
+#ifndef UNICAST_DISABLED
+    if (e - m->NextuDNSEvent         > 0) e = m->NextuDNSEvent;
+    if (e - m->NextScheduledNATOp    > 0) e = m->NextScheduledNATOp;
+    if (m->NextSRVUpdate && e - m->NextSRVUpdate > 0) e = m->NextSRVUpdate;
+#endif
+
+    if (e - m->NextCacheCheck        > 0) e = m->NextCacheCheck;
+    if (e - m->NextScheduledSPS      > 0) e = m->NextScheduledSPS;
+    if (e - m->NextScheduledKA       > 0) e = m->NextScheduledKA;
+
+    // NextScheduledSPRetry only valid when DelaySleep not set
+    if (!m->DelaySleep && m->SleepLimit && e - m->NextScheduledSPRetry > 0) e = m->NextScheduledSPRetry;
+    if (m->DelaySleep && e - m->DelaySleep > 0) e = m->DelaySleep;
+
+    if (m->SuppressSending)
+    {
+        if (e - m->SuppressSending       > 0) e = m->SuppressSending;
+    }
+    else
+    {
+        if (e - m->NextScheduledQuery    > 0) e = m->NextScheduledQuery;
+        if (e - m->NextScheduledProbe    > 0) e = m->NextScheduledProbe;
+        if (e - m->NextScheduledResponse > 0) e = m->NextScheduledResponse;
+    }
+    if (e - m->NextScheduledStopTime > 0) e = m->NextScheduledStopTime;
+    return(e);
+}
+
+mDNSexport void ShowTaskSchedulingError(mDNS *const m)
+{
+    AuthRecord *rr;
+    mDNS_Lock(m);
+
+    LogMsg("Task Scheduling Error: Continuously busy for more than a second");
+
+    // Note: To accurately diagnose *why* we're busy, the debugging code here needs to mirror the logic in GetNextScheduledEvent above
+
+    if (m->NewQuestions && (!m->NewQuestions->DelayAnswering || m->timenow - m->NewQuestions->DelayAnswering >= 0))
+        LogMsg("Task Scheduling Error: NewQuestion %##s (%s)",
+               m->NewQuestions->qname.c, DNSTypeName(m->NewQuestions->qtype));
+
+    if (m->NewLocalOnlyQuestions)
+        LogMsg("Task Scheduling Error: NewLocalOnlyQuestions %##s (%s)",
+               m->NewLocalOnlyQuestions->qname.c, DNSTypeName(m->NewLocalOnlyQuestions->qtype));
+
+    if (m->NewLocalRecords)
+    {
+        rr = AnyLocalRecordReady(m);
+        if (rr) LogMsg("Task Scheduling Error: NewLocalRecords %s", ARDisplayString(m, rr));
+    }
+
+    if (m->NewLocalOnlyRecords) LogMsg("Task Scheduling Error: NewLocalOnlyRecords");
+
+    if (m->SPSProxyListChanged) LogMsg("Task Scheduling Error: SPSProxyListChanged");
+    if (m->LocalRemoveEvents) LogMsg("Task Scheduling Error: LocalRemoveEvents");
+
+    if (m->timenow - m->NextScheduledEvent    >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledEvent %d",    m->timenow - m->NextScheduledEvent);
+
+#ifndef UNICAST_DISABLED
+    if (m->timenow - m->NextuDNSEvent         >= 0)
+        LogMsg("Task Scheduling Error: m->NextuDNSEvent %d",         m->timenow - m->NextuDNSEvent);
+    if (m->timenow - m->NextScheduledNATOp    >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledNATOp %d",    m->timenow - m->NextScheduledNATOp);
+    if (m->NextSRVUpdate && m->timenow - m->NextSRVUpdate >= 0)
+        LogMsg("Task Scheduling Error: m->NextSRVUpdate %d",         m->timenow - m->NextSRVUpdate);
+#endif
+
+    if (m->timenow - m->NextCacheCheck        >= 0)
+        LogMsg("Task Scheduling Error: m->NextCacheCheck %d",        m->timenow - m->NextCacheCheck);
+    if (m->timenow - m->NextScheduledSPS      >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledSPS %d",      m->timenow - m->NextScheduledSPS);
+    if (m->timenow - m->NextScheduledKA       >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledKA %d",      m->timenow - m->NextScheduledKA);
+    if (!m->DelaySleep && m->SleepLimit && m->timenow - m->NextScheduledSPRetry >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledSPRetry %d",  m->timenow - m->NextScheduledSPRetry);
+    if (m->DelaySleep && m->timenow - m->DelaySleep >= 0)
+        LogMsg("Task Scheduling Error: m->DelaySleep %d",            m->timenow - m->DelaySleep);
+
+    if (m->SuppressSending && m->timenow - m->SuppressSending >= 0)
+        LogMsg("Task Scheduling Error: m->SuppressSending %d",       m->timenow - m->SuppressSending);
+    if (m->timenow - m->NextScheduledQuery    >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledQuery %d",    m->timenow - m->NextScheduledQuery);
+    if (m->timenow - m->NextScheduledProbe    >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledProbe %d",    m->timenow - m->NextScheduledProbe);
+    if (m->timenow - m->NextScheduledResponse >= 0)
+        LogMsg("Task Scheduling Error: m->NextScheduledResponse %d", m->timenow - m->NextScheduledResponse);
+
+    mDNS_Unlock(m);
+}
+
+mDNSexport void mDNS_Unlock_(mDNS *const m, const char * const functionname)
+{
+    // Decrement mDNS_busy
+    m->mDNS_busy--;
+
+    // Check for locking failures
+    if (m->mDNS_busy != m->mDNS_reentrancy)
+    {
+        LogMsg("%s: mDNS_Unlock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", functionname, m->mDNS_busy, m->mDNS_reentrancy);
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+    }
+
+    // If this is a final exit from the mDNSCore code, set m->NextScheduledEvent and clear m->timenow
+    if (m->mDNS_busy == 0)
+    {
+        m->NextScheduledEvent = GetNextScheduledEvent(m);
+        if (m->timenow == 0) LogMsg("%s: mDNS_Unlock: ERROR! m->timenow aready zero", functionname);
+        m->timenow = 0;
+    }
+
+    // MUST release the platform lock LAST!
+    mDNSPlatformUnlock(m);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Specialized mDNS version of vsnprintf
+#endif
+
+static const struct mDNSprintf_format
+{
+    unsigned leftJustify : 1;
+    unsigned forceSign : 1;
+    unsigned zeroPad : 1;
+    unsigned havePrecision : 1;
+    unsigned hSize : 1;
+    unsigned lSize : 1;
+    char altForm;
+    char sign;              // +, - or space
+    unsigned int fieldWidth;
+    unsigned int precision;
+} mDNSprintf_format_default = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+mDNSexport mDNSu32 mDNS_vsnprintf(char *sbuffer, mDNSu32 buflen, const char *fmt, va_list arg)
+{
+    mDNSu32 nwritten = 0;
+    int c;
+    if (buflen == 0) return(0);
+    buflen--;       // Pre-reserve one space in the buffer for the terminating null
+    if (buflen == 0) goto exit;
+
+    for (c = *fmt; c != 0; c = *++fmt)
+    {
+        if (c != '%')
+        {
+            *sbuffer++ = (char)c;
+            if (++nwritten >= buflen) goto exit;
+        }
+        else
+        {
+            unsigned int i=0, j;
+            // The mDNS Vsprintf Argument Conversion Buffer is used as a temporary holding area for
+            // generating decimal numbers, hexdecimal numbers, IP addresses, domain name strings, etc.
+            // The size needs to be enough for a 256-byte domain name plus some error text.
+            #define mDNS_VACB_Size 300
+            char mDNS_VACB[mDNS_VACB_Size];
+            #define mDNS_VACB_Lim (&mDNS_VACB[mDNS_VACB_Size])
+            #define mDNS_VACB_Remain(s) ((mDNSu32)(mDNS_VACB_Lim - s))
+            char *s = mDNS_VACB_Lim, *digits;
+            struct mDNSprintf_format F = mDNSprintf_format_default;
+
+            while (1)   //  decode flags
+            {
+                c = *++fmt;
+                if      (c == '-') F.leftJustify = 1;
+                else if (c == '+') F.forceSign = 1;
+                else if (c == ' ') F.sign = ' ';
+                else if (c == '#') F.altForm++;
+                else if (c == '0') F.zeroPad = 1;
+                else break;
+            }
+
+            if (c == '*')   //  decode field width
+            {
+                int f = va_arg(arg, int);
+                if (f < 0) { f = -f; F.leftJustify = 1; }
+                F.fieldWidth = (unsigned int)f;
+                c = *++fmt;
+            }
+            else
+            {
+                for (; c >= '0' && c <= '9'; c = *++fmt)
+                    F.fieldWidth = (10 * F.fieldWidth) + (c - '0');
+            }
+
+            if (c == '.')   //  decode precision
+            {
+                if ((c = *++fmt) == '*')
+                { F.precision = va_arg(arg, unsigned int); c = *++fmt; }
+                else for (; c >= '0' && c <= '9'; c = *++fmt)
+                        F.precision = (10 * F.precision) + (c - '0');
+                F.havePrecision = 1;
+            }
+
+            if (F.leftJustify) F.zeroPad = 0;
+
+conv:
+            switch (c)  //  perform appropriate conversion
+            {
+                unsigned long n;
+            case 'h':  F.hSize = 1; c = *++fmt; goto conv;
+            case 'l':       // fall through
+            case 'L':  F.lSize = 1; c = *++fmt; goto conv;
+            case 'd':
+            case 'i':  if (F.lSize) n = (unsigned long)va_arg(arg, long);
+                else n = (unsigned long)va_arg(arg, int);
+                if (F.hSize) n = (short) n;
+                if ((long) n < 0) { n = (unsigned long)-(long)n; F.sign = '-'; }
+                else if (F.forceSign) F.sign = '+';
+                goto decimal;
+            case 'u':  if (F.lSize) n = va_arg(arg, unsigned long);
+                else n = va_arg(arg, unsigned int);
+                if (F.hSize) n = (unsigned short) n;
+                F.sign = 0;
+                goto decimal;
+decimal:    if (!F.havePrecision)
+                {
+                    if (F.zeroPad)
+                    {
+                        F.precision = F.fieldWidth;
+                        if (F.sign) --F.precision;
+                    }
+                    if (F.precision < 1) F.precision = 1;
+                }
+                if (F.precision > mDNS_VACB_Size - 1)
+                    F.precision = mDNS_VACB_Size - 1;
+                for (i = 0; n; n /= 10, i++) *--s = (char)(n % 10 + '0');
+                for (; i < F.precision; i++) *--s = '0';
+                if (F.sign) { *--s = F.sign; i++; }
+                break;
+
+            case 'o':  if (F.lSize) n = va_arg(arg, unsigned long);
+                else n = va_arg(arg, unsigned int);
+                if (F.hSize) n = (unsigned short) n;
+                if (!F.havePrecision)
+                {
+                    if (F.zeroPad) F.precision = F.fieldWidth;
+                    if (F.precision < 1) F.precision = 1;
+                }
+                if (F.precision > mDNS_VACB_Size - 1)
+                    F.precision = mDNS_VACB_Size - 1;
+                for (i = 0; n; n /= 8, i++) *--s = (char)(n % 8 + '0');
+                if (F.altForm && i && *s != '0') { *--s = '0'; i++; }
+                for (; i < F.precision; i++) *--s = '0';
+                break;
+
+            case 'a':  {
+                unsigned char *a = va_arg(arg, unsigned char *);
+                if (!a) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                else
+                {
+                    s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                    if (F.altForm)
+                    {
+                        mDNSAddr *ip = (mDNSAddr*)a;
+                        switch (ip->type)
+                        {
+                        case mDNSAddrType_IPv4: F.precision =  4; a = (unsigned char *)&ip->ip.v4; break;
+                        case mDNSAddrType_IPv6: F.precision = 16; a = (unsigned char *)&ip->ip.v6; break;
+                        default:                F.precision =  0; break;
+                        }
+                    }
+                    if (F.altForm && !F.precision)
+                        i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "«ZERO ADDRESS»");
+                    else switch (F.precision)
+                        {
+                        case  4: i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "%d.%d.%d.%d",
+                                                   a[0], a[1], a[2], a[3]); break;
+                        case  6: i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "%02X:%02X:%02X:%02X:%02X:%02X",
+                                                   a[0], a[1], a[2], a[3], a[4], a[5]); break;
+                        case 16: i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB),
+                                                   "%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X",
+                                                   a[0x0], a[0x1], a[0x2], a[0x3], a[0x4], a[0x5], a[0x6], a[0x7],
+                                                   a[0x8], a[0x9], a[0xA], a[0xB], a[0xC], a[0xD], a[0xE], a[0xF]); break;
+                        default: i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "%s", "<< ERROR: Must specify"
+                                                   " address size (i.e. %.4a=IPv4, %.6a=Ethernet, %.16a=IPv6) >>"); break;
+                        }
+                }
+            }
+            break;
+
+            case 'p':  F.havePrecision = F.lSize = 1;
+                F.precision = sizeof(void*) * 2;                // 8 characters on 32-bit; 16 characters on 64-bit
+            case 'X':  digits = "0123456789ABCDEF";
+                goto hexadecimal;
+            case 'x':  digits = "0123456789abcdef";
+hexadecimal: if (F.lSize) n = va_arg(arg, unsigned long);
+                else n = va_arg(arg, unsigned int);
+                if (F.hSize) n = (unsigned short) n;
+                if (!F.havePrecision)
+                {
+                    if (F.zeroPad)
+                    {
+                        F.precision = F.fieldWidth;
+                        if (F.altForm) F.precision -= 2;
+                    }
+                    if (F.precision < 1) F.precision = 1;
+                }
+                if (F.precision > mDNS_VACB_Size - 1)
+                    F.precision = mDNS_VACB_Size - 1;
+                for (i = 0; n; n /= 16, i++) *--s = digits[n % 16];
+                for (; i < F.precision; i++) *--s = '0';
+                if (F.altForm) { *--s = (char)c; *--s = '0'; i += 2; }
+                break;
+
+            case 'c':  *--s = (char)va_arg(arg, int); i = 1; break;
+
+            case 's':  s = va_arg(arg, char *);
+                if (!s) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                else switch (F.altForm)
+                    {
+                    case 0: i=0;
+                        if (!F.havePrecision)                               // C string
+                            while (s[i]) i++;
+                        else
+                        {
+                            while ((i < F.precision) && s[i]) i++;
+                            // Make sure we don't truncate in the middle of a UTF-8 character
+                            // If last character we got was any kind of UTF-8 multi-byte character,
+                            // then see if we have to back up.
+                            // This is not as easy as the similar checks below, because
+                            // here we can't assume it's safe to examine the *next* byte, so we
+                            // have to confine ourselves to working only backwards in the string.
+                            j = i;                      // Record where we got to
+                            // Now, back up until we find first non-continuation-char
+                            while (i>0 && (s[i-1] & 0xC0) == 0x80) i--;
+                            // Now s[i-1] is the first non-continuation-char
+                            // and (j-i) is the number of continuation-chars we found
+                            if (i>0 && (s[i-1] & 0xC0) == 0xC0)                 // If we found a start-char
+                            {
+                                i--;                        // Tentatively eliminate this start-char as well
+                                // Now (j-i) is the number of characters we're considering eliminating.
+                                // To be legal UTF-8, the start-char must contain (j-i) one-bits,
+                                // followed by a zero bit. If we shift it right by (7-(j-i)) bits
+                                // (with sign extension) then the result has to be 0xFE.
+                                // If this is right, then we reinstate the tentatively eliminated bytes.
+                                if (((j-i) < 7) && (((s[i] >> (7-(j-i))) & 0xFF) == 0xFE)) i = j;
+                            }
+                        }
+                        break;
+                    case 1: i = (unsigned char) *s++; break;                // Pascal string
+                    case 2: {                                               // DNS label-sequence name
+                        unsigned char *a = (unsigned char *)s;
+                        s = mDNS_VACB;                  // Adjust s to point to the start of the buffer, not the end
+                        if (*a == 0) *s++ = '.';                    // Special case for root DNS name
+                        while (*a)
+                        {
+                            char buf[63*4+1];
+                            if (*a > 63)
+                            { s += mDNS_snprintf(s, mDNS_VACB_Remain(s), "<<INVALID LABEL LENGTH %u>>", *a); break; }
+                            if (s + *a >= &mDNS_VACB[254])
+                            { s += mDNS_snprintf(s, mDNS_VACB_Remain(s), "<<NAME TOO LONG>>"); break; }
+                            // Need to use ConvertDomainLabelToCString to do proper escaping here,
+                            // so it's clear what's a literal dot and what's a label separator
+                            ConvertDomainLabelToCString((domainlabel*)a, buf);
+                            s += mDNS_snprintf(s, mDNS_VACB_Remain(s), "%s.", buf);
+                            a += 1 + *a;
+                        }
+                        i = (mDNSu32)(s - mDNS_VACB);
+                        s = mDNS_VACB;                  // Reset s back to the start of the buffer
+                        break;
+                    }
+                    }
+                // Make sure we don't truncate in the middle of a UTF-8 character (see similar comment below)
+                if (F.havePrecision && i > F.precision)
+                { i = F.precision; while (i>0 && (s[i] & 0xC0) == 0x80) i--;}
+                break;
+
+            case 'n':  s = va_arg(arg, char *);
+                if      (F.hSize) *(short *) s = (short)nwritten;
+                else if (F.lSize) *(long  *) s = (long)nwritten;
+                else *(int   *) s = (int)nwritten;
+                continue;
+
+            default:    s = mDNS_VACB;
+                i = mDNS_snprintf(mDNS_VACB, sizeof(mDNS_VACB), "<<UNKNOWN FORMAT CONVERSION CODE %%%c>>", c);
+
+            case '%':  *sbuffer++ = (char)c;
+                if (++nwritten >= buflen) goto exit;
+                break;
+            }
+
+            if (i < F.fieldWidth && !F.leftJustify)         // Pad on the left
+                do  {
+                    *sbuffer++ = ' ';
+                    if (++nwritten >= buflen) goto exit;
+                } while (i < --F.fieldWidth);
+
+            // Make sure we don't truncate in the middle of a UTF-8 character.
+            // Note: s[i] is the first eliminated character; i.e. the next character *after* the last character of the
+            // allowed output. If s[i] is a UTF-8 continuation character, then we've cut a unicode character in half,
+            // so back up 'i' until s[i] is no longer a UTF-8 continuation character. (if the input was proprly
+            // formed, s[i] will now be the UTF-8 start character of the multi-byte character we just eliminated).
+            if (i > buflen - nwritten)
+            { i = buflen - nwritten; while (i>0 && (s[i] & 0xC0) == 0x80) i--;}
+            for (j=0; j<i; j++) *sbuffer++ = *s++;          // Write the converted result
+            nwritten += i;
+            if (nwritten >= buflen) goto exit;
+
+            for (; i < F.fieldWidth; i++)                   // Pad on the right
+            {
+                *sbuffer++ = ' ';
+                if (++nwritten >= buflen) goto exit;
+            }
+        }
+    }
+exit:
+    *sbuffer++ = 0;
+    return(nwritten);
+}
+
+mDNSexport mDNSu32 mDNS_snprintf(char *sbuffer, mDNSu32 buflen, const char *fmt, ...)
+{
+    mDNSu32 length;
+
+    va_list ptr;
+    va_start(ptr,fmt);
+    length = mDNS_vsnprintf(sbuffer, buflen, fmt, ptr);
+    va_end(ptr);
+
+    return(length);
+}
diff --git a/mDNSResponder/mDNSCore/DNSCommon.h b/mDNSResponder/mDNSCore/DNSCommon.h
new file mode 100644
index 00000000..b92f5a9a
--- /dev/null
+++ b/mDNSResponder/mDNSCore/DNSCommon.h
@@ -0,0 +1,315 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DNSCOMMON_H_
+#define __DNSCOMMON_H_
+
+#include "mDNSEmbeddedAPI.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+//*************************************************************************************************************
+// Macros
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - DNS Protocol Constants
+#endif
+
+typedef enum
+{
+    kDNSFlag0_QR_Mask     = 0x80,       // Query or response?
+    kDNSFlag0_QR_Query    = 0x00,
+    kDNSFlag0_QR_Response = 0x80,
+
+    kDNSFlag0_OP_Mask     = 0x78,       // Operation type
+    kDNSFlag0_OP_StdQuery = 0x00,
+    kDNSFlag0_OP_Iquery   = 0x08,
+    kDNSFlag0_OP_Status   = 0x10,
+    kDNSFlag0_OP_Unused3  = 0x18,
+    kDNSFlag0_OP_Notify   = 0x20,
+    kDNSFlag0_OP_Update   = 0x28,
+
+    kDNSFlag0_QROP_Mask   = kDNSFlag0_QR_Mask | kDNSFlag0_OP_Mask,
+
+    kDNSFlag0_AA          = 0x04,       // Authoritative Answer?
+    kDNSFlag0_TC          = 0x02,       // Truncated?
+    kDNSFlag0_RD          = 0x01,       // Recursion Desired?
+    kDNSFlag1_RA          = 0x80,       // Recursion Available?
+
+    kDNSFlag1_Zero        = 0x40,       // Reserved; must be zero
+    kDNSFlag1_AD          = 0x20,       // Authentic Data [RFC 2535]
+    kDNSFlag1_CD          = 0x10,       // Checking Disabled [RFC 2535]
+
+    kDNSFlag1_RC_Mask     = 0x0F,       // Response code
+    kDNSFlag1_RC_NoErr    = 0x00,
+    kDNSFlag1_RC_FormErr  = 0x01,
+    kDNSFlag1_RC_ServFail = 0x02,
+    kDNSFlag1_RC_NXDomain = 0x03,
+    kDNSFlag1_RC_NotImpl  = 0x04,
+    kDNSFlag1_RC_Refused  = 0x05,
+    kDNSFlag1_RC_YXDomain = 0x06,
+    kDNSFlag1_RC_YXRRSet  = 0x07,
+    kDNSFlag1_RC_NXRRSet  = 0x08,
+    kDNSFlag1_RC_NotAuth  = 0x09,
+    kDNSFlag1_RC_NotZone  = 0x0A
+} DNS_Flags;
+
+typedef enum
+{
+    TSIG_ErrBadSig  = 16,
+    TSIG_ErrBadKey  = 17,
+    TSIG_ErrBadTime = 18
+} TSIG_ErrorCode;
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Utility Functions
+#endif
+
+extern NetworkInterfaceInfo *GetFirstActiveInterface(NetworkInterfaceInfo *intf);
+extern mDNSInterfaceID GetNextActiveInterfaceID(const NetworkInterfaceInfo *intf);
+
+extern mDNSu32 mDNSRandom(mDNSu32 max);     // Returns pseudo-random result from zero to max inclusive
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Domain Name Utility Functions
+#endif
+
+#define mDNSSubTypeLabel   "\x04_sub"
+
+#define mDNSIsDigit(X)     ((X) >= '0' && (X) <= '9')
+#define mDNSIsUpperCase(X) ((X) >= 'A' && (X) <= 'Z')
+#define mDNSIsLowerCase(X) ((X) >= 'a' && (X) <= 'z')
+#define mDNSIsLetter(X)    (mDNSIsUpperCase(X) || mDNSIsLowerCase(X))
+
+#define mDNSValidHostChar(X, notfirst, notlast) (mDNSIsLetter(X) || mDNSIsDigit(X) || ((notfirst) && (notlast) && (X) == '-') )
+
+extern mDNSu16 CompressedDomainNameLength(const domainname *const name, const domainname *parent);
+extern int CountLabels(const domainname *d);
+extern const domainname *SkipLeadingLabels(const domainname *d, int skip);
+
+extern mDNSu32 TruncateUTF8ToLength(mDNSu8 *string, mDNSu32 length, mDNSu32 max);
+extern mDNSBool LabelContainsSuffix(const domainlabel *const name, const mDNSBool RichText);
+extern mDNSu32 RemoveLabelSuffix(domainlabel *name, mDNSBool RichText);
+extern void AppendLabelSuffix(domainlabel *const name, mDNSu32 val, const mDNSBool RichText);
+#define ValidateDomainName(N) (DomainNameLength(N) <= MAX_DOMAIN_NAME)
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Resource Record Utility Functions
+#endif
+
+// IdenticalResourceRecord returns true if two resources records have
+// the same name, type, class, and identical rdata (InterfaceID and TTL may differ)
+
+// IdenticalSameNameRecord is the same, except it skips the expensive SameDomainName() check,
+// which is at its most expensive and least useful in cases where we know in advance that the names match
+
+// Note: The dominant use of IdenticalResourceRecord is from ProcessQuery(), handling known-answer lists. In this case
+// it's common to have a whole bunch or records with exactly the same name (e.g. "_http._tcp.local") but different RDATA.
+// The SameDomainName() check is expensive when the names match, and in this case *all* the names match, so we
+// used to waste a lot of CPU time verifying that the names match, only then to find that the RDATA is different.
+// We observed mDNSResponder spending 30% of its total CPU time on this single task alone.
+// By swapping the checks so that we check the RDATA first, we can quickly detect when it's different
+// (99% of the time) and then bail out before we waste time on the expensive SameDomainName() check.
+
+#define IdenticalResourceRecord(r1,r2) ( \
+        (r1)->rrtype    == (r2)->rrtype      && \
+        (r1)->rrclass   == (r2)->rrclass     && \
+        (r1)->namehash  == (r2)->namehash    && \
+        (r1)->rdlength  == (r2)->rdlength    && \
+        (r1)->rdatahash == (r2)->rdatahash   && \
+        SameRDataBody((r1), &(r2)->rdata->u, SameDomainName) && \
+        SameDomainName((r1)->name, (r2)->name))
+
+#define IdenticalSameNameRecord(r1,r2) ( \
+        (r1)->rrtype    == (r2)->rrtype      && \
+        (r1)->rrclass   == (r2)->rrclass     && \
+        (r1)->rdlength  == (r2)->rdlength    && \
+        (r1)->rdatahash == (r2)->rdatahash   && \
+        SameRDataBody((r1), &(r2)->rdata->u, SameDomainName))
+
+// A given RRType answers a QuestionType if RRType is CNAME, or types match, or QuestionType is ANY,
+// or the RRType is NSEC and positively asserts the nonexistence of the type being requested
+#define RRTypeAnswersQuestionType(R,Q) ((R)->rrtype == kDNSType_CNAME || (R)->rrtype == (Q) || (Q) == kDNSQType_ANY || RRAssertsNonexistence((R),(Q)))
+// Unicast NSEC records have the NSEC bit set whereas the multicast NSEC ones don't
+#define UNICAST_NSEC(rr) ((rr)->rrtype == kDNSType_NSEC && RRAssertsExistence((rr), kDNSType_NSEC))
+
+extern mDNSu32 RDataHashValue(const ResourceRecord *const rr);
+extern mDNSBool SameRDataBody(const ResourceRecord *const r1, const RDataBody *const r2, DomainNameComparisonFn *samename);
+extern mDNSBool SameNameRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q);
+extern mDNSBool ResourceRecordAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q);
+extern mDNSBool AnyTypeRecordAnswersQuestion (const ResourceRecord *const rr, const DNSQuestion *const q);
+extern mDNSBool ResourceRecordAnswersUnicastResponse(const ResourceRecord *const rr, const DNSQuestion *const q);
+extern mDNSBool LocalOnlyRecordAnswersQuestion(AuthRecord *const rr, const DNSQuestion *const q);
+extern mDNSu16 GetRDLength(const ResourceRecord *const rr, mDNSBool estimate);
+extern mDNSBool ValidateRData(const mDNSu16 rrtype, const mDNSu16 rdlength, const RData *const rd);
+extern mStatus DNSNameToLowerCase(domainname *d, domainname *result);
+
+#define GetRRDomainNameTarget(RR) (                                                                          \
+        ((RR)->rrtype == kDNSType_NS || (RR)->rrtype == kDNSType_CNAME || (RR)->rrtype == kDNSType_PTR || (RR)->rrtype == kDNSType_DNAME) ? &(RR)->rdata->u.name        : \
+        ((RR)->rrtype == kDNSType_MX || (RR)->rrtype == kDNSType_AFSDB || (RR)->rrtype == kDNSType_RT  || (RR)->rrtype == kDNSType_KX   ) ? &(RR)->rdata->u.mx.exchange : \
+        ((RR)->rrtype == kDNSType_SRV                                  ) ? &(RR)->rdata->u.srv.target : mDNSNULL )
+
+#define LocalRecordReady(X) ((X)->resrec.RecordType != kDNSRecordTypeUnique)
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNS Message Creation Functions
+#endif
+
+extern void InitializeDNSMessage(DNSMessageHeader *h, mDNSOpaque16 id, mDNSOpaque16 flags);
+extern const mDNSu8 *FindCompressionPointer(const mDNSu8 *const base, const mDNSu8 *const end, const mDNSu8 *const domname);
+extern mDNSu8 *putDomainNameAsLabels(const DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, const domainname *const name);
+extern mDNSu8 *putRData(const DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, const ResourceRecord *const rr);
+
+// If we have a single large record to put in the packet, then we allow the packet to be up to 9K bytes,
+// but in the normal case we try to keep the packets below 1500 to avoid IP fragmentation on standard Ethernet
+
+#define AllowedRRSpace(msg) (((msg)->h.numAnswers || (msg)->h.numAuthorities || (msg)->h.numAdditionals) ? NormalMaxDNSMessageData : AbsoluteMaxDNSMessageData)
+
+extern mDNSu8 *PutResourceRecordTTLWithLimit(DNSMessage *const msg, mDNSu8 *ptr, mDNSu16 *count, ResourceRecord *rr, mDNSu32 ttl, const mDNSu8 *limit);
+
+#define PutResourceRecordTTL(msg, ptr, count, rr, ttl) \
+    PutResourceRecordTTLWithLimit((msg), (ptr), (count), (rr), (ttl), (msg)->data + AllowedRRSpace(msg))
+
+#define PutResourceRecordTTLJumbo(msg, ptr, count, rr, ttl) \
+    PutResourceRecordTTLWithLimit((msg), (ptr), (count), (rr), (ttl), (msg)->data + AbsoluteMaxDNSMessageData)
+
+#define PutResourceRecord(MSG, P, C, RR) PutResourceRecordTTL((MSG), (P), (C), (RR), (RR)->rroriginalttl)
+
+// The PutRR_OS variants assume a local variable 'm', put build the packet at m->omsg,
+// and assume local variables 'OwnerRecordSpace' & 'TraceRecordSpace' indicating how many bytes (if any) to reserve to add an OWNER/TRACER option at the end
+#define PutRR_OS_TTL(ptr, count, rr, ttl) \
+    PutResourceRecordTTLWithLimit(&m->omsg, (ptr), (count), (rr), (ttl), m->omsg.data + AllowedRRSpace(&m->omsg) - OwnerRecordSpace - TraceRecordSpace)
+
+#define PutRR_OS(P, C, RR) PutRR_OS_TTL((P), (C), (RR), (RR)->rroriginalttl)
+
+extern mDNSu8 *putQuestion(DNSMessage *const msg, mDNSu8 *ptr, const mDNSu8 *const limit, const domainname *const name, mDNSu16 rrtype, mDNSu16 rrclass);
+extern mDNSu8 *putZone(DNSMessage *const msg, mDNSu8 *ptr, mDNSu8 *limit, const domainname *zone, mDNSOpaque16 zoneClass);
+extern mDNSu8 *putPrereqNameNotInUse(const domainname *const name, DNSMessage *const msg, mDNSu8 *const ptr, mDNSu8 *const end);
+extern mDNSu8 *putDeletionRecord(DNSMessage *msg, mDNSu8 *ptr, ResourceRecord *rr);
+extern mDNSu8 *putDeletionRecordWithLimit(DNSMessage *msg, mDNSu8 *ptr, ResourceRecord *rr, mDNSu8 *limit);
+extern mDNSu8 *putDeleteRRSetWithLimit(DNSMessage *msg, mDNSu8 *ptr, const domainname *name, mDNSu16 rrtype, mDNSu8 *limit);
+extern mDNSu8 *putDeleteAllRRSets(DNSMessage *msg, mDNSu8 *ptr, const domainname *name);
+extern mDNSu8 *putUpdateLease(DNSMessage *msg, mDNSu8 *end, mDNSu32 lease);
+extern mDNSu8 *putUpdateLeaseWithLimit(DNSMessage *msg, mDNSu8 *ptr, mDNSu32 lease, mDNSu8 *limit);
+
+extern mDNSu8 *putHINFO(const mDNS *const m, DNSMessage *const msg, mDNSu8 *ptr, DomainAuthInfo *authInfo, mDNSu8 *limit);
+extern mDNSu8 *putDNSSECOption(DNSMessage *msg, mDNSu8 *end, mDNSu8 *limit);
+extern int baseEncode(char *buffer, int blen, const mDNSu8 *data, int len, int encAlg);
+extern void NSEC3Parse(const ResourceRecord *const rr, mDNSu8 **salt, int *hashLength, mDNSu8 **nxtName, int *bitmaplen, mDNSu8 **bitmap);
+
+extern const mDNSu8 *NSEC3HashName(const domainname *name, rdataNSEC3 *nsec3, const mDNSu8 *AnonData, int AnonDataLen,
+    const mDNSu8 hash[NSEC3_MAX_HASH_LEN], int *dlen);
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNS Message Parsing Functions
+#endif
+
+#define AuthHashSlot(X) (DomainNameHashValue(X) % AUTH_HASH_SLOTS)
+#define HashSlot(X) (DomainNameHashValue(X) % CACHE_HASH_SLOTS)
+extern mDNSu32 DomainNameHashValue(const domainname *const name);
+extern void SetNewRData(ResourceRecord *const rr, RData *NewRData, mDNSu16 rdlength);
+extern const mDNSu8 *skipDomainName(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *const end);
+extern const mDNSu8 *getDomainName(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *const end,
+                                   domainname *const name);
+extern const mDNSu8 *skipResourceRecord(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end);
+extern const mDNSu8 *GetLargeResourceRecord(mDNS *const m, const DNSMessage * const msg, const mDNSu8 *ptr,
+                                            const mDNSu8 * end, const mDNSInterfaceID InterfaceID, mDNSu8 RecordType, LargeCacheRecord *const largecr);
+extern mDNSBool SetRData(const DNSMessage *const msg, const mDNSu8 *ptr, const mDNSu8 *end,
+    LargeCacheRecord *const largecr, mDNSu16 rdlength);
+extern const mDNSu8 *skipQuestion(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end);
+extern const mDNSu8 *getQuestion(const DNSMessage *msg, const mDNSu8 *ptr, const mDNSu8 *end, const mDNSInterfaceID InterfaceID,
+                                 DNSQuestion *question);
+extern const mDNSu8 *LocateAnswers(const DNSMessage *const msg, const mDNSu8 *const end);
+extern const mDNSu8 *LocateAuthorities(const DNSMessage *const msg, const mDNSu8 *const end);
+extern const mDNSu8 *LocateAdditionals(const DNSMessage *const msg, const mDNSu8 *const end);
+extern const mDNSu8 *LocateOptRR(const DNSMessage *const msg, const mDNSu8 *const end, int minsize);
+extern const rdataOPT *GetLLQOptData(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end);
+extern mDNSu32 GetPktLease(mDNS *m, DNSMessage *msg, const mDNSu8 *end);
+extern void DumpPacket(mDNS *const m, mStatus status, mDNSBool sent, char *transport,
+                       const mDNSAddr *srcaddr, mDNSIPPort srcport,
+                       const mDNSAddr *dstaddr, mDNSIPPort dstport, const DNSMessage *const msg, const mDNSu8 *const end);
+extern mDNSBool RRAssertsNonexistence(const ResourceRecord *const rr, mDNSu16 type);
+extern mDNSBool RRAssertsExistence(const ResourceRecord *const rr, mDNSu16 type);
+extern mDNSBool BitmapTypeCheck(mDNSu8 *bmap, int bitmaplen, mDNSu16 type);
+
+extern mDNSu16 swap16(mDNSu16 x);
+extern mDNSu32 swap32(mDNSu32 x);
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Packet Sending Functions
+#endif
+
+extern mStatus mDNSSendDNSMessage(mDNS *const m, DNSMessage *const msg, mDNSu8 *end,
+                                  mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
+                                  mDNSIPPort dstport, TCPSocket *sock, DomainAuthInfo *authInfo,
+                                  mDNSBool useBackgroundTrafficClass);
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - RR List Management & Task Management
+#endif
+
+extern void ShowTaskSchedulingError(mDNS *const m);
+extern void mDNS_Lock_(mDNS *const m, const char * const functionname);
+extern void mDNS_Unlock_(mDNS *const m, const char * const functionname);
+
+#if defined(_WIN32)
+ #define __func__ __FUNCTION__
+#endif
+
+#define mDNS_Lock(X) mDNS_Lock_((X), __func__)
+
+#define mDNS_Unlock(X) mDNS_Unlock_((X), __func__)
+
+#define mDNS_CheckLock(X) { if ((X)->mDNS_busy != (X)->mDNS_reentrancy+1) \
+                            LogMsg("%s: Lock not held! mDNS_busy (%ld) mDNS_reentrancy (%ld)", __func__, (X)->mDNS_busy, (X)->mDNS_reentrancy); }
+
+#define mDNS_DropLockBeforeCallback() do { m->mDNS_reentrancy++; \
+                                           if (m->mDNS_busy != m->mDNS_reentrancy) LogMsg("%s: Locking Failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", __func__, m->mDNS_busy, m->mDNS_reentrancy);                                                                                                                                                                  \
+} while (0)
+
+#define mDNS_ReclaimLockAfterCallback() do { \
+        if (m->mDNS_busy != m->mDNS_reentrancy) LogMsg("%s: Unlocking Failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", __func__, m->mDNS_busy, m->mDNS_reentrancy);                                                                                                                                                                    \
+        m->mDNS_reentrancy--; } while (0)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif // __DNSCOMMON_H_
diff --git a/mDNSResponder/mDNSCore/DNSDigest.c b/mDNSResponder/mDNSCore/DNSDigest.c
new file mode 100644
index 00000000..33798d38
--- /dev/null
+++ b/mDNSResponder/mDNSCore/DNSDigest.c
@@ -0,0 +1,1567 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+
+// Disable certain benign warnings with Microsoft compilers
+#if (defined(_MSC_VER))
+// Disable "conditional expression is constant" warning for debug macros.
+// Otherwise, this generates warnings for the perfectly natural construct "while(1)"
+// If someone knows a variant way of writing "while(1)" that doesn't generate warning messages, please let us know
+    #pragma warning(disable:4127)
+#endif
+
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Byte Swapping Functions
+#endif
+
+mDNSlocal mDNSu16 NToH16(mDNSu8 * bytes)
+{
+    return (mDNSu16)((mDNSu16)bytes[0] << 8 | (mDNSu16)bytes[1]);
+}
+
+mDNSlocal mDNSu32 NToH32(mDNSu8 * bytes)
+{
+    return (mDNSu32)((mDNSu32) bytes[0] << 24 | (mDNSu32) bytes[1] << 16 | (mDNSu32) bytes[2] << 8 | (mDNSu32)bytes[3]);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - MD5 Hash Functions
+#endif
+
+
+/* The source for the has is derived CommonCrypto files CommonDigest.h, md32_common.h, md5_locl.h, md5_locl.h, and openssl/md5.h.
+ * The following changes have been made to the original sources:
+ *    replaced CC_LONG w/ mDNSu32
+ *    replaced CC_MD5* with MD5*
+ *    replaced CC_LONG w/ mDNSu32, removed conditional #defines from md5.h
+ *    removed extern decls for MD5_Init/Update/Final from CommonDigest.h
+ *    removed APPLE_COMMON_DIGEST specific #defines from md5_locl.h
+ *
+ * Note: machine archetecure specific conditionals from the original sources are turned off, but are left in the code
+ * to aid in platform-specific optimizations and debugging.
+ * Sources originally distributed under the following license headers:
+ * CommonDigest.h - APSL
+ *
+ * md32_Common.h
+ * ====================================================================
+ * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * md5_dgst.c, md5_locl.h
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ *
+ */
+
+//from CommonDigest.h
+
+
+
+// from openssl/md5.h
+
+#define MD5_CBLOCK  64
+#define MD5_LBLOCK  (MD5_CBLOCK/4)
+#define MD5_DIGEST_LENGTH 16
+
+void MD5_Transform(MD5_CTX *c, const unsigned char *b);
+
+// From md5_locl.h
+
+#ifndef MD5_LONG_LOG2
+#define MD5_LONG_LOG2 2 /* default to 32 bits */
+#endif
+
+#ifdef MD5_ASM
+# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
+#  define md5_block_host_order md5_block_asm_host_order
+# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)
+void md5_block_asm_data_order_aligned (MD5_CTX *c, const mDNSu32 *p,int num);
+#  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
+# endif
+#endif
+
+void md5_block_host_order (MD5_CTX *c, const void *p,int num);
+void md5_block_data_order (MD5_CTX *c, const void *p,int num);
+
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
+/*
+ * *_block_host_order is expected to handle aligned data while
+ * *_block_data_order - unaligned. As algorithm and host (x86)
+ * are in this case of the same "endianness" these two are
+ * otherwise indistinguishable. But normally you don't want to
+ * call the same function because unaligned access in places
+ * where alignment is expected is usually a "Bad Thing". Indeed,
+ * on RISCs you get punished with BUS ERROR signal or *severe*
+ * performance degradation. Intel CPUs are in turn perfectly
+ * capable of loading unaligned data without such drastic side
+ * effect. Yes, they say it's slower than aligned load, but no
+ * exception is generated and therefore performance degradation
+ * is *incomparable* with RISCs. What we should weight here is
+ * costs of unaligned access against costs of aligning data.
+ * According to my measurements allowing unaligned access results
+ * in ~9% performance improvement on Pentium II operating at
+ * 266MHz. I won't be surprised if the difference will be higher
+ * on faster systems:-)
+ *
+ *				<appro@fy.chalmers.se>
+ */
+#define md5_block_data_order md5_block_host_order
+#endif
+
+#define DATA_ORDER_IS_LITTLE_ENDIAN
+
+#define HASH_LONG       mDNSu32
+#define HASH_LONG_LOG2  MD5_LONG_LOG2
+#define HASH_CTX        MD5_CTX
+#define HASH_CBLOCK     MD5_CBLOCK
+#define HASH_LBLOCK     MD5_LBLOCK
+
+#define HASH_UPDATE     MD5_Update
+#define HASH_TRANSFORM  MD5_Transform
+#define HASH_FINAL      MD5_Final
+
+#define HASH_MAKE_STRING(c,s)   do {    \
+        unsigned long ll;       \
+        ll=(c)->A; HOST_l2c(ll,(s));    \
+        ll=(c)->B; HOST_l2c(ll,(s));    \
+        ll=(c)->C; HOST_l2c(ll,(s));    \
+        ll=(c)->D; HOST_l2c(ll,(s));    \
+} while (0)
+#define HASH_BLOCK_HOST_ORDER   md5_block_host_order
+#if !defined(L_ENDIAN) || defined(md5_block_data_order)
+#define HASH_BLOCK_DATA_ORDER   md5_block_data_order
+/*
+ * Little-endians (Intel and Alpha) feel better without this.
+ * It looks like memcpy does better job than generic
+ * md5_block_data_order on copying-n-aligning input data.
+ * But frankly speaking I didn't expect such result on Alpha.
+ * On the other hand I've got this with egcs-1.0.2 and if
+ * program is compiled with another (better?) compiler it
+ * might turn out other way around.
+ *
+ *				<appro@fy.chalmers.se>
+ */
+#endif
+
+
+// from md32_common.h
+
+/*
+ * This is a generic 32 bit "collector" for message digest algorithms.
+ * Whenever needed it collects input character stream into chunks of
+ * 32 bit values and invokes a block function that performs actual hash
+ * calculations.
+ *
+ * Porting guide.
+ *
+ * Obligatory macros:
+ *
+ * DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
+ *	this macro defines byte order of input stream.
+ * HASH_CBLOCK
+ *	size of a unit chunk HASH_BLOCK operates on.
+ * HASH_LONG
+ *	has to be at lest 32 bit wide, if it's wider, then
+ *	HASH_LONG_LOG2 *has to* be defined along
+ * HASH_CTX
+ *	context structure that at least contains following
+ *	members:
+ *		typedef struct {
+ *			...
+ *			HASH_LONG	Nl,Nh;
+ *			HASH_LONG	data[HASH_LBLOCK];
+ *			int		num;
+ *			...
+ *			} HASH_CTX;
+ * HASH_UPDATE
+ *	name of "Update" function, implemented here.
+ * HASH_TRANSFORM
+ *	name of "Transform" function, implemented here.
+ * HASH_FINAL
+ *	name of "Final" function, implemented here.
+ * HASH_BLOCK_HOST_ORDER
+ *	name of "block" function treating *aligned* input message
+ *	in host byte order, implemented externally.
+ * HASH_BLOCK_DATA_ORDER
+ *	name of "block" function treating *unaligned* input message
+ *	in original (data) byte order, implemented externally (it
+ *	actually is optional if data and host are of the same
+ *	"endianess").
+ * HASH_MAKE_STRING
+ *	macro convering context variables to an ASCII hash string.
+ *
+ * Optional macros:
+ *
+ * B_ENDIAN or L_ENDIAN
+ *	defines host byte-order.
+ * HASH_LONG_LOG2
+ *	defaults to 2 if not states otherwise.
+ * HASH_LBLOCK
+ *	assumed to be HASH_CBLOCK/4 if not stated otherwise.
+ * HASH_BLOCK_DATA_ORDER_ALIGNED
+ *	alternative "block" function capable of treating
+ *	aligned input message in original (data) order,
+ *	implemented externally.
+ *
+ * MD5 example:
+ *
+ *	#define DATA_ORDER_IS_LITTLE_ENDIAN
+ *
+ *	#define HASH_LONG		mDNSu32
+ *	#define HASH_LONG_LOG2	mDNSu32_LOG2
+ *	#define HASH_CTX		MD5_CTX
+ *	#define HASH_CBLOCK		MD5_CBLOCK
+ *	#define HASH_LBLOCK		MD5_LBLOCK
+ *	#define HASH_UPDATE		MD5_Update
+ *	#define HASH_TRANSFORM		MD5_Transform
+ *	#define HASH_FINAL		MD5_Final
+ *	#define HASH_BLOCK_HOST_ORDER	md5_block_host_order
+ *	#define HASH_BLOCK_DATA_ORDER	md5_block_data_order
+ *
+ *					<appro@fy.chalmers.se>
+ */
+
+#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#error "DATA_ORDER must be defined!"
+#endif
+
+#ifndef HASH_CBLOCK
+#error "HASH_CBLOCK must be defined!"
+#endif
+#ifndef HASH_LONG
+#error "HASH_LONG must be defined!"
+#endif
+#ifndef HASH_CTX
+#error "HASH_CTX must be defined!"
+#endif
+
+#ifndef HASH_UPDATE
+#error "HASH_UPDATE must be defined!"
+#endif
+#ifndef HASH_TRANSFORM
+#error "HASH_TRANSFORM must be defined!"
+#endif
+#ifndef HASH_FINAL
+#error "HASH_FINAL must be defined!"
+#endif
+
+#ifndef HASH_BLOCK_HOST_ORDER
+#error "HASH_BLOCK_HOST_ORDER must be defined!"
+#endif
+
+#if 0
+/*
+ * Moved below as it's required only if HASH_BLOCK_DATA_ORDER_ALIGNED
+ * isn't defined.
+ */
+#ifndef HASH_BLOCK_DATA_ORDER
+#error "HASH_BLOCK_DATA_ORDER must be defined!"
+#endif
+#endif
+
+#ifndef HASH_LBLOCK
+#define HASH_LBLOCK (HASH_CBLOCK/4)
+#endif
+
+#ifndef HASH_LONG_LOG2
+#define HASH_LONG_LOG2  2
+#endif
+
+/*
+ * Engage compiler specific rotate intrinsic function if available.
+ */
+#undef ROTATE
+#ifndef PEDANTIC
+# if 0 /* defined(_MSC_VER) */
+#  define ROTATE(a,n)   _lrotl(a,n)
+# elif defined(__MWERKS__)
+#  if defined(__POWERPC__)
+#   define ROTATE(a,n)  (unsigned MD32_REG_T)__rlwinm((int)a,n,0,31)
+#  elif defined(__MC68K__)
+/* Motorola specific tweak. <appro@fy.chalmers.se> */
+#   define ROTATE(a,n)  (n<24 ? __rol(a,n) : __ror(a,32-n))
+#  else
+#   define ROTATE(a,n)  __rol(a,n)
+#  endif
+# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+/*
+ * Some GNU C inline assembler templates. Note that these are
+ * rotates by *constant* number of bits! But that's exactly
+ * what we need here...
+ *
+ *                  <appro@fy.chalmers.se>
+ */
+/*
+ * LLVM is more strict about compatibility of types between input & output constraints,
+ * but we want these to be rotations of 32 bits, not 64, so we explicitly drop the
+ * most significant bytes by casting to an unsigned int.
+ */
+#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#   define ROTATE(a,n)  ({ register unsigned int ret;   \
+                           asm (           \
+                               "roll %1,%0"        \
+                               : "=r" (ret)     \
+                               : "I" (n), "0" ((unsigned int)a)  \
+                               : "cc");        \
+                           ret;             \
+                         })
+#  elif defined(__powerpc) || defined(__ppc)
+#   define ROTATE(a,n)  ({ register unsigned int ret;   \
+                           asm (           \
+                               "rlwinm %0,%1,%2,0,31"  \
+                               : "=r" (ret)     \
+                               : "r" (a), "I" (n));  \
+                           ret;             \
+                         })
+#  endif
+# endif
+
+/*
+ * Engage compiler specific "fetch in reverse byte order"
+ * intrinsic function if available.
+ */
+# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+/* some GNU C inline assembler templates by <appro@fy.chalmers.se> */
+#  if (defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)) && !defined(I386_ONLY)
+#   define BE_FETCH32(a)    ({ register unsigned int l=(a); \
+                               asm (           \
+                                   "bswapl %0"     \
+                                   : "=r" (l) : "0" (l));    \
+                               l;                \
+                             })
+#  elif defined(__powerpc)
+#   define LE_FETCH32(a)    ({ register unsigned int l; \
+                               asm (           \
+                                   "lwbrx %0,0,%1"     \
+                                   : "=r" (l)       \
+                                   : "r" (a));      \
+                               l;               \
+                             })
+
+#  elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)
+#  define LE_FETCH32(a) ({ register unsigned int l;     \
+                           asm (               \
+                               "lda [%1]#ASI_PRIMARY_LITTLE,%0" \
+                               : "=r" (l)           \
+                               : "r" (a));          \
+                           l;                   \
+                         })
+#  endif
+# endif
+#endif /* PEDANTIC */
+
+#if HASH_LONG_LOG2==2   /* Engage only if sizeof(HASH_LONG)== 4 */
+/* A nice byte order reversal from Wei Dai <weidai@eskimo.com> */
+#ifdef ROTATE
+/* 5 instructions with rotate instruction, else 9 */
+#define REVERSE_FETCH32(a,l)    (                   \
+        l=*(const HASH_LONG *)(a),              \
+        ((ROTATE(l,8)&0x00FF00FF)|(ROTATE((l&0x00FF00FF),24)))  \
+        )
+#else
+/* 6 instructions with rotate instruction, else 8 */
+#define REVERSE_FETCH32(a,l)    (               \
+        l=*(const HASH_LONG *)(a),          \
+        l=(((l>>8)&0x00FF00FF)|((l&0x00FF00FF)<<8)),    \
+        ROTATE(l,16)                    \
+        )
+/*
+ * Originally the middle line started with l=(((l&0xFF00FF00)>>8)|...
+ * It's rewritten as above for two reasons:
+ *	- RISCs aren't good at long constants and have to explicitely
+ *	  compose 'em with several (well, usually 2) instructions in a
+ *	  register before performing the actual operation and (as you
+ *	  already realized:-) having same constant should inspire the
+ *	  compiler to permanently allocate the only register for it;
+ *	- most modern CPUs have two ALUs, but usually only one has
+ *	  circuitry for shifts:-( this minor tweak inspires compiler
+ *	  to schedule shift instructions in a better way...
+ *
+ *				<appro@fy.chalmers.se>
+ */
+#endif
+#endif
+
+#ifndef ROTATE
+#define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
+#endif
+
+/*
+ * Make some obvious choices. E.g., HASH_BLOCK_DATA_ORDER_ALIGNED
+ * and HASH_BLOCK_HOST_ORDER ought to be the same if input data
+ * and host are of the same "endianess". It's possible to mask
+ * this with blank #define HASH_BLOCK_DATA_ORDER though...
+ *
+ *				<appro@fy.chalmers.se>
+ */
+#if defined(B_ENDIAN)
+#  if defined(DATA_ORDER_IS_BIG_ENDIAN)
+#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
+#      define HASH_BLOCK_DATA_ORDER_ALIGNED HASH_BLOCK_HOST_ORDER
+#    endif
+#  elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#    ifndef HOST_FETCH32
+#      ifdef LE_FETCH32
+#        define HOST_FETCH32(p,l)   LE_FETCH32(p)
+#      elif defined(REVERSE_FETCH32)
+#        define HOST_FETCH32(p,l)   REVERSE_FETCH32(p,l)
+#      endif
+#    endif
+#  endif
+#elif defined(L_ENDIAN)
+#  if defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
+#      define HASH_BLOCK_DATA_ORDER_ALIGNED HASH_BLOCK_HOST_ORDER
+#    endif
+#  elif defined(DATA_ORDER_IS_BIG_ENDIAN)
+#    ifndef HOST_FETCH32
+#      ifdef BE_FETCH32
+#        define HOST_FETCH32(p,l)   BE_FETCH32(p)
+#      elif defined(REVERSE_FETCH32)
+#        define HOST_FETCH32(p,l)   REVERSE_FETCH32(p,l)
+#      endif
+#    endif
+#  endif
+#endif
+
+#if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
+#ifndef HASH_BLOCK_DATA_ORDER
+#error "HASH_BLOCK_DATA_ORDER must be defined!"
+#endif
+#endif
+
+// None of the invocations of the following macros actually use the result,
+// so cast them to void to avoid any compiler warnings/errors about not using
+// the result (e.g. when using clang).
+// If the resultant values need to be used at some point, these must be changed.
+#define HOST_c2l(c,l) ((void)_HOST_c2l(c,l))
+#define HOST_l2c(l,c) ((void)_HOST_l2c(l,c))
+
+#if defined(DATA_ORDER_IS_BIG_ENDIAN)
+
+#define _HOST_c2l(c,l)  (l =(((unsigned long)(*((c)++)))<<24),      \
+                         l|=(((unsigned long)(*((c)++)))<<16),      \
+                         l|=(((unsigned long)(*((c)++)))<< 8),      \
+                         l|=(((unsigned long)(*((c)++)))    ),      \
+                         l)
+#define HOST_p_c2l(c,l,n)   {                   \
+        switch (n) {                    \
+        case 0: l =((unsigned long)(*((c)++)))<<24; \
+        case 1: l|=((unsigned long)(*((c)++)))<<16; \
+        case 2: l|=((unsigned long)(*((c)++)))<< 8; \
+        case 3: l|=((unsigned long)(*((c)++)));     \
+        } }
+#define HOST_p_c2l_p(c,l,sc,len) {                  \
+        switch (sc) {                   \
+        case 0: l =((unsigned long)(*((c)++)))<<24; \
+            if (--len == 0) break;                                                 \
+        case 1: l|=((unsigned long)(*((c)++)))<<16; \
+            if (--len == 0) break;                                                 \
+        case 2: l|=((unsigned long)(*((c)++)))<< 8; \
+        } }
+/* NOTE the pointer is not incremented at the end of this */
+#define HOST_c2l_p(c,l,n)   {                   \
+        l=0; (c)+=n;                    \
+        switch (n) {                    \
+        case 3: l =((unsigned long)(*(--(c))))<< 8; \
+        case 2: l|=((unsigned long)(*(--(c))))<<16; \
+        case 1: l|=((unsigned long)(*(--(c))))<<24; \
+        } }
+#define _HOST_l2c(l,c)  (*((c)++)=(unsigned char)(((l)>>24)&0xff),  \
+                         *((c)++)=(unsigned char)(((l)>>16)&0xff),  \
+                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),  \
+                         *((c)++)=(unsigned char)(((l)    )&0xff),  \
+                         l)
+
+#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+
+#define _HOST_c2l(c,l)  (l =(((unsigned long)(*((c)++)))    ),      \
+                         l|=(((unsigned long)(*((c)++)))<< 8),      \
+                         l|=(((unsigned long)(*((c)++)))<<16),      \
+                         l|=(((unsigned long)(*((c)++)))<<24),      \
+                         l)
+#define HOST_p_c2l(c,l,n)   {                   \
+        switch (n) {                    \
+        case 0: l =((unsigned long)(*((c)++)));     \
+        case 1: l|=((unsigned long)(*((c)++)))<< 8; \
+        case 2: l|=((unsigned long)(*((c)++)))<<16; \
+        case 3: l|=((unsigned long)(*((c)++)))<<24; \
+        } }
+#define HOST_p_c2l_p(c,l,sc,len) {                  \
+        switch (sc) {                   \
+        case 0: l =((unsigned long)(*((c)++)));     \
+            if (--len == 0) break;                                                 \
+        case 1: l|=((unsigned long)(*((c)++)))<< 8; \
+            if (--len == 0) break;                                                 \
+        case 2: l|=((unsigned long)(*((c)++)))<<16; \
+        } }
+/* NOTE the pointer is not incremented at the end of this */
+#define HOST_c2l_p(c,l,n)   {                   \
+        l=0; (c)+=n;                    \
+        switch (n) {                    \
+        case 3: l =((unsigned long)(*(--(c))))<<16; \
+        case 2: l|=((unsigned long)(*(--(c))))<< 8; \
+        case 1: l|=((unsigned long)(*(--(c))));     \
+        } }
+#define _HOST_l2c(l,c)  (*((c)++)=(unsigned char)(((l)    )&0xff),  \
+                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),  \
+                         *((c)++)=(unsigned char)(((l)>>16)&0xff),  \
+                         *((c)++)=(unsigned char)(((l)>>24)&0xff),  \
+                         l)
+
+#endif
+
+/*
+ * Time for some action:-)
+ */
+
+int HASH_UPDATE (HASH_CTX *c, const void *data_, unsigned long len)
+{
+    const unsigned char *data=(const unsigned char *)data_;
+    register HASH_LONG * p;
+    register unsigned long l;
+    int sw,sc,ew,ec;
+
+    if (len==0) return 1;
+
+    l=(c->Nl+(len<<3))&0xffffffffL;
+    /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
+     * Wei Dai <weidai@eskimo.com> for pointing it out. */
+    if (l < c->Nl) /* overflow */
+        c->Nh++;
+    c->Nh+=(len>>29);
+    c->Nl=l;
+
+    if (c->num != 0)
+    {
+        p=c->data;
+        sw=c->num>>2;
+        sc=c->num&0x03;
+
+        if ((c->num+len) >= HASH_CBLOCK)
+        {
+            l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
+            for (; sw<HASH_LBLOCK; sw++)
+            {
+                HOST_c2l(data,l); p[sw]=l;
+            }
+            HASH_BLOCK_HOST_ORDER (c,p,1);
+            len-=(HASH_CBLOCK-c->num);
+            c->num=0;
+            /* drop through and do the rest */
+        }
+        else
+        {
+            c->num+=len;
+            if ((sc+len) < 4) /* ugly, add char's to a word */
+            {
+                l=p[sw]; HOST_p_c2l_p(data,l,sc,len); p[sw]=l;
+            }
+            else
+            {
+                ew=(c->num>>2);
+                ec=(c->num&0x03);
+                if (sc)
+                    l=p[sw];
+                HOST_p_c2l(data,l,sc);
+                p[sw++]=l;
+                for (; sw < ew; sw++)
+                {
+                    HOST_c2l(data,l); p[sw]=l;
+                }
+                if (ec)
+                {
+                    HOST_c2l_p(data,l,ec); p[sw]=l;
+                }
+            }
+            return 1;
+        }
+    }
+
+    sw=(int)(len/HASH_CBLOCK);
+    if (sw > 0)
+    {
+#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
+        /*
+         * Note that HASH_BLOCK_DATA_ORDER_ALIGNED gets defined
+         * only if sizeof(HASH_LONG)==4.
+         */
+        if ((((unsigned long)data)%4) == 0)
+        {
+            /* data is properly aligned so that we can cast it: */
+            HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,sw);
+            sw*=HASH_CBLOCK;
+            data+=sw;
+            len-=sw;
+        }
+        else
+#if !defined(HASH_BLOCK_DATA_ORDER)
+            while (sw--)
+            {
+                mDNSPlatformMemCopy(p=c->data,data,HASH_CBLOCK);
+                HASH_BLOCK_DATA_ORDER_ALIGNED(c,p,1);
+                data+=HASH_CBLOCK;
+                len-=HASH_CBLOCK;
+            }
+#endif
+#endif
+#if defined(HASH_BLOCK_DATA_ORDER)
+        {
+            HASH_BLOCK_DATA_ORDER(c,data,sw);
+            sw*=HASH_CBLOCK;
+            data+=sw;
+            len-=sw;
+        }
+#endif
+    }
+
+    if (len!=0)
+    {
+        p = c->data;
+        c->num = (int)len;
+        ew=(int)(len>>2);   /* words to copy */
+        ec=(int)(len&0x03);
+        for (; ew; ew--,p++)
+        {
+            HOST_c2l(data,l); *p=l;
+        }
+        HOST_c2l_p(data,l,ec);
+        *p=l;
+    }
+    return 1;
+}
+
+
+void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
+{
+#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
+    if ((((unsigned long)data)%4) == 0)
+        /* data is properly aligned so that we can cast it: */
+        HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,1);
+    else
+#if !defined(HASH_BLOCK_DATA_ORDER)
+    {
+        mDNSPlatformMemCopy(c->data,data,HASH_CBLOCK);
+        HASH_BLOCK_DATA_ORDER_ALIGNED (c,c->data,1);
+    }
+#endif
+#endif
+#if defined(HASH_BLOCK_DATA_ORDER)
+    HASH_BLOCK_DATA_ORDER (c,data,1);
+#endif
+}
+
+
+int HASH_FINAL (unsigned char *md, HASH_CTX *c)
+{
+    register HASH_LONG *p;
+    register unsigned long l;
+    register int i,j;
+    static const unsigned char end[4]={0x80,0x00,0x00,0x00};
+    const unsigned char *cp=end;
+
+    /* c->num should definitly have room for at least one more byte. */
+    p=c->data;
+    i=c->num>>2;
+    j=c->num&0x03;
+
+#if 0
+    /* purify often complains about the following line as an
+     * Uninitialized Memory Read.  While this can be true, the
+     * following p_c2l macro will reset l when that case is true.
+     * This is because j&0x03 contains the number of 'valid' bytes
+     * already in p[i].  If and only if j&0x03 == 0, the UMR will
+     * occur but this is also the only time p_c2l will do
+     * l= *(cp++) instead of l|= *(cp++)
+     * Many thanks to Alex Tang <altitude@cic.net> for pickup this
+     * 'potential bug' */
+#ifdef PURIFY
+    if (j==0) p[i]=0; /* Yeah, but that's not the way to fix it:-) */
+#endif
+    l=p[i];
+#else
+    l = (j==0) ? 0 : p[i];
+#endif
+    HOST_p_c2l(cp,l,j); p[i++]=l; /* i is the next 'undefined word' */
+
+    if (i>(HASH_LBLOCK-2)) /* save room for Nl and Nh */
+    {
+        if (i<HASH_LBLOCK) p[i]=0;
+        HASH_BLOCK_HOST_ORDER (c,p,1);
+        i=0;
+    }
+    for (; i<(HASH_LBLOCK-2); i++)
+        p[i]=0;
+
+#if   defined(DATA_ORDER_IS_BIG_ENDIAN)
+    p[HASH_LBLOCK-2]=c->Nh;
+    p[HASH_LBLOCK-1]=c->Nl;
+#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+    p[HASH_LBLOCK-2]=c->Nl;
+    p[HASH_LBLOCK-1]=c->Nh;
+#endif
+    HASH_BLOCK_HOST_ORDER (c,p,1);
+
+#ifndef HASH_MAKE_STRING
+#error "HASH_MAKE_STRING must be defined!"
+#else
+    HASH_MAKE_STRING(c,md);
+#endif
+
+    c->num=0;
+    /* clear stuff, HASH_BLOCK may be leaving some stuff on the stack
+     * but I'm not worried :-)
+       OPENSSL_cleanse((void *)c,sizeof(HASH_CTX));
+     */
+    return 1;
+}
+
+#ifndef MD32_REG_T
+#define MD32_REG_T long
+/*
+ * This comment was originaly written for MD5, which is why it
+ * discusses A-D. But it basically applies to all 32-bit digests,
+ * which is why it was moved to common header file.
+ *
+ * In case you wonder why A-D are declared as long and not
+ * as mDNSu32. Doing so results in slight performance
+ * boost on LP64 architectures. The catch is we don't
+ * really care if 32 MSBs of a 64-bit register get polluted
+ * with eventual overflows as we *save* only 32 LSBs in
+ * *either* case. Now declaring 'em long excuses the compiler
+ * from keeping 32 MSBs zeroed resulting in 13% performance
+ * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
+ * Well, to be honest it should say that this *prevents*
+ * performance degradation.
+ *				<appro@fy.chalmers.se>
+ * Apparently there're LP64 compilers that generate better
+ * code if A-D are declared int. Most notably GCC-x86_64
+ * generates better code.
+ *				<appro@fy.chalmers.se>
+ */
+#endif
+
+
+// from md5_locl.h (continued)
+
+/*
+ #define	F(x,y,z)	(((x) & (y))  |  ((~(x)) & (z)))
+ #define	G(x,y,z)	(((x) & (z))  |  ((y) & (~(z))))
+ */
+
+/* As pointed out by Wei Dai <weidai@eskimo.com>, the above can be
+ * simplified to the code below.  Wei attributes these optimizations
+ * to Peter Gutmann's SHS code, and he attributes it to Rich Schroeppel.
+ */
+#define F(b,c,d)    ((((c) ^ (d)) & (b)) ^ (d))
+#define G(b,c,d)    ((((b) ^ (c)) & (d)) ^ (c))
+#define H(b,c,d)    ((b) ^ (c) ^ (d))
+#define I(b,c,d)    (((~(d)) | (b)) ^ (c))
+
+#define R0(a,b,c,d,k,s,t) { \
+        a+=((k)+(t)+F((b),(c),(d))); \
+        a=ROTATE(a,s); \
+        a+=b; }; \
+
+#define R1(a,b,c,d,k,s,t) { \
+        a+=((k)+(t)+G((b),(c),(d))); \
+        a=ROTATE(a,s); \
+        a+=b; };
+
+#define R2(a,b,c,d,k,s,t) { \
+        a+=((k)+(t)+H((b),(c),(d))); \
+        a=ROTATE(a,s); \
+        a+=b; };
+
+#define R3(a,b,c,d,k,s,t) { \
+        a+=((k)+(t)+I((b),(c),(d))); \
+        a=ROTATE(a,s); \
+        a+=b; };
+
+// from md5_dgst.c
+
+
+/* Implemented from RFC1321 The MD5 Message-Digest Algorithm
+ */
+
+#define INIT_DATA_A (unsigned long)0x67452301L
+#define INIT_DATA_B (unsigned long)0xefcdab89L
+#define INIT_DATA_C (unsigned long)0x98badcfeL
+#define INIT_DATA_D (unsigned long)0x10325476L
+
+int MD5_Init(MD5_CTX *c)
+{
+    c->A=INIT_DATA_A;
+    c->B=INIT_DATA_B;
+    c->C=INIT_DATA_C;
+    c->D=INIT_DATA_D;
+    c->Nl=0;
+    c->Nh=0;
+    c->num=0;
+    return 1;
+}
+
+#ifndef md5_block_host_order
+void md5_block_host_order (MD5_CTX *c, const void *data, int num)
+{
+    const mDNSu32 *X=(const mDNSu32 *)data;
+    register unsigned MD32_REG_T A,B,C,D;
+
+    A=c->A;
+    B=c->B;
+    C=c->C;
+    D=c->D;
+
+    for (; num--; X+=HASH_LBLOCK)
+    {
+        /* Round 0 */
+        R0(A,B,C,D,X[ 0], 7,0xd76aa478L);
+        R0(D,A,B,C,X[ 1],12,0xe8c7b756L);
+        R0(C,D,A,B,X[ 2],17,0x242070dbL);
+        R0(B,C,D,A,X[ 3],22,0xc1bdceeeL);
+        R0(A,B,C,D,X[ 4], 7,0xf57c0fafL);
+        R0(D,A,B,C,X[ 5],12,0x4787c62aL);
+        R0(C,D,A,B,X[ 6],17,0xa8304613L);
+        R0(B,C,D,A,X[ 7],22,0xfd469501L);
+        R0(A,B,C,D,X[ 8], 7,0x698098d8L);
+        R0(D,A,B,C,X[ 9],12,0x8b44f7afL);
+        R0(C,D,A,B,X[10],17,0xffff5bb1L);
+        R0(B,C,D,A,X[11],22,0x895cd7beL);
+        R0(A,B,C,D,X[12], 7,0x6b901122L);
+        R0(D,A,B,C,X[13],12,0xfd987193L);
+        R0(C,D,A,B,X[14],17,0xa679438eL);
+        R0(B,C,D,A,X[15],22,0x49b40821L);
+        /* Round 1 */
+        R1(A,B,C,D,X[ 1], 5,0xf61e2562L);
+        R1(D,A,B,C,X[ 6], 9,0xc040b340L);
+        R1(C,D,A,B,X[11],14,0x265e5a51L);
+        R1(B,C,D,A,X[ 0],20,0xe9b6c7aaL);
+        R1(A,B,C,D,X[ 5], 5,0xd62f105dL);
+        R1(D,A,B,C,X[10], 9,0x02441453L);
+        R1(C,D,A,B,X[15],14,0xd8a1e681L);
+        R1(B,C,D,A,X[ 4],20,0xe7d3fbc8L);
+        R1(A,B,C,D,X[ 9], 5,0x21e1cde6L);
+        R1(D,A,B,C,X[14], 9,0xc33707d6L);
+        R1(C,D,A,B,X[ 3],14,0xf4d50d87L);
+        R1(B,C,D,A,X[ 8],20,0x455a14edL);
+        R1(A,B,C,D,X[13], 5,0xa9e3e905L);
+        R1(D,A,B,C,X[ 2], 9,0xfcefa3f8L);
+        R1(C,D,A,B,X[ 7],14,0x676f02d9L);
+        R1(B,C,D,A,X[12],20,0x8d2a4c8aL);
+        /* Round 2 */
+        R2(A,B,C,D,X[ 5], 4,0xfffa3942L);
+        R2(D,A,B,C,X[ 8],11,0x8771f681L);
+        R2(C,D,A,B,X[11],16,0x6d9d6122L);
+        R2(B,C,D,A,X[14],23,0xfde5380cL);
+        R2(A,B,C,D,X[ 1], 4,0xa4beea44L);
+        R2(D,A,B,C,X[ 4],11,0x4bdecfa9L);
+        R2(C,D,A,B,X[ 7],16,0xf6bb4b60L);
+        R2(B,C,D,A,X[10],23,0xbebfbc70L);
+        R2(A,B,C,D,X[13], 4,0x289b7ec6L);
+        R2(D,A,B,C,X[ 0],11,0xeaa127faL);
+        R2(C,D,A,B,X[ 3],16,0xd4ef3085L);
+        R2(B,C,D,A,X[ 6],23,0x04881d05L);
+        R2(A,B,C,D,X[ 9], 4,0xd9d4d039L);
+        R2(D,A,B,C,X[12],11,0xe6db99e5L);
+        R2(C,D,A,B,X[15],16,0x1fa27cf8L);
+        R2(B,C,D,A,X[ 2],23,0xc4ac5665L);
+        /* Round 3 */
+        R3(A,B,C,D,X[ 0], 6,0xf4292244L);
+        R3(D,A,B,C,X[ 7],10,0x432aff97L);
+        R3(C,D,A,B,X[14],15,0xab9423a7L);
+        R3(B,C,D,A,X[ 5],21,0xfc93a039L);
+        R3(A,B,C,D,X[12], 6,0x655b59c3L);
+        R3(D,A,B,C,X[ 3],10,0x8f0ccc92L);
+        R3(C,D,A,B,X[10],15,0xffeff47dL);
+        R3(B,C,D,A,X[ 1],21,0x85845dd1L);
+        R3(A,B,C,D,X[ 8], 6,0x6fa87e4fL);
+        R3(D,A,B,C,X[15],10,0xfe2ce6e0L);
+        R3(C,D,A,B,X[ 6],15,0xa3014314L);
+        R3(B,C,D,A,X[13],21,0x4e0811a1L);
+        R3(A,B,C,D,X[ 4], 6,0xf7537e82L);
+        R3(D,A,B,C,X[11],10,0xbd3af235L);
+        R3(C,D,A,B,X[ 2],15,0x2ad7d2bbL);
+        R3(B,C,D,A,X[ 9],21,0xeb86d391L);
+
+        A = c->A += A;
+        B = c->B += B;
+        C = c->C += C;
+        D = c->D += D;
+    }
+}
+#endif
+
+#ifndef md5_block_data_order
+#ifdef X
+#undef X
+#endif
+void md5_block_data_order (MD5_CTX *c, const void *data_, int num)
+{
+    const unsigned char *data=data_;
+    register unsigned MD32_REG_T A,B,C,D,l;
+#ifndef MD32_XARRAY
+    /* See comment in crypto/sha/sha_locl.h for details. */
+    unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
+                        XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
+# define X(i)   XX ## i
+#else
+    mDNSu32 XX[MD5_LBLOCK];
+# define X(i)   XX[i]
+#endif
+
+    A=c->A;
+    B=c->B;
+    C=c->C;
+    D=c->D;
+
+    for (; num--;)
+    {
+        HOST_c2l(data,l); X( 0)=l;      HOST_c2l(data,l); X( 1)=l;
+        /* Round 0 */
+        R0(A,B,C,D,X( 0), 7,0xd76aa478L);   HOST_c2l(data,l); X( 2)=l;
+        R0(D,A,B,C,X( 1),12,0xe8c7b756L);   HOST_c2l(data,l); X( 3)=l;
+        R0(C,D,A,B,X( 2),17,0x242070dbL);   HOST_c2l(data,l); X( 4)=l;
+        R0(B,C,D,A,X( 3),22,0xc1bdceeeL);   HOST_c2l(data,l); X( 5)=l;
+        R0(A,B,C,D,X( 4), 7,0xf57c0fafL);   HOST_c2l(data,l); X( 6)=l;
+        R0(D,A,B,C,X( 5),12,0x4787c62aL);   HOST_c2l(data,l); X( 7)=l;
+        R0(C,D,A,B,X( 6),17,0xa8304613L);   HOST_c2l(data,l); X( 8)=l;
+        R0(B,C,D,A,X( 7),22,0xfd469501L);   HOST_c2l(data,l); X( 9)=l;
+        R0(A,B,C,D,X( 8), 7,0x698098d8L);   HOST_c2l(data,l); X(10)=l;
+        R0(D,A,B,C,X( 9),12,0x8b44f7afL);   HOST_c2l(data,l); X(11)=l;
+        R0(C,D,A,B,X(10),17,0xffff5bb1L);   HOST_c2l(data,l); X(12)=l;
+        R0(B,C,D,A,X(11),22,0x895cd7beL);   HOST_c2l(data,l); X(13)=l;
+        R0(A,B,C,D,X(12), 7,0x6b901122L);   HOST_c2l(data,l); X(14)=l;
+        R0(D,A,B,C,X(13),12,0xfd987193L);   HOST_c2l(data,l); X(15)=l;
+        R0(C,D,A,B,X(14),17,0xa679438eL);
+        R0(B,C,D,A,X(15),22,0x49b40821L);
+        /* Round 1 */
+        R1(A,B,C,D,X( 1), 5,0xf61e2562L);
+        R1(D,A,B,C,X( 6), 9,0xc040b340L);
+        R1(C,D,A,B,X(11),14,0x265e5a51L);
+        R1(B,C,D,A,X( 0),20,0xe9b6c7aaL);
+        R1(A,B,C,D,X( 5), 5,0xd62f105dL);
+        R1(D,A,B,C,X(10), 9,0x02441453L);
+        R1(C,D,A,B,X(15),14,0xd8a1e681L);
+        R1(B,C,D,A,X( 4),20,0xe7d3fbc8L);
+        R1(A,B,C,D,X( 9), 5,0x21e1cde6L);
+        R1(D,A,B,C,X(14), 9,0xc33707d6L);
+        R1(C,D,A,B,X( 3),14,0xf4d50d87L);
+        R1(B,C,D,A,X( 8),20,0x455a14edL);
+        R1(A,B,C,D,X(13), 5,0xa9e3e905L);
+        R1(D,A,B,C,X( 2), 9,0xfcefa3f8L);
+        R1(C,D,A,B,X( 7),14,0x676f02d9L);
+        R1(B,C,D,A,X(12),20,0x8d2a4c8aL);
+        /* Round 2 */
+        R2(A,B,C,D,X( 5), 4,0xfffa3942L);
+        R2(D,A,B,C,X( 8),11,0x8771f681L);
+        R2(C,D,A,B,X(11),16,0x6d9d6122L);
+        R2(B,C,D,A,X(14),23,0xfde5380cL);
+        R2(A,B,C,D,X( 1), 4,0xa4beea44L);
+        R2(D,A,B,C,X( 4),11,0x4bdecfa9L);
+        R2(C,D,A,B,X( 7),16,0xf6bb4b60L);
+        R2(B,C,D,A,X(10),23,0xbebfbc70L);
+        R2(A,B,C,D,X(13), 4,0x289b7ec6L);
+        R2(D,A,B,C,X( 0),11,0xeaa127faL);
+        R2(C,D,A,B,X( 3),16,0xd4ef3085L);
+        R2(B,C,D,A,X( 6),23,0x04881d05L);
+        R2(A,B,C,D,X( 9), 4,0xd9d4d039L);
+        R2(D,A,B,C,X(12),11,0xe6db99e5L);
+        R2(C,D,A,B,X(15),16,0x1fa27cf8L);
+        R2(B,C,D,A,X( 2),23,0xc4ac5665L);
+        /* Round 3 */
+        R3(A,B,C,D,X( 0), 6,0xf4292244L);
+        R3(D,A,B,C,X( 7),10,0x432aff97L);
+        R3(C,D,A,B,X(14),15,0xab9423a7L);
+        R3(B,C,D,A,X( 5),21,0xfc93a039L);
+        R3(A,B,C,D,X(12), 6,0x655b59c3L);
+        R3(D,A,B,C,X( 3),10,0x8f0ccc92L);
+        R3(C,D,A,B,X(10),15,0xffeff47dL);
+        R3(B,C,D,A,X( 1),21,0x85845dd1L);
+        R3(A,B,C,D,X( 8), 6,0x6fa87e4fL);
+        R3(D,A,B,C,X(15),10,0xfe2ce6e0L);
+        R3(C,D,A,B,X( 6),15,0xa3014314L);
+        R3(B,C,D,A,X(13),21,0x4e0811a1L);
+        R3(A,B,C,D,X( 4), 6,0xf7537e82L);
+        R3(D,A,B,C,X(11),10,0xbd3af235L);
+        R3(C,D,A,B,X( 2),15,0x2ad7d2bbL);
+        R3(B,C,D,A,X( 9),21,0xeb86d391L);
+
+        A = c->A += A;
+        B = c->B += B;
+        C = c->C += C;
+        D = c->D += D;
+    }
+}
+#endif
+
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - base64 -> binary conversion
+#endif
+
+static const char Base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char Pad64 = '=';
+
+
+#define mDNSisspace(x) (x == '\t' || x == '\n' || x == '\v' || x == '\f' || x == '\r' || x == ' ')
+
+mDNSlocal const char *mDNSstrchr(const char *s, int c)
+{
+    while (1)
+    {
+        if (c == *s) return s;
+        if (!*s) return mDNSNULL;
+        s++;
+    }
+}
+
+// skips all whitespace anywhere.
+// converts characters, four at a time, starting at (or after)
+// src from base - 64 numbers into three 8 bit bytes in the target area.
+// it returns the number of data bytes stored at the target, or -1 on error.
+// adapted from BIND sources
+
+mDNSlocal mDNSs32 DNSDigest_Base64ToBin(const char *src, mDNSu8 *target, mDNSu32 targsize)
+{
+    int tarindex, state, ch;
+    const char *pos;
+
+    state = 0;
+    tarindex = 0;
+
+    while ((ch = *src++) != '\0') {
+        if (mDNSisspace(ch))    /* Skip whitespace anywhere. */
+            continue;
+
+        if (ch == Pad64)
+            break;
+
+        pos = mDNSstrchr(Base64, ch);
+        if (pos == 0)       /* A non-base64 character. */
+            return (-1);
+
+        switch (state) {
+        case 0:
+            if (target) {
+                if ((mDNSu32)tarindex >= targsize)
+                    return (-1);
+                target[tarindex] = (mDNSu8)((pos - Base64) << 2);
+            }
+            state = 1;
+            break;
+        case 1:
+            if (target) {
+                if ((mDNSu32)tarindex + 1 >= targsize)
+                    return (-1);
+                target[tarindex]   |=  (pos - Base64) >> 4;
+                target[tarindex+1]  = (mDNSu8)(((pos - Base64) & 0x0f) << 4);
+            }
+            tarindex++;
+            state = 2;
+            break;
+        case 2:
+            if (target) {
+                if ((mDNSu32)tarindex + 1 >= targsize)
+                    return (-1);
+                target[tarindex]   |=  (pos - Base64) >> 2;
+                target[tarindex+1]  = (mDNSu8)(((pos - Base64) & 0x03) << 6);
+            }
+            tarindex++;
+            state = 3;
+            break;
+        case 3:
+            if (target) {
+                if ((mDNSu32)tarindex >= targsize)
+                    return (-1);
+                target[tarindex] |= (pos - Base64);
+            }
+            tarindex++;
+            state = 0;
+            break;
+        default:
+            return -1;
+        }
+    }
+
+    /*
+     * We are done decoding Base-64 chars.  Let's see if we ended
+     * on a byte boundary, and/or with erroneous trailing characters.
+     */
+
+    if (ch == Pad64) {      /* We got a pad char. */
+        ch = *src++;        /* Skip it, get next. */
+        switch (state) {
+        case 0:     /* Invalid = in first position */
+        case 1:     /* Invalid = in second position */
+            return (-1);
+
+        case 2:     /* Valid, means one byte of info */
+            /* Skip any number of spaces. */
+            for ((void)mDNSNULL; ch != '\0'; ch = *src++)
+                if (!mDNSisspace(ch))
+                    break;
+            /* Make sure there is another trailing = sign. */
+            if (ch != Pad64)
+                return (-1);
+            ch = *src++;        /* Skip the = */
+        /* Fall through to "single trailing =" case. */
+        /* FALLTHROUGH */
+
+        case 3:     /* Valid, means two bytes of info */
+            /*
+             * We know this char is an =.  Is there anything but
+             * whitespace after it?
+             */
+            for ((void)mDNSNULL; ch != '\0'; ch = *src++)
+                if (!mDNSisspace(ch))
+                    return (-1);
+
+            /*
+             * Now make sure for cases 2 and 3 that the "extra"
+             * bits that slopped past the last full byte were
+             * zeros.  If we don't check them, they become a
+             * subliminal channel.
+             */
+            if (target && target[tarindex] != 0)
+                return (-1);
+        }
+    } else {
+        /*
+         * We ended by seeing the end of the string.  Make sure we
+         * have no partial bytes lying around.
+         */
+        if (state != 0)
+            return (-1);
+    }
+
+    return (tarindex);
+}
+
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - API exported to mDNS Core
+#endif
+
+// Constants
+#define HMAC_IPAD   0x36
+#define HMAC_OPAD   0x5c
+#define MD5_LEN     16
+
+#define HMAC_MD5_AlgName (*(const domainname*) "\010" "hmac-md5" "\007" "sig-alg" "\003" "reg" "\003" "int")
+
+// Adapted from Appendix, RFC 2104
+mDNSlocal void DNSDigest_ConstructHMACKey(DomainAuthInfo *info, const mDNSu8 *key, mDNSu32 len)
+{
+    MD5_CTX k;
+    mDNSu8 buf[MD5_LEN];
+    int i;
+
+    // If key is longer than HMAC_LEN reset it to MD5(key)
+    if (len > HMAC_LEN)
+    {
+        MD5_Init(&k);
+        MD5_Update(&k, key, len);
+        MD5_Final(buf, &k);
+        key = buf;
+        len = MD5_LEN;
+    }
+
+    // store key in pads
+    mDNSPlatformMemZero(info->keydata_ipad, HMAC_LEN);
+    mDNSPlatformMemZero(info->keydata_opad, HMAC_LEN);
+    mDNSPlatformMemCopy(info->keydata_ipad, key, len);
+    mDNSPlatformMemCopy(info->keydata_opad, key, len);
+
+    // XOR key with ipad and opad values
+    for (i = 0; i < HMAC_LEN; i++)
+    {
+        info->keydata_ipad[i] ^= HMAC_IPAD;
+        info->keydata_opad[i] ^= HMAC_OPAD;
+    }
+
+}
+
+mDNSexport mDNSs32 DNSDigest_ConstructHMACKeyfromBase64(DomainAuthInfo *info, const char *b64key)
+{
+    mDNSu8 keybuf[1024];
+    mDNSs32 keylen = DNSDigest_Base64ToBin(b64key, keybuf, sizeof(keybuf));
+    if (keylen < 0) return(keylen);
+    DNSDigest_ConstructHMACKey(info, keybuf, (mDNSu32)keylen);
+    return(keylen);
+}
+
+mDNSexport void DNSDigest_SignMessage(DNSMessage *msg, mDNSu8 **end, DomainAuthInfo *info, mDNSu16 tcode)
+{
+    AuthRecord tsig;
+    mDNSu8  *rdata, *const countPtr = (mDNSu8 *)&msg->h.numAdditionals; // Get existing numAdditionals value
+    mDNSu32 utc32;
+    mDNSu8 utc48[6];
+    mDNSu8 digest[MD5_LEN];
+    mDNSu8 *ptr = *end;
+    mDNSu32 len;
+    mDNSOpaque16 buf;
+    MD5_CTX c;
+    mDNSu16 numAdditionals = (mDNSu16)((mDNSu16)countPtr[0] << 8 | countPtr[1]);
+
+    // Init MD5 context, digest inner key pad and message
+    MD5_Init(&c);
+    MD5_Update(&c, info->keydata_ipad, HMAC_LEN);
+    MD5_Update(&c, (mDNSu8 *)msg, (unsigned long)(*end - (mDNSu8 *)msg));
+
+    // Construct TSIG RR, digesting variables as apporpriate
+    mDNS_SetupResourceRecord(&tsig, mDNSNULL, 0, kDNSType_TSIG, 0, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+
+    // key name
+    AssignDomainName(&tsig.namestorage, &info->keyname);
+    MD5_Update(&c, info->keyname.c, DomainNameLength(&info->keyname));
+
+    // class
+    tsig.resrec.rrclass = kDNSQClass_ANY;
+    buf = mDNSOpaque16fromIntVal(kDNSQClass_ANY);
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));
+
+    // ttl
+    tsig.resrec.rroriginalttl = 0;
+    MD5_Update(&c, (mDNSu8 *)&tsig.resrec.rroriginalttl, sizeof(tsig.resrec.rroriginalttl));
+
+    // alg name
+    AssignDomainName(&tsig.resrec.rdata->u.name, &HMAC_MD5_AlgName);
+    len = DomainNameLength(&HMAC_MD5_AlgName);
+    rdata = tsig.resrec.rdata->u.data + len;
+    MD5_Update(&c, HMAC_MD5_AlgName.c, len);
+
+    // time
+    // get UTC (universal time), convert to 48-bit unsigned in network byte order
+    utc32 = (mDNSu32)mDNSPlatformUTC();
+    if (utc32 == (unsigned)-1) { LogMsg("ERROR: DNSDigest_SignMessage - mDNSPlatformUTC returned bad time -1"); *end = mDNSNULL; }
+    utc48[0] = 0;
+    utc48[1] = 0;
+    utc48[2] = (mDNSu8)((utc32 >> 24) & 0xff);
+    utc48[3] = (mDNSu8)((utc32 >> 16) & 0xff);
+    utc48[4] = (mDNSu8)((utc32 >>  8) & 0xff);
+    utc48[5] = (mDNSu8)( utc32        & 0xff);
+
+    mDNSPlatformMemCopy(rdata, utc48, 6);
+    rdata += 6;
+    MD5_Update(&c, utc48, 6);
+
+    // 300 sec is fudge recommended in RFC 2485
+    rdata[0] = (mDNSu8)((300 >> 8)  & 0xff);
+    rdata[1] = (mDNSu8)( 300        & 0xff);
+    MD5_Update(&c, rdata, sizeof(mDNSOpaque16));
+    rdata += sizeof(mDNSOpaque16);
+
+    // digest error (tcode) and other data len (zero) - we'll add them to the rdata later
+    buf.b[0] = (mDNSu8)((tcode >> 8) & 0xff);
+    buf.b[1] = (mDNSu8)( tcode       & 0xff);
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));  // error
+    buf.NotAnInteger = 0;
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));  // other data len
+
+    // finish the message & tsig var hash
+    MD5_Final(digest, &c);
+
+    // perform outer MD5 (outer key pad, inner digest)
+    MD5_Init(&c);
+    MD5_Update(&c, info->keydata_opad, HMAC_LEN);
+    MD5_Update(&c, digest, MD5_LEN);
+    MD5_Final(digest, &c);
+
+    // set remaining rdata fields
+    rdata[0] = (mDNSu8)((MD5_LEN >> 8)  & 0xff);
+    rdata[1] = (mDNSu8)( MD5_LEN        & 0xff);
+    rdata += sizeof(mDNSOpaque16);
+    mDNSPlatformMemCopy(rdata, digest, MD5_LEN);                          // MAC
+    rdata += MD5_LEN;
+    rdata[0] = msg->h.id.b[0];                                            // original ID
+    rdata[1] = msg->h.id.b[1];
+    rdata[2] = (mDNSu8)((tcode >> 8) & 0xff);
+    rdata[3] = (mDNSu8)( tcode       & 0xff);
+    rdata[4] = 0;                                                         // other data len
+    rdata[5] = 0;
+    rdata += 6;
+
+    tsig.resrec.rdlength = (mDNSu16)(rdata - tsig.resrec.rdata->u.data);
+    *end = PutResourceRecordTTLJumbo(msg, ptr, &numAdditionals, &tsig.resrec, 0);
+    if (!*end) { LogMsg("ERROR: DNSDigest_SignMessage - could not put TSIG"); *end = mDNSNULL; return; }
+
+    // Write back updated numAdditionals value
+    countPtr[0] = (mDNSu8)(numAdditionals >> 8);
+    countPtr[1] = (mDNSu8)(numAdditionals &  0xFF);
+}
+
+mDNSexport mDNSBool DNSDigest_VerifyMessage(DNSMessage *msg, mDNSu8 *end, LargeCacheRecord * lcr, DomainAuthInfo *info, mDNSu16 * rcode, mDNSu16 * tcode)
+{
+    mDNSu8          *   ptr = (mDNSu8*) &lcr->r.resrec.rdata->u.data;
+    mDNSs32 now;
+    mDNSs32 then;
+    mDNSu8 thisDigest[MD5_LEN];
+    mDNSu8 thatDigest[MD5_LEN];
+    mDNSOpaque16 buf;
+    mDNSu8 utc48[6];
+    mDNSs32 delta;
+    mDNSu16 fudge;
+    domainname      *   algo;
+    MD5_CTX c;
+    mDNSBool ok = mDNSfalse;
+
+    // We only support HMAC-MD5 for now
+
+    algo = (domainname*) ptr;
+
+    if (!SameDomainName(algo, &HMAC_MD5_AlgName))
+    {
+        LogMsg("ERROR: DNSDigest_VerifyMessage - TSIG algorithm not supported: %##s", algo->c);
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadKey;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    ptr += DomainNameLength(algo);
+
+    // Check the times
+
+    now = mDNSPlatformUTC();
+    if (now == -1)
+    {
+        LogMsg("ERROR: DNSDigest_VerifyMessage - mDNSPlatformUTC returned bad time -1");
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadTime;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    // Get the 48 bit time field, skipping over the first word
+
+    utc48[0] = *ptr++;
+    utc48[1] = *ptr++;
+    utc48[2] = *ptr++;
+    utc48[3] = *ptr++;
+    utc48[4] = *ptr++;
+    utc48[5] = *ptr++;
+
+    then  = (mDNSs32)NToH32(utc48 + sizeof(mDNSu16));
+
+    fudge = NToH16(ptr);
+
+    ptr += sizeof(mDNSu16);
+
+    delta = (now > then) ? now - then : then - now;
+
+    if (delta > fudge)
+    {
+        LogMsg("ERROR: DNSDigest_VerifyMessage - time skew > %d", fudge);
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadTime;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    // MAC size
+
+    ptr += sizeof(mDNSu16);
+
+    // MAC
+
+    mDNSPlatformMemCopy(thatDigest, ptr, MD5_LEN);
+
+    // Init MD5 context, digest inner key pad and message
+
+    MD5_Init(&c);
+    MD5_Update(&c, info->keydata_ipad, HMAC_LEN);
+    MD5_Update(&c, (mDNSu8*) msg, (unsigned long)(end - (mDNSu8*) msg));
+
+    // Key name
+
+    MD5_Update(&c, lcr->r.resrec.name->c, DomainNameLength(lcr->r.resrec.name));
+
+    // Class name
+
+    buf = mDNSOpaque16fromIntVal(lcr->r.resrec.rrclass);
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));
+
+    // TTL
+
+    MD5_Update(&c, (mDNSu8*) &lcr->r.resrec.rroriginalttl, sizeof(lcr->r.resrec.rroriginalttl));
+
+    // Algorithm
+
+    MD5_Update(&c, algo->c, DomainNameLength(algo));
+
+    // Time
+
+    MD5_Update(&c, utc48, 6);
+
+    // Fudge
+
+    buf = mDNSOpaque16fromIntVal(fudge);
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));
+
+    // Digest error and other data len (both zero) - we'll add them to the rdata later
+
+    buf.NotAnInteger = 0;
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));  // error
+    MD5_Update(&c, buf.b, sizeof(mDNSOpaque16));  // other data len
+
+    // Finish the message & tsig var hash
+
+    MD5_Final(thisDigest, &c);
+
+    // perform outer MD5 (outer key pad, inner digest)
+
+    MD5_Init(&c);
+    MD5_Update(&c, info->keydata_opad, HMAC_LEN);
+    MD5_Update(&c, thisDigest, MD5_LEN);
+    MD5_Final(thisDigest, &c);
+
+    if (!mDNSPlatformMemSame(thisDigest, thatDigest, MD5_LEN))
+    {
+        LogMsg("ERROR: DNSDigest_VerifyMessage - bad signature");
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadSig;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    // set remaining rdata fields
+    ok = mDNStrue;
+
+exit:
+
+    return ok;
+}
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/mDNSResponder/mDNSCore/Implementer Notes.txt b/mDNSResponder/mDNSCore/Implementer Notes.txt
new file mode 100644
index 00000000..60c9b3ae
--- /dev/null
+++ b/mDNSResponder/mDNSCore/Implementer Notes.txt
@@ -0,0 +1,66 @@
+February 2002:
+
+The mDNSResponder code has a slight architectural change to improve
+efficiency.
+
+The mDNSResponder code previously called ScheduleNextTask() after every
+operation, to calculate the time at which it needed to be called back to
+perform its next timed operation. When the workload is light, and
+protocol operations are rare and far apart, this makes sense.
+
+However, on networks where there is a lot of mDNS traffic (or the CPU is
+slow), this leads to the following anomolous behaviour: mDNSResponder
+spends a lot of CPU time working out what to do next, when what it needs
+to do next should be obvious: Finish processing the big backlog of
+packets that have been received.
+
+To remedy this, mDNSResponder now only executes ScheduleNextTask() when
+there is no other obvious work waiting to be done. However, the
+mDNSResponder code does not have direct access to this knowledge. Only
+the platform layer below knows whether there are packets waiting to be
+processed. Only the client layer above knows whether it is in the
+process of performing a long sequence of back-to-back mDNS API calls.
+
+This means that the new architecture places an additional responsibility
+on the client layer and/or platform support layer. As long as they have
+immediate work to do, they should call the appropriate mDNSCore routines
+to accomplish that work. With each call, mDNSCore will do only what it
+immediately has to do to satisfy the call. Any optional work will be
+deferred. As soon as there is no more immediate work to do, the calling
+layer MUST call mDNS_Execute(). Failure to call mDNS_Execute() will lead
+to unreliable or incorrect operation.
+
+The value returned from mDNS_Execute() is the next time (in absolute
+platform time units) at which mDNS_Execute() MUST be called again to
+perform its next necessary operation (e.g. transmitting its next
+scheduled query packet, etc.) Note that the time returned is an absolute
+time, not the time *interval* between now and the next required call.
+For OS APIs that work in terms of intervals instead of absolute times,
+mDNSPlatformTimeNow() must be subtracted from the absolute time to get
+the interval between now and the next event.
+
+In a single-threaded application using a blocking select() call as its
+main synchronization point, this means that you should call
+mDNS_Execute() before calling select(), and the timeout value you pass
+to select() MUST NOT be larger than that indicated by the result
+returned from mDNS_Execute(). After the blocking select() call returns,
+you should do whatever work you have to do, and then, if mDNS packets
+were received, or mDNS API calls were made, be sure to call
+mDNS_Execute() again, and if necessary adjust your timeout value
+accordingly, before going back into the select() call.
+
+In an asynchronous or interrupt-driven application, there are three
+places that should call mDNS_Execute():
+
+1. After delivering received packets, the platform support layer should
+call mDNS_Execute(), and use the value returned to set the platform
+callback timer to fire at the indicated time.
+
+2. After making any mDNS API call or series of calls, the client layer
+should call mDNS_Execute(), and use the value returned to set the
+platform callback timer to fire at the indicated time.
+
+3. When the platform callback timer fires, it should call mDNS_Execute()
+(to allow mDNSCore to perform its necessary work) and then the timer
+routine use the result returned to reset itself to fire at the right
+time for the next scheduled event.
diff --git a/mDNSResponder/mDNSCore/anonymous.c b/mDNSResponder/mDNSCore/anonymous.c
new file mode 100644
index 00000000..94b102ec
--- /dev/null
+++ b/mDNSResponder/mDNSCore/anonymous.c
@@ -0,0 +1,597 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mDNSEmbeddedAPI.h"
+#include "CryptoAlg.h"
+#include "anonymous.h"
+#include "DNSCommon.h"
+
+// Define ANONYMOUS_DISABLED to remove all the anonymous functionality
+// and use the stub functions implemented later in this file.
+
+#ifndef ANONYMOUS_DISABLED
+
+#define ANON_NSEC3_ITERATIONS        1 
+
+mDNSlocal mDNSBool InitializeNSEC3Record(ResourceRecord *rr, const mDNSu8 *AnonData, int len, mDNSu32 salt)
+{
+    const mDNSu8 *ptr;
+    rdataNSEC3 *nsec3 = (rdataNSEC3 *)rr->rdata->u.data;
+    mDNSu8 *tmp, *nxt;
+    unsigned short iter = ANON_NSEC3_ITERATIONS;
+    int hlen;
+    const mDNSu8 hashName[NSEC3_MAX_HASH_LEN];
+
+    // Construct the RDATA first and construct the owner name based on that.
+    ptr = (const mDNSu8 *)&salt;
+    debugf("InitializeNSEC3Record: %x%x%x%x, name %##s", ptr[0], ptr[1], ptr[2], ptr[3], rr->name->c);
+
+    // Set the RDATA
+    nsec3->alg = SHA1_DIGEST_TYPE;
+    nsec3->flags = 0;
+    nsec3->iterations = swap16(iter);
+    nsec3->saltLength = 4;
+    tmp = (mDNSu8 *)&nsec3->salt;
+    *tmp++ = ptr[0];
+    *tmp++ = ptr[1];
+    *tmp++ = ptr[2];
+    *tmp++ = ptr[3];
+
+    // hashLength, nxt, bitmap
+    *tmp++ = SHA1_HASH_LENGTH;    // hash length
+    nxt = tmp;
+    tmp += SHA1_HASH_LENGTH;
+    *tmp++ = 0; // window number
+    *tmp++ = NSEC_MCAST_WINDOW_SIZE; // window length
+    mDNSPlatformMemZero(tmp, NSEC_MCAST_WINDOW_SIZE);
+    tmp[kDNSType_PTR >> 3] |= 128 >> (kDNSType_PTR & 7);
+
+    // Hash the base service name + salt + AnonData
+    if (!NSEC3HashName(rr->name, nsec3, AnonData, len, hashName, &hlen))
+    {
+        LogMsg("InitializeNSEC3Record: NSEC3HashName failed for ##s", rr->name->c);
+        return mDNSfalse;
+    }
+    if (hlen != SHA1_HASH_LENGTH)
+    {
+        LogMsg("InitializeNSEC3Record: hlen wrong %d", hlen);
+        return mDNSfalse;
+    }
+    mDNSPlatformMemCopy(nxt, hashName, hlen);
+
+    return mDNStrue;
+}
+
+mDNSlocal ResourceRecord *ConstructNSEC3Record(const domainname *service, const mDNSu8 *AnonData, int len, mDNSu32 salt)
+{
+    ResourceRecord *rr;
+    int dlen;
+    domainname *name;
+
+    // We are just allocating an RData which has StandardAuthRDSize
+    if (StandardAuthRDSize < MCAST_NSEC3_RDLENGTH)
+    {
+        LogMsg("ConstructNSEC3Record: StandardAuthRDSize %d smaller than MCAST_NSEC3_RDLENGTH %d", StandardAuthRDSize, MCAST_NSEC3_RDLENGTH);
+        return mDNSNULL;
+    }
+
+    dlen = DomainNameLength(service);
+ 
+    // Allocate space for the name and RData. 
+    rr = mDNSPlatformMemAllocate(sizeof(ResourceRecord) + dlen + sizeof(RData));
+    if (!rr)
+        return mDNSNULL;
+    name = (domainname *)((mDNSu8 *)rr + sizeof(ResourceRecord));
+    rr->RecordType        = kDNSRecordTypePacketAuth;
+    rr->InterfaceID       = mDNSInterface_Any;
+    rr->name              = (const domainname *)name;
+    rr->rrtype            = kDNSType_NSEC3;
+    rr->rrclass           = kDNSClass_IN;
+    rr->rroriginalttl     = kStandardTTL;
+    rr->rDNSServer        = mDNSNULL;
+    rr->rdlength          = MCAST_NSEC3_RDLENGTH;
+    rr->rdestimate        = MCAST_NSEC3_RDLENGTH;
+    rr->rdata             = (RData *)((mDNSu8 *)rr->name + dlen);
+
+    AssignDomainName(name, service);
+    if (!InitializeNSEC3Record(rr, AnonData, len, salt))
+    {
+        mDNSPlatformMemFree(rr);
+        return mDNSNULL;
+    }
+    return rr;
+}
+
+mDNSlocal ResourceRecord *CopyNSEC3ResourceRecord(AnonymousInfo *si, const ResourceRecord *rr)
+{
+    int len;
+    domainname *name;
+    ResourceRecord *nsec3rr;
+
+    if (rr->rdlength < MCAST_NSEC3_RDLENGTH)
+    {
+        LogMsg("CopyNSEC3ResourceRecord: rdlength %d smaller than MCAST_NSEC3_RDLENGTH %d", rr->rdlength, MCAST_NSEC3_RDLENGTH);
+        return mDNSNULL;
+    }
+    // Allocate space for the name and the rdata along with the ResourceRecord
+    len = DomainNameLength(rr->name);
+    nsec3rr = mDNSPlatformMemAllocate(sizeof(ResourceRecord) + len + sizeof(RData));
+    if (!nsec3rr)
+        return mDNSNULL;
+
+    *nsec3rr = *rr;
+    name = (domainname *)((mDNSu8 *)nsec3rr + sizeof(ResourceRecord));
+    nsec3rr->name = (const domainname *)name;
+    AssignDomainName(name, rr->name);
+
+    nsec3rr->rdata = (RData *)((mDNSu8 *)nsec3rr->name + len);
+    mDNSPlatformMemCopy(nsec3rr->rdata->u.data, rr->rdata->u.data, rr->rdlength);
+
+    si->nsec3RR = nsec3rr;
+
+    return nsec3rr;
+}
+
+// When a service is started or a browse is started with the Anonymous data, we allocate a new random
+// number and based on that allocate a new NSEC3 resource record whose hash is a function of random number (salt) and
+// the anonymous data.
+//
+// If we receive a packet with the NSEC3 option, we need to cache that along with the resource record so that we can
+// check against the question to see whether it answers them or not. In that case, we pass the "rr" that we received.
+mDNSexport  AnonymousInfo *AllocateAnonInfo(const domainname *service, const mDNSu8 *data, int len, const ResourceRecord *rr)
+{
+    AnonymousInfo *ai;
+    ai = (AnonymousInfo *)mDNSPlatformMemAllocate(sizeof(AnonymousInfo));
+    if (!ai)
+    {
+        return mDNSNULL;
+    }
+    mDNSPlatformMemZero(ai, sizeof(AnonymousInfo));
+    if (rr)
+    {
+        if (!CopyNSEC3ResourceRecord(ai, rr))
+        {
+            mDNSPlatformMemFree(ai);
+            return mDNSNULL;
+        }
+        return ai;
+    }
+    ai->salt = mDNSRandom(0xFFFFFFFF);
+    ai->AnonData = mDNSPlatformMemAllocate(len);
+    if (!ai->AnonData)
+    {
+        mDNSPlatformMemFree(ai);
+        return mDNSNULL;
+    }
+    ai->AnonDataLen = len;
+    mDNSPlatformMemCopy(ai->AnonData, data, len);
+    ai->nsec3RR = ConstructNSEC3Record(service, data, len, ai->salt);
+    if (!ai->nsec3RR)
+    {
+        mDNSPlatformMemFree(ai);
+        return mDNSNULL;
+    }
+    return ai;
+}
+
+mDNSexport void FreeAnonInfo(AnonymousInfo *ai)
+{
+    if (ai->nsec3RR)
+        mDNSPlatformMemFree(ai->nsec3RR);
+    if (ai->AnonData)
+        mDNSPlatformMemFree(ai->AnonData);
+    mDNSPlatformMemFree(ai);
+}
+
+mDNSexport void ReInitAnonInfo(AnonymousInfo **AnonInfo, const domainname *name)
+{
+    if (*AnonInfo)
+    {
+        AnonymousInfo *ai = *AnonInfo;
+        *AnonInfo = AllocateAnonInfo(name, ai->AnonData, ai->AnonDataLen, mDNSNULL);
+        if (!(*AnonInfo))
+            *AnonInfo = ai;
+        else
+            FreeAnonInfo(ai);
+    }
+}
+
+// This function should be used only if you know that the question and
+// the resource record belongs to the same set. The main usage is
+// in ProcessQuery where we find the question to be part of the same
+// set as the resource record, but it needs the AnonData to be
+// initialized so that it can walk the cache records to see if they
+// answer the question.
+mDNSexport void SetAnonData(DNSQuestion *q, ResourceRecord *rr, mDNSBool ForQuestion)
+{
+    if (!q->AnonInfo || !rr->AnonInfo)
+    {
+        LogMsg("SetAnonData: question %##s(%p), rr %##s(%p), NULL", q->qname.c, q->AnonInfo, rr->name->c, rr->AnonInfo);
+        return;
+    }
+    
+    debugf("SetAnonData: question %##s(%p), rr %##s(%p)", q->qname.c, q->AnonInfo, rr->name->c, rr->AnonInfo);
+    if (ForQuestion)
+    {
+        if (!q->AnonInfo->AnonData)
+        {
+            q->AnonInfo->AnonData = mDNSPlatformMemAllocate(rr->AnonInfo->AnonDataLen);
+            if (!q->AnonInfo->AnonData)
+                return;
+        }
+        mDNSPlatformMemCopy(q->AnonInfo->AnonData, rr->AnonInfo->AnonData, rr->AnonInfo->AnonDataLen);
+        q->AnonInfo->AnonDataLen = rr->AnonInfo->AnonDataLen;
+    }
+    else
+    {
+        if (!rr->AnonInfo->AnonData)
+        {
+            rr->AnonInfo->AnonData = mDNSPlatformMemAllocate(q->AnonInfo->AnonDataLen);
+            if (!rr->AnonInfo->AnonData)
+                return;
+        }
+        mDNSPlatformMemCopy(rr->AnonInfo->AnonData, q->AnonInfo->AnonData, q->AnonInfo->AnonDataLen);
+        rr->AnonInfo->AnonDataLen = q->AnonInfo->AnonDataLen;
+    }
+}
+
+// returns -1 if the caller should ignore the result
+// returns 1 if the record answers the question
+// returns 0 if the record does not answer the question
+mDNSexport int AnonInfoAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    mDNSexport mDNS mDNSStorage;
+    ResourceRecord *nsec3RR;
+    int i;
+    AnonymousInfo *qai, *rai;
+    mDNSu8 *AnonData;
+    int AnonDataLen;
+    rdataNSEC3 *nsec3;
+    int hlen;
+    const mDNSu8 hashName[NSEC3_MAX_HASH_LEN];
+    int nxtLength;
+    mDNSu8 *nxtName;
+
+    debugf("AnonInfoAnswersQuestion: question qname %##s", q->qname.c);
+
+    // Currently only PTR records can have anonymous information
+    if (q->qtype != kDNSType_PTR)
+    {
+        return -1;
+    }
+
+    // We allow anonymous questions to be answered by both normal services (without the
+    // anonymous information) and anonymous services that are part of the same set. And
+    // normal questions discover normal services and all anonymous services. 
+    //
+    // The three cases have been enumerated clearly even though they all behave the
+    // same way.
+    if (!q->AnonInfo)
+    {
+        debugf("AnonInfoAnswersQuestion: not a anonymous type question");
+        if (!rr->AnonInfo)
+        {
+            // case 1
+            return -1;
+        }
+        else
+        {
+            // case 2
+            debugf("AnonInfoAnswersQuestion: Question %##s not answered using anonymous record %##s", q->qname.c, rr->name->c);
+            return -1;
+        }
+    }
+    else
+    {
+        // case 3
+        if (!rr->AnonInfo)
+        {
+            debugf("AnonInfoAnswersQuestion: not a anonymous type record");
+            return -1;
+        }
+    }
+
+    // case 4: We have the anonymous information both in the question and the record. We need
+    // two sets of information to validate.
+    //
+    // 1) Anonymous data that identifies the set/group
+    // 2) NSEC3 record that contains the hash and the salt
+    //
+    // If the question is a remote one, it does not have the anonymous information to validate (just
+    // the NSEC3 record) and hence the anonymous data should come from the local resource record. If the
+    // question is local, it can come from either of them and if there is a mismatch between the
+    // question and record, it won't validate.
+
+    qai = q->AnonInfo;
+    rai = rr->AnonInfo;
+
+    if (qai->AnonData && rai->AnonData)
+    {
+        // Before a cache record is created, if there is a matching question i.e., part
+        // of the same set, then when the cache is created we also set the anonymous
+        // information. Otherwise, the cache record contains just the NSEC3 record and we
+        // won't be here for that case.
+        //
+        // It is also possible that a local question is matched against the local AuthRecord
+        // as that is also the case for which the AnonData would be non-NULL for both.
+        // We match questions against AuthRecords (rather than the cache) for LocalOnly case and 
+        // to see whether a .local query should be suppressed or not. The latter never happens
+        // because PTR queries are never suppressed.
+
+        // If they don't belong to the same anonymous set, then no point in validating.
+        if ((qai->AnonDataLen != rai->AnonDataLen) ||
+            mDNSPlatformMemCmp(qai->AnonData, rai->AnonData, qai->AnonDataLen) != 0)
+        {
+            debugf("AnonInfoAnswersQuestion: AnonData mis-match for record  %s question %##s ",
+                RRDisplayString(&mDNSStorage, rr), q->qname.c);
+            return 0;
+        }
+        // AnonData matches i.e they belong to the same group and the same service.
+        LogInfo("AnonInfoAnswersQuestion: Answering qname %##s, rname %##s, without validation", q->qname.c,
+            rr->name->c);
+        return 1;
+    }
+    else
+    {
+        debugf("AnonInfoAnswersQuestion: question %p, record %p", qai->AnonData, rai->AnonData);
+    }
+
+    if (qai->AnonData)
+    {
+        // If there is AnonData, then this is a local question. The
+        // NSEC3 RR comes from the resource record which could be part
+        // of the cache or local auth record. The cache entry could
+        // be from a remote host or created when we heard our own 
+        // announcements. In any case, we use that to see if it matches
+        // the question.
+        AnonData = qai->AnonData;
+        AnonDataLen = qai->AnonDataLen;
+        nsec3RR = rai->nsec3RR;
+    }
+    else
+    {
+        // Remote question or hearing our own question back
+        AnonData = rai->AnonData;
+        AnonDataLen = rai->AnonDataLen;
+        nsec3RR = qai->nsec3RR;
+    }
+
+    if (!AnonData || !nsec3RR)
+    {
+        // AnonData can be NULL for the cache entry and if we are hearing our own question back, AnonData is NULL for
+        // that too and we can end up here for that case.
+        debugf("AnonInfoAnswersQuestion: AnonData %p or nsec3RR %p, NULL for question %##s, record %s", AnonData, nsec3RR,
+            q->qname.c, RRDisplayString(&mDNSStorage, rr));
+        return 0;
+    }
+    debugf("AnonInfoAnswersQuestion: Validating question %##s, ResourceRecord %s", q->qname.c, RRDisplayString(&mDNSStorage, nsec3RR));
+
+
+    nsec3 = (rdataNSEC3 *)nsec3RR->rdata->u.data;
+
+    if (!NSEC3HashName(nsec3RR->name, nsec3, AnonData, AnonDataLen, hashName, &hlen))
+    {
+        LogMsg("AnonInfoAnswersQuestion: NSEC3HashName failed for ##s", nsec3RR->name->c);
+        return mDNSfalse;
+    }
+    if (hlen != SHA1_HASH_LENGTH)
+    {
+        LogMsg("AnonInfoAnswersQuestion: hlen wrong %d", hlen);
+        return mDNSfalse;
+    }
+
+    NSEC3Parse(nsec3RR, mDNSNULL, &nxtLength, &nxtName, mDNSNULL, mDNSNULL);
+
+    if (hlen != nxtLength)
+    {
+        LogMsg("AnonInfoAnswersQuestion: ERROR!! hlen %d not same as nxtLength %d", hlen, nxtLength);
+        return mDNSfalse;
+    }
+
+    for (i = 0; i < nxtLength; i++)
+    {
+        if (nxtName[i] != hashName[i])
+        {
+            debugf("AnonInfoAnswersQuestion: mismatch output %x, digest %x, i %d", nxtName[i+1], hashName[i], i);
+            return 0;
+        }
+    }
+    LogInfo("AnonInfoAnswersQuestion: ResourceRecord %s matched question %##s (%s)", RRDisplayString(&mDNSStorage, nsec3RR), q->qname.c, DNSTypeName(q->qtype));
+    return 1;
+}
+
+// Find a matching NSEC3 record for the name. We parse the questions and the records in the packet in order.
+// Similarly we also parse the NSEC3 records in order and this mapping to the questions and records
+// respectively.
+mDNSlocal CacheRecord *FindMatchingNSEC3ForName(mDNS *const m, CacheRecord **nsec3, const domainname *name)
+{
+    CacheRecord *cr;
+    CacheRecord **prev = nsec3;
+    
+    (void) m;
+
+    for (cr = *nsec3; cr; cr = cr->next)
+    {
+        if (SameDomainName(cr->resrec.name, name))
+        {
+            debugf("FindMatchingNSEC3ForName: NSEC3 record %s matched %##s", CRDisplayString(m, cr), name->c);
+            *prev = cr->next;
+            cr->next = mDNSNULL;
+            return cr;
+        }
+        prev = &cr->next;
+    }
+    return mDNSNULL;
+}
+
+mDNSexport void InitializeAnonInfoForQuestion(mDNS *const m, CacheRecord **McastNSEC3Records, DNSQuestion *q)
+{
+    CacheRecord *nsec3CR;
+
+    if (q->qtype != kDNSType_PTR)
+        return;
+
+    nsec3CR = FindMatchingNSEC3ForName(m, McastNSEC3Records, &q->qname);
+    if (nsec3CR)
+    {
+        q->AnonInfo = AllocateAnonInfo(mDNSNULL, mDNSNULL, 0, &nsec3CR->resrec);
+        if (q->AnonInfo)
+        {
+            debugf("InitializeAnonInfoForQuestion: Found a matching NSEC3 record %s, for %##s (%s)",
+                RRDisplayString(m, q->AnonInfo->nsec3RR), q->qname.c, DNSTypeName(q->qtype));
+        }
+        ReleaseCacheRecord(m, nsec3CR);
+    }
+}
+
+mDNSexport void InitializeAnonInfoForCR(mDNS *const m, CacheRecord **McastNSEC3Records, CacheRecord *cr)
+{
+    CacheRecord *nsec3CR;
+
+    if (!(*McastNSEC3Records))
+        return;
+
+    // If already initialized or not a PTR type, we don't have to do anything
+    if (cr->resrec.AnonInfo || cr->resrec.rrtype != kDNSType_PTR)
+        return;
+
+    nsec3CR = FindMatchingNSEC3ForName(m, McastNSEC3Records, cr->resrec.name);
+    if (nsec3CR)
+    {
+        cr->resrec.AnonInfo = AllocateAnonInfo(mDNSNULL, mDNSNULL, 0, &nsec3CR->resrec);
+        if (cr->resrec.AnonInfo)
+        {
+            debugf("InitializeAnonInfoForCR: Found a matching NSEC3 record %s, for %##s (%s)",
+                RRDisplayString(m, cr->resrec.AnonInfo->nsec3RR), cr->resrec.name->c,
+                DNSTypeName(cr->resrec.rrtype));
+        }
+        ReleaseCacheRecord(m, nsec3CR);
+    }
+}
+
+mDNSexport mDNSBool IdenticalAnonInfo(AnonymousInfo *a1, AnonymousInfo *a2)
+{
+    // if a1 is NULL and a2 is not NULL AND vice-versa
+    // return false as there is a change.
+    if ((a1 != mDNSNULL) != (a2 != mDNSNULL))
+        return mDNSfalse;
+
+    // Both could be NULL or non-NULL
+    if (a1 && a2)
+    {
+        // The caller already verified that the owner name is the same.
+        // Check whether the RData is same.
+        if (!IdenticalSameNameRecord(a1->nsec3RR, a2->nsec3RR))
+        {
+            debugf("IdenticalAnonInfo: nsec3RR mismatch");
+            return mDNSfalse;
+        }
+    }
+    return mDNStrue;
+}
+
+mDNSexport void CopyAnonInfoForCR(mDNS *const m, CacheRecord *crto, CacheRecord *crfrom)
+{
+    AnonymousInfo *aifrom = crfrom->resrec.AnonInfo;
+    AnonymousInfo *aito = crto->resrec.AnonInfo;
+
+    (void) m;
+
+    if (!aifrom)
+        return;
+
+    if (aito)
+    {
+        crto->resrec.AnonInfo = aifrom;
+        FreeAnonInfo(aito);
+        crfrom->resrec.AnonInfo = mDNSNULL;
+    }
+    else
+    {
+        FreeAnonInfo(aifrom);
+        crfrom->resrec.AnonInfo = mDNSNULL;
+    }
+}
+
+#else // !ANONYMOUS_DISABLED
+
+mDNSexport void ReInitAnonInfo(AnonymousInfo **si, const domainname *name)
+{
+	(void)si;
+	(void)name;
+}
+
+mDNSexport AnonymousInfo * AllocateAnonInfo(const domainname *service, const mDNSu8 *AnonData, int len, const ResourceRecord *rr)
+{
+	(void)service;
+	(void)AnonData;
+	(void)len;
+	(void)rr;
+
+	return mDNSNULL;
+}
+
+mDNSexport void FreeAnonInfo(AnonymousInfo *ai)
+{
+	(void)ai;
+}
+
+mDNSexport void SetAnonData(DNSQuestion *q, ResourceRecord *rr, mDNSBool ForQuestion)
+{
+	(void)q;
+	(void)rr;
+	(void)ForQuestion;
+}
+
+mDNSexport int AnonInfoAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+	(void)rr;
+	(void)q;
+
+	return mDNSfalse;
+}
+
+mDNSexport void InitializeAnonInfoForQuestion(mDNS *const m, CacheRecord **McastNSEC3Records, DNSQuestion *q)
+{
+	(void)m;
+	(void)McastNSEC3Records;
+	(void)q;
+}
+
+mDNSexport void InitializeAnonInfoForCR(mDNS *const m, CacheRecord **McastNSEC3Records, CacheRecord *cr)
+{
+	(void)m;
+	(void)McastNSEC3Records;
+	(void)cr;
+}
+
+mDNSexport void CopyAnonInfoForCR(mDNS *const m, CacheRecord *crto, CacheRecord *crfrom)
+{
+	(void)m;
+	(void)crto;
+	(void)crfrom;
+}
+
+mDNSexport mDNSBool IdenticalAnonInfo(AnonymousInfo *a1, AnonymousInfo *a2)
+{
+	(void)a1;
+	(void)a2;
+
+	return mDNStrue;
+}
+
+#endif // !ANONYMOUS_DISABLED
diff --git a/mDNSResponder/mDNSCore/anonymous.h b/mDNSResponder/mDNSCore/anonymous.h
new file mode 100644
index 00000000..2f2b4f8c
--- /dev/null
+++ b/mDNSResponder/mDNSCore/anonymous.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __ANONYMOUS_H_
+#define __ANONYMOUS_H_
+
+extern void ReInitAnonInfo(AnonymousInfo **si, const domainname *name);
+extern AnonymousInfo *AllocateAnonInfo(const domainname *service, const mDNSu8 *AnonData, int len, const ResourceRecord *rr);
+extern void FreeAnonInfo(AnonymousInfo *ai);
+extern void SetAnonData(DNSQuestion *q, ResourceRecord *rr, mDNSBool ForQuestion);
+extern int AnonInfoAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q);
+extern void InitializeAnonInfoForCR(mDNS *const m, CacheRecord **McastNSEC3Records, CacheRecord *cr);
+extern void InitializeAnonInfoForQuestion(mDNS *const m, CacheRecord **McastNSEC3Records, DNSQuestion *q);
+extern void CopyAnonInfoForCR(mDNS *const m, CacheRecord *crto, CacheRecord *crfrom);
+extern mDNSBool IdenticalAnonInfo(AnonymousInfo *a1, AnonymousInfo *a2);
+
+#endif
diff --git a/mDNSResponder/mDNSCore/dnsproxy.c b/mDNSResponder/mDNSCore/dnsproxy.c
new file mode 100644
index 00000000..11bacc10
--- /dev/null
+++ b/mDNSResponder/mDNSCore/dnsproxy.c
@@ -0,0 +1,836 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "dnsproxy.h"
+
+#ifndef UNICAST_DISABLED
+
+// Implementation Notes
+//
+// DNS Proxy listens on port 53 (UDPv4v6 & TCPv4v6) for DNS queries. It handles only
+// the "Query" opcode of the DNS protocol described in RFC 1035. For all other opcodes, it returns
+// "Not Implemented" error. The platform interface mDNSPlatformInitDNSProxySkts
+// sets up the sockets and whenever it receives a packet, it calls ProxyTCPCallback or ProxyUDPCallback
+// defined here. For TCP socket, the platform does the "accept" and only sends the received packets
+// on the newly accepted socket. A single UDP socket (per address family) is used to send/recv
+// requests/responses from all clients. For TCP, there is one socket per request. Hence, there is some
+// extra state that needs to be disposed at the end.
+//
+// When a DNS request is received, ProxyCallbackCommon checks for malformed packet etc. and also checks
+// for duplicates, before creating DNSProxyClient state and starting a question with the "core"
+// (mDNS_StartQuery). When the callback for the question happens, it gathers all the necessary
+// resource records, constructs a response and sends it back to the client.
+//
+//   - Question callback is called with only one resource record at a time. We need all the resource
+//     records to construct the response. Hence, we lookup all the records ourselves. 
+//
+//   - The response may not fit the client's buffer size. In that case, we need to set the truncate bit
+//     and the client would retry using TCP.
+//
+//   - The client may have set the DNSSEC OK bit in the EDNS0 option and that means we also have to
+//     return the RRSIGs or the NSEC records with the RRSIGs in the Additional section. We need to
+//     ask the "core" to fetch the DNSSEC records and do the validation if the CD bit is not set.
+//
+// Once the response is sent to the client, the client state is disposed. When there is no response
+// from the "core", it eventually times out and we will not find any answers in the cache and we send a
+// "NXDomain" response back. Thus, we don't need any special timers to reap the client state in the case
+// of errors. 
+
+typedef struct DNSProxyClient_struct DNSProxyClient;
+
+struct DNSProxyClient_struct {
+
+    DNSProxyClient *next; 
+    mDNSAddr    addr;               // Client's IP address 
+    mDNSIPPort  port;               // Client's port number
+    mDNSOpaque16 msgid;             // DNS msg id
+    mDNSInterfaceID interfaceID;    // Interface on which we received the request
+    void *socket;                   // Return socket
+    mDNSBool tcp;                   // TCP or UDP ?
+    mDNSOpaque16 requestFlags;      // second 16 bit word in the DNSMessageHeader of the request
+    mDNSu8 *optRR;                  // EDNS0 option
+    mDNSu16 optLen;                 // Total Length of the EDNS0 option 
+    mDNSu16 rcvBufSize;             // How much can the client receive ?
+    mDNSBool DNSSECOK;              // DNSSEC OK ?
+    void *context;                  // Platform context to be disposed if non-NULL
+    domainname qname;               // q->qname can't be used for duplicate check
+    DNSQuestion q;                  // as it can change underneath us for CNAMEs
+};
+
+#define MIN_DNS_MESSAGE_SIZE    512
+DNSProxyClient *DNSProxyClients;
+
+mDNSlocal void FreeDNSProxyClient(DNSProxyClient *pc)
+{
+    if (pc->optRR)
+        mDNSPlatformMemFree(pc->optRR);
+    mDNSPlatformMemFree(pc);
+}
+
+mDNSlocal mDNSBool ParseEDNS0(DNSProxyClient *pc, const mDNSu8 *ptr, int length, const mDNSu8 *limit)
+{
+    mDNSu16 rrtype, rrclass;
+    mDNSu8 rcode, version;
+    mDNSu16 flag;
+ 
+    if (ptr + length > limit)
+    {
+        LogInfo("ParseEDNS0: Not enough space in the packet");
+        return mDNSfalse;
+    }
+    // Skip the root label
+    ptr++;
+    rrtype  = (mDNSu16) ((mDNSu16)ptr[0] <<  8 | ptr[1]);
+    if (rrtype != kDNSType_OPT)
+    {
+        LogInfo("ParseEDNS0: Not the right type %d", rrtype);
+        return mDNSfalse;
+    }
+    rrclass = (mDNSu16) ((mDNSu16)ptr[2] <<  8 | ptr[3]);
+    rcode   = ptr[4];
+    version = ptr[5];
+    flag    = (mDNSu16) ((mDNSu16)ptr[6] << 8 | ptr[7]);
+
+    debugf("rrtype is %s, length is %d, rcode %d, version %d, flag 0x%x", DNSTypeName(rrtype), rrclass, rcode, version, flag);
+    pc->rcvBufSize = rrclass;
+    pc->DNSSECOK = ptr[6] & 0x80;
+    
+    return mDNStrue;
+}
+
+mDNSexport mDNSu8 *DNSProxySetAttributes(DNSQuestion *q, DNSMessageHeader *h, DNSMessage *msg, mDNSu8 *ptr, mDNSu8 *limit)
+{
+    DNSProxyClient *pc = (DNSProxyClient *)q->QuestionContext;
+
+    (void) msg;
+
+    h->flags = pc->requestFlags;
+    if (pc->optRR)
+    {
+        if (ptr + pc->optLen > limit)
+        {
+            LogInfo("DNSProxySetAttributes: Cannot set EDNS0 option start %p, OptLen %d, end %p", ptr, pc->optLen, limit);
+            return ptr;
+        }
+        h->numAdditionals++;
+        mDNSPlatformMemCopy(ptr, pc->optRR, pc->optLen);
+        ptr += pc->optLen;
+    }
+    return ptr;
+}
+
+mDNSlocal mDNSu8 *AddEDNS0Option(mDNS *const m, mDNSu8 *ptr, mDNSu8 *limit)
+{
+    int len = 4096;
+
+    if (ptr + 11 > limit)
+    {
+        LogInfo("AddEDNS0Option: not enough space");
+        return mDNSNULL;
+    }
+    m->omsg.h.numAdditionals++;
+    ptr[0] = 0;
+    ptr[1] = (mDNSu8) (kDNSType_OPT >> 8);
+    ptr[2] = (mDNSu8) (kDNSType_OPT & 0xFF);
+    ptr[3] = (mDNSu8) (len >> 8);
+    ptr[4] = (mDNSu8) (len & 0xFF);
+    ptr[5] = 0;     // rcode
+    ptr[6] = 0;     // version
+    ptr[7] = 0;
+    ptr[8] = 0;     // flags
+    ptr[9] = 0;     // rdlength
+    ptr[10] = 0;    // rdlength
+
+    debugf("AddEDNS0 option");
+
+    return (ptr + 11);
+}
+
+// Currently RD and CD bit should be copied if present in the request or cleared if
+// not present in the request. RD bit is normally set in the response and hence the
+// cache reflects the right value. CD bit behaves differently. If the CD bit is set
+// the first time, the cache retains it, if it is present in response (assuming the
+// upstream server does it right). Next time through we should not use the cached
+// value of the CD bit blindly. It depends on whether it was in the request or not.
+mDNSlocal mDNSOpaque16 SetResponseFlags(DNSProxyClient *pc, const mDNSOpaque16 responseFlags)
+{
+    mDNSOpaque16 rFlags = responseFlags;
+
+    if (pc->requestFlags.b[0] & kDNSFlag0_RD)
+        rFlags.b[0] |= kDNSFlag0_RD;
+    else
+        rFlags.b[0] &= ~kDNSFlag0_RD;
+
+    if (pc->requestFlags.b[1] & kDNSFlag1_CD)
+        rFlags.b[1] |= kDNSFlag1_CD;
+    else
+        rFlags.b[1] &= ~kDNSFlag1_CD;
+
+    return rFlags;
+}
+
+mDNSlocal mDNSu8 *AddResourceRecords(mDNS *const m, DNSProxyClient *pc, mDNSu8 **prevptr, mStatus *error)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    int len = sizeof(DNSMessageHeader);
+    mDNSu8 *orig = m->omsg.data;
+    mDNSBool first = mDNStrue;
+    mDNSu8 *ptr = mDNSNULL;
+    mDNSs32 now;
+    mDNSs32 ttl;
+    CacheRecord *nsec = mDNSNULL;
+    CacheRecord *soa = mDNSNULL;
+    CacheRecord *cname = mDNSNULL;
+    mDNSu8 *limit;
+
+    *error = mStatus_NoError;
+    *prevptr = mDNSNULL;
+
+    mDNS_Lock(m);
+    now = m->timenow;
+    mDNS_Unlock(m);
+
+    if (!pc->tcp)
+    {
+        if (!pc->rcvBufSize)
+        {
+            limit = m->omsg.data + MIN_DNS_MESSAGE_SIZE;
+        }
+        else
+        {
+            limit = (pc->rcvBufSize > AbsoluteMaxDNSMessageData ? m->omsg.data + AbsoluteMaxDNSMessageData : m->omsg.data + pc->rcvBufSize);
+        }
+    }
+    else
+    {
+        // For TCP, limit is not determined by EDNS0 but by 16 bit rdlength field and
+        // AbsoluteMaxDNSMessageData is smaller than 64k.
+        limit = m->omsg.data + AbsoluteMaxDNSMessageData;
+    }
+    LogInfo("AddResourceRecords: Limit is %d", limit - m->omsg.data);
+
+    if (!SameDomainName(&pc->qname, &pc->q.qname))
+    {
+        AssignDomainName(&pc->q.qname, &pc->qname);
+        pc->q.qnamehash = DomainNameHashValue(&pc->q.qname);
+    }
+
+again:
+    nsec = soa = cname = mDNSNULL;
+    slot = HashSlot(&pc->q.qname);
+        
+    cg = CacheGroupForName(m, slot, pc->q.qnamehash, &pc->q.qname);
+    if (!cg)
+    {
+        LogInfo("AddResourceRecords: CacheGroup not found");
+        *error = mStatus_NoSuchRecord;
+        return mDNSNULL;
+    }
+    // Set ValidatingResponse so that you can get RRSIGs also matching
+    // the question
+    if (pc->DNSSECOK)
+        pc->q.ValidatingResponse = 1;
+    for (cr = cg->members; cr; cr = cr->next)
+    {
+        if (SameNameRecordAnswersQuestion(&cr->resrec, &pc->q))
+        {
+            if (first)
+            {
+                // If this is the first time, initialize the header and the question.
+                // This code needs to be here so that we can use the responseFlags from the
+                // cache record
+                mDNSOpaque16 responseFlags = SetResponseFlags(pc, cr->responseFlags);
+                InitializeDNSMessage(&m->omsg.h, pc->msgid, responseFlags);
+                ptr = putQuestion(&m->omsg, m->omsg.data, m->omsg.data + AbsoluteMaxDNSMessageData, &pc->qname, pc->q.qtype, pc->q.qclass);
+                if (!ptr)
+                {
+                    LogInfo("AddResourceRecords: putQuestion NULL for %##s (%s)", &pc->qname.c, DNSTypeName(pc->q.qtype));
+                    return mDNSNULL;
+                }
+                first = mDNSfalse;
+            }
+            // - For NegativeAnswers there is nothing to add
+            // - If DNSSECOK is set, we also automatically lookup the RRSIGs which
+            //   will also be returned. If the client is explicitly looking up
+            //   a DNSSEC record (e.g., DNSKEY, DS) we should return the response.
+            //   DNSSECOK bit only influences whether we add the RRSIG or not.
+            if (cr->resrec.RecordType != kDNSRecordTypePacketNegative)
+            {
+                LogInfo("AddResourceRecords: Answering question with %s", CRDisplayString(m, cr));
+                ttl = cr->resrec.rroriginalttl - (now - cr->TimeRcvd) / mDNSPlatformOneSecond;
+                ptr = PutResourceRecordTTLWithLimit(&m->omsg, ptr, &m->omsg.h.numAnswers, &cr->resrec, ttl, limit);
+                if (!ptr)
+                {
+                    *prevptr = orig;
+                    return mDNSNULL;
+                }
+                len += (ptr - orig); 
+                orig = ptr;
+            }
+            // If we have nsecs (wildcard expanded answer or negative response), add them
+            // in the additional section below if the DNSSECOK bit is set
+            if (pc->DNSSECOK && cr->nsec)
+            {
+                LogInfo("AddResourceRecords: nsec set for %s", CRDisplayString(m ,cr));
+                nsec = cr->nsec;
+            }
+            if (cr->soa)
+            {
+                LogInfo("AddResourceRecords: soa set for %s", CRDisplayString(m ,cr));
+                soa = cr->soa;
+            }
+            // If we are using CNAME to answer a question and CNAME is not the type we
+            // are looking for, note down the CNAME record so that we can follow them
+            // later. Before we follow the CNAME, print the RRSIGs and any nsec (wildcard
+            // expanded) if any.
+            if ((pc->q.qtype != cr->resrec.rrtype) && cr->resrec.rrtype == kDNSType_CNAME)
+            {
+                LogInfo("AddResourceRecords: cname set for %s", CRDisplayString(m ,cr));
+                cname = cr;
+            }
+        }
+    }
+    // Along with the nsec records, we also cache the SOA record. For non-DNSSEC question, we need
+    // to send the SOA back. Normally we either cache the SOA record (non-DNSSEC question) pointed
+    // to by "cr->soa" or the NSEC/SOA records along with their RRSIGs (DNSSEC question) pointed to
+    // by "cr->nsec". Two cases:
+    //
+    // - if we issue a DNSSEC question followed by non-DNSSEC question for the same name,
+    //   we only have the nsec records and we need to filter the SOA record alone for the
+    //   non-DNSSEC questions.
+    //
+    // - if we issue a non-DNSSEC question followed by DNSSEC question for the same name,
+    //   the "core" flushes the cache entry and re-issue the question with EDNS0/DOK bit and
+    //   in this case we return all the DNSSEC records we have.
+    for (; nsec; nsec = nsec->next)
+    {
+        if (!pc->DNSSECOK && DNSSECRecordType(nsec->resrec.rrtype))
+            continue;
+        LogInfo("AddResourceRecords:NSEC Answering question with %s", CRDisplayString(m, nsec));
+        ttl = nsec->resrec.rroriginalttl - (now - nsec->TimeRcvd) / mDNSPlatformOneSecond;
+        ptr = PutResourceRecordTTLWithLimit(&m->omsg, ptr, &m->omsg.h.numAuthorities, &nsec->resrec, ttl, limit);
+        if (!ptr)
+        {
+            *prevptr = orig;
+            return mDNSNULL;
+        }
+        len += (ptr - orig); 
+        orig = ptr;
+    }
+    if (soa)
+    {
+        LogInfo("AddResourceRecords: SOA Answering question with %s", CRDisplayString(m, soa));
+        ptr = PutResourceRecordTTLWithLimit(&m->omsg, ptr, &m->omsg.h.numAuthorities, &soa->resrec, soa->resrec.rroriginalttl, limit);
+        if (!ptr)
+        {
+            *prevptr = orig;
+            return mDNSNULL;
+        }
+        len += (ptr - orig); 
+        orig = ptr;
+    }
+    if (cname)
+    {
+        AssignDomainName(&pc->q.qname, &cname->resrec.rdata->u.name);
+        pc->q.qnamehash = DomainNameHashValue(&pc->q.qname);
+        goto again;
+    }
+    if (!ptr)
+    {
+        LogInfo("AddResourceRecords: Did not find any valid ResourceRecords");
+        *error = mStatus_NoSuchRecord;
+        return mDNSNULL;
+    }
+    if (pc->rcvBufSize)
+    {
+        ptr = AddEDNS0Option(m, ptr, limit);
+        if (!ptr)
+        {
+            *prevptr = orig;
+            return mDNSNULL;
+        }
+        len += (ptr - orig); 
+        orig = ptr;
+    }
+    LogInfo("AddResourceRecord: Added %d bytes to the packet", len);
+    return ptr;
+}
+
+mDNSlocal void ProxyClientCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    DNSProxyClient *pc = question->QuestionContext;
+    DNSProxyClient **ppc = &DNSProxyClients;
+    mDNSu8 *ptr;
+    mDNSu8 *prevptr;
+    mStatus error;
+
+    if (!AddRecord)
+        return;
+
+    LogInfo("ProxyClientCallback: ResourceRecord %s", RRDisplayString(m, answer));
+
+    // We asked for validation and not timed out yet, then wait for the DNSSEC result.
+    // We have to set the AD bit in the response if it is secure which can't be done
+    // till we get the DNSSEC result back (indicated by QC_dnssec).
+    if (question->ValidationRequired)
+    {
+        mDNSs32 now;
+
+        mDNS_Lock(m);
+        now = m->timenow;
+        mDNS_Unlock(m);
+        if (((now - question->StopTime) < 0) && AddRecord != QC_dnssec)
+        {
+            LogInfo("ProxyClientCallback: No DNSSEC answer yet for Question %##s (%s), AddRecord %d, answer %s", question->qname.c,
+                DNSTypeName(question->qtype), AddRecord, RRDisplayString(m, answer));
+            return;
+        }
+    }
+
+    if (answer->RecordType != kDNSRecordTypePacketNegative)
+    {
+        if (answer->rrtype != question->qtype)
+        {
+            // Wait till we get called for the real response
+            LogInfo("ProxyClientCallback: Received %s, not answering yet", RRDisplayString(m, answer));
+            return;
+        }
+    }
+    ptr = AddResourceRecords(m, pc, &prevptr, &error);
+    if (!ptr)
+    {
+        LogInfo("ProxyClientCallback: AddResourceRecords NULL for %##s (%s)", &pc->qname.c, DNSTypeName(pc->q.qtype));
+        if (error == mStatus_NoError && prevptr)
+        {
+            // No space to add the record. Set the Truncate bit for UDP.
+            //
+            // TBD: For TCP, we need to send the rest of the data. But finding out what is left
+            // is harder. We should allocate enough buffer in the first place to send all
+            // of the data.
+            if (!pc->tcp)
+            {
+                m->omsg.h.flags.b[0] |= kDNSFlag0_TC;
+                ptr = prevptr;
+            }
+            else
+            {
+                LogInfo("ProxyClientCallback: ERROR!! Not enough space to return in TCP for %##s (%s)", &pc->qname.c, DNSTypeName(pc->q.qtype));
+                ptr = prevptr;
+            }
+        }
+        else
+        {
+            mDNSOpaque16 flags   = { { kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery, kDNSFlag1_RC_ServFail } };
+            // We could not find the record for some reason. Return a response, so that the client
+            // is not waiting forever.
+            LogInfo("ProxyClientCallback: No response");
+            if (!mDNSOpaque16IsZero(pc->q.responseFlags))
+                flags = pc->q.responseFlags;
+            InitializeDNSMessage(&m->omsg.h, pc->msgid, flags);
+            ptr = putQuestion(&m->omsg, m->omsg.data, m->omsg.data + AbsoluteMaxDNSMessageData, &pc->qname, pc->q.qtype, pc->q.qclass);
+            if (!ptr)
+            {
+                LogInfo("ProxyClientCallback: putQuestion NULL for %##s (%s)", &pc->qname.c, DNSTypeName(pc->q.qtype));
+                goto done;
+            }
+        }
+    }
+    if (question->ValidationRequired)
+    {
+        if (question->ValidationState == DNSSECValDone && question->ValidationStatus == DNSSEC_Secure)
+        {
+            LogInfo("ProxyClientCallback: Setting AD bit for Question %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+            m->omsg.h.flags.b[1] |= kDNSFlag1_AD;
+        }
+        else
+        {
+            // If some external resolver sets the AD bit and we did not validate the response securely, don't set
+            // the AD bit. It is possible that we did not see all the records that the upstream resolver saw or
+            // a buggy implementation somewhere.
+            if (m->omsg.h.flags.b[1] & kDNSFlag1_AD)
+            {
+                LogInfo("ProxyClientCallback: AD bit set in the response for response that was not validated locally %##s (%s)",
+                    question->qname.c, DNSTypeName(question->qtype));
+                m->omsg.h.flags.b[1] &= ~kDNSFlag1_AD;
+            }
+        }
+    }
+
+    if (!pc->tcp)
+    {
+        mDNSSendDNSMessage(m, &m->omsg, ptr, mDNSInterface_Any, (UDPSocket *)pc->socket, &pc->addr, pc->port, mDNSNULL, mDNSNULL, mDNSfalse);
+    }
+    else
+    {
+        mDNSSendDNSMessage(m, &m->omsg, ptr, mDNSInterface_Any, mDNSNULL, &pc->addr, pc->port, (TCPSocket *)pc->socket, mDNSNULL, mDNSfalse);
+    }
+
+done:
+    mDNS_StopQuery(m, question);
+
+    while (*ppc && *ppc != pc)
+        ppc=&(*ppc)->next;
+    if (!*ppc)
+    {
+        LogMsg("ProxyClientCallback: question %##s (%s) not found", question->qname.c, DNSTypeName(question->qtype));
+        return;
+    }
+    *ppc = pc->next;
+    mDNSPlatformDisposeProxyContext(pc->context);
+    FreeDNSProxyClient(pc);
+}
+
+mDNSlocal void SendError(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *dstaddr,
+    const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, mDNSBool tcp, void *context, mDNSu8 rcode)
+{
+    int pktlen = (int)(end - (mDNSu8 *)pkt);
+    DNSMessage  *msg  = (DNSMessage *)pkt;
+
+    (void) InterfaceID; 
+
+    // RFC 1035 requires that we copy the question back and RFC 2136 is okay with sending nothing
+    // in the body or send back whatever we get for updates. It is easy to return whatever we get
+    // in the question back to the responder. We return as much as we can fit in our standard
+    // output packet.
+    if (pktlen > AbsoluteMaxDNSMessageData)
+        pktlen = AbsoluteMaxDNSMessageData;
+
+    mDNSPlatformMemCopy(&m->omsg.h, &msg->h, sizeof(DNSMessageHeader));
+    m->omsg.h.flags.b[0] |= kDNSFlag0_QR_Response;
+    m->omsg.h.flags.b[1] = rcode;
+    mDNSPlatformMemCopy(m->omsg.data, (mDNSu8 *)&msg->h.numQuestions, pktlen);
+    if (!tcp)
+    {
+        mDNSSendDNSMessage(m, &m->omsg, (mDNSu8 *)&m->omsg + pktlen, mDNSInterface_Any, socket, dstaddr, dstport, mDNSNULL, mDNSNULL,
+            mDNSfalse);
+    }
+    else
+    {
+        mDNSSendDNSMessage(m, &m->omsg, (mDNSu8 *)&m->omsg + pktlen, mDNSInterface_Any, mDNSNULL, dstaddr, dstport, (TCPSocket *)socket,
+            mDNSNULL, mDNSfalse);
+    }
+    mDNSPlatformDisposeProxyContext(context);
+}
+
+mDNSlocal DNSQuestion *IsDuplicateClient(const mDNS *const m, const mDNSAddr *const addr, const mDNSIPPort port, const mDNSOpaque16 id,
+    const DNSQuestion *const question)
+{
+    DNSProxyClient *pc;
+
+    (void) m; // unused
+
+    for (pc = DNSProxyClients; pc; pc = pc->next)
+    {
+        if (mDNSSameAddress(&pc->addr, addr)   &&
+            mDNSSameIPPort(pc->port, port)  &&
+            mDNSSameOpaque16(pc->msgid, id) &&
+            pc->q.qtype == question->qtype  &&
+            pc->q.qclass  == question->qclass &&
+            SameDomainName(&pc->qname, &question->qname))
+        {
+            LogInfo("IsDuplicateClient: Found a duplicate client in the list");
+            return(&pc->q);
+        }
+    }
+    return(mDNSNULL);
+}
+
+mDNSlocal mDNSBool CheckDNSProxyIpIntf(const mDNS *const m, mDNSInterfaceID InterfaceID)
+{
+    int i;
+    mDNSu32 ip_ifindex = (mDNSu32)(unsigned long)InterfaceID;
+
+    LogInfo("CheckDNSProxyIpIntf: Stored Input Interface List: [%d] [%d] [%d] [%d] [%d]", m->dp_ipintf[0], m->dp_ipintf[1], m->dp_ipintf[2], 
+             m->dp_ipintf[3], m->dp_ipintf[4]);
+
+    for (i = 0; i < MaxIp; i++)
+    {
+        if (ip_ifindex == m->dp_ipintf[i])
+            return mDNStrue;
+    }
+    return mDNSfalse;
+
+}
+
+mDNSlocal void ProxyCallbackCommon(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+    const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, mDNSBool tcp, void *context)
+{
+    DNSMessage  *msg  = (DNSMessage *)pkt;
+    mDNSu8 QR_OP;
+    const mDNSu8 *ptr;
+    DNSQuestion q, *qptr;
+    DNSProxyClient *pc;
+    const mDNSu8 *optRR;
+    int optLen = 0;
+    DNSProxyClient **ppc = &DNSProxyClients;
+
+    (void) dstaddr;
+    (void) dstport;
+
+    debugf("ProxyCallbackCommon: DNS Query coming from InterfaceID %p", InterfaceID);
+    // Ignore if the DNS Query is not from a Valid Input InterfaceID
+    if (!CheckDNSProxyIpIntf(m, InterfaceID))
+        return;
+    
+    if ((unsigned)(end - (mDNSu8 *)pkt) < sizeof(DNSMessageHeader))
+    {
+        debugf("ProxyCallbackCommon: DNS Message from %#a:%d to %#a:%d length %d too short", srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), end - (mDNSu8 *)pkt);
+        return;
+    }
+
+    QR_OP = (mDNSu8)(msg->h.flags.b[0] & kDNSFlag0_QROP_Mask);
+    if (QR_OP != kDNSFlag0_QR_Query)
+    {
+        LogInfo("ProxyCallbackCommon: Not a query(%d) for pkt from %#a:%d", QR_OP, srcaddr, mDNSVal16(srcport));
+        SendError(m, socket, pkt, end, srcaddr, srcport, InterfaceID, tcp, context, kDNSFlag1_RC_NotImpl);
+        return;
+    }
+
+    // Read the integer parts which are in IETF byte-order (MSB first, LSB second)
+    ptr = (mDNSu8 *)&msg->h.numQuestions;
+    msg->h.numQuestions   = (mDNSu16)((mDNSu16)ptr[0] << 8 | ptr[1]);
+    msg->h.numAnswers     = (mDNSu16)((mDNSu16)ptr[2] << 8 | ptr[3]);
+    msg->h.numAuthorities = (mDNSu16)((mDNSu16)ptr[4] << 8 | ptr[5]);
+    msg->h.numAdditionals = (mDNSu16)((mDNSu16)ptr[6] << 8 | ptr[7]);
+
+    if (msg->h.numQuestions != 1 || msg->h.numAnswers || msg->h.numAuthorities)
+    {
+        LogInfo("ProxyCallbackCommon: Malformed pkt from %#a:%d, Q:%d, An:%d, Au:%d", srcaddr, mDNSVal16(srcport),
+            msg->h.numQuestions, msg->h.numAnswers, msg->h.numAuthorities);
+        SendError(m, socket, pkt, end, srcaddr, srcport, InterfaceID, tcp, context, kDNSFlag1_RC_FormErr);
+        return;
+    }
+    ptr = msg->data;
+    ptr = getQuestion(msg, ptr, end, InterfaceID, &q);
+    if (!ptr)
+    {
+        LogInfo("ProxyCallbackCommon: Question cannot be parsed for pkt from %#a:%d", srcaddr, mDNSVal16(srcport));
+        SendError(m, socket, pkt, end, srcaddr, srcport, InterfaceID, tcp, context, kDNSFlag1_RC_FormErr);
+        return;
+    }
+    else
+    {
+        LogInfo("ProxyCallbackCommon: Question %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+    }
+    ptr = LocateOptRR(msg, end, 0);
+    if (ptr)
+    {
+        optRR = ptr;
+        ptr = skipResourceRecord(msg, ptr, end);
+        // Be liberal and ignore the EDNS0 option if we can't parse it properly
+        if (!ptr)
+        {
+            LogInfo("ProxyCallbackCommon: EDNS0 cannot be parsed for pkt from %#a:%d, ignoring", srcaddr, mDNSVal16(srcport));
+        }
+        else
+        {
+            optLen = ptr - optRR;
+            LogInfo("ProxyCallbackCommon: EDNS0 opt length %d present in Question %##s (%s)", optLen, q.qname.c, DNSTypeName(q.qtype));
+        }
+    }
+    else
+    {
+        LogInfo("ProxyCallbackCommon: EDNS0 opt not present in Question %##s (%s), ptr %p", q.qname.c, DNSTypeName(q.qtype), ptr);
+    }
+        
+    qptr = IsDuplicateClient(m, srcaddr, srcport, msg->h.id, &q);
+    if (qptr)
+    {
+        LogInfo("ProxyCallbackCommon: Found a duplicate for pkt from %#a:%d, ignoring this", srcaddr, mDNSVal16(srcport));
+        return;
+    }
+    pc = mDNSPlatformMemAllocate(sizeof(DNSProxyClient));
+    if (!pc)
+    {
+        LogMsg("ProxyCallbackCommon: Memory failure for pkt from %#a:%d, ignoring this", srcaddr, mDNSVal16(srcport));
+        return;
+    }
+    mDNSPlatformMemZero(pc, sizeof(DNSProxyClient));
+    pc->addr = *srcaddr;
+    pc->port = srcport;
+    pc->msgid = msg->h.id;
+    pc->interfaceID = InterfaceID; // input interface 
+    pc->socket = socket;
+    pc->tcp = tcp;
+    pc->requestFlags = msg->h.flags;
+    pc->context = context;
+    AssignDomainName(&pc->qname, &q.qname);
+    if (optRR)
+    {
+        if (!ParseEDNS0(pc, optRR, optLen, end))
+        {
+            LogInfo("ProxyCallbackCommon: Invalid EDNS0 option for pkt from %#a:%d, ignoring this", srcaddr, mDNSVal16(srcport));
+        }
+        else
+        {
+            pc->optRR = mDNSPlatformMemAllocate(optLen);
+            if (!pc->optRR)
+            {
+                LogMsg("ProxyCallbackCommon: Memory failure for pkt from %#a:%d, ignoring this", srcaddr, mDNSVal16(srcport));
+                FreeDNSProxyClient(pc);
+                return;
+            }
+            mDNSPlatformMemCopy(pc->optRR, optRR, optLen);
+            pc->optLen = optLen;
+        }
+    }
+
+    debugf("ProxyCallbackCommon: DNS Query forwarding to interface index %d", m->dp_opintf);
+    mDNS_SetupQuestion(&pc->q, (mDNSInterfaceID)(unsigned long)m->dp_opintf, &q.qname, q.qtype, ProxyClientCallback, pc);
+    pc->q.TimeoutQuestion = 1;
+    // Even though we don't care about intermediate responses, set ReturnIntermed so that
+    // we get the negative responses
+    pc->q.ReturnIntermed  = mDNStrue;
+    pc->q.ProxyQuestion   = mDNStrue;
+    pc->q.ProxyDNSSECOK   = pc->DNSSECOK;
+    pc->q.responseFlags   = zeroID;
+    if (pc->DNSSECOK)
+    {
+        if (!(msg->h.flags.b[1] & kDNSFlag1_CD) && pc->q.qtype != kDNSType_RRSIG && pc->q.qtype != kDNSQType_ANY)
+        {
+            LogInfo("ProxyCallbackCommon: Setting Validation required bit for %#a:%d, validating %##s (%s)", srcaddr, mDNSVal16(srcport),
+                q.qname.c, DNSTypeName(q.qtype));
+            pc->q.ValidationRequired = DNSSEC_VALIDATION_SECURE;
+        }
+        else
+        {
+            LogInfo("ProxyCallbackCommon: CD bit not set OR not a valid type for %#a:%d, not validating %##s (%s)", srcaddr, mDNSVal16(srcport),
+                q.qname.c, DNSTypeName(q.qtype));
+        }
+    }
+    else
+    {
+        LogInfo("ProxyCallbackCommon: DNSSEC OK bit not set for %#a:%d, not validating %##s (%s)", srcaddr, mDNSVal16(srcport),
+                q.qname.c, DNSTypeName(q.qtype));
+    }
+
+    while (*ppc)
+        ppc = &((*ppc)->next);
+    *ppc = pc;
+
+    mDNS_StartQuery(m, &pc->q);
+}
+
+mDNSexport void ProxyUDPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+    const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context)
+{
+    LogInfo("ProxyUDPCallback: DNS Message from %#a:%d to %#a:%d length %d", srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), end - (mDNSu8 *)pkt);
+    ProxyCallbackCommon(m, socket, pkt, end, srcaddr, srcport, dstaddr, dstport, InterfaceID, mDNSfalse, context);
+}
+
+mDNSexport void ProxyTCPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+    const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context)
+{
+    LogInfo("ProxyTCPCallback: DNS Message from %#a:%d to %#a:%d length %d", srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), end - (mDNSu8 *)pkt);
+    // If the connection was closed from the other side, locate the client
+    // state and free it.
+    if ((end - (mDNSu8 *)pkt) == 0)
+    {
+        DNSProxyClient **ppc = &DNSProxyClients;
+        DNSProxyClient **prevpc;
+
+        prevpc = ppc;
+        while (*ppc && (*ppc)->socket != socket)
+        {
+            prevpc = ppc;
+            ppc=&(*ppc)->next;
+        }
+        if (!*ppc)
+        {
+            mDNSPlatformDisposeProxyContext(socket);
+            LogMsg("ProxyTCPCallback: socket cannot be found");
+            return;
+        }
+        *prevpc = (*ppc)->next;
+        LogInfo("ProxyTCPCallback: free");
+        mDNSPlatformDisposeProxyContext(socket);
+        FreeDNSProxyClient(*ppc);
+        return;
+    }
+    ProxyCallbackCommon(m, socket, pkt, end, srcaddr, srcport, dstaddr, dstport, InterfaceID, mDNStrue, context);
+}
+
+mDNSexport void DNSProxyInit(mDNS *const m, mDNSu32 IpIfArr[MaxIp], mDNSu32 OpIf)
+{
+    int i;
+
+    // Store DNSProxy Interface fields in mDNS struct
+    for (i = 0; i < MaxIp; i++)
+        m->dp_ipintf[i]  = IpIfArr[i];
+    m->dp_opintf         = OpIf;
+
+    LogInfo("DNSProxyInit Storing interface list: Input [%d, %d, %d, %d, %d] Output [%d]", m->dp_ipintf[0],
+            m->dp_ipintf[1], m->dp_ipintf[2], m->dp_ipintf[3], m->dp_ipintf[4], m->dp_opintf);
+}
+
+mDNSexport void DNSProxyTerminate(mDNS *const m)
+{
+    int i;
+    
+    // Clear DNSProxy Interface fields from mDNS struct
+    for (i = 0; i < MaxIp; i++)
+        m->dp_ipintf[i]  = 0;
+    m->dp_opintf         = 0; 
+    
+    LogInfo("DNSProxyTerminate Cleared interface list: Input [%d, %d, %d, %d, %d] Output [%d]", m->dp_ipintf[0],
+            m->dp_ipintf[1], m->dp_ipintf[2], m->dp_ipintf[3], m->dp_ipintf[4], m->dp_opintf);
+}
+#else // UNICAST_DISABLED
+
+mDNSexport void ProxyUDPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context)
+{
+    (void) m;
+    (void) socket;
+    (void) pkt;
+    (void) end;
+    (void) srcaddr;
+    (void) srcport;
+    (void) dstaddr;
+    (void) dstport;
+    (void) InterfaceID;
+    (void) context;
+}
+
+mDNSexport void ProxyTCPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context)
+{
+    (void) m;
+    (void) socket;
+    (void) pkt;
+    (void) end;
+    (void) srcaddr;
+    (void) srcport;
+    (void) dstaddr;
+    (void) dstport;
+    (void) InterfaceID;
+    (void) context;
+}
+
+mDNSexport void DNSProxyInit(mDNS *const m, mDNSu32 IpIfArr[MaxIp], mDNSu32 OpIf)
+{
+    (void) m;
+    (void) IpIfArr;
+    (void) OpIf;
+}
+extern void DNSProxyTerminate(mDNS *const m)
+{
+    (void) m;
+}
+
+
+#endif // UNICAST_DISABLED
diff --git a/mDNSResponder/mDNSCore/dnsproxy.h b/mDNSResponder/mDNSCore/dnsproxy.h
new file mode 100644
index 00000000..ed46a125
--- /dev/null
+++ b/mDNSResponder/mDNSCore/dnsproxy.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __DNS_PROXY_H
+#define __DNS_PROXY_H
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+
+extern void ProxyUDPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+                             const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context);
+extern void ProxyTCPCallback(mDNS *const m, void *socket, void *const pkt, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+                             const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context);                          
+extern void DNSProxyInit(mDNS *const m, mDNSu32 IpIfArr[MaxIp], mDNSu32 OpIf);
+extern void DNSProxyTerminate(mDNS *const m);
+
+#endif // __DNS_PROXY_H
diff --git a/mDNSResponder/mDNSCore/dnssec.c b/mDNSResponder/mDNSCore/dnssec.c
new file mode 100644
index 00000000..c83b8413
--- /dev/null
+++ b/mDNSResponder/mDNSCore/dnssec.c
@@ -0,0 +1,4111 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "mDNSEmbeddedAPI.h"
+#include "DNSSECSupport.h"
+#include "DNSCommon.h"
+#include "dnssec.h"
+#include "CryptoAlg.h"
+#include "nsec.h"
+#include "nsec3.h"
+
+// Define DNSSEC_DISABLED to remove all the DNSSEC functionality
+// and use the stub functions implemented later in this file.
+
+#ifndef DNSSEC_DISABLED
+
+//#define DNSSEC_DEBUG
+
+#ifdef DNSSEC_DEBUG
+#define debugdnssec LogMsg
+#else
+#define debugdnssec debug_noop
+#endif
+//
+// Implementation Notes
+//
+// The entry point to DNSSEC Verification is VerifySignature. This function is called from the "core" when
+// the answer delivered to the application needs DNSSEC validation. If a question needs DNSSEC
+// validation, "ValidationRequired" would be set. As we need to issue more queries to validate the
+// original question, we create another question as part of the verification process (question is part of
+// DNSSECVerifier). This question sets "ValidatingResponse" to distinguish itself from the original
+// question. Without this, it will be a duplicate and never sent out. The "core" almost treats both the
+// types identically (like adding EDNS0 option with DO bit etc.) except for a few differences. When RRSIGs
+// are added to the cache, "ValidatingResponse" question gets called back as long as the typeCovered matches
+// the question's qtype. See the comment in DNSSECRecordAnswersQuestion for the details. The other big
+// difference is that "ValidationRequired" question kicks off the verification process by calling into
+// "VerifySignature" whereas ValidationResponse don't do that as it gets callback for its questions.
+//
+// VerifySignature does not retain the original question that started the verification process. It just
+// remembers the name and the type. It takes a snapshot of the cache at that instance which will be
+// verified using DNSSEC. If the cache changes subsequently e.g., network change etc., it will be detected
+// when the validation is completed. If there is a change, it will be revalidated.
+//
+// The verification flow looks like this:
+//
+// VerifySignature -> StartDNSSECVerification - GetAllRRSetsForVerification -> FinishDNSSECVerification -> VerifySignature
+//
+// Verification is a recursive process. It stops when we find a trust anchor or if we have recursed too deep.
+//
+// If the original question resulted in NODATA/NXDOMAIN error, there should have been NSECs as part of the response.
+// These nsecs are cached along with the negative cache record. These are validated using ValidateWithNSECS called
+// from Verifysignature.
+//
+// The flow in this case looks like this:
+//
+// VerifySignature -> ValidateWithNSECS -> {NoDataProof, NameErrorProof} -> VerifyNSECS -> StartDNSSECVerification
+//
+// Once the DNSSEC verification is started, it is similar to the previous flow described above. When the verification
+// is done, DNSSECPositiveValidationCB or DNSSECNegativeValidationCB will be called which will then deliver the
+// validation results to the original question that started the validation.
+//
+// Insecure proofs are done when the verification ends up bogus. The flow would look like this
+//
+// VerifySignature -> StartDNSSECVerification - GetAllRRSetsForVerification -> FinishDNSSECVerification -> DNSSECValidationCB
+// {DNSSECPositiveValidationCB, DNSSECNegativeValidationCB} -> ProveInsecure -> VerifySignaure ->
+//
+// ProveInsecure finds the break in trust in a top-down fashion.
+//
+// Forward declaration
+mDNSlocal void VerifySigCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord);
+mDNSlocal mStatus TrustedKey(mDNS *const m, DNSSECVerifier *dv);
+mDNSlocal mDNSBool TrustedKeyPresent(mDNS *const m, DNSSECVerifier *dv);
+mDNSlocal mStatus ValidateDS(DNSSECVerifier *dv);
+mDNSlocal void DNSSECNegativeValidationCB(mDNS *const m, DNSSECVerifier *dv, CacheGroup *cg, ResourceRecord *answer, DNSSECStatus status);
+mDNSlocal RRVerifier* CopyRRVerifier(RRVerifier *from);
+
+// Currently we use this to convert a RRVerifier to resource record so that we can
+// use the standard DNS utility functions
+LargeCacheRecord largerec;
+
+// Verification is a recursive process. We arbitrarily limit to 10 just to be cautious which should be
+// removed in the future.
+#define MAX_RECURSE_COUNT   10
+
+// TTL (in seconds) when the DNSSEC status is Bogus
+#define RR_BOGUS_TTL        60
+
+// RFC 4034 Appendix B: Get the keyid of a DNS KEY. It is not transmitted
+// explicitly on the wire.
+//
+// Note: This just helps narrow down the list of keys to look at. It is possible
+// for two DNS keys to have the same ID i.e., key ID is not a unqiue tag
+//
+// 1st argument - the RDATA part of the DNSKEY RR
+// 2nd argument - the RDLENGTH
+//
+mDNSlocal mDNSu32 keytag(mDNSu8 *key, mDNSu32 keysize)
+{
+    unsigned long ac;
+    unsigned int i;
+
+    // DST_ALG_RSAMD5 will be rejected automatically as the keytag
+    // is calculated wrongly
+
+    for (ac = 0, i = 0; i < keysize; ++i)
+        ac += (i & 1) ? key[i] : key[i] << 8;
+    ac += (ac >> 16) & 0xFFFF;
+    return ac & 0xFFFF;
+}
+
+mDNSexport int DNSMemCmp(const mDNSu8 *const m1, const mDNSu8 *const m2, int len)
+{
+    int res;
+
+    res = mDNSPlatformMemCmp(m1, m2, len);
+    if (res != 0)
+        return (res < 0 ? -1 : 1);
+    return 0;
+}
+
+// RFC 4034:
+//
+// Section 6.1:
+//
+// For the purposes of DNS security, owner names are ordered by treating
+// individual labels as unsigned left-justified octet strings.  The
+// absence of a octet sorts before a zero value octet, and uppercase
+// US-ASCII letters are treated as if they were lowercase US-ASCII
+// letters.
+//
+// To compute the canonical ordering of a set of DNS names, start by
+// sorting the names according to their most significant (rightmost)
+// labels.  For names in which the most significant label is identical,
+// continue sorting according to their next most significant label, and
+// so forth.
+//
+// Returns 0 if the names are same
+// Returns -1 if d1 < d2
+// Returns  1 if d1 > d2
+//
+// subdomain is set if there is at least one label match (starting from the end)
+// and d1 has more labels than d2 e.g., a.b.com is a subdomain of b.com
+//
+mDNSexport int DNSSECCanonicalOrder(const domainname *const d1, const domainname *const d2, int *subdomain)
+{
+    int count, c1, c2;
+    int i, skip1, skip2;
+
+    c1 = CountLabels(d1);
+    skip1 = c1 - 1;
+    c2 = CountLabels(d2);
+    skip2 = c2 - 1;
+
+    if (subdomain) *subdomain = 0;
+
+    // Compare as many labels as possible starting from the rightmost
+    count = c1 < c2 ? c1 : c2;
+    for (i = count; i > 0; i--)
+    {
+        mDNSu8 *a, *b;
+        int j, len, lena, lenb;
+
+        a = (mDNSu8 *)SkipLeadingLabels(d1, skip1);
+        b = (mDNSu8 *)SkipLeadingLabels(d2, skip2);
+        lena = *a;
+        lenb = *b;
+        // Compare label by label. Note that "z" > "yak" because z > y, but z < za
+        // (lena - lenb check below) because 'za' has two characters. Hence compare the
+        // letters first and then compare the length of the label at the end.
+        len = lena < lenb ? lena : lenb;
+        a++; b++;
+        for (j = 0; j < len; j++)
+        {
+            mDNSu8 ac = *a++;
+            mDNSu8 bc = *b++;
+            if (mDNSIsUpperCase(ac)) ac += 'a' - 'A';
+            if (mDNSIsUpperCase(bc)) bc += 'a' - 'A';
+            if (ac != bc)
+            {
+                verbosedebugf("DNSSECCanonicalOrder: returning ac %c, bc %c", ac, bc);
+                return ((ac < bc) ? -1 : 1);
+            }
+        }
+        if ((lena - lenb) != 0)
+        {
+            verbosedebugf("DNSSECCanonicalOrder: returning lena %d lenb %d", lena, lenb);
+            return ((lena < lenb) ? -1 : 1);
+        }
+
+        // Continue with the next label
+        skip1--;
+        skip2--;
+    }
+    // We have compared label by label. Both of them are same if we are here.
+    //
+    // Two possibilities.
+    //
+    // 1) Both names have same number of labels. In that case, return zero.
+    // 2) The number of labels is not same. As zero label sorts before, names
+    //    with more number of labels is greater.
+
+    // a.b.com is a subdomain of b.com
+    if ((c1 > c2) && subdomain)
+        *subdomain = 1;
+
+    verbosedebugf("DNSSECCanonicalOrder: returning c1 %d c2 %d\n", c1, c2);
+    if (c1 != c2)
+        return ((c1 < c2) ? -1 : 1);
+    else
+        return 0;
+}
+
+// Initialize the question enough so that it can be answered from the cache using SameNameRecordAnswersQuestion or
+// ResourceRecordAnswersQuestion.
+mDNSexport void InitializeQuestion(mDNS *const m, DNSQuestion *question, mDNSInterfaceID InterfaceID, const domainname *qname,
+                                   mDNSu16 qtype, mDNSQuestionCallback *callback, void *context)
+{
+    debugf("InitializeQuestion: Called for %##s (%s)", qname->c, DNSTypeName(qtype));
+
+    if (question->ThisQInterval != -1) mDNS_StopQuery(m, question);
+
+    mDNS_SetupQuestion(question, InterfaceID, qname, qtype, callback, context);
+    question->qnamehash  = DomainNameHashValue(qname);
+    question->ValidatingResponse = mDNStrue;
+
+    // Need to hold the lock, as GetServerForQuestion (its callers) references m->timenow.
+    mDNS_Lock(m);
+    // We need to set the DNS server appropriately to match the question against the cache record.
+    // Though not all callers of this function need it, we always do it to keep it simple.
+    SetValidDNSServers(m, question);
+    question->qDNSServer = GetServerForQuestion(m, question);
+    mDNS_Unlock(m);
+
+    // Make it look like unicast
+    question->TargetQID = onesID;
+    question->TimeoutQuestion = 1;
+    question->ReturnIntermed = 1;
+    // SetupQuestion sets LongLived if qtype == PTR
+    question->LongLived = 0;
+}
+
+mDNSexport DNSSECVerifier *AllocateDNSSECVerifier(mDNS *const m, const domainname *name, mDNSu16 rrtype, mDNSInterfaceID InterfaceID,
+    mDNSu8 ValidationRequired, DNSSECVerifierCallback dvcallback, mDNSQuestionCallback qcallback)
+{
+    DNSSECVerifier *dv;
+
+    dv = (DNSSECVerifier *)mDNSPlatformMemAllocate(sizeof(DNSSECVerifier));
+    if (!dv) { LogMsg("AllocateDNSSECVerifier: ERROR!! memory alloc failed"); return mDNSNULL; }
+    mDNSPlatformMemZero(dv, sizeof(*dv));
+
+    LogDNSSEC("AllocateDNSSECVerifier called %p", dv);
+
+    // Remember the question's name and type so that when we are done processing all
+    // the verifications, we can trace the original question back
+    AssignDomainName(&dv->origName, name);
+    dv->origType = rrtype;
+    dv->InterfaceID = InterfaceID;
+    dv->DVCallback = dvcallback;
+    dv->q.ThisQInterval = -1;
+    ResetAuthChain(dv);
+    // These two are used for Insecure proof if we end up doing it.
+    // -Value of ValidationRequired so that we know whether this is a secure or insecure validation
+    // -InsecureProofDone tells us whether the proof has been done or not
+    dv->ValidationRequired = ValidationRequired;
+    dv->InsecureProofDone = 0;
+    dv->NumPackets = 0;
+    mDNS_Lock(m);
+    dv->StartTime = m->timenow;
+    mDNS_Unlock(m);
+    // The verifier's question has to be initialized as some of the callers assume it
+    InitializeQuestion(m, &dv->q, InterfaceID, name, rrtype, qcallback, dv);
+    return dv;
+}
+
+mDNSlocal AuthChain *AuthChainCopy(AuthChain *ae)
+{
+    RRVerifier *rvfrom, **rvto;
+    AuthChain **prev = mDNSNULL;
+    AuthChain *retac = mDNSNULL;
+    AuthChain *ac;
+
+
+    while (ae)
+    {
+        ac = mDNSPlatformMemAllocate(sizeof(AuthChain));
+        if (!ac)
+        {
+            LogMsg("AuthChainCopy: AuthChain alloc failure");
+            return mDNSfalse;
+        }
+
+        ac->next  = mDNSNULL;
+
+        if (!retac)
+            retac = ac;
+
+        rvfrom = ae->rrset;
+        rvto = &ac->rrset;
+        while (rvfrom)
+        {
+            *rvto = CopyRRVerifier(rvfrom);
+            rvfrom = rvfrom->next;
+            rvto = &((*rvto)->next);
+        }
+
+        rvfrom = ae->rrsig;
+        rvto = &ac->rrsig;
+        while (rvfrom)
+        {
+            *rvto = CopyRRVerifier(rvfrom);
+            rvfrom = rvfrom->next;
+            rvto = &((*rvto)->next);
+        }
+
+        rvfrom = ae->key;
+        rvto = &ac->key;
+        while (rvfrom)
+        {
+            *rvto = CopyRRVerifier(rvfrom);
+            rvfrom = rvfrom->next;
+            rvto = &((*rvto)->next);
+        }
+
+        if (prev)
+        {
+            *prev = ac;
+        }
+        prev = &(ac->next);
+        ae = ae->next;
+    }
+    return retac;
+}
+
+mDNSlocal void FreeDNSSECAuthChainInfo(AuthChain *ac)
+{
+    RRVerifier *rrset;
+    RRVerifier *next;
+    AuthChain *acnext;
+
+    LogDNSSEC("FreeDNSSECAuthChainInfo: called");
+
+    while (ac)
+    {
+        acnext = ac->next;
+        rrset = ac->rrset;
+        while (rrset)
+        {
+            next = rrset->next;
+            mDNSPlatformMemFree(rrset);
+            rrset = next;
+        }
+        ac->rrset = mDNSNULL;
+
+        rrset = ac->rrsig;
+        while (rrset)
+        {
+            next = rrset->next;
+            mDNSPlatformMemFree(rrset);
+            rrset = next;
+        }
+        ac->rrsig = mDNSNULL;
+
+        rrset = ac->key;
+        while (rrset)
+        {
+            next = rrset->next;
+            mDNSPlatformMemFree(rrset);
+            rrset = next;
+        }
+        ac->key = mDNSNULL;
+
+        mDNSPlatformMemFree(ac);
+        ac = acnext;
+    }
+}
+
+mDNSlocal void FreeDNSSECAuthChain(DNSSECVerifier *dv)
+{
+    if (dv->ac)
+    {
+        FreeDNSSECAuthChainInfo(dv->ac);
+        // if someone reuses the "dv", it will be initialized properly
+        ResetAuthChain(dv);
+    }
+    if (dv->saveac)
+    {
+        FreeDNSSECAuthChainInfo(dv->saveac);
+        dv->saveac = mDNSNULL;
+    }
+}
+
+mDNSlocal void FreeAuthChain(mDNS *const m, void *context)
+{
+    AuthChain *ac = (AuthChain *)context;
+    (void) m; // unused
+
+    FreeDNSSECAuthChainInfo(ac);
+}
+
+mDNSlocal void FreeDNSSECVerifierRRSets(DNSSECVerifier *dv)
+{
+    RRVerifier *rrset;
+    RRVerifier *next;
+
+    //debugdnssec("FreeDNSSECVerifierRRSets called %p", dv);
+    rrset = dv->rrset;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->rrset = mDNSNULL;
+
+    rrset = dv->rrsig;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->rrsig = mDNSNULL;
+
+    rrset = dv->key;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->key = mDNSNULL;
+
+    rrset = dv->rrsigKey;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->rrsigKey = mDNSNULL;
+
+    rrset = dv->ds;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->ds = mDNSNULL;
+    rrset = dv->pendingNSEC;
+    while (rrset)
+    {
+        next = rrset->next;
+        mDNSPlatformMemFree(rrset);
+        rrset = next;
+    }
+    dv->pendingNSEC = mDNSNULL;
+}
+
+mDNSexport void FreeDNSSECVerifier(mDNS *const m, DNSSECVerifier *dv)
+{
+    LogDNSSEC("FreeDNSSECVerifier called %p", dv);
+    if (dv->q.ThisQInterval != -1)
+        mDNS_StopQuery(m, &dv->q);
+    FreeDNSSECVerifierRRSets(dv);
+    if (dv->ctx)
+        AlgDestroy(dv->ctx);
+    if (dv->ac || dv->saveac)
+        FreeDNSSECAuthChain(dv);
+    if (dv->parent)
+    {
+        LogDNSSEC("FreeDNSSECVerifier freeing parent %p", dv->parent);
+        FreeDNSSECVerifier(m, dv->parent);
+    }
+    mDNSPlatformMemFree(dv);
+}
+
+mDNSlocal RRVerifier* CopyRRVerifier(RRVerifier *from)
+{
+    RRVerifier *r;
+
+    r = mDNSPlatformMemAllocate(sizeof (RRVerifier) + from->rdlength);
+    if (!r)
+    {
+        LogMsg("CopyRRVerifier: memory failure");
+        return mDNSNULL;
+    }
+    mDNSPlatformMemCopy(r, from, sizeof(RRVerifier));
+    r->next = mDNSNULL;
+    r->rdata = (mDNSu8*) ((mDNSu8 *)r + sizeof(RRVerifier));
+    mDNSPlatformMemCopy(r->rdata, from->rdata, r->rdlength);
+    return r;
+}
+
+mDNSexport RRVerifier* AllocateRRVerifier(const ResourceRecord *const rr, mStatus *status)
+{
+    RRVerifier *r;
+
+    r = mDNSPlatformMemAllocate(sizeof (RRVerifier) + rr->rdlength);
+    if (!r)
+    {
+        LogMsg("AllocateRRVerifier: memory failure");
+        *status = mStatus_NoMemoryErr;
+        return mDNSNULL;
+    }
+    r->next = mDNSNULL;
+    r->rrtype = rr->rrtype;
+    r->rrclass = rr->rrclass;
+    r->rroriginalttl = rr->rroriginalttl;
+    r->rdlength = rr->rdlength;
+    r->namehash = rr->namehash;
+    r->rdatahash = rr->rdatahash;
+    AssignDomainName(&r->name, rr->name);
+    r->rdata = (mDNSu8*) ((mDNSu8 *)r + sizeof(RRVerifier));
+
+    // When we parsed the DNS response in GeLargeResourceRecord, for some records, we parse them into
+    // host order so that the rest of the code does not have to bother with converting from network order
+    // to host order. For signature verification, we need them back in network order. For DNSSEC records
+    // like DNSKEY and DS, we just copy over the data both in GetLargeResourceRecord and putRData.
+
+    if (!putRData(mDNSNULL, r->rdata, r->rdata + rr->rdlength, rr))
+    {
+        LogMsg("AllocateRRVerifier: putRData failed");
+        *status = mStatus_BadParamErr;
+        return mDNSNULL;
+    }
+    *status = mStatus_NoError;
+    return r;
+}
+
+mDNSexport mStatus AddRRSetToVerifier(DNSSECVerifier *dv, const ResourceRecord *const rr, RRVerifier *rv, RRVerifierSet set)
+{
+    RRVerifier *r;
+    RRVerifier **v;
+    mStatus status;
+
+    if (!rv)
+    {
+        r = AllocateRRVerifier(rr, &status);
+        if (!r) return status;
+    }
+    else
+        r = rv;
+
+    switch (set)
+    {
+    case RRVS_rr:
+        v = &dv->rrset;
+        break;
+    case RRVS_rrsig:
+        v = &dv->rrsig;
+        break;
+    case RRVS_key:
+        v = &dv->key;
+        break;
+    case RRVS_rrsig_key:
+        v = &dv->rrsigKey;
+        break;
+    case RRVS_ds:
+        v = &dv->ds;
+        break;
+    default:
+        LogMsg("AddRRSetToVerifier: ERROR!! default case %d", set);
+        return mStatus_BadParamErr;
+    }
+    while (*v)
+        v = &(*v)->next;
+    *v = r;
+    return mStatus_NoError;
+}
+
+// Validate the RRSIG. "type" tells which RRSIG that we are supposed to validate. We fetch RRSIG for
+// the rrset (type is RRVS_rrsig) and RRSIG for the key (type is RRVS_rrsig_key).
+mDNSexport void ValidateRRSIG(DNSSECVerifier *dv, RRVerifierSet type, const ResourceRecord *const rr)
+{
+    RRVerifier *rv;
+    mDNSu32 currentTime;
+    rdataRRSig *rrsigRData = (rdataRRSig *)((mDNSu8 *)rr->rdata + sizeofRDataHeader);
+
+    if (type == RRVS_rrsig)
+    {
+        rv = dv->rrset;
+    }
+    else if (type == RRVS_rrsig_key)
+    {
+        rv = dv->key;
+    }
+    else
+    {
+        LogMsg("ValidateRRSIG: ERROR!! type not valid %d", type);
+        return;
+    }
+
+    // RFC 4035:
+    // For each authoritative RRset in a signed zone, there MUST be at least
+    // one RRSIG record that meets the following requirements:
+    //
+    // RRSet is defined by same name, class and type
+    //
+    // 1. The RRSIG RR and the RRset MUST have the same owner name and the same class.
+    if (!SameDomainName(&rv->name, rr->name) || (rr->rrclass != rv->rrclass))
+    {
+        debugdnssec("ValidateRRSIG: name mismatch or class mismatch");
+        return;
+    }
+
+    // 2. The RRSIG RR's Type Covered field MUST equal the RRset's type.
+    if ((swap16(rrsigRData->typeCovered)) != rv->rrtype)
+    {
+        debugdnssec("ValidateRRSIG: typeCovered mismatch rrsig %d, rr type %d", swap16(rrsigRData->typeCovered), rv->rrtype);
+        return;
+    }
+
+    // 3. The number of labels in the RRset owner name MUST be greater than or equal
+    //    to the value in the RRSIG RR's Labels field.
+    if (rrsigRData->labels > CountLabels(&rv->name))
+    {
+        debugdnssec("ValidateRRSIG: labels count problem rrsig %d, rr %d", rrsigRData->labels, CountLabels(&rv->name));
+        return;
+    }
+
+    // 4. The RRSIG RR's Signer's Name field MUST be the name of the zone that contains
+    //    the RRset. For a stub resolver, this can't be done in a secure way. Hence we
+    //    do it this way (discussed in dnsext mailing list)
+    switch (rv->rrtype)
+    {
+    case kDNSType_NS:
+    case kDNSType_SOA:
+    case kDNSType_DNSKEY:
+        //Signed by the owner
+        if (!SameDomainName(&rv->name, (domainname *)&rrsigRData->signerName))
+        {
+            debugdnssec("ValidateRRSIG: Signer Name does not match the record name for %s", DNSTypeName(rv->rrtype));
+            return;
+        }
+        break;
+    case kDNSType_DS:
+        // Should be signed by the parent
+        if (SameDomainName(&rv->name, (domainname *)&rrsigRData->signerName))
+        {
+            debugdnssec("ValidateRRSIG: Signer Name matches the record name for %s", DNSTypeName(rv->rrtype));
+            return;
+        }
+    // FALLTHROUGH
+    default:
+    {
+        int c1 = CountLabels(&rv->name);
+        int c2 = CountLabels((domainname *)&rrsigRData->signerName);
+        if (c1 < c2)
+        {
+            debugdnssec("ValidateRRSIG: Signer Name not a subdomain label count %d < %d ", c1, c2);
+            return;
+        }
+        domainname *d = (domainname *)SkipLeadingLabels(&rv->name, c1 - c2);
+        if (!SameDomainName(d, (domainname *)&rrsigRData->signerName))
+        {
+            debugdnssec("ValidateRRSIG: Signer Name not a subdomain");
+            return;
+        }
+        break;
+    }
+    }
+
+    // 5. The validator's notion of the current time MUST be less than or equal to the
+    //    time listed in the RRSIG RR's Expiration field.
+    //
+    // 6. The validator's notion of the current time MUST be greater than or equal to the
+    //    time listed in the RRSIG RR's Inception field.
+    currentTime = mDNSPlatformUTC();
+
+    if (DNS_SERIAL_LT(swap32(rrsigRData->sigExpireTime), currentTime))
+    {
+        LogDNSSEC("ValidateRRSIG: Expired: currentTime %d, ExpireTime %d", (int)currentTime,
+                  swap32((int)rrsigRData->sigExpireTime));
+        return;
+    }
+    if (DNS_SERIAL_LT(currentTime, swap32(rrsigRData->sigInceptTime)))
+    {
+        LogDNSSEC("ValidateRRSIG: Future: currentTime %d, InceptTime %d", (int)currentTime,
+                  swap32((int)rrsigRData->sigInceptTime));
+        return;
+    }
+
+    if (AddRRSetToVerifier(dv, rr, mDNSNULL, type) != mStatus_NoError)
+    {
+        LogMsg("ValidateRRSIG: ERROR!! cannot allocate RRSet");
+        return;
+    }
+}
+
+mDNSlocal mStatus CheckRRSIGForRRSet(mDNS *const m, DNSSECVerifier *dv, CacheRecord **negcr)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    RRVerifier *rv;
+    mDNSBool expectRRSIG = mDNSfalse;
+
+    *negcr = mDNSNULL;
+    if (!dv->rrset)
+    {
+        LogMsg("CheckRRSIGForRRSet: ERROR!! rrset NULL for origName %##s (%s)", dv->origName.c,
+               DNSTypeName(dv->origType));
+        return mStatus_BadParamErr;
+    }
+
+    rv = dv->rrset;
+    slot = HashSlot(&rv->name);
+    cg = CacheGroupForName(m, slot, rv->namehash, &rv->name);
+    if (!cg)
+    {
+        debugdnssec("CheckRRSIGForRRSet: cg null");
+        return mStatus_NoSuchRecord;
+    }
+
+    for (cr=cg->members; cr; cr=cr->next)
+    {
+        debugdnssec("CheckRRSIGForRRSet: checking the validity of rrsig");
+        if (cr->resrec.rrtype != kDNSType_RRSIG)
+        {
+            // Check to see if we should expect RRSIGs for the type that we are looking for.
+            // We would expect RRSIGs, if we had previously issued the question with the
+            // EDNS0/DOK bit set.
+            if (cr->resrec.rrtype == dv->rrset->rrtype)
+            {
+                expectRRSIG = cr->CRDNSSECQuestion;
+                LogDNSSEC("CheckRRSIGForRRSet: %s RRSIG for %s", (expectRRSIG ? "Expecting" : "Not Expecting"), CRDisplayString(m, cr));
+            }
+            continue;
+        }
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            if (!(*negcr))
+            {
+                LogDNSSEC("CheckRRSIGForRRSet: Negative cache record %s encountered for %##s (%s)", CRDisplayString(m, cr),
+                          rv->name.c, DNSTypeName(rv->rrtype));
+                *negcr = cr;
+            }
+            else
+            {
+                LogMsg("CheckRRSIGForRRSet: ERROR!! Negative cache record %s already set for %##s (%s)", CRDisplayString(m, cr),
+                       rv->name.c, DNSTypeName(rv->rrtype));
+            }
+            continue;
+        }
+        ValidateRRSIG(dv, RRVS_rrsig, &cr->resrec);
+    }
+    if (*negcr && dv->rrsig)
+    {
+        // Encountered both RRSIG and negative CR
+        LogMsg("CheckRRSIGForRRSet: ERROR!! Encountered negative cache record %s and RRSIG for %##s (%s)",
+               CRDisplayString(m, *negcr), rv->name.c, DNSTypeName(rv->rrtype));
+        return mStatus_BadParamErr;
+    }
+    // If we can't find RRSIGs, but we find a negative response then we need to validate that
+    // which the caller will do it. Otherwise, if we should be expecting RRSIGs to be in the
+    // cache already, then return error.
+    if (dv->rrsig || *negcr)
+        return mStatus_NoError;
+    else if (expectRRSIG)
+        return mStatus_BadParamErr;
+    else
+        return mStatus_NoSuchRecord;
+}
+
+mDNSlocal void CheckOneKeyForRRSIG(DNSSECVerifier *dv, const ResourceRecord *const rr)
+{
+    rdataRRSig *rrsig;
+
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckOneKeyForRRSIG: ERROR!! rrsig NULL");
+        return;
+    }
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    if (!SameDomainName((domainname *)&rrsig->signerName, rr->name))
+    {
+        debugdnssec("CheckOneKeyForRRSIG: name mismatch");
+        return;
+    }
+
+    // We store all the keys including the ZSK and KSK and use them appropriately
+    // later
+    if (AddRRSetToVerifier(dv, rr, mDNSNULL, RRVS_key) != mStatus_NoError)
+    {
+        LogMsg("CheckOneKeyForRRSIG: ERROR!! cannot allocate RRSet");
+        return;
+    }
+}
+
+mDNSlocal mStatus CheckKeyForRRSIG(mDNS *const m, DNSSECVerifier *dv, CacheRecord **negcr)
+{
+    mDNSu32 slot;
+    mDNSu32 namehash;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    rdataRRSig *rrsig;
+    domainname *name;
+
+    *negcr = mDNSNULL;
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckKeyForRRSIG: ERROR!! rrsig NULL");
+        return mStatus_BadParamErr;
+    }
+
+    // Signer name should be the same on all rrsig ??
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    name = (domainname *)&rrsig->signerName;
+
+    slot = HashSlot(name);
+    namehash = DomainNameHashValue(name);
+    cg = CacheGroupForName(m, slot, namehash, name);
+    if (!cg)
+    {
+        debugdnssec("CheckKeyForRRSIG: cg null for %##s", name->c);
+        return mStatus_NoSuchRecord;
+    }
+
+    for (cr=cg->members; cr; cr=cr->next)
+    {
+        if (cr->resrec.rrtype != kDNSType_DNSKEY) continue;
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            if (!(*negcr))
+            {
+                LogDNSSEC("CheckKeyForRRSIG: Negative cache record %s encountered for %##s (DNSKEY)", CRDisplayString(m, cr),
+                          name->c);
+                *negcr = cr;
+            }
+            else
+            {
+                LogMsg("CheckKeyForRRSIG: ERROR!! Negative cache record %s already set for %##s (DNSKEY)", CRDisplayString(m, cr),
+                       name->c);
+            }
+            continue;
+        }
+        debugdnssec("CheckKeyForRRSIG: checking the validity of key record");
+        CheckOneKeyForRRSIG(dv, &cr->resrec);
+    }
+    if (*negcr && dv->key)
+    {
+        // Encountered both RRSIG and negative CR
+        LogMsg("CheckKeyForRRSIG: ERROR!! Encountered negative cache record %s and DNSKEY for %##s",
+               CRDisplayString(m, *negcr), name->c);
+        return mStatus_BadParamErr;
+    }
+    if (dv->key || *negcr)
+        return mStatus_NoError;
+    else
+        return mStatus_NoSuchRecord;
+}
+
+mDNSlocal void CheckOneRRSIGForKey(DNSSECVerifier *dv, const ResourceRecord *const rr)
+{
+    rdataRRSig *rrsig;
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckOneRRSIGForKey: ERROR!! rrsig NULL");
+        return;
+    }
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    if (!SameDomainName((domainname *)&rrsig->signerName, rr->name))
+    {
+        debugdnssec("CheckOneRRSIGForKey: name mismatch");
+        return;
+    }
+    ValidateRRSIG(dv, RRVS_rrsig_key, rr);
+}
+
+mDNSlocal mStatus CheckRRSIGForKey(mDNS *const m, DNSSECVerifier *dv, CacheRecord **negcr)
+{
+    mDNSu32 slot;
+    mDNSu32 namehash;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    rdataRRSig *rrsig;
+    domainname *name;
+    mDNSBool expectRRSIG = mDNSfalse;
+
+    *negcr = mDNSNULL;
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckRRSIGForKey: ERROR!! rrsig NULL");
+        return mStatus_BadParamErr;
+    }
+    if (!dv->key)
+    {
+        LogMsg("CheckRRSIGForKey:  ERROR!! key NULL");
+        return mStatus_BadParamErr;
+    }
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    name = (domainname *)&rrsig->signerName;
+
+    slot = HashSlot(name);
+    namehash = DomainNameHashValue(name);
+    cg = CacheGroupForName(m, slot, namehash, name);
+    if (!cg)
+    {
+        debugdnssec("CheckRRSIGForKey: cg null %##s", name->c);
+        return mStatus_NoSuchRecord;
+    }
+    for (cr=cg->members; cr; cr=cr->next)
+    {
+        if (cr->resrec.rrtype != kDNSType_RRSIG)
+        {
+            // Check to see if we should expect RRSIGs for the DNSKEY record that we are
+            // looking for. We would expect RRSIGs, if we had previously issued the question
+            // with the EDNS0/DOK bit set.
+            if (cr->resrec.rrtype == kDNSType_DNSKEY)
+            {
+                expectRRSIG = cr->CRDNSSECQuestion;
+                LogDNSSEC("CheckRRSIGForKey: %s RRSIG for %s", (expectRRSIG ? "Expecting" : "Not Expecting"), CRDisplayString(m, cr));
+            }
+            continue;
+        }
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            if (!(*negcr))
+            {
+                LogDNSSEC("CheckRRSIGForKey: Negative cache record %s encountered for %##s (RRSIG)", CRDisplayString(m, cr),
+                          name->c);
+                *negcr = cr;
+            }
+            else
+            {
+                LogMsg("CheckRRSIGForKey: ERROR!! Negative cache record %s already set for %##s (RRSIG)", CRDisplayString(m, cr),
+                       name->c);
+            }
+            continue;
+        }
+        debugdnssec("CheckRRSIGForKey: checking the validity of rrsig");
+        CheckOneRRSIGForKey(dv, &cr->resrec);
+    }
+    if (*negcr && dv->rrsigKey)
+    {
+        // Encountered both RRSIG and negative CR
+        LogMsg("CheckRRSIGForKey: ERROR!! Encountered negative cache record %s and DNSKEY for %##s",
+               CRDisplayString(m, *negcr), name->c);
+        return mStatus_BadParamErr;
+    }
+    // If we can't find RRSIGs, but we find a negative response then we need to validate that
+    // which the caller will do it. Finally, make sure that we are not expecting RRSIGS.
+    if (dv->rrsigKey || *negcr)
+        return mStatus_NoError;
+    else if (expectRRSIG)
+        return mStatus_BadParamErr;
+    else
+        return mStatus_NoSuchRecord;
+}
+
+mDNSlocal void CheckOneDSForKey(DNSSECVerifier *dv, const ResourceRecord *const rr)
+{
+    mDNSu16 tag;
+    rdataDS *DS;
+    RRVerifier *keyv;
+    rdataDNSKey *key;
+    rdataRRSig *rrsig;
+
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckOneDSForKey: ERROR!! rrsig NULL");
+        return;
+    }
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    DS = (rdataDS *)((mDNSu8 *)rr->rdata + sizeofRDataHeader);
+
+    if (!SameDomainName((domainname *)&rrsig->signerName, rr->name))
+    {
+        debugdnssec("CheckOneDSForKey: name mismatch");
+        return;
+    }
+    for (keyv = dv->key; keyv; keyv = keyv->next)
+    {
+        key = (rdataDNSKey *)keyv->rdata;
+        tag = (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength);
+        if (tag != swap16(DS->keyTag))
+        {
+            debugdnssec("CheckOneDSForKey: keyTag mismatch keyTag %d, DStag %d", tag, swap16(DS->keyTag));
+            continue;
+        }
+        if (key->alg != DS->alg)
+        {
+            debugdnssec("CheckOneDSForKey: alg mismatch key alg%d, DS alg %d", key->alg, swap16(DS->alg));
+            continue;
+        }
+        if (AddRRSetToVerifier(dv, rr, mDNSNULL, RRVS_ds) != mStatus_NoError)
+        {
+            debugdnssec("CheckOneDSForKey: cannot allocate RRSet");
+        }
+    }
+}
+
+mDNSlocal mStatus CheckDSForKey(mDNS *const m, DNSSECVerifier *dv, CacheRecord **negcr)
+{
+    mDNSu32 slot;
+    mDNSu32 namehash;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    rdataRRSig *rrsig;
+    domainname *name;
+
+    *negcr = mDNSNULL;
+    if (!dv->rrsig)
+    {
+        LogMsg("CheckDSForKey: ERROR!! rrsig NULL");
+        return mStatus_BadParamErr;
+    }
+    if (!dv->key)
+    {
+        LogMsg("CheckDSForKey: ERROR!! key NULL");
+        return mStatus_BadParamErr;
+    }
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+    name = (domainname *)&rrsig->signerName;
+    slot = HashSlot(name);
+    namehash = DomainNameHashValue(name);
+    cg = CacheGroupForName(m, slot, namehash, name);
+    if (!cg)
+    {
+        debugdnssec("CheckDSForKey: cg null for %s", name->c);
+        return mStatus_NoSuchRecord;
+    }
+    for (cr=cg->members; cr; cr=cr->next)
+    {
+        if (cr->resrec.rrtype != kDNSType_DS) continue;
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            if (!(*negcr))
+            {
+                LogDNSSEC("CheckDSForKey: Negative cache record %s encountered for %##s (DS)", CRDisplayString(m, cr),
+                          name->c);
+                *negcr = cr;
+            }
+            else
+            {
+                LogMsg("CheckDSForKey: ERROR!! Negative cache record %s already set for %##s (DS)", CRDisplayString(m, cr),
+                       name->c);
+            }
+            continue;
+        }
+        CheckOneDSForKey(dv, &cr->resrec);
+    }
+    if (*negcr && dv->ds)
+    {
+        // Encountered both RRSIG and negative CR
+        LogMsg("CheckDSForKey: ERROR!! Encountered negative cache record %s and DS for %##s",
+               CRDisplayString(m, *negcr), name->c);
+        return mStatus_BadParamErr;
+    }
+    if (dv->ds || *negcr)
+        return mStatus_NoError;
+    else
+        return mStatus_NoSuchRecord;
+    return (dv->ds ? mStatus_NoError : mStatus_NoSuchRecord);
+}
+
+// It returns mDNStrue if we have all the rrsets for verification and mDNSfalse otherwise.
+mDNSlocal mDNSBool GetAllRRSetsForVerification(mDNS *const m, DNSSECVerifier *dv)
+{
+    mStatus err;
+    CacheRecord *negcr;
+    rdataRRSig *rrsig;
+
+    if (!dv->rrset)
+    {
+        LogMsg("GetAllRRSetsForVerification: ERROR!! rrset NULL");
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return mDNSfalse;
+    }
+
+    if (dv->next == RRVS_done) return mDNStrue;
+
+    debugdnssec("GetAllRRSetsForVerification: next %d", dv->next);
+    switch (dv->next)
+    {
+    case RRVS_rrsig:
+        // If we can't find the RRSIG for the rrset, re-issue the query.
+        //
+        // NOTE: It is possible that the cache might answer partially e.g., RRSIGs match qtype but the
+        // whole set is not there. In that case the validation will fail. Ideally we should flush the
+        // cache and reissue the query (TBD).
+        err = CheckRRSIGForRRSet(m, dv, &negcr);
+        if (err != mStatus_NoSuchRecord && err != mStatus_NoError)
+        {
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return mDNSfalse;
+        }
+        // Need to initialize the question as if we end up in ValidateWithNSECS below, the nsec proofs
+        // looks in "dv->q" for the proof. Note that we have to use currQtype as the response could be
+        // a CNAME and dv->rrset->rrtype would be set to CNAME and not the original question type that
+        // resulted in CNAME.
+        InitializeQuestion(m, &dv->q, dv->InterfaceID, &dv->rrset->name, dv->currQtype, VerifySigCallback, dv);
+        // We may not have the NSECS if the previous query was a non-DNSSEC query
+        if (negcr && negcr->nsec)
+        {
+            ValidateWithNSECS(m, dv, negcr);
+            return mDNSfalse;
+        }
+
+        dv->next = RRVS_key;
+        if (!dv->rrsig)
+        {
+            // We already found the rrset to verify. Ideally we should just issue the query for the RRSIG. Unfortunately,
+            // that does not work well as the response may not contain the RRSIG whose typeCovered matches the
+            // rrset->rrtype (recursive server returns what is in its cache). Hence, we send the original query with the
+            // DO bit set again to get the RRSIG. Normally this would happen if there was question which did not require
+            // DNSSEC validation (ValidationRequied = 0) populated the cache and later when the ValidationRequired question
+            // comes along, we need to get the RRSIGs. If we started off with ValidationRequired question we would have
+            // already set the DO bit and not able to get RRSIGs e.g., bad CPE device, we would reissue the query here
+            // again once more.
+            //
+            // Also, if it is a wildcard expanded answer, we need to issue the query with the original type for it to
+            // elicit the right NSEC records. Just querying for RRSIG alone is not sufficient.
+            //
+            // Note: For this to work, the core needs to deliver RRSIGs when they are added to the cache even if the
+            // "qtype" is not RRSIG.
+            debugdnssec("GetAllRRSetsForVerification: Fetching RRSIGS for RRSET");
+            dv->NumPackets++;
+            mDNS_StartQuery(m, &dv->q);
+            return mDNSfalse;
+        }
+        // if we found the RRSIG, then fall through to find the DNSKEY
+    case RRVS_key:
+        err = CheckKeyForRRSIG(m, dv, &negcr);
+        if (err != mStatus_NoSuchRecord && err != mStatus_NoError)
+        {
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return mDNSfalse;
+        }
+        // Need to initialize the question as if we end up in ValidateWithNSECS below, the nsec proofs
+        // looks in "dv->q" for the proof.
+        rrsig = (rdataRRSig *)dv->rrsig->rdata;
+        InitializeQuestion(m, &dv->q, dv->InterfaceID, (domainname *)&rrsig->signerName, kDNSType_DNSKEY, VerifySigCallback, dv);
+        // We may not have the NSECS if the previous query was a non-DNSSEC query
+        if (negcr && negcr->nsec)
+        {
+            ValidateWithNSECS(m, dv, negcr);
+            return mDNSfalse;
+        }
+
+        dv->next = RRVS_rrsig_key;
+        if (!dv->key)
+        {
+            debugdnssec("GetAllRRSetsForVerification: Fetching DNSKEY for RRSET");
+            dv->NumPackets++;
+            mDNS_StartQuery(m, &dv->q);
+            return mDNSfalse;
+        }
+    // if we found the DNSKEY, then fall through to find the RRSIG for the DNSKEY
+    case RRVS_rrsig_key:
+        err = CheckRRSIGForKey(m, dv, &negcr);
+        // if we are falling through, then it is okay if we don't find the record
+        if (err != mStatus_NoSuchRecord && err != mStatus_NoError)
+        {
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return mDNSfalse;
+        }
+        // Need to initialize the question as if we end up in ValidateWithNSECS below, the nsec proofs
+        // looks in "dv->q" for the proof.
+        rrsig = (rdataRRSig *)dv->rrsig->rdata;
+        InitializeQuestion(m, &dv->q, dv->InterfaceID, (domainname *)&rrsig->signerName, kDNSType_DNSKEY, VerifySigCallback, dv);
+        // We may not have the NSECS if the previous query was a non-DNSSEC query
+        if (negcr && negcr->nsec)
+        {
+            ValidateWithNSECS(m, dv, negcr);
+            return mDNSfalse;
+        }
+        dv->next = RRVS_ds;
+        debugdnssec("GetAllRRSetsForVerification: RRVS_rrsig_key %p", dv->rrsigKey);
+        if (!dv->rrsigKey)
+        {
+            debugdnssec("GetAllRRSetsForVerification: Fetching RRSIGS for DNSKEY");
+            dv->NumPackets++;
+            mDNS_StartQuery(m, &dv->q);
+            return mDNSfalse;
+        }
+    // if we found RRSIG for the DNSKEY, then fall through to find the DS
+    case RRVS_ds:
+    {
+        domainname *qname;
+        rrsig = (rdataRRSig *)dv->rrsig->rdata;
+        qname = (domainname *)&rrsig->signerName;
+
+        err = CheckDSForKey(m, dv, &negcr);
+        if (err != mStatus_NoSuchRecord && err != mStatus_NoError)
+        {
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return mDNSfalse;
+        }
+        // Need to initialize the question as if we end up in ValidateWithNSECS below, the nsec proofs
+        // looks in "dv->q" for the proof.
+        InitializeQuestion(m, &dv->q, dv->InterfaceID, qname, kDNSType_DS, VerifySigCallback, dv);
+        // We may not have the NSECS if the previous query was a non-DNSSEC query
+        if (negcr && negcr->nsec)
+        {
+            ValidateWithNSECS(m, dv, negcr);
+            return mDNSfalse;
+        }
+        dv->next = RRVS_done;
+        // If we have a trust anchor, then don't bother looking up the DS record
+        if (!dv->ds && !TrustedKeyPresent(m, dv))
+        {
+            // There is no DS for the root. Hence, if we don't have the trust
+            // anchor for root, just fail.
+            if (SameDomainName(qname, (const domainname *)"\000"))
+            {
+                LogDNSSEC("GetAllRRSetsForVerification: Reached root");
+                dv->DVCallback(m, dv, DNSSEC_Bogus);
+                return mDNSfalse;
+            }
+            debugdnssec("GetAllRRSetsForVerification: Fetching DS");
+            dv->NumPackets++;
+            mDNS_StartQuery(m, &dv->q);
+            return mDNSfalse;
+        }
+        else
+        {
+            debugdnssec("GetAllRRSetsForVerification: Skipped fetching the DS");
+            return mDNStrue;
+        }
+    }
+    default:
+        LogMsg("GetAllRRSetsForVerification: ERROR!! unknown next %d", dv->next);
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return mDNSfalse;
+    }
+}
+
+#ifdef DNSSEC_DEBUG
+mDNSlocal void PrintFixedSignInfo(rdataRRSig *rrsig, domainname *signerName, int sigNameLen, mDNSu8 *fixedPart, int fixedPartLen)
+{
+    int j;
+    char buf[RRSIG_FIXED_SIZE *3 + 1]; // 3 bytes count for %2x + 1 and the one byte for null at the end
+    char sig[sigNameLen * 3 + 1];
+    char fp[fixedPartLen * 3 + 1];
+    int length;
+
+    length = 0;
+    for (j = 0; j < RRSIG_FIXED_SIZE; j++)
+        length += mDNS_snprintf(buf+length, sizeof(buf) - length - 1, "%2x ", ((mDNSu8 *)rrsig)[j]);
+    LogMsg("RRSIG(%d) %s", RRSIG_FIXED_SIZE, buf);
+
+
+    length = 0;
+    for (j = 0; j < sigNameLen; j++)
+        length += mDNS_snprintf(sig+length, sizeof(sig) - length - 1, "%2x ", signerName->c[j]);
+    LogMsg("SIGNAME(%d) %s", sigNameLen, sig);
+
+    length = 0;
+    for (j = 0; j < fixedPartLen; j++)
+        length += mDNS_snprintf(fp+length, sizeof(fp) - length - 1, "%2x ", fixedPart[j]);
+    LogMsg("fixedPart(%d) %s", fixedPartLen, fp);
+}
+
+mDNSlocal void PrintVarSignInfo(mDNSu16 rdlen, mDNSu8 *rdata)
+{
+    unsigned int j;
+    mDNSu8 *r;
+    unsigned int blen = swap16(rdlen);
+    char buf[blen * 3 + 1]; // 3 bytes count for %2x + 1 and the one byte for null at the end
+    int length;
+
+    length = 0;
+
+    r = (mDNSu8 *)&rdlen;
+    for (j = 0; j < sizeof(mDNSu16); j++)
+        length += mDNS_snprintf(buf+length, sizeof(buf) - length - 1, "%2x ", r[j]);
+    LogMsg("RDLENGTH(%d) %s", sizeof(mDNSu16), buf);
+
+    length = 0;
+    for (j = 0; j < blen; j++)
+        length += mDNS_snprintf(buf+length, sizeof(buf) - length - 1, "%2x ", rdata[j]);
+    LogMsg("RDATA(%d) %s", blen, buf);
+}
+#else
+mDNSlocal void PrintVarSignInfo(mDNSu16 rdlen, mDNSu8 *rdata)
+{
+    (void)rdlen;
+    (void)rdata;
+}
+mDNSlocal void PrintFixedSignInfo(rdataRRSig *rrsig, domainname *signerName, int sigNameLen, mDNSu8 *fixedPart, int fixedPartLen)
+{
+    (void)rrsig;
+    (void)signerName;
+    (void)sigNameLen;
+    (void)fixedPart;
+    (void)fixedPartLen;
+}
+#endif
+
+// Used for RDATA comparison
+typedef struct
+{
+    mDNSu16 rdlength;
+    mDNSu16 rrtype;
+    mDNSu8 *rdata;
+} rdataComp;
+
+mDNSlocal int rdata_compare(mDNSu8 *const rdata1, mDNSu8 *const rdata2, int rdlen1, int rdlen2)
+{
+    int len;
+    int ret;
+
+    len = (rdlen1 < rdlen2) ? rdlen1 : rdlen2;
+
+    ret = DNSMemCmp(rdata1, rdata2, len);
+    if (ret != 0) return ret;
+
+    // RDATA is same at this stage. Consider them equal if they are of same length. Otherwise
+    // decide based on their lengths.
+    return ((rdlen1 == rdlen2) ? 0 : (rdlen1 < rdlen2) ? -1 : 1);
+}
+
+mDNSlocal int name_compare(mDNSu8 *const rdata1, mDNSu8 *const rdata2, int rdlen1, int rdlen2)
+{
+    domainname *n1 = (domainname *)rdata1;
+    domainname *n2 = (domainname *)rdata2;
+    mDNSu8 *a = n1->c;
+    mDNSu8 *b = n2->c;
+    int count, c1, c2;
+    int i, j, len;
+
+    c1 = CountLabels(n1);
+    c2 = CountLabels(n2);
+
+    count = c1 < c2 ? c1 : c2;
+
+    // We can't use SameDomainName as we need to know exactly which is greater/smaller
+    // for sorting purposes. Hence, we need to compare label by label
+    for (i = 0; i < count; i++)
+    {
+        // Are the lengths same ?
+        if (*a != *b)
+        {
+            debugdnssec("compare_name: returning c1 %d, c2 %d", *a, *b);
+            return ((*a < *b) ? -1 : 1);
+        }
+        len = *a;
+        rdlen1 -= (len + 1);
+        rdlen2 -= (len + 1);
+        if (rdlen1 < 0 || rdlen2 < 0)
+        {
+            LogMsg("name_compare: ERROR!! not enough data rdlen1 %d, rdlen2 %d", rdlen1, rdlen2);
+            return -1;
+        }
+        a++; b++;
+        for (j = 0; j < len; j++)
+        {
+            mDNSu8 ac = *a++;
+            mDNSu8 bc = *b++;
+            if (mDNSIsUpperCase(ac)) ac += 'a' - 'A';
+            if (mDNSIsUpperCase(bc)) bc += 'a' - 'A';
+            if (ac != bc)
+            {
+                debugdnssec("compare_name: returning ac %c, bc %c", ac, bc);
+                return ((ac < bc) ? -1 : 1);
+            }
+        }
+    }
+
+    return 0;
+}
+
+mDNSlocal int srv_compare(rdataComp *const r1, rdataComp *const r2)
+{
+    int res;
+    int length1, length2;
+
+    length1 = r1->rdlength;
+    length2 = r2->rdlength;
+    // We should have at least priority, weight, port plus 1 byte
+    if (length1 < 7 || length2 < 7)
+    {
+        LogMsg("srv_compare: ERROR!! Length smaller than 7 bytes");
+        return -1;
+    }
+    // Compare priority, weight and port
+    res = DNSMemCmp(r1->rdata, r2->rdata, 6);
+    if (res != 0) return res;
+    length1 -= 6;
+    length2 -= 6;
+    return (name_compare(r1->rdata + 6, r2->rdata + 6, length1, length2));
+}
+
+mDNSlocal int tsig_compare(rdataComp *const r1, rdataComp *const r2)
+{
+    int offset1, offset2;
+    int length1, length2;
+    int res, dlen;
+
+    offset1 = offset2 = 0;
+    length1 = r1->rdlength;
+    length2 = r2->rdlength;
+
+    // we should have at least one byte to start with
+    if (length1 < 1 || length2 < 1)
+    {
+        LogMsg("sig_compare: Length smaller than 18 bytes");
+        return -1;
+    }
+
+    res = name_compare(r1->rdata, r2->rdata, length1, length2);
+    if (res != 0) return res;
+
+    dlen = DomainNameLength((domainname *)r1->rdata);
+    offset1 += dlen;
+    offset2 += dlen;
+    length1 -= dlen;
+    length2 -= dlen;
+
+    if (length1 <= 1 || length2 <= 1)
+    {
+        LogMsg("tsig_compare: data too small to compare length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+
+    return (rdata_compare(r1->rdata + offset1, r2->rdata + offset2, length1, length2));
+}
+
+// Compares types that conform to : <length><Value>
+mDNSlocal int lenval_compare(mDNSu8 *d1, mDNSu8 *d2, int *len1, int *len2, int rem1, int rem2)
+{
+    int len;
+    int res;
+
+    if (rem1 <= 1 || rem2 <= 1)
+    {
+        LogMsg("lenval_compare: data too small to compare length1 %d, length2 %d", rem1, rem2);
+        return -1;
+    }
+    *len1 = (int)d1[0];
+    *len2 = (int)d2[0];
+    len = (*len1 < *len2 ? *len1 : *len2);
+    res = DNSMemCmp(d1, d2, len + 1);
+    return res;
+}
+
+// RFC 2915: Order (2) Preference(2) and variable length: Flags Service Regexp Replacement
+mDNSlocal int naptr_compare(rdataComp *const r1, rdataComp *const r2)
+{
+    mDNSu8 *d1 = r1->rdata;
+    mDNSu8 *d2 = r2->rdata;
+    int len1, len2, res;
+    int length1, length2;
+
+    length1 = r1->rdlength;
+    length2 = r2->rdlength;
+
+    // Order, Preference plus at least 1 byte
+    if (length1 < 5 || length2 < 5)
+    {
+        LogMsg("naptr_compare: Length smaller than 18 bytes");
+        return -1;
+    }
+    // Compare order and preference
+    res = DNSMemCmp(d1, d2, 4);
+    if (res != 0) return res;
+
+    d1 += 4;
+    d2 += 4;
+    length1 -= 4;
+    length2 -= 4;
+
+    // Compare Flags (including the length byte)
+    res = lenval_compare(d1, d2, &len1, &len2, length1, length2);
+    if (res != 0) return res;
+    d1 += (len1 + 1);
+    d2 += (len2 + 1);
+    length1 -= (len1 + 1);
+    length2 -= (len2 + 1);
+
+    // Compare Service (including the length byte)
+    res = lenval_compare(d1, d2, &len1, &len2, length1, length2);
+    if (res != 0) return res;
+    d1 += (len1 + 1);
+    d2 += (len2 + 1);
+    length1 -= (len1 + 1);
+    length2 -= (len2 + 1);
+
+    // Compare regexp (including the length byte)
+    res = lenval_compare(d1, d2, &len1, &len2, length1, length2);
+    if (res != 0) return res;
+    d1 += (len1 + 1);
+    d2 += (len2 + 1);
+    length1 -= (len1 + 1);
+    length2 -= (len2 + 1);
+
+    // Compare Replacement
+    return name_compare(d1, d2, length1, length2);
+}
+
+// RFC 1035: MINFO: Two domain names
+// RFC 1183: RP: Two domain names
+mDNSlocal int dom2_compare(mDNSu8 *d1, mDNSu8 *d2, int length1, int length2)
+{
+    int res, dlen;
+
+    // We need at least one byte to start with
+    if (length1 < 1 || length2 < 1)
+    {
+        LogMsg("dom2_compare:1: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+    res = name_compare(d1, d2, length1, length2);
+    if (res != 0) return res;
+    dlen = DomainNameLength((domainname *)d1);
+
+    length1 -= dlen;
+    length2 -= dlen;
+    // We need at least one byte to start with
+    if (length1 < 1 || length2 < 1)
+    {
+        LogMsg("dom2_compare:2: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+
+    d1 += dlen;
+    d2 += dlen;
+
+    return name_compare(d1, d2, length1, length2);
+}
+
+// MX : preference (2 bytes), domainname
+mDNSlocal int mx_compare(rdataComp *const r1, rdataComp *const r2)
+{
+    int res;
+    int length1, length2;
+
+    length1 = r1->rdlength;
+    length2 = r2->rdlength;
+
+    // We need at least two bytes + 1 extra byte for the domainname to start with
+    if (length1 < 3 || length2 < 3)
+    {
+        LogMsg("mx_compare: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+
+    res = DNSMemCmp(r1->rdata, r2->rdata, 2);
+    if (res != 0) return res;
+    length1 -= 2;
+    length2 -= 2;
+    return name_compare(r1->rdata + 2, r2->rdata + 2, length1, length2);
+}
+
+// RFC 2163 (PX) : preference (2 bytes), map822. mapx400 (domainnames)
+mDNSlocal int px_compare(rdataComp *const r1, rdataComp *const r2)
+{
+    int res;
+
+    // We need at least two bytes + 1 extra byte for the domainname to start with
+    if (r1->rdlength < 3 || r2->rdlength < 3)
+    {
+        LogMsg("px_compare: data too small length1 %d, length2 %d", r1->rdlength, r2->rdlength);
+        return -1;
+    }
+
+    res = DNSMemCmp(r1->rdata, r2->rdata, 2);
+    if (res != 0) return res;
+
+    return dom2_compare(r1->rdata + 2, r2->rdata + 2, r1->rdlength - 2, r2->rdlength - 2);
+}
+
+mDNSlocal int soa_compare(rdataComp *r1, rdataComp *r2)
+{
+    int res, dlen;
+    int offset1, offset2;
+    int length1, length2;
+
+    length1 = r1->rdlength;
+    length2 = r2->rdlength;
+    offset1 = offset2 = 0;
+
+    // We need at least 20 bytes plus 1 byte for each domainname
+    if (length1 < 22 || length2 < 22)
+    {
+        LogMsg("soa_compare:1: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+
+    // There are two domainnames followed by 20 bytes of serial, refresh, retry, expire and min
+    // Compare the names and then the rest of the bytes
+
+    res = name_compare(r1->rdata, r2->rdata, length1, length2);
+    if (res != 0) return res;
+
+    dlen = DomainNameLength((domainname *)r1->rdata);
+
+    length1 -= dlen;
+    length2 -= dlen;
+    if (length1 < 1 || length2 < 1)
+    {
+        LogMsg("soa_compare:2: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+    offset1 += dlen;
+    offset2 += dlen;
+
+    res = name_compare(r1->rdata + offset1, r2->rdata + offset2, length1, length2);
+    if (res != 0) return res;
+
+    dlen = DomainNameLength((domainname *)r1->rdata);
+    length1 -= dlen;
+    length2 -= dlen;
+    if (length1 < 20 || length2 < 20)
+    {
+        LogMsg("soa_compare:3: data too small length1 %d, length2 %d", length1, length2);
+        return -1;
+    }
+    offset1 += dlen;
+    offset2 += dlen;
+
+    return (rdata_compare(r1->rdata + offset1, r2->rdata + offset2, length1, length2));
+}
+
+// RFC 4034 Section 6.0 states that:
+//
+// A canonical RR form and ordering within an RRset are required in order to
+// construct and verify RRSIG RRs.
+//
+// This function is called to order within an RRset. We can't just do a memcmp as
+// as stated in 6.3. This function is responsible for the third bullet in 6.2, where
+// the RDATA has to be converted to lower case if it has domain names.
+mDNSlocal int RDATACompare(const void *rdata1, const void *rdata2)
+{
+    rdataComp *r1 = (rdataComp *)rdata1;
+    rdataComp *r2 = (rdataComp *)rdata2;
+
+    if (r1->rrtype != r2->rrtype)
+    {
+        LogMsg("RDATACompare: ERROR!! comparing rdata of wrong types type1: %d, type2: %d", r1->rrtype, r2->rrtype);
+        return -1;
+    }
+    switch (r1->rrtype)
+    {
+    case kDNSType_A:                // 1. Address Record
+    case kDNSType_NULL:             // 10 NULL RR
+    case kDNSType_WKS:              // 11 Well-known-service
+    case kDNSType_HINFO:            // 13 Host information
+    case kDNSType_TXT:              // 16 Arbitrary text string
+    case kDNSType_X25:              // 19 X_25 calling address
+    case kDNSType_ISDN:             // 20 ISDN calling address
+    case kDNSType_NSAP:             // 22 NSAP address
+    case kDNSType_KEY:              // 25 Security key
+    case kDNSType_GPOS:             // 27 Geographical position (withdrawn)
+    case kDNSType_AAAA:             // 28 IPv6 Address
+    case kDNSType_LOC:              // 29 Location Information
+    case kDNSType_EID:              // 31 Endpoint identifier
+    case kDNSType_NIMLOC:           // 32 Nimrod Locator
+    case kDNSType_ATMA:             // 34 ATM Address
+    case kDNSType_CERT:             // 37 Certification record
+    case kDNSType_A6:               // 38 IPv6 Address (deprecated)
+    case kDNSType_SINK:             // 40 Kitchen sink (experimental)
+    case kDNSType_OPT:              // 41 EDNS0 option (meta-RR)
+    case kDNSType_APL:              // 42 Address Prefix List
+    case kDNSType_DS:               // 43 Delegation Signer
+    case kDNSType_SSHFP:            // 44 SSH Key Fingerprint
+    case kDNSType_IPSECKEY:         // 45 IPSECKEY
+    case kDNSType_RRSIG:            // 46 RRSIG
+    case kDNSType_NSEC:             // 47 Denial of Existence
+    case kDNSType_DNSKEY:           // 48 DNSKEY
+    case kDNSType_DHCID:            // 49 DHCP Client Identifier
+    case kDNSType_NSEC3:            // 50 Hashed Authenticated Denial of Existence
+    case kDNSType_NSEC3PARAM:       // 51 Hashed Authenticated Denial of Existence
+    case kDNSType_HIP:              // 55 Host Identity Protocol
+    case kDNSType_SPF:              // 99 Sender Policy Framework for E-Mail
+    default:
+        return rdata_compare(r1->rdata, r2->rdata, r1->rdlength, r2->rdlength);
+    case kDNSType_NS:               //  2 Name Server
+    case kDNSType_MD:               //  3 Mail Destination
+    case kDNSType_MF:               //  4 Mail Forwarder
+    case kDNSType_CNAME:            //  5 Canonical Name
+    case kDNSType_MB:               //  7 Mailbox
+    case kDNSType_MG:               //  8 Mail Group
+    case kDNSType_MR:               //  9 Mail Rename
+    case kDNSType_PTR:              // 12 Domain name pointer
+    case kDNSType_NSAP_PTR:         // 23 Reverse NSAP lookup (deprecated)
+    case kDNSType_DNAME:            // 39 Non-terminal DNAME (for IPv6)
+        return name_compare(r1->rdata, r2->rdata, r1->rdlength, r2->rdlength);
+    case kDNSType_SRV:              // 33 Service record
+        return srv_compare(r1, r2);
+    case kDNSType_SOA:              //  6 Start of Authority
+        return soa_compare(r1, r2);
+
+    case kDNSType_RP:               // 17 Responsible person
+    case kDNSType_MINFO:            // 14 Mailbox information
+        return dom2_compare(r1->rdata, r2->rdata, r1->rdlength, r2->rdlength);
+    case kDNSType_MX:               // 15 Mail Exchanger
+    case kDNSType_AFSDB:            // 18 AFS cell database
+    case kDNSType_RT:               // 21 Router
+    case kDNSType_KX:               // 36 Key Exchange
+        return mx_compare(r1, r2);
+    case kDNSType_PX:               // 26 X.400 mail mapping
+        return px_compare(r1, r2);
+    case kDNSType_NAPTR:            // 35 Naming Authority PoinTeR
+        return naptr_compare(r1, r2);
+    case kDNSType_TKEY:             // 249 Transaction key
+    case kDNSType_TSIG:             // 250 Transaction signature
+        // TSIG and TKEY have a domainname followed by data
+        return tsig_compare(r1, r2);
+    // TBD: We are comparing them as opaque types, perhaps not right
+    case kDNSType_SIG:              // 24 Security signature
+    case kDNSType_NXT:              // 30 Next domain (security)
+        LogMsg("RDATACompare: WARNING!! explicit support has not been added, using default");
+        return rdata_compare(r1->rdata, r2->rdata, r1->rdlength, r2->rdlength);
+    }
+}
+
+
+
+// RFC 4034 section 6.2 requirement for verifying signature.
+//
+// 3. if the type of the RR is NS, MD, MF, CNAME, SOA, MB, MG, MR, PTR,
+// HINFO, MINFO, MX, HINFO, RP, AFSDB, RT, SIG, PX, NXT, NAPTR, KX,
+// SRV, DNAME, A6, RRSIG, or NSEC, all uppercase US-ASCII letters in
+// the DNS names contained within the RDATA are replaced by the
+// corresponding lowercase US-ASCII letters;
+//
+// NSEC and HINFO is not needed as per dnssec-bis update. RRSIG is done elsewhere
+// as part of signature verification
+mDNSlocal void ConvertRDATAToCanonical(mDNSu16 rrtype, mDNSu16 rdlength, mDNSu8 *rdata)
+{
+    domainname name;
+    int len;
+    mDNSu8 *origRdata = rdata;
+
+    // Ensure that we have at least one byte of data to examine and modify.
+
+    if (!rdlength) { LogMsg("ConvertRDATAToCanonical: rdlength zero for rrtype %s", DNSTypeName(rrtype)); return; }
+
+    switch (rrtype)
+    {
+    // Not adding suppot for A6 as it is deprecated
+    case kDNSType_A6:               // 38 IPv6 Address (deprecated)
+    default:
+        debugdnssec("ConvertRDATAToCanonical: returning from default %s", DNSTypeName(rrtype));
+        return;
+    case kDNSType_NS:               //  2 Name Server
+    case kDNSType_MD:               //  3 Mail Destination
+    case kDNSType_MF:               //  4 Mail Forwarder
+    case kDNSType_CNAME:            //  5 Canonical Name
+    case kDNSType_MB:               //  7 Mailbox
+    case kDNSType_MG:               //  8 Mail Group
+    case kDNSType_MR:               //  9 Mail Rename
+    case kDNSType_PTR:              // 12 Domain name pointer
+    case kDNSType_DNAME:            // 39 Non-terminal DNAME (for IPv6)
+    case kDNSType_NXT:              // 30 Next domain (security)
+
+    // TSIG and TKEY are not mentioned in RFC 4034, but we just leave it here
+    case kDNSType_TSIG:             // 250 Transaction signature
+    case kDNSType_TKEY:             // 249 Transaction key
+
+        if (DNSNameToLowerCase((domainname *)rdata, &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)rdata, &name);
+        return;
+    case kDNSType_MX:               // 15 Mail Exchanger
+    case kDNSType_AFSDB:            // 18 AFS cell database
+    case kDNSType_RT:               // 21 Router
+    case kDNSType_KX:               // 36 Key Exchange
+
+        // format: preference - 2 bytes, followed by name
+        // Ensure that we have at least 3 bytes (preference + 1 byte for the domain name)
+        if (rdlength <= 3)
+        {
+            LogMsg("ConvertRDATAToCanonical:MX: rdlength %d for rrtype %s too small", rdlength, DNSTypeName(rrtype));
+            return;
+        }
+        if (DNSNameToLowerCase((domainname *)(rdata + 2), &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: MX: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)(rdata + 2), &name);
+        return;
+    case kDNSType_SRV:              // 33 Service record
+        // format : priority, weight and port - 6 bytes, followed by name
+        if (rdlength <= 7)
+        {
+            LogMsg("ConvertRDATAToCanonical:SRV: rdlength %d for rrtype %s too small", rdlength, DNSTypeName(rrtype));
+            return;
+        }
+        if (DNSNameToLowerCase((domainname *)(rdata + 6), &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: SRV: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)(rdata + 6), &name);
+        return;
+    case kDNSType_PX:               // 26 X.400 mail mapping
+        if (rdlength <= 3)
+        {
+            LogMsg("ConvertRDATAToCanonical:PX: rdlength %d for rrtype %s too small", rdlength, DNSTypeName(rrtype));
+            return;
+        }
+        // Preference followed by two domain names
+        rdata += 2;
+    /* FALLTHROUGH */
+    case kDNSType_RP:               // 17 Responsible person
+    case kDNSType_SOA:              //  6 Start of Authority
+    case kDNSType_MINFO:            // 14 Mailbox information
+        if (DNSNameToLowerCase((domainname *)rdata, &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: SOA1: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+
+        AssignDomainName((domainname *)rdata, &name);
+        len = DomainNameLength((domainname *)rdata);
+        if (rdlength <= len + 1)
+        {
+            LogMsg("ConvertRDATAToCanonical:RP: rdlength %d for rrtype %s too small", rdlength, DNSTypeName(rrtype));
+            return;
+        }
+        rdata += len;
+
+        if (DNSNameToLowerCase((domainname *)rdata, &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: SOA2: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)rdata, &name);
+        return;
+    case kDNSType_NAPTR:            // 35 Naming Authority Pointer
+        // order and preference
+        rdata += 4;
+        // Flags (including the length byte)
+        rdata += (((int) rdata[0]) + 1);
+        // Service (including the length byte)
+        rdata += (((int) rdata[0]) + 1);
+        // regexp (including the length byte)
+        rdata += (((int) rdata[0]) + 1);
+
+        // Replacement field is a domainname. If we have at least one more byte, then we are okay.
+        if ((origRdata + rdlength) < rdata + 1)
+        {
+            LogMsg("ConvertRDATAToCanonical:NAPTR: origRdata %p, rdlength %d, rdata %p for rrtype %s too small", origRdata, rdlength, rdata, DNSTypeName(rrtype));
+            return;
+        }
+        if (DNSNameToLowerCase((domainname *)rdata, &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: NAPTR2: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)rdata, &name);
+    case kDNSType_SIG:              // 24 Security signature
+        // format: <18 bytes> <domainname> <data>
+        if (rdlength <= 19)
+        {
+            LogMsg("ConvertRDATAToCanonical:SIG: rdlength %d for rrtype %s too small", rdlength, DNSTypeName(rrtype));
+            return;
+        }
+        // Preference followed by two domain names
+        rdata += 18;
+        if (DNSNameToLowerCase((domainname *)rdata, &name) != mStatus_NoError)
+        {
+            LogMsg("ConvertRDATAToCanonical: SIG: ERROR!! DNSNameToLowerCase failed");
+            return;
+        }
+        AssignDomainName((domainname *)rdata, &name);
+        return;
+    }
+}
+
+mDNSlocal mDNSBool ValidateSignatureWithKey(DNSSECVerifier *dv, RRVerifier *rrset, RRVerifier *keyv, RRVerifier *sig)
+{
+    domainname name;
+    domainname signerName;
+    int labels;
+    mDNSu8 fixedPart[MAX_DOMAIN_NAME + 8];  // domainname + type + class + ttl
+    int fixedPartLen;
+    RRVerifier *tmp;
+    int nrrsets;
+    rdataComp *ptr, *start, *p;
+    rdataRRSig *rrsig;
+    rdataDNSKey *key;
+    int i;
+    int sigNameLen;
+    mDNSu16 temp;
+    mStatus algRet;
+
+
+    key = (rdataDNSKey *)keyv->rdata;
+    rrsig = (rdataRRSig *)sig->rdata;
+
+    LogDNSSEC("ValidateSignatureWithKey: Validating signature with key with tag %d", (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength));
+
+    if (DNSNameToLowerCase((domainname *)&rrsig->signerName, &signerName) != mStatus_NoError)
+    {
+        LogMsg("ValidateSignatureWithKey: ERROR!! cannot convert signer name to lower case");
+        return mDNSfalse;
+    }
+
+    if (DNSNameToLowerCase((domainname *)&rrset->name, &name) != mStatus_NoError)
+    {
+        LogMsg("ValidateSignatureWithKey: ERROR!! cannot convert rrset name to lower case");
+        return mDNSfalse;
+    }
+
+    sigNameLen = DomainNameLength(&signerName);
+    labels = CountLabels(&name);
+    // RFC 4034: RRSIG validation
+    //
+    // signature = sign(RRSIG_RDATA | RR(1) | RR(2)... )
+    //
+    // where RRSIG_RDATA excludes the signature and signer name in canonical form
+
+    if (dv->ctx) AlgDestroy(dv->ctx);
+    dv->ctx = AlgCreate(CRYPTO_ALG, rrsig->alg);
+    if (!dv->ctx)
+    {
+        LogDNSSEC("ValidateSignatureWithKey: ERROR!! No algorithm support for %d", rrsig->alg);
+        return mDNSfalse;
+    }
+    AlgAdd(dv->ctx, (const mDNSu8 *)rrsig, RRSIG_FIXED_SIZE);
+    AlgAdd(dv->ctx, signerName.c, sigNameLen);
+
+    if (labels - rrsig->labels > 0)
+    {
+        domainname *d;
+        LogDNSSEC("ValidateSignatureWithKey: ====splitting labels %d, rrsig->labels %d====", labels,rrsig->labels);
+        d = (domainname *)SkipLeadingLabels(&name, labels - rrsig->labels);
+        fixedPart[0] = 1;
+        fixedPart[1] = '*';
+        AssignDomainName((domainname *)(fixedPart + 2), d);
+        fixedPartLen = DomainNameLength(d) + 2;
+        // See RFC 4034 section 3.1.3. If you are looking up *.example.com,
+        // the labels count in the RRSIG is 2, but this is not considered as
+        // a wildcard answer
+        if (name.c[0] != 1 || name.c[1] != '*')
+        {
+            LogDNSSEC("ValidateSignatureWithKey: Wildcard exapnded answer for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+            dv->flags |= WILDCARD_PROVES_ANSWER_EXPANDED;
+            dv->wildcardName = (domainname *)SkipLeadingLabels(&dv->origName, labels - rrsig->labels);
+            if (!dv->wildcardName) return mDNSfalse;
+        }
+    }
+    else
+    {
+        debugdnssec("ValidateSignatureWithKey: assigning domainname");
+        AssignDomainName((domainname *)fixedPart, &name);
+        fixedPartLen = DomainNameLength(&name);
+    }
+    temp = swap16(rrset->rrtype);
+    mDNSPlatformMemCopy(fixedPart + fixedPartLen, (mDNSu8 *)&temp, sizeof(rrset->rrtype));
+    fixedPartLen += sizeof(rrset->rrtype);
+    temp = swap16(rrset->rrclass);
+    mDNSPlatformMemCopy(fixedPart + fixedPartLen, (mDNSu8 *)&temp, sizeof(rrset->rrclass));
+    fixedPartLen += sizeof(rrset->rrclass);
+    mDNSPlatformMemCopy(fixedPart + fixedPartLen, (mDNSu8 *)&rrsig->origTTL, sizeof(rrsig->origTTL));
+    fixedPartLen += sizeof(rrsig->origTTL);
+
+
+    for (tmp = rrset, nrrsets = 0; tmp; tmp = tmp->next)
+        nrrsets++;
+
+    tmp = rrset;
+    start = ptr = mDNSPlatformMemAllocate(nrrsets * sizeof (rdataComp));
+    debugdnssec("ValidateSignatureWithKey: start %p, nrrsets %d", start, nrrsets);
+    if (ptr)
+    {
+        // Need to initialize for failure case below
+        mDNSPlatformMemZero(ptr, nrrsets * (sizeof (rdataComp)));
+        while (tmp)
+        {
+            ptr->rdlength = tmp->rdlength;
+            ptr->rrtype = tmp->rrtype;
+            if (ptr->rdlength)
+            {
+                ptr->rdata = mDNSPlatformMemAllocate(ptr->rdlength);
+                if (ptr->rdata)
+                {
+                    mDNSPlatformMemCopy(ptr->rdata, tmp->rdata, tmp->rdlength);
+                }
+                else
+                {
+                    for (i = 0; i < nrrsets; i++)
+                        if (start[i].rdata) mDNSPlatformMemFree(start[i].rdata);
+                    mDNSPlatformMemFree(start);
+                    LogMsg("ValidateSignatureWithKey:1: ERROR!! RDATA memory alloation failure");
+                    return mDNSfalse;
+                }
+            }
+            ptr++;
+            tmp = tmp->next;
+        }
+    }
+    else
+    {
+        LogMsg("ValidateSignatureWithKey:2: ERROR!! RDATA memory alloation failure");
+        return mDNSfalse;
+    }
+
+    PrintFixedSignInfo(rrsig, &signerName, sigNameLen, fixedPart, fixedPartLen);
+
+    mDNSPlatformQsort(start, nrrsets, sizeof(rdataComp), RDATACompare);
+    for (p = start, i = 0; i < nrrsets; p++, i++)
+    {
+        int rdlen;
+
+        // The array is sorted and hence checking adjacent entries for duplicate is sufficient
+        if (i > 0)
+        {
+            rdataComp *q = p - 1;
+            if (!RDATACompare((void *)p, (void *)q)) continue;
+        }
+
+        // Add the fixed part
+        AlgAdd(dv->ctx, (const mDNSu8 *)fixedPart, fixedPartLen);
+
+        // Add the rdlength
+        rdlen = swap16(p->rdlength);
+        AlgAdd(dv->ctx, (const mDNSu8 *)&rdlen, sizeof(mDNSu16));
+
+        ConvertRDATAToCanonical(p->rrtype, p->rdlength, p->rdata);
+
+        PrintVarSignInfo(rdlen, p->rdata);
+        AlgAdd(dv->ctx, (const mDNSu8 *)p->rdata, p->rdlength);
+    }
+    // free the memory as we don't need it anymore
+    for (i = 0; i < nrrsets; i++)
+        if (start[i].rdata) mDNSPlatformMemFree(start[i].rdata);
+    mDNSPlatformMemFree(start);
+
+    algRet = AlgVerify(dv->ctx, (mDNSu8 *)&key->data, keyv->rdlength - DNSKEY_FIXED_SIZE, (mDNSu8 *)(sig->rdata + sigNameLen + RRSIG_FIXED_SIZE), sig->rdlength - RRSIG_FIXED_SIZE - sigNameLen);
+    AlgDestroy(dv->ctx);
+    dv->ctx = mDNSNULL;
+    if (algRet != mStatus_NoError)
+    {
+        LogDNSSEC("ValidateSignatureWithKey: AlgVerify failed for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        // Reset the state if we set any above.
+        if (dv->flags & WILDCARD_PROVES_ANSWER_EXPANDED)
+        {
+            dv->flags &= ~WILDCARD_PROVES_ANSWER_EXPANDED;
+            dv->wildcardName = mDNSNULL;
+        }
+        return mDNSfalse;
+    }
+    return mDNStrue;
+}
+
+// Walk all the keys and for each key walk all the RRSIGS that signs the original rrset
+mDNSlocal mStatus ValidateSignature(DNSSECVerifier *dv, RRVerifier **resultKey, RRVerifier **resultRRSIG)
+{
+    RRVerifier *rrset;
+    RRVerifier *keyv;
+    RRVerifier *rrsigv;
+    RRVerifier *sig;
+    rdataDNSKey *key;
+    rdataRRSig *rrsig;
+    mDNSu16 tag;
+
+    rrset = dv->rrset;
+    sig = dv->rrsig;
+
+    for (keyv = dv->key; keyv; keyv = keyv->next)
+    {
+        key = (rdataDNSKey *)keyv->rdata;
+        tag = (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength);
+        for (rrsigv = sig; rrsigv; rrsigv = rrsigv->next)
+        {
+            rrsig = (rdataRRSig *)rrsigv->rdata;
+            // 7. The RRSIG RR's Signer's Name, Algorithm, and Key Tag fields MUST match the owner
+            //    name, algorithm, and key tag for some DNSKEY RR in the zone's apex DNSKEY RRset.
+            if (!SameDomainName((domainname *)&rrsig->signerName, &keyv->name))
+            {
+                debugdnssec("ValidateSignature: name mismatch");
+                continue;
+            }
+            if (key->alg != rrsig->alg)
+            {
+                debugdnssec("ValidateSignature: alg mismatch");
+                continue;
+            }
+            if (tag != swap16(rrsig->keyTag))
+            {
+                debugdnssec("ValidateSignature: keyTag mismatch rrsig tag %d(0x%x), keyTag %d(0x%x)", swap16(rrsig->keyTag),
+                            swap16(rrsig->keyTag), tag, tag);
+                continue;
+            }
+            // 8. The matching DNSKEY RR MUST be present in the zone's apex DNSKEY RRset, and MUST
+            //    have the Zone Flag bit (DNSKEY RDATA Flag bit 7) set.
+            if (!((swap16(key->flags)) & DNSKEY_ZONE_SIGN_KEY))
+            {
+                debugdnssec("ValidateSignature: ZONE flag bit not set");
+                continue;
+            }
+            debugdnssec("ValidateSignature:Found a key and RRSIG tag: %d", tag);
+            if (ValidateSignatureWithKey(dv, rrset, keyv, rrsigv))
+            {
+                LogDNSSEC("ValidateSignature: Validated successfully with key tag %d", tag);
+                *resultKey = keyv;
+                *resultRRSIG = rrsigv;
+                return mStatus_NoError;
+            }
+        }
+    }
+    *resultKey = mDNSNULL;
+    *resultRRSIG = mDNSNULL;
+    return mStatus_NoSuchRecord;
+}
+
+mDNSlocal mDNSBool ValidateSignatureWithKeyForAllRRSigs(DNSSECVerifier *dv, RRVerifier *rrset, RRVerifier *keyv, RRVerifier *sig)
+{
+    rdataRRSig *rrsig;
+    mDNSu16 tag;
+
+    while (sig)
+    {
+        rrsig = (rdataRRSig *)sig->rdata;
+        tag = (mDNSu16)keytag(keyv->rdata, keyv->rdlength);
+        if (tag == swap16(rrsig->keyTag))
+        {
+            if (ValidateSignatureWithKey(dv, rrset, keyv, sig))
+            {
+                LogDNSSEC("ValidateSignatureWithKeyForAllRRSigs: Validated");
+                return mDNStrue;
+            }
+        }
+        sig = sig->next;
+    }
+    return mDNSfalse;
+}
+
+mDNSlocal mStatus ValidateDS(DNSSECVerifier *dv)
+{
+    mDNSu8 *digest;
+    int digestLen;
+    domainname name;
+    rdataRRSig *rrsig;
+    rdataDS *ds;
+    rdataDNSKey *key;
+    RRVerifier *keyv;
+    RRVerifier *dsv;
+    mStatus algRet;
+
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+
+    // Walk all the DS Records to see if we have a matching DNS KEY record that verifies
+    // the hash. If we find one, verify that this key was used to sign the KEY rrsets in
+    // this zone. Loop till we find one.
+    for (dsv = dv->ds; dsv; dsv = dsv->next)
+    {
+        ds = (rdataDS *)dsv->rdata;
+        if ((ds->digestType != SHA1_DIGEST_TYPE) && (ds->digestType != SHA256_DIGEST_TYPE))
+        {
+            LogDNSSEC("ValidateDS: Unsupported digest %d", ds->digestType);
+            return mStatus_BadParamErr;
+        }
+        else debugdnssec("ValidateDS: digest type %d", ds->digestType);
+        for (keyv = dv->key; keyv; keyv = keyv->next)
+        {
+            key = (rdataDNSKey *)keyv->rdata;
+            mDNSu16 tag = (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength);
+            if (tag != swap16(ds->keyTag))
+            {
+                debugdnssec("ValidateDS:Not a valid keytag %d", tag);
+                continue;
+            }
+
+            if (DNSNameToLowerCase((domainname *)&rrsig->signerName, &name) != mStatus_NoError)
+            {
+                LogMsg("ValidateDS: ERROR!! cannot convert to lower case");
+                continue;
+            }
+
+            if (dv->ctx) AlgDestroy(dv->ctx);
+            dv->ctx = AlgCreate(DIGEST_ALG, ds->digestType);
+            if (!dv->ctx)
+            {
+                LogMsg("ValidateDS: ERROR!! Cannot allocate context");
+                continue;
+            }
+            digest = (mDNSu8 *)&ds->digest;
+            digestLen = dsv->rdlength - DS_FIXED_SIZE;
+
+            AlgAdd(dv->ctx, name.c, DomainNameLength(&name));
+            AlgAdd(dv->ctx, (const mDNSu8 *)key, keyv->rdlength);
+
+            algRet = AlgVerify(dv->ctx, mDNSNULL, 0, digest, digestLen);
+            AlgDestroy(dv->ctx);
+            dv->ctx = mDNSNULL;
+            if (algRet == mStatus_NoError)
+            {
+                LogDNSSEC("ValidateDS: DS Validated Successfully, need to verify the key %d", tag);
+                // We found the DNS KEY that is authenticated by the DS in our parent zone. Check to see if this key
+                // was used to sign the DNS KEY RRSET. If so, then the keys in our DNS KEY RRSET are valid
+                if (ValidateSignatureWithKeyForAllRRSigs(dv, dv->key, keyv, dv->rrsigKey))
+                {
+                    LogDNSSEC("ValidateDS: DS Validated Successfully %d", tag);
+                    return mStatus_NoError;
+                }
+            }
+        }
+    }
+    return mStatus_NoSuchRecord;
+}
+
+mDNSlocal mDNSBool UnlinkRRVerifier(DNSSECVerifier *dv, RRVerifier *elem, RRVerifierSet set)
+{
+    RRVerifier **v;
+
+    switch (set)
+    {
+    case RRVS_rr:
+        v = &dv->rrset;
+        break;
+    case RRVS_rrsig:
+        v = &dv->rrsig;
+        break;
+    case RRVS_key:
+        v = &dv->key;
+        break;
+    case RRVS_rrsig_key:
+        v = &dv->rrsigKey;
+        break;
+    case RRVS_ds:
+        v = &dv->ds;
+        break;
+    default:
+        LogMsg("UnlinkRRVerifier: ERROR!! default case %d", set);
+        return mDNSfalse;
+    }
+    while (*v && *v != elem)
+        v = &(*v)->next;
+    if (!(*v))
+    {
+        LogMsg("UnlinkRRVerifier: ERROR!! cannot find element in set %d", set);
+        return mDNSfalse;
+    }
+    *v = elem->next;                  // Cut this record from the list
+    elem->next = mDNSNULL;
+    return mDNStrue;
+}
+
+// This can link a single AuthChain element or a list of AuthChain elements to
+// DNSSECVerifier. The latter happens when we have multiple NSEC proofs and
+// we gather up all the proofs in one place.
+mDNSexport void AuthChainLink(DNSSECVerifier *dv, AuthChain *ae)
+{
+    AuthChain *head;
+
+    LogDNSSEC("AuthChainLink: called");
+
+    head = ae;
+    // Get to the last element
+    while (ae->next)
+        ae = ae->next;
+    *(dv->actail) = head;                // Append this record to tail of auth chain
+    dv->actail = &(ae->next);          // Advance tail pointer
+}
+
+mDNSlocal mDNSBool AuthChainAdd(DNSSECVerifier *dv, RRVerifier *resultKey, RRVerifier *resultRRSig)
+{
+    AuthChain *ae;
+    rdataDNSKey *key;
+    mDNSu16 tag;
+
+    if (!dv->rrset || !resultKey || !resultRRSig)
+    {
+        LogMsg("AuthChainAdd: ERROR!! input argument NULL");
+        return mDNSfalse;
+    }
+
+    // Unlink resultKey and resultRRSig and store as part of AuthChain
+    if (!UnlinkRRVerifier(dv, resultKey, RRVS_key))
+    {
+        LogMsg("AuthChainAdd: ERROR!! cannot unlink key");
+        return mDNSfalse;
+    }
+    if (!UnlinkRRVerifier(dv, resultRRSig, RRVS_rrsig))
+    {
+        LogMsg("AuthChainAdd: ERROR!! cannot unlink rrsig");
+        return mDNSfalse;
+    }
+
+    ae = mDNSPlatformMemAllocate(sizeof(AuthChain));
+    if (!ae)
+    {
+        LogMsg("AuthChainAdd: AuthChain alloc failure");
+        return mDNSfalse;
+    }
+
+    ae->next  = mDNSNULL;
+    ae->rrset = dv->rrset;
+    dv->rrset = mDNSNULL;
+
+    ae->rrsig = resultRRSig;
+    ae->key   = resultKey;
+
+    key = (rdataDNSKey *)resultKey->rdata;
+    tag = (mDNSu16)keytag((mDNSu8 *)key, resultKey->rdlength);
+    LogDNSSEC("AuthChainAdd: inserting AuthChain element with rrset %##s (%s), DNSKEY tag %d", ae->rrset->name.c, DNSTypeName(ae->rrset->rrtype), tag);
+
+    AuthChainLink(dv, ae);
+    return mDNStrue;
+}
+	
+// RFC 4035: Section 5.3.3
+//
+// If the resolver accepts the RRset as authentic, the validator MUST set the TTL of
+// the RRSIG RR and each RR in the authenticated RRset to a value no greater than the
+// minimum of:
+//
+//   o  the RRset's TTL as received in the response;
+//
+//   o  the RRSIG RR's TTL as received in the response;
+//
+//   o  the value in the RRSIG RR's Original TTL field; and
+//
+//   o  the difference of the RRSIG RR's Signature Expiration time and the
+//      current time.
+mDNSlocal void SetTTLRRSet(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status)
+{
+    DNSQuestion question;
+    CacheRecord *rr;
+    RRVerifier *rrsigv;
+    rdataRRSig *rrsig;
+    mDNSu32 slot;
+    CacheGroup *cg;
+    int sigNameLen, len;
+    mDNSu8 *ptr;
+    mDNSu32 rrTTL, rrsigTTL, rrsigOrigTTL, rrsigTimeTTL;
+    domainname *qname;
+    mDNSu16 qtype;
+    CacheRecord *rrsigRR;
+    mDNSs32 now;
+
+    debugdnssec("SetTTLRRSet called");
+
+    if (status == DNSSEC_Insecure || status == DNSSEC_Indeterminate)
+    {
+        LogDNSSEC("SetTTLRRSET: not setting ttl for status %s", DNSSECStatusName(status));
+        return;
+    }
+
+    mDNS_Lock(m);
+    now = m->timenow;
+    mDNS_Unlock(m);
+
+    mDNSPlatformMemZero(&question, sizeof(DNSQuestion));
+    rrTTL = rrsigTTL = rrsigOrigTTL = rrsigTimeTTL = 0;
+
+    // 1. Locate the rrset name and get its TTL (take the first one as a representative
+    // of the rrset). Ideally, we should set the TTL on the first validation. Instead,
+    // we do it whenever we validate which happens whenever a ValidationRequired question
+    // finishes validation. 
+    qname = &dv->origName;
+    qtype = dv->origType;
+
+    question.ThisQInterval = -1;
+    InitializeQuestion(m, &question, dv->InterfaceID, qname, qtype, mDNSNULL, mDNSNULL);
+    slot = HashSlot(&question.qname);
+    cg = CacheGroupForName(m, slot, question.qnamehash, &question.qname);
+
+    if (!cg)
+    {
+        LogMsg("SetTTLRRSet cg NULL for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        return;
+    }
+
+    for (rr = cg->members; rr; rr = rr->next)
+        if (SameNameRecordAnswersQuestion(&rr->resrec, &question))
+        {
+            // originalttl is never touched. The actual TTL is derived based on when it was
+            // received.
+            rrTTL = rr->resrec.rroriginalttl - (now - rr->TimeRcvd)/mDNSPlatformOneSecond;
+            break;
+        }
+
+    // Should we check to see if it matches the record in dv->ac->rrset ?
+    if (!rr)
+    {
+        LogMsg("SetTTLRRSet: ERROR!! cannot locate main rrset for %##s (%s)", qname->c, DNSTypeName(qtype));
+        return;
+    }
+
+
+    // 2. Get the RRSIG ttl. For NSEC records we need to get the NSEC record's TTL as
+    // the negative cache record that we created may not be right.
+
+    if (dv->ac && dv->ac->rrsig)
+    {
+        rrsigv = dv->ac->rrsig;
+        rrsig = (rdataRRSig *)rrsigv->rdata;
+        sigNameLen = DomainNameLength((domainname *)&rrsig->signerName);
+        // pointer to signature and the length
+        ptr = (mDNSu8 *)(rrsigv->rdata + sigNameLen + RRSIG_FIXED_SIZE);
+        len = rrsigv->rdlength - RRSIG_FIXED_SIZE - sigNameLen;
+    }
+    else
+    {
+        rrsigv = mDNSNULL;
+        rrsig = mDNSNULL;
+        ptr = mDNSNULL;
+        sigNameLen = len = 0;
+    }
+
+    rrsigRR = mDNSNULL;
+    if (rr->resrec.RecordType == kDNSRecordTypePacketNegative && status == DNSSEC_Secure)
+    {
+        CacheRecord *ncr;
+        rrTTL = 0;
+        for (ncr = rr->nsec; ncr; ncr = ncr->next)
+        {
+            if (ncr->resrec.rrtype == kDNSType_NSEC || ncr->resrec.rrtype == kDNSType_NSEC3)
+            {
+                rrTTL = ncr->resrec.rroriginalttl - (now - ncr->TimeRcvd)/mDNSPlatformOneSecond;
+                debugdnssec("SetTTLRRSet: NSEC TTL %u", rrTTL);
+            }
+            // Note: we can't use dv->origName here as the NSEC record's RRSIG may not match
+            // the original name
+            if (rrsigv && ncr->resrec.rrtype == kDNSType_RRSIG && SameDomainName(ncr->resrec.name, &rrsigv->name))
+            {
+                RDataBody2 *rdb = (RDataBody2 *)ncr->resrec.rdata->u.data;
+                rdataRRSig *sig = (rdataRRSig *)rdb->data;
+                if (rrsigv->rdlength != ncr->resrec.rdlength)
+                {
+                    debugdnssec("SetTTLRRSet length mismatch");
+                    continue;
+                }
+                if (mDNSPlatformMemSame(sig, rrsig, rrsigv->rdlength))
+                {
+                    mDNSu32 remain = (now - ncr->TimeRcvd)/mDNSPlatformOneSecond;
+                    rrsigTTL = ncr->resrec.rroriginalttl - remain;
+                    rrsigOrigTTL = swap32(rrsig->origTTL) - remain;
+                    rrsigTimeTTL = swap32(rrsig->sigExpireTime) - swap32(rrsig->sigInceptTime);
+                }
+            }
+            if (rrTTL && (!rrsigv || rrsigTTL)) break;
+        }
+    }
+    else if (rrsigv)
+    {
+        // Look for the matching RRSIG so that we can get its TTL
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+            if (rr->resrec.rrtype == kDNSType_RRSIG && SameDomainName(rr->resrec.name, &rrsigv->name))
+            {
+                RDataBody2 *rdb = (RDataBody2 *)rr->resrec.rdata->u.data;
+                rdataRRSig *sig = (rdataRRSig *)rdb->data;
+                if (rrsigv->rdlength != rr->resrec.rdlength)
+                {
+                    debugdnssec("SetTTLRRSet length mismatch");
+                    continue;
+                }
+                if (mDNSPlatformMemSame(sig, rrsig, rrsigv->rdlength))
+                {
+                    mDNSu32 remain = (now - rr->TimeRcvd)/mDNSPlatformOneSecond;
+                    rrsigTTL = rr->resrec.rroriginalttl - remain;
+                    rrsigOrigTTL = swap32(rrsig->origTTL) - remain;
+                    rrsigTimeTTL = swap32(rrsig->sigExpireTime) - swap32(rrsig->sigInceptTime);
+                    rrsigRR = rr;
+                    break;
+                }
+            }
+    }
+
+    // It is possible that there are no RRSIGs and in that case it is not an error
+    // to find the rrsigTTL.
+    if (!rrTTL || (rrsigv && (!rrsigTTL || !rrsigOrigTTL || !rrsigTimeTTL)))
+    {
+        LogDNSSEC("SetTTLRRSet: ERROR!! Bad TTL rrtl %u, rrsigTTL %u, rrsigOrigTTL %u, rrsigTimeTTL %u for %##s (%s)",
+               rrTTL, rrsigTTL, rrsigOrigTTL, rrsigTimeTTL, qname->c, DNSTypeName(qtype));
+        return;
+    }
+    LogDNSSEC("SetTTLRRSet: TTL rrtl %u, rrsigTTL %u, rrsigOrigTTL %u, rrsigTimeTTL %u for %##s (%s)",
+        rrTTL, rrsigTTL, rrsigOrigTTL, rrsigTimeTTL, qname->c, DNSTypeName(qtype));
+
+    if (status == DNSSEC_Bogus)
+    {
+        rrTTL = RR_BOGUS_TTL;
+        LogDNSSEC("SetTTLRRSet: setting to bogus TTL %d", rrTTL);
+    }
+
+    if (rrsigv)
+    {
+        if (rrsigTTL < rrTTL)
+            rrTTL = rrsigTTL;
+        if (rrsigOrigTTL < rrTTL)
+            rrTTL = rrsigOrigTTL;
+        if (rrsigTimeTTL < rrTTL)
+            rrTTL = rrsigTimeTTL;
+    }
+
+    // Set the rrsig's TTL. For NSEC records, rrsigRR is NULL which means it expires when
+    // the negative cache record expires.
+    if (rrsigRR)
+    {
+        rrsigRR->resrec.rroriginalttl = rrTTL;
+        rrsigRR->TimeRcvd = now;
+        rrsigRR->UnansweredQueries = 0;
+    }
+
+    // Find the RRset and set its TTL
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        if (SameNameRecordAnswersQuestion(&rr->resrec, &question))
+        {
+            LogDNSSEC("SetTTLRRSet: Setting the TTL %d for %s, question %##s (%s)", rrTTL, CRDisplayString(m, rr),
+                      question.qname.c, DNSTypeName(rr->resrec.rrtype));
+            rr->resrec.rroriginalttl = rrTTL;
+            rr->TimeRcvd = now;
+            rr->UnansweredQueries = 0;
+            SetNextCacheCheckTimeForRecord(m, rr);
+        }
+    }
+}
+
+mDNSlocal void FinishDNSSECVerification(mDNS *const m, DNSSECVerifier *dv)
+{
+    RRVerifier *resultKey;
+    RRVerifier *resultRRSig;
+
+    LogDNSSEC("FinishDNSSECVerification: all rdata sets available for sig verification for %##s (%s)",
+              dv->origName.c, DNSTypeName(dv->origType));
+
+    mDNS_StopQuery(m, &dv->q);
+    if (ValidateSignature(dv, &resultKey, &resultRRSig) == mStatus_NoError)
+    {
+        rdataDNSKey *key;
+        mDNSu16 tag;
+        key = (rdataDNSKey *)resultKey->rdata;
+        tag = (mDNSu16)keytag((mDNSu8 *)key, resultKey->rdlength);
+
+        LogDNSSEC("FinishDNSSECVerification: RRSIG validated by DNSKEY tag %d, %##s (%s)", tag, dv->rrset->name.c,
+                  DNSTypeName(dv->rrset->rrtype));
+
+        if (TrustedKey(m, dv) == mStatus_NoError)
+        {
+            // Need to call this after we called TrustedKey, as AuthChainAdd
+            // unlinks the resultKey and resultRRSig
+            if (!AuthChainAdd(dv, resultKey, resultRRSig))
+            {
+                dv->DVCallback(m, dv, DNSSEC_Bogus);
+                return;
+            }
+            // The callback will be called when NSEC verification is done.
+            if ((dv->flags & WILDCARD_PROVES_ANSWER_EXPANDED))
+            {
+                WildcardAnswerProof(m, dv);
+                return;
+            }
+            else
+            {
+                dv->DVCallback(m, dv, DNSSEC_Secure);
+                return;
+            }
+        }
+        if (!ValidateDS(dv))
+        {
+            // Need to call this after we called ValidateDS, as AuthChainAdd
+            // unlinks the resultKey and resultRRSig
+            if (!AuthChainAdd(dv, resultKey, resultRRSig))
+            {
+                dv->DVCallback(m, dv, DNSSEC_Bogus);
+                return;
+            }
+            FreeDNSSECVerifierRRSets(dv);
+            dv->recursed++;
+            if (dv->recursed < MAX_RECURSE_COUNT)
+            {
+                LogDNSSEC("FinishDNSSECVerification: Recursion level %d for %##s (%s)", dv->recursed, dv->origName.c,
+                          DNSTypeName(dv->origType));
+                VerifySignature(m, dv, &dv->q);
+                return;
+            }
+        }
+        else
+        {
+            LogDNSSEC("FinishDNSSECVerification: ValidateDS failed %##s (%s)", dv->rrset->name.c, DNSTypeName(dv->rrset->rrtype));
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return;
+        }
+    }
+    else
+    {
+        LogDNSSEC("FinishDNSSECVerification: Could not validate the rrset %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+}
+
+mDNSexport void StartDNSSECVerification(mDNS *const m, void *context)
+{
+    mDNSBool done;
+    DNSSECVerifier *dv = (DNSSECVerifier *)context;
+
+    done = GetAllRRSetsForVerification(m, dv);
+    if (done)
+    {
+        if (dv->next != RRVS_done)
+            LogMsg("StartDNSSECVerification: ERROR!! dv->next is not done");
+        else
+            LogDNSSEC("StartDNSSECVerification: all rdata sets available for sig verification");
+        FinishDNSSECVerification(m, dv);
+        return;
+    }
+    else debugdnssec("StartDNSSECVerification: all rdata sets not available for sig verification next %d", dv->next);
+}
+
+mDNSexport char *DNSSECStatusName(DNSSECStatus status)
+{
+    switch (status)
+    {
+    case DNSSEC_Secure: return "Secure";
+    case DNSSEC_Insecure: return "Insecure";
+    case DNSSEC_Indeterminate: return "Indeterminate";
+    case DNSSEC_Bogus: return "Bogus";
+    default: return "Invalid";
+    }
+}
+
+// We could not use GenerateNegativeResponse as it assumes m->CurrentQuestion to be set. Even if
+// we change that, we needs to fix its callers and so on. It is much simpler to call the callback.
+mDNSlocal void DeliverDNSSECStatus(mDNS *const m, DNSSECVerifier *dv, ResourceRecord *answer, DNSSECStatus status)
+{
+
+    // Can't use m->CurrentQuestion as it may already be in use
+    if (m->ValidationQuestion)
+        LogMsg("DeliverDNSSECStatus: ERROR!! m->ValidationQuestion already set: %##s (%s)",
+               m->ValidationQuestion->qname.c, DNSTypeName(m->ValidationQuestion->qtype));
+
+    BumpDNSSECStats(m, kStatsActionSet, kStatsTypeStatus, status);
+    BumpDNSSECStats(m, kStatsActionSet, kStatsTypeExtraPackets, dv->NumPackets);
+    mDNS_Lock(m);
+    BumpDNSSECStats(m, kStatsActionSet, kStatsTypeLatency, m->timenow - dv->StartTime);
+    mDNS_Unlock(m);
+
+    m->ValidationQuestion = m->Questions;
+    while (m->ValidationQuestion && m->ValidationQuestion != m->NewQuestions)
+    {
+        DNSQuestion *q = m->ValidationQuestion;
+
+        if (q->ValidatingResponse || !q->ValidationRequired ||
+           (q->ValidationState != DNSSECValInProgress) || !ResourceRecordAnswersQuestion(answer, q))
+        {
+            m->ValidationQuestion = q->next;
+            continue;
+        }
+
+        q->ValidationState = DNSSECValDone;
+        q->ValidationStatus = status;
+
+        MakeNegativeCacheRecord(m, &largerec.r, &q->qname, q->qnamehash, q->qtype, q->qclass, 60, mDNSInterface_Any, mDNSNULL);
+        if (q->qtype == answer->rrtype || status != DNSSEC_Secure)
+        {
+            LogDNSSEC("DeliverDNSSECStatus: Generating dnssec status %s for %##s (%s)", DNSSECStatusName(status),
+                q->qname.c, DNSTypeName(q->qtype));
+            if (q->QuestionCallback)
+            {
+                if (q->DNSSECAuthInfo)
+                    FreeDNSSECAuthChainInfo((AuthChain *)q->DNSSECAuthInfo);
+                q->DNSSECAuthInfo = AuthChainCopy(dv->ac);
+                q->DAIFreeCallback = FreeAuthChain;
+                q->QuestionCallback(m, q, &largerec.r.resrec, QC_dnssec);
+            }
+        }
+        else if (FollowCNAME(q, answer, QC_add))
+        {
+            LogDNSSEC("DeliverDNSSECStatus: Following CNAME dnssec status %s for %##s (%s)", DNSSECStatusName(status),
+                q->qname.c, DNSTypeName(q->qtype));
+            mDNS_Lock(m); 
+            AnswerQuestionByFollowingCNAME(m, q, answer);
+            mDNS_Unlock(m);
+        }
+
+        if (m->ValidationQuestion == q)    // If m->ValidationQuestion was not auto-advanced, do it ourselves now
+            m->ValidationQuestion = q->next;
+    }
+    m->ValidationQuestion = mDNSNULL;
+}
+
+// There is no work to be done if we could not validate DNSSEC (as the actual response for
+// the query has already been delivered) except in the case of CNAMEs where we did not follow
+// CNAMEs until we finished the DNSSEC processing.
+mDNSlocal void DNSSECNoResponse(mDNS *const m, DNSSECVerifier *dv)
+{
+    CacheGroup *cg;
+    CacheRecord *cr;
+    mDNSu32 slot, namehash;
+    ResourceRecord *answer = mDNSNULL;
+
+    LogDNSSEC("DNSSECNoResponse: called");
+
+    if (dv->ValidationRequired != DNSSEC_VALIDATION_SECURE_OPTIONAL)
+    {
+        LogMsg("DNSSECNoResponse: ERROR!! ValidationRequired incorrect %d", dv->ValidationRequired);
+        return;
+    }
+
+    BumpDNSSECStats(m, kStatsActionSet, kStatsTypeStatus, DNSSEC_NoResponse);
+
+    slot = HashSlot(&dv->origName);
+    namehash = DomainNameHashValue(&dv->origName);
+
+    cg = CacheGroupForName(m, (const mDNSu32)slot, namehash, &dv->origName);
+    if (!cg)
+    {
+        LogDNSSEC("DNSSECNoResponse: cg NULL for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+
+    InitializeQuestion(m, &dv->q, dv->InterfaceID, &dv->origName, dv->origType, mDNSNULL, mDNSNULL);
+
+    // We don't have to reset ValidatingResponse (unlike in DeliverDNSSECStatus) as there are no
+    // RRSIGs that can match the original question
+    for (cr = cg->members; cr; cr = cr->next)
+    {
+        if (SameNameRecordAnswersQuestion(&cr->resrec, &dv->q))
+        {
+            answer = &cr->resrec;
+            break;
+        }
+    }
+
+    // It is not an error for things to disappear underneath
+    if (!answer)
+    {
+        LogDNSSEC("DNSSECNoResponse: answer NULL for %##s, %s", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+    if (answer->rrtype == kDNSType_RRSIG)
+    {
+        LogDNSSEC("DNSSECNoResponse: RRSIG present for %##s, %s", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+
+    // Can't use m->CurrentQuestion as it may already be in use
+    if (m->ValidationQuestion)
+        LogMsg("DNSSECNoResponse: ERROR!! m->ValidationQuestion already set: %##s (%s)",
+               m->ValidationQuestion->qname.c, DNSTypeName(m->ValidationQuestion->qtype));
+
+    m->ValidationQuestion = m->Questions;
+    while (m->ValidationQuestion && m->ValidationQuestion != m->NewQuestions)
+    {
+        DNSQuestion *q = m->ValidationQuestion;
+
+        if (q->ValidatingResponse || !q->ValidationRequired ||
+           (q->ValidationState != DNSSECValInProgress) || !ResourceRecordAnswersQuestion(answer, q))
+        {
+            m->ValidationQuestion = q->next;
+            continue;
+        }
+
+        // If we could not validate e.g., zone was not signed or bad delegation etc., 
+        // disable validation. Ideally, for long outstanding questions, we should try again when
+        // we switch networks. But for now, keep it simple.
+        // 
+        // Note: If we followed a CNAME with no dnssec protection, it is even more important that
+        // we disable validation as we don't want to deliver a "secure" dnssec response later e.g.,
+        // it is possible that the CNAME is not secure but the address records are secure. In this
+        // case, we don't want to deliver the secure response later as we followed a CNAME that was
+        // not protected with DNSSEC.
+
+        q->ValidationRequired = 0;
+        q->ValidationState = DNSSECValNotRequired;
+        
+        if (FollowCNAME(q, answer, QC_add))
+        {
+            LogDNSSEC("DNSSECNoResponse: Following CNAME for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+            mDNS_Lock(m); 
+            AnswerQuestionByFollowingCNAME(m, q, answer);
+            mDNS_Unlock(m);
+        }
+
+        if (m->ValidationQuestion == q)    // If m->ValidationQuestion was not auto-advanced, do it ourselves now
+            m->ValidationQuestion = q->next;
+    }
+    m->ValidationQuestion = mDNSNULL;
+
+done:
+    FreeDNSSECVerifier(m, dv);
+}
+
+mDNSlocal void DNSSECPositiveValidationCB(mDNS *const m, DNSSECVerifier *dv, CacheGroup *cg, ResourceRecord *answer, DNSSECStatus status)
+{
+    RRVerifier *rrset;
+    RRVerifier *rv;
+    CacheRecord *cr;
+    mDNSu16 rrtype, rrclass;
+    CacheRecord *const lrr = &largerec.r;
+
+    LogDNSSEC("DNSSECPositiveValidationCB: called %s for %##s (%s)", DNSSECStatusName(status), dv->origName.c, DNSTypeName(dv->origType));
+
+    //
+    // 1. Check to see if the rrset that was validated is the same as in cache. If they are not same,
+    //    this validation result is not valid. When the rrset changed while the validation was in
+    //    progress, the act of delivering the changed rrset again should have kicked off another
+    //    verification.
+    //
+    // 2. Walk the question list to find the matching question. The original question that started
+    //    the DNSSEC verification may or may not be there. As long as there is a matching question
+    //    and waiting for the response, deliver the response.
+    //
+    // 3. If we are answering with CNAME, it is time to follow the CNAME if the response is secure
+
+    if (!dv->ac || status == DNSSEC_Insecure)
+    {
+        // For Insecure status, the auth chain contains information about the trust
+        // chain starting from the known trust anchor. The rrsets are not related to
+        // the origName like in Bogus or Secure.
+        if (!answer)
+            LogMsg("DNSSECPositiveValidationCB: ERROR: answer NULL");
+    }
+    else
+    {
+        if (!dv->ac->rrset)
+        {
+            LogMsg("DNSSECPositiveValidationCB: ERROR!! Validated RRSET NULL");
+            goto done;
+        }
+
+        rrset = dv->ac->rrset;
+        rrtype = rrset->rrtype;
+        rrclass = rrset->rrclass;
+    
+        lrr->resrec.name = &largerec.namestorage;
+
+        for (rv = dv->ac->rrset; rv; rv = rv->next)
+            rv->found = 0;
+
+        // Check to see if we can find all the elements in the rrset
+        for (cr = cg ? cg->members : mDNSNULL; cr; cr = cr->next)
+        {
+            if (cr->resrec.rrtype == rrtype && cr->resrec.rrclass == rrclass)
+            {
+                for (rv = dv->ac->rrset; rv; rv = rv->next)
+                {
+                    if (rv->rdlength == cr->resrec.rdlength && rv->rdatahash == cr->resrec.rdatahash)
+                    {
+                        lrr->resrec.namehash = rv->namehash;
+                        lrr->resrec.rrtype = rv->rrtype;
+                        lrr->resrec.rrclass = rv->rrclass;
+                        lrr->resrec.rdata = (RData*)&lrr->smallrdatastorage;
+                        lrr->resrec.rdata->MaxRDLength = MaximumRDSize;
+
+                        // Convert the "rdata" to a suitable form before we can call SameRDataBody which expects
+                        // some of the resource records in host order and also domainnames fully expanded. We
+                        // converted the resource records into network order for verification purpose and hence
+                        // need to convert them back again before comparing them.
+                        if (!SetRData(mDNSNULL, rv->rdata, rv->rdata + rv->rdlength, &largerec, rv->rdlength))
+                        {
+                            LogMsg("DNSSECPositiveValidationCB: SetRData failed for %##s (%s)", rv->name.c, DNSTypeName(rv->rrtype));
+                        }
+                        else if (SameRDataBody(&cr->resrec, &lrr->resrec.rdata->u, SameDomainName))
+                        {
+                            answer = &cr->resrec;
+                            rv->found = 1;
+                            break;
+                        }
+                    }
+                }
+                if (!rv)
+                {
+                    // The validated rrset does not have the element in the cache, re-validate
+                    LogDNSSEC("DNSSECPositiveValidationCB: CacheRecord %s, not found in the validated set", CRDisplayString(m, cr));
+                    goto done;
+                }
+            }
+        }
+        // Check to see if we have elements that were not in the cache
+        for (rv = dv->ac->rrset; rv; rv = rv->next)
+        {
+            if (!rv->found)
+            {
+                // We had more elements in the validated set, re-validate
+                LogDNSSEC("DNSSECPositiveValidationCB: Record %##s (%s) not found in the cache", rv->name.c, DNSTypeName(rv->rrtype));
+                goto done;
+            }
+        }
+    }
+
+    // It is not an error for things to disappear underneath
+    if (!answer)
+    {
+        LogDNSSEC("DNSSECPositiveValidationCB: answer NULL for %##s, %s", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+
+    DeliverDNSSECStatus(m, dv, answer, status);
+    SetTTLRRSet(m, dv, status);
+
+done:
+    FreeDNSSECVerifier(m, dv);
+}
+
+mDNSlocal void DNSSECNegativeValidationCB(mDNS *const m, DNSSECVerifier *dv, CacheGroup *cg, ResourceRecord *answer, DNSSECStatus status)
+{
+    RRVerifier *rv;
+    CacheRecord *cr;
+    mDNSu16 rrtype, rrclass;
+    AuthChain *ac;
+
+    LogDNSSEC("DNSSECNegativeValidationCB: called %s for %##s (%s)", DNSSECStatusName(status), dv->origName.c, DNSTypeName(dv->origType));
+
+    if (dv->parent)
+    {
+        // When NSEC/NSEC3s validation is completed, it calls the parent's DVCallback with the
+        // parent DNSSECVerifier which is the original one that started the verification. It itself
+        // should not have a parent. If the NSEC/NSEC3 validation results in another NSEC/NSEC3
+        // validation, it should chain up via the dv->parent all the way to the top.
+        LogMsg("DNSSECNegativeValidationCB: ERROR!! dv->parent is set for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+
+    // 1. Locate the negative cache record and check the cached NSEC/NSEC3 records to see if it matches the
+    //    NSEC/NSEC3s that were valiated. If the cached NSEC/NSEC3s changed while the validation was in progress,
+    //    we ignore the validation results.
+    //
+    // 2. Walk the question list to find the matching question. The original question that started
+    //    the DNSSEC verification may or may not be there. As long as there is a matching question
+    //    and waiting for the response, deliver the response.
+    //
+    if (!dv->ac || status == DNSSEC_Insecure)
+    {
+        // For Insecure status, the auth chain contains information about the trust
+        // chain starting from the known trust anchor. The rrsets are not related to
+        // the origName like in Bogus or Secure.
+        if (!answer)
+            LogMsg("DNSSECNegativeValidationCB: ERROR: answer NULL");
+    }
+    else
+    {
+        if (!dv->ac->rrset)
+        {
+            LogMsg("DNSSECNegativeValidationCB: ERROR!! Validated RRSET NULL");
+            goto done;
+        }
+
+        rrtype = dv->origType;
+        rrclass = dv->ac->rrset->rrclass;
+
+        for (ac = dv->ac; ac; ac = ac->next)
+        {
+            for (rv = ac->rrset; rv; rv = rv->next)
+            {
+                if (rv->rrtype == kDNSType_NSEC || rv->rrtype == kDNSType_NSEC3)
+                {
+                    LogDNSSEC("DNSSECNegativeValidationCB: Record %p %##s (%s) marking zero", rv, rv->name.c, DNSTypeName(rv->rrtype));
+                    rv->found = 0;
+                }
+            }
+        }
+
+        // Check to see if we can find all the elements in the rrset
+        for (cr = cg->members; cr; cr = cr->next)
+        {
+            if (cr->resrec.RecordType == kDNSRecordTypePacketNegative && 
+                cr->resrec.rrtype == rrtype && cr->resrec.rrclass == rrclass)
+            {
+                CacheRecord *ncr;
+                for (ncr = cr->nsec; ncr; ncr = ncr->next)
+                {
+                    // We have RRSIGs for the NSECs cached there too
+                    if (ncr->resrec.rrtype != kDNSType_NSEC && ncr->resrec.rrtype != kDNSType_NSEC3)
+                        continue;
+                    for (ac = dv->ac; ac; ac = ac->next)
+                    {
+                        for (rv = ac->rrset; rv; rv = rv->next)
+                        {
+                            if ((rv->rrtype == kDNSType_NSEC || rv->rrtype == kDNSType_NSEC3) && rv->rdlength == ncr->resrec.rdlength &&
+                                rv->rdatahash == ncr->resrec.rdatahash)
+                            {
+                                if (SameDomainName(ncr->resrec.name, &rv->name) &&
+                                    SameRDataBody(&ncr->resrec, (const RDataBody *)rv->rdata, SameDomainName))
+                                {
+                                    LogDNSSEC("DNSSECNegativeValidationCB: Record %p %##s (%s) marking one", rv, rv->name.c, DNSTypeName(rv->rrtype));
+                                    answer = &cr->resrec;
+                                    rv->found = 1;
+                                    break;
+                                }
+                            }
+                        }
+                        if (rv)
+                            break;
+                    }
+                }
+                if (!rv)
+                {
+                    // The validated rrset does not have the element in the cache, re-validate
+                    LogDNSSEC("DNSSECNegativeValidationCB: CacheRecord %s, not found in the validated set", CRDisplayString(m, cr));
+                    goto done;
+                }
+            }
+        }
+        // Check to see if we have elements that were not in the cache
+        for (ac = dv->ac; ac; ac = ac->next)
+        {
+            for (rv = ac->rrset; rv; rv = rv->next)
+            {
+                if (rv->rrtype == kDNSType_NSEC || rv->rrtype == kDNSType_NSEC3)
+                {
+                    if (!rv->found)
+                    {
+                        // We had more elements in the validated set, re-validate
+                        LogDNSSEC("DNSSECNegativeValidationCB: Record %p %##s (%s) not found in the cache", rv, rv->name.c, DNSTypeName(rv->rrtype));
+                        goto done;
+                    }
+                    rv->found = 0;
+                }
+            }
+        }
+    }
+
+    // It is not an error for things to disappear underneath
+    if (!answer)
+    {
+        LogDNSSEC("DNSSECNegativeValidationCB: answer NULL for %##s, %s", dv->origName.c, DNSTypeName(dv->origType));
+        goto done;
+    }
+
+    DeliverDNSSECStatus(m, dv, answer, status); 
+    SetTTLRRSet(m, dv, status);
+
+done:
+    FreeDNSSECVerifier(m, dv);
+}
+
+mDNSlocal void DNSSECValidationCB(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status)
+{
+    mDNSu32 slot, namehash;
+    CacheGroup *cg;
+    CacheRecord *cr;
+
+    LogDNSSEC("DNSSECValidationCB: called %s for %##s (%s)", DNSSECStatusName(status), dv->origName.c, DNSTypeName(dv->origType));
+
+    // Currently, if we receive anything other than secure, we abort DNSSEC validation for
+    // the optional case.
+    if (dv->ValidationRequired == DNSSEC_VALIDATION_SECURE_OPTIONAL && status != DNSSEC_Secure)
+    {
+        DNSSECNoResponse(m, dv);
+        return; 
+    }
+
+    if (dv->ValidationRequired == DNSSEC_VALIDATION_SECURE && !dv->InsecureProofDone && status == DNSSEC_Bogus)
+    {
+        dv->InsecureProofDone = 1;
+        ProveInsecure(m, dv, mDNSNULL, mDNSNULL);
+        return;
+    }
+    slot = HashSlot(&dv->origName);
+    namehash = DomainNameHashValue(&dv->origName);
+
+    cg = CacheGroupForName(m, (const mDNSu32)slot, namehash, &dv->origName);
+    if (!cg)
+    {
+        LogDNSSEC("DNSSECValidationCB: cg NULL for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        FreeDNSSECVerifier(m, dv);
+        return;
+    }
+    InitializeQuestion(m, &dv->q, dv->InterfaceID, &dv->origName, dv->origType, mDNSNULL, mDNSNULL);
+    // Need to be reset ValidatingResponse as we are looking for the cache record that would answer
+    // the original question
+    dv->q.ValidatingResponse = mDNSfalse;
+    for (cr = cg->members; cr; cr = cr->next)
+    {
+        if (SameNameRecordAnswersQuestion(&cr->resrec, &dv->q))
+        {
+            if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+                DNSSECNegativeValidationCB(m, dv, cg, &cr->resrec, status);
+            else
+                DNSSECPositiveValidationCB(m, dv, cg, &cr->resrec, status);
+            return;
+        }
+    }
+}
+
+mDNSexport void VerifySignature(mDNS *const m, DNSSECVerifier *dv, DNSQuestion *q)
+{
+    mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    CacheRecord *rr;
+    mDNSBool first = mDNSfalse;
+    static mDNSBool TrustAnchorsUpdated = mDNSfalse;
+
+    LogDNSSEC("VerifySignature called for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+    if (!TrustAnchorsUpdated)
+    {
+        TrustAnchorsUpdated = mDNStrue;
+        UpdateTrustAnchors(m);
+    }
+    if (!dv)
+    {
+        first = mDNStrue;
+        if (!q->qDNSServer || q->qDNSServer->cellIntf)
+        {
+            LogDNSSEC("VerifySignature: Disabled");
+            return;
+        }
+        // We assume that the verifier's question has been initialized here so that ValidateWithNSECS below
+        // knows what it has prove the non-existence of.
+        dv = AllocateDNSSECVerifier(m, &q->qname, q->qtype, q->InterfaceID, q->ValidationRequired, DNSSECValidationCB, VerifySigCallback);
+        if (!dv)
+        {
+            LogMsg("VerifySignature: ERROR!! memory alloc failed");
+            return;
+        }
+    }
+
+    // If we find a CNAME response to the question, remember what qtype
+    // caused the CNAME response. origType is not sufficient as we
+    // recursively validate the response and origType is initialized above
+    // the first time this function is called.
+    dv->currQtype = q->qtype;
+
+    // Walk the cache and get all the rrsets for verification.
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+        if (SameNameRecordAnswersQuestion(&rr->resrec, q))
+        {
+            // We also get called for RRSIGs which matches qtype. We don't need that here as we are
+            // building rrset for matching q->qname. Checking for RRSIG type is important as otherwise
+            // we would miss the CNAME answering any qtype.
+            if (rr->resrec.rrtype == kDNSType_RRSIG && rr->resrec.rrtype != q->qtype)
+            {
+                LogDNSSEC("VerifySignature: Question %##s (%s) answered with RRSIG record %s, not using it", q->qname.c, DNSTypeName(q->qtype), CRDisplayString(m, rr));
+                continue;
+            }
+
+            // See DNSSECRecordAnswersQuestion: This should never happen. NSEC records are
+            // answered directly only when the qtype is NSEC. Otherwise, NSEC records are
+            // used only for denial of existence and hence should go through negative cache
+            // entry.
+            if (rr->resrec.rrtype == kDNSType_NSEC && q->qtype != kDNSType_NSEC)
+            {
+                LogMsg("VerifySignature: ERROR!! Question %##s (%s) answered using NSEC record %s", q->qname.c, DNSTypeName(q->qtype), CRDisplayString(m, rr));
+                continue;
+            }
+
+            // We might get a NSEC response when we first send the query out from the "core" for ValidationRequired
+            // questions. Later as part of validating the response, we might get a NSEC response.
+            if (rr->resrec.RecordType == kDNSRecordTypePacketNegative && DNSSECQuestion(q))
+            {
+                // If we can't find the NSEC, we can't validate. This can happens if we are
+                // behind a non-DNSSEC aware CPE/server.
+                if (!rr->nsec)
+                {
+                    LogDNSSEC("VerifySignature: No nsecs found for %s", CRDisplayString(m, rr));
+                    dv->DVCallback(m, dv, DNSSEC_Bogus);
+                    return;
+                }
+                ValidateWithNSECS(m, dv, rr);
+                return;
+            }
+
+            if (AddRRSetToVerifier(dv, &rr->resrec, mDNSNULL, RRVS_rr) != mStatus_NoError)
+            {
+                dv->DVCallback(m, dv, DNSSEC_Bogus);
+                return;
+            }
+        }
+    if (!dv->rrset)
+    {
+        LogMsg("VerifySignature: rrset mDNSNULL for %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+    dv->next = RRVS_rrsig;
+    // Delay this so that the mDNS "core" can deliver all the results before
+    // we can deliver the dnssec result
+    if (first)
+    {
+        mDNSPlatformDispatchAsync(m, dv, StartDNSSECVerification);
+    }
+    else
+    {
+        StartDNSSECVerification(m, dv);
+    }
+}
+
+mDNSlocal mDNSBool TrustedKeyPresent(mDNS *const m, DNSSECVerifier *dv)
+{
+    rdataRRSig *rrsig;
+    rdataDS *ds;
+    rdataDNSKey *key;
+    TrustAnchor *ta;
+    RRVerifier *keyv;
+
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+
+    // Walk all our trusted DS Records to see if we have a matching DNS KEY record that verifies
+    // the hash. If we find one, verify that this key was used to sign the KEY rrsets in
+    // this zone. Loop till we find one.
+    for (ta = m->TrustAnchors; ta; ta = ta->next)
+    {
+        ds = (rdataDS *)&ta->rds;
+        if ((ds->digestType != SHA1_DIGEST_TYPE) && (ds->digestType != SHA256_DIGEST_TYPE))
+        {
+            LogMsg("TrustedKeyPresent: Unsupported digest %d", ds->digestType);
+            continue;
+        }
+        else
+        {
+            debugdnssec("TrustedKeyPresent: digest type %d", ds->digestType);
+        }
+        for (keyv = dv->key; keyv; keyv = keyv->next)
+        {
+            key = (rdataDNSKey *)keyv->rdata;
+            mDNSu16 tag = (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength);
+            if (tag != ds->keyTag)
+            {
+                debugdnssec("TrustedKeyPresent:Not a valid keytag %d", tag);
+                continue;
+            }
+            if (!SameDomainName(&keyv->name, &ta->zone))
+            {
+                debugdnssec("TrustedKeyPresent: domainame mismatch key %##s, ta %##s", keyv->name.c, ta->zone.c);
+                continue;
+            }
+            return mDNStrue;
+        }
+    }
+    return mDNSfalse;
+}
+
+mDNSlocal mStatus TrustedKey(mDNS *const m, DNSSECVerifier *dv)
+{
+    mDNSu8 *digest;
+    int digestLen;
+    domainname name;
+    rdataRRSig *rrsig;
+    rdataDS *ds;
+    rdataDNSKey *key;
+    TrustAnchor *ta;
+    RRVerifier *keyv;
+    mStatus algRet;
+    mDNSu32 currTime = mDNSPlatformUTC();
+
+    rrsig = (rdataRRSig *)dv->rrsig->rdata;
+
+    // Walk all our trusted DS Records to see if we have a matching DNS KEY record that verifies
+    // the hash. If we find one, verify that this key was used to sign the KEY rrsets in
+    // this zone. Loop till we find one.
+    for (ta = m->TrustAnchors; ta; ta = ta->next)
+    {
+        ds = (rdataDS *)&ta->rds;
+        if ((ds->digestType != SHA1_DIGEST_TYPE) && (ds->digestType != SHA256_DIGEST_TYPE))
+        {
+            LogMsg("TrustedKey: Unsupported digest %d", ds->digestType);
+            continue;
+        }
+        else
+        {
+            debugdnssec("TrustedKey: Zone %##s, digest type %d, tag %d", ta->zone.c, ds->digestType, ds->keyTag);
+        }
+        for (keyv = dv->key; keyv; keyv = keyv->next)
+        {
+            key = (rdataDNSKey *)keyv->rdata;
+            mDNSu16 tag = (mDNSu16)keytag((mDNSu8 *)key, keyv->rdlength);
+            if (tag != ds->keyTag)
+            {
+                debugdnssec("TrustedKey:Not a valid keytag %d", tag);
+                continue;
+            }
+            if (!SameDomainName(&keyv->name, &ta->zone))
+            {
+                debugdnssec("TrustedKey: domainame mismatch key %##s, ta %##s", keyv->name.c, ta->zone.c);
+                continue;
+            }
+            if (DNS_SERIAL_LT(ta->validUntil, currTime))
+            {
+                LogDNSSEC("TrustedKey: Expired: currentTime %d, ExpireTime %d", (int)currTime, ta->validUntil);
+                continue;
+            }
+            if (DNS_SERIAL_LT(currTime, ta->validFrom))
+            {
+                LogDNSSEC("TrustedKey: Future: currentTime %d, InceptTime %d", (int)currTime, ta->validFrom);
+                continue;
+            }
+
+            if (DNSNameToLowerCase((domainname *)&rrsig->signerName, &name) != mStatus_NoError)
+            {
+                LogMsg("TrustedKey: ERROR!! cannot convert to lower case");
+                continue;
+            }
+
+            if (dv->ctx) AlgDestroy(dv->ctx);
+            dv->ctx = AlgCreate(DIGEST_ALG, ds->digestType);
+            if (!dv->ctx)
+            {
+                LogMsg("TrustedKey: ERROR!! No digest support");
+                continue;
+            }
+            digest = ds->digest;
+            digestLen = ta->digestLen;
+
+            AlgAdd(dv->ctx, name.c, DomainNameLength(&name));
+            AlgAdd(dv->ctx, (const mDNSu8 *)key, keyv->rdlength);
+
+            algRet = AlgVerify(dv->ctx, mDNSNULL, 0, digest, digestLen);
+            AlgDestroy(dv->ctx);
+            dv->ctx = mDNSNULL;
+            if (algRet == mStatus_NoError)
+            {
+                LogDNSSEC("TrustedKey: DS Validated Successfully, need to verify the key %d", tag);
+                // We found the DNS KEY that is authenticated by the DS in our parent zone. Check to see if this key
+                // was used to sign the DNS KEY RRSET. If so, then the keys in our DNS KEY RRSET are valid
+                if (ValidateSignatureWithKeyForAllRRSigs(dv, dv->key, keyv, dv->rrsigKey))
+                {
+                    LogDNSSEC("TrustedKey: DS Validated Successfully %d", tag);
+                    return mStatus_NoError;
+                }
+            }
+        }
+    }
+    return mStatus_NoSuchRecord;
+}
+
+mDNSlocal CacheRecord* NegativeCacheRecordForRR(mDNS *const m, const ResourceRecord *const rr)
+{
+    mDNSu32 slot;
+    mDNSu32 namehash;
+    CacheGroup *cg;
+    CacheRecord *cr;
+
+    slot = HashSlot(rr->name);
+    namehash = DomainNameHashValue(rr->name);
+    cg = CacheGroupForName(m, slot, namehash, rr->name);
+    if (!cg)
+    {
+        LogMsg("NegativeCacheRecordForRR: cg null %##s", rr->name->c);
+        return mDNSNULL;
+    }
+    for (cr=cg->members; cr; cr=cr->next)
+    {
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative && (&cr->resrec == rr))
+            return cr;
+    }
+    return mDNSNULL;
+}
+
+mDNSlocal void VerifySigCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    DNSSECVerifier *dv = (DNSSECVerifier *)question->QuestionContext;
+    mDNSu16 rrtype;
+    CacheRecord *negcr;
+
+    debugdnssec("VerifySigCallback: AddRecord %d, dv %p", AddRecord, dv);
+
+    if (!AddRecord)
+        return;
+
+    // After the first ADD event, we should ideally stop the question. If we don't stop
+    // the question, we might get more callbacks and that can cause problems. For example,
+    // in the first callback, we could start a insecure proof and while that is in progress,
+    // if we get more callbacks, we will try to start another insecure proof. As we already
+    // started an insecure proof, we won't start another but terminate the verification
+    // process where we free the current DNSSECVerifier while the first insecure proof is
+    // still referencing it.
+    //
+    // But there are cases below which might return if we have not received the right answer
+    // yet e.g., no RRSIGs. In that case if the question is stopped, we will never get any
+    // callbacks again and also we leak "dv". Hence it is important that we either process
+    // the result or wait for more results. Note that the question eventually times out
+    // and cleans up the "dv" i.e., we don't wait forever.
+    
+    if (!answer)
+    {
+        LogDNSSEC("VerifySigCallback: Question %##s (%s) no dnssec response", question->qname.c, DNSTypeName(question->qtype));
+        mDNS_StopQuery(m, question);
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+
+    LogDNSSEC("VerifySigCallback(%p): Called with record %s for question %##s (%s)", dv, RRDisplayString(m, answer), question->qname.c,
+        DNSTypeName(question->qtype));
+    mDNS_Lock(m);
+    if ((m->timenow - question->StopTime) >= 0)
+    {
+        mDNS_Unlock(m);
+        LogDNSSEC("VerifySigCallback: Question %##s (%s) timed out", question->qname.c, DNSTypeName(question->qtype));
+        mDNS_StopQuery(m, question);
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+    mDNS_Unlock(m);
+
+    if (answer->RecordType == kDNSRecordTypePacketNegative)
+    {
+        CacheRecord *cr;
+        LogDNSSEC("VerifySigCallback: Received a negative answer with record %s, AddRecord %d",
+                  RRDisplayString(m, answer), AddRecord);
+        mDNS_StopQuery(m, question);
+        cr = NegativeCacheRecordForRR(m, answer);
+        if (cr && cr->nsec)
+        {
+            ValidateWithNSECS(m, dv, cr);
+        }
+        else
+        {
+            
+            LogDNSSEC("VerifySigCallback: Missing record (%s) Negative Cache Record %p", RRDisplayString(m, answer), cr);
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+        }
+        return;
+    }
+
+    if (!dv->rrset)
+    {
+        LogMsg("VerifySigCallback: ERROR!! rrset NULL");
+        mDNS_StopQuery(m, question);
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+
+    rrtype = answer->rrtype;
+    // Check whether we got any answers for the question. If there are no answers, we
+    // can't do the verification.
+    //
+    // We need to look at the whole rrset for verifying the signatures. This callback gets
+    // called back for each record in the rrset sequentially and we won't know when to start the
+    // verification. Hence, we look for all the records in the rrset ourselves using the
+    // CheckXXX function below. The caller has to ensure that all the records in the rrset are
+    // added to the cache before calling this callback which happens naturally because all
+    // unicast records are marked for DelayDelivery and hence added to the cache before the
+    // callback is done.
+    //
+    // We also need the RRSIGs for the rrset to do the validation. It is possible that the
+    // cache contains RRSIG records but it may not be a valid record when we filter them
+    // in CheckXXX function. For example, some application can query for RRSIG records which
+    // might come back with a partial set of RRSIG records from the recursive server and
+    // they may not be the right ones for the current validation. In this case, we still
+    // need to send the query out to get the right RRSIGs but the "core" should not answer
+    // this query with the same records that we checked and found them to be unusable.
+    //
+    // We handle this in two ways:
+    //
+    // 1) AnswerNewQuestion always sends the "ValidatingResponse" query out bypassing the cache.
+    //
+    // 2) DNSSECRecordAnswersQuestion does not answer a question with RRSIGs matching the
+    //    same name as the query until the typeCovered also matches the query's type.
+    //
+    // NOTE: We use "next - 1" as next always points to what we are going to fetch next and not the one
+    // we are fetching currently
+    switch(dv->next - 1)
+    {
+    case RRVS_rr:
+        // Verification always starts at RRVS_rrsig (which means dv->next points at RRVS_key) as verification does
+        // not begin until we have the main rrset.
+        LogDNSSEC("VerifySigCallback: ERROR!! rrset %##s dv->next is RRVS_rr", dv->rrset->name.c);
+        return;
+    case RRVS_rrsig:
+        // We can get called back with rrtype matching qtype as new records are added to the cache
+        // triggered by other questions. This could potentially mean that the rrset that is being
+        // validated by this "dv" whose rrsets were initialized at the beginning of the verification
+        // may not be the right one. If this case happens, we will detect this at the end of validation
+        // and throw away the validation results. This should not be a common case.
+        if (rrtype != kDNSType_RRSIG)
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_rrsig called with %s", RRDisplayString(m, answer));
+            return;
+        }
+        mDNS_StopQuery(m, question);
+        if (CheckRRSIGForRRSet(m, dv, &negcr) != mStatus_NoError)
+        {
+            LogDNSSEC("VerifySigCallback: Unable to find RRSIG for %##s (%s), question %##s", dv->rrset->name.c,
+                      DNSTypeName(dv->rrset->rrtype), question->qname.c);
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return;
+        }
+        break;
+    case RRVS_key:
+        // We are waiting for the DNSKEY record and hence dv->key should be NULL. If RRSIGs are being
+        // returned first, ignore them for now.
+        if (dv->key)
+            LogDNSSEC("VerifySigCallback: ERROR!! RRVS_key dv->key non-NULL for %##s", question->qname.c);
+        if (rrtype == kDNSType_RRSIG)
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_key rrset type %s, %##s received before DNSKEY", DNSTypeName(rrtype), question->qname.c);
+            return;
+        }
+        if (rrtype != question->qtype)
+        {
+            LogDNSSEC("VerifySigCallback: ERROR!! RRVS_key rrset type %s, %##s not matching qtype %d", DNSTypeName(rrtype), question->qname.c,
+                question->qtype);
+            return;
+        }
+        mDNS_StopQuery(m, question);
+        if (CheckKeyForRRSIG(m, dv, &negcr) != mStatus_NoError)
+        {
+            LogDNSSEC("VerifySigCallback: Unable to find DNSKEY for %##s (%s), question %##s", dv->rrset->name.c,
+                      DNSTypeName(dv->rrset->rrtype), question->qname.c);
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return;
+        }
+        break;
+    case RRVS_rrsig_key:
+        // If we are in RRVS_rrsig_key, it means that we already found the relevant DNSKEYs (dv->key should be non-NULL).
+        // If DNSKEY record is being returned i.e., it means it is being added to the cache, then it can't be in our
+        // list.
+        if (!dv->key)
+            LogDNSSEC("VerifySigCallback: ERROR!! RRVS_rrsig_key dv->key NULL for %##s", question->qname.c);
+        if (rrtype == question->qtype)
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_rrsig_key rrset type %s, %##s", DNSTypeName(rrtype), question->qname.c);
+            CheckOneKeyForRRSIG(dv, answer);
+            return;
+        }
+        if (rrtype != kDNSType_RRSIG)
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_rrsig_key rrset type %s, %##s not matching qtype %d", DNSTypeName(rrtype), question->qname.c,
+                question->qtype);
+            return;
+        }
+        mDNS_StopQuery(m, question);
+        if (CheckRRSIGForKey(m, dv, &negcr) != mStatus_NoError)
+        {
+            LogDNSSEC("VerifySigCallback: Unable to find RRSIG for %##s (%s), question %##s", dv->rrset->name.c,
+                      DNSTypeName(dv->rrset->rrtype), question->qname.c);
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+            return;
+        }
+        break;
+    case RRVS_ds:
+        if (rrtype == question->qtype)
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_ds rrset type %s, %##s", DNSTypeName(rrtype), question->qname.c);
+        }
+        else
+        {
+            LogDNSSEC("VerifySigCallback: RRVS_ds rrset type %s, %##s received before DS", DNSTypeName(rrtype), question->qname.c);
+        }
+        mDNS_StopQuery(m, question);
+        // It is not an error if we don't find the DS record as we could have
+        // a trusted key. Or this is not a secure delegation which will be handled
+        // below.
+        if (CheckDSForKey(m, dv, &negcr) != mStatus_NoError)
+        {
+            LogDNSSEC("VerifySigCallback: Unable find DS for %##s (%s), question %##s", dv->rrset->name.c,
+                      DNSTypeName(dv->rrset->rrtype), question->qname.c);
+        }
+        // dv->next is already at RRVS_done, so if we "break" from here, we will end up
+        // in FinishDNSSECVerification. We should not do that if we receive a negative
+        // response. For all other cases above, GetAllRRSetsForVerification handles
+        // negative cache record
+        if (negcr)
+        {
+            if (!negcr->nsec)
+            {
+                LogDNSSEC("VerifySigCallback: No nsec records for %##s (DS)", dv->ds->name.c);
+                dv->DVCallback(m, dv, DNSSEC_Bogus);
+                return;
+            }
+            ValidateWithNSECS(m, dv, negcr);
+            return;
+        }
+        break;
+    default:
+        LogDNSSEC("VerifySigCallback: ERROR!! default case rrset %##s question %##s", dv->rrset->name.c, question->qname.c);
+        mDNS_StopQuery(m, question);
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+    if (dv->next != RRVS_done)
+    {
+        mDNSBool done = GetAllRRSetsForVerification(m, dv);
+        if (done)
+        {
+            if (dv->next != RRVS_done)
+                LogMsg("VerifySigCallback ERROR!! dv->next is not done");
+            else
+                LogDNSSEC("VerifySigCallback: all rdata sets available for sig verification");
+        }
+        else
+        {
+            LogDNSSEC("VerifySigCallback: all rdata sets not available for sig verification");
+            return;
+        }
+    }
+    FinishDNSSECVerification(m, dv);
+}
+
+mDNSlocal TrustAnchor *FindTrustAnchor(mDNS *const m, const domainname *const name)
+{
+    TrustAnchor *ta;
+    TrustAnchor *matchTA = mDNSNULL;
+    TrustAnchor *rootTA = mDNSNULL;
+    int currmatch = 0;
+    int match;
+    mDNSu32 currTime = mDNSPlatformUTC();
+
+    for (ta = m->TrustAnchors; ta; ta = ta->next)
+    {
+        if (DNS_SERIAL_LT(ta->validUntil, currTime))
+        {
+            LogDNSSEC("FindTrustAnchor: Expired: currentTime %d, ExpireTime %d", (int)currTime, ta->validUntil);
+            continue;
+        }
+        if (DNS_SERIAL_LT(currTime, ta->validFrom))
+        {
+            LogDNSSEC("FindTrustAnchor: Future: currentTime %d, InceptTime %d", (int)currTime, ta->validFrom);
+            continue;
+        }
+
+        if (SameDomainName((const domainname *)"\000", &ta->zone))
+            rootTA = ta;
+
+        match = CountLabelsMatch(&ta->zone, name);
+        if (match > currmatch)
+        {
+            currmatch = match;
+            matchTA = ta;
+        }
+    }
+    if (matchTA)
+    {
+        LogDNSSEC("FindTrustAnhcor: matched %##s", matchTA->zone.c);
+        return matchTA;
+    }
+    else if (rootTA)
+    {
+        LogDNSSEC("FindTrustAnhcor: matched rootTA %##s", rootTA->zone.c);
+        return rootTA;
+    }
+    else
+    {
+        LogDNSSEC("FindTrustAnhcor: No Trust Anchor");
+        return mDNSNULL;
+    }
+}
+
+mDNSlocal void DeliverInsecureProofResultAsync(mDNS *const m, void *context)
+{
+    InsecureContext *ic = (InsecureContext *)context;
+    ic->dv->DVCallback(m, ic->dv, ic->status);
+    if (ic->q.ThisQInterval != -1)
+    {
+        LogMsg("DeliverInsecureProofResultAsync: ERROR!! Question %##s (%s) not stopped already", ic->q.qname.c, DNSTypeName(ic->q.qtype));
+        mDNS_StopQuery(m, &ic->q);
+    }
+    mDNSPlatformMemFree(ic);
+}
+
+mDNSlocal void DeliverInsecureProofResult(mDNS *const m, InsecureContext *ic, DNSSECStatus status)
+{
+    // If the status is Bogus, restore the original auth chain before the insecure
+    // proof.
+    if (status == DNSSEC_Bogus)
+    {
+        LogDNSSEC("DeliverInsecureProofResult: Restoring the auth chain");
+        if (ic->dv->ac)
+        {
+            FreeDNSSECAuthChainInfo(ic->dv->ac);
+        }
+        ResetAuthChain(ic->dv);
+        ic->dv->ac = ic->dv->saveac;
+        if (ic->dv->ac)
+        {
+            AuthChain *tmp = ic->dv->ac;
+            AuthChain **tail = &tmp->next;
+            while (tmp->next)
+            {
+                tail = &tmp->next;
+                tmp = tmp->next;
+            }
+            ic->dv->actail = tail;
+        }
+        ic->dv->saveac = mDNSNULL;
+    }
+    else if (ic->dv->saveac)
+    {
+        FreeDNSSECAuthChainInfo(ic->dv->saveac);
+        ic->dv->saveac = mDNSNULL;
+    }
+    ic->status = status;
+    // Stop the question before we schedule the block so that we don't receive additional
+    // callbacks again. Once the block runs, it will free the "ic" and you can't
+    // have another block queued up. This can happen if we receive a callback after we
+    // queue the block below.
+    if (ic->q.ThisQInterval != -1)
+        mDNS_StopQuery(m, &ic->q);
+    mDNSPlatformDispatchAsync(m, ic, DeliverInsecureProofResultAsync);
+}
+
+mDNSlocal mDNSBool AlgorithmSupported(rdataDS *ds)
+{
+    switch(ds->digestType)
+    {
+    case SHA1_DIGEST_TYPE:
+    case SHA256_DIGEST_TYPE:
+        break;
+    default:
+        LogDNSSEC("AlgorithmSupported: Unsupported digest %d", ds->digestType);
+        return mDNSfalse;
+    }
+
+    switch(ds->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+    case CRYPTO_RSA_SHA256:
+    case CRYPTO_RSA_SHA512:
+        return mDNStrue;
+    default:
+        LogDNSSEC("AlgorithmSupported: Unsupported algorithm %d", ds->alg);
+        return mDNSfalse;
+    }
+}
+
+// Note: This function is called when DNSSEC results are delivered (from DeliverDNSSECStatus) and we can't deliver DNSSEC result
+// again within this function as "m->ValidationQuestion" is already in use. Hence we should dispatch off the delivery of insecure
+// results asynchronously.
+//
+// Insecure proof callback can deliver either insecure or bogus, but never secure result.
+mDNSlocal void ProveInsecureCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    InsecureContext *ic = (InsecureContext *)question->QuestionContext;
+    DNSSECVerifier *pdv = ic->dv;
+    AuthChain *ac;
+
+    (void) answer;
+
+    if (!AddRecord)
+        return;
+
+    mDNS_Lock(m);
+    if ((m->timenow - question->StopTime) >= 0)
+    {
+        mDNS_Unlock(m);
+        LogDNSSEC("ProveInsecureCallback: Question %##s (%s) timed out", question->qname.c, DNSTypeName(question->qtype));
+        DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+        return;
+    }
+    mDNS_Unlock(m);
+
+    // We only need to handle the actual DNSSEC results and the ones that are secure. Anything else results in
+    // bogus.
+    if (AddRecord != QC_dnssec)
+    {
+        LogDNSSEC("ProveInsecureCallback: Question %##s (%s), AddRecord %d, answer %s", question->qname.c,
+            DNSTypeName(question->qtype), AddRecord, RRDisplayString(m, answer));
+        return;
+    }
+
+    LogDNSSEC("ProveInsecureCallback: ic %p Question %##s (%s), DNSSEC status %s", ic, question->qname.c, DNSTypeName(question->qtype),
+            DNSSECStatusName(question->ValidationStatus));
+
+    // Insecure is delivered for NSEC3 OptOut 
+    if (question->ValidationStatus != DNSSEC_Secure && question->ValidationStatus != DNSSEC_Insecure)
+    {
+        LogDNSSEC("ProveInsecureCallback: Question %##s (%s) returned DNSSEC status %s", question->qname.c,
+            DNSTypeName(question->qtype), DNSSECStatusName(question->ValidationStatus));
+        goto done;
+    }
+    ac = (AuthChain *)question->DNSSECAuthInfo;
+    if (!ac)
+    {
+        LogDNSSEC("ProveInsecureCallback: ac NULL for question %##s, %s", question->qname.c, DNSTypeName(question->qtype));
+        goto done;
+    }
+    if (!ac->rrset)
+    {
+        LogDNSSEC("ProveInsecureCallback: ac->rrset NULL for question %##s, %s", question->qname.c, DNSTypeName(question->qtype));
+        goto done;
+    }
+    if (ac->rrset->rrtype != kDNSType_DS && ac->rrset->rrtype != kDNSType_NSEC && ac->rrset->rrtype != kDNSType_NSEC3)
+    {
+        LogDNSSEC("ProveInsecureCallback: ac->rrset->rrtype %##s (%s) not handled", ac->rrset->name.c,
+            DNSTypeName(ac->rrset->rrtype));
+        goto done;
+    }
+    AuthChainLink(pdv, ac);
+    question->DNSSECAuthInfo = mDNSNULL;
+    if (ac->rrset->rrtype == kDNSType_DS)
+    {
+        rdataDS *ds = (rdataDS *)ac->rrset->rdata;
+
+        // If the delegation is secure, but the underlying zone is signed with an unsupported
+        // algorithm, then we can't verify it. Deliver insecure in that case.
+        if (!AlgorithmSupported(ds))
+        {
+            LogDNSSEC("ProveInsecureCallback: Unsupported algorithm %d or digest %d", ds->alg, ds->digestType);
+            DeliverInsecureProofResult(m, ic, DNSSEC_Insecure);
+            return;
+        }
+
+        // If the delegation is secure and the name that we queried for is same as the original
+        // name that started the insecure proof, then something is not right. We started the
+        // insecure proof e.g., the zone is not signed, but we are able to validate a DS for
+        // the same name which implies that the zone is signed (whose algorithm we support) and
+        // we should not have started the insecurity proof in the first place.
+        if (SameDomainName(&question->qname, &pdv->origName))
+        {
+            LogDNSSEC("ProveInsecureCallback: Insecure proof reached original name %##s, error", question->qname.c);
+            DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+            return;
+        }
+
+        LogDNSSEC("ProveInsecureCallback: Trying one more level down");
+        ProveInsecure(m, pdv, ic, mDNSNULL);
+    }
+    else if (ac->rrset->rrtype == kDNSType_NSEC || ac->rrset->rrtype == kDNSType_NSEC3)
+    {
+        CacheRecord *cr;
+
+        if (ac->rrset->rrtype == kDNSType_NSEC)
+            cr = NSECRecordIsDelegation(m, &question->qname, question->qtype);
+        else
+            cr = NSEC3RecordIsDelegation(m, &question->qname, question->qtype);
+		if (cr)
+        {
+            LogDNSSEC("ProveInsecureCallback: Non-existence proved and %s is a delegation for %##s (%s)", CRDisplayString(m, cr),
+				question->qname.c, DNSTypeName(question->qtype));
+            DeliverInsecureProofResult(m, ic, DNSSEC_Insecure);
+			return;
+        }
+        // Could be a ENT. Go one more level down to see whether it is a secure delegation or not.
+        if (!SameDomainName(&question->qname, &pdv->origName))
+        {
+            LogDNSSEC("ProveInsecureCallback: Not a delegation %##s (%s), go one more level down", question->qname.c, DNSTypeName(question->qtype));
+            ProveInsecure(m, pdv, ic, mDNSNULL);
+        }
+        else
+        {
+             // Secure denial of existence and the name matches the original query. This means we should have
+             // received an NSEC (if the type does not exist) or signed records (if the name and type exists)
+             // and verified it successfully instead of starting the insecure proof. This could happen e.g.,
+             // Wildcard expanded answer received without NSEC/NSEC3s etc. Also, is it possible that the
+             // zone went from unsigned to signed in a short time ? For now, we return bogus.
+             LogDNSSEC("ProveInsecureCallback: Not a delegation %##s (%s), but reached original name", question->qname.c,
+                 DNSTypeName(question->qtype));
+             DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+        }
+    }
+    return;
+done:
+    DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+}
+
+// We return Insecure if we don't have a trust anchor or we have a trust anchor and
+// can prove that the delegation is not secure (and hence can't establish the trust
+// chain) or the delegation is possibly secure but we don't have the algorithm support
+// to prove that.
+mDNSexport void ProveInsecure(mDNS *const m, DNSSECVerifier *dv, InsecureContext *ic, domainname *trigger)
+{
+    TrustAnchor *ta;
+    domainname *sname;
+
+    if (ic == mDNSNULL)
+    {
+        ic = (InsecureContext *)mDNSPlatformMemAllocate(sizeof(InsecureContext));
+        if (!ic)
+        {
+            LogMsg("mDNSPlatformMemAllocate: ERROR!! memory alloc failed for ic");
+            return;
+        }
+        
+        // Save the AuthInfo while we are proving insecure. We don't want to mix up
+        // the auth chain for Bogus and Insecure. If we prove it to be insecure, we
+        // will add the chain corresponding to the insecure proof. Otherwise, we will
+        // restore this chain.
+        if (dv->ac)
+        {
+            if (!dv->saveac)
+            {
+                LogDNSSEC("ProveInsecure: saving authinfo");
+            }
+            else
+            {
+                LogDNSSEC("ProveInsecure: ERROR!! authinfo already set");
+                FreeDNSSECAuthChainInfo(dv->saveac);
+            }
+            dv->saveac = dv->ac;
+            ResetAuthChain(dv);
+        }
+        ic->dv = dv;
+        ic->q.ThisQInterval = -1;
+
+        if (trigger)
+        {
+            LogDNSSEC("ProveInsecure: Setting Trigger %##s", trigger->c);
+            ic->triggerLabelCount = CountLabels(trigger);
+        }
+        else
+        {
+            LogDNSSEC("ProveInsecure: No Trigger");
+            ic->triggerLabelCount = CountLabels(&dv->origName);
+        }
+
+        ta = FindTrustAnchor(m, &dv->origName);
+        if (!ta)
+        {
+            LogDNSSEC("ProveInsecure: TrustAnchor NULL");
+            DeliverInsecureProofResult(m, ic, DNSSEC_Insecure);
+            return;
+        }
+        // We want to skip the labels that is already matched by the trust anchor so
+        // that the first query starts just below the trust anchor
+        ic->skip = CountLabels(&dv->origName) - CountLabels(&ta->zone);
+        if (!ic->skip)
+        {
+            LogDNSSEC("ProveInsecure: origName %##s, skip is zero", dv->origName.c);
+            DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+            return;
+        }
+    }
+    // Look for the DS record starting just below the trust anchor.
+    //
+    // 1. If we find an NSEC record, then see if it is a delegation. If it is, then
+    //    we are done. Otherwise, go down one more level.
+    //
+    // 2. If we find a DS record and no algorithm support, return "insecure". Otherwise, go
+    //    down one more level.
+    //
+    sname = (domainname *)SkipLeadingLabels(&dv->origName, (ic->skip ? ic->skip - 1 : 0));
+    if (!sname)
+    {
+        LogDNSSEC("ProveInsecure: sname NULL, origName %##s, skip %d", dv->origName.c, ic->skip);
+        DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+        return;
+    }
+
+    // Insecurity proof is started during the normal bottom-up validation when we have a break in the trust
+    // chain e.g., we get NSEC/NSEC3s when looking up a DS record. Insecurity proof is top-down looking
+    // for a break in the trust chain. If we have already tried the validation (before the insecurity
+    // proof started) for this "sname", then don't bother with the proof. This happens sometimes, when 
+    // we can't prove whether a zone is insecurely delegated or not. For example, if we are looking up
+    // host1.secure-nods.secure.example and when we encounter secure-nods, there is no DS record in the
+    // parent. We start the insecurity proof remembering that "secure-nods.secure.example" is the trigger
+    // point. As part of the proof we reach "secure-nods.secure.example". Even though secure.example
+    // prove that the name "secure-nods.secure.example/DS" does not exist,  it can't prove that it is a
+    // delegation. So, we continue one more level down to host1.secure-nods.secure.example and we
+    // realize that we already tried the validation and hence abort here.
+
+    if (CountLabels(sname) > ic->triggerLabelCount)
+    {
+        LogDNSSEC("ProveInsecure: Beyond the trigger current name %##s, origName %##s", sname->c, dv->origName.c);
+        DeliverInsecureProofResult(m, ic, DNSSEC_Bogus);
+        return;
+    }
+
+    LogDNSSEC("ProveInsecure: OrigName %##s (%s), Current %##s", dv->origName.c, DNSTypeName(dv->origType), sname->c);
+    ic->skip--;
+    InitializeQuestion(m, &ic->q, dv->InterfaceID, sname, kDNSType_DS, ProveInsecureCallback, ic);
+    ic->q.ValidationRequired = DNSSEC_VALIDATION_INSECURE;
+    ic->q.ValidatingResponse = 0;
+    ic->q.DNSSECAuthInfo = mDNSNULL;
+    mDNS_StartQuery(m, &ic->q);
+}
+
+mDNSexport void BumpDNSSECStats(mDNS *const m, DNSSECStatsAction action, DNSSECStatsType type, mDNSu32 value)
+{
+    switch (type)
+    {
+    case kStatsTypeMemoryUsage:
+        if (action == kStatsActionIncrement)
+        {
+            m->DNSSECStats.TotalMemUsed += value;
+        }
+        else if (action == kStatsActionDecrement)
+        {
+            m->DNSSECStats.TotalMemUsed -= value;
+        }
+        break;
+    case kStatsTypeLatency:
+        if (action == kStatsActionSet)
+        {
+            if (value <= 4)
+            {
+                m->DNSSECStats.Latency0++;
+            }
+            else if (value <= 9)
+            {
+                m->DNSSECStats.Latency5++;
+            }
+            else if (value <= 19)
+            {
+                m->DNSSECStats.Latency10++;
+            }
+            else if (value <= 49)
+            {
+                m->DNSSECStats.Latency20++;
+            }
+            else if (value <= 99)
+            {
+                m->DNSSECStats.Latency50++;
+            }
+            else
+            {
+                m->DNSSECStats.Latency100++;
+            }
+        }
+        break;
+    case kStatsTypeExtraPackets:
+        if (action == kStatsActionSet)
+        {
+            if (value <= 2)
+            {
+                m->DNSSECStats.ExtraPackets0++;
+            }
+            else if (value <= 6)
+            {
+                m->DNSSECStats.ExtraPackets3++;
+            }
+            else if (value <= 9)
+            {
+                m->DNSSECStats.ExtraPackets7++;
+            }
+            else
+            {
+                m->DNSSECStats.ExtraPackets10++;
+            }
+        }
+        break;
+    case kStatsTypeStatus:
+        if (action == kStatsActionSet)
+        {
+            switch(value)
+            {
+            case DNSSEC_Secure:
+                m->DNSSECStats.SecureStatus++;
+                break;
+            case DNSSEC_Insecure:
+                m->DNSSECStats.InsecureStatus++;
+                break;
+            case DNSSEC_Indeterminate:
+                m->DNSSECStats.IndeterminateStatus++;
+                break;
+            case DNSSEC_Bogus:
+                m->DNSSECStats.BogusStatus++;
+                break;
+            case DNSSEC_NoResponse:
+                m->DNSSECStats.NoResponseStatus++;
+                break;
+            default:
+                LogMsg("BumpDNSSECStats: unknown status %d", value);
+            }
+        }
+        break;
+    case kStatsTypeMsgSize:
+        if (action == kStatsActionSet)
+        {
+            if (value <= 1024)
+            {
+                m->DNSSECStats.MsgSize0++;
+            }
+            else if (value <= 2048)
+            {
+                m->DNSSECStats.MsgSize1++;
+            }
+            else
+            {
+                m->DNSSECStats.MsgSize2++;
+            }
+        }
+        break;
+    case kStatsTypeProbe:
+        if (action == kStatsActionIncrement)
+        {
+            m->DNSSECStats.NumProbesSent += value;
+        }
+        break;
+    default:
+        LogMsg("BumpDNSSECStats: unknown type %d", type);
+    }
+    return;
+}
+
+#else // !DNSSEC_DISABLED
+
+mDNSexport void VerifySignature(mDNS *const m, DNSSECVerifier *dv, DNSQuestion *q)
+{
+    (void)m;
+    (void)dv;
+    (void)q;
+}
+
+mDNSexport void BumpDNSSECStats(mDNS *const m, DNSSECStatsAction action, DNSSECStatsType type, mDNSu32 value)
+{
+    (void)m;
+    (void)action;
+    (void)type;
+    (void)value;
+}
+
+mDNSexport void InitializeQuestion(mDNS *const m, DNSQuestion *question, mDNSInterfaceID InterfaceID, const domainname *qname, mDNSu16 qtype, mDNSQuestionCallback *callback, void *context)
+{
+    (void) m;
+    (void) question;
+    (void) InterfaceID;
+    (void) qname;
+    (void) qtype;
+    (void) callback;
+    (void) context;
+}
+
+mDNSexport char *DNSSECStatusName(DNSSECStatus status)
+{
+    (void) status;
+    
+    return mDNSNULL;
+}
+
+#endif // !DNSSEC_DISABLED
diff --git a/mDNSResponder/mDNSCore/dnssec.h b/mDNSResponder/mDNSCore/dnssec.h
new file mode 100644
index 00000000..1a8d9535
--- /dev/null
+++ b/mDNSResponder/mDNSCore/dnssec.h
@@ -0,0 +1,157 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __DNSSEC_H
+#define __DNSSEC_H
+
+#include "CryptoAlg.h"
+#include "mDNSDebug.h"
+
+typedef enum
+{
+    RRVS_rr, RRVS_rrsig, RRVS_key, RRVS_rrsig_key, RRVS_ds, RRVS_done,
+} RRVerifierSet;
+
+typedef struct RRVerifier_struct RRVerifier;
+typedef struct DNSSECVerifier_struct DNSSECVerifier;
+typedef struct AuthChain_struct AuthChain;
+typedef struct InsecureContext_struct InsecureContext;
+
+struct RRVerifier_struct
+{
+    RRVerifier *next;
+    mDNSu16 rrtype;
+    mDNSu16 rrclass;
+    mDNSu32 rroriginalttl;
+    mDNSu16 rdlength;
+    mDNSu16 found;
+    mDNSu32 namehash;
+    mDNSu32 rdatahash;
+    domainname name;
+    mDNSu8  *rdata;
+};
+
+// Each AuthChain element has one rrset (with multiple resource records of same type), rrsig and key
+// that validates the rrset.
+struct AuthChain_struct
+{
+	AuthChain  *next;		// Next element in the chain
+	RRVerifier *rrset;		// RRSET that is authenticated
+	RRVerifier *rrsig;		// Signature for that RRSET
+	RRVerifier *key;		// Public key for that RRSET
+};
+
+#define ResetAuthChain(dv) {    \
+    (dv)->ac = mDNSNULL;        \
+    (dv)->actail = &((dv)->ac); \
+}
+
+typedef void DNSSECVerifierCallback (mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status);
+//
+// When we do a validation for a question, there might be additional validations that needs to be done e.g.,
+// wildcard expanded answer. It is also possible that in the case of nsec we need to prove both that a wildcard
+// does not apply and the closest encloser proves that name does not exist. We identify these with the following
+// flags.
+//
+// Note: In the following, by "marking the validation", we mean that as part of validation we need to prove
+// the ones that are marked with.
+//
+// A wildcard may be used to answer a question. In that case, we need to verify that the right wildcard was
+// used in answering the question. This is done by marking the validation with WILDCARD_PROVES_ANSWER_EXPANDED.
+//
+// Sometimes we get a NXDOMAIN response. In this case, we may have a wildcard where we need to prove
+// that the wildcard proves that the name does not exist. This is done by marking the validation with
+// WILDCARD_PROVES_NONAME_EXISTS.
+//
+// In the case of NODATA error, sometimes the name may exist but the query type does not exist. This is done by
+// marking the validation with NSEC_PROVES_NOTYPE_EXISTS.
+//
+// In both NXDOMAIN and NODATA proofs, we may have to prove that the NAME does not exist. This is done by marking
+// the validation with NSEC_PROVES_NONAME_EXISTS.
+//
+#define WILDCARD_PROVES_ANSWER_EXPANDED 0x00000001
+#define WILDCARD_PROVES_NONAME_EXISTS   0x00000002
+#define NSEC_PROVES_NOTYPE_EXISTS       0x00000004
+#define NSEC_PROVES_NONAME_EXISTS       0x00000008
+#define NSEC3_OPT_OUT					0x00000010 // OptOut was set in NSEC3
+
+struct DNSSECVerifier_struct
+{
+    domainname origName;            // Original question name that needs verification
+    mDNSu16 origType;               // Original question type corresponding to origName
+    mDNSu16 currQtype;              // Current question type that is being verified
+    mDNSInterfaceID InterfaceID;    // InterfaceID of the question
+    DNSQuestion q;
+    mDNSu8 recursed;                // Number of times recursed during validation
+    mDNSu8 ValidationRequired;      // Copy of the question's ValidationRequired status
+    mDNSu8 InsecureProofDone;
+    mDNSu8 NumPackets;              // Number of packets that we send on the wire for DNSSEC verification.
+    mDNSs32 StartTime;              // Time the DNSSEC verification starts
+    mDNSu32 flags;
+    RRVerifierSet next;
+    domainname *wildcardName;       // set if the answer is wildcard expanded
+    RRVerifier *pendingNSEC;
+    DNSSECVerifierCallback *DVCallback;
+    DNSSECVerifier *parent;
+    RRVerifier *rrset;              // rrset for which we have to verify
+    RRVerifier *rrsig;              // RRSIG for rrset
+    RRVerifier *key;                // DNSKEY for rrset
+    RRVerifier *rrsigKey;           // RRSIG for DNSKEY
+    RRVerifier *ds;                 // DS for DNSKEY set in parent zone
+    AuthChain *saveac;
+    AuthChain *ac;
+    AuthChain **actail;
+    AlgContext *ctx;
+};
+
+
+struct InsecureContext_struct
+{
+    DNSSECVerifier *dv;             // dv for which we are doing the insecure proof
+    mDNSu8 skip;                    // labels to skip for forming the name from origName
+    DNSSECStatus status;            // status to deliver when done
+    mDNSu8 triggerLabelCount;       // Label count of the name that triggered the insecure proof
+    DNSQuestion q;
+};
+
+#define LogDNSSEC LogOperation
+
+#define DNS_SERIAL_GT(a, b) ((int)((a) - (b)) > 0)
+#define DNS_SERIAL_LT(a, b) ((int)((a) - (b)) < 0)
+
+extern void StartDNSSECVerification(mDNS *const m, void *context);
+extern RRVerifier* AllocateRRVerifier(const ResourceRecord *const rr, mStatus *status);
+extern mStatus AddRRSetToVerifier(DNSSECVerifier *dv, const ResourceRecord *const rr, RRVerifier *rv, RRVerifierSet set);
+extern void VerifySignature(mDNS *const m, DNSSECVerifier *dv, DNSQuestion *q);
+extern void FreeDNSSECVerifier(mDNS *const m, DNSSECVerifier *dv);
+extern DNSSECVerifier *AllocateDNSSECVerifier(mDNS *const m, const domainname *name, mDNSu16 rrtype, mDNSInterfaceID InterfaceID,
+                                              mDNSu8 ValidationRequired, DNSSECVerifierCallback dvcallback, mDNSQuestionCallback qcallback);
+extern void InitializeQuestion(mDNS *const m, DNSQuestion *question, mDNSInterfaceID InterfaceID, const domainname *qname,
+                               mDNSu16 qtype, mDNSQuestionCallback *callback, void *context);
+extern void ValidateRRSIG(DNSSECVerifier *dv, RRVerifierSet type, const ResourceRecord *const rr);
+extern void AuthChainLink(DNSSECVerifier *dv, AuthChain *ae);
+extern mStatus DNSNameToLowerCase(domainname *d, domainname *result);
+extern int DNSMemCmp(const mDNSu8 *const m1, const mDNSu8 *const m2, int len);
+extern int DNSSECCanonicalOrder(const domainname *const d1, const domainname *const d2, int *subdomain);
+extern void ProveInsecure(mDNS *const m, DNSSECVerifier *dv, InsecureContext *ic, domainname *trigger);
+extern void BumpDNSSECStats(mDNS *const m, DNSSECStatsAction action, DNSSECStatsType type, mDNSu32 value);
+extern char *DNSSECStatusName(DNSSECStatus status);
+
+// DNSSECProbe belongs in DNSSECSupport.h but then we don't want to expose yet another plaform specific dnssec file
+// to other platforms where dnssec is not supported.
+extern void DNSSECProbe(mDNS *const m);
+
+#endif // __DNSSEC_H
diff --git a/mDNSResponder/mDNSCore/mDNS.c b/mDNSResponder/mDNSCore/mDNS.c
new file mode 100755
index 00000000..71c7a395
--- /dev/null
+++ b/mDNSResponder/mDNSCore/mDNS.c
@@ -0,0 +1,15034 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This code is completely 100% portable C. It does not depend on any external header files
+ * from outside the mDNS project -- all the types it expects to find are defined right here.
+ *
+ * The previous point is very important: This file does not depend on any external
+ * header files. It should compile on *any* platform that has a C compiler, without
+ * making *any* assumptions about availability of so-called "standard" C functions,
+ * routines, or types (which may or may not be present on any given platform).
+ */
+
+#include "DNSCommon.h"                  // Defines general DNS untility routines
+#include "uDNS.h"                       // Defines entry points into unicast-specific routines
+#include "nsec.h"
+#include "dnssec.h"
+#include "anonymous.h"
+
+// Disable certain benign warnings with Microsoft compilers
+#if (defined(_MSC_VER))
+// Disable "conditional expression is constant" warning for debug macros.
+// Otherwise, this generates warnings for the perfectly natural construct "while(1)"
+// If someone knows a variant way of writing "while(1)" that doesn't generate warning messages, please let us know
+    #pragma warning(disable:4127)
+
+// Disable "assignment within conditional expression".
+// Other compilers understand the convention that if you place the assignment expression within an extra pair
+// of parentheses, this signals to the compiler that you really intended an assignment and no warning is necessary.
+// The Microsoft compiler doesn't understand this convention, so in the absense of any other way to signal
+// to the compiler that the assignment is intentional, we have to just turn this warning off completely.
+    #pragma warning(disable:4706)
+#endif
+
+#include "dns_sd.h" // for kDNSServiceFlags* definitions
+
+#if APPLE_OSX_mDNSResponder
+
+#include <WebFilterDNS/WebFilterDNS.h>
+
+#if !NO_WCF
+WCFConnection *WCFConnectionNew(void) __attribute__((weak_import));
+void WCFConnectionDealloc(WCFConnection* c) __attribute__((weak_import));
+
+// Do we really need to define a macro for "if"?
+#define CHECK_WCF_FUNCTION(X) if (X)
+#endif // ! NO_WCF
+
+#else
+
+#define NO_WCF 1
+#endif // APPLE_OSX_mDNSResponder
+
+// Forward declarations
+mDNSlocal void BeginSleepProcessing(mDNS *const m);
+mDNSlocal void RetrySPSRegistrations(mDNS *const m);
+mDNSlocal void SendWakeup(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSEthAddr *EthAddr, mDNSOpaque48 *password);
+mDNSlocal mDNSBool CacheRecordRmvEventsForQuestion(mDNS *const m, DNSQuestion *q);
+mDNSlocal mDNSBool LocalRecordRmvEventsForQuestion(mDNS *const m, DNSQuestion *q);
+mDNSlocal void mDNS_PurgeForQuestion(mDNS *const m, DNSQuestion *q);
+mDNSlocal void CheckForDNSSECRecords(mDNS *const m, DNSQuestion *q);
+mDNSlocal void mDNS_SendKeepalives(mDNS *const m);
+mDNSlocal void mDNS_ExtractKeepaliveInfo(AuthRecord *ar, mDNSu32 *timeout, mDNSAddr *laddr, mDNSAddr *raddr, mDNSEthAddr *eth,
+                                         mDNSu32 *seq, mDNSu32 *ack, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu16 *win);
+
+mDNSlocal void AdvertiseAllInterfaceRecords(mDNS *const m);
+mDNSlocal void DeadvertiseAllInterfaceRecords(mDNS *const m);
+mDNSlocal void FreeNSECRecords(mDNS *const m, CacheRecord *NSECRecords);
+mDNSlocal void mDNSParseNSEC3Records(mDNS *const m, const DNSMessage *const response, const mDNSu8 *end,
+                                        const mDNSInterfaceID InterfaceID, CacheRecord **NSEC3Records);
+
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Program Constants
+#endif
+
+// To Turn OFF mDNS_Tracer set MDNS_TRACER to 0 or undef it
+#define MDNS_TRACER 1
+
+#define NO_HINFO 1
+
+// Any records bigger than this are considered 'large' records
+#define SmallRecordLimit 1024
+
+#define kMaxUpdateCredits 10
+#define kUpdateCreditRefreshInterval (mDNSPlatformOneSecond * 6)
+
+// define special NR_AnswerTo values
+#define NR_AnswerMulticast  (mDNSu8*)~0
+#define NR_AnswerUnicast    (mDNSu8*)~1
+
+// Defined to set the kDNSQClass_UnicastResponse bit in the first four query packets.
+// else, it's just set it the first query.
+#define mDNS_REQUEST_UNICAST_RESPONSE 0
+
+// The code (see SendQueries() and BuildQuestion()) needs to have the
+// RequestUnicast value set to a value one greater than the number of times you want the query
+// sent with the "request unicast response" (QU) bit set.
+#define SET_QU_IN_FIRST_QUERY   2
+#define SET_QU_IN_FIRST_FOUR_QUERIES   5
+
+
+mDNSexport const char *const mDNS_DomainTypeNames[] =
+{
+    "b._dns-sd._udp.",      // Browse
+    "db._dns-sd._udp.",     // Default Browse
+    "lb._dns-sd._udp.",     // Automatic Browse
+    "r._dns-sd._udp.",      // Registration
+    "dr._dns-sd._udp."      // Default Registration
+};
+
+#ifdef UNICAST_DISABLED
+#define uDNS_IsActiveQuery(q, u) mDNSfalse
+#endif
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Utility Functions
+#endif
+
+// Returns true if this is a  unique, authoritative LocalOnly record that answers questions of type 
+// A, AAAA , CNAME, or PTR.  The caller should answer the question with this record and not send out 
+// the question on the wire if LocalOnlyRecordAnswersQuestion() also returns true.
+// Main use is to handle /etc/hosts records and the LocalOnly PTR records created for localhost.
+#define UniqueLocalOnlyRecord(rr) ((rr)->ARType == AuthRecordLocalOnly && \
+                                        (rr)->resrec.RecordType & kDNSRecordTypeUniqueMask && \
+                                        ((rr)->resrec.rrtype == kDNSType_A || (rr)->resrec.rrtype == kDNSType_AAAA || \
+                                         (rr)->resrec.rrtype == kDNSType_CNAME || \
+                                         (rr)->resrec.rrtype == kDNSType_PTR))
+
+mDNSlocal void SetNextQueryStopTime(mDNS *const m, const DNSQuestion *const q)
+{
+    mDNS_CheckLock(m);
+
+#if ForceAlerts
+    if (m->mDNS_busy != m->mDNS_reentrancy+1) *(long*)0 = 0;
+#endif
+
+    if (m->NextScheduledStopTime - q->StopTime > 0)
+        m->NextScheduledStopTime = q->StopTime;
+}
+
+mDNSexport void SetNextQueryTime(mDNS *const m, const DNSQuestion *const q)
+{
+    mDNS_CheckLock(m);
+
+#if ForceAlerts
+    if (m->mDNS_busy != m->mDNS_reentrancy+1) *(long*)0 = 0;
+#endif
+
+    if (ActiveQuestion(q))
+    {
+        // Depending on whether this is a multicast or unicast question we want to set either:
+        // m->NextScheduledQuery = NextQSendTime(q) or
+        // m->NextuDNSEvent      = NextQSendTime(q)
+        mDNSs32 *const timer = mDNSOpaque16IsZero(q->TargetQID) ? &m->NextScheduledQuery : &m->NextuDNSEvent;
+        if (*timer - NextQSendTime(q) > 0)
+            *timer = NextQSendTime(q);
+    }
+}
+
+mDNSlocal void ReleaseAuthEntity(AuthHash *r, AuthEntity *e)
+{
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING >= 1
+    unsigned int i;
+    for (i=0; i<sizeof(*e); i++) ((char*)e)[i] = 0xFF;
+#endif
+    e->next = r->rrauth_free;
+    r->rrauth_free = e;
+    r->rrauth_totalused--;
+}
+
+mDNSlocal void ReleaseAuthGroup(AuthHash *r, AuthGroup **cp)
+{
+    AuthEntity *e = (AuthEntity *)(*cp);
+    LogMsg("ReleaseAuthGroup:  Releasing AuthGroup %##s", (*cp)->name->c);
+    if ((*cp)->rrauth_tail != &(*cp)->members)
+        LogMsg("ERROR: (*cp)->members == mDNSNULL but (*cp)->rrauth_tail != &(*cp)->members)");
+    if ((*cp)->name != (domainname*)((*cp)->namestorage)) mDNSPlatformMemFree((*cp)->name);
+    (*cp)->name = mDNSNULL;
+    *cp = (*cp)->next;          // Cut record from list
+    ReleaseAuthEntity(r, e);
+}
+
+mDNSlocal AuthEntity *GetAuthEntity(AuthHash *r, const AuthGroup *const PreserveAG)
+{
+    AuthEntity *e = mDNSNULL;
+
+    if (r->rrauth_lock) { LogMsg("GetFreeCacheRR ERROR! Cache already locked!"); return(mDNSNULL); }
+    r->rrauth_lock = 1;
+
+    if (!r->rrauth_free)
+    {
+        // We allocate just one AuthEntity at a time because we need to be able
+        // free them all individually which normally happens when we parse /etc/hosts into
+        // AuthHash where we add the "new" entries and discard (free) the already added
+        // entries. If we allocate as chunks, we can't free them individually.
+        AuthEntity *storage = mDNSPlatformMemAllocate(sizeof(AuthEntity));
+        storage->next = mDNSNULL;
+        r->rrauth_free = storage;
+    }
+
+    // If we still have no free records, recycle all the records we can.
+    // Enumerating the entire auth is moderately expensive, so when we do it, we reclaim all the records we can in one pass.
+    if (!r->rrauth_free)
+    {
+        mDNSu32 oldtotalused = r->rrauth_totalused;
+        mDNSu32 slot;
+        for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+        {
+            AuthGroup **cp = &r->rrauth_hash[slot];
+            while (*cp)
+            {
+                if ((*cp)->members || (*cp)==PreserveAG) cp=&(*cp)->next;
+                else ReleaseAuthGroup(r, cp);
+            }
+        }
+        LogInfo("GetAuthEntity: Recycled %d records to reduce auth cache from %d to %d",
+                oldtotalused - r->rrauth_totalused, oldtotalused, r->rrauth_totalused);
+    }
+
+    if (r->rrauth_free) // If there are records in the free list, take one
+    {
+        e = r->rrauth_free;
+        r->rrauth_free = e->next;
+        if (++r->rrauth_totalused >= r->rrauth_report)
+        {
+            LogInfo("RR Auth now using %ld objects", r->rrauth_totalused);
+            if      (r->rrauth_report <  100) r->rrauth_report += 10;
+            else if (r->rrauth_report < 1000) r->rrauth_report += 100;
+            else r->rrauth_report += 1000;
+        }
+        mDNSPlatformMemZero(e, sizeof(*e));
+    }
+
+    r->rrauth_lock = 0;
+
+    return(e);
+}
+
+mDNSexport AuthGroup *AuthGroupForName(AuthHash *r, const mDNSu32 slot, const mDNSu32 namehash, const domainname *const name)
+{
+    AuthGroup *ag;
+    for (ag = r->rrauth_hash[slot]; ag; ag=ag->next)
+        if (ag->namehash == namehash && SameDomainName(ag->name, name))
+            break;
+    return(ag);
+}
+
+mDNSexport AuthGroup *AuthGroupForRecord(AuthHash *r, const mDNSu32 slot, const ResourceRecord *const rr)
+{
+    return(AuthGroupForName(r, slot, rr->namehash, rr->name));
+}
+
+mDNSlocal AuthGroup *GetAuthGroup(AuthHash *r, const mDNSu32 slot, const ResourceRecord *const rr)
+{
+    mDNSu16 namelen = DomainNameLength(rr->name);
+    AuthGroup *ag = (AuthGroup*)GetAuthEntity(r, mDNSNULL);
+    if (!ag) { LogMsg("GetAuthGroup: Failed to allocate memory for %##s", rr->name->c); return(mDNSNULL); }
+    ag->next         = r->rrauth_hash[slot];
+    ag->namehash     = rr->namehash;
+    ag->members      = mDNSNULL;
+    ag->rrauth_tail  = &ag->members;
+    ag->NewLocalOnlyRecords = mDNSNULL;
+    if (namelen > sizeof(ag->namestorage))
+        ag->name = mDNSPlatformMemAllocate(namelen);
+    else
+        ag->name = (domainname*)ag->namestorage;
+    if (!ag->name)
+    {
+        LogMsg("GetAuthGroup: Failed to allocate name storage for %##s", rr->name->c);
+        ReleaseAuthEntity(r, (AuthEntity*)ag);
+        return(mDNSNULL);
+    }
+    AssignDomainName(ag->name, rr->name);
+
+    if (AuthGroupForRecord(r, slot, rr)) LogMsg("GetAuthGroup: Already have AuthGroup for %##s", rr->name->c);
+    r->rrauth_hash[slot] = ag;
+    if (AuthGroupForRecord(r, slot, rr) != ag) LogMsg("GetAuthGroup: Not finding AuthGroup for %##s", rr->name->c);
+
+    return(ag);
+}
+
+// Returns the AuthGroup in which the AuthRecord was inserted
+mDNSexport AuthGroup *InsertAuthRecord(mDNS *const m, AuthHash *r, AuthRecord *rr)
+{
+    AuthGroup *ag;
+    const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+    ag = AuthGroupForRecord(r, slot, &rr->resrec);
+    if (!ag) ag = GetAuthGroup(r, slot, &rr->resrec);   // If we don't have a AuthGroup for this name, make one now
+    if (ag)
+    {
+        LogInfo("InsertAuthRecord: inserting auth record %s from table", ARDisplayString(m, rr));
+        *(ag->rrauth_tail) = rr;                // Append this record to tail of cache slot list
+        ag->rrauth_tail = &(rr->next);          // Advance tail pointer
+    }
+    return ag;
+}
+
+mDNSexport AuthGroup *RemoveAuthRecord(mDNS *const m, AuthHash *r, AuthRecord *rr)
+{
+    AuthGroup *a;
+    AuthGroup **ag = &a;
+    AuthRecord **rp;
+    const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+
+    a = AuthGroupForRecord(r, slot, &rr->resrec);
+    if (!a) { LogMsg("RemoveAuthRecord: ERROR!! AuthGroup not found for %s", ARDisplayString(m, rr)); return mDNSNULL; }
+    rp = &(*ag)->members;
+    while (*rp)
+    {
+        if (*rp != rr)
+            rp=&(*rp)->next;
+        else
+        {
+            // We don't break here, so that we can set the tail below without tracking "prev" pointers
+
+            LogInfo("RemoveAuthRecord: removing auth record %s from table", ARDisplayString(m, rr));
+            *rp = (*rp)->next;          // Cut record from list
+        }
+    }
+    // TBD: If there are no more members, release authgroup ?
+    (*ag)->rrauth_tail = rp;
+    return a;
+}
+
+mDNSexport CacheGroup *CacheGroupForName(const mDNS *const m, const mDNSu32 slot, const mDNSu32 namehash, const domainname *const name)
+{
+    CacheGroup *cg;
+    for (cg = m->rrcache_hash[slot]; cg; cg=cg->next)
+        if (cg->namehash == namehash && SameDomainName(cg->name, name))
+            break;
+    return(cg);
+}
+
+mDNSlocal CacheGroup *CacheGroupForRecord(const mDNS *const m, const mDNSu32 slot, const ResourceRecord *const rr)
+{
+    return(CacheGroupForName(m, slot, rr->namehash, rr->name));
+}
+
+mDNSexport mDNSBool mDNS_AddressIsLocalSubnet(mDNS *const m, const mDNSInterfaceID InterfaceID, const mDNSAddr *addr, mDNSBool *myself)
+{
+    NetworkInterfaceInfo *intf;
+
+    if (addr->type == mDNSAddrType_IPv4)
+    {
+        // Normally we resist touching the NotAnInteger fields, but here we're doing tricky bitwise masking so we make an exception
+        if (mDNSv4AddressIsLinkLocal(&addr->ip.v4)) return(mDNStrue);
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+            if (intf->ip.type == addr->type && intf->InterfaceID == InterfaceID && intf->McastTxRx)
+                if (((intf->ip.ip.v4.NotAnInteger ^ addr->ip.v4.NotAnInteger) & intf->mask.ip.v4.NotAnInteger) == 0)
+                {
+                    if (myself)
+                    {
+                        if (mDNSSameIPv4Address(intf->ip.ip.v4, addr->ip.v4))
+                            *myself = mDNStrue;
+                        else
+                            *myself = mDNSfalse;
+                        if (*myself)
+                            debugf("mDNS_AddressIsLocalSubnet: IPv4 %#a returning true", addr);
+                        else
+                            debugf("mDNS_AddressIsLocalSubnet: IPv4 %#a returning false", addr);
+                    }
+                    return(mDNStrue);
+                }
+    }
+
+    if (addr->type == mDNSAddrType_IPv6)
+    {
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+            if (intf->ip.type == addr->type && intf->InterfaceID == InterfaceID && intf->McastTxRx)
+                if ((((intf->ip.ip.v6.l[0] ^ addr->ip.v6.l[0]) & intf->mask.ip.v6.l[0]) == 0) &&
+                    (((intf->ip.ip.v6.l[1] ^ addr->ip.v6.l[1]) & intf->mask.ip.v6.l[1]) == 0) &&
+                    (((intf->ip.ip.v6.l[2] ^ addr->ip.v6.l[2]) & intf->mask.ip.v6.l[2]) == 0) &&
+                    (((intf->ip.ip.v6.l[3] ^ addr->ip.v6.l[3]) & intf->mask.ip.v6.l[3]) == 0))
+                    {
+                        if (myself)
+                        {
+                            if (mDNSSameIPv6Address(intf->ip.ip.v6, addr->ip.v6))
+                                *myself = mDNStrue;
+                            else
+                                *myself = mDNSfalse;
+                            if (*myself)
+                                debugf("mDNS_AddressIsLocalSubnet: IPv6 %#a returning true", addr);
+                            else
+                                debugf("mDNS_AddressIsLocalSubnet: IPv6 %#a returning false", addr);
+                        }
+                        return(mDNStrue);
+                    }
+    }
+
+    return(mDNSfalse);
+}
+
+mDNSlocal NetworkInterfaceInfo *FirstInterfaceForID(mDNS *const m, const mDNSInterfaceID InterfaceID)
+{
+    NetworkInterfaceInfo *intf = m->HostInterfaces;
+    while (intf && intf->InterfaceID != InterfaceID) intf = intf->next;
+    return(intf);
+}
+
+mDNSlocal NetworkInterfaceInfo *FirstIPv4LLInterfaceForID(mDNS *const m, const mDNSInterfaceID InterfaceID)
+{
+    NetworkInterfaceInfo *intf;
+
+    if (!InterfaceID)
+        return mDNSNULL;
+
+    // Note: We don't check for InterfaceActive, as the active interface could be IPv6 and 
+    // we still want to find the first IPv4 Link-Local interface
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+    {
+        if (intf->InterfaceID == InterfaceID &&
+            intf->ip.type == mDNSAddrType_IPv4 && mDNSv4AddressIsLinkLocal(&intf->ip.ip.v4))
+        {
+            debugf("FirstIPv4LLInterfaceForID: found LL interface with address %.4a", &intf->ip.ip.v4);
+            return intf;
+        }
+    }
+    return (mDNSNULL);
+}
+
+mDNSexport char *InterfaceNameForID(mDNS *const m, const mDNSInterfaceID InterfaceID)
+{
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID);
+    return(intf ? intf->ifname : mDNSNULL);
+}
+
+// Caller should hold the lock
+mDNSlocal void GenerateNegativeResponse(mDNS *const m, QC_result qc)
+{
+    DNSQuestion *q;
+    if (!m->CurrentQuestion) { LogMsg("GenerateNegativeResponse: ERROR!! CurrentQuestion not set"); return; }
+    q = m->CurrentQuestion;
+    LogInfo("GenerateNegativeResponse: Generating negative response for question %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+    MakeNegativeCacheRecord(m, &m->rec.r, &q->qname, q->qnamehash, q->qtype, q->qclass, 60, mDNSInterface_Any, mDNSNULL);
+    // We need to force the response through in the following cases
+    //
+    //  a) SuppressUnusable questions that are suppressed
+    //  b) Append search domains and retry the question
+    //
+    // The question may not have set Intermediates in which case we don't deliver negative responses. So, to force
+    // through we use "QC_forceresponse".
+    AnswerCurrentQuestionWithResourceRecord(m, &m->rec.r, qc);
+    if (m->CurrentQuestion == q) { q->ThisQInterval = 0; }              // Deactivate this question
+    // Don't touch the question after this
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+}
+
+mDNSexport void AnswerQuestionByFollowingCNAME(mDNS *const m, DNSQuestion *q, ResourceRecord *rr)
+{
+    const mDNSBool selfref = SameDomainName(&q->qname, &rr->rdata->u.name);
+    if (q->CNAMEReferrals >= 10 || selfref)
+        LogMsg("AnswerQuestionByFollowingCNAME: %p %##s (%s) NOT following CNAME referral %d%s for %s",
+               q, q->qname.c, DNSTypeName(q->qtype), q->CNAMEReferrals, selfref ? " (Self-Referential)" : "", RRDisplayString(m, rr));
+    else
+    {
+        const mDNSu32 c = q->CNAMEReferrals + 1;        // Stash a copy of the new q->CNAMEReferrals value
+        UDPSocket *sock = q->LocalSocket;
+        mDNSOpaque16 id = q->TargetQID;
+
+        // if there is a message waiting at the socket, we want to process that instead
+        // of throwing it away. If we have a CNAME response that answers
+        // both A and AAAA question and while answering it we don't want to throw
+        // away the response where the actual addresses are present.
+        if (mDNSPlatformPeekUDP(m, q->LocalSocket))
+        {
+            LogInfo("AnswerQuestionByFollowingCNAME: Preserving UDP socket for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+            q->LocalSocket = mDNSNULL;
+        }
+        else
+        {
+            sock = mDNSNULL;
+        }
+
+        // The SameDomainName check above is to ignore bogus CNAME records that point right back at
+        // themselves. Without that check we can get into a case where we have two duplicate questions,
+        // A and B, and when we stop question A, UpdateQuestionDuplicates copies the value of CNAMEReferrals
+        // from A to B, and then A is re-appended to the end of the list as a duplicate of B (because
+        // the target name is still the same), and then when we stop question B, UpdateQuestionDuplicates
+        // copies the B's value of CNAMEReferrals back to A, and we end up not incrementing CNAMEReferrals
+        // for either of them. This is not a problem for CNAME loops of two or more records because in
+        // those cases the newly re-appended question A has a different target name and therefore cannot be
+        // a duplicate of any other question ('B') which was itself a duplicate of the previous question A.
+
+        // Right now we just stop and re-use the existing query. If we really wanted to be 100% perfect,
+        // and track CNAMEs coming and going, we should really create a subordinate query here,
+        // which we would subsequently cancel and retract if the CNAME referral record were removed.
+        // In reality this is such a corner case we'll ignore it until someone actually needs it.
+
+        LogInfo("AnswerQuestionByFollowingCNAME: %p %##s (%s) following CNAME referral %d for %s",
+                q, q->qname.c, DNSTypeName(q->qtype), q->CNAMEReferrals, RRDisplayString(m, rr));
+
+        mDNS_StopQuery_internal(m, q);                              // Stop old query
+        AssignDomainName(&q->qname, &rr->rdata->u.name);            // Update qname
+        q->qnamehash = DomainNameHashValue(&q->qname);              // and namehash
+        // If a unicast query results in a CNAME that points to a .local, we need to re-try
+        // this as unicast. Setting the mDNSInterface_Unicast tells mDNS_StartQuery_internal
+        // to try this as unicast query even though it is a .local name
+        if (!mDNSOpaque16IsZero(q->TargetQID) && IsLocalDomain(&q->qname))
+        {
+            LogInfo("AnswerQuestionByFollowingCNAME: Resolving a .local CNAME %p %##s (%s) Record %s",
+                    q, q->qname.c, DNSTypeName(q->qtype), RRDisplayString(m, rr));
+            q->InterfaceID = mDNSInterface_Unicast;
+        }
+        mDNS_StartQuery_internal(m, q);                             // start new query
+        // Record how many times we've done this. We need to do this *after* mDNS_StartQuery_internal,
+        // because mDNS_StartQuery_internal re-initializes CNAMEReferrals to zero
+        q->CNAMEReferrals = c;
+        if (sock)
+        {
+            // We have a message waiting and that should answer this question.
+            if (q->LocalSocket)
+                mDNSPlatformUDPClose(q->LocalSocket);
+            q->LocalSocket = sock;
+            q->TargetQID = id;
+        }
+    }
+}
+
+// For a single given DNSQuestion pointed to by CurrentQuestion, deliver an add/remove result for the single given AuthRecord
+// Note: All the callers should use the m->CurrentQuestion to see if the question is still valid or not
+mDNSlocal void AnswerLocalQuestionWithLocalAuthRecord(mDNS *const m, AuthRecord *rr, QC_result AddRecord)
+{
+    DNSQuestion *q = m->CurrentQuestion;
+    mDNSBool followcname;
+
+    if (!q)
+    {
+        LogMsg("AnswerLocalQuestionWithLocalAuthRecord: ERROR!! CurrentQuestion NULL while answering with %s", ARDisplayString(m, rr));
+        return;
+    }
+
+    followcname = FollowCNAME(q, &rr->resrec, AddRecord);
+
+    // We should not be delivering results for record types Unregistered, Deregistering, and (unverified) Unique
+    if (!(rr->resrec.RecordType & kDNSRecordTypeActiveMask))
+    {
+        LogMsg("AnswerLocalQuestionWithLocalAuthRecord: *NOT* delivering %s event for local record type %X %s",
+               AddRecord ? "Add" : "Rmv", rr->resrec.RecordType, ARDisplayString(m, rr));
+        return;
+    }
+
+    // Indicate that we've given at least one positive answer for this record, so we should be prepared to send a goodbye for it
+    if (AddRecord) rr->AnsweredLocalQ = mDNStrue;
+    mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+    if (q->QuestionCallback && !q->NoAnswer)
+    {
+        q->CurrentAnswers += AddRecord ? 1 : -1;
+        if (UniqueLocalOnlyRecord(rr))
+        {
+            if (!followcname || q->ReturnIntermed)
+            {
+                // Don't send this packet on the wire as we answered from /etc/hosts
+                q->ThisQInterval = 0;
+                q->LOAddressAnswers += AddRecord ? 1 : -1;
+                q->QuestionCallback(m, q, &rr->resrec, AddRecord);
+            }
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+            // The callback above could have caused the question to stop. Detect that
+            // using m->CurrentQuestion
+            if (followcname && m->CurrentQuestion == q)
+                AnswerQuestionByFollowingCNAME(m, q, &rr->resrec);
+            return;
+        }
+        else
+        {
+            q->QuestionCallback(m, q, &rr->resrec, AddRecord);
+        }
+    }
+    mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+}
+
+mDNSlocal void AnswerInterfaceAnyQuestionsWithLocalAuthRecord(mDNS *const m, AuthRecord *rr, QC_result AddRecord)
+{
+    if (m->CurrentQuestion)
+        LogMsg("AnswerInterfaceAnyQuestionsWithLocalAuthRecord: ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+    {
+        mDNSBool answered;
+        DNSQuestion *q = m->CurrentQuestion;
+        if (RRAny(rr))
+            answered = ResourceRecordAnswersQuestion(&rr->resrec, q);
+        else
+            answered = LocalOnlyRecordAnswersQuestion(rr, q);
+        if (answered)
+            AnswerLocalQuestionWithLocalAuthRecord(m, rr, AddRecord);       // MUST NOT dereference q again
+        if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+// When a new local AuthRecord is created or deleted, AnswerAllLocalQuestionsWithLocalAuthRecord()
+// delivers the appropriate add/remove events to listening questions:
+// 1. It runs though all our LocalOnlyQuestions delivering answers as appropriate,
+//    stopping if it reaches a NewLocalOnlyQuestion -- brand-new questions are handled by AnswerNewLocalOnlyQuestion().
+// 2. If the AuthRecord is marked mDNSInterface_LocalOnly or mDNSInterface_P2P, then it also runs though
+//    our main question list, delivering answers to mDNSInterface_Any questions as appropriate,
+//    stopping if it reaches a NewQuestion -- brand-new questions are handled by AnswerNewQuestion().
+//
+// AnswerAllLocalQuestionsWithLocalAuthRecord is used by the m->NewLocalRecords loop in mDNS_Execute(),
+// and by mDNS_Deregister_internal()
+
+mDNSlocal void AnswerAllLocalQuestionsWithLocalAuthRecord(mDNS *const m, AuthRecord *rr, QC_result AddRecord)
+{
+    if (m->CurrentQuestion)
+        LogMsg("AnswerAllLocalQuestionsWithLocalAuthRecord ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+
+    m->CurrentQuestion = m->LocalOnlyQuestions;
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewLocalOnlyQuestions)
+    {
+        mDNSBool answered;
+        DNSQuestion *q = m->CurrentQuestion;
+        // We are called with both LocalOnly/P2P record or a regular AuthRecord
+        if (RRAny(rr))
+            answered = ResourceRecordAnswersQuestion(&rr->resrec, q);
+        else
+            answered = LocalOnlyRecordAnswersQuestion(rr, q);
+        if (answered)
+            AnswerLocalQuestionWithLocalAuthRecord(m, rr, AddRecord);           // MUST NOT dereference q again
+        if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+            m->CurrentQuestion = q->next;
+    }
+
+    m->CurrentQuestion = mDNSNULL;
+
+    // If this AuthRecord is marked LocalOnly or P2P, then we want to deliver it to all local 'mDNSInterface_Any' questions
+    if (rr->ARType == AuthRecordLocalOnly || rr->ARType == AuthRecordP2P)
+        AnswerInterfaceAnyQuestionsWithLocalAuthRecord(m, rr, AddRecord);
+
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Resource Record Utility Functions
+#endif
+
+#define RRTypeIsAddressType(T) ((T) == kDNSType_A || (T) == kDNSType_AAAA)
+
+#define ResourceRecordIsValidAnswer(RR) ( ((RR)->resrec.RecordType & kDNSRecordTypeActiveMask)  && \
+                                          ((RR)->Additional1 == mDNSNULL || ((RR)->Additional1->resrec.RecordType & kDNSRecordTypeActiveMask)) && \
+                                          ((RR)->Additional2 == mDNSNULL || ((RR)->Additional2->resrec.RecordType & kDNSRecordTypeActiveMask)) && \
+                                          ((RR)->DependentOn == mDNSNULL || ((RR)->DependentOn->resrec.RecordType & kDNSRecordTypeActiveMask))  )
+
+#define ResourceRecordIsValidInterfaceAnswer(RR, INTID) \
+    (ResourceRecordIsValidAnswer(RR) && \
+     ((RR)->resrec.InterfaceID == mDNSInterface_Any || (RR)->resrec.InterfaceID == (INTID)))
+
+#define DefaultProbeCountForTypeUnique ((mDNSu8)3)
+#define DefaultProbeCountForRecordType(X)      ((X) == kDNSRecordTypeUnique ? DefaultProbeCountForTypeUnique : (mDNSu8)0)
+
+// See RFC 6762: "8.3 Announcing"
+// "The Multicast DNS responder MUST send at least two unsolicited responses, one second apart."
+// Send 4, which is really 8 since we send on both IPv4 and IPv6.
+#define InitialAnnounceCount ((mDNSu8)4)
+
+// For goodbye packets we set the count to 3, and for wakeups we set it to 18
+// (which will be up to 15 wakeup attempts over the course of 30 seconds,
+// and then if the machine fails to wake, 3 goodbye packets).
+#define GoodbyeCount ((mDNSu8)3)
+#define WakeupCount ((mDNSu8)18)
+#define MAX_PROBE_RESTARTS ((mDNSu8)20)
+
+// Number of wakeups we send if WakeOnResolve is set in the question
+#define InitialWakeOnResolveCount ((mDNSu8)3)
+
+// Note that the announce intervals use exponential backoff, doubling each time. The probe intervals do not.
+// This means that because the announce interval is doubled after sending the first packet, the first
+// observed on-the-wire inter-packet interval between announcements is actually one second.
+// The half-second value here may be thought of as a conceptual (non-existent) half-second delay *before* the first packet is sent.
+#define DefaultProbeIntervalForTypeUnique (mDNSPlatformOneSecond/4)
+#define DefaultAnnounceIntervalForTypeShared (mDNSPlatformOneSecond/2)
+#define DefaultAnnounceIntervalForTypeUnique (mDNSPlatformOneSecond/2)
+
+#define DefaultAPIntervalForRecordType(X)  ((X) &kDNSRecordTypeActiveSharedMask ? DefaultAnnounceIntervalForTypeShared : \
+                                            (X) &kDNSRecordTypeUnique           ? DefaultProbeIntervalForTypeUnique    : \
+                                            (X) &kDNSRecordTypeActiveUniqueMask ? DefaultAnnounceIntervalForTypeUnique : 0)
+
+#define TimeToAnnounceThisRecord(RR,time) ((RR)->AnnounceCount && (time) - ((RR)->LastAPTime + (RR)->ThisAPInterval) >= 0)
+#define TimeToSendThisRecord(RR,time) ((TimeToAnnounceThisRecord(RR,time) || (RR)->ImmedAnswer) && ResourceRecordIsValidAnswer(RR))
+#define TicksTTL(RR) ((mDNSs32)(RR)->resrec.rroriginalttl * mDNSPlatformOneSecond)
+#define RRExpireTime(RR) ((RR)->TimeRcvd + TicksTTL(RR))
+
+// Adjustment factor to avoid race condition (used for unicast cache entries) :
+// Suppose real record has TTL of 3600, and our local caching server has held it for 3500 seconds, so it returns an aged TTL of 100.
+// If we do our normal refresh at 80% of the TTL, our local caching server will return 20 seconds, so we'll do another
+// 80% refresh after 16 seconds, and then the server will return 4 seconds, and so on, in the fashion of Zeno's paradox.
+// To avoid this, we extend the record's effective TTL to give it a little extra grace period.
+// We adjust the 100 second TTL to 127. This means that when we do our 80% query at 102 seconds,
+// the cached copy at our local caching server will already have expired, so the server will be forced
+// to fetch a fresh copy from the authoritative server, and then return a fresh record with the full TTL of 3600 seconds.
+
+#define RRAdjustTTL(ttl) ((ttl) + ((ttl)/4) + 2)
+#define RRUnadjustedTTL(ttl) ((((ttl) - 2) * 4) / 5)
+
+#define MaxUnansweredQueries 4
+
+// SameResourceRecordSignature returns true if two resources records have the same name, type, and class, and may be sent
+// (or were received) on the same interface (i.e. if *both* records specify an interface, then it has to match).
+// TTL and rdata may differ.
+// This is used for cache flush management:
+// When sending a unique record, all other records matching "SameResourceRecordSignature" must also be sent
+// When receiving a unique record, all old cache records matching "SameResourceRecordSignature" are flushed
+
+// SameResourceRecordNameClassInterface is functionally the same as SameResourceRecordSignature, except rrtype does not have to match
+
+#define SameResourceRecordSignature(A,B) (A)->resrec.rrtype == (B)->resrec.rrtype && SameResourceRecordNameClassInterface((A),(B))
+
+mDNSlocal mDNSBool SameResourceRecordNameClassInterface(const AuthRecord *const r1, const AuthRecord *const r2)
+{
+    if (!r1) { LogMsg("SameResourceRecordSignature ERROR: r1 is NULL"); return(mDNSfalse); }
+    if (!r2) { LogMsg("SameResourceRecordSignature ERROR: r2 is NULL"); return(mDNSfalse); }
+    if (r1->resrec.InterfaceID &&
+        r2->resrec.InterfaceID &&
+        r1->resrec.InterfaceID != r2->resrec.InterfaceID) return(mDNSfalse);
+    return (mDNSBool)(
+               r1->resrec.rrclass  == r2->resrec.rrclass &&
+               r1->resrec.namehash == r2->resrec.namehash &&
+               SameDomainName(r1->resrec.name, r2->resrec.name));
+}
+
+// PacketRRMatchesSignature behaves as SameResourceRecordSignature, except that types may differ if our
+// authoratative record is unique (as opposed to shared). For unique records, we are supposed to have
+// complete ownership of *all* types for this name, so *any* record type with the same name is a conflict.
+// In addition, when probing we send our questions with the wildcard type kDNSQType_ANY,
+// so a response of any type should match, even if it is not actually the type the client plans to use.
+
+// For now, to make it easier to avoid false conflicts, we treat SPS Proxy records like shared records,
+// and require the rrtypes to match for the rdata to be considered potentially conflicting
+mDNSlocal mDNSBool PacketRRMatchesSignature(const CacheRecord *const pktrr, const AuthRecord *const authrr)
+{
+    if (!pktrr)  { LogMsg("PacketRRMatchesSignature ERROR: pktrr is NULL"); return(mDNSfalse); }
+    if (!authrr) { LogMsg("PacketRRMatchesSignature ERROR: authrr is NULL"); return(mDNSfalse); }
+    if (pktrr->resrec.InterfaceID &&
+        authrr->resrec.InterfaceID &&
+        pktrr->resrec.InterfaceID != authrr->resrec.InterfaceID) return(mDNSfalse);
+    if (!(authrr->resrec.RecordType & kDNSRecordTypeUniqueMask) || authrr->WakeUp.HMAC.l[0])
+        if (pktrr->resrec.rrtype != authrr->resrec.rrtype) return(mDNSfalse);
+    return (mDNSBool)(
+               pktrr->resrec.rrclass == authrr->resrec.rrclass &&
+               pktrr->resrec.namehash == authrr->resrec.namehash &&
+               SameDomainName(pktrr->resrec.name, authrr->resrec.name));
+}
+
+// CacheRecord *ka is the CacheRecord from the known answer list in the query.
+// This is the information that the requester believes to be correct.
+// AuthRecord *rr is the answer we are proposing to give, if not suppressed.
+// This is the information that we believe to be correct.
+// We've already determined that we plan to give this answer on this interface
+// (either the record is non-specific, or it is specific to this interface)
+// so now we just need to check the name, type, class, rdata and TTL.
+mDNSlocal mDNSBool ShouldSuppressKnownAnswer(const CacheRecord *const ka, const AuthRecord *const rr)
+{
+    // If RR signature is different, or data is different, then don't suppress our answer
+    if (!IdenticalResourceRecord(&ka->resrec, &rr->resrec)) return(mDNSfalse);
+
+    // If the requester's indicated TTL is less than half the real TTL,
+    // we need to give our answer before the requester's copy expires.
+    // If the requester's indicated TTL is at least half the real TTL,
+    // then we can suppress our answer this time.
+    // If the requester's indicated TTL is greater than the TTL we believe,
+    // then that's okay, and we don't need to do anything about it.
+    // (If two responders on the network are offering the same information,
+    // that's okay, and if they are offering the information with different TTLs,
+    // the one offering the lower TTL should defer to the one offering the higher TTL.)
+    return (mDNSBool)(ka->resrec.rroriginalttl >= rr->resrec.rroriginalttl / 2);
+}
+
+mDNSlocal void SetNextAnnounceProbeTime(mDNS *const m, const AuthRecord *const rr)
+{
+    if (rr->resrec.RecordType == kDNSRecordTypeUnique)
+    {
+        if ((rr->LastAPTime + rr->ThisAPInterval) - m->timenow > mDNSPlatformOneSecond * 10)
+        {
+            LogMsg("SetNextAnnounceProbeTime: ProbeCount %d Next in %d %s", rr->ProbeCount, (rr->LastAPTime + rr->ThisAPInterval) - m->timenow, ARDisplayString(m, rr));
+            LogMsg("SetNextAnnounceProbeTime: m->SuppressProbes %d m->timenow %d diff %d", m->SuppressProbes, m->timenow, m->SuppressProbes - m->timenow);
+        }
+        if (m->NextScheduledProbe - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+            m->NextScheduledProbe = (rr->LastAPTime + rr->ThisAPInterval);
+        // Some defensive code:
+        // If (rr->LastAPTime + rr->ThisAPInterval) happens to be far in the past, we don't want to allow
+        // NextScheduledProbe to be set excessively in the past, because that can cause bad things to happen.
+        // See: <rdar://problem/7795434> mDNS: Sometimes advertising stops working and record interval is set to zero
+        if (m->NextScheduledProbe - m->timenow < 0)
+            m->NextScheduledProbe = m->timenow;
+    }
+    else if (rr->AnnounceCount && (ResourceRecordIsValidAnswer(rr) || rr->resrec.RecordType == kDNSRecordTypeDeregistering))
+    {
+        if (m->NextScheduledResponse - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+            m->NextScheduledResponse = (rr->LastAPTime + rr->ThisAPInterval);
+    }
+}
+
+mDNSlocal void InitializeLastAPTime(mDNS *const m, AuthRecord *const rr)
+{
+    // For reverse-mapping Sleep Proxy PTR records, probe interval is one second
+    rr->ThisAPInterval = rr->AddressProxy.type ? mDNSPlatformOneSecond : DefaultAPIntervalForRecordType(rr->resrec.RecordType);
+
+    // * If this is a record type that's going to probe, then we use the m->SuppressProbes time.
+    // * Otherwise, if it's not going to probe, but m->SuppressProbes is set because we have other
+    //   records that are going to probe, then we delay its first announcement so that it will
+    //   go out synchronized with the first announcement for the other records that *are* probing.
+    //   This is a minor performance tweak that helps keep groups of related records synchronized together.
+    //   The addition of "interval / 2" is to make sure that, in the event that any of the probes are
+    //   delayed by a few milliseconds, this announcement does not inadvertently go out *before* the probing is complete.
+    //   When the probing is complete and those records begin to announce, these records will also be picked up and accelerated,
+    //   because they will meet the criterion of being at least half-way to their scheduled announcement time.
+    // * If it's not going to probe and m->SuppressProbes is not already set then we should announce immediately.
+
+    if (rr->ProbeCount)
+    {
+        // If we have no probe suppression time set, or it is in the past, set it now
+        if (m->SuppressProbes == 0 || m->SuppressProbes - m->timenow < 0)
+        {
+            // To allow us to aggregate probes when a group of services are registered together,
+            // the first probe is delayed 1/4 second. This means the common-case behaviour is:
+            // 1/4 second wait; probe
+            // 1/4 second wait; probe
+            // 1/4 second wait; probe
+            // 1/4 second wait; announce (i.e. service is normally announced exactly one second after being registered)
+            m->SuppressProbes = NonZeroTime(m->timenow + DefaultProbeIntervalForTypeUnique/2 + mDNSRandom(DefaultProbeIntervalForTypeUnique/2));
+
+            // If we already have a *probe* scheduled to go out sooner, then use that time to get better aggregation
+            if (m->SuppressProbes - m->NextScheduledProbe >= 0)
+                m->SuppressProbes = NonZeroTime(m->NextScheduledProbe);
+            if (m->SuppressProbes - m->timenow < 0)     // Make sure we don't set m->SuppressProbes excessively in the past
+                m->SuppressProbes = m->timenow;
+
+            // If we already have a *query* scheduled to go out sooner, then use that time to get better aggregation
+            if (m->SuppressProbes - m->NextScheduledQuery >= 0)
+                m->SuppressProbes = NonZeroTime(m->NextScheduledQuery);
+            if (m->SuppressProbes - m->timenow < 0)     // Make sure we don't set m->SuppressProbes excessively in the past
+                m->SuppressProbes = m->timenow;
+
+            // except... don't expect to be able to send before the m->SuppressSending timer fires
+            if (m->SuppressSending && m->SuppressProbes - m->SuppressSending < 0)
+                m->SuppressProbes = NonZeroTime(m->SuppressSending);
+
+            if (m->SuppressProbes - m->timenow > mDNSPlatformOneSecond * 8)
+            {
+                LogMsg("InitializeLastAPTime ERROR m->SuppressProbes %d m->NextScheduledProbe %d m->NextScheduledQuery %d m->SuppressSending %d %d",
+                       m->SuppressProbes     - m->timenow,
+                       m->NextScheduledProbe - m->timenow,
+                       m->NextScheduledQuery - m->timenow,
+                       m->SuppressSending,
+                       m->SuppressSending    - m->timenow);
+                m->SuppressProbes = NonZeroTime(m->timenow + DefaultProbeIntervalForTypeUnique/2 + mDNSRandom(DefaultProbeIntervalForTypeUnique/2));
+            }
+        }
+        rr->LastAPTime = m->SuppressProbes - rr->ThisAPInterval;
+    }
+    else if (m->SuppressProbes && m->SuppressProbes - m->timenow >= 0)
+        rr->LastAPTime = m->SuppressProbes - rr->ThisAPInterval + DefaultProbeIntervalForTypeUnique * DefaultProbeCountForTypeUnique + rr->ThisAPInterval / 2;
+    else
+        rr->LastAPTime = m->timenow - rr->ThisAPInterval;
+
+    // For reverse-mapping Sleep Proxy PTR records we don't want to start probing instantly -- we
+    // wait one second to give the client a chance to go to sleep, and then start our ARP/NDP probing.
+    // After three probes one second apart with no answer, we conclude the client is now sleeping
+    // and we can begin broadcasting our announcements to take over ownership of that IP address.
+    // If we don't wait for the client to go to sleep, then when the client sees our ARP Announcements there's a risk
+    // (depending on the OS and networking stack it's using) that it might interpret it as a conflict and change its IP address.
+    if (rr->AddressProxy.type) 
+        rr->LastAPTime = m->timenow;
+
+    // Set LastMCTime to now, to inhibit multicast responses
+    // (no need to send additional multicast responses when we're announcing anyway)
+    rr->LastMCTime      = m->timenow;
+    rr->LastMCInterface = mDNSInterfaceMark;
+
+    SetNextAnnounceProbeTime(m, rr);
+}
+
+mDNSlocal const domainname *SetUnicastTargetToHostName(mDNS *const m, AuthRecord *rr)
+{
+    const domainname *target;
+    if (rr->AutoTarget)
+    {
+        // For autotunnel services pointing at our IPv6 ULA we don't need or want a NAT mapping, but for all other
+        // advertised services referencing our uDNS hostname, we want NAT mappings automatically created as appropriate,
+        // with the port number in our advertised SRV record automatically tracking the external mapped port.
+        DomainAuthInfo *AuthInfo = GetAuthInfoForName_internal(m, rr->resrec.name);
+        if (!AuthInfo || !AuthInfo->AutoTunnel) rr->AutoTarget = Target_AutoHostAndNATMAP;
+    }
+
+    target = GetServiceTarget(m, rr);
+    if (!target || target->c[0] == 0)
+    {
+        // defer registration until we've got a target
+        LogInfo("SetUnicastTargetToHostName No target for %s", ARDisplayString(m, rr));
+        rr->state = regState_NoTarget;
+        return mDNSNULL;
+    }
+    else
+    {
+        LogInfo("SetUnicastTargetToHostName target %##s for resource record %s", target->c, ARDisplayString(m,rr));
+        return target;
+    }
+}
+
+// Right now this only applies to mDNS (.local) services where the target host is always m->MulticastHostname
+// Eventually we should unify this with GetServiceTarget() in uDNS.c
+mDNSlocal void SetTargetToHostName(mDNS *const m, AuthRecord *const rr)
+{
+    domainname *const target = GetRRDomainNameTarget(&rr->resrec);
+    const domainname *newname = &m->MulticastHostname;
+
+    if (!target) LogInfo("SetTargetToHostName: Don't know how to set the target of rrtype %s", DNSTypeName(rr->resrec.rrtype));
+
+    if (!(rr->ForceMCast || rr->ARType == AuthRecordLocalOnly || rr->ARType == AuthRecordP2P || IsLocalDomain(&rr->namestorage)))
+    {
+        const domainname *const n = SetUnicastTargetToHostName(m, rr);
+        if (n) newname = n;
+        else { target->c[0] = 0; SetNewRData(&rr->resrec, mDNSNULL, 0); return; }
+    }
+
+    if (target && SameDomainName(target, newname))
+        debugf("SetTargetToHostName: Target of %##s is already %##s", rr->resrec.name->c, target->c);
+
+    if (target && !SameDomainName(target, newname))
+    {
+        AssignDomainName(target, newname);
+        SetNewRData(&rr->resrec, mDNSNULL, 0);      // Update rdlength, rdestimate, rdatahash
+
+        // If we're in the middle of probing this record, we need to start again,
+        // because changing its rdata may change the outcome of the tie-breaker.
+        // (If the record type is kDNSRecordTypeUnique (unconfirmed unique) then DefaultProbeCountForRecordType is non-zero.)
+        rr->ProbeCount     = DefaultProbeCountForRecordType(rr->resrec.RecordType);
+
+        // If we've announced this record, we really should send a goodbye packet for the old rdata before
+        // changing to the new rdata. However, in practice, we only do SetTargetToHostName for unique records,
+        // so when we announce them we'll set the kDNSClass_UniqueRRSet and clear any stale data that way.
+        if (rr->RequireGoodbye && rr->resrec.RecordType == kDNSRecordTypeShared)
+            debugf("Have announced shared record %##s (%s) at least once: should have sent a goodbye packet before updating",
+                   rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+
+        rr->AnnounceCount  = InitialAnnounceCount;
+        rr->RequireGoodbye = mDNSfalse;
+        rr->ProbeRestartCount = 0;
+        InitializeLastAPTime(m, rr);
+    }
+}
+
+mDNSlocal void AcknowledgeRecord(mDNS *const m, AuthRecord *const rr)
+{
+    if (rr->RecordCallback)
+    {
+        // CAUTION: MUST NOT do anything more with rr after calling rr->Callback(), because the client's callback function
+        // is allowed to do anything, including starting/stopping queries, registering/deregistering records, etc.
+        rr->Acknowledged = mDNStrue;
+        mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+        rr->RecordCallback(m, rr, mStatus_NoError);
+        mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+    }
+}
+
+mDNSexport void ActivateUnicastRegistration(mDNS *const m, AuthRecord *const rr)
+{
+    // Make sure that we don't activate the SRV record and associated service records, if it is in
+    // NoTarget state. First time when a service is being instantiated, SRV record may be in NoTarget state.
+    // We should not activate any of the other reords (PTR, TXT) that are part of the service. When
+    // the target becomes available, the records will be reregistered.
+    if (rr->resrec.rrtype != kDNSType_SRV)
+    {
+        AuthRecord *srvRR = mDNSNULL;
+        if (rr->resrec.rrtype == kDNSType_PTR)
+            srvRR = rr->Additional1;
+        else if (rr->resrec.rrtype == kDNSType_TXT)
+            srvRR = rr->DependentOn;
+        if (srvRR)
+        {
+            if (srvRR->resrec.rrtype != kDNSType_SRV)
+            {
+                LogMsg("ActivateUnicastRegistration: ERROR!! Resource record %s wrong, expecting SRV type", ARDisplayString(m, srvRR));
+            }
+            else
+            {
+                LogInfo("ActivateUnicastRegistration: Found Service Record %s in state %d for %##s (%s)",
+                        ARDisplayString(m, srvRR), srvRR->state, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+                rr->state = srvRR->state;
+            }
+        }
+    }
+
+    if (rr->state == regState_NoTarget)
+    {
+        LogInfo("ActivateUnicastRegistration record %s in regState_NoTarget, not activating", ARDisplayString(m, rr));
+        return;
+    }
+    // When we wake up from sleep, we call ActivateUnicastRegistration. It is possible that just before we went to sleep,
+    // the service/record was being deregistered. In that case, we should not try to register again. For the cases where
+    // the records are deregistered due to e.g., no target for the SRV record, we would have returned from above if it
+    // was already in NoTarget state. If it was in the process of deregistration but did not complete fully before we went
+    // to sleep, then it is okay to start in Pending state as we will go back to NoTarget state if we don't have a target.
+    if (rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+    {
+        LogInfo("ActivateUnicastRegistration: Resource record %s, current state %d, moving to DeregPending", ARDisplayString(m, rr), rr->state);
+        rr->state = regState_DeregPending;
+    }
+    else
+    {
+        LogInfo("ActivateUnicastRegistration: Resource record %s, current state %d, moving to Pending", ARDisplayString(m, rr), rr->state);
+        rr->state = regState_Pending;
+    }
+    rr->ProbeCount     = 0;
+    rr->ProbeRestartCount = 0;
+    rr->AnnounceCount  = 0;
+    rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+    rr->LastAPTime     = m->timenow - rr->ThisAPInterval;
+    rr->expire         = 0; // Forget about all the leases, start fresh
+    rr->uselease       = mDNStrue;
+    rr->updateid       = zeroID;
+    rr->SRVChanged     = mDNSfalse;
+    rr->updateError    = mStatus_NoError;
+    // RestartRecordGetZoneData calls this function whenever a new interface gets registered with core.
+    // The records might already be registered with the server and hence could have NAT state.
+    if (rr->NATinfo.clientContext)
+    {
+        mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+        rr->NATinfo.clientContext = mDNSNULL;
+    }
+    if (rr->nta) { CancelGetZoneData(m, rr->nta); rr->nta = mDNSNULL; }
+    if (rr->tcp) { DisposeTCPConn(rr->tcp);       rr->tcp = mDNSNULL; }
+    if (m->NextuDNSEvent - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+        m->NextuDNSEvent = (rr->LastAPTime + rr->ThisAPInterval);
+}
+
+// Two records qualify to be local duplicates if:
+// (a) the RecordTypes are the same, or
+// (b) one is Unique and the other Verified
+// (c) either is in the process of deregistering
+#define RecordLDT(A,B) ((A)->resrec.RecordType == (B)->resrec.RecordType || \
+                        ((A)->resrec.RecordType | (B)->resrec.RecordType) == (kDNSRecordTypeUnique | kDNSRecordTypeVerified) || \
+                        ((A)->resrec.RecordType == kDNSRecordTypeDeregistering || (B)->resrec.RecordType == kDNSRecordTypeDeregistering))
+
+#define RecordIsLocalDuplicate(A,B) \
+    ((A)->resrec.InterfaceID == (B)->resrec.InterfaceID && RecordLDT((A),(B)) && IdenticalResourceRecord(& (A)->resrec, & (B)->resrec))
+
+mDNSlocal AuthRecord *CheckAuthIdenticalRecord(AuthHash *r, AuthRecord *rr)
+{
+    AuthGroup *a;
+    AuthGroup **ag = &a;
+    AuthRecord **rp;
+    const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+
+    a = AuthGroupForRecord(r, slot, &rr->resrec);
+    if (!a) return mDNSNULL;
+    rp = &(*ag)->members;
+    while (*rp)
+    {
+        if (!RecordIsLocalDuplicate(*rp, rr))
+            rp=&(*rp)->next;
+        else
+        {
+            if ((*rp)->resrec.RecordType == kDNSRecordTypeDeregistering)
+            {
+                (*rp)->AnnounceCount = 0;
+                rp=&(*rp)->next;
+            }
+            else return *rp;
+        }
+    }
+    return (mDNSNULL);
+}
+
+mDNSlocal mDNSBool CheckAuthRecordConflict(AuthHash *r, AuthRecord *rr)
+{
+    AuthGroup *a;
+    AuthGroup **ag = &a;
+    AuthRecord **rp;
+    const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+
+    a = AuthGroupForRecord(r, slot, &rr->resrec);
+    if (!a) return mDNSfalse;
+    rp = &(*ag)->members;
+    while (*rp)
+    {
+        const AuthRecord *s1 = rr->RRSet ? rr->RRSet : rr;
+        const AuthRecord *s2 = (*rp)->RRSet ? (*rp)->RRSet : *rp;
+        if (s1 != s2 && SameResourceRecordSignature((*rp), rr) && !IdenticalSameNameRecord(&(*rp)->resrec, &rr->resrec))
+            return mDNStrue;
+        else
+            rp=&(*rp)->next;
+    }
+    return (mDNSfalse);
+}
+
+// checks to see if "rr" is already present
+mDNSlocal AuthRecord *CheckAuthSameRecord(AuthHash *r, AuthRecord *rr)
+{
+    AuthGroup *a;
+    AuthGroup **ag = &a;
+    AuthRecord **rp;
+    const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+
+    a = AuthGroupForRecord(r, slot, &rr->resrec);
+    if (!a) return mDNSNULL;
+    rp = &(*ag)->members;
+    while (*rp)
+    {
+        if (*rp != rr)
+            rp=&(*rp)->next;
+        else
+        {
+            return *rp;
+        }
+    }
+    return (mDNSNULL);
+}
+
+
+mDNSlocal void DecrementAutoTargetServices(mDNS *const m, AuthRecord *const rr)
+{
+    if (!AuthRecord_uDNS(rr) && rr->resrec.rrtype == kDNSType_SRV && rr->AutoTarget == Target_AutoHost)
+    {
+        m->AutoTargetServices--;
+        LogInfo("DecrementAutoTargetServices: AutoService Record %s, AutoTargetServices %d", ARDisplayString(m, rr), m->AutoTargetServices);
+        if (!m->AutoTargetServices)
+            DeadvertiseAllInterfaceRecords(m);
+    }
+}
+
+mDNSlocal void IncrementAutoTargetServices(mDNS *const m, AuthRecord *const rr)
+{
+    if (!AuthRecord_uDNS(rr) && rr->resrec.rrtype == kDNSType_SRV && rr->AutoTarget == Target_AutoHost)
+    {
+        int count = m->AutoTargetServices;
+
+        // Bump up before calling AdvertiseAllInterfaceRecords. AdvertiseInterface
+        // returns without doing anything if the count is zero.
+        m->AutoTargetServices++;
+        LogInfo("IncrementAutoTargetServices: AutoService Record %s, AutoTargetServices %d", ARDisplayString(m, rr), m->AutoTargetServices);
+        if (!count)
+            AdvertiseAllInterfaceRecords(m);
+    }
+}
+
+mDNSlocal void getKeepaliveRaddr(mDNS *const m, AuthRecord *rr, mDNSAddr *raddr)
+{
+    mDNSAddr     laddr;
+    mDNSEthAddr  eth;
+    mDNSIPPort   lport, rport;
+    mDNSu32      timeout, seq, ack;
+    mDNSu16      win;
+
+    if (mDNS_KeepaliveRecord(&rr->resrec))
+    {
+        mDNS_ExtractKeepaliveInfo(rr, &timeout, &laddr, raddr, &eth, &seq, &ack, &lport, &rport, &win);
+        if (!timeout || mDNSAddressIsZero(&laddr) || mDNSAddressIsZero(raddr) || mDNSIPPortIsZero(lport) || mDNSIPPortIsZero(rport))
+        {
+            LogMsg("getKeepaliveRaddr: not a valid record %s for keepalive %#a:%d %#a:%d", ARDisplayString(m, rr), &laddr, lport.NotAnInteger, raddr, rport.NotAnInteger);
+            return;
+        }
+    }
+}
+
+// Exported so uDNS.c can call this
+mDNSexport mStatus mDNS_Register_internal(mDNS *const m, AuthRecord *const rr)
+{
+    domainname *target = GetRRDomainNameTarget(&rr->resrec);
+    AuthRecord *r;
+    AuthRecord **p = &m->ResourceRecords;
+    AuthRecord **d = &m->DuplicateRecords;
+
+    if ((mDNSs32)rr->resrec.rroriginalttl <= 0)
+    { LogMsg("mDNS_Register_internal: TTL %X should be 1 - 0x7FFFFFFF %s", rr->resrec.rroriginalttl, ARDisplayString(m, rr)); return(mStatus_BadParamErr); }
+
+    if (!rr->resrec.RecordType)
+    { LogMsg("mDNS_Register_internal: RecordType must be non-zero %s", ARDisplayString(m, rr)); return(mStatus_BadParamErr); }
+
+    if (m->ShutdownTime)
+    { LogMsg("mDNS_Register_internal: Shutting down, can't register %s", ARDisplayString(m, rr)); return(mStatus_ServiceNotRunning); }
+
+    if (m->DivertMulticastAdvertisements && !AuthRecord_uDNS(rr))
+    {
+        mDNSInterfaceID previousID = rr->resrec.InterfaceID;
+        if (rr->resrec.InterfaceID == mDNSInterface_Any || rr->resrec.InterfaceID == mDNSInterface_P2P)
+        {
+            rr->resrec.InterfaceID = mDNSInterface_LocalOnly;
+            rr->ARType = AuthRecordLocalOnly;
+        }
+        if (rr->resrec.InterfaceID != mDNSInterface_LocalOnly)
+        {
+            NetworkInterfaceInfo *intf = FirstInterfaceForID(m, rr->resrec.InterfaceID);
+            if (intf && !intf->Advertise) { rr->resrec.InterfaceID = mDNSInterface_LocalOnly; rr->ARType = AuthRecordLocalOnly; }
+        }
+        if (rr->resrec.InterfaceID != previousID)
+            LogInfo("mDNS_Register_internal: Diverting record to local-only %s", ARDisplayString(m, rr));
+    }
+
+    if (RRLocalOnly(rr))
+    {
+        if (CheckAuthSameRecord(&m->rrauth, rr))
+        {
+            LogMsg("mDNS_Register_internal: ERROR!! Tried to register LocalOnly AuthRecord %p %##s (%s) that's already in the list",
+                   rr, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+            return(mStatus_AlreadyRegistered);
+        }
+    }
+    else
+    {
+        while (*p && *p != rr) p=&(*p)->next;
+        if (*p)
+        {
+            LogMsg("mDNS_Register_internal: ERROR!! Tried to register AuthRecord %p %##s (%s) that's already in the list",
+                   rr, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+            return(mStatus_AlreadyRegistered);
+        }
+    }
+
+    while (*d && *d != rr) d=&(*d)->next;
+    if (*d)
+    {
+        LogMsg("mDNS_Register_internal: ERROR!! Tried to register AuthRecord %p %##s (%s) that's already in the Duplicate list",
+               rr, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+        return(mStatus_AlreadyRegistered);
+    }
+
+    if (rr->DependentOn)
+    {
+        if (rr->resrec.RecordType == kDNSRecordTypeUnique)
+            rr->resrec.RecordType =  kDNSRecordTypeVerified;
+        else
+        {
+            LogMsg("mDNS_Register_internal: ERROR! %##s (%s): rr->DependentOn && RecordType != kDNSRecordTypeUnique",
+                   rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+            return(mStatus_Invalid);
+        }
+        if (!(rr->DependentOn->resrec.RecordType & (kDNSRecordTypeUnique | kDNSRecordTypeVerified | kDNSRecordTypeKnownUnique)))
+        {
+            LogMsg("mDNS_Register_internal: ERROR! %##s (%s): rr->DependentOn->RecordType bad type %X",
+                   rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), rr->DependentOn->resrec.RecordType);
+            return(mStatus_Invalid);
+        }
+    }
+
+    // If this resource record is referencing a specific interface, make sure it exists.
+    // Skip checks for LocalOnly and P2P as they are not valid InterfaceIDs. Also, for scoped
+    // entries in /etc/hosts skip that check as that interface may not be valid at this time.
+    if (rr->resrec.InterfaceID && rr->ARType != AuthRecordLocalOnly && rr->ARType != AuthRecordP2P)
+    {
+        NetworkInterfaceInfo *intf = FirstInterfaceForID(m, rr->resrec.InterfaceID);
+        if (!intf)
+        {
+            debugf("mDNS_Register_internal: Bogus InterfaceID %p in resource record", rr->resrec.InterfaceID);
+            return(mStatus_BadReferenceErr);
+        }
+    }
+
+    rr->next = mDNSNULL;
+
+    // Field Group 1: The actual information pertaining to this resource record
+    // Set up by client prior to call
+
+    // Field Group 2: Persistent metadata for Authoritative Records
+//	rr->Additional1       = set to mDNSNULL  in mDNS_SetupResourceRecord; may be overridden by client
+//	rr->Additional2       = set to mDNSNULL  in mDNS_SetupResourceRecord; may be overridden by client
+//	rr->DependentOn       = set to mDNSNULL  in mDNS_SetupResourceRecord; may be overridden by client
+//	rr->RRSet             = set to mDNSNULL  in mDNS_SetupResourceRecord; may be overridden by client
+//	rr->Callback          = already set      in mDNS_SetupResourceRecord
+//	rr->Context           = already set      in mDNS_SetupResourceRecord
+//	rr->RecordType        = already set      in mDNS_SetupResourceRecord
+//	rr->HostTarget        = set to mDNSfalse in mDNS_SetupResourceRecord; may be overridden by client
+//	rr->AllowRemoteQuery  = set to mDNSfalse in mDNS_SetupResourceRecord; may be overridden by client
+    // Make sure target is not uninitialized data, or we may crash writing debugging log messages
+    if (rr->AutoTarget && target) target->c[0] = 0;
+
+    // Field Group 3: Transient state for Authoritative Records
+    rr->Acknowledged      = mDNSfalse;
+    rr->ProbeCount        = DefaultProbeCountForRecordType(rr->resrec.RecordType);
+    rr->ProbeRestartCount = 0;
+    rr->AnnounceCount     = InitialAnnounceCount;
+    rr->RequireGoodbye    = mDNSfalse;
+    rr->AnsweredLocalQ    = mDNSfalse;
+    rr->IncludeInProbe    = mDNSfalse;
+    rr->ImmedUnicast      = mDNSfalse;
+    rr->SendNSECNow       = mDNSNULL;
+    rr->ImmedAnswer       = mDNSNULL;
+    rr->ImmedAdditional   = mDNSNULL;
+    rr->SendRNow          = mDNSNULL;
+    rr->v4Requester       = zerov4Addr;
+    rr->v6Requester       = zerov6Addr;
+    rr->NextResponse      = mDNSNULL;
+    rr->NR_AnswerTo       = mDNSNULL;
+    rr->NR_AdditionalTo   = mDNSNULL;
+    if (!rr->AutoTarget) InitializeLastAPTime(m, rr);
+//	rr->LastAPTime        = Set for us in InitializeLastAPTime()
+//	rr->LastMCTime        = Set for us in InitializeLastAPTime()
+//	rr->LastMCInterface   = Set for us in InitializeLastAPTime()
+    rr->NewRData          = mDNSNULL;
+    rr->newrdlength       = 0;
+    rr->UpdateCallback    = mDNSNULL;
+    rr->UpdateCredits     = kMaxUpdateCredits;
+    rr->NextUpdateCredit  = 0;
+    rr->UpdateBlocked     = 0;
+
+    // For records we're holding as proxy (except reverse-mapping PTR records) two announcements is sufficient
+    if (rr->WakeUp.HMAC.l[0] && !rr->AddressProxy.type) rr->AnnounceCount = 2;
+
+    // Field Group 4: Transient uDNS state for Authoritative Records
+    rr->state             = regState_Zero;
+    rr->uselease          = 0;
+    rr->expire            = 0;
+    rr->Private           = 0;
+    rr->updateid          = zeroID;
+    rr->updateIntID       = zeroOpaque64;
+    rr->zone              = rr->resrec.name;
+    rr->nta               = mDNSNULL;
+    rr->tcp               = mDNSNULL;
+    rr->OrigRData         = 0;
+    rr->OrigRDLen         = 0;
+    rr->InFlightRData     = 0;
+    rr->InFlightRDLen     = 0;
+    rr->QueuedRData       = 0;
+    rr->QueuedRDLen       = 0;
+    //mDNSPlatformMemZero(&rr->NATinfo, sizeof(rr->NATinfo));
+    // We should be recording the actual internal port for this service record here. Once we initiate our NAT mapping
+    // request we'll subsequently overwrite srv.port with the allocated external NAT port -- potentially multiple
+    // times with different values if the external NAT port changes during the lifetime of the service registration.
+    //if (rr->resrec.rrtype == kDNSType_SRV) rr->NATinfo.IntPort = rr->resrec.rdata->u.srv.port;
+
+//	rr->resrec.interface         = already set in mDNS_SetupResourceRecord
+//	rr->resrec.name->c           = MUST be set by client
+//	rr->resrec.rrtype            = already set in mDNS_SetupResourceRecord
+//	rr->resrec.rrclass           = already set in mDNS_SetupResourceRecord
+//	rr->resrec.rroriginalttl     = already set in mDNS_SetupResourceRecord
+//	rr->resrec.rdata             = MUST be set by client, unless record type is CNAME or PTR and rr->HostTarget is set
+
+    // BIND named (name daemon) doesn't allow TXT records with zero-length rdata. This is strictly speaking correct,
+    // since RFC 1035 specifies a TXT record as "One or more <character-string>s", not "Zero or more <character-string>s".
+    // Since some legacy apps try to create zero-length TXT records, we'll silently correct it here.
+    if (rr->resrec.rrtype == kDNSType_TXT && rr->resrec.rdlength == 0) { rr->resrec.rdlength = 1; rr->resrec.rdata->u.txt.c[0] = 0; }
+
+    if (rr->AutoTarget)
+    {
+        SetTargetToHostName(m, rr); // Also sets rdlength and rdestimate for us, and calls InitializeLastAPTime();
+#ifndef UNICAST_DISABLED
+        // If we have no target record yet, SetTargetToHostName will set rr->state == regState_NoTarget
+        // In this case we leave the record half-formed in the list, and later we'll remove it from the list and re-add it properly.
+        if (rr->state == regState_NoTarget)
+        {
+            // Initialize the target so that we don't crash while logging etc.
+            domainname *tar = GetRRDomainNameTarget(&rr->resrec);
+            if (tar) tar->c[0] = 0;
+            LogInfo("mDNS_Register_internal: record %s in NoTarget state", ARDisplayString(m, rr));
+        }
+#endif
+    }
+    else
+    {
+        rr->resrec.rdlength   = GetRDLength(&rr->resrec, mDNSfalse);
+        rr->resrec.rdestimate = GetRDLength(&rr->resrec, mDNStrue);
+    }
+
+    if (!ValidateDomainName(rr->resrec.name))
+    { LogMsg("Attempt to register record with invalid name: %s", ARDisplayString(m, rr)); return(mStatus_Invalid); }
+
+    // Don't do this until *after* we've set rr->resrec.rdlength
+    if (!ValidateRData(rr->resrec.rrtype, rr->resrec.rdlength, rr->resrec.rdata))
+    { LogMsg("Attempt to register record with invalid rdata: %s", ARDisplayString(m, rr)); return(mStatus_Invalid); }
+
+    rr->resrec.namehash   = DomainNameHashValue(rr->resrec.name);
+    rr->resrec.rdatahash  = target ? DomainNameHashValue(target) : RDataHashValue(&rr->resrec);
+
+    if (RRLocalOnly(rr))
+    {
+        // If this is supposed to be unique, make sure we don't have any name conflicts.
+        // If we found a conflict, we may still want to insert the record in the list but mark it appropriately
+        // (kDNSRecordTypeDeregistering) so that we deliver RMV events to the application. But this causes more
+        // complications and not clear whether there are any benefits. See rdar:9304275 for details.
+        // Hence, just bail out.
+        if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+        {
+            if (CheckAuthRecordConflict(&m->rrauth, rr))
+            {
+                LogInfo("mDNS_Register_internal: Name conflict %s (%p), InterfaceID %p", ARDisplayString(m, rr), rr, rr->resrec.InterfaceID);
+                return mStatus_NameConflict;
+            }
+        }
+    }
+
+    // For uDNS records, we don't support duplicate checks at this time.
+#ifndef UNICAST_DISABLED
+    if (AuthRecord_uDNS(rr))
+    {
+        if (!m->NewLocalRecords) m->NewLocalRecords = rr;
+        // When we called SetTargetToHostName, it may have caused mDNS_Register_internal to be re-entered, appending new
+        // records to the list, so we now need to update p to advance to the new end to the list before appending our new record.
+        // Note that for AutoTunnel this should never happen, but this check makes the code future-proof.
+        while (*p) p=&(*p)->next;
+        *p = rr;
+        if (rr->resrec.RecordType == kDNSRecordTypeUnique) rr->resrec.RecordType = kDNSRecordTypeVerified;
+        rr->ProbeCount    = 0;
+        rr->ProbeRestartCount = 0;
+        rr->AnnounceCount = 0;
+        if (rr->state != regState_NoTarget) ActivateUnicastRegistration(m, rr);
+        return(mStatus_NoError);            // <--- Note: For unicast records, code currently bails out at this point
+    }
+#endif
+
+    // Now that we've finished building our new record, make sure it's not identical to one we already have
+    if (RRLocalOnly(rr))
+    {
+        rr->ProbeCount    = 0;
+        rr->ProbeRestartCount = 0;
+        rr->AnnounceCount = 0;
+        r = CheckAuthIdenticalRecord(&m->rrauth, rr);
+    }
+    else
+    {
+        for (r = m->ResourceRecords; r; r=r->next)
+            if (RecordIsLocalDuplicate(r, rr))
+            {
+                if (r->resrec.RecordType == kDNSRecordTypeDeregistering) r->AnnounceCount = 0;
+                else break;
+            }
+    }
+
+    if (r)
+    {
+        debugf("mDNS_Register_internal:Adding to duplicate list %s", ARDisplayString(m,rr));
+        *d = rr;
+        // If the previous copy of this record is already verified unique,
+        // then indicate that we should move this record promptly to kDNSRecordTypeUnique state.
+        // Setting ProbeCount to zero will cause SendQueries() to advance this record to
+        // kDNSRecordTypeVerified state and call the client callback at the next appropriate time.
+        if (rr->resrec.RecordType == kDNSRecordTypeUnique && r->resrec.RecordType == kDNSRecordTypeVerified)
+            rr->ProbeCount = 0;
+    }
+    else
+    {
+        debugf("mDNS_Register_internal: Adding to active record list %s", ARDisplayString(m,rr));
+        if (RRLocalOnly(rr))
+        {
+            AuthGroup *ag;
+            ag = InsertAuthRecord(m, &m->rrauth, rr);
+            if (ag && !ag->NewLocalOnlyRecords) {
+                m->NewLocalOnlyRecords = mDNStrue;
+                ag->NewLocalOnlyRecords = rr;
+            }
+            // No probing for LocalOnly records, Acknowledge them right away
+            if (rr->resrec.RecordType == kDNSRecordTypeUnique) rr->resrec.RecordType = kDNSRecordTypeVerified;
+            AcknowledgeRecord(m, rr);
+            return(mStatus_NoError);
+        }
+        else
+        {
+            if (!m->NewLocalRecords) m->NewLocalRecords = rr;
+            *p = rr;
+        }
+    }
+
+    // If this is a keepalive record, fetch the MAC address of the remote host.
+    // This is used by the in-NIC proxy to send the keepalive packets.
+    if (mDNS_KeepaliveRecord(&rr->resrec))
+    {
+        // Set the record type to known unique to prevent probing keep alive records.
+        // Also make sure we do not announce the keepalive records.
+       rr->resrec.RecordType = kDNSRecordTypeKnownUnique;
+       rr->AnnounceCount     = 0;
+       mDNSAddr   raddr;
+       getKeepaliveRaddr(m, rr, &raddr);
+       // This is an asynchronous call. Once the remote MAC address is available, helper will schedule an
+       // asynchronous task to update the resource record
+       mDNSPlatformGetRemoteMacAddr(m, &raddr);
+    }
+
+    if (!AuthRecord_uDNS(rr))   // This check is superfluous, given that for unicast records we (currently) bail out above
+    {
+        // We have inserted the record in the list. See if we have to advertise the A/AAAA,HINFO,PTR records.
+        IncrementAutoTargetServices(m, rr);
+        // For records that are not going to probe, acknowledge them right away
+        if (rr->resrec.RecordType != kDNSRecordTypeUnique && rr->resrec.RecordType != kDNSRecordTypeDeregistering)
+            AcknowledgeRecord(m, rr);
+
+        // Adding a record may affect whether or not we should sleep
+        mDNS_UpdateAllowSleep(m);
+    }
+
+    return(mStatus_NoError);
+}
+
+mDNSlocal void RecordProbeFailure(mDNS *const m, const AuthRecord *const rr)
+{
+    m->ProbeFailTime = m->timenow;
+    m->NumFailedProbes++;
+    // If we've had fifteen or more probe failures, rate-limit to one every five seconds.
+    // If a bunch of hosts have all been configured with the same name, then they'll all
+    // conflict and run through the same series of names: name-2, name-3, name-4, etc.,
+    // up to name-10. After that they'll start adding random increments in the range 1-100,
+    // so they're more likely to branch out in the available namespace and settle on a set of
+    // unique names quickly. If after five more tries the host is still conflicting, then we
+    // may have a serious problem, so we start rate-limiting so we don't melt down the network.
+    if (m->NumFailedProbes >= 15)
+    {
+        m->SuppressProbes = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 5);
+        LogMsg("Excessive name conflicts (%lu) for %##s (%s); rate limiting in effect",
+               m->NumFailedProbes, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+    }
+}
+
+mDNSlocal void CompleteRDataUpdate(mDNS *const m, AuthRecord *const rr)
+{
+    RData *OldRData = rr->resrec.rdata;
+    mDNSu16 OldRDLen = rr->resrec.rdlength;
+    SetNewRData(&rr->resrec, rr->NewRData, rr->newrdlength);    // Update our rdata
+    rr->NewRData = mDNSNULL;                                    // Clear the NewRData pointer ...
+    if (rr->UpdateCallback)
+        rr->UpdateCallback(m, rr, OldRData, OldRDLen);          // ... and let the client know
+}
+
+// Note: mDNS_Deregister_internal can call a user callback, which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+// Exported so uDNS.c can call this
+mDNSexport mStatus mDNS_Deregister_internal(mDNS *const m, AuthRecord *const rr, mDNS_Dereg_type drt)
+{
+    AuthRecord *r2;
+    mDNSu8 RecordType = rr->resrec.RecordType;
+    AuthRecord **p = &m->ResourceRecords;   // Find this record in our list of active records
+    mDNSBool dupList = mDNSfalse;
+
+    if (RRLocalOnly(rr))
+    {
+        AuthGroup *a;
+        AuthGroup **ag = &a;
+        AuthRecord **rp;
+        const mDNSu32 slot = AuthHashSlot(rr->resrec.name);
+
+        a = AuthGroupForRecord(&m->rrauth, slot, &rr->resrec);
+        if (!a) return mDNSfalse;
+        rp = &(*ag)->members;
+        while (*rp && *rp != rr) rp=&(*rp)->next;
+        p = rp;
+    }
+    else
+    {
+        while (*p && *p != rr) p=&(*p)->next;
+    }
+
+    if (*p)
+    {
+        // We found our record on the main list. See if there are any duplicates that need special handling.
+        if (drt == mDNS_Dereg_conflict)     // If this was a conflict, see that all duplicates get the same treatment
+        {
+            // Scan for duplicates of rr, and mark them for deregistration at the end of this routine, after we've finished
+            // deregistering rr. We need to do this scan *before* we give the client the chance to free and reuse the rr memory.
+            for (r2 = m->DuplicateRecords; r2; r2=r2->next) if (RecordIsLocalDuplicate(r2, rr)) r2->ProbeCount = 0xFF;
+        }
+        else
+        {
+            // Before we delete the record (and potentially send a goodbye packet)
+            // first see if we have a record on the duplicate list ready to take over from it.
+            AuthRecord **d = &m->DuplicateRecords;
+            while (*d && !RecordIsLocalDuplicate(*d, rr)) d=&(*d)->next;
+            if (*d)
+            {
+                AuthRecord *dup = *d;
+                debugf("mDNS_Register_internal: Duplicate record %p taking over from %p %##s (%s)",
+                       dup, rr, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+                *d        = dup->next;      // Cut replacement record from DuplicateRecords list
+                if (RRLocalOnly(rr))
+                {
+                    dup->next = mDNSNULL;
+                    if (!InsertAuthRecord(m, &m->rrauth, dup)) LogMsg("mDNS_Deregister_internal: ERROR!! cannot insert %s", ARDisplayString(m, dup));
+                }
+                else
+                {
+                    dup->next = rr->next;       // And then...
+                    rr->next  = dup;            // ... splice it in right after the record we're about to delete
+                }
+                dup->resrec.RecordType        = rr->resrec.RecordType;
+                dup->ProbeCount      = rr->ProbeCount;
+                dup->ProbeRestartCount = rr->ProbeRestartCount;
+                dup->AnnounceCount   = rr->AnnounceCount;
+                dup->RequireGoodbye  = rr->RequireGoodbye;
+                dup->AnsweredLocalQ  = rr->AnsweredLocalQ;
+                dup->ImmedAnswer     = rr->ImmedAnswer;
+                dup->ImmedUnicast    = rr->ImmedUnicast;
+                dup->ImmedAdditional = rr->ImmedAdditional;
+                dup->v4Requester     = rr->v4Requester;
+                dup->v6Requester     = rr->v6Requester;
+                dup->ThisAPInterval  = rr->ThisAPInterval;
+                dup->LastAPTime      = rr->LastAPTime;
+                dup->LastMCTime      = rr->LastMCTime;
+                dup->LastMCInterface = rr->LastMCInterface;
+                dup->Private         = rr->Private;
+                dup->state           = rr->state;
+                rr->RequireGoodbye = mDNSfalse;
+                rr->AnsweredLocalQ = mDNSfalse;
+            }
+        }
+    }
+    else
+    {
+        // We didn't find our record on the main list; try the DuplicateRecords list instead.
+        p = &m->DuplicateRecords;
+        while (*p && *p != rr) p=&(*p)->next;
+        // If we found our record on the duplicate list, then make sure we don't send a goodbye for it
+        if (*p)
+        {
+            // Duplicate records are not used for sending wakeups or goodbyes. Hence, deregister them
+            // immediately. When there is a conflict, we deregister all the conflicting duplicate records
+            // also that have been marked above in this function. In that case, we come here and if we don't
+            // deregister (unilink from the DuplicateRecords list), we will be recursing infinitely. Hence,
+            // clear the HMAC which will cause it to deregister. See <rdar://problem/10380988> for
+            // details.
+            rr->WakeUp.HMAC    = zeroEthAddr;
+            rr->RequireGoodbye = mDNSfalse;
+            rr->resrec.RecordType = kDNSRecordTypeDeregistering;
+            dupList = mDNStrue;
+        }
+        if (*p) debugf("mDNS_Deregister_internal: Deleting DuplicateRecord %p %##s (%s)",
+                       rr, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+    }
+
+    if (!*p)
+    {
+        // No need to log an error message if we already know this is a potentially repeated deregistration
+        if (drt != mDNS_Dereg_repeat)
+            LogMsg("mDNS_Deregister_internal: Record %p not found in list %s", rr, ARDisplayString(m,rr));
+        return(mStatus_BadReferenceErr);
+    }
+
+    // If this is a shared record and we've announced it at least once,
+    // we need to retract that announcement before we delete the record
+
+    // If this is a record (including mDNSInterface_LocalOnly records) for which we've given local-only answers then
+    // it's tempting to just do "AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNSfalse)" here, but that would not not be safe.
+    // The AnswerAllLocalQuestionsWithLocalAuthRecord routine walks the question list invoking client callbacks, using the "m->CurrentQuestion"
+    // mechanism to cope with the client callback modifying the question list while that's happening.
+    // However, mDNS_Deregister could have been called from a client callback (e.g. from the domain enumeration callback FoundDomain)
+    // which means that the "m->CurrentQuestion" mechanism is already in use to protect that list, so we can't use it twice.
+    // More generally, if we invoke callbacks from within a client callback, then those callbacks could deregister other
+    // records, thereby invoking yet more callbacks, without limit.
+    // The solution is to defer delivering the "Remove" events until mDNS_Execute time, just like we do for sending
+    // actual goodbye packets.
+
+#ifndef UNICAST_DISABLED
+    if (AuthRecord_uDNS(rr))
+    {
+        if (rr->RequireGoodbye)
+        {
+            if (rr->tcp) { DisposeTCPConn(rr->tcp); rr->tcp = mDNSNULL; }
+            rr->resrec.RecordType    = kDNSRecordTypeDeregistering;
+            m->LocalRemoveEvents     = mDNStrue;
+            uDNS_DeregisterRecord(m, rr);
+            // At this point unconditionally we bail out
+            // Either uDNS_DeregisterRecord will have completed synchronously, and called CompleteDeregistration,
+            // which calls us back here with RequireGoodbye set to false, or it will have initiated the deregistration
+            // process and will complete asynchronously. Either way we don't need to do anything more here.
+            return(mStatus_NoError);
+        }
+        // Sometimes the records don't complete proper deregistration i.e., don't wait for a response
+        // from the server. In that case, if the records have been part of a group update, clear the
+        // state here. Some recors e.g., AutoTunnel gets reused without ever being completely initialized
+        rr->updateid = zeroID;
+
+        // We defer cleaning up NAT state only after sending goodbyes. This is important because
+        // RecordRegistrationGotZoneData guards against creating NAT state if clientContext is non-NULL.
+        // This happens today when we turn on/off interface where we get multiple network transitions
+        // and RestartRecordGetZoneData triggers re-registration of the resource records even though
+        // they may be in Registered state which causes NAT information to be setup multiple times. Defering
+        // the cleanup here keeps clientContext non-NULL and hence prevents that. Note that cleaning up
+        // NAT state here takes care of the case where we did not send goodbyes at all.
+        if (rr->NATinfo.clientContext)
+        {
+            mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+            rr->NATinfo.clientContext = mDNSNULL;
+        }
+        if (rr->nta) { CancelGetZoneData(m, rr->nta); rr->nta = mDNSNULL; }
+        if (rr->tcp) { DisposeTCPConn(rr->tcp);       rr->tcp = mDNSNULL; }
+    }
+#endif // UNICAST_DISABLED
+
+    if      (RecordType == kDNSRecordTypeUnregistered)
+        LogMsg("mDNS_Deregister_internal: %s already marked kDNSRecordTypeUnregistered", ARDisplayString(m, rr));
+    else if (RecordType == kDNSRecordTypeDeregistering)
+    {
+        LogMsg("mDNS_Deregister_internal: %s already marked kDNSRecordTypeDeregistering", ARDisplayString(m, rr));
+        return(mStatus_BadReferenceErr);
+    }
+
+    // <rdar://problem/7457925> Local-only questions don't get remove events for unique records
+    // We may want to consider changing this code so that we generate local-only question "rmv"
+    // events (and maybe goodbye packets too) for unique records as well as for shared records
+    // Note: If we change the logic for this "if" statement, need to ensure that the code in
+    // CompleteDeregistration() sets the appropriate state variables to gaurantee that "else"
+    // clause will execute here and the record will be cut from the list.
+    if (rr->WakeUp.HMAC.l[0] ||
+        (RecordType == kDNSRecordTypeShared && (rr->RequireGoodbye || rr->AnsweredLocalQ)))
+    {
+        verbosedebugf("mDNS_Deregister_internal: Starting deregistration for %s", ARDisplayString(m, rr));
+        rr->resrec.RecordType    = kDNSRecordTypeDeregistering;
+        rr->resrec.rroriginalttl = 0;
+        rr->AnnounceCount        = rr->WakeUp.HMAC.l[0] ? WakeupCount : (drt == mDNS_Dereg_rapid) ? 1 : GoodbyeCount;
+        rr->ThisAPInterval       = mDNSPlatformOneSecond * 2;
+        rr->LastAPTime           = m->timenow - rr->ThisAPInterval;
+        m->LocalRemoveEvents     = mDNStrue;
+        if (m->NextScheduledResponse - (m->timenow + mDNSPlatformOneSecond/10) >= 0)
+            m->NextScheduledResponse = (m->timenow + mDNSPlatformOneSecond/10);
+    }
+    else
+    {
+        if (!dupList && RRLocalOnly(rr))
+        {
+            AuthGroup *ag = RemoveAuthRecord(m, &m->rrauth, rr);
+            if (ag->NewLocalOnlyRecords == rr) ag->NewLocalOnlyRecords = rr->next;
+        }
+        else
+        {
+            *p = rr->next;                  // Cut this record from the list
+            if (m->NewLocalRecords == rr) m->NewLocalRecords = rr->next;
+            DecrementAutoTargetServices(m, rr);
+        }
+        // If someone is about to look at this, bump the pointer forward
+        if (m->CurrentRecord   == rr) m->CurrentRecord   = rr->next;
+        rr->next = mDNSNULL;
+
+        // Should we generate local remove events here?
+        // i.e. something like:
+        // if (rr->AnsweredLocalQ) { AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNSfalse); rr->AnsweredLocalQ = mDNSfalse; }
+
+        verbosedebugf("mDNS_Deregister_internal: Deleting record for %s", ARDisplayString(m, rr));
+        rr->resrec.RecordType = kDNSRecordTypeUnregistered;
+
+        if ((drt == mDNS_Dereg_conflict || drt == mDNS_Dereg_repeat) && RecordType == kDNSRecordTypeShared)
+            debugf("mDNS_Deregister_internal: Cannot have a conflict on a shared record! %##s (%s)",
+                   rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+
+        // If we have an update queued up which never executed, give the client a chance to free that memory
+        if (rr->NewRData) CompleteRDataUpdate(m, rr);   // Update our rdata, clear the NewRData pointer, and return memory to the client
+
+
+        // CAUTION: MUST NOT do anything more with rr after calling rr->Callback(), because the client's callback function
+        // is allowed to do anything, including starting/stopping queries, registering/deregistering records, etc.
+        // In this case the likely client action to the mStatus_MemFree message is to free the memory,
+        // so any attempt to touch rr after this is likely to lead to a crash.
+        if (drt != mDNS_Dereg_conflict)
+        {
+            mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+            LogInfo("mDNS_Deregister_internal: mStatus_MemFree for %s", ARDisplayString(m, rr));
+            if (rr->RecordCallback)
+                rr->RecordCallback(m, rr, mStatus_MemFree);         // MUST NOT touch rr after this
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        }
+        else
+        {
+            RecordProbeFailure(m, rr);
+            mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+            if (rr->RecordCallback)
+                rr->RecordCallback(m, rr, mStatus_NameConflict);    // MUST NOT touch rr after this
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+            // Now that we've finished deregistering rr, check our DuplicateRecords list for any that we marked previously.
+            // Note that with all the client callbacks going on, by the time we get here all the
+            // records we marked may have been explicitly deregistered by the client anyway.
+            r2 = m->DuplicateRecords;
+            while (r2)
+            {
+                if (r2->ProbeCount != 0xFF)
+                {
+                    r2 = r2->next;
+                }
+                else
+                {
+                    mDNS_Deregister_internal(m, r2, mDNS_Dereg_conflict);
+                    // As this is a duplicate record, it will be unlinked from the list
+                    // immediately
+                    r2 = m->DuplicateRecords;
+                }
+            }
+        }
+    }
+    mDNS_UpdateAllowSleep(m);
+    return(mStatus_NoError);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Packet Sending Functions
+#endif
+
+mDNSlocal void AddRecordToResponseList(AuthRecord ***nrpp, AuthRecord *rr, AuthRecord *add)
+{
+    if (rr->NextResponse == mDNSNULL && *nrpp != &rr->NextResponse)
+    {
+        **nrpp = rr;
+        // NR_AdditionalTo must point to a record with NR_AnswerTo set (and not NR_AdditionalTo)
+        // If 'add' does not meet this requirement, then follow its NR_AdditionalTo pointer to a record that does
+        // The referenced record will definitely be acceptable (by recursive application of this rule)
+        if (add && add->NR_AdditionalTo) add = add->NR_AdditionalTo;
+        rr->NR_AdditionalTo = add;
+        *nrpp = &rr->NextResponse;
+    }
+    debugf("AddRecordToResponseList: %##s (%s) already in list", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+}
+
+mDNSlocal void AddAdditionalsToResponseList(mDNS *const m, AuthRecord *ResponseRecords, AuthRecord ***nrpp, const mDNSInterfaceID InterfaceID)
+{
+    AuthRecord  *rr, *rr2;
+    for (rr=ResponseRecords; rr; rr=rr->NextResponse)           // For each record we plan to put
+    {
+        // (Note: This is an "if", not a "while". If we add a record, we'll find it again
+        // later in the "for" loop, and we will follow further "additional" links then.)
+        if (rr->Additional1 && ResourceRecordIsValidInterfaceAnswer(rr->Additional1, InterfaceID))
+            AddRecordToResponseList(nrpp, rr->Additional1, rr);
+
+        if (rr->Additional2 && ResourceRecordIsValidInterfaceAnswer(rr->Additional2, InterfaceID))
+            AddRecordToResponseList(nrpp, rr->Additional2, rr);
+
+        // For SRV records, automatically add the Address record(s) for the target host
+        if (rr->resrec.rrtype == kDNSType_SRV)
+        {
+            for (rr2=m->ResourceRecords; rr2; rr2=rr2->next)                    // Scan list of resource records
+                if (RRTypeIsAddressType(rr2->resrec.rrtype) &&                  // For all address records (A/AAAA) ...
+                    ResourceRecordIsValidInterfaceAnswer(rr2, InterfaceID) &&   // ... which are valid for answer ...
+                    rr->resrec.rdatahash == rr2->resrec.namehash &&         // ... whose name is the name of the SRV target
+                    SameDomainName(&rr->resrec.rdata->u.srv.target, rr2->resrec.name))
+                    AddRecordToResponseList(nrpp, rr2, rr);
+        }
+        else if (RRTypeIsAddressType(rr->resrec.rrtype))    // For A or AAAA, put counterpart as additional
+        {
+            for (rr2=m->ResourceRecords; rr2; rr2=rr2->next)                    // Scan list of resource records
+                if (RRTypeIsAddressType(rr2->resrec.rrtype) &&                  // For all address records (A/AAAA) ...
+                    ResourceRecordIsValidInterfaceAnswer(rr2, InterfaceID) &&   // ... which are valid for answer ...
+                    rr->resrec.namehash == rr2->resrec.namehash &&              // ... and have the same name
+                    SameDomainName(rr->resrec.name, rr2->resrec.name))
+                    AddRecordToResponseList(nrpp, rr2, rr);
+        }
+        else if (rr->resrec.rrtype == kDNSType_PTR)         // For service PTR, see if we want to add DeviceInfo record
+        {
+            if (ResourceRecordIsValidInterfaceAnswer(&m->DeviceInfo, InterfaceID) &&
+                SameDomainLabel(rr->resrec.rdata->u.name.c, m->DeviceInfo.resrec.name->c))
+                AddRecordToResponseList(nrpp, &m->DeviceInfo, rr);
+        }
+    }
+}
+
+mDNSlocal int AnonInfoSpace(AnonymousInfo *info)
+{
+    ResourceRecord *rr = info->nsec3RR;
+
+    // 2 bytes for compressed name + type (2) class (2) TTL (4) rdlength (2) rdata (n)
+    return (2 + 10 + rr->rdlength);
+}
+
+mDNSlocal void SendDelayedUnicastResponse(mDNS *const m, const mDNSAddr *const dest, const mDNSInterfaceID InterfaceID)
+{
+    AuthRecord *rr;
+    AuthRecord  *ResponseRecords = mDNSNULL;
+    AuthRecord **nrp             = &ResponseRecords;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID);
+    int AnoninfoSpace = 0;
+
+    // Make a list of all our records that need to be unicast to this destination
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        // If we find we can no longer unicast this answer, clear ImmedUnicast
+        if (rr->ImmedAnswer == mDNSInterfaceMark               ||
+            mDNSSameIPv4Address(rr->v4Requester, onesIPv4Addr) ||
+            mDNSSameIPv6Address(rr->v6Requester, onesIPv6Addr)  )
+            rr->ImmedUnicast = mDNSfalse;
+
+        if (rr->ImmedUnicast && rr->ImmedAnswer == InterfaceID)
+        {
+            if ((dest->type == mDNSAddrType_IPv4 && mDNSSameIPv4Address(rr->v4Requester, dest->ip.v4)) ||
+                (dest->type == mDNSAddrType_IPv6 && mDNSSameIPv6Address(rr->v6Requester, dest->ip.v6)))
+            {
+                rr->ImmedAnswer  = mDNSNULL;                // Clear the state fields
+                rr->ImmedUnicast = mDNSfalse;
+                rr->v4Requester  = zerov4Addr;
+                rr->v6Requester  = zerov6Addr;
+
+                // Only sent records registered for P2P over P2P interfaces
+                if (intf && !mDNSPlatformValidRecordForInterface(rr, intf))
+                {
+                    LogInfo("SendDelayedUnicastResponse: Not sending %s, on %s", ARDisplayString(m, rr), InterfaceNameForID(m, InterfaceID));
+                    continue;
+                }
+
+                if (rr->NextResponse == mDNSNULL && nrp != &rr->NextResponse)   // rr->NR_AnswerTo
+                {
+                    rr->NR_AnswerTo = NR_AnswerMulticast;
+                    *nrp = rr;
+                    nrp = &rr->NextResponse;
+                }
+            }
+        }
+    }
+
+    AddAdditionalsToResponseList(m, ResponseRecords, &nrp, InterfaceID);
+
+    while (ResponseRecords)
+    {
+        mDNSu8 *responseptr = m->omsg.data;
+        mDNSu8 *newptr;
+        InitializeDNSMessage(&m->omsg.h, zeroID, ResponseFlags);
+
+        // Put answers in the packet
+        while (ResponseRecords && ResponseRecords->NR_AnswerTo)
+        {
+            rr = ResponseRecords;
+            if (rr->resrec.AnonInfo)
+            {
+                AnoninfoSpace += AnonInfoSpace(rr->resrec.AnonInfo);
+                rr->resrec.AnonInfo->SendNow = mDNSInterfaceMark;
+            }
+            if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                rr->resrec.rrclass |= kDNSClass_UniqueRRSet;        // Temporarily set the cache flush bit so PutResourceRecord will set it
+
+            // Retract the limit by AnoninfoSpace which we need to put the AnoInfo option.
+            newptr = PutResourceRecordTTLWithLimit(&m->omsg, responseptr, &m->omsg.h.numAnswers, &rr->resrec, rr->resrec.rroriginalttl,
+                 m->omsg.data + (AllowedRRSpace(&m->omsg) - AnoninfoSpace));
+
+            rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;           // Make sure to clear cache flush bit back to normal state
+            if (!newptr && m->omsg.h.numAnswers)
+            {
+                break; // If packet full, send it now
+            }
+            if (newptr) responseptr = newptr;
+            ResponseRecords = rr->NextResponse;
+            rr->NextResponse    = mDNSNULL;
+            rr->NR_AnswerTo     = mDNSNULL;
+            rr->NR_AdditionalTo = mDNSNULL;
+            rr->RequireGoodbye  = mDNStrue;
+        }
+
+        // We have reserved the space for AnonInfo option. PutResourceRecord uses the
+        // standard limit (AllowedRRSpace) and we should have space now.
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+            if (rr->resrec.AnonInfo && rr->resrec.AnonInfo->SendNow == mDNSInterfaceMark)
+            {
+                ResourceRecord *nsec3RR = rr->resrec.AnonInfo->nsec3RR;
+
+                newptr = PutResourceRecord(&m->omsg, responseptr, &m->omsg.h.numAuthorities, nsec3RR);
+                if (newptr)
+                {
+                    responseptr = newptr;
+                    debugf("SendDelayedUnicastResponse: Added NSEC3 Record %s on %p", RRDisplayString(m, nsec3RR), intf->InterfaceID);
+                }
+                else
+                {
+                    // We allocated space and we should not fail. Don't break, we need to clear the SendNow flag.
+                    LogMsg("SendDelayedUnicastResponse: ERROR!! Cannot Add NSEC3 Record %s on %p", RRDisplayString(m, nsec3RR), intf->InterfaceID);
+                }
+                rr->resrec.AnonInfo->SendNow = mDNSNULL;
+            }
+        }
+
+        // Add additionals, if there's space
+        while (ResponseRecords && !ResponseRecords->NR_AnswerTo)
+        {
+            rr = ResponseRecords;
+            if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                rr->resrec.rrclass |= kDNSClass_UniqueRRSet;        // Temporarily set the cache flush bit so PutResourceRecord will set it
+            newptr = PutResourceRecord(&m->omsg, responseptr, &m->omsg.h.numAdditionals, &rr->resrec);
+            rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;           // Make sure to clear cache flush bit back to normal state
+
+            if (newptr) responseptr = newptr;
+            if (newptr && m->omsg.h.numAnswers) rr->RequireGoodbye = mDNStrue;
+            else if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask) rr->ImmedAnswer = mDNSInterfaceMark;
+            ResponseRecords = rr->NextResponse;
+            rr->NextResponse    = mDNSNULL;
+            rr->NR_AnswerTo     = mDNSNULL;
+            rr->NR_AdditionalTo = mDNSNULL;
+        }
+
+        if (m->omsg.h.numAnswers)
+            mDNSSendDNSMessage(m, &m->omsg, responseptr, InterfaceID, mDNSNULL, dest, MulticastDNSPort, mDNSNULL, mDNSNULL, mDNSfalse);
+    }
+}
+
+// CompleteDeregistration guarantees that on exit the record will have been cut from the m->ResourceRecords list
+// and the client's mStatus_MemFree callback will have been invoked
+mDNSexport void CompleteDeregistration(mDNS *const m, AuthRecord *rr)
+{
+    LogInfo("CompleteDeregistration: called for Resource record %s", ARDisplayString(m, rr));
+    // Clearing rr->RequireGoodbye signals mDNS_Deregister_internal() that
+    // it should go ahead and immediately dispose of this registration
+    rr->resrec.RecordType = kDNSRecordTypeShared;
+    rr->RequireGoodbye    = mDNSfalse;
+    rr->WakeUp.HMAC       = zeroEthAddr;
+    if (rr->AnsweredLocalQ) { AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNSfalse); rr->AnsweredLocalQ = mDNSfalse; }
+    mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);     // Don't touch rr after this
+}
+
+// DiscardDeregistrations is used on shutdown and sleep to discard (forcibly and immediately)
+// any deregistering records that remain in the m->ResourceRecords list.
+// DiscardDeregistrations calls mDNS_Deregister_internal which can call a user callback,
+// which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void DiscardDeregistrations(mDNS *const m)
+{
+    if (m->CurrentRecord)
+        LogMsg("DiscardDeregistrations ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = m->ResourceRecords;
+
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rr = m->CurrentRecord;
+        if (!AuthRecord_uDNS(rr) && rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+            CompleteDeregistration(m, rr);      // Don't touch rr after this
+        else
+            m->CurrentRecord = rr->next;
+    }
+}
+
+mDNSlocal mStatus GetLabelDecimalValue(const mDNSu8 *const src, mDNSu8 *dst)
+{
+    int i, val = 0;
+    if (src[0] < 1 || src[0] > 3) return(mStatus_Invalid);
+    for (i=1; i<=src[0]; i++)
+    {
+        if (src[i] < '0' || src[i] > '9') return(mStatus_Invalid);
+        val = val * 10 + src[i] - '0';
+    }
+    if (val > 255) return(mStatus_Invalid);
+    *dst = (mDNSu8)val;
+    return(mStatus_NoError);
+}
+
+mDNSlocal mStatus GetIPv4FromName(mDNSAddr *const a, const domainname *const name)
+{
+    int skip = CountLabels(name) - 6;
+    if (skip < 0) { LogMsg("GetIPFromName: Need six labels in IPv4 reverse mapping name %##s", name); return mStatus_Invalid; }
+    if (GetLabelDecimalValue(SkipLeadingLabels(name, skip+3)->c, &a->ip.v4.b[0]) ||
+        GetLabelDecimalValue(SkipLeadingLabels(name, skip+2)->c, &a->ip.v4.b[1]) ||
+        GetLabelDecimalValue(SkipLeadingLabels(name, skip+1)->c, &a->ip.v4.b[2]) ||
+        GetLabelDecimalValue(SkipLeadingLabels(name, skip+0)->c, &a->ip.v4.b[3])) return mStatus_Invalid;
+    a->type = mDNSAddrType_IPv4;
+    return(mStatus_NoError);
+}
+
+#define HexVal(X) ( ((X) >= '0' && (X) <= '9') ? ((X) - '0'     ) :   \
+                    ((X) >= 'A' && (X) <= 'F') ? ((X) - 'A' + 10) :   \
+                    ((X) >= 'a' && (X) <= 'f') ? ((X) - 'a' + 10) : -1)
+
+mDNSlocal mStatus GetIPv6FromName(mDNSAddr *const a, const domainname *const name)
+{
+    int i, h, l;
+    const domainname *n;
+
+    int skip = CountLabels(name) - 34;
+    if (skip < 0) { LogMsg("GetIPFromName: Need 34 labels in IPv6 reverse mapping name %##s", name); return mStatus_Invalid; }
+
+    n = SkipLeadingLabels(name, skip);
+    for (i=0; i<16; i++)
+    {
+        if (n->c[0] != 1) return mStatus_Invalid;
+        l = HexVal(n->c[1]);
+        n = (const domainname *)(n->c + 2);
+
+        if (n->c[0] != 1) return mStatus_Invalid;
+        h = HexVal(n->c[1]);
+        n = (const domainname *)(n->c + 2);
+
+        if (l<0 || h<0) return mStatus_Invalid;
+        a->ip.v6.b[15-i] = (mDNSu8)((h << 4) | l);
+    }
+
+    a->type = mDNSAddrType_IPv6;
+    return(mStatus_NoError);
+}
+
+mDNSlocal mDNSs32 ReverseMapDomainType(const domainname *const name)
+{
+    int skip = CountLabels(name) - 2;
+    if (skip >= 0)
+    {
+        const domainname *suffix = SkipLeadingLabels(name, skip);
+        if (SameDomainName(suffix, (const domainname*)"\x7" "in-addr" "\x4" "arpa")) return mDNSAddrType_IPv4;
+        if (SameDomainName(suffix, (const domainname*)"\x3" "ip6"     "\x4" "arpa")) return mDNSAddrType_IPv6;
+    }
+    return(mDNSAddrType_None);
+}
+
+mDNSlocal void SendARP(mDNS *const m, const mDNSu8 op, const AuthRecord *const rr,
+                       const mDNSv4Addr *const spa, const mDNSEthAddr *const tha, const mDNSv4Addr *const tpa, const mDNSEthAddr *const dst)
+{
+    int i;
+    mDNSu8 *ptr = m->omsg.data;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, rr->resrec.InterfaceID);
+    if (!intf) { LogMsg("SendARP: No interface with InterfaceID %p found %s", rr->resrec.InterfaceID, ARDisplayString(m,rr)); return; }
+
+    // 0x00 Destination address
+    for (i=0; i<6; i++) *ptr++ = dst->b[i];
+
+    // 0x06 Source address (Note: Since we don't currently set the BIOCSHDRCMPLT option, BPF will fill in the real interface address for us)
+    for (i=0; i<6; i++) *ptr++ = intf->MAC.b[0];
+
+    // 0x0C ARP Ethertype (0x0806)
+    *ptr++ = 0x08; *ptr++ = 0x06;
+
+    // 0x0E ARP header
+    *ptr++ = 0x00; *ptr++ = 0x01;   // Hardware address space; Ethernet = 1
+    *ptr++ = 0x08; *ptr++ = 0x00;   // Protocol address space; IP = 0x0800
+    *ptr++ = 6;                     // Hardware address length
+    *ptr++ = 4;                     // Protocol address length
+    *ptr++ = 0x00; *ptr++ = op;     // opcode; Request = 1, Response = 2
+
+    // 0x16 Sender hardware address (our MAC address)
+    for (i=0; i<6; i++) *ptr++ = intf->MAC.b[i];
+
+    // 0x1C Sender protocol address
+    for (i=0; i<4; i++) *ptr++ = spa->b[i];
+
+    // 0x20 Target hardware address
+    for (i=0; i<6; i++) *ptr++ = tha->b[i];
+
+    // 0x26 Target protocol address
+    for (i=0; i<4; i++) *ptr++ = tpa->b[i];
+
+    // 0x2A Total ARP Packet length 42 bytes
+    mDNSPlatformSendRawPacket(m->omsg.data, ptr, rr->resrec.InterfaceID);
+}
+
+mDNSlocal mDNSu16 CheckSum(const void *const data, mDNSs32 length, mDNSu32 sum)
+{
+    const mDNSu16 *ptr = data;
+    while (length > 0) { length -= 2; sum += *ptr++; }
+    sum = (sum & 0xFFFF) + (sum >> 16);
+    sum = (sum & 0xFFFF) + (sum >> 16);
+    return(sum != 0xFFFF ? sum : 0);
+}
+
+mDNSlocal mDNSu16 IPv6CheckSum(const mDNSv6Addr *const src, const mDNSv6Addr *const dst, const mDNSu8 protocol, const void *const data, const mDNSu32 length)
+{
+    IPv6PseudoHeader ph;
+    ph.src = *src;
+    ph.dst = *dst;
+    ph.len.b[0] = length >> 24;
+    ph.len.b[1] = length >> 16;
+    ph.len.b[2] = length >> 8;
+    ph.len.b[3] = length;
+    ph.pro.b[0] = 0;
+    ph.pro.b[1] = 0;
+    ph.pro.b[2] = 0;
+    ph.pro.b[3] = protocol;
+    return CheckSum(&ph, sizeof(ph), CheckSum(data, length, 0));
+}
+
+mDNSlocal void SendNDP(mDNS *const m, const mDNSu8 op, const mDNSu8 flags, const AuthRecord *const rr,
+                       const mDNSv6Addr *const spa, const mDNSEthAddr *const tha, const mDNSv6Addr *const tpa, const mDNSEthAddr *const dst)
+{
+    int i;
+    mDNSOpaque16 checksum;
+    mDNSu8 *ptr = m->omsg.data;
+    // Some recipient hosts seem to ignore Neighbor Solicitations if the IPv6-layer destination address is not the
+    // appropriate IPv6 solicited node multicast address, so we use that IPv6-layer destination address, even though
+    // at the Ethernet-layer we unicast the packet to the intended target, to avoid wasting network bandwidth.
+    const mDNSv6Addr mc = { { 0xFF,0x02,0x00,0x00, 0,0,0,0, 0,0,0,1, 0xFF,tpa->b[0xD],tpa->b[0xE],tpa->b[0xF] } };
+    const mDNSv6Addr *const v6dst = (op == NDP_Sol) ? &mc : tpa;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, rr->resrec.InterfaceID);
+    if (!intf) { LogMsg("SendNDP: No interface with InterfaceID %p found %s", rr->resrec.InterfaceID, ARDisplayString(m,rr)); return; }
+
+    // 0x00 Destination address
+    for (i=0; i<6; i++) *ptr++ = dst->b[i];
+    // Right now we only send Neighbor Solicitations to verify whether the host we're proxying for has gone to sleep yet.
+    // Since we know who we're looking for, we send it via Ethernet-layer unicast, rather than bothering every host on the
+    // link with a pointless link-layer multicast.
+    // Should we want to send traditional Neighbor Solicitations in the future, where we really don't know in advance what
+    // Ethernet-layer address we're looking for, we'll need to send to the appropriate Ethernet-layer multicast address:
+    // *ptr++ = 0x33;
+    // *ptr++ = 0x33;
+    // *ptr++ = 0xFF;
+    // *ptr++ = tpa->b[0xD];
+    // *ptr++ = tpa->b[0xE];
+    // *ptr++ = tpa->b[0xF];
+
+    // 0x06 Source address (Note: Since we don't currently set the BIOCSHDRCMPLT option, BPF will fill in the real interface address for us)
+    for (i=0; i<6; i++) *ptr++ = (tha ? *tha : intf->MAC).b[i];
+
+    // 0x0C IPv6 Ethertype (0x86DD)
+    *ptr++ = 0x86; *ptr++ = 0xDD;
+
+    // 0x0E IPv6 header
+    *ptr++ = 0x60; *ptr++ = 0x00; *ptr++ = 0x00; *ptr++ = 0x00;     // Version, Traffic Class, Flow Label
+    *ptr++ = 0x00; *ptr++ = 0x20;                                   // Length
+    *ptr++ = 0x3A;                                                  // Protocol == ICMPv6
+    *ptr++ = 0xFF;                                                  // Hop Limit
+
+    // 0x16 Sender IPv6 address
+    for (i=0; i<16; i++) *ptr++ = spa->b[i];
+
+    // 0x26 Destination IPv6 address
+    for (i=0; i<16; i++) *ptr++ = v6dst->b[i];
+
+    // 0x36 NDP header
+    *ptr++ = op;                    // 0x87 == Neighbor Solicitation, 0x88 == Neighbor Advertisement
+    *ptr++ = 0x00;                  // Code
+    *ptr++ = 0x00; *ptr++ = 0x00;   // Checksum placeholder (0x38, 0x39)
+    *ptr++ = flags;
+    *ptr++ = 0x00; *ptr++ = 0x00; *ptr++ = 0x00;
+
+    if (op == NDP_Sol)  // Neighbor Solicitation. The NDP "target" is the address we seek.
+    {
+        // 0x3E NDP target.
+        for (i=0; i<16; i++) *ptr++ = tpa->b[i];
+        // 0x4E Source Link-layer Address
+        // <http://www.ietf.org/rfc/rfc2461.txt>
+        // MUST NOT be included when the source IP address is the unspecified address.
+        // Otherwise, on link layers that have addresses this option MUST be included
+        // in multicast solicitations and SHOULD be included in unicast solicitations.
+        if (!mDNSIPv6AddressIsZero(*spa))
+        {
+            *ptr++ = NDP_SrcLL; // Option Type 1 == Source Link-layer Address
+            *ptr++ = 0x01;      // Option length 1 (in units of 8 octets)
+            for (i=0; i<6; i++) *ptr++ = (tha ? *tha : intf->MAC).b[i];
+        }
+    }
+    else            // Neighbor Advertisement. The NDP "target" is the address we're giving information about.
+    {
+        // 0x3E NDP target.
+        for (i=0; i<16; i++) *ptr++ = spa->b[i];
+        // 0x4E Target Link-layer Address
+        *ptr++ = NDP_TgtLL; // Option Type 2 == Target Link-layer Address
+        *ptr++ = 0x01;      // Option length 1 (in units of 8 octets)
+        for (i=0; i<6; i++) *ptr++ = (tha ? *tha : intf->MAC).b[i];
+    }
+
+    // 0x4E or 0x56 Total NDP Packet length 78 or 86 bytes
+    m->omsg.data[0x13] = ptr - &m->omsg.data[0x36];     // Compute actual length
+    checksum.NotAnInteger = ~IPv6CheckSum(spa, v6dst, 0x3A, &m->omsg.data[0x36], m->omsg.data[0x13]);
+    m->omsg.data[0x38] = checksum.b[0];
+    m->omsg.data[0x39] = checksum.b[1];
+
+    mDNSPlatformSendRawPacket(m->omsg.data, ptr, rr->resrec.InterfaceID);
+}
+
+mDNSlocal void SetupTracerOpt(const mDNS *const m, rdataOPT *const Trace)
+{
+    mDNSu32 DNS_VERS = _DNS_SD_H;
+    Trace->u.tracer.platf    = m->mDNS_plat;
+    Trace->u.tracer.mDNSv    = DNS_VERS;
+
+    Trace->opt              = kDNSOpt_Trace;
+    Trace->optlen           = DNSOpt_TraceData_Space - 4;
+}
+
+mDNSlocal void SetupOwnerOpt(const mDNS *const m, const NetworkInterfaceInfo *const intf, rdataOPT *const owner)
+{
+    owner->u.owner.vers     = 0;
+    owner->u.owner.seq      = m->SleepSeqNum;
+    owner->u.owner.HMAC     = m->PrimaryMAC;
+    owner->u.owner.IMAC     = intf->MAC;
+    owner->u.owner.password = zeroEthAddr;
+
+    // Don't try to compute the optlen until *after* we've set up the data fields
+    // Right now the DNSOpt_Owner_Space macro does not depend on the owner->u.owner being set up correctly, but in the future it might
+    owner->opt              = kDNSOpt_Owner;
+    owner->optlen           = DNSOpt_Owner_Space(&m->PrimaryMAC, &intf->MAC) - 4;
+}
+
+mDNSlocal void GrantUpdateCredit(AuthRecord *rr)
+{
+    if (++rr->UpdateCredits >= kMaxUpdateCredits) rr->NextUpdateCredit = 0;
+    else rr->NextUpdateCredit = NonZeroTime(rr->NextUpdateCredit + kUpdateCreditRefreshInterval);
+}
+
+mDNSlocal mDNSBool ShouldSendGoodbyesBeforeSleep(mDNS *const m, const NetworkInterfaceInfo *intf, AuthRecord *rr)
+{
+    // If there are no sleep proxies, we set the state to SleepState_Sleeping explicitly
+    // and hence there is no need to check for Transfering state. But if we have sleep
+    // proxies and partially sending goodbyes for some records, we will be in Transfering
+    // state and hence need to make sure that we send goodbyes in that case too. Checking whether
+    // we are not awake handles both cases.
+    if ((rr->AuthFlags & AuthFlagsWakeOnly) && (m->SleepState != SleepState_Awake))
+    {
+        debugf("ShouldSendGoodbyesBeforeSleep: marking for goodbye", ARDisplayString(m, rr));
+        return mDNStrue;
+    }
+
+    if (m->SleepState != SleepState_Sleeping)
+        return mDNSfalse;
+
+    // If we are going to sleep and in SleepState_Sleeping, SendGoodbyes on the interface tell you
+    // whether you can send goodbyes or not.
+    if (!intf->SendGoodbyes)
+    {
+        debugf("ShouldSendGoodbyesBeforeSleep: not sending goodbye %s, int %p", ARDisplayString(m, rr), intf->InterfaceID);
+        return mDNSfalse;
+    }
+    else
+    {
+        debugf("ShouldSendGoodbyesBeforeSleep: sending goodbye %s, int %p", ARDisplayString(m, rr), intf->InterfaceID);
+        return mDNStrue;
+    }
+}
+
+// Note about acceleration of announcements to facilitate automatic coalescing of
+// multiple independent threads of announcements into a single synchronized thread:
+// The announcements in the packet may be at different stages of maturity;
+// One-second interval, two-second interval, four-second interval, and so on.
+// After we've put in all the announcements that are due, we then consider
+// whether there are other nearly-due announcements that are worth accelerating.
+// To be eligible for acceleration, a record MUST NOT be older (further along
+// its timeline) than the most mature record we've already put in the packet.
+// In other words, younger records can have their timelines accelerated to catch up
+// with their elder bretheren; this narrows the age gap and helps them eventually get in sync.
+// Older records cannot have their timelines accelerated; this would just widen
+// the gap between them and their younger bretheren and get them even more out of sync.
+
+// Note: SendResponses calls mDNS_Deregister_internal which can call a user callback, which may change
+// the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void SendResponses(mDNS *const m)
+{
+    int pktcount = 0;
+    AuthRecord *rr, *r2;
+    mDNSs32 maxExistingAnnounceInterval = 0;
+    const NetworkInterfaceInfo *intf = GetFirstActiveInterface(m->HostInterfaces);
+
+    m->NextScheduledResponse = m->timenow + 0x78000000;
+
+    if (m->SleepState == SleepState_Transferring) RetrySPSRegistrations(m);
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->ImmedUnicast)
+        {
+            mDNSAddr v4 = { mDNSAddrType_IPv4, {{{0}}} };
+            mDNSAddr v6 = { mDNSAddrType_IPv6, {{{0}}} };
+            v4.ip.v4 = rr->v4Requester;
+            v6.ip.v6 = rr->v6Requester;
+            if (!mDNSIPv4AddressIsZero(rr->v4Requester)) SendDelayedUnicastResponse(m, &v4, rr->ImmedAnswer);
+            if (!mDNSIPv6AddressIsZero(rr->v6Requester)) SendDelayedUnicastResponse(m, &v6, rr->ImmedAnswer);
+            if (rr->ImmedUnicast)
+            {
+                LogMsg("SendResponses: ERROR: rr->ImmedUnicast still set: %s", ARDisplayString(m, rr));
+                rr->ImmedUnicast = mDNSfalse;
+            }
+        }
+
+    // ***
+    // *** 1. Setup: Set the SendRNow and ImmedAnswer fields to indicate which interface(s) the records need to be sent on
+    // ***
+
+    // Run through our list of records, and decide which ones we're going to announce on all interfaces
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        while (rr->NextUpdateCredit && m->timenow - rr->NextUpdateCredit >= 0) GrantUpdateCredit(rr);
+        if (TimeToAnnounceThisRecord(rr, m->timenow))
+        {
+            if (rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+            {
+                if (!rr->WakeUp.HMAC.l[0])
+                {
+                    if (rr->AnnounceCount) rr->ImmedAnswer = mDNSInterfaceMark;     // Send goodbye packet on all interfaces
+                }
+                else
+                {
+                    LogSPS("SendResponses: Sending wakeup %2d for %.6a %s", rr->AnnounceCount-3, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                    SendWakeup(m, rr->resrec.InterfaceID, &rr->WakeUp.IMAC, &rr->WakeUp.password);
+                    for (r2 = rr; r2; r2=r2->next)
+                        if (r2->AnnounceCount && r2->resrec.InterfaceID == rr->resrec.InterfaceID && mDNSSameEthAddress(&r2->WakeUp.IMAC, &rr->WakeUp.IMAC) &&
+                                !mDNSSameEthAddress(&zeroEthAddr, &r2->WakeUp.HMAC))
+                        {
+                            // For now we only want to send a single Unsolicited Neighbor Advertisement restoring the address to the original
+                            // owner, because these packets can cause some IPv6 stacks to falsely conclude that there's an address conflict.
+                            if (r2->AddressProxy.type == mDNSAddrType_IPv6 && r2->AnnounceCount == WakeupCount)
+                            {
+                                LogSPS("NDP Announcement %2d Releasing traffic for H-MAC %.6a I-MAC %.6a %s",
+                                       r2->AnnounceCount-3, &r2->WakeUp.HMAC, &r2->WakeUp.IMAC, ARDisplayString(m,r2));
+                                SendNDP(m, NDP_Adv, NDP_Override, r2, &r2->AddressProxy.ip.v6, &r2->WakeUp.IMAC, &AllHosts_v6, &AllHosts_v6_Eth);
+                            }
+                            r2->LastAPTime = m->timenow;
+                            // After 15 wakeups without success (maybe host has left the network) send three goodbyes instead
+                            if (--r2->AnnounceCount <= GoodbyeCount) r2->WakeUp.HMAC = zeroEthAddr;
+                        }
+                }
+            }
+            else if (ResourceRecordIsValidAnswer(rr))
+            {
+                if (rr->AddressProxy.type)
+                {
+                    if (!mDNSSameEthAddress(&zeroEthAddr, &rr->WakeUp.HMAC))
+                    {
+                        rr->AnnounceCount--;
+                        rr->ThisAPInterval *= 2;
+                        rr->LastAPTime = m->timenow;
+                        if (rr->AddressProxy.type == mDNSAddrType_IPv4)
+                        {
+                            LogSPS("ARP Announcement %2d Capturing traffic for H-MAC %.6a I-MAC %.6a %s",
+                                    rr->AnnounceCount, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m,rr));
+                            SendARP(m, 1, rr, &rr->AddressProxy.ip.v4, &zeroEthAddr, &rr->AddressProxy.ip.v4, &onesEthAddr);
+                        }
+                        else if (rr->AddressProxy.type == mDNSAddrType_IPv6)
+                        {
+                            LogSPS("NDP Announcement %2d Capturing traffic for H-MAC %.6a I-MAC %.6a %s",
+                                    rr->AnnounceCount, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m,rr));
+                            SendNDP(m, NDP_Adv, NDP_Override, rr, &rr->AddressProxy.ip.v6, mDNSNULL, &AllHosts_v6, &AllHosts_v6_Eth);
+                        }
+                    }
+                }
+                else
+                {
+                    rr->ImmedAnswer = mDNSInterfaceMark;        // Send on all interfaces
+                    if (maxExistingAnnounceInterval < rr->ThisAPInterval)
+                        maxExistingAnnounceInterval = rr->ThisAPInterval;
+                    if (rr->UpdateBlocked) rr->UpdateBlocked = 0;
+                }
+            }
+        }
+    }
+
+    // Any interface-specific records we're going to send are marked as being sent on all appropriate interfaces (which is just one)
+    // Eligible records that are more than half-way to their announcement time are accelerated
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if ((rr->resrec.InterfaceID && rr->ImmedAnswer) ||
+            (rr->ThisAPInterval <= maxExistingAnnounceInterval &&
+             TimeToAnnounceThisRecord(rr, m->timenow + rr->ThisAPInterval/2) &&
+             !rr->AddressProxy.type &&                  // Don't include ARP Annoucements when considering which records to accelerate
+             ResourceRecordIsValidAnswer(rr)))
+            rr->ImmedAnswer = mDNSInterfaceMark;        // Send on all interfaces
+
+    // When sending SRV records (particularly when announcing a new service) automatically add related Address record(s) as additionals
+    // Note: Currently all address records are interface-specific, so it's safe to set ImmedAdditional to their InterfaceID,
+    // which will be non-null. If by some chance there is an address record that's not interface-specific (should never happen)
+    // then all that means is that it won't get sent -- which would not be the end of the world.
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (rr->ImmedAnswer && rr->resrec.rrtype == kDNSType_SRV)
+            for (r2=m->ResourceRecords; r2; r2=r2->next)                // Scan list of resource records
+                if (RRTypeIsAddressType(r2->resrec.rrtype) &&           // For all address records (A/AAAA) ...
+                    ResourceRecordIsValidAnswer(r2) &&                  // ... which are valid for answer ...
+                    rr->LastMCTime - r2->LastMCTime >= 0 &&             // ... which we have not sent recently ...
+                    rr->resrec.rdatahash == r2->resrec.namehash &&      // ... whose name is the name of the SRV target
+                    SameDomainName(&rr->resrec.rdata->u.srv.target, r2->resrec.name) &&
+                    (rr->ImmedAnswer == mDNSInterfaceMark || rr->ImmedAnswer == r2->resrec.InterfaceID))
+                    r2->ImmedAdditional = r2->resrec.InterfaceID;       // ... then mark this address record for sending too
+        // We also make sure we send the DeviceInfo TXT record too, if necessary
+        // We check for RecordType == kDNSRecordTypeShared because we don't want to tag the
+        // DeviceInfo TXT record onto a goodbye packet (RecordType == kDNSRecordTypeDeregistering).
+        if (rr->ImmedAnswer && rr->resrec.RecordType == kDNSRecordTypeShared && rr->resrec.rrtype == kDNSType_PTR)
+            if (ResourceRecordIsValidAnswer(&m->DeviceInfo) && SameDomainLabel(rr->resrec.rdata->u.name.c, m->DeviceInfo.resrec.name->c))
+            {
+                if (!m->DeviceInfo.ImmedAnswer) m->DeviceInfo.ImmedAnswer = rr->ImmedAnswer;
+                else m->DeviceInfo.ImmedAnswer = mDNSInterfaceMark;
+            }
+    }
+
+    // If there's a record which is supposed to be unique that we're going to send, then make sure that we give
+    // the whole RRSet as an atomic unit. That means that if we have any other records with the same name/type/class
+    // then we need to mark them for sending too. Otherwise, if we set the kDNSClass_UniqueRRSet bit on a
+    // record, then other RRSet members that have not been sent recently will get flushed out of client caches.
+    // -- If a record is marked to be sent on a certain interface, make sure the whole set is marked to be sent on that interface
+    // -- If any record is marked to be sent on all interfaces, make sure the whole set is marked to be sent on all interfaces
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+        {
+            if (rr->ImmedAnswer)            // If we're sending this as answer, see that its whole RRSet is similarly marked
+            {
+                for (r2 = m->ResourceRecords; r2; r2=r2->next)
+                    if (ResourceRecordIsValidAnswer(r2))
+                        if (r2->ImmedAnswer != mDNSInterfaceMark &&
+                            r2->ImmedAnswer != rr->ImmedAnswer && SameResourceRecordSignature(r2, rr))
+                            r2->ImmedAnswer = !r2->ImmedAnswer ? rr->ImmedAnswer : mDNSInterfaceMark;
+            }
+            else if (rr->ImmedAdditional)   // If we're sending this as additional, see that its whole RRSet is similarly marked
+            {
+                for (r2 = m->ResourceRecords; r2; r2=r2->next)
+                    if (ResourceRecordIsValidAnswer(r2))
+                        if (r2->ImmedAdditional != rr->ImmedAdditional && SameResourceRecordSignature(r2, rr))
+                            r2->ImmedAdditional = rr->ImmedAdditional;
+            }
+        }
+
+    // Now set SendRNow state appropriately
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (rr->ImmedAnswer == mDNSInterfaceMark)       // Sending this record on all appropriate interfaces
+        {
+            rr->SendRNow = !intf ? mDNSNULL : (rr->resrec.InterfaceID) ? rr->resrec.InterfaceID : intf->InterfaceID;
+            rr->ImmedAdditional = mDNSNULL;             // No need to send as additional if sending as answer
+            rr->LastMCTime      = m->timenow;
+            rr->LastMCInterface = rr->ImmedAnswer;
+            // If we're announcing this record, and it's at least half-way to its ordained time, then consider this announcement done
+            if (TimeToAnnounceThisRecord(rr, m->timenow + rr->ThisAPInterval/2))
+            {
+                rr->AnnounceCount--;
+                if (rr->resrec.RecordType != kDNSRecordTypeDeregistering)
+                    rr->ThisAPInterval *= 2;
+                rr->LastAPTime = m->timenow;
+                debugf("Announcing %##s (%s) %d", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), rr->AnnounceCount);
+            }
+        }
+        else if (rr->ImmedAnswer)                       // Else, just respond to a single query on single interface:
+        {
+            rr->SendRNow        = rr->ImmedAnswer;      // Just respond on that interface
+            rr->ImmedAdditional = mDNSNULL;             // No need to send as additional too
+            rr->LastMCTime      = m->timenow;
+            rr->LastMCInterface = rr->ImmedAnswer;
+        }
+        SetNextAnnounceProbeTime(m, rr);
+        //if (rr->SendRNow) LogMsg("%-15.4a %s", &rr->v4Requester, ARDisplayString(m, rr));
+    }
+
+    // ***
+    // *** 2. Loop through interface list, sending records as appropriate
+    // ***
+
+    while (intf)
+    {
+        int OwnerRecordSpace = (m->AnnounceOwner && intf->MAC.l[0]) ? DNSOpt_Header_Space + DNSOpt_Owner_Space(&m->PrimaryMAC, &intf->MAC) : 0;
+        int TraceRecordSpace = (mDNS_McastTracingEnabled && MDNS_TRACER) ? DNSOpt_Header_Space + DNSOpt_TraceData_Space : 0;
+        int numDereg    = 0;
+        int numAnnounce = 0;
+        int numAnswer   = 0;
+        int AnoninfoSpace = 0;
+        mDNSu8 *responseptr = m->omsg.data;
+        mDNSu8 *newptr;
+        InitializeDNSMessage(&m->omsg.h, zeroID, ResponseFlags);
+
+        // First Pass. Look for:
+        // 1. Deregistering records that need to send their goodbye packet
+        // 2. Updated records that need to retract their old data
+        // 3. Answers and announcements we need to send
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+
+            // Skip this interface if the record InterfaceID is *Any and the record is not
+            // appropriate for the interface type.
+            if ((rr->SendRNow == intf->InterfaceID) &&
+                ((rr->resrec.InterfaceID == mDNSInterface_Any) && !mDNSPlatformValidRecordForInterface(rr, intf)))
+            {
+                LogInfo("SendResponses: Not sending %s, on %s", ARDisplayString(m, rr), InterfaceNameForID(m, rr->SendRNow));
+                rr->SendRNow = GetNextActiveInterfaceID(intf);
+            }
+            else if (rr->SendRNow == intf->InterfaceID)
+            {
+                RData  *OldRData    = rr->resrec.rdata;
+                mDNSu16 oldrdlength = rr->resrec.rdlength;
+                mDNSu8 active = (mDNSu8)
+                                (rr->resrec.RecordType != kDNSRecordTypeDeregistering && !ShouldSendGoodbyesBeforeSleep(m, intf, rr));
+                newptr = mDNSNULL;
+                if (rr->NewRData && active)
+                {
+                    // See if we should send a courtesy "goodbye" for the old data before we replace it.
+                    if (ResourceRecordIsValidAnswer(rr) && rr->resrec.RecordType == kDNSRecordTypeShared && rr->RequireGoodbye)
+                    {
+                        newptr = PutRR_OS_TTL(responseptr, &m->omsg.h.numAnswers, &rr->resrec, 0);
+                        if (newptr) { responseptr = newptr; numDereg++; rr->RequireGoodbye = mDNSfalse; }
+                        else continue; // If this packet is already too full to hold the goodbye for this record, skip it for now and we'll retry later
+                    }
+                    SetNewRData(&rr->resrec, rr->NewRData, rr->newrdlength);
+                }
+
+                if (rr->resrec.AnonInfo)
+                {
+                    int tmp = AnonInfoSpace(rr->resrec.AnonInfo);
+
+                    AnoninfoSpace += tmp;
+                    // Adjust OwnerRecordSpace/TraceRecordSpace which is used by PutRR_OS_TTL below so that
+                    // we have space to put in the NSEC3 record in the authority section.
+                    OwnerRecordSpace += tmp;
+                    TraceRecordSpace += tmp;
+                }
+
+                if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                    rr->resrec.rrclass |= kDNSClass_UniqueRRSet;        // Temporarily set the cache flush bit so PutResourceRecord will set it
+                newptr = PutRR_OS_TTL(responseptr, &m->omsg.h.numAnswers, &rr->resrec, active ? rr->resrec.rroriginalttl : 0);
+                rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;           // Make sure to clear cache flush bit back to normal state
+                if (newptr)
+                {
+                    responseptr = newptr;
+                    rr->RequireGoodbye = active;
+                    if (rr->resrec.RecordType == kDNSRecordTypeDeregistering) numDereg++;
+                    else if (rr->LastAPTime == m->timenow) numAnnounce++;else numAnswer++;
+                }
+
+                if (rr->NewRData && active)
+                    SetNewRData(&rr->resrec, OldRData, oldrdlength);
+
+                // The first time through (pktcount==0), if this record is verified unique
+                // (i.e. typically A, AAAA, SRV, TXT and reverse-mapping PTR), set the flag to add an NSEC too.
+                if (!pktcount && active && (rr->resrec.RecordType & kDNSRecordTypeActiveUniqueMask) && !rr->SendNSECNow)
+                    rr->SendNSECNow = mDNSInterfaceMark;
+
+                if (newptr)     // If succeeded in sending, advance to next interface
+                {
+                    if (rr->resrec.AnonInfo)
+                    {
+                        debugf("SendResponses: Marking %s, OwnerRecordSpace %d, TraceRecordSpace %d, limit %p", ARDisplayString(m, rr), OwnerRecordSpace,
+                                TraceRecordSpace, m->omsg.data + AllowedRRSpace(&m->omsg) - OwnerRecordSpace - TraceRecordSpace);
+                        rr->resrec.AnonInfo->SendNow = intf->InterfaceID;
+                    }
+
+                    // If sending on all interfaces, go to next interface; else we're finished now
+                    if (rr->ImmedAnswer == mDNSInterfaceMark && rr->resrec.InterfaceID == mDNSInterface_Any)
+                        rr->SendRNow = GetNextActiveInterfaceID(intf);
+                    else
+                        rr->SendRNow = mDNSNULL;
+                }
+            }
+        }
+
+        // Get the reserved space back
+        OwnerRecordSpace -= AnoninfoSpace;
+        TraceRecordSpace -= AnoninfoSpace; 
+        newptr = responseptr;
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+            if (rr->resrec.AnonInfo && rr->resrec.AnonInfo->SendNow == intf->InterfaceID)
+            {
+                ResourceRecord *nsec3RR = rr->resrec.AnonInfo->nsec3RR;
+
+                newptr = PutRR_OS_TTL(newptr, &m->omsg.h.numAuthorities, nsec3RR,  nsec3RR->rroriginalttl);
+                if (newptr)
+                {
+                    responseptr = newptr;
+                    debugf("SendResponses: Added NSEC3 %s, OwnerRecordSpace %d, TraceRecordSpace %d, limit %p", ARDisplayString(m, rr), OwnerRecordSpace,
+                            TraceRecordSpace, m->omsg.data + AllowedRRSpace(&m->omsg) - OwnerRecordSpace - TraceRecordSpace);
+                }
+                else
+                {
+                    LogMsg("SendResponses: Cannot add NSEC3 %s, OwnerRecordSpace %d, TraceRecordSpace %d, limit %p", ARDisplayString(m, rr), OwnerRecordSpace,
+                            TraceRecordSpace, m->omsg.data + AllowedRRSpace(&m->omsg) - OwnerRecordSpace - TraceRecordSpace);
+                }
+                rr->resrec.AnonInfo->SendNow = mDNSNULL;
+            }
+        }
+        // Second Pass. Add additional records, if there's space.
+        newptr = responseptr;
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->ImmedAdditional == intf->InterfaceID)
+                if (ResourceRecordIsValidAnswer(rr))
+                {
+                    // If we have at least one answer already in the packet, then plan to add additionals too
+                    mDNSBool SendAdditional = (m->omsg.h.numAnswers > 0);
+
+                    // If we're not planning to send any additionals, but this record is a unique one, then
+                    // make sure we haven't already sent any other members of its RRSet -- if we have, then they
+                    // will have had the cache flush bit set, so now we need to finish the job and send the rest.
+                    if (!SendAdditional && (rr->resrec.RecordType & kDNSRecordTypeUniqueMask))
+                    {
+                        const AuthRecord *a;
+                        for (a = m->ResourceRecords; a; a=a->next)
+                            if (a->LastMCTime      == m->timenow &&
+                                a->LastMCInterface == intf->InterfaceID &&
+                                SameResourceRecordSignature(a, rr)) { SendAdditional = mDNStrue; break; }
+                    }
+                    if (!SendAdditional)                    // If we don't want to send this after all,
+                        rr->ImmedAdditional = mDNSNULL;     // then cancel its ImmedAdditional field
+                    else if (newptr)                        // Else, try to add it if we can
+                    {
+                        // The first time through (pktcount==0), if this record is verified unique
+                        // (i.e. typically A, AAAA, SRV, TXT and reverse-mapping PTR), set the flag to add an NSEC too.
+                        if (!pktcount && (rr->resrec.RecordType & kDNSRecordTypeActiveUniqueMask) && !rr->SendNSECNow)
+                            rr->SendNSECNow = mDNSInterfaceMark;
+
+                        if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                            rr->resrec.rrclass |= kDNSClass_UniqueRRSet;    // Temporarily set the cache flush bit so PutResourceRecord will set it
+                        newptr = PutRR_OS(newptr, &m->omsg.h.numAdditionals, &rr->resrec);
+                        rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;       // Make sure to clear cache flush bit back to normal state
+                        if (newptr)
+                        {
+                            responseptr = newptr;
+                            rr->ImmedAdditional = mDNSNULL;
+                            rr->RequireGoodbye = mDNStrue;
+                            // If we successfully put this additional record in the packet, we record LastMCTime & LastMCInterface.
+                            // This matters particularly in the case where we have more than one IPv6 (or IPv4) address, because otherwise,
+                            // when we see our own multicast with the cache flush bit set, if we haven't set LastMCTime, then we'll get
+                            // all concerned and re-announce our record again to make sure it doesn't get flushed from peer caches.
+                            rr->LastMCTime      = m->timenow;
+                            rr->LastMCInterface = intf->InterfaceID;
+                        }
+                    }
+                }
+
+        // Third Pass. Add NSEC records, if there's space.
+        // When we're generating an NSEC record in response to a specify query for that type
+        // (recognized by rr->SendNSECNow == intf->InterfaceID) we should really put the NSEC in the Answer Section,
+        // not Additional Section, but for now it's easier to handle both cases in this Additional Section loop here.
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->SendNSECNow == mDNSInterfaceMark || rr->SendNSECNow == intf->InterfaceID)
+            {
+                AuthRecord nsec;
+                mDNSu8 *ptr;
+                int len;
+                mDNS_SetupResourceRecord(&nsec, mDNSNULL, mDNSInterface_Any, kDNSType_NSEC, rr->resrec.rroriginalttl, kDNSRecordTypeUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+                nsec.resrec.rrclass |= kDNSClass_UniqueRRSet;
+                AssignDomainName(&nsec.namestorage, rr->resrec.name);
+                ptr = nsec.rdatastorage.u.data;
+                len = DomainNameLength(rr->resrec.name);
+                // We have a nxt name followed by window number, window length and a window bitmap
+                nsec.resrec.rdlength = len + 2 + NSEC_MCAST_WINDOW_SIZE;
+                if (nsec.resrec.rdlength <= StandardAuthRDSize)
+                {
+                    mDNSPlatformMemZero(ptr, nsec.resrec.rdlength);
+                    AssignDomainName((domainname *)ptr, rr->resrec.name);
+                    ptr += len;
+                    *ptr++ = 0; // window number
+                    *ptr++ = NSEC_MCAST_WINDOW_SIZE; // window length
+                    for (r2 = m->ResourceRecords; r2; r2=r2->next)
+                        if (ResourceRecordIsValidAnswer(r2) && SameResourceRecordNameClassInterface(r2, rr))
+                        {
+                            if (r2->resrec.rrtype >= kDNSQType_ANY) { LogMsg("SendResponses: Can't create NSEC for record %s", ARDisplayString(m, r2)); break; }
+                            else ptr[r2->resrec.rrtype >> 3] |= 128 >> (r2->resrec.rrtype & 7);
+                        }
+                    newptr = responseptr;
+                    if (!r2)    // If we successfully built our NSEC record, add it to the packet now
+                    {
+                        newptr = PutRR_OS(responseptr, &m->omsg.h.numAdditionals, &nsec.resrec);
+                        if (newptr) responseptr = newptr;
+                    }
+                }
+                else LogMsg("SendResponses: not enough space (%d)  in authrecord for nsec", nsec.resrec.rdlength);
+
+                // If we successfully put the NSEC record, clear the SendNSECNow flag
+                // If we consider this NSEC optional, then we unconditionally clear the SendNSECNow flag, even if we fail to put this additional record
+                if (newptr || rr->SendNSECNow == mDNSInterfaceMark)
+                {
+                    rr->SendNSECNow = mDNSNULL;
+                    // Run through remainder of list clearing SendNSECNow flag for all other records which would generate the same NSEC
+                    for (r2 = rr->next; r2; r2=r2->next)
+                        if (SameResourceRecordNameClassInterface(r2, rr))
+                            if (r2->SendNSECNow == mDNSInterfaceMark || r2->SendNSECNow == intf->InterfaceID)
+                                r2->SendNSECNow = mDNSNULL;
+                }
+            }
+
+        if (m->omsg.h.numAnswers || m->omsg.h.numAdditionals)
+        {
+            // If we have data to send, add OWNER/TRACER/OWNER+TRACER option if necessary, then send packet
+            if (OwnerRecordSpace || TraceRecordSpace)
+            {
+                AuthRecord opt;
+                mDNS_SetupResourceRecord(&opt, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+                opt.resrec.rrclass    = NormalMaxDNSMessageData;
+                opt.resrec.rdlength   = sizeof(rdataOPT);
+                opt.resrec.rdestimate = sizeof(rdataOPT);
+                if (OwnerRecordSpace && TraceRecordSpace)
+                {
+                    opt.resrec.rdlength   += sizeof(rdataOPT); // Two options in this OPT record
+                    opt.resrec.rdestimate += sizeof(rdataOPT);
+                    SetupOwnerOpt(m, intf, &opt.resrec.rdata->u.opt[0]);
+                    SetupTracerOpt(m, &opt.resrec.rdata->u.opt[1]);
+                }
+                else if (OwnerRecordSpace)
+                {
+                    SetupOwnerOpt(m, intf, &opt.resrec.rdata->u.opt[0]);
+                }
+                else if (TraceRecordSpace)
+                {
+                    SetupTracerOpt(m, &opt.resrec.rdata->u.opt[0]);
+                }
+                newptr = PutResourceRecord(&m->omsg, responseptr, &m->omsg.h.numAdditionals, &opt.resrec);
+                if (newptr) 
+                { 
+                    responseptr = newptr; 
+                    LogInfo("SendResponses put %s %s: %s %s", OwnerRecordSpace ? "OWNER" : "", TraceRecordSpace ? "TRACER" : "", intf->ifname, ARDisplayString(m, &opt));
+                }
+                else if (m->omsg.h.numAnswers + m->omsg.h.numAuthorities + m->omsg.h.numAdditionals == 1)
+                {
+                    LogInfo("SendResponses: No space in packet for %s %s OPT record (%d/%d/%d/%d) %s", OwnerRecordSpace ? "OWNER" : "", TraceRecordSpace ? "TRACER" : "",
+                            m->omsg.h.numQuestions, m->omsg.h.numAnswers, m->omsg.h.numAuthorities, m->omsg.h.numAdditionals, ARDisplayString(m, &opt));
+                }
+                else
+                {
+                    LogMsg("SendResponses: How did we fail to have space for %s %s OPT record (%d/%d/%d/%d) %s", OwnerRecordSpace ? "OWNER" : "", TraceRecordSpace ? "TRACER" : "",
+                           m->omsg.h.numQuestions, m->omsg.h.numAnswers, m->omsg.h.numAuthorities, m->omsg.h.numAdditionals, ARDisplayString(m, &opt));
+                }
+            }
+    
+            debugf("SendResponses: Sending %d Deregistration%s, %d Announcement%s, %d Answer%s, %d Additional%s on %p",
+                   numDereg,                 numDereg                 == 1 ? "" : "s",
+                   numAnnounce,              numAnnounce              == 1 ? "" : "s",
+                   numAnswer,                numAnswer                == 1 ? "" : "s",
+                   m->omsg.h.numAdditionals, m->omsg.h.numAdditionals == 1 ? "" : "s", intf->InterfaceID);
+
+            if (intf->IPv4Available) mDNSSendDNSMessage(m, &m->omsg, responseptr, intf->InterfaceID, mDNSNULL, &AllDNSLinkGroup_v4, MulticastDNSPort, mDNSNULL, mDNSNULL, mDNSfalse);
+            if (intf->IPv6Available) mDNSSendDNSMessage(m, &m->omsg, responseptr, intf->InterfaceID, mDNSNULL, &AllDNSLinkGroup_v6, MulticastDNSPort, mDNSNULL, mDNSNULL, mDNSfalse);
+            if (!m->SuppressSending) m->SuppressSending = NonZeroTime(m->timenow + (mDNSPlatformOneSecond+9)/10);
+            if (++pktcount >= 1000) { LogMsg("SendResponses exceeded loop limit %d: giving up", pktcount); break; }
+            // There might be more things to send on this interface, so go around one more time and try again.
+        }
+        else    // Nothing more to send on this interface; go to next
+        {
+            const NetworkInterfaceInfo *next = GetFirstActiveInterface(intf->next);
+            #if MDNS_DEBUGMSGS && 0
+            const char *const msg = next ? "SendResponses: Nothing more on %p; moving to %p" : "SendResponses: Nothing more on %p";
+            debugf(msg, intf, next);
+            #endif
+            intf = next;
+            pktcount = 0;       // When we move to a new interface, reset packet count back to zero -- NSEC generation logic uses it
+        }
+    }
+
+    // ***
+    // *** 3. Cleanup: Now that everything is sent, call client callback functions, and reset state variables
+    // ***
+
+    if (m->CurrentRecord)
+        LogMsg("SendResponses ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = m->ResourceRecords;
+    while (m->CurrentRecord)
+    {
+        rr = m->CurrentRecord;
+        m->CurrentRecord = rr->next;
+
+        if (rr->SendRNow)
+        {
+            if (rr->ARType != AuthRecordLocalOnly && rr->ARType != AuthRecordP2P)
+                LogMsg("SendResponses: No active interface %p to send: %p %02X %s", rr->SendRNow, rr->resrec.InterfaceID, rr->resrec.RecordType, ARDisplayString(m, rr));
+            rr->SendRNow = mDNSNULL;
+        }
+
+        if (rr->ImmedAnswer || rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+        {
+            if (rr->NewRData) CompleteRDataUpdate(m, rr);   // Update our rdata, clear the NewRData pointer, and return memory to the client
+
+            if (rr->resrec.RecordType == kDNSRecordTypeDeregistering && rr->AnnounceCount == 0)
+            {
+                // For Unicast, when we get the response from the server, we will call CompleteDeregistration
+                if (!AuthRecord_uDNS(rr)) CompleteDeregistration(m, rr);        // Don't touch rr after this
+            }
+            else
+            {
+                rr->ImmedAnswer  = mDNSNULL;
+                rr->ImmedUnicast = mDNSfalse;
+                rr->v4Requester  = zerov4Addr;
+                rr->v6Requester  = zerov6Addr;
+            }
+        }
+    }
+    verbosedebugf("SendResponses: Next in %ld ticks", m->NextScheduledResponse - m->timenow);
+}
+
+// Calling CheckCacheExpiration() is an expensive operation because it has to look at the entire cache,
+// so we want to be lazy about how frequently we do it.
+// 1. If a cache record is currently referenced by *no* active questions,
+//    then we don't mind expiring it up to a minute late (who will know?)
+// 2. Else, if a cache record is due for some of its final expiration queries,
+//    we'll allow them to be late by up to 2% of the TTL
+// 3. Else, if a cache record has completed all its final expiration queries without success,
+//    and is expiring, and had an original TTL more than ten seconds, we'll allow it to be one second late
+// 4. Else, it is expiring and had an original TTL of ten seconds or less (includes explicit goodbye packets),
+//    so allow at most 1/10 second lateness
+// 5. For records with rroriginalttl set to zero, that means we really want to delete them immediately
+//    (we have a new record with DelayDelivery set, waiting for the old record to go away before we can notify clients).
+#define CacheCheckGracePeriod(RR) (                                                   \
+        ((RR)->CRActiveQuestion == mDNSNULL            ) ? (60 * mDNSPlatformOneSecond) : \
+        ((RR)->UnansweredQueries < MaxUnansweredQueries) ? (TicksTTL(rr)/50)            : \
+        ((RR)->resrec.rroriginalttl > 10               ) ? (mDNSPlatformOneSecond)      : \
+        ((RR)->resrec.rroriginalttl > 0                ) ? (mDNSPlatformOneSecond/10)   : 0)
+
+#define NextCacheCheckEvent(RR) ((RR)->NextRequiredQuery + CacheCheckGracePeriod(RR))
+
+mDNSexport void ScheduleNextCacheCheckTime(mDNS *const m, const mDNSu32 slot, const mDNSs32 event)
+{
+    if (m->rrcache_nextcheck[slot] - event > 0)
+        m->rrcache_nextcheck[slot] = event;
+    if (m->NextCacheCheck          - event > 0)
+        m->NextCacheCheck          = event;
+}
+
+// Note: MUST call SetNextCacheCheckTimeForRecord any time we change:
+// rr->TimeRcvd
+// rr->resrec.rroriginalttl
+// rr->UnansweredQueries
+// rr->CRActiveQuestion
+mDNSexport void SetNextCacheCheckTimeForRecord(mDNS *const m, CacheRecord *const rr)
+{
+    rr->NextRequiredQuery = RRExpireTime(rr);
+
+    // If we have an active question, then see if we want to schedule a refresher query for this record.
+    // Usually we expect to do four queries, at 80-82%, 85-87%, 90-92% and then 95-97% of the TTL.
+    if (rr->CRActiveQuestion && rr->UnansweredQueries < MaxUnansweredQueries)
+    {
+        rr->NextRequiredQuery -= TicksTTL(rr)/20 * (MaxUnansweredQueries - rr->UnansweredQueries);
+        rr->NextRequiredQuery += mDNSRandom((mDNSu32)TicksTTL(rr)/50);
+        verbosedebugf("SetNextCacheCheckTimeForRecord: NextRequiredQuery in %ld sec CacheCheckGracePeriod %d ticks for %s",
+                      (rr->NextRequiredQuery - m->timenow) / mDNSPlatformOneSecond, CacheCheckGracePeriod(rr), CRDisplayString(m,rr));
+    }
+    ScheduleNextCacheCheckTime(m, HashSlot(rr->resrec.name), NextCacheCheckEvent(rr));
+}
+
+#define kMinimumReconfirmTime                     ((mDNSu32)mDNSPlatformOneSecond *  5)
+#define kDefaultReconfirmTimeForWake              ((mDNSu32)mDNSPlatformOneSecond *  5)
+#define kDefaultReconfirmTimeForNoAnswer          ((mDNSu32)mDNSPlatformOneSecond *  5)
+#define kDefaultReconfirmTimeForFlappingInterface ((mDNSu32)mDNSPlatformOneSecond *  5)
+
+mDNSexport mStatus mDNS_Reconfirm_internal(mDNS *const m, CacheRecord *const rr, mDNSu32 interval)
+{
+    if (interval < kMinimumReconfirmTime)
+        interval = kMinimumReconfirmTime;
+    if (interval > 0x10000000)  // Make sure interval doesn't overflow when we multiply by four below
+        interval = 0x10000000;
+
+    // If the expected expiration time for this record is more than interval+33%, then accelerate its expiration
+    if (RRExpireTime(rr) - m->timenow > (mDNSs32)((interval * 4) / 3))
+    {
+        // Add a 33% random amount to the interval, to avoid synchronization between multiple hosts
+        // For all the reconfirmations in a given batch, we want to use the same random value
+        // so that the reconfirmation questions can be grouped into a single query packet
+        if (!m->RandomReconfirmDelay) m->RandomReconfirmDelay = 1 + mDNSRandom(0x3FFFFFFF);
+        interval += m->RandomReconfirmDelay % ((interval/3) + 1);
+        rr->TimeRcvd          = m->timenow - (mDNSs32)interval * 3;
+        rr->resrec.rroriginalttl     = (interval * 4 + mDNSPlatformOneSecond - 1) / mDNSPlatformOneSecond;
+        SetNextCacheCheckTimeForRecord(m, rr);
+    }
+    debugf("mDNS_Reconfirm_internal:%6ld ticks to go for %s %p",
+           RRExpireTime(rr) - m->timenow, CRDisplayString(m, rr), rr->CRActiveQuestion);
+    return(mStatus_NoError);
+}
+
+// BuildQuestion puts a question into a DNS Query packet and if successful, updates the value of queryptr.
+// It also appends to the list of known answer records that need to be included,
+// and updates the forcast for the size of the known answer section.
+mDNSlocal mDNSBool BuildQuestion(mDNS *const m, DNSMessage *query, mDNSu8 **queryptr, DNSQuestion *q,
+                                 CacheRecord ***kalistptrptr, mDNSu32 *answerforecast)
+{
+    mDNSBool ucast = (q->LargeAnswers || q->RequestUnicast) && m->CanReceiveUnicastOn5353;
+    mDNSu16 ucbit = (mDNSu16)(ucast ? kDNSQClass_UnicastResponse : 0);
+    const mDNSu8 *const limit = query->data + NormalMaxDNSMessageData;
+    mDNSu8 anoninfo_space = q->AnonInfo ? AnonInfoSpace(q->AnonInfo) : 0;
+    mDNSu8 *newptr = putQuestion(query, *queryptr, limit - *answerforecast - anoninfo_space, &q->qname, q->qtype, (mDNSu16)(q->qclass | ucbit));
+    if (!newptr)
+    {
+        debugf("BuildQuestion: No more space in this packet for question %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return(mDNSfalse);
+    }
+    else
+    {
+        mDNSu32 forecast = *answerforecast + anoninfo_space;
+        const mDNSu32 slot = HashSlot(&q->qname);
+        const CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+        CacheRecord *rr;
+        CacheRecord **ka = *kalistptrptr;   // Make a working copy of the pointer we're going to update
+
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)             // If we have a resource record in our cache,
+            if (rr->resrec.InterfaceID == q->SendQNow &&                    // received on this interface
+                !(rr->resrec.RecordType & kDNSRecordTypeUniqueMask) &&      // which is a shared (i.e. not unique) record type
+                rr->NextInKAList == mDNSNULL && ka != &rr->NextInKAList &&  // which is not already in the known answer list
+                rr->resrec.rdlength <= SmallRecordLimit &&                  // which is small enough to sensibly fit in the packet
+                SameNameRecordAnswersQuestion(&rr->resrec, q) &&            // which answers our question
+                rr->TimeRcvd + TicksTTL(rr)/2 - m->timenow >                // and its half-way-to-expiry time is at least 1 second away
+                mDNSPlatformOneSecond)                                      // (also ensures we never include goodbye records with TTL=1)
+            {
+                // We don't want to include unique records in the Known Answer section. The Known Answer section
+                // is intended to suppress floods of shared-record replies from many other devices on the network.
+                // That concept really does not apply to unique records, and indeed if we do send a query for
+                // which we have a unique record already in our cache, then including that unique record as a
+                // Known Answer, so as to suppress the only answer we were expecting to get, makes little sense.
+
+                *ka = rr;   // Link this record into our known answer chain
+                ka = &rr->NextInKAList;
+                // We forecast: compressed name (2) type (2) class (2) TTL (4) rdlength (2) rdata (n)
+                forecast += 12 + rr->resrec.rdestimate;
+                // If we're trying to put more than one question in this packet, and it doesn't fit
+                // then undo that last question and try again next time
+                if (query->h.numQuestions > 1 && newptr + forecast >= limit)
+                {
+                    query->h.numQuestions--;
+                    debugf("BuildQuestion: Retracting question %##s (%s) new forecast total %d, total questions %d",
+                           q->qname.c, DNSTypeName(q->qtype), newptr + forecast - query->data, query->h.numQuestions);
+                    ka = *kalistptrptr;     // Go back to where we started and retract these answer records
+                    while (*ka) { CacheRecord *c = *ka; *ka = mDNSNULL; ka = &c->NextInKAList; }
+                    return(mDNSfalse);      // Return false, so we'll try again in the next packet
+                }
+            }
+
+        // Success! Update our state pointers, increment UnansweredQueries as appropriate, and return
+        *queryptr        = newptr;              // Update the packet pointer
+        *answerforecast  = forecast;            // Update the forecast
+        *kalistptrptr    = ka;                  // Update the known answer list pointer
+        if (ucast) q->ExpectUnicastResp = NonZeroTime(m->timenow);
+
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)             // For every resource record in our cache,
+            if (rr->resrec.InterfaceID == q->SendQNow &&                    // received on this interface
+                rr->NextInKAList == mDNSNULL && ka != &rr->NextInKAList &&  // which is not in the known answer list
+                SameNameRecordAnswersQuestion(&rr->resrec, q))              // which answers our question
+            {
+                rr->UnansweredQueries++;                                    // indicate that we're expecting a response
+                rr->LastUnansweredTime = m->timenow;
+                SetNextCacheCheckTimeForRecord(m, rr);
+            }
+
+        return(mDNStrue);
+    }
+}
+
+// When we have a query looking for a specified name, but there appear to be no answers with
+// that name, ReconfirmAntecedents() is called with depth=0 to start the reconfirmation process
+// for any records in our cache that reference the given name (e.g. PTR and SRV records).
+// For any such cache record we find, we also recursively call ReconfirmAntecedents() for *its* name.
+// We increment depth each time we recurse, to guard against possible infinite loops, with a limit of 5.
+// A typical reconfirmation scenario might go like this:
+// Depth 0: Name "myhost.local" has no address records
+// Depth 1: SRV "My Service._example._tcp.local." refers to "myhost.local"; may be stale
+// Depth 2: PTR "_example._tcp.local." refers to "My Service"; may be stale
+// Depth 3: PTR "_services._dns-sd._udp.local." refers to "_example._tcp.local."; may be stale
+// Currently depths 4 and 5 are not expected to occur; if we did get to depth 5 we'd reconfim any records we
+// found referring to the given name, but not recursively descend any further reconfirm *their* antecedents.
+mDNSlocal void ReconfirmAntecedents(mDNS *const m, const domainname *const name, const mDNSu32 namehash, const int depth)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    debugf("ReconfirmAntecedents (depth=%d) for %##s", depth, name->c);
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        domainname *crtarget = GetRRDomainNameTarget(&cr->resrec);
+        if (crtarget && cr->resrec.rdatahash == namehash && SameDomainName(crtarget, name))
+        {
+            LogInfo("ReconfirmAntecedents: Reconfirming (depth=%d) %s", depth, CRDisplayString(m, cr));
+            mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForNoAnswer);
+            if (depth < 5)
+                ReconfirmAntecedents(m, cr->resrec.name, cr->resrec.namehash, depth+1);
+        }
+    }
+}
+
+// If we get no answer for a AAAA query, then before doing an automatic implicit ReconfirmAntecedents
+// we check if we have an address record for the same name. If we do have an IPv4 address for a given
+// name but not an IPv6 address, that's okay (it just means the device doesn't do IPv6) so the failure
+// to get a AAAA response is not grounds to doubt the PTR/SRV chain that lead us to that name.
+mDNSlocal const CacheRecord *CacheHasAddressTypeForName(mDNS *const m, const domainname *const name, const mDNSu32 namehash)
+{
+    CacheGroup *const cg = CacheGroupForName(m, HashSlot(name), namehash, name);
+    const CacheRecord *cr = cg ? cg->members : mDNSNULL;
+    while (cr && !RRTypeIsAddressType(cr->resrec.rrtype)) cr=cr->next;
+    return(cr);
+}
+
+
+mDNSlocal const CacheRecord *FindSPSInCache1(mDNS *const m, const DNSQuestion *const q, const CacheRecord *const c0, const CacheRecord *const c1)
+{
+#ifndef SPC_DISABLED
+    CacheGroup *const cg = CacheGroupForName(m, HashSlot(&q->qname), q->qnamehash, &q->qname);
+    const CacheRecord *cr, *bestcr = mDNSNULL;
+    mDNSu32 bestmetric = 1000000;
+    for (cr = cg ? cg->members : mDNSNULL; cr; cr=cr->next)
+        if (cr->resrec.rrtype == kDNSType_PTR && cr->resrec.rdlength >= 6)                      // If record is PTR type, with long enough name,
+            if (cr != c0 && cr != c1)                                                           // that's not one we've seen before,
+                if (SameNameRecordAnswersQuestion(&cr->resrec, q))                              // and answers our browse query,
+                    if (!IdenticalSameNameRecord(&cr->resrec, &m->SPSRecords.RR_PTR.resrec))    // and is not our own advertised service...
+                    {
+                        mDNSu32 metric = SPSMetric(cr->resrec.rdata->u.name.c);
+                        if (bestmetric > metric) { bestmetric = metric; bestcr = cr; }
+                    }
+    return(bestcr);
+#else // SPC_DISABLED
+	(void) m;
+	(void) q;
+	(void) c0;
+	(void) c1;
+	(void) c1;
+    return mDNSNULL;
+#endif // SPC_DISABLED
+}
+
+mDNSlocal void CheckAndSwapSPS(const CacheRecord *sps1, const CacheRecord *sps2)
+{
+    const CacheRecord *swap_sps;
+    mDNSu32 metric1, metric2;
+
+    if (!sps1 || !sps2) return;
+    metric1 = SPSMetric(sps1->resrec.rdata->u.name.c);
+    metric2 = SPSMetric(sps2->resrec.rdata->u.name.c);
+    if (!SPSFeatures(sps1->resrec.rdata->u.name.c) && SPSFeatures(sps2->resrec.rdata->u.name.c) && (metric2 >= metric1))
+    {
+        swap_sps = sps1;
+        sps1     = sps2;
+        sps2     = swap_sps;
+    }
+}
+
+mDNSlocal void ReorderSPSByFeature(const CacheRecord *sps[3])
+{
+    CheckAndSwapSPS(sps[0], sps[1]);
+    CheckAndSwapSPS(sps[0], sps[2]);
+    CheckAndSwapSPS(sps[1], sps[2]);
+}
+
+
+// Finds the three best Sleep Proxies we currently have in our cache
+mDNSexport void FindSPSInCache(mDNS *const m, const DNSQuestion *const q, const CacheRecord *sps[3])
+{
+    sps[0] =                      FindSPSInCache1(m, q, mDNSNULL, mDNSNULL);
+    sps[1] = !sps[0] ? mDNSNULL : FindSPSInCache1(m, q, sps[0],   mDNSNULL);
+    sps[2] = !sps[1] ? mDNSNULL : FindSPSInCache1(m, q, sps[0],   sps[1]);
+
+    // SPS is already sorted by metric. We want to move the entries to the beginning of the array
+    // only if they have equally good metric and support features.
+    ReorderSPSByFeature(sps);
+}
+
+// Only DupSuppressInfos newer than the specified 'time' are allowed to remain active
+mDNSlocal void ExpireDupSuppressInfo(DupSuppressInfo ds[DupSuppressInfoSize], mDNSs32 time)
+{
+    int i;
+    for (i=0; i<DupSuppressInfoSize; i++) if (ds[i].Time - time < 0) ds[i].InterfaceID = mDNSNULL;
+}
+
+mDNSlocal void ExpireDupSuppressInfoOnInterface(DupSuppressInfo ds[DupSuppressInfoSize], mDNSs32 time, mDNSInterfaceID InterfaceID)
+{
+    int i;
+    for (i=0; i<DupSuppressInfoSize; i++) if (ds[i].InterfaceID == InterfaceID && ds[i].Time - time < 0) ds[i].InterfaceID = mDNSNULL;
+}
+
+mDNSlocal mDNSBool SuppressOnThisInterface(const DupSuppressInfo ds[DupSuppressInfoSize], const NetworkInterfaceInfo * const intf)
+{
+    int i;
+    mDNSBool v4 = !intf->IPv4Available;     // If this interface doesn't do v4, we don't need to find a v4 duplicate of this query
+    mDNSBool v6 = !intf->IPv6Available;     // If this interface doesn't do v6, we don't need to find a v6 duplicate of this query
+    for (i=0; i<DupSuppressInfoSize; i++)
+        if (ds[i].InterfaceID == intf->InterfaceID)
+        {
+            if      (ds[i].Type == mDNSAddrType_IPv4) v4 = mDNStrue;
+            else if (ds[i].Type == mDNSAddrType_IPv6) v6 = mDNStrue;
+            if (v4 && v6) return(mDNStrue);
+        }
+    return(mDNSfalse);
+}
+
+mDNSlocal int RecordDupSuppressInfo(DupSuppressInfo ds[DupSuppressInfoSize], mDNSs32 Time, mDNSInterfaceID InterfaceID, mDNSs32 Type)
+{
+    int i, j;
+
+    // See if we have this one in our list somewhere already
+    for (i=0; i<DupSuppressInfoSize; i++) if (ds[i].InterfaceID == InterfaceID && ds[i].Type == Type) break;
+
+    // If not, find a slot we can re-use
+    if (i >= DupSuppressInfoSize)
+    {
+        i = 0;
+        for (j=1; j<DupSuppressInfoSize && ds[i].InterfaceID; j++)
+            if (!ds[j].InterfaceID || ds[j].Time - ds[i].Time < 0)
+                i = j;
+    }
+
+    // Record the info about this query we saw
+    ds[i].Time        = Time;
+    ds[i].InterfaceID = InterfaceID;
+    ds[i].Type        = Type;
+
+    return(i);
+}
+
+mDNSlocal void mDNSSendWakeOnResolve(mDNS *const m, DNSQuestion *q)
+{
+    int len, i, cnt;
+    mDNSInterfaceID InterfaceID = q->InterfaceID;
+    domainname *d = &q->qname;
+
+    // We can't send magic packets without knowing which interface to send it on.
+    if (InterfaceID == mDNSInterface_Any || InterfaceID == mDNSInterface_LocalOnly || InterfaceID == mDNSInterface_P2P)
+    {
+        LogMsg("mDNSSendWakeOnResolve: ERROR!! Invalid InterfaceID %p for question %##s", InterfaceID, q->qname.c);
+        return;
+    }
+
+    // Split MAC@IPAddress and pass them separately
+    len = d->c[0];
+    i = 1;
+    cnt = 0;
+    for (i = 1; i < len; i++)
+    {
+        if (d->c[i] == '@')
+        {
+            char EthAddr[18];   // ethernet adddress : 12 bytes + 5 ":" + 1 NULL byte
+            char IPAddr[47];    // Max IP address len: 46 bytes (IPv6) + 1 NULL byte
+            if (cnt != 5)
+            {
+                LogMsg("mDNSSendWakeOnResolve: ERROR!! Malformed Ethernet address %##s, cnt %d", q->qname.c, cnt);
+                return;
+            }
+            if ((i - 1) > (int) (sizeof(EthAddr) - 1))
+            {
+                LogMsg("mDNSSendWakeOnResolve: ERROR!! Malformed Ethernet address %##s, length %d", q->qname.c, i - 1);
+                return;
+            }
+            if ((len - i) > (int)(sizeof(IPAddr) - 1))
+            {
+                LogMsg("mDNSSendWakeOnResolve: ERROR!! Malformed IP address %##s, length %d", q->qname.c, len - i);
+                return;
+            }
+            mDNSPlatformMemCopy(EthAddr, &d->c[1], i - 1);
+            EthAddr[i - 1] = 0;
+            mDNSPlatformMemCopy(IPAddr, &d->c[i + 1], len - i);
+            IPAddr[len - i] = 0;
+            m->mDNSStats.WakeOnResolves++;
+            mDNSPlatformSendWakeupPacket(m, InterfaceID, EthAddr, IPAddr, InitialWakeOnResolveCount - q->WakeOnResolveCount);
+            return;
+        }
+        else if (d->c[i] == ':')
+            cnt++;
+    }
+    LogMsg("mDNSSendWakeOnResolve: ERROR!! Malformed WakeOnResolve name %##s", q->qname.c);
+}
+
+
+mDNSlocal mDNSBool AccelerateThisQuery(mDNS *const m, DNSQuestion *q)
+{
+    // If more than 90% of the way to the query time, we should unconditionally accelerate it
+    if (TimeToSendThisQuestion(q, m->timenow + q->ThisQInterval/10))
+        return(mDNStrue);
+
+    // If half-way to next scheduled query time, only accelerate if it will add less than 512 bytes to the packet
+    if (TimeToSendThisQuestion(q, m->timenow + q->ThisQInterval/2))
+    {
+        // We forecast: qname (n) type (2) class (2)
+        mDNSu32 forecast = (mDNSu32)DomainNameLength(&q->qname) + 4;
+        const mDNSu32 slot = HashSlot(&q->qname);
+        const CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+        const CacheRecord *rr;
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)             // If we have a resource record in our cache,
+            if (rr->resrec.rdlength <= SmallRecordLimit &&                  // which is small enough to sensibly fit in the packet
+                SameNameRecordAnswersQuestion(&rr->resrec, q) &&            // which answers our question
+                rr->TimeRcvd + TicksTTL(rr)/2 - m->timenow >= 0 &&          // and it is less than half-way to expiry
+                rr->NextRequiredQuery - (m->timenow + q->ThisQInterval) > 0) // and we'll ask at least once again before NextRequiredQuery
+            {
+                // We forecast: compressed name (2) type (2) class (2) TTL (4) rdlength (2) rdata (n)
+                forecast += 12 + rr->resrec.rdestimate;
+                if (forecast >= 512) return(mDNSfalse); // If this would add 512 bytes or more to the packet, don't accelerate
+            }
+        return(mDNStrue);
+    }
+
+    return(mDNSfalse);
+}
+
+// How Standard Queries are generated:
+// 1. The Question Section contains the question
+// 2. The Additional Section contains answers we already know, to suppress duplicate responses
+
+// How Probe Queries are generated:
+// 1. The Question Section contains queries for the name we intend to use, with QType=ANY because
+// if some other host is already using *any* records with this name, we want to know about it.
+// 2. The Authority Section contains the proposed values we intend to use for one or more
+// of our records with that name (analogous to the Update section of DNS Update packets)
+// because if some other host is probing at the same time, we each want to know what the other is
+// planning, in order to apply the tie-breaking rule to see who gets to use the name and who doesn't.
+
+mDNSlocal void SendQueries(mDNS *const m)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    AuthRecord *ar;
+    int pktcount = 0;
+    DNSQuestion *q;
+    // For explanation of maxExistingQuestionInterval logic, see comments for maxExistingAnnounceInterval
+    mDNSs32 maxExistingQuestionInterval = 0;
+    const NetworkInterfaceInfo *intf = GetFirstActiveInterface(m->HostInterfaces);
+    CacheRecord *KnownAnswerList = mDNSNULL;
+
+    // 1. If time for a query, work out what we need to do
+
+    // We're expecting to send a query anyway, so see if any expiring cache records are close enough
+    // to their NextRequiredQuery to be worth batching them together with this one
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if (cr->CRActiveQuestion && cr->UnansweredQueries < MaxUnansweredQueries)
+        {
+            if (m->timenow + TicksTTL(cr)/50 - cr->NextRequiredQuery >= 0)
+            {
+                debugf("Sending %d%% cache expiration query for %s", 80 + 5 * cr->UnansweredQueries, CRDisplayString(m, cr));
+                q = cr->CRActiveQuestion;
+                ExpireDupSuppressInfoOnInterface(q->DupSuppress, m->timenow - TicksTTL(cr)/20, cr->resrec.InterfaceID);
+                // For uDNS queries (TargetQID non-zero) we adjust LastQTime,
+                // and bump UnansweredQueries so that we don't spin trying to send the same cache expiration query repeatedly
+                if (q->Target.type)
+                {
+                    q->SendQNow = mDNSInterfaceMark; // If targeted query, mark it
+                }
+                else if (!mDNSOpaque16IsZero(q->TargetQID))
+                {
+                    q->LastQTime = m->timenow - q->ThisQInterval;
+                    cr->UnansweredQueries++;
+                    m->mDNSStats.CacheRefreshQueries++;
+                }
+                else if (q->SendQNow == mDNSNULL)
+                {
+                    q->SendQNow = cr->resrec.InterfaceID;
+                }
+                else if (q->SendQNow != cr->resrec.InterfaceID)
+                {
+                    q->SendQNow = mDNSInterfaceMark;
+                }
+
+                // Indicate that this question was marked for sending
+                // to update an existing cached answer record.
+                // The browse throttling logic below uses this to determine
+                // if the query should be sent.
+                if (mDNSOpaque16IsZero(q->TargetQID))
+                    q->CachedAnswerNeedsUpdate = mDNStrue;
+            }
+        }
+    }
+
+    // Scan our list of questions to see which:
+    //     *WideArea*  queries need to be sent
+    //     *unicast*   queries need to be sent
+    //     *multicast* queries we're definitely going to send
+    if (m->CurrentQuestion)
+        LogMsg("SendQueries ERROR m->CurrentQuestion already set: %##s (%s)", m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+    {
+        q = m->CurrentQuestion;
+        if (q->Target.type && (q->SendQNow || TimeToSendThisQuestion(q, m->timenow)))
+        {
+            mDNSu8       *qptr        = m->omsg.data;
+            const mDNSu8 *const limit = m->omsg.data + sizeof(m->omsg.data);
+
+            // If we fail to get a new on-demand socket (should only happen cases of the most extreme resource exhaustion), we'll try again next time
+            if (!q->LocalSocket) q->LocalSocket = mDNSPlatformUDPSocket(m, zeroIPPort);
+            if (q->LocalSocket)
+            {
+                InitializeDNSMessage(&m->omsg.h, q->TargetQID, QueryFlags);
+                qptr = putQuestion(&m->omsg, qptr, limit, &q->qname, q->qtype, q->qclass);
+                mDNSSendDNSMessage(m, &m->omsg, qptr, mDNSInterface_Any, q->LocalSocket, &q->Target, q->TargetPort, mDNSNULL, mDNSNULL, q->UseBackgroundTrafficClass);
+                q->ThisQInterval    *= QuestionIntervalStep;
+            }
+            if (q->ThisQInterval > MaxQuestionInterval)
+                q->ThisQInterval = MaxQuestionInterval;
+            q->LastQTime         = m->timenow;
+            q->LastQTxTime       = m->timenow;
+            q->RecentAnswerPkts  = 0;
+            q->SendQNow          = mDNSNULL;
+            q->ExpectUnicastResp = NonZeroTime(m->timenow);
+        }
+        else if (mDNSOpaque16IsZero(q->TargetQID) && !q->Target.type && TimeToSendThisQuestion(q, m->timenow))
+        {
+            //LogInfo("Time to send %##s (%s) %d", q->qname.c, DNSTypeName(q->qtype), m->timenow - NextQSendTime(q));
+            q->SendQNow = mDNSInterfaceMark;        // Mark this question for sending on all interfaces
+            if (maxExistingQuestionInterval < q->ThisQInterval)
+                maxExistingQuestionInterval = q->ThisQInterval;
+        }
+        // If m->CurrentQuestion wasn't modified out from under us, advance it now
+        // We can't do this at the start of the loop because uDNS_CheckCurrentQuestion() depends on having
+        // m->CurrentQuestion point to the right question
+        if (q == m->CurrentQuestion) m->CurrentQuestion = m->CurrentQuestion->next;
+    }
+    while (m->CurrentQuestion)
+    {
+        LogInfo("SendQueries question loop 1: Skipping NewQuestion %##s (%s)", m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+        m->CurrentQuestion = m->CurrentQuestion->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+
+    // Scan our list of questions
+    // (a) to see if there are any more that are worth accelerating, and
+    // (b) to update the state variables for *all* the questions we're going to send
+    // Note: Don't set NextScheduledQuery until here, because uDNS_CheckCurrentQuestion in the loop above can add new questions to the list,
+    // which causes NextScheduledQuery to get (incorrectly) set to m->timenow. Setting it here is the right place, because the very
+    // next thing we do is scan the list and call SetNextQueryTime() for every question we find, so we know we end up with the right value.
+    m->NextScheduledQuery = m->timenow + 0x78000000;
+    for (q = m->Questions; q && q != m->NewQuestions; q=q->next)
+    {
+        if (mDNSOpaque16IsZero(q->TargetQID)
+            && (q->SendQNow || (!q->Target.type && ActiveQuestion(q) && q->ThisQInterval <= maxExistingQuestionInterval && AccelerateThisQuery(m,q))))
+        {
+            // If at least halfway to next query time, advance to next interval
+            // If less than halfway to next query time, then
+            // treat this as logically a repeat of the last transmission, without advancing the interval
+            if (m->timenow - (q->LastQTime + (q->ThisQInterval/2)) >= 0)
+            {
+                // If we have reached the answer threshold for this question, 
+                // don't send it again until MaxQuestionInterval unless:
+                //  one of its cached answers needs to be refreshed,
+                //  or it's the initial query for a kDNSServiceFlagsThresholdFinder mode browse.
+                if (q->BrowseThreshold 
+                    && (q->CurrentAnswers >= q->BrowseThreshold)
+                    && (q->CachedAnswerNeedsUpdate == mDNSfalse)
+                    && !((q->flags & kDNSServiceFlagsThresholdFinder) && (q->ThisQInterval == InitialQuestionInterval)))
+                {
+                    q->SendQNow = mDNSNULL;
+                    q->ThisQInterval = MaxQuestionInterval;
+                    q->LastQTime = m->timenow;
+                    q->RequestUnicast = 0;
+                    LogInfo("SendQueries: (%s) %##s reached threshold of %d answers",
+                         DNSTypeName(q->qtype), q->qname.c, q->BrowseThreshold);
+                }
+                else
+                {
+                    // Mark this question for sending on all interfaces
+                    q->SendQNow = mDNSInterfaceMark;
+                    q->ThisQInterval *= QuestionIntervalStep;
+                }
+
+                debugf("SendQueries: %##s (%s) next interval %d seconds RequestUnicast = %d",
+                       q->qname.c, DNSTypeName(q->qtype), q->ThisQInterval / InitialQuestionInterval, q->RequestUnicast);
+
+                if (q->ThisQInterval >= QuestionIntervalThreshold)
+                {
+                    q->ThisQInterval = MaxQuestionInterval;
+                }
+                else if (q->CurrentAnswers == 0 && q->ThisQInterval == InitialQuestionInterval * QuestionIntervalStep3 && !q->RequestUnicast &&
+                         !(RRTypeIsAddressType(q->qtype) && CacheHasAddressTypeForName(m, &q->qname, q->qnamehash)))
+                {
+                    // Generally don't need to log this.
+                    // It's not especially noteworthy if a query finds no results -- this usually happens for domain
+                    // enumeration queries in the LL subdomain (e.g. "db._dns-sd._udp.0.0.254.169.in-addr.arpa")
+                    // and when there simply happen to be no instances of the service the client is looking
+                    // for (e.g. iTunes is set to look for RAOP devices, and the current network has none).
+                    debugf("SendQueries: Zero current answers for %##s (%s); will reconfirm antecedents",
+                           q->qname.c, DNSTypeName(q->qtype));
+                    // Sending third query, and no answers yet; time to begin doubting the source
+                    ReconfirmAntecedents(m, &q->qname, q->qnamehash, 0);
+                }
+            }
+
+            // Mark for sending. (If no active interfaces, then don't even try.)
+            q->SendOnAll = (q->SendQNow == mDNSInterfaceMark);
+            if (q->SendOnAll)
+            {
+                q->SendQNow  = !intf ? mDNSNULL : (q->InterfaceID) ? q->InterfaceID : intf->InterfaceID;
+                q->LastQTime = m->timenow;
+            }
+
+            // If we recorded a duplicate suppression for this question less than half an interval ago,
+            // then we consider it recent enough that we don't need to do an identical query ourselves.
+            ExpireDupSuppressInfo(q->DupSuppress, m->timenow - q->ThisQInterval/2);
+
+            q->LastQTxTime      = m->timenow;
+            q->RecentAnswerPkts = 0;
+            if (q->RequestUnicast) q->RequestUnicast--;
+        }
+        // For all questions (not just the ones we're sending) check what the next scheduled event will be
+        // We don't need to consider NewQuestions here because for those we'll set m->NextScheduledQuery in AnswerNewQuestion
+        SetNextQueryTime(m,q);
+    }
+
+    // 2. Scan our authoritative RR list to see what probes we might need to send
+
+    m->NextScheduledProbe = m->timenow + 0x78000000;
+
+    if (m->CurrentRecord)
+        LogMsg("SendQueries ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = m->ResourceRecords;
+    while (m->CurrentRecord)
+    {
+        ar = m->CurrentRecord;
+        m->CurrentRecord = ar->next;
+        if (!AuthRecord_uDNS(ar) && ar->resrec.RecordType == kDNSRecordTypeUnique)  // For all records that are still probing...
+        {
+            // 1. If it's not reached its probe time, just make sure we update m->NextScheduledProbe correctly
+            if (m->timenow - (ar->LastAPTime + ar->ThisAPInterval) < 0)
+            {
+                SetNextAnnounceProbeTime(m, ar);
+            }
+            // 2. else, if it has reached its probe time, mark it for sending and then update m->NextScheduledProbe correctly
+            else if (ar->ProbeCount)
+            {
+                if (ar->AddressProxy.type == mDNSAddrType_IPv4)
+                {
+                    LogSPS("SendQueries ARP Probe %d %s %s", ar->ProbeCount, InterfaceNameForID(m, ar->resrec.InterfaceID), ARDisplayString(m,ar));
+                    SendARP(m, 1, ar, &zerov4Addr, &zeroEthAddr, &ar->AddressProxy.ip.v4, &ar->WakeUp.IMAC);
+                }
+                else if (ar->AddressProxy.type == mDNSAddrType_IPv6)
+                {
+                    LogSPS("SendQueries NDP Probe %d %s %s", ar->ProbeCount, InterfaceNameForID(m, ar->resrec.InterfaceID), ARDisplayString(m,ar));
+                    // IPv6 source = zero
+                    // No target hardware address
+                    // IPv6 target address is address we're probing
+                    // Ethernet destination address is Ethernet interface address of the Sleep Proxy client we're probing
+                    SendNDP(m, NDP_Sol, 0, ar, &zerov6Addr, mDNSNULL, &ar->AddressProxy.ip.v6, &ar->WakeUp.IMAC);
+                }
+                // Mark for sending. (If no active interfaces, then don't even try.)
+                ar->SendRNow   = (!intf || ar->WakeUp.HMAC.l[0]) ? mDNSNULL : ar->resrec.InterfaceID ? ar->resrec.InterfaceID : intf->InterfaceID;
+                ar->LastAPTime = m->timenow;
+                // When we have a late conflict that resets a record to probing state we use a special marker value greater
+                // than DefaultProbeCountForTypeUnique. Here we detect that state and reset ar->ProbeCount back to the right value.
+                if (ar->ProbeCount > DefaultProbeCountForTypeUnique)
+                    ar->ProbeCount = DefaultProbeCountForTypeUnique;
+                ar->ProbeCount--;
+                SetNextAnnounceProbeTime(m, ar);
+                if (ar->ProbeCount == 0)
+                {
+                    // If this is the last probe for this record, then see if we have any matching records
+                    // on our duplicate list which should similarly have their ProbeCount cleared to zero...
+                    AuthRecord *r2;
+                    for (r2 = m->DuplicateRecords; r2; r2=r2->next)
+                        if (r2->resrec.RecordType == kDNSRecordTypeUnique && RecordIsLocalDuplicate(r2, ar))
+                            r2->ProbeCount = 0;
+                    // ... then acknowledge this record to the client.
+                    // We do this optimistically, just as we're about to send the third probe.
+                    // This helps clients that both advertise and browse, and want to filter themselves
+                    // from the browse results list, because it helps ensure that the registration
+                    // confirmation will be delivered 1/4 second *before* the browse "add" event.
+                    // A potential downside is that we could deliver a registration confirmation and then find out
+                    // moments later that there's a name conflict, but applications have to be prepared to handle
+                    // late conflicts anyway (e.g. on connection of network cable, etc.), so this is nothing new.
+                    if (!ar->Acknowledged) AcknowledgeRecord(m, ar);
+                }
+            }
+            // else, if it has now finished probing, move it to state Verified,
+            // and update m->NextScheduledResponse so it will be announced
+            else
+            {
+                if (!ar->Acknowledged) AcknowledgeRecord(m, ar);    // Defensive, just in case it got missed somehow
+                ar->resrec.RecordType     = kDNSRecordTypeVerified;
+                ar->ThisAPInterval = DefaultAnnounceIntervalForTypeUnique;
+                ar->LastAPTime     = m->timenow - DefaultAnnounceIntervalForTypeUnique;
+                SetNextAnnounceProbeTime(m, ar);
+            }
+        }
+    }
+    m->CurrentRecord = m->DuplicateRecords;
+    while (m->CurrentRecord)
+    {
+        ar = m->CurrentRecord;
+        m->CurrentRecord = ar->next;
+        if (ar->resrec.RecordType == kDNSRecordTypeUnique && ar->ProbeCount == 0 && !ar->Acknowledged)
+            AcknowledgeRecord(m, ar);
+    }
+
+    // 3. Now we know which queries and probes we're sending,
+    // go through our interface list sending the appropriate queries on each interface
+    while (intf)
+    {
+        int OwnerRecordSpace = (m->AnnounceOwner && intf->MAC.l[0]) ? DNSOpt_Header_Space + DNSOpt_Owner_Space(&m->PrimaryMAC, &intf->MAC) : 0;
+        int TraceRecordSpace = (mDNS_McastTracingEnabled && MDNS_TRACER) ? DNSOpt_Header_Space + DNSOpt_TraceData_Space : 0;
+        mDNSu8 *queryptr = m->omsg.data;
+        mDNSBool useBackgroundTrafficClass = mDNSfalse;    // set if we should use background traffic class
+
+        InitializeDNSMessage(&m->omsg.h, zeroID, QueryFlags);
+        if (KnownAnswerList) verbosedebugf("SendQueries:   KnownAnswerList set... Will continue from previous packet");
+        if (!KnownAnswerList)
+        {
+            // Start a new known-answer list
+            CacheRecord **kalistptr = &KnownAnswerList;
+            mDNSu32 answerforecast = OwnerRecordSpace + TraceRecordSpace;  // Start by assuming we'll need at least enough space to put the Owner+Tracer Option
+
+            // Put query questions in this packet
+            for (q = m->Questions; q && q != m->NewQuestions; q=q->next)
+            {
+                if (mDNSOpaque16IsZero(q->TargetQID) && (q->SendQNow == intf->InterfaceID))
+                {
+                    mDNSBool Suppress = mDNSfalse;
+                    debugf("SendQueries: %s question for %##s (%s) at %d forecast total %d",
+                           SuppressOnThisInterface(q->DupSuppress, intf) ? "Suppressing" : "Putting    ",
+                           q->qname.c, DNSTypeName(q->qtype), queryptr - m->omsg.data, queryptr + answerforecast - m->omsg.data);
+
+                    // If interface is P2P type, verify that query should be sent over it.
+                    if (!mDNSPlatformValidQuestionForInterface(q, intf))
+                    {
+                        LogInfo("SendQueries: Not sending (%s) %##s on %s", DNSTypeName(q->qtype), q->qname.c, InterfaceNameForID(m, intf->InterfaceID));
+                        q->SendQNow = (q->InterfaceID || !q->SendOnAll) ? mDNSNULL : GetNextActiveInterfaceID(intf);
+                    }
+                    // If we're suppressing this question, or we successfully put it, update its SendQNow state
+                    else if ((Suppress = SuppressOnThisInterface(q->DupSuppress, intf)) ||
+                        BuildQuestion(m, &m->omsg, &queryptr, q, &kalistptr, &answerforecast))
+                    {
+                        // We successfully added the question to the packet. Make sure that
+                        // we also send the NSEC3 record if required. BuildQuestion accounted for
+                        // the space.
+                        //
+                        // Note: We don't suppress anonymous questions and hence Suppress should always
+                        // be zero.
+
+                        if (Suppress)
+                            m->mDNSStats.DupQuerySuppressions++;
+
+                        if (!Suppress && q->AnonInfo)
+                        {
+                            debugf("SendQueries: marking for question %##s, Suppress %d", q->qname.c, Suppress);
+                            q->AnonInfo->SendNow = intf->InterfaceID;
+                        }
+                        q->SendQNow = (q->InterfaceID || !q->SendOnAll) ? mDNSNULL : GetNextActiveInterfaceID(intf);
+                        if (q->WakeOnResolveCount)
+                        {
+                            mDNSSendWakeOnResolve(m, q);
+                            q->WakeOnResolveCount--;
+                        }
+
+                        // use brackground traffic class if any included question requires it
+                        if (q->UseBackgroundTrafficClass)
+                        {
+                            useBackgroundTrafficClass = mDNStrue;
+                        }
+                    }
+                }
+            }
+
+            // Put probe questions in this packet
+            for (ar = m->ResourceRecords; ar; ar=ar->next)
+                if (ar->SendRNow == intf->InterfaceID)
+                {
+                    mDNSBool ucast = (ar->ProbeCount >= DefaultProbeCountForTypeUnique-1) && m->CanReceiveUnicastOn5353;
+                    mDNSu16 ucbit = (mDNSu16)(ucast ? kDNSQClass_UnicastResponse : 0);
+                    const mDNSu8 *const limit = m->omsg.data + (m->omsg.h.numQuestions ? NormalMaxDNSMessageData : AbsoluteMaxDNSMessageData);
+                    // We forecast: compressed name (2) type (2) class (2) TTL (4) rdlength (2) rdata (n)
+                    mDNSu32 forecast = answerforecast + 12 + ar->resrec.rdestimate;
+                    mDNSu8 *newptr = putQuestion(&m->omsg, queryptr, limit - forecast, ar->resrec.name, kDNSQType_ANY, (mDNSu16)(ar->resrec.rrclass | ucbit));
+                    if (newptr)
+                    {
+                        queryptr       = newptr;
+                        answerforecast = forecast;
+                        ar->SendRNow = (ar->resrec.InterfaceID) ? mDNSNULL : GetNextActiveInterfaceID(intf);
+                        ar->IncludeInProbe = mDNStrue;
+                        verbosedebugf("SendQueries:   Put Question %##s (%s) probecount %d",
+                                      ar->resrec.name->c, DNSTypeName(ar->resrec.rrtype), ar->ProbeCount);
+                    }
+                }
+        }
+
+        // Put our known answer list (either new one from this question or questions, or remainder of old one from last time)
+        while (KnownAnswerList)
+        {
+            CacheRecord *ka = KnownAnswerList;
+            mDNSu32 SecsSinceRcvd = ((mDNSu32)(m->timenow - ka->TimeRcvd)) / mDNSPlatformOneSecond;
+            mDNSu8 *newptr = PutResourceRecordTTLWithLimit(&m->omsg, queryptr, &m->omsg.h.numAnswers, &ka->resrec, ka->resrec.rroriginalttl - SecsSinceRcvd,
+                                                           m->omsg.data + NormalMaxDNSMessageData - OwnerRecordSpace - TraceRecordSpace);
+            if (newptr)
+            {
+                verbosedebugf("SendQueries:   Put %##s (%s) at %d - %d",
+                              ka->resrec.name->c, DNSTypeName(ka->resrec.rrtype), queryptr - m->omsg.data, newptr - m->omsg.data);
+                queryptr = newptr;
+                KnownAnswerList = ka->NextInKAList;
+                ka->NextInKAList = mDNSNULL;
+            }
+            else
+            {
+                // If we ran out of space and we have more than one question in the packet, that's an error --
+                // we shouldn't have put more than one question if there was a risk of us running out of space.
+                if (m->omsg.h.numQuestions > 1)
+                    LogMsg("SendQueries:   Put %d answers; No more space for known answers", m->omsg.h.numAnswers);
+                m->omsg.h.flags.b[0] |= kDNSFlag0_TC;
+                break;
+            }
+        }
+
+        for (ar = m->ResourceRecords; ar; ar=ar->next)
+        {
+            if (ar->IncludeInProbe)
+            {
+                mDNSu8 *newptr = PutResourceRecord(&m->omsg, queryptr, &m->omsg.h.numAuthorities, &ar->resrec);
+                ar->IncludeInProbe = mDNSfalse;
+                if (newptr) queryptr = newptr;
+                else LogMsg("SendQueries:   How did we fail to have space for the Update record %s", ARDisplayString(m,ar));
+            }
+        }
+
+        for (q = m->Questions; q; q = q->next)
+        {
+            if (q->AnonInfo && q->AnonInfo->SendNow == intf->InterfaceID)
+            {
+                mDNSu8 *newptr = PutResourceRecord(&m->omsg, queryptr, &m->omsg.h.numAuthorities, q->AnonInfo->nsec3RR);
+                if (newptr)
+                {
+                    debugf("SendQueries: Added NSEC3 record %s on InterfaceID %p", RRDisplayString(m, q->AnonInfo->nsec3RR), intf->InterfaceID);
+                    queryptr = newptr;
+                }
+                else
+                {
+                    LogMsg("SendQueries: ERROR!! Cannot add NSEC3 record %s on InterfaceID %p", RRDisplayString(m, q->AnonInfo->nsec3RR), intf->InterfaceID);
+                }
+                q->AnonInfo->SendNow = mDNSNULL;
+            }
+        }
+
+        if (queryptr > m->omsg.data)
+        {
+            // If we have data to send, add OWNER/TRACER/OWNER+TRACER option if necessary, then send packet
+            if (OwnerRecordSpace || TraceRecordSpace)
+            {
+                AuthRecord opt;
+                mDNS_SetupResourceRecord(&opt, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+                opt.resrec.rrclass    = NormalMaxDNSMessageData;
+                opt.resrec.rdlength   = sizeof(rdataOPT); 
+                opt.resrec.rdestimate = sizeof(rdataOPT);
+                if (OwnerRecordSpace && TraceRecordSpace)
+                {
+                    opt.resrec.rdlength   += sizeof(rdataOPT);  // Two options in this OPT record
+                    opt.resrec.rdestimate += sizeof(rdataOPT);
+                    SetupOwnerOpt(m, intf, &opt.resrec.rdata->u.opt[0]);
+                    SetupTracerOpt(m, &opt.resrec.rdata->u.opt[1]);
+                }
+                else if (OwnerRecordSpace)
+                {
+                    SetupOwnerOpt(m, intf, &opt.resrec.rdata->u.opt[0]);
+                }
+                else if (TraceRecordSpace)
+                {
+                    SetupTracerOpt(m, &opt.resrec.rdata->u.opt[0]);
+                }
+                LogInfo("SendQueries putting %s %s: %s %s", OwnerRecordSpace ? "OWNER" : "", TraceRecordSpace ? "TRACER" : "", intf->ifname, ARDisplayString(m, &opt));
+                queryptr = PutResourceRecordTTLWithLimit(&m->omsg, queryptr, &m->omsg.h.numAdditionals,
+                                                         &opt.resrec, opt.resrec.rroriginalttl, m->omsg.data + AbsoluteMaxDNSMessageData);
+                if (!queryptr)
+                { 
+                    LogMsg("SendQueries: How did we fail to have space for %s %s OPT record (%d/%d/%d/%d) %s", OwnerRecordSpace ? "OWNER" : "", TraceRecordSpace ? "TRACER" : "",
+                           m->omsg.h.numQuestions, m->omsg.h.numAnswers, m->omsg.h.numAuthorities, m->omsg.h.numAdditionals, ARDisplayString(m, &opt));
+                }
+                if (queryptr > m->omsg.data + NormalMaxDNSMessageData)
+                {
+                    if (m->omsg.h.numQuestions != 1 || m->omsg.h.numAnswers != 0 || m->omsg.h.numAuthorities != 1 || m->omsg.h.numAdditionals != 1)
+                        LogMsg("SendQueries: Why did we generate oversized packet with %s %s OPT record %p %p %p (%d/%d/%d/%d) %s", OwnerRecordSpace ? "OWNER" : "", 
+                                TraceRecordSpace ? "TRACER" : "", m->omsg.data, m->omsg.data + NormalMaxDNSMessageData, queryptr, m->omsg.h.numQuestions, m->omsg.h.numAnswers, 
+                                m->omsg.h.numAuthorities, m->omsg.h.numAdditionals, ARDisplayString(m, &opt));
+                }
+            }
+
+            if ((m->omsg.h.flags.b[0] & kDNSFlag0_TC) && m->omsg.h.numQuestions > 1)
+                LogMsg("SendQueries: Should not have more than one question (%d) in a truncated packet", m->omsg.h.numQuestions);
+            debugf("SendQueries:   Sending %d Question%s %d Answer%s %d Update%s on %p",
+                   m->omsg.h.numQuestions,   m->omsg.h.numQuestions   == 1 ? "" : "s",
+                   m->omsg.h.numAnswers,     m->omsg.h.numAnswers     == 1 ? "" : "s",
+                   m->omsg.h.numAuthorities, m->omsg.h.numAuthorities == 1 ? "" : "s", intf->InterfaceID);
+            if (intf->IPv4Available) mDNSSendDNSMessage(m, &m->omsg, queryptr, intf->InterfaceID, mDNSNULL, &AllDNSLinkGroup_v4, MulticastDNSPort, mDNSNULL, mDNSNULL, useBackgroundTrafficClass);
+            if (intf->IPv6Available) mDNSSendDNSMessage(m, &m->omsg, queryptr, intf->InterfaceID, mDNSNULL, &AllDNSLinkGroup_v6, MulticastDNSPort, mDNSNULL, mDNSNULL, useBackgroundTrafficClass);
+            if (!m->SuppressSending) m->SuppressSending = NonZeroTime(m->timenow + (mDNSPlatformOneSecond+9)/10);
+            if (++pktcount >= 1000)
+            { LogMsg("SendQueries exceeded loop limit %d: giving up", pktcount); break; }
+            // There might be more records left in the known answer list, or more questions to send
+            // on this interface, so go around one more time and try again.
+        }
+        else    // Nothing more to send on this interface; go to next
+        {
+            const NetworkInterfaceInfo *next = GetFirstActiveInterface(intf->next);
+            #if MDNS_DEBUGMSGS && 0
+            const char *const msg = next ? "SendQueries:   Nothing more on %p; moving to %p" : "SendQueries:   Nothing more on %p";
+            debugf(msg, intf, next);
+            #endif
+            intf = next;
+        }
+    }
+
+    // 4. Final housekeeping
+
+    // 4a. Debugging check: Make sure we announced all our records
+    for (ar = m->ResourceRecords; ar; ar=ar->next)
+        if (ar->SendRNow)
+        {
+            if (ar->ARType != AuthRecordLocalOnly && ar->ARType != AuthRecordP2P)
+                LogMsg("SendQueries: No active interface %p to send probe: %p %s", ar->SendRNow, ar->resrec.InterfaceID, ARDisplayString(m, ar));
+            ar->SendRNow = mDNSNULL;
+        }
+
+    // 4b. When we have lingering cache records that we're keeping around for a few seconds in the hope
+    // that their interface which went away might come back again, the logic will want to send queries
+    // for those records, but we can't because their interface isn't here any more, so to keep the
+    // state machine ticking over we just pretend we did so.
+    // If the interface does not come back in time, the cache record will expire naturally
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if (cr->CRActiveQuestion && cr->UnansweredQueries < MaxUnansweredQueries)
+        {
+            if (m->timenow + TicksTTL(cr)/50 - cr->NextRequiredQuery >= 0)
+            {
+                cr->UnansweredQueries++;
+                cr->CRActiveQuestion->SendQNow = mDNSNULL;
+                SetNextCacheCheckTimeForRecord(m, cr);
+            }
+        }
+    }
+
+    // 4c. Debugging check: Make sure we sent all our planned questions
+    // Do this AFTER the lingering cache records check above, because that will prevent spurious warnings for questions
+    // we legitimately couldn't send because the interface is no longer available
+    for (q = m->Questions; q; q=q->next)
+    {
+        if (q->SendQNow)
+        {
+            DNSQuestion *x;
+            for (x = m->NewQuestions; x; x=x->next) if (x == q) break;  // Check if this question is a NewQuestion
+            LogMsg("SendQueries: No active interface %p to send %s question: %p %##s (%s)", q->SendQNow, x ? "new" : "old", q->InterfaceID, q->qname.c, DNSTypeName(q->qtype));
+            q->SendQNow = mDNSNULL;
+        }
+        q->CachedAnswerNeedsUpdate = mDNSfalse;
+    }
+}
+
+mDNSlocal void SendWakeup(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSEthAddr *EthAddr, mDNSOpaque48 *password)
+{
+    int i, j;
+    mDNSu8 *ptr = m->omsg.data;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID);
+    if (!intf) { LogMsg("SendARP: No interface with InterfaceID %p found", InterfaceID); return; }
+
+    // 0x00 Destination address
+    for (i=0; i<6; i++) *ptr++ = EthAddr->b[i];
+
+    // 0x06 Source address (Note: Since we don't currently set the BIOCSHDRCMPLT option, BPF will fill in the real interface address for us)
+    for (i=0; i<6; i++) *ptr++ = intf->MAC.b[0];
+
+    // 0x0C Ethertype (0x0842)
+    *ptr++ = 0x08;
+    *ptr++ = 0x42;
+
+    // 0x0E Wakeup sync sequence
+    for (i=0; i<6; i++) *ptr++ = 0xFF;
+
+    // 0x14 Wakeup data
+    for (j=0; j<16; j++) for (i=0; i<6; i++) *ptr++ = EthAddr->b[i];
+
+    // 0x74 Password
+    for (i=0; i<6; i++) *ptr++ = password->b[i];
+
+    mDNSPlatformSendRawPacket(m->omsg.data, ptr, InterfaceID);
+
+    // For Ethernet switches that don't flood-foward packets with unknown unicast destination MAC addresses,
+    // broadcast is the only reliable way to get a wakeup packet to the intended target machine.
+    // For 802.11 WPA networks, where a sleeping target machine may have missed a broadcast/multicast
+    // key rotation, unicast is the only way to get a wakeup packet to the intended target machine.
+    // So, we send one of each, unicast first, then broadcast second.
+    for (i=0; i<6; i++) m->omsg.data[i] = 0xFF;
+    mDNSPlatformSendRawPacket(m->omsg.data, ptr, InterfaceID);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - RR List Management & Task Management
+#endif
+
+// Whenever a question is answered, reset its state so that we don't query
+// the network repeatedly. This happens first time when we answer the question and
+// and later when we refresh the cache.
+mDNSlocal void ResetQuestionState(mDNS *const m, DNSQuestion *q)
+{
+    q->LastQTime        = m->timenow;
+    q->LastQTxTime      = m->timenow;
+    q->RecentAnswerPkts = 0;
+    q->ThisQInterval    = MaxQuestionInterval;
+    q->RequestUnicast   = 0;
+    // Reset unansweredQueries so that we don't penalize this server later when we
+    // start sending queries when the cache expires.
+    q->unansweredQueries = 0;
+    debugf("ResetQuestionState: Set MaxQuestionInterval for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+}
+
+// Note: AnswerCurrentQuestionWithResourceRecord can call a user callback, which may change the record list and/or question list.
+// Any code walking either list must use the m->CurrentQuestion (and possibly m->CurrentRecord) mechanism to protect against this.
+// In fact, to enforce this, the routine will *only* answer the question currently pointed to by m->CurrentQuestion,
+// which will be auto-advanced (possibly to NULL) if the client callback cancels the question.
+mDNSexport void AnswerCurrentQuestionWithResourceRecord(mDNS *const m, CacheRecord *const rr, const QC_result AddRecord)
+{
+    DNSQuestion *const q = m->CurrentQuestion;
+    mDNSBool followcname = FollowCNAME(q, &rr->resrec, AddRecord);
+
+    verbosedebugf("AnswerCurrentQuestionWithResourceRecord:%4lu %s TTL %d %s",
+                  q->CurrentAnswers, AddRecord ? "Add" : "Rmv", rr->resrec.rroriginalttl, CRDisplayString(m, rr));
+
+    // When the response for the question was validated, the entire rrset was validated. If we deliver
+    // a RMV for a single record in the rrset, we invalidate the response. If we deliver another add
+    // in the future, we will do the revalidation again.
+    //
+    // Also, if we deliver an ADD for a negative cache record and it has no NSEC/NSEC3, the ValidationStatus needs
+    // to be reset. This happens normally when we deliver a "secure" negative response followed by an insecure
+    // negative response which can happen e.g., when disconnecting from network that leads to a negative response
+    // due to no DNS servers. As we don't deliver RMVs for negative responses that were delivered before, we need
+    // to do it on the next ADD of a negative cache record. This ADD could be the result of a timeout, no DNS servers
+    // etc. in which case we need to reset the state to make sure we don't deliver them as secure. If this is
+    // a real negative response, we would reset the state here and validate the results at the end of this function.
+    // or the real response again if we purge the cache. 
+    if (q->ValidationRequired && ((AddRecord == QC_rmv) ||
+        (rr->resrec.RecordType == kDNSRecordTypePacketNegative && (AddRecord == QC_add))))
+    {
+        q->ValidationStatus = 0;
+        q->ValidationState = DNSSECValRequired;
+    }
+
+    // Normally we don't send out the unicast query if we have answered using our local only auth records e.g., /etc/hosts.
+    // But if the query for "A" record has a local answer but query for "AAAA" record has no local answer, we might
+    // send the AAAA query out which will come back with CNAME and will also answer the "A" query. To prevent that,
+    // we check to see if that query already has a unique local answer.
+    if (q->LOAddressAnswers)
+    {
+        LogInfo("AnswerCurrentQuestionWithResourceRecord: Question %p %##s (%s) not answering with record %s due to "
+                "LOAddressAnswers %d", q, q->qname.c, DNSTypeName(q->qtype), ARDisplayString(m, rr),
+                q->LOAddressAnswers);
+        return;
+    }
+
+    if (QuerySuppressed(q))
+    {
+        // If the query is suppressed, then we don't want to answer from the cache. But if this query is
+        // supposed to time out, we still want to callback the clients. We do this only for TimeoutQuestions
+        // that are timing out, which we know are answered with negative cache record when timing out.
+        if (!q->TimeoutQuestion || rr->resrec.RecordType != kDNSRecordTypePacketNegative || (m->timenow - q->StopTime < 0))
+            return;
+    }
+
+    // Note: Use caution here. In the case of records with rr->DelayDelivery set, AnswerCurrentQuestionWithResourceRecord(... mDNStrue)
+    // may be called twice, once when the record is received, and again when it's time to notify local clients.
+    // If any counters or similar are added here, care must be taken to ensure that they are not double-incremented by this.
+
+    rr->LastUsed = m->timenow;
+    if (AddRecord == QC_add && !q->DuplicateOf && rr->CRActiveQuestion != q)
+    {
+        if (!rr->CRActiveQuestion) m->rrcache_active++; // If not previously active, increment rrcache_active count
+        debugf("AnswerCurrentQuestionWithResourceRecord: Updating CRActiveQuestion from %p to %p for cache record %s, CurrentAnswer %d",
+               rr->CRActiveQuestion, q, CRDisplayString(m,rr), q->CurrentAnswers);
+        rr->CRActiveQuestion = q;                       // We know q is non-null
+        SetNextCacheCheckTimeForRecord(m, rr);
+    }
+
+    // If this is:
+    // (a) a no-cache add, where we've already done at least one 'QM' query, or
+    // (b) a normal add, where we have at least one unique-type answer,
+    // then there's no need to keep polling the network.
+    // (If we have an answer in the cache, then we'll automatically ask again in time to stop it expiring.)
+    // We do this for mDNS questions and uDNS one-shot questions, but not for
+    // uDNS LongLived questions, because that would mess up our LLQ lease renewal timing.
+    if ((AddRecord == QC_addnocache && !q->RequestUnicast) ||
+        (AddRecord == QC_add && (q->ExpectUnique || (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask))))
+        if (ActiveQuestion(q) && (mDNSOpaque16IsZero(q->TargetQID) || !q->LongLived))
+        {
+            ResetQuestionState(m, q);
+        }
+
+    if (rr->DelayDelivery) return;      // We'll come back later when CacheRecordDeferredAdd() calls us
+
+    // Only deliver negative answers if client has explicitly requested them except when we are forcing a negative response
+    // for the purpose of retrying search domains/timeout OR the question is suppressed
+    if (rr->resrec.RecordType == kDNSRecordTypePacketNegative || (q->qtype != kDNSType_NSEC && RRAssertsNonexistence(&rr->resrec, q->qtype)))
+        if (!AddRecord || (AddRecord != QC_suppressed && AddRecord != QC_forceresponse && !q->ReturnIntermed)) return;
+
+    // For CNAME results to non-CNAME questions, only inform the client if they explicitly requested that
+    if (q->QuestionCallback && !q->NoAnswer && (!followcname || q->ReturnIntermed))
+    {
+        mDNS_DropLockBeforeCallback();      // Allow client (and us) to legally make mDNS API calls
+        if (q->qtype != kDNSType_NSEC && RRAssertsNonexistence(&rr->resrec, q->qtype))
+        {
+            CacheRecord neg;
+            MakeNegativeCacheRecord(m, &neg, &q->qname, q->qnamehash, q->qtype, q->qclass, 1, rr->resrec.InterfaceID, q->qDNSServer);
+            q->QuestionCallback(m, q, &neg.resrec, AddRecord);
+        }
+        else
+            q->QuestionCallback(m, q, &rr->resrec, AddRecord);
+        mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+    }
+    // If this is an "Add" operation and this question needs validation, validate the response.
+    // In the case of negative responses, extra care should be taken. Negative cache records are
+    // used for many purposes. For example,
+    //
+    // 1) Suppressing questions (SuppressUnusable)
+    // 2) Timeout questions
+    // 3) The name does not exist
+    // 4) No DNS servers are available and we need a quick response for the application
+    //
+    // (1) and (2) are handled by "QC_add" check as AddRecord would be "QC_forceresponse" or "QC_suppressed"
+    // in that case. For (3), it is possible that we don't get nsecs back but we still need to call
+    // VerifySignature so that we can deliver the appropriate DNSSEC result. There is no point in verifying
+    // signature for (4) and hence the explicit check for q->qDNSServer.
+    //
+    if (m->CurrentQuestion == q && (AddRecord == QC_add) && !q->ValidatingResponse && q->ValidationRequired &&
+        q->ValidationState == DNSSECValRequired && q->qDNSServer)
+    {
+        q->ValidationState = DNSSECValInProgress;
+        // Treat it as callback call as that's what dnssec code expects
+        mDNS_DropLockBeforeCallback();      // Allow client (and us) to legally make mDNS API calls
+        VerifySignature(m, mDNSNULL, q);
+        mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        return;
+    }
+
+    // Note: Proceed with caution here because client callback function is allowed to do anything,
+    // including starting/stopping queries, registering/deregistering records, etc.
+    //
+    // If we get a CNAME back while we are validating the response (i.e., CNAME for DS, DNSKEY, RRSIG),
+    // don't follow them. If it is a ValidationRequired question, wait for the CNAME to be validated
+    // first before following it
+    if (!ValidatingQuestion(q) && followcname && m->CurrentQuestion == q)
+        AnswerQuestionByFollowingCNAME(m, q, &rr->resrec);
+}
+
+mDNSlocal void CacheRecordDeferredAdd(mDNS *const m, CacheRecord *rr)
+{
+    rr->DelayDelivery = 0;
+    if (m->CurrentQuestion)
+        LogMsg("CacheRecordDeferredAdd ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+    {
+        DNSQuestion *q = m->CurrentQuestion;
+        if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+            AnswerCurrentQuestionWithResourceRecord(m, rr, QC_add);
+        if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+mDNSlocal mDNSs32 CheckForSoonToExpireRecords(mDNS *const m, const domainname *const name, const mDNSu32 namehash, const mDNSu32 slot, mDNSBool *purge)
+{
+    const mDNSs32 threshhold = m->timenow + mDNSPlatformOneSecond;  // See if there are any records expiring within one second
+    const mDNSs32 start      = m->timenow - 0x10000000;
+    mDNSs32 delay = start;
+    CacheGroup *cg = CacheGroupForName(m, slot, namehash, name);
+    const CacheRecord *rr;
+
+    if (purge)
+        *purge = mDNSfalse;
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        // If there are records that will expire soon, there are cases that need delayed
+        // delivery of events:
+        //
+        // 1) A new cache entry is about to be added as a replacement. The caller needs to
+        //    deliver a RMV (for the current old entry) followed by ADD (for the new entry).
+        //    It needs to schedule the timer for the next cache expiry (ScheduleNextCacheCheckTime),
+        //    so that the cache entry can be purged (purging causes the RMV followed by ADD)
+        //   
+        // 2) A new question is about to be answered and the caller needs to know whether it's
+        //    scheduling should be delayed so that the question is not answered with this record.
+        //    Instead of delivering an ADD (old entry) followed by RMV (old entry) and another ADD
+        //    (new entry), a single ADD can be delivered by delaying the scheduling of the question
+        //    immediately.
+        //
+        // When the unicast cache record is created, it's TTL has been extended beyond its value
+        // given in the resource record (See RRAdjustTTL). If it is in the "extended" time, the
+        // cache is already expired and we set "purge" to indicate that. When "purge" is set, the
+        // return value of the function should be ignored by the callers.
+        //
+        // Note: For case (1), "purge" argument is NULL and hence the following checks are skipped.
+        // It is okay to skip in that case because the cache records have been set to expire almost
+        // immediately and the extended time does not apply.
+        //
+        // Also, if there is already an active question we don't try to optimize as purging the cache
+        // would end up delivering RMV for the active question and hence we avoid that.
+
+        if (purge && !rr->resrec.InterfaceID && !rr->CRActiveQuestion && rr->resrec.rroriginalttl)
+        {
+            mDNSu32 uTTL = RRUnadjustedTTL(rr->resrec.rroriginalttl);
+            if (m->timenow - (rr->TimeRcvd + ((mDNSs32)uTTL * mDNSPlatformOneSecond)) >= 0)
+            {
+                LogInfo("CheckForSoonToExpireRecords: %s: rroriginalttl %u, unadjustedTTL %u, currentTTL %u",
+                    CRDisplayString(m, rr), rr->resrec.rroriginalttl, uTTL, (m->timenow - rr->TimeRcvd)/mDNSPlatformOneSecond);
+                *purge = mDNStrue;
+                continue;
+            }
+        }
+        if (threshhold - RRExpireTime(rr) >= 0)     // If we have records about to expire within a second
+        {
+            if (delay - RRExpireTime(rr) < 0)       // then delay until after they've been deleted
+                delay = RRExpireTime(rr);
+        }
+    }
+    if (delay - start > 0)
+        return(NonZeroTime(delay));
+    else
+        return(0);
+}
+
+// CacheRecordAdd is only called from CreateNewCacheEntry, *never* directly as a result of a client API call.
+// If new questions are created as a result of invoking client callbacks, they will be added to
+// the end of the question list, and m->NewQuestions will be set to indicate the first new question.
+// rr is a new CacheRecord just received into our cache
+// (kDNSRecordTypePacketAns/PacketAnsUnique/PacketAdd/PacketAddUnique).
+// Note: CacheRecordAdd calls AnswerCurrentQuestionWithResourceRecord which can call a user callback,
+// which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void CacheRecordAdd(mDNS *const m, CacheRecord *rr)
+{
+    DNSQuestion *q;
+
+    // We stop when we get to NewQuestions -- if we increment their CurrentAnswers/LargeAnswers/UniqueAnswers
+    // counters here we'll end up double-incrementing them when we do it again in AnswerNewQuestion().
+    for (q = m->Questions; q && q != m->NewQuestions; q=q->next)
+    {
+        if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+        {
+            // If this question is one that's actively sending queries, and it's received ten answers within one
+            // second of sending the last query packet, then that indicates some radical network topology change,
+            // so reset its exponential backoff back to the start. We must be at least at the eight-second interval
+            // to do this. If we're at the four-second interval, or less, there's not much benefit accelerating
+            // because we will anyway send another query within a few seconds. The first reset query is sent out
+            // randomized over the next four seconds to reduce possible synchronization between machines.
+            if (q->LastAnswerPktNum != m->PktNum)
+            {
+                q->LastAnswerPktNum = m->PktNum;
+                if (mDNSOpaque16IsZero(q->TargetQID) && ActiveQuestion(q) && ++q->RecentAnswerPkts >= 10 &&
+                    q->ThisQInterval > InitialQuestionInterval * QuestionIntervalStep3 && m->timenow - q->LastQTxTime < mDNSPlatformOneSecond)
+                {
+                    LogMsg("CacheRecordAdd: %##s (%s) got immediate answer burst (%d); restarting exponential backoff sequence (%d)",
+                           q->qname.c, DNSTypeName(q->qtype), q->RecentAnswerPkts, q->ThisQInterval);
+                    q->LastQTime      = m->timenow - InitialQuestionInterval + (mDNSs32)mDNSRandom((mDNSu32)mDNSPlatformOneSecond*4);
+                    q->ThisQInterval  = InitialQuestionInterval;
+                    SetNextQueryTime(m,q);
+                }
+            }
+            verbosedebugf("CacheRecordAdd %p %##s (%s) %lu %#a:%d question %p", rr, rr->resrec.name->c,
+                          DNSTypeName(rr->resrec.rrtype), rr->resrec.rroriginalttl, rr->resrec.rDNSServer ?
+                          &rr->resrec.rDNSServer->addr : mDNSNULL, mDNSVal16(rr->resrec.rDNSServer ?
+                                                                             rr->resrec.rDNSServer->port : zeroIPPort), q);
+            q->CurrentAnswers++;
+
+            q->unansweredQueries = 0;
+            if (rr->resrec.rdlength > SmallRecordLimit) q->LargeAnswers++;
+            if (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) q->UniqueAnswers++;
+            if (q->CurrentAnswers > 4000)
+            {
+                static int msgcount = 0;
+                if (msgcount++ < 10)
+                    LogMsg("CacheRecordAdd: %##s (%s) has %d answers; shedding records to resist DOS attack",
+                           q->qname.c, DNSTypeName(q->qtype), q->CurrentAnswers);
+                rr->resrec.rroriginalttl = 0;
+                rr->UnansweredQueries = MaxUnansweredQueries;
+            }
+        }
+    }
+
+    if (!rr->DelayDelivery)
+    {
+        if (m->CurrentQuestion)
+            LogMsg("CacheRecordAdd ERROR m->CurrentQuestion already set: %##s (%s)", m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+        m->CurrentQuestion = m->Questions;
+        while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+        {
+            q = m->CurrentQuestion;
+            if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+                AnswerCurrentQuestionWithResourceRecord(m, rr, QC_add);
+            if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+                m->CurrentQuestion = q->next;
+        }
+        m->CurrentQuestion = mDNSNULL;
+    }
+
+    SetNextCacheCheckTimeForRecord(m, rr);
+}
+
+// NoCacheAnswer is only called from mDNSCoreReceiveResponse, *never* directly as a result of a client API call.
+// If new questions are created as a result of invoking client callbacks, they will be added to
+// the end of the question list, and m->NewQuestions will be set to indicate the first new question.
+// rr is a new CacheRecord just received from the wire (kDNSRecordTypePacketAns/AnsUnique/Add/AddUnique)
+// but we don't have any place to cache it. We'll deliver question 'add' events now, but we won't have any
+// way to deliver 'remove' events in future, nor will we be able to include this in known-answer lists,
+// so we immediately bump ThisQInterval up to MaxQuestionInterval to avoid pounding the network.
+// Note: NoCacheAnswer calls AnswerCurrentQuestionWithResourceRecord which can call a user callback,
+// which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void NoCacheAnswer(mDNS *const m, CacheRecord *rr)
+{
+    LogMsg("No cache space: Delivering non-cached result for %##s", m->rec.r.resrec.name->c);
+    if (m->CurrentQuestion)
+        LogMsg("NoCacheAnswer ERROR m->CurrentQuestion already set: %##s (%s)", m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    // We do this for *all* questions, not stopping when we get to m->NewQuestions,
+    // since we're not caching the record and we'll get no opportunity to do this later
+    while (m->CurrentQuestion)
+    {
+        DNSQuestion *q = m->CurrentQuestion;
+        if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+            AnswerCurrentQuestionWithResourceRecord(m, rr, QC_addnocache);  // QC_addnocache means "don't expect remove events for this"
+        if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+// CacheRecordRmv is only called from CheckCacheExpiration, which is called from mDNS_Execute.
+// Note that CacheRecordRmv is *only* called for records that are referenced by at least one active question.
+// If new questions are created as a result of invoking client callbacks, they will be added to
+// the end of the question list, and m->NewQuestions will be set to indicate the first new question.
+// rr is an existing cache CacheRecord that just expired and is being deleted
+// (kDNSRecordTypePacketAns/PacketAnsUnique/PacketAdd/PacketAddUnique).
+// Note: CacheRecordRmv calls AnswerCurrentQuestionWithResourceRecord which can call a user callback,
+// which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void CacheRecordRmv(mDNS *const m, CacheRecord *rr)
+{
+    if (m->CurrentQuestion)
+        LogMsg("CacheRecordRmv ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+
+    // We stop when we get to NewQuestions -- for new questions their CurrentAnswers/LargeAnswers/UniqueAnswers counters
+    // will all still be zero because we haven't yet gone through the cache counting how many answers we have for them.
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+    {
+        DNSQuestion *q = m->CurrentQuestion;
+        // When a question enters suppressed state, we generate RMV events and generate a negative
+        // response. A cache may be present that answers this question e.g., cache entry generated
+        // before the question became suppressed. We need to skip the suppressed questions here as
+        // the RMV event has already been generated.
+        if (!QuerySuppressed(q) && ResourceRecordAnswersQuestion(&rr->resrec, q))
+        {
+            verbosedebugf("CacheRecordRmv %p %s", rr, CRDisplayString(m, rr));
+            q->FlappingInterface1 = mDNSNULL;
+            q->FlappingInterface2 = mDNSNULL;
+
+            if (q->CurrentAnswers == 0)
+                LogMsg("CacheRecordRmv ERROR!!: How can CurrentAnswers already be zero for %p %##s (%s) DNSServer %#a:%d",
+                       q, q->qname.c, DNSTypeName(q->qtype), q->qDNSServer ? &q->qDNSServer->addr : mDNSNULL,
+                       mDNSVal16(q->qDNSServer ? q->qDNSServer->port : zeroIPPort));
+            else
+            {
+                q->CurrentAnswers--;
+                if (rr->resrec.rdlength > SmallRecordLimit) q->LargeAnswers--;
+                if (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) q->UniqueAnswers--;
+            }
+
+            // If we have dropped below the answer threshold for this mDNS question,
+            // restart the queries at InitialQuestionInterval.
+            if (mDNSOpaque16IsZero(q->TargetQID) && (q->BrowseThreshold > 0) && (q->CurrentAnswers < q->BrowseThreshold))
+            {
+                q->ThisQInterval = InitialQuestionInterval;
+                q->LastQTime     = m->timenow - q->ThisQInterval;
+                SetNextQueryTime(m,q);
+                LogInfo("CacheRecordRmv: (%s) %##s dropped below threshold of %d answers",
+                    DNSTypeName(q->qtype), q->qname.c, q->BrowseThreshold);
+            }
+            if (rr->resrec.rdata->MaxRDLength) // Never generate "remove" events for negative results
+            {
+                if (q->CurrentAnswers == 0)
+                {
+                    LogInfo("CacheRecordRmv: Last answer for %##s (%s) expired from cache; will reconfirm antecedents",
+                            q->qname.c, DNSTypeName(q->qtype));
+                    ReconfirmAntecedents(m, &q->qname, q->qnamehash, 0);
+                }
+                AnswerCurrentQuestionWithResourceRecord(m, rr, QC_rmv);
+            }
+        }
+        if (m->CurrentQuestion == q)    // If m->CurrentQuestion was not auto-advanced, do it ourselves now
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+mDNSlocal void ReleaseCacheEntity(mDNS *const m, CacheEntity *e)
+{
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING >= 1
+    unsigned int i;
+    for (i=0; i<sizeof(*e); i++) ((char*)e)[i] = 0xFF;
+#endif
+    e->next = m->rrcache_free;
+    m->rrcache_free = e;
+    m->rrcache_totalused--;
+}
+
+mDNSlocal void ReleaseCacheGroup(mDNS *const m, CacheGroup **cp)
+{
+    CacheEntity *e = (CacheEntity *)(*cp);
+    //LogMsg("ReleaseCacheGroup:  Releasing CacheGroup for %p, %##s", (*cp)->name->c, (*cp)->name->c);
+    if ((*cp)->rrcache_tail != &(*cp)->members)
+        LogMsg("ERROR: (*cp)->members == mDNSNULL but (*cp)->rrcache_tail != &(*cp)->members)");
+    //if ((*cp)->name != (domainname*)((*cp)->namestorage))
+    //	LogMsg("ReleaseCacheGroup: %##s, %p %p", (*cp)->name->c, (*cp)->name, (domainname*)((*cp)->namestorage));
+    if ((*cp)->name != (domainname*)((*cp)->namestorage)) mDNSPlatformMemFree((*cp)->name);
+    (*cp)->name = mDNSNULL;
+    *cp = (*cp)->next;          // Cut record from list
+    ReleaseCacheEntity(m, e);
+}
+
+mDNSlocal void ReleaseAdditionalCacheRecords(mDNS *const m, CacheRecord **rp)
+{
+    while (*rp)
+    {
+        CacheRecord *rr = *rp;
+        *rp = (*rp)->next;          // Cut record from list
+        if (rr->resrec.rdata && rr->resrec.rdata != (RData*)&rr->smallrdatastorage)
+        {
+            mDNSPlatformMemFree(rr->resrec.rdata);
+            rr->resrec.rdata = mDNSNULL;
+        }
+        // NSEC or SOA records that are not added to the CacheGroup do not share the name
+        // of the CacheGroup.
+        if (rr->resrec.name)
+        {
+            debugf("ReleaseAdditionalCacheRecords: freeing cached record %##s (%s)", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+            mDNSPlatformMemFree((void *)rr->resrec.name);
+            rr->resrec.name = mDNSNULL;
+        }
+        // Don't count the NSEC3 records used by anonymous browse/reg
+        if (!rr->resrec.InterfaceID)
+        {
+            m->rrcache_totalused_unicast -= rr->resrec.rdlength;
+            if (DNSSECRecordType(rr->resrec.rrtype))
+                BumpDNSSECStats(m, kStatsActionDecrement, kStatsTypeMemoryUsage, rr->resrec.rdlength);
+        }
+        ReleaseCacheEntity(m, (CacheEntity *)rr);
+    }
+}
+
+mDNSexport void ReleaseCacheRecord(mDNS *const m, CacheRecord *r)
+{
+    CacheGroup *cg;
+    const mDNSu32 slot = HashSlot(r->resrec.name);
+
+    //LogMsg("ReleaseCacheRecord: Releasing %s", CRDisplayString(m, r));
+    if (r->resrec.rdata && r->resrec.rdata != (RData*)&r->smallrdatastorage) mDNSPlatformMemFree(r->resrec.rdata);
+    r->resrec.rdata = mDNSNULL;
+
+    cg = CacheGroupForRecord(m, slot, &r->resrec);
+    
+    if (!cg)
+    {
+        // It is okay to have this printed for NSEC/NSEC3s
+        LogInfo("ReleaseCacheRecord: ERROR!! cg NULL for %##s (%s)", r->resrec.name->c, DNSTypeName(r->resrec.rrtype));
+    }
+    // When NSEC records are not added to the cache, it is usually cached at the "nsec" list
+    // of the CacheRecord. But sometimes they may be freed without adding to the "nsec" list
+    // (which is handled below) and in that case it should be freed here.
+    if (r->resrec.name && cg && r->resrec.name != cg->name)
+    {
+        debugf("ReleaseCacheRecord: freeing %##s (%s)", r->resrec.name->c, DNSTypeName(r->resrec.rrtype));
+        mDNSPlatformMemFree((void *)r->resrec.name);
+    }
+    r->resrec.name = mDNSNULL;
+
+    if (r->resrec.AnonInfo)
+    {
+        debugf("ReleaseCacheRecord: freeing AnonInfo for %##s (%s)", r->resrec.name->c, DNSTypeName(r->resrec.rrtype));
+        FreeAnonInfo((void *)r->resrec.AnonInfo);
+    }
+    r->resrec.AnonInfo = mDNSNULL;
+
+    if (!r->resrec.InterfaceID)
+    {
+        m->rrcache_totalused_unicast -= r->resrec.rdlength;
+        if (DNSSECRecordType(r->resrec.rrtype))
+            BumpDNSSECStats(m, kStatsActionDecrement, kStatsTypeMemoryUsage, r->resrec.rdlength);
+    }
+
+    ReleaseAdditionalCacheRecords(m, &r->nsec);
+    ReleaseAdditionalCacheRecords(m, &r->soa);
+
+    ReleaseCacheEntity(m, (CacheEntity *)r);
+}
+
+// Note: We want to be careful that we deliver all the CacheRecordRmv calls before delivering
+// CacheRecordDeferredAdd calls. The in-order nature of the cache lists ensures that all
+// callbacks for old records are delivered before callbacks for newer records.
+mDNSlocal void CheckCacheExpiration(mDNS *const m, const mDNSu32 slot, CacheGroup *const cg)
+{
+    CacheRecord **rp = &cg->members;
+
+    if (m->lock_rrcache) { LogMsg("CheckCacheExpiration ERROR! Cache already locked!"); return; }
+    m->lock_rrcache = 1;
+
+    while (*rp)
+    {
+        CacheRecord *const rr = *rp;
+        mDNSs32 event = RRExpireTime(rr);
+        if (m->timenow - event >= 0)    // If expired, delete it
+        {
+            *rp = rr->next;             // Cut it from the list
+            
+            verbosedebugf("CheckCacheExpiration: Deleting%7d %7d %p %s",
+                          m->timenow - rr->TimeRcvd, rr->resrec.rroriginalttl, rr->CRActiveQuestion, CRDisplayString(m, rr));
+            if (rr->CRActiveQuestion)   // If this record has one or more active questions, tell them it's going away
+            {
+                DNSQuestion *q = rr->CRActiveQuestion;
+                // When a cache record is about to expire, we expect to do four queries at 80-82%, 85-87%, 90-92% and
+                // then 95-97% of the TTL. If the DNS server does not respond, then we will remove the cache entry
+                // before we pick a new DNS server. As the question interval is set to MaxQuestionInterval, we may
+                // not send out a query anytime soon. Hence, we need to reset the question interval. If this is
+                // a normal deferred ADD case, then AnswerCurrentQuestionWithResourceRecord will reset it to
+                // MaxQuestionInterval. If we have inactive questions referring to negative cache entries,
+                // don't ressurect them as they will deliver duplicate "No such Record" ADD events
+                if (!mDNSOpaque16IsZero(q->TargetQID) && !q->LongLived && ActiveQuestion(q))
+                {
+                    q->ThisQInterval = InitialQuestionInterval;
+                    q->LastQTime     = m->timenow - q->ThisQInterval;
+                    SetNextQueryTime(m, q);
+                }
+                CacheRecordRmv(m, rr);
+                m->rrcache_active--;
+            }
+            ReleaseCacheRecord(m, rr);
+        }
+        else                            // else, not expired; see if we need to query
+        {
+            // If waiting to delay delivery, do nothing until then
+            if (rr->DelayDelivery && rr->DelayDelivery - m->timenow > 0)
+                event = rr->DelayDelivery;
+            else
+            {
+                if (rr->DelayDelivery) CacheRecordDeferredAdd(m, rr);
+                if (rr->CRActiveQuestion && rr->UnansweredQueries < MaxUnansweredQueries)
+                {
+                    if (m->timenow - rr->NextRequiredQuery < 0)     // If not yet time for next query
+                        event = NextCacheCheckEvent(rr);            // then just record when we want the next query
+                    else                                            // else trigger our question to go out now
+                    {
+                        // Set NextScheduledQuery to timenow so that SendQueries() will run.
+                        // SendQueries() will see that we have records close to expiration, and send FEQs for them.
+                        m->NextScheduledQuery = m->timenow;
+                        // After sending the query we'll increment UnansweredQueries and call SetNextCacheCheckTimeForRecord(),
+                        // which will correctly update m->NextCacheCheck for us.
+                        event = m->timenow + 0x3FFFFFFF;
+                    }
+                }
+            }
+            verbosedebugf("CheckCacheExpiration:%6d %5d %s",
+                          (event - m->timenow) / mDNSPlatformOneSecond, CacheCheckGracePeriod(rr), CRDisplayString(m, rr));
+            if (m->rrcache_nextcheck[slot] - event > 0)
+                m->rrcache_nextcheck[slot] = event;
+            rp = &rr->next;
+        }
+    }
+    if (cg->rrcache_tail != rp) verbosedebugf("CheckCacheExpiration: Updating CacheGroup tail from %p to %p", cg->rrcache_tail, rp);
+    cg->rrcache_tail = rp;
+    m->lock_rrcache = 0;
+}
+
+// "LORecord" includes both LocalOnly and P2P record. This function assumes m->CurrentQuestion is pointing to "q".
+//
+// If "CheckOnly" is set to "true", the question won't be answered but just check to see if there is an answer and
+// returns true if there is an answer.
+//
+// If "CheckOnly" is set to "false", the question will be answered if there is a LocalOnly/P2P record and 
+// returns true to indicate the same.
+mDNSlocal mDNSBool AnswerQuestionWithLORecord(mDNS *const m, DNSQuestion *q, mDNSBool checkOnly)
+{
+    mDNSu32 slot;
+    AuthRecord *lr;
+    AuthGroup *ag;
+
+    if (m->CurrentRecord)
+        LogMsg("AnswerQuestionWithLORecord ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+
+    slot = AuthHashSlot(&q->qname);
+    ag = AuthGroupForName(&m->rrauth, slot, q->qnamehash, &q->qname);
+    if (ag)
+    {
+        m->CurrentRecord = ag->members;
+        while (m->CurrentRecord && m->CurrentRecord != ag->NewLocalOnlyRecords)
+        {
+            AuthRecord *rr = m->CurrentRecord;
+            m->CurrentRecord = rr->next;
+            //
+            // If the question is mDNSInterface_LocalOnly, all records local to the machine should be used
+            // to answer the query. This is handled in AnswerNewLocalOnlyQuestion.
+            //
+            // We handle mDNSInterface_Any and scoped questions here. See LocalOnlyRecordAnswersQuestion for more
+            // details on how we handle this case. For P2P we just handle "Interface_Any" questions. For LocalOnly
+            // we handle both mDNSInterface_Any and scoped questions.
+
+            if (rr->ARType == AuthRecordLocalOnly || (rr->ARType == AuthRecordP2P && q->InterfaceID == mDNSInterface_Any))
+                if (LocalOnlyRecordAnswersQuestion(rr, q))
+                {
+                    if (checkOnly)
+                    {
+                        LogInfo("AnswerQuestionWithLORecord: question %##s (%s) answered by %s", q->qname.c, DNSTypeName(q->qtype),
+                            ARDisplayString(m, rr));
+                        m->CurrentRecord = mDNSNULL;
+                        return mDNStrue;
+                    }
+                    AnswerLocalQuestionWithLocalAuthRecord(m, rr, mDNStrue);
+                    if (m->CurrentQuestion != q)
+                        break;     // If callback deleted q, then we're finished here
+                }
+        }
+    }
+    m->CurrentRecord = mDNSNULL;
+
+    if (m->CurrentQuestion != q)
+    {
+        LogInfo("AnswerQuestionWithLORecord: Question deleted while while answering LocalOnly record answers");
+        return mDNStrue;
+    }
+
+    if (q->LOAddressAnswers)
+    {
+        LogInfo("AnswerQuestionWithLORecord: Question %p %##s (%s) answered using local auth records LOAddressAnswers %d",
+                q, q->qname.c, DNSTypeName(q->qtype), q->LOAddressAnswers);
+        return mDNStrue;
+    }
+
+    // Before we go check the cache and ship this query on the wire, we have to be sure that there are
+    // no local records that could possibly answer this question. As we did not check the NewLocalRecords, we
+    // need to just peek at them to see whether it will answer this question. If it would answer, pretend
+    // that we answered. AnswerAllLocalQuestionsWithLocalAuthRecord will answer shortly. This happens normally
+    // when we add new /etc/hosts entries and restart the question. It is a new question and also a new record.
+    if (ag)
+    {
+        lr = ag->NewLocalOnlyRecords;
+        while (lr)
+        {
+            if (UniqueLocalOnlyRecord(lr) && LocalOnlyRecordAnswersQuestion(lr, q))
+            {
+                LogInfo("AnswerQuestionWithLORecord: Question %p %##s (%s) will be answered using new local auth records "
+                        " LOAddressAnswers %d", q, q->qname.c, DNSTypeName(q->qtype), q->LOAddressAnswers);
+                return mDNStrue;
+            }
+            lr = lr->next;
+        }
+    }
+    return mDNSfalse;
+}
+
+// Today, we suppress questions (not send them on the wire) for several reasons e.g.,
+// AAAA query is suppressed because no IPv6 capability or PID is not allowed to make
+// DNS requests. We need to temporarily suspend the suppress status so that we can
+// deliver a negative response (AnswerCurrentQuestionWithResourceRecord does not answer
+// suppressed questions) and reset it back. In the future, if there are other
+// reasons for suppressing the query, this function should be updated.
+mDNSlocal void AnswerSuppressedQuestion(mDNS *const m, DNSQuestion *q)
+{
+    mDNSBool SuppressQuery = q->SuppressQuery;
+    mDNSBool DisallowPID   = q->DisallowPID;
+
+    // make sure that QuerySuppressed() returns false
+    q->SuppressQuery = mDNSfalse;
+    q->DisallowPID   = mDNSfalse;
+
+    GenerateNegativeResponse(m, QC_suppressed);
+
+    q->SuppressQuery = SuppressQuery;
+    q->DisallowPID   = DisallowPID;
+}
+
+mDNSlocal void AnswerNewQuestion(mDNS *const m)
+{
+    mDNSBool ShouldQueryImmediately = mDNStrue;
+    DNSQuestion *const q = m->NewQuestions;     // Grab the question we're going to answer
+    mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    mDNSBool AnsweredFromCache = mDNSfalse;
+
+    verbosedebugf("AnswerNewQuestion: Answering %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+    if (cg) CheckCacheExpiration(m, slot, cg);
+    if (m->NewQuestions != q) { LogInfo("AnswerNewQuestion: Question deleted while doing CheckCacheExpiration"); goto exit; }
+    m->NewQuestions = q->next;
+    // Advance NewQuestions to the next *after* calling CheckCacheExpiration, because if we advance it first
+    // then CheckCacheExpiration may give this question add/remove callbacks, and it's not yet ready for that.
+    //
+    // Also, CheckCacheExpiration() calls CacheRecordDeferredAdd() and CacheRecordRmv(), which invoke
+    // client callbacks, which may delete their own or any other question. Our mechanism for detecting
+    // whether our current m->NewQuestions question got deleted by one of these callbacks is to store the
+    // value of m->NewQuestions in 'q' before calling CheckCacheExpiration(), and then verify afterwards
+    // that they're still the same. If m->NewQuestions has changed (because mDNS_StopQuery_internal
+    // advanced it), that means the question was deleted, so we no longer need to worry about answering
+    // it (and indeed 'q' is now a dangling pointer, so dereferencing it at all would be bad, and the
+    // values we computed for slot and cg are now stale and relate to a question that no longer exists).
+    //
+    // We can't use the usual m->CurrentQuestion mechanism for this because  CacheRecordDeferredAdd() and
+    // CacheRecordRmv() both use that themselves when walking the list of (non-new) questions generating callbacks.
+    // Fortunately mDNS_StopQuery_internal auto-advances both m->CurrentQuestion *AND* m->NewQuestions when
+    // deleting a question, so luckily we have an easy alternative way of detecting if our question got deleted.
+
+    if (m->lock_rrcache) LogMsg("AnswerNewQuestion ERROR! Cache already locked!");
+    // This should be safe, because calling the client's question callback may cause the
+    // question list to be modified, but should not ever cause the rrcache list to be modified.
+    // If the client's question callback deletes the question, then m->CurrentQuestion will
+    // be advanced, and we'll exit out of the loop
+    m->lock_rrcache = 1;
+    if (m->CurrentQuestion)
+        LogMsg("AnswerNewQuestion ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = q;     // Indicate which question we're answering, so we'll know if it gets deleted
+
+    if (q->NoAnswer == NoAnswer_Fail)
+    {
+        LogMsg("AnswerNewQuestion: NoAnswer_Fail %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        MakeNegativeCacheRecord(m, &m->rec.r, &q->qname, q->qnamehash, q->qtype, q->qclass, 60, mDNSInterface_Any, q->qDNSServer);
+        q->NoAnswer = NoAnswer_Normal;      // Temporarily turn off answer suppression
+        AnswerCurrentQuestionWithResourceRecord(m, &m->rec.r, QC_addnocache);
+        // Don't touch the question if it has been stopped already
+        if (m->CurrentQuestion == q) q->NoAnswer = NoAnswer_Fail;       // Restore NoAnswer state
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+
+    if (m->CurrentQuestion != q)
+    {
+        LogInfo("AnswerNewQuestion: Question deleted while generating NoAnswer_Fail response");
+        goto exit;
+    }
+
+    // See if we want to tell it about LocalOnly/P2P records. If we answered them using LocalOnly
+    // or P2P record, then we are done.
+    if (AnswerQuestionWithLORecord(m, q, mDNSfalse))
+        goto exit;
+
+    // If we are not supposed to answer this question, generate a negative response.
+    // Temporarily suspend the SuppressQuery so that AnswerCurrentQuestionWithResourceRecord can answer the question
+    //
+    // If it is a question trying to validate some response, it already checked the cache for a response. If it still
+    // reissues a question it means it could not find the RRSIGs. So, we need to bypass the cache check and send
+    // the question out.
+    if (QuerySuppressed(q))
+    {
+        AnswerSuppressedQuestion(m, q);
+    }
+    else if (!q->ValidatingResponse)
+    {
+        CacheRecord *rr;
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+            if (SameNameRecordAnswersQuestion(&rr->resrec, q))
+            {
+                // SecsSinceRcvd is whole number of elapsed seconds, rounded down
+                mDNSu32 SecsSinceRcvd = ((mDNSu32)(m->timenow - rr->TimeRcvd)) / mDNSPlatformOneSecond;
+                if (rr->resrec.rroriginalttl <= SecsSinceRcvd)
+                {
+                    LogMsg("AnswerNewQuestion: How is rr->resrec.rroriginalttl %lu <= SecsSinceRcvd %lu for %s %d %d",
+                           rr->resrec.rroriginalttl, SecsSinceRcvd, CRDisplayString(m, rr), m->timenow, rr->TimeRcvd);
+                    continue;   // Go to next one in loop
+                }
+
+                // If this record set is marked unique, then that means we can reasonably assume we have the whole set
+                // -- we don't need to rush out on the network and query immediately to see if there are more answers out there
+                if ((rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) || (q->ExpectUnique))
+                    ShouldQueryImmediately = mDNSfalse;
+                q->CurrentAnswers++;
+                if (rr->resrec.rdlength > SmallRecordLimit) q->LargeAnswers++;
+                if (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) q->UniqueAnswers++;
+                AnsweredFromCache = mDNStrue;
+                AnswerCurrentQuestionWithResourceRecord(m, rr, QC_add);
+                if (m->CurrentQuestion != q) break;     // If callback deleted q, then we're finished here
+            }
+            else if (RRTypeIsAddressType(rr->resrec.rrtype) && RRTypeIsAddressType(q->qtype))
+                ShouldQueryImmediately = mDNSfalse;
+    }
+    // We don't use LogInfo for this "Question deleted" message because it happens so routinely that
+    // it's not remotely remarkable, and therefore unlikely to be of much help tracking down bugs.
+    if (m->CurrentQuestion != q) { debugf("AnswerNewQuestion: Question deleted while giving cache answers"); goto exit; }
+
+    // Neither a local record nor a cache entry could answer this question. If this question need to be retried
+    // with search domains, generate a negative response which will now retry after appending search domains.
+    // If the query was suppressed above, we already generated a negative response. When it gets unsuppressed,
+    // we will retry with search domains.
+    if (!QuerySuppressed(q) && !AnsweredFromCache && q->RetryWithSearchDomains)
+    {
+        LogInfo("AnswerNewQuestion: Generating response for retrying with search domains %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        GenerateNegativeResponse(m, QC_forceresponse);
+    }
+
+    if (m->CurrentQuestion != q) { debugf("AnswerNewQuestion: Question deleted while giving negative answer"); goto exit; }
+
+    // Note: When a query gets suppressed or retried with search domains, we de-activate the question.
+    // Hence we don't execute the following block of code for those cases.
+    if (ShouldQueryImmediately && ActiveQuestion(q))
+    {
+        debugf("AnswerNewQuestion: ShouldQueryImmediately %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        q->ThisQInterval  = InitialQuestionInterval;
+        q->LastQTime      = m->timenow - q->ThisQInterval;
+        if (mDNSOpaque16IsZero(q->TargetQID))       // For mDNS, spread packets to avoid a burst of simultaneous queries
+        {
+            // Compute random delay in the range 1-6 seconds, then divide by 50 to get 20-120ms
+            if (!m->RandomQueryDelay)
+                m->RandomQueryDelay = (mDNSPlatformOneSecond + mDNSRandom(mDNSPlatformOneSecond*5) - 1) / 50 + 1;
+            q->LastQTime += m->RandomQueryDelay;
+        }
+    }
+
+    // IN ALL CASES make sure that m->NextScheduledQuery is set appropriately.
+    // In cases where m->NewQuestions->DelayAnswering is set, we may have delayed generating our
+    // answers for this question until *after* its scheduled transmission time, in which case
+    // m->NextScheduledQuery may now be set to 'never', and in that case -- even though we're *not* doing
+    // ShouldQueryImmediately -- we still need to make sure we set m->NextScheduledQuery correctly.
+    SetNextQueryTime(m,q);
+
+exit:
+    m->CurrentQuestion = mDNSNULL;
+    m->lock_rrcache = 0;
+}
+
+// When a NewLocalOnlyQuestion is created, AnswerNewLocalOnlyQuestion runs though our ResourceRecords delivering any
+// appropriate answers, stopping if it reaches a NewLocalOnlyRecord -- these will be handled by AnswerAllLocalQuestionsWithLocalAuthRecord
+mDNSlocal void AnswerNewLocalOnlyQuestion(mDNS *const m)
+{
+    mDNSu32 slot;
+    AuthGroup *ag;
+    DNSQuestion *q = m->NewLocalOnlyQuestions;      // Grab the question we're going to answer
+    m->NewLocalOnlyQuestions = q->next;             // Advance NewLocalOnlyQuestions to the next (if any)
+
+    debugf("AnswerNewLocalOnlyQuestion: Answering %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+    if (m->CurrentQuestion)
+        LogMsg("AnswerNewLocalOnlyQuestion ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = q;     // Indicate which question we're answering, so we'll know if it gets deleted
+
+    if (m->CurrentRecord)
+        LogMsg("AnswerNewLocalOnlyQuestion ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+
+    // 1. First walk the LocalOnly records answering the LocalOnly question
+    // 2. As LocalOnly questions should also be answered by any other Auth records local to the machine,
+    //    walk the ResourceRecords list delivering the answers
+    slot = AuthHashSlot(&q->qname);
+    ag = AuthGroupForName(&m->rrauth, slot, q->qnamehash, &q->qname);
+    if (ag)
+    {
+        m->CurrentRecord = ag->members;
+        while (m->CurrentRecord && m->CurrentRecord != ag->NewLocalOnlyRecords)
+        {
+            AuthRecord *rr = m->CurrentRecord;
+            m->CurrentRecord = rr->next;
+            if (LocalOnlyRecordAnswersQuestion(rr, q))
+            {
+                AnswerLocalQuestionWithLocalAuthRecord(m, rr, mDNStrue);
+                if (m->CurrentQuestion != q) break;     // If callback deleted q, then we're finished here
+            }
+        }
+    }
+
+    if (m->CurrentQuestion == q)
+    {
+        m->CurrentRecord = m->ResourceRecords;
+
+        while (m->CurrentRecord && m->CurrentRecord != m->NewLocalRecords)
+        {
+            AuthRecord *rr = m->CurrentRecord;
+            m->CurrentRecord = rr->next;
+            if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+            {
+                AnswerLocalQuestionWithLocalAuthRecord(m, rr, mDNStrue);
+                if (m->CurrentQuestion != q) break;     // If callback deleted q, then we're finished here
+            }
+        }
+    }
+
+    m->CurrentQuestion = mDNSNULL;
+    m->CurrentRecord   = mDNSNULL;
+}
+
+mDNSlocal CacheEntity *GetCacheEntity(mDNS *const m, const CacheGroup *const PreserveCG)
+{
+    CacheEntity *e = mDNSNULL;
+
+    if (m->lock_rrcache) { LogMsg("GetFreeCacheRR ERROR! Cache already locked!"); return(mDNSNULL); }
+    m->lock_rrcache = 1;
+
+    // If we have no free records, ask the client layer to give us some more memory
+    if (!m->rrcache_free && m->MainCallback)
+    {
+        if (m->rrcache_totalused != m->rrcache_size)
+            LogMsg("GetFreeCacheRR: count mismatch: m->rrcache_totalused %lu != m->rrcache_size %lu",
+                   m->rrcache_totalused, m->rrcache_size);
+
+        // We don't want to be vulnerable to a malicious attacker flooding us with an infinite
+        // number of bogus records so that we keep growing our cache until the machine runs out of memory.
+        // To guard against this, if our cache grows above 512kB (approx 3168 records at 164 bytes each),
+        // and we're actively using less than 1/32 of that cache, then we purge all the unused records
+        // and recycle them, instead of allocating more memory.
+        if (m->rrcache_size > 5000 && m->rrcache_size / 32 > m->rrcache_active)
+            LogInfo("Possible denial-of-service attack in progress: m->rrcache_size %lu; m->rrcache_active %lu",
+                    m->rrcache_size, m->rrcache_active);
+        else
+        {
+            mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+            m->MainCallback(m, mStatus_GrowCache);
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        }
+    }
+
+    // If we still have no free records, recycle all the records we can.
+    // Enumerating the entire cache is moderately expensive, so when we do it, we reclaim all the records we can in one pass.
+    if (!m->rrcache_free)
+    {
+        mDNSu32 oldtotalused = m->rrcache_totalused;
+        mDNSu32 slot;
+        for (slot = 0; slot < CACHE_HASH_SLOTS; slot++)
+        {
+            CacheGroup **cp = &m->rrcache_hash[slot];
+            while (*cp)
+            {
+                CacheRecord **rp = &(*cp)->members;
+                while (*rp)
+                {
+                    // Records that answer still-active questions are not candidates for recycling
+                    // Records that are currently linked into the CacheFlushRecords list may not be recycled, or we'll crash
+                    if ((*rp)->CRActiveQuestion || (*rp)->NextInCFList)
+                        rp=&(*rp)->next;
+                    else
+                    {
+                        CacheRecord *rr = *rp;
+                        *rp = (*rp)->next;          // Cut record from list
+                        ReleaseCacheRecord(m, rr);
+                    }
+                }
+                if ((*cp)->rrcache_tail != rp)
+                    verbosedebugf("GetFreeCacheRR: Updating rrcache_tail[%lu] from %p to %p", slot, (*cp)->rrcache_tail, rp);
+                (*cp)->rrcache_tail = rp;
+                if ((*cp)->members || (*cp)==PreserveCG) cp=&(*cp)->next;
+                else ReleaseCacheGroup(m, cp);
+            }
+        }
+        LogInfo("GetCacheEntity recycled %d records to reduce cache from %d to %d",
+                oldtotalused - m->rrcache_totalused, oldtotalused, m->rrcache_totalused);
+    }
+
+    if (m->rrcache_free)    // If there are records in the free list, take one
+    {
+        e = m->rrcache_free;
+        m->rrcache_free = e->next;
+        if (++m->rrcache_totalused >= m->rrcache_report)
+        {
+            LogInfo("RR Cache now using %ld objects", m->rrcache_totalused);
+            if      (m->rrcache_report <  100) m->rrcache_report += 10;
+            else if (m->rrcache_report < 1000) m->rrcache_report += 100;
+            else m->rrcache_report += 1000;
+        }
+        mDNSPlatformMemZero(e, sizeof(*e));
+    }
+
+    m->lock_rrcache = 0;
+
+    return(e);
+}
+
+mDNSlocal CacheRecord *GetCacheRecord(mDNS *const m, CacheGroup *cg, mDNSu16 RDLength)
+{
+    CacheRecord *r = (CacheRecord *)GetCacheEntity(m, cg);
+    if (r)
+    {
+        r->resrec.rdata = (RData*)&r->smallrdatastorage;    // By default, assume we're usually going to be using local storage
+        if (RDLength > InlineCacheRDSize)           // If RDLength is too big, allocate extra storage
+        {
+            r->resrec.rdata = (RData*)mDNSPlatformMemAllocate(sizeofRDataHeader + RDLength);
+            if (r->resrec.rdata) r->resrec.rdata->MaxRDLength = r->resrec.rdlength = RDLength;
+            else { ReleaseCacheEntity(m, (CacheEntity*)r); r = mDNSNULL; }
+        }
+    }
+    return(r);
+}
+
+mDNSlocal CacheGroup *GetCacheGroup(mDNS *const m, const mDNSu32 slot, const ResourceRecord *const rr)
+{
+    mDNSu16 namelen = DomainNameLength(rr->name);
+    CacheGroup *cg = (CacheGroup*)GetCacheEntity(m, mDNSNULL);
+    if (!cg) { LogMsg("GetCacheGroup: Failed to allocate memory for %##s", rr->name->c); return(mDNSNULL); }
+    cg->next         = m->rrcache_hash[slot];
+    cg->namehash     = rr->namehash;
+    cg->members      = mDNSNULL;
+    cg->rrcache_tail = &cg->members;
+    if (namelen > sizeof(cg->namestorage)) 
+        cg->name = mDNSPlatformMemAllocate(namelen);
+    else
+        cg->name = (domainname*)cg->namestorage;
+    if (!cg->name)
+    {
+        LogMsg("GetCacheGroup: Failed to allocate name storage for %##s", rr->name->c);
+        ReleaseCacheEntity(m, (CacheEntity*)cg);
+        return(mDNSNULL);
+    }
+    AssignDomainName(cg->name, rr->name);
+
+    if (CacheGroupForRecord(m, slot, rr)) LogMsg("GetCacheGroup: Already have CacheGroup for %##s", rr->name->c);
+    m->rrcache_hash[slot] = cg;
+    if (CacheGroupForRecord(m, slot, rr) != cg) LogMsg("GetCacheGroup: Not finding CacheGroup for %##s", rr->name->c);
+
+    return(cg);
+}
+
+mDNSexport void mDNS_PurgeCacheResourceRecord(mDNS *const m, CacheRecord *rr)
+{
+    mDNS_CheckLock(m);
+
+    // Make sure we mark this record as thoroughly expired -- we don't ever want to give
+    // a positive answer using an expired record (e.g. from an interface that has gone away).
+    // We don't want to clear CRActiveQuestion here, because that would leave the record subject to
+    // summary deletion without giving the proper callback to any questions that are monitoring it.
+    // By setting UnansweredQueries to MaxUnansweredQueries we ensure it won't trigger any further expiration queries.
+    rr->TimeRcvd          = m->timenow - mDNSPlatformOneSecond * 60;
+    rr->UnansweredQueries = MaxUnansweredQueries;
+    rr->resrec.rroriginalttl     = 0;
+    SetNextCacheCheckTimeForRecord(m, rr);
+}
+
+mDNSexport mDNSs32 mDNS_TimeNow(const mDNS *const m)
+{
+    mDNSs32 time;
+    mDNSPlatformLock(m);
+    if (m->mDNS_busy)
+    {
+        LogMsg("mDNS_TimeNow called while holding mDNS lock. This is incorrect. Code protected by lock should just use m->timenow.");
+        if (!m->timenow) LogMsg("mDNS_TimeNow: m->mDNS_busy is %ld but m->timenow not set", m->mDNS_busy);
+    }
+
+    if (m->timenow) time = m->timenow;
+    else time = mDNS_TimeNow_NoLock(m);
+    mDNSPlatformUnlock(m);
+    return(time);
+}
+
+// To avoid pointless CPU thrash, we use SetSPSProxyListChanged(X) to record the last interface that
+// had its Sleep Proxy client list change, and defer to actual BPF reconfiguration to mDNS_Execute().
+// (GetNextScheduledEvent() returns "now" when m->SPSProxyListChanged is set)
+#define SetSPSProxyListChanged(X) do { \
+        if (m->SPSProxyListChanged && m->SPSProxyListChanged != (X)) mDNSPlatformUpdateProxyList(m, m->SPSProxyListChanged);                                                                                                                          \
+        m->SPSProxyListChanged = (X); } while(0)
+
+// Called from mDNS_Execute() to expire stale proxy records
+mDNSlocal void CheckProxyRecords(mDNS *const m, AuthRecord *list)
+{
+    m->CurrentRecord = list;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rr = m->CurrentRecord;
+        if (rr->resrec.RecordType != kDNSRecordTypeDeregistering && rr->WakeUp.HMAC.l[0])
+        {
+            // If m->SPSSocket is NULL that means we're not acting as a sleep proxy any more,
+            // so we need to cease proxying for *all* records we may have, expired or not.
+            if (m->SPSSocket && m->timenow - rr->TimeExpire < 0)    // If proxy record not expired yet, update m->NextScheduledSPS
+            {
+                if (m->NextScheduledSPS - rr->TimeExpire > 0)
+                    m->NextScheduledSPS = rr->TimeExpire;
+            }
+            else                                                    // else proxy record expired, so remove it
+            {
+                LogSPS("CheckProxyRecords: Removing %d H-MAC %.6a I-MAC %.6a %d %s",
+                       m->ProxyRecords, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, rr->WakeUp.seq, ARDisplayString(m, rr));
+                SetSPSProxyListChanged(rr->resrec.InterfaceID);
+                mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+                // Don't touch rr after this -- memory may have been free'd
+            }
+        }
+        // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+        // new records could have been added to the end of the list as a result of that call.
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+mDNSlocal void CheckRmvEventsForLocalRecords(mDNS *const m)
+{
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rr = m->CurrentRecord;
+        if (rr->AnsweredLocalQ && rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+        {
+            debugf("CheckRmvEventsForLocalRecords: Generating local RMV events for %s", ARDisplayString(m, rr));
+            rr->resrec.RecordType = kDNSRecordTypeShared;
+            AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNSfalse);
+            if (m->CurrentRecord == rr) // If rr still exists in list, restore its state now
+            {
+                rr->resrec.RecordType = kDNSRecordTypeDeregistering;
+                rr->AnsweredLocalQ = mDNSfalse;
+                // SendResponses normally calls CompleteDeregistration after sending goodbyes.
+                // For LocalOnly records, we don't do that and hence we need to do that here.
+                if (RRLocalOnly(rr)) CompleteDeregistration(m, rr);
+            }
+        }
+        if (m->CurrentRecord == rr)     // If m->CurrentRecord was not auto-advanced, do it ourselves now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+mDNSlocal void TimeoutQuestions(mDNS *const m)
+{
+    m->NextScheduledStopTime = m->timenow + 0x3FFFFFFF;
+    if (m->CurrentQuestion)
+        LogMsg("TimeoutQuestions ERROR m->CurrentQuestion already set: %##s (%s)", m->CurrentQuestion->qname.c,
+               DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion)
+    {
+        DNSQuestion *const q = m->CurrentQuestion;
+        if (q->StopTime)
+        {
+            if (!q->TimeoutQuestion)
+                LogMsg("TimeoutQuestions: ERROR!! TimeoutQuestion not set, but StopTime set for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+            if (m->timenow - q->StopTime >= 0)
+            {
+                LogInfo("TimeoutQuestions: question %p %##s timed out, time %d", q, q->qname.c, m->timenow - q->StopTime);
+                GenerateNegativeResponse(m, QC_forceresponse);
+                if (m->CurrentQuestion == q) q->StopTime = 0;
+            }
+            else
+            {
+                if (m->NextScheduledStopTime - q->StopTime > 0)
+                    m->NextScheduledStopTime = q->StopTime;
+            }
+        }
+        // If m->CurrentQuestion wasn't modified out from under us, advance it now
+        // We can't do this at the start of the loop because GenerateNegativeResponse
+        // depends on having m->CurrentQuestion point to the right question
+        if (m->CurrentQuestion == q)
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+mDNSlocal void mDNSCoreFreeProxyRR(mDNS *const m)
+{
+    AuthRecord *rrPtr = m->SPSRRSet, *rrNext = mDNSNULL;
+    LogSPS("%s : Freeing stored sleep proxy A/AAAA records", __func__);
+    while (rrPtr)
+    {
+        rrNext = rrPtr->next;
+        mDNSPlatformMemFree(rrPtr);
+        rrPtr  = rrNext;
+    }
+    m->SPSRRSet = mDNSNULL;
+}
+
+mDNSexport mDNSs32 mDNS_Execute(mDNS *const m)
+{
+    mDNS_Lock(m);   // Must grab lock before trying to read m->timenow
+
+#if APPLE_OSX_mDNSResponder
+    mDNSLogStatistics(m);
+#endif // APPLE_OSX_mDNSResponder
+
+    if (m->timenow - m->NextScheduledEvent >= 0)
+    {
+        int i;
+        AuthRecord *head, *tail;
+        mDNSu32 slot;
+        AuthGroup *ag;
+
+        verbosedebugf("mDNS_Execute");
+
+        if (m->CurrentQuestion)
+            LogMsg("mDNS_Execute: ERROR m->CurrentQuestion already set: %##s (%s)",
+                   m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+
+        if (m->CurrentRecord)
+            LogMsg("mDNS_Execute: ERROR m->CurrentRecord already set: %s", ARDisplayString(m, m->CurrentRecord));
+
+        // 1. If we're past the probe suppression time, we can clear it
+        if (m->SuppressProbes && m->timenow - m->SuppressProbes >= 0) m->SuppressProbes = 0;
+
+        // 2. If it's been more than ten seconds since the last probe failure, we can clear the counter
+        if (m->NumFailedProbes && m->timenow - m->ProbeFailTime >= mDNSPlatformOneSecond * 10) m->NumFailedProbes = 0;
+
+        // 3. Purge our cache of stale old records
+        if (m->rrcache_size && m->timenow - m->NextCacheCheck >= 0)
+        {
+            mDNSu32 numchecked = 0;
+            m->NextCacheCheck = m->timenow + 0x3FFFFFFF;
+            for (slot = 0; slot < CACHE_HASH_SLOTS; slot++)
+            {
+                if (m->timenow - m->rrcache_nextcheck[slot] >= 0)
+                {
+                    CacheGroup **cp = &m->rrcache_hash[slot];
+                    m->rrcache_nextcheck[slot] = m->timenow + 0x3FFFFFFF;
+                    while (*cp)
+                    {
+                        debugf("m->NextCacheCheck %4d Slot %3d %##s", numchecked, slot, *cp ? (*cp)->name : (domainname*)"\x04NULL");
+                        numchecked++;
+                        CheckCacheExpiration(m, slot, *cp);
+                        if ((*cp)->members) cp=&(*cp)->next;
+                        else ReleaseCacheGroup(m, cp);
+                    }
+                }
+                // Even if we didn't need to actually check this slot yet, still need to
+                // factor its nextcheck time into our overall NextCacheCheck value
+                if (m->NextCacheCheck - m->rrcache_nextcheck[slot] > 0)
+                    m->NextCacheCheck = m->rrcache_nextcheck[slot];
+            }
+            debugf("m->NextCacheCheck %4d checked, next in %d", numchecked, m->NextCacheCheck - m->timenow);
+        }
+
+        if (m->timenow - m->NextScheduledSPS >= 0)
+        {
+            m->NextScheduledSPS = m->timenow + 0x3FFFFFFF;
+            CheckProxyRecords(m, m->DuplicateRecords);  // Clear m->DuplicateRecords first, then m->ResourceRecords
+            CheckProxyRecords(m, m->ResourceRecords);
+        }
+
+        SetSPSProxyListChanged(mDNSNULL);       // Perform any deferred BPF reconfiguration now
+
+        // Check to see if we need to send any keepalives. Do this after we called CheckProxyRecords above
+        // as records could have expired during that check
+        if (m->timenow - m->NextScheduledKA >= 0)
+        {
+            m->NextScheduledKA = m->timenow + 0x3FFFFFFF;
+            mDNS_SendKeepalives(m);
+        }
+
+        // Clear AnnounceOwner if necessary. (Do this *before* SendQueries() and SendResponses().)
+        if (m->AnnounceOwner && m->timenow - m->AnnounceOwner >= 0)
+        {
+            m->AnnounceOwner = 0;
+        }
+
+        if (m->DelaySleep && m->timenow - m->DelaySleep >= 0)
+        {
+            m->DelaySleep = 0;
+            if (m->SleepState == SleepState_Transferring)
+            {
+                LogSPS("Re-sleep delay passed; now checking for Sleep Proxy Servers");
+                BeginSleepProcessing(m);
+            }
+        }
+
+        // 4. See if we can answer any of our new local questions from the cache
+        for (i=0; m->NewQuestions && i<1000; i++)
+        {
+            if (m->NewQuestions->DelayAnswering && m->timenow - m->NewQuestions->DelayAnswering < 0) break;
+            AnswerNewQuestion(m);
+        }
+        if (i >= 1000) LogMsg("mDNS_Execute: AnswerNewQuestion exceeded loop limit");
+
+        // Make sure we deliver *all* local RMV events, and clear the corresponding rr->AnsweredLocalQ flags, *before*
+        // we begin generating *any* new ADD events in the m->NewLocalOnlyQuestions and m->NewLocalRecords loops below.
+        for (i=0; i<1000 && m->LocalRemoveEvents; i++)
+        {
+            m->LocalRemoveEvents = mDNSfalse;
+            m->CurrentRecord = m->ResourceRecords;
+            CheckRmvEventsForLocalRecords(m);
+            // Walk the LocalOnly records and deliver the RMV events
+            for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+                for (ag = m->rrauth.rrauth_hash[slot]; ag; ag = ag->next)
+                {
+                    m->CurrentRecord = ag->members;
+                    if (m->CurrentRecord) CheckRmvEventsForLocalRecords(m);
+                }
+        }
+
+        if (i >= 1000) LogMsg("mDNS_Execute: m->LocalRemoveEvents exceeded loop limit");
+
+        for (i=0; m->NewLocalOnlyQuestions && i<1000; i++) AnswerNewLocalOnlyQuestion(m);
+        if (i >= 1000) LogMsg("mDNS_Execute: AnswerNewLocalOnlyQuestion exceeded loop limit");
+
+        head = tail = mDNSNULL;
+        for (i=0; i<1000 && m->NewLocalRecords && m->NewLocalRecords != head; i++)
+        {
+            AuthRecord *rr = m->NewLocalRecords;
+            m->NewLocalRecords = m->NewLocalRecords->next;
+            if (LocalRecordReady(rr))
+            {
+                debugf("mDNS_Execute: Delivering Add event with LocalAuthRecord %s", ARDisplayString(m, rr));
+                AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNStrue);
+            }
+            else if (!rr->next)
+            {
+                // If we have just one record that is not ready, we don't have to unlink and
+                // reinsert. As the NewLocalRecords will be NULL for this case, the loop will
+                // terminate and set the NewLocalRecords to rr.
+                debugf("mDNS_Execute: Just one LocalAuthRecord %s, breaking out of the loop early", ARDisplayString(m, rr));
+                if (head != mDNSNULL || m->NewLocalRecords != mDNSNULL)
+                    LogMsg("mDNS_Execute: ERROR!!: head %p, NewLocalRecords %p", head, m->NewLocalRecords);
+
+                head = rr;
+            }
+            else
+            {
+                AuthRecord **p = &m->ResourceRecords;   // Find this record in our list of active records
+                debugf("mDNS_Execute: Skipping LocalAuthRecord %s", ARDisplayString(m, rr));
+                // if this is the first record we are skipping, move to the end of the list.
+                // if we have already skipped records before, append it at the end.
+                while (*p && *p != rr) p=&(*p)->next;
+                if (*p) *p = rr->next;                  // Cut this record from the list
+                else { LogMsg("mDNS_Execute: ERROR!! Cannot find record %s in ResourceRecords list", ARDisplayString(m, rr)); break; }
+                if (!head)
+                {
+                    while (*p) p=&(*p)->next;
+                    *p = rr;
+                    head = tail = rr;
+                }
+                else
+                {
+                    tail->next = rr;
+                    tail = rr;
+                }
+                rr->next = mDNSNULL;
+            }
+        }
+        m->NewLocalRecords = head;
+        debugf("mDNS_Execute: Setting NewLocalRecords to %s", (head ? ARDisplayString(m, head) : "NULL"));
+
+        if (i >= 1000) LogMsg("mDNS_Execute: m->NewLocalRecords exceeded loop limit");
+
+        // Check to see if we have any new LocalOnly/P2P records to examine for delivering
+        // to our local questions
+        if (m->NewLocalOnlyRecords)
+        {
+            m->NewLocalOnlyRecords = mDNSfalse;
+            for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+                for (ag = m->rrauth.rrauth_hash[slot]; ag; ag = ag->next)
+                {
+                    for (i=0; i<100 && ag->NewLocalOnlyRecords; i++)
+                    {
+                        AuthRecord *rr = ag->NewLocalOnlyRecords;
+                        ag->NewLocalOnlyRecords = ag->NewLocalOnlyRecords->next;
+                        // LocalOnly records should always be ready as they never probe
+                        if (LocalRecordReady(rr))
+                        {
+                            debugf("mDNS_Execute: Delivering Add event with LocalAuthRecord %s", ARDisplayString(m, rr));
+                            AnswerAllLocalQuestionsWithLocalAuthRecord(m, rr, mDNStrue);
+                        }
+                        else LogMsg("mDNS_Execute: LocalOnlyRecord %s not ready", ARDisplayString(m, rr));
+                    }
+                    // We limit about 100 per AuthGroup that can be serviced at a time
+                    if (i >= 100) LogMsg("mDNS_Execute: ag->NewLocalOnlyRecords exceeded loop limit");
+                }
+        }
+
+        // 5. See what packets we need to send
+        if (m->mDNSPlatformStatus != mStatus_NoError || (m->SleepState == SleepState_Sleeping))
+            DiscardDeregistrations(m);
+        if (m->mDNSPlatformStatus == mStatus_NoError && (m->SuppressSending == 0 || m->timenow - m->SuppressSending >= 0))
+        {
+            // If the platform code is ready, and we're not suppressing packet generation right now
+            // then send our responses, probes, and questions.
+            // We check the cache first, because there might be records close to expiring that trigger questions to refresh them.
+            // We send queries next, because there might be final-stage probes that complete their probing here, causing
+            // them to advance to announcing state, and we want those to be included in any announcements we send out.
+            // Finally, we send responses, including the previously mentioned records that just completed probing.
+            m->SuppressSending = 0;
+
+            // 6. Send Query packets. This may cause some probing records to advance to announcing state
+            if (m->timenow - m->NextScheduledQuery >= 0 || m->timenow - m->NextScheduledProbe >= 0) SendQueries(m);
+            if (m->timenow - m->NextScheduledQuery >= 0)
+            {
+                DNSQuestion *q;
+                LogMsg("mDNS_Execute: SendQueries didn't send all its queries (%d - %d = %d) will try again in one second",
+                       m->timenow, m->NextScheduledQuery, m->timenow - m->NextScheduledQuery);
+                m->NextScheduledQuery = m->timenow + mDNSPlatformOneSecond;
+                for (q = m->Questions; q && q != m->NewQuestions; q=q->next)
+                    if (ActiveQuestion(q) && m->timenow - NextQSendTime(q) >= 0)
+                        LogMsg("mDNS_Execute: SendQueries didn't send %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+            }
+            if (m->timenow - m->NextScheduledProbe >= 0)
+            {
+                LogMsg("mDNS_Execute: SendQueries didn't send all its probes (%d - %d = %d) will try again in one second",
+                       m->timenow, m->NextScheduledProbe, m->timenow - m->NextScheduledProbe);
+                m->NextScheduledProbe = m->timenow + mDNSPlatformOneSecond;
+            }
+
+            // 7. Send Response packets, including probing records just advanced to announcing state
+            if (m->timenow - m->NextScheduledResponse >= 0) SendResponses(m);
+            if (m->timenow - m->NextScheduledResponse >= 0)
+            {
+                LogMsg("mDNS_Execute: SendResponses didn't send all its responses; will try again in one second");
+                m->NextScheduledResponse = m->timenow + mDNSPlatformOneSecond;
+            }
+        }
+
+        // Clear RandomDelay values, ready to pick a new different value next time
+        m->RandomQueryDelay     = 0;
+        m->RandomReconfirmDelay = 0;
+
+        if (m->NextScheduledStopTime && m->timenow - m->NextScheduledStopTime >= 0) TimeoutQuestions(m);
+#ifndef UNICAST_DISABLED
+        if (m->NextSRVUpdate && m->timenow - m->NextSRVUpdate >= 0) UpdateAllSRVRecords(m);
+        if (m->timenow - m->NextScheduledNATOp >= 0) CheckNATMappings(m);
+        if (m->timenow - m->NextuDNSEvent >= 0) uDNS_Tasks(m);
+#endif
+    }
+
+    // Note about multi-threaded systems:
+    // On a multi-threaded system, some other thread could run right after the mDNS_Unlock(),
+    // performing mDNS API operations that change our next scheduled event time.
+    //
+    // On multi-threaded systems (like the current Windows implementation) that have a single main thread
+    // calling mDNS_Execute() (and other threads allowed to call mDNS API routines) it is the responsibility
+    // of the mDNSPlatformUnlock() routine to signal some kind of stateful condition variable that will
+    // signal whatever blocking primitive the main thread is using, so that it will wake up and execute one
+    // more iteration of its loop, and immediately call mDNS_Execute() again. The signal has to be stateful
+    // in the sense that if the main thread has not yet entered its blocking primitive, then as soon as it
+    // does, the state of the signal will be noticed, causing the blocking primitive to return immediately
+    // without blocking. This avoids the race condition between the signal from the other thread arriving
+    // just *before* or just *after* the main thread enters the blocking primitive.
+    //
+    // On multi-threaded systems (like the current Mac OS 9 implementation) that are entirely timer-driven,
+    // with no main mDNS_Execute() thread, it is the responsibility of the mDNSPlatformUnlock() routine to
+    // set the timer according to the m->NextScheduledEvent value, and then when the timer fires, the timer
+    // callback function should call mDNS_Execute() (and ignore the return value, which may already be stale
+    // by the time it gets to the timer callback function).
+
+    mDNS_Unlock(m);     // Calling mDNS_Unlock is what gives m->NextScheduledEvent its new value
+    return(m->NextScheduledEvent);
+}
+
+#ifndef UNICAST_DISABLED
+mDNSlocal void SuspendLLQs(mDNS *m)
+{
+    DNSQuestion *q;
+    for (q = m->Questions; q; q = q->next)
+        if (ActiveQuestion(q) && !mDNSOpaque16IsZero(q->TargetQID) && q->LongLived && q->state == LLQ_Established)
+        { q->ReqLease = 0; sendLLQRefresh(m, q); }
+}
+#endif // UNICAST_DISABLED
+
+mDNSlocal mDNSBool QuestionHasLocalAnswers(mDNS *const m, DNSQuestion *q)
+{
+    AuthRecord *rr;
+    mDNSu32 slot;
+    AuthGroup *ag;
+
+    slot = AuthHashSlot(&q->qname);
+    ag = AuthGroupForName(&m->rrauth, slot, q->qnamehash, &q->qname);
+    if (ag)
+    {
+        for (rr = ag->members; rr; rr=rr->next)
+            // Filter the /etc/hosts records - LocalOnly, Unique, A/AAAA/CNAME
+            if (UniqueLocalOnlyRecord(rr) && LocalOnlyRecordAnswersQuestion(rr, q))
+            {
+                LogInfo("QuestionHasLocalAnswers: Question %p %##s (%s) has local answer %s", q, q->qname.c, DNSTypeName(q->qtype), ARDisplayString(m, rr));
+                return mDNStrue;
+            }
+    }
+    return mDNSfalse;
+}
+
+// ActivateUnicastQuery() is called from three places:
+// 1. When a new question is created
+// 2. On wake from sleep
+// 3. When the DNS configuration changes
+// In case 1 we don't want to mess with our established ThisQInterval and LastQTime (ScheduleImmediately is false)
+// In cases 2 and 3 we do want to cause the question to be resent immediately (ScheduleImmediately is true)
+mDNSlocal void ActivateUnicastQuery(mDNS *const m, DNSQuestion *const question, mDNSBool ScheduleImmediately)
+{
+    // For now this AutoTunnel stuff is specific to Mac OS X.
+    // In the future, if there's demand, we may see if we can abstract it out cleanly into the platform layer
+#if APPLE_OSX_mDNSResponder
+    // Even though BTMM client tunnels are only useful for AAAA queries, we need to treat v4 and v6 queries equally.
+    // Otherwise we can get the situation where the A query completes really fast (with an NXDOMAIN result) and the
+    // caller then gives up waiting for the AAAA result while we're still in the process of setting up the tunnel.
+    // To level the playing field, we block both A and AAAA queries while tunnel setup is in progress, and then
+    // returns results for both at the same time. If we are looking for the _autotunnel6 record, then skip this logic
+    // as this would trigger looking up _autotunnel6._autotunnel6 and end up failing the original query.
+
+    if (RRTypeIsAddressType(question->qtype) && PrivateQuery(question) &&
+        !SameDomainLabel(question->qname.c, (const mDNSu8 *)"\x0c_autotunnel6")&& question->QuestionCallback != AutoTunnelCallback)
+    {
+        question->NoAnswer = NoAnswer_Suspended;
+        AddNewClientTunnel(m, question);
+        return;
+    }
+#endif // APPLE_OSX_mDNSResponder
+
+    if (!question->DuplicateOf)
+    {
+        debugf("ActivateUnicastQuery: %##s %s%s%s",
+               question->qname.c, DNSTypeName(question->qtype), PrivateQuery(question) ? " (Private)" : "", ScheduleImmediately ? " ScheduleImmediately" : "");
+        question->CNAMEReferrals = 0;
+        if (question->nta) { CancelGetZoneData(m, question->nta); question->nta = mDNSNULL; }
+        if (question->LongLived)
+        {
+            question->state = LLQ_InitialRequest;
+            question->id = zeroOpaque64;
+            question->servPort = zeroIPPort;
+            if (question->tcp) { DisposeTCPConn(question->tcp); question->tcp = mDNSNULL; }
+        }
+        // If the question has local answers, then we don't want answers from outside
+        if (ScheduleImmediately && !QuestionHasLocalAnswers(m, question))
+        {
+            question->ThisQInterval = InitialQuestionInterval;
+            question->LastQTime     = m->timenow - question->ThisQInterval;
+            SetNextQueryTime(m, question);
+        }
+    }
+}
+
+// Caller should hold the lock
+mDNSexport void mDNSCoreRestartAddressQueries(mDNS *const m, mDNSBool SearchDomainsChanged, FlushCache flushCacheRecords,
+                                              CallbackBeforeStartQuery BeforeStartCallback, void *context)
+{
+    DNSQuestion *q;
+    DNSQuestion *restart = mDNSNULL;
+
+    mDNS_CheckLock(m);
+
+    // 1. Flush the cache records
+    if (flushCacheRecords) flushCacheRecords(m);
+
+    // 2. Even though we may have purged the cache records above, before it can generate RMV event
+    // we are going to stop the question. Hence we need to deliver the RMV event before we
+    // stop the question.
+    //
+    // CurrentQuestion is used by RmvEventsForQuestion below. While delivering RMV events, the
+    // application callback can potentially stop the current question (detected by CurrentQuestion) or
+    // *any* other question which could be the next one that we may process here. RestartQuestion
+    // points to the "next" question which will be automatically advanced in mDNS_StopQuery_internal
+    // if the "next" question is stopped while the CurrentQuestion is stopped
+
+    if (m->RestartQuestion)
+        LogMsg("mDNSCoreRestartAddressQueries: ERROR!! m->RestartQuestion already set: %##s (%s)",
+               m->RestartQuestion->qname.c, DNSTypeName(m->RestartQuestion->qtype));
+
+    m->RestartQuestion = m->Questions;
+    while (m->RestartQuestion)
+    {
+        q = m->RestartQuestion;
+        m->RestartQuestion = q->next;
+        // GetZoneData questions are referenced by other questions (original query that started the GetZoneData
+        // question)  through their "nta" pointer. Normally when the original query stops, it stops the
+        // GetZoneData question and also frees the memory (See CancelGetZoneData). If we stop the GetZoneData
+        // question followed by the original query that refers to this GetZoneData question, we will end up
+        // freeing the GetZoneData question and then start the "freed" question at the end.
+
+        if (IsGetZoneDataQuestion(q))
+        {
+            DNSQuestion *refq = q->next;
+            LogInfo("mDNSCoreRestartAddressQueries: Skipping GetZoneDataQuestion %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+            // debug stuff, we just try to find the referencing question and don't do much with it
+            while (refq)
+            {
+                if (q == &refq->nta->question)
+                {
+                    LogInfo("mDNSCoreRestartAddressQueries: Question %p %##s (%s) referring to GetZoneDataQuestion %p, not stopping", refq, refq->qname.c, DNSTypeName(refq->qtype), q);
+                }
+                refq = refq->next;
+            }
+            continue;
+        }
+
+        // This function is called when /etc/hosts changes and that could affect A, AAAA and CNAME queries
+        if (q->qtype != kDNSType_A && q->qtype != kDNSType_AAAA && q->qtype != kDNSType_CNAME) continue;
+
+        // If the search domains did not change, then we restart all the queries. Otherwise, only
+        // for queries for which we "might" have appended search domains ("might" because we may
+        // find results before we apply search domains even though AppendSearchDomains is set to 1)
+        if (!SearchDomainsChanged || q->AppendSearchDomains)
+        {
+            // NOTE: CacheRecordRmvEventsForQuestion will not generate RMV events for queries that have non-zero
+            // LOAddressAnswers. Hence it is important that we call CacheRecordRmvEventsForQuestion before
+            // LocalRecordRmvEventsForQuestion (which decrements LOAddressAnswers). Let us say that
+            // /etc/hosts has an A Record for web.apple.com. Any queries for web.apple.com will be answered locally.
+            // But this can't prevent a CNAME/AAAA query to not to be sent on the wire. When it is sent on the wire,
+            // it could create cache entries. When we are restarting queries, we can't deliver the cache RMV events
+            // for the original query using these cache entries as ADDs were never delivered using these cache
+            // entries and hence this order is needed.
+
+            // If the query is suppressed, the RMV events won't be delivered
+            if (!CacheRecordRmvEventsForQuestion(m, q)) { LogInfo("mDNSCoreRestartAddressQueries: Question deleted while delivering Cache Record RMV events"); continue; }
+
+            // SuppressQuery status does not affect questions that are answered using local records
+            if (!LocalRecordRmvEventsForQuestion(m, q)) { LogInfo("mDNSCoreRestartAddressQueries: Question deleted while delivering Local Record RMV events"); continue; }
+
+            LogInfo("mDNSCoreRestartAddressQueries: Stop question %p %##s (%s), AppendSearchDomains %d, qnameOrig %p", q,
+                    q->qname.c, DNSTypeName(q->qtype), q->AppendSearchDomains, q->qnameOrig);
+            mDNS_StopQuery_internal(m, q);
+            // Reset state so that it looks like it was in the beginning i.e it should look at /etc/hosts, cache
+            // and then search domains should be appended. At the beginning, qnameOrig was NULL.
+            if (q->qnameOrig)
+            {
+                LogInfo("mDNSCoreRestartAddressQueries: qnameOrig %##s", q->qnameOrig);
+                AssignDomainName(&q->qname, q->qnameOrig);
+                mDNSPlatformMemFree(q->qnameOrig);
+                q->qnameOrig = mDNSNULL;
+                q->RetryWithSearchDomains = ApplySearchDomainsFirst(q) ? 1 : 0;
+            }
+            q->SearchListIndex = 0;
+            q->next = restart;
+            restart = q;
+        }
+    }
+
+    // 3. Callback before we start the query
+    if (BeforeStartCallback) BeforeStartCallback(m, context);
+
+    // 4. Restart all the stopped queries
+    while (restart)
+    {
+        q = restart;
+        restart = restart->next;
+        q->next = mDNSNULL;
+        LogInfo("mDNSCoreRestartAddressQueries: Start question %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+        mDNS_StartQuery_internal(m, q);
+    }
+}
+
+mDNSexport void mDNSCoreRestartQueries(mDNS *const m)
+{
+    DNSQuestion *q;
+
+#ifndef UNICAST_DISABLED
+    // Retrigger all our uDNS questions
+    if (m->CurrentQuestion)
+        LogMsg("mDNSCoreRestartQueries: ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion)
+    {
+        q = m->CurrentQuestion;
+        m->CurrentQuestion = m->CurrentQuestion->next;
+        if (!mDNSOpaque16IsZero(q->TargetQID) && ActiveQuestion(q)) ActivateUnicastQuery(m, q, mDNStrue);
+    }
+#endif
+
+    // Retrigger all our mDNS questions
+    for (q = m->Questions; q; q=q->next)                // Scan our list of questions
+            mDNSCoreRestartQuestion(m, q);
+}
+
+// restart question if it's multicast and currently active
+mDNSexport void mDNSCoreRestartQuestion(mDNS *const m, DNSQuestion *q)
+{
+    if (mDNSOpaque16IsZero(q->TargetQID) && ActiveQuestion(q))
+    {
+        q->ThisQInterval    = InitialQuestionInterval;  // MUST be > zero for an active question
+#if mDNS_REQUEST_UNICAST_RESPONSE
+        q->RequestUnicast = SET_QU_IN_FIRST_FOUR_QUERIES;
+#else   // mDNS_REQUEST_UNICAST_RESPONSE
+        q->RequestUnicast   = SET_QU_IN_FIRST_QUERY;
+#endif  // mDNS_REQUEST_UNICAST_RESPONSE
+        q->LastQTime        = m->timenow - q->ThisQInterval;
+        q->RecentAnswerPkts = 0;
+        ExpireDupSuppressInfo(q->DupSuppress, m->timenow);
+        m->NextScheduledQuery = m->timenow;
+    }
+}
+
+// restart the probe/announce cycle for multicast record
+mDNSexport void mDNSCoreRestartRegistration(mDNS *const m, AuthRecord  *rr, int announceCount)
+{
+    if (!AuthRecord_uDNS(rr))
+    {
+        if (rr->resrec.RecordType == kDNSRecordTypeVerified && !rr->DependentOn) rr->resrec.RecordType = kDNSRecordTypeUnique;
+        rr->ProbeCount     = DefaultProbeCountForRecordType(rr->resrec.RecordType);
+
+        // announceCount < 0 indicates default announce count should be used
+        if (announceCount < 0)
+            announceCount = InitialAnnounceCount;
+        if (rr->AnnounceCount < announceCount) 
+            rr->AnnounceCount  = announceCount;
+
+        if (mDNS_KeepaliveRecord(&rr->resrec))
+            rr->AnnounceCount  = 0; // Do not announce keepalive records
+        else
+            rr->AnnounceCount  = InitialAnnounceCount;
+        rr->SendNSECNow    = mDNSNULL;
+        InitializeLastAPTime(m, rr);
+    }
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Power Management (Sleep/Wake)
+#endif
+
+mDNSexport void mDNS_UpdateAllowSleep(mDNS *const m)
+{
+#ifndef IDLESLEEPCONTROL_DISABLED
+    mDNSBool allowSleep = mDNStrue;
+    char reason[128];
+
+    reason[0] = 0;
+
+    if (m->SystemSleepOnlyIfWakeOnLAN)
+    {
+        // Don't sleep if we are a proxy for any services
+        if (m->ProxyRecords)
+        {
+            allowSleep = mDNSfalse;
+            mDNS_snprintf(reason, sizeof(reason), "sleep proxy for %d records", m->ProxyRecords);
+            LogInfo("mDNS_UpdateAllowSleep: Sleep disabled because we are proxying %d records", m->ProxyRecords);
+        }
+
+        if (allowSleep && mDNSCoreHaveAdvertisedMulticastServices(m))
+        {
+            // Scan the list of active interfaces
+            NetworkInterfaceInfo *intf;
+            for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+            {
+                if (intf->McastTxRx && !intf->Loopback && !mDNSPlatformInterfaceIsD2D(intf->InterfaceID))
+                {
+                    // Disallow sleep if this interface doesn't support NetWake
+                    if (!intf->NetWake)
+                    {
+                        allowSleep = mDNSfalse;
+                        mDNS_snprintf(reason, sizeof(reason), "%s does not support NetWake", intf->ifname);
+                        LogInfo("mDNS_UpdateAllowSleep: Sleep disabled because %s does not support NetWake", intf->ifname);
+                        break;
+                    }
+
+                    // Disallow sleep if there is no sleep proxy server
+                    const CacheRecord *cr = FindSPSInCache1(m, &intf->NetWakeBrowse, mDNSNULL, mDNSNULL);
+                    if ( cr == mDNSNULL)
+                    {
+                        allowSleep = mDNSfalse;
+                        mDNS_snprintf(reason, sizeof(reason), "No sleep proxy server on %s", intf->ifname);
+                        LogInfo("mDNS_UpdateAllowSleep: Sleep disabled because %s has no sleep proxy server", intf->ifname);
+                        break;
+                    }
+                    else if (m->SPSType != 0)
+                    {
+                        mDNSu32 mymetric = LocalSPSMetric(m);
+                        mDNSu32 metric   = SPSMetric(cr->resrec.rdata->u.name.c);
+                        if (metric >= mymetric)
+                        {
+                            allowSleep = mDNSfalse;
+                            mDNS_snprintf(reason, sizeof(reason), "No sleep proxy server with better metric on %s", intf->ifname);
+                            LogInfo("mDNS_UpdateAllowSleep: Sleep disabled because %s has no sleep proxy server with a better metric", intf->ifname);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Call the platform code to enable/disable sleep
+    mDNSPlatformSetAllowSleep(m, allowSleep, reason);
+#else
+    (void) m;
+#endif /* !defined(IDLESLEEPCONTROL_DISABLED) */
+}
+
+mDNSlocal mDNSBool mDNSUpdateOkToSend(mDNS *const m, AuthRecord *rr, NetworkInterfaceInfo *const intf, mDNSu32 scopeid)
+{
+    // If it is not a uDNS record, check to see if the updateid is zero. "updateid" is cleared when we have
+    // sent the resource record on all the interfaces. If the update id is not zero, check to see if it is time
+    // to send.
+    if (AuthRecord_uDNS(rr) || (rr->AuthFlags & AuthFlagsWakeOnly) || mDNSOpaque16IsZero(rr->updateid) || 
+        m->timenow - (rr->LastAPTime + rr->ThisAPInterval) < 0)
+    {
+        return mDNSfalse;
+    }
+
+    // If we have a pending registration for "scopeid", it is ok to send the update on that interface.
+    // If the scopeid is too big to check for validity, we don't check against updateIntID. When
+    // we successfully update on all the interfaces (with whatever set in "rr->updateIntID"), we clear
+    // updateid and we should have returned from above.
+    //
+    // Note: scopeid is the same as intf->InterfaceID. It is passed in so that we don't have to call the
+    // platform function to extract the value from "intf" everytime.
+
+    if ((scopeid >= (sizeof(rr->updateIntID) * mDNSNBBY) || bit_get_opaque64(rr->updateIntID, scopeid)) &&
+        (!rr->resrec.InterfaceID || rr->resrec.InterfaceID == intf->InterfaceID))
+        return mDNStrue;
+
+    return mDNSfalse;
+}
+
+mDNSexport void UpdateRMACCallback(mDNS *const m, void *context)
+{
+    IPAddressMACMapping *addrmap = (IPAddressMACMapping *)context ;
+    m->CurrentRecord = m->ResourceRecords;
+
+    if (!addrmap)
+    {
+        LogMsg("UpdateRMACCallback: Address mapping is NULL");
+        return;
+    }
+
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rr = m->CurrentRecord;
+        // If this is a keepalive record and the remote IP address matches, update the RData
+        if (mDNS_KeepaliveRecord(&rr->resrec))
+        {
+            mDNSAddr raddr;
+            getKeepaliveRaddr(m, rr, &raddr);
+            if (mDNSSameAddress(&raddr, &addrmap->ipaddr))
+            {
+                UpdateKeepaliveRData(m, rr, mDNSNULL, mDNStrue, (char *)(addrmap->ethaddr));
+            }
+        }
+        m->CurrentRecord = rr->next;
+    }
+
+    if (addrmap)
+    {
+        mDNSPlatformMemFree(addrmap);
+    }
+}
+
+mDNSexport mStatus UpdateKeepaliveRData(mDNS *const m, AuthRecord *rr, NetworkInterfaceInfo *const intf, mDNSBool updateMac, char *ethAddr)
+{
+    mDNSu16 newrdlength;
+    mDNSAddr laddr, raddr;
+    mDNSEthAddr eth;
+    mDNSIPPort lport, rport;
+    mDNSu32 timeout, seq, ack;
+    mDNSu16 win;
+    UTF8str255 txt;
+    int rdsize;
+    RData *newrd;
+    mDNSTCPInfo mti;
+    mStatus ret;
+
+    // Note: If we fail to update the  DNS NULL  record with additional information in this function, it will be registered
+    // with the SPS like any other record. SPS will not send keepalives if it does not have additional information.
+    mDNS_ExtractKeepaliveInfo(rr, &timeout, &laddr, &raddr, &eth, &seq, &ack, &lport, &rport, &win);
+    if (!timeout || mDNSAddressIsZero(&laddr) || mDNSAddressIsZero(&raddr) || mDNSIPPortIsZero(lport) ||
+        mDNSIPPortIsZero(rport))
+    {
+        LogMsg("UpdateKeepaliveRData: not a valid record %s for keepalive %#a:%d %#a:%d", ARDisplayString(m, rr), &laddr, lport.NotAnInteger, &raddr, rport.NotAnInteger);
+        return mStatus_UnknownErr;
+    }
+
+    if (updateMac)
+    {
+        if (laddr.type == mDNSAddrType_IPv4)
+            newrdlength = mDNS_snprintf((char *)&txt.c[1], sizeof(txt.c) - 1, "t=%d i=%d c=%d h=%#a d=%#a l=%u r=%u m=%s", timeout, kKeepaliveRetryInterval, kKeepaliveRetryCount, &laddr, &raddr, mDNSVal16(lport), mDNSVal16(rport), ethAddr);
+        else
+            newrdlength = mDNS_snprintf((char *)&txt.c[1], sizeof(txt.c) - 1, "t=%d i=%d c=%d H=%#a D=%#a l=%u r=%u m=%s", timeout, kKeepaliveRetryInterval, kKeepaliveRetryCount, &laddr, &raddr,  mDNSVal16(lport), mDNSVal16(rport), ethAddr);
+
+    }
+    else
+    {
+        // If this keepalive packet would be sent on a different interface than the current one that we are processing
+        // now, then we don't update the DNS NULL record. But we do not prevent it from registering with the SPS. When SPS sees
+        // this DNS NULL record, it does not send any keepalives as it does not have all the information
+        mDNSPlatformMemZero(&mti, sizeof (mDNSTCPInfo));
+        ret = mDNSPlatformRetrieveTCPInfo(m, &laddr, &lport, &raddr, &rport, &mti);
+        if (ret != mStatus_NoError)
+        {
+            LogMsg("mDNSPlatformRetrieveTCPInfo: mDNSPlatformRetrieveTCPInfo failed %d", ret);
+            return ret;
+        }
+        if ((intf != mDNSNULL) && (mti.IntfId != intf->InterfaceID))
+        {
+            LogInfo("mDNSPlatformRetrieveTCPInfo: InterfaceID  mismatch mti.IntfId = %p InterfaceID = %p",  mti.IntfId, intf->InterfaceID);
+            return mStatus_BadParamErr;
+        }
+
+        if (laddr.type == mDNSAddrType_IPv4)
+            newrdlength = mDNS_snprintf((char *)&txt.c[1], sizeof(txt.c) - 1, "t=%d i=%d c=%d h=%#a d=%#a l=%u r=%u m=%.6a s=%u a=%u w=%u", timeout, kKeepaliveRetryInterval, kKeepaliveRetryCount, &laddr, &raddr, mDNSVal16(lport), mDNSVal16(rport), &eth, mti.seq, mti.ack, mti.window);
+        else
+            newrdlength = mDNS_snprintf((char *)&txt.c[1], sizeof(txt.c) - 1, "t=%d i=%d c=%d H=%#a D=%#a l=%u r=%u m=%.6a s=%u a=%u w=%u", timeout, kKeepaliveRetryInterval, kKeepaliveRetryCount, &laddr, &raddr, mDNSVal16(lport), mDNSVal16(rport), &eth, mti.seq, mti.ack, mti.window);
+    }
+
+    // Did we insert a null byte at the end ?
+    if (newrdlength == (sizeof(txt.c) - 1))
+    {
+        LogMsg("UpdateKeepaliveRData: could not allocate memory %s", ARDisplayString(m, rr));
+        return mStatus_NoMemoryErr;
+    }
+
+    // Include the length for the null byte at the end
+    txt.c[0] = newrdlength + 1;
+    // Account for the first length byte and the null byte at the end
+    newrdlength += 2;
+
+    rdsize = newrdlength > sizeof(RDataBody) ? newrdlength : sizeof(RDataBody);
+    newrd = mDNSPlatformMemAllocate(sizeof(RData) - sizeof(RDataBody) + rdsize);
+    if (!newrd) { LogMsg("UpdateKeepaliveRData: ptr NULL"); return mStatus_NoMemoryErr; }
+
+    newrd->MaxRDLength = (mDNSu16) rdsize;
+    mDNSPlatformMemCopy(&newrd->u, txt.c, newrdlength);
+
+    //  If we are updating the record for the first time, rdata points to rdatastorage as the rdata memory
+    //  was allocated as part of the AuthRecord itself. We allocate memory when we update the AuthRecord.
+    //  If the resource record has data that we allocated in a previous pass (to update MAC address),
+    //  free that memory here before copying in the new data.
+    if ( rr->resrec.rdata != &rr->rdatastorage)
+    {
+        mDNSPlatformMemFree(rr->resrec.rdata);
+        LogSPS("UpdateKeepaliveRData: Freed allocated memory for keep alive packet: %s ", ARDisplayString(m, rr));
+    }
+    SetNewRData(&rr->resrec, newrd, newrdlength);    // Update our rdata
+
+    LogSPS("UpdateKeepaliveRData: successfully updated the record %s", ARDisplayString(m, rr));
+    return mStatus_NoError;
+}
+
+mDNSlocal void SendSPSRegistrationForOwner(mDNS *const m, NetworkInterfaceInfo *const intf, const mDNSOpaque16 id, const OwnerOptData *const owner)
+{
+    const int optspace = DNSOpt_Header_Space + DNSOpt_LeaseData_Space + DNSOpt_Owner_Space(&m->PrimaryMAC, &intf->MAC);
+    const int sps = intf->NextSPSAttempt / 3;
+    AuthRecord *rr;
+    mDNSOpaque16 msgid;
+    mDNSu32 scopeid;
+
+    scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, intf->InterfaceID, mDNStrue);
+    if (!intf->SPSAddr[sps].type)
+    {
+        intf->NextSPSAttemptTime = m->timenow + mDNSPlatformOneSecond;
+        if (m->NextScheduledSPRetry - intf->NextSPSAttemptTime > 0)
+            m->NextScheduledSPRetry = intf->NextSPSAttemptTime;
+        LogSPS("SendSPSRegistration: %s SPS %d (%d) %##s not yet resolved", intf->ifname, intf->NextSPSAttempt, sps, intf->NetWakeResolve[sps].qname.c);
+        goto exit;
+    }
+
+    // Mark our mDNS records (not unicast records) for transfer to SPS
+    if (mDNSOpaque16IsZero(id))
+    {
+        // We may have to register this record over multiple interfaces and we don't want to
+        // overwrite the id. We send the registration over interface X with id "IDX" and before
+        // we get a response, we overwrite with id "IDY" for interface Y and we won't accept responses
+        // for "IDX". Hence, we want to use the same ID across all interfaces.
+        //
+        // In the case of sleep proxy server transfering its records when it goes to sleep, the owner
+        // option check below will set the same ID across the records from the same owner. Records
+        // with different owner option gets different ID.
+        msgid = mDNS_NewMessageID(m);
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+            if (!(rr->AuthFlags & AuthFlagsWakeOnly) && rr->resrec.RecordType > kDNSRecordTypeDeregistering)
+            {
+                if (rr->resrec.InterfaceID == intf->InterfaceID || (!rr->resrec.InterfaceID && (rr->ForceMCast || IsLocalDomain(rr->resrec.name))))
+                {
+                    if (mDNSPlatformMemSame(owner, &rr->WakeUp, sizeof(*owner)))
+                    {
+                        rr->SendRNow = mDNSInterfaceMark;   // mark it now
+                        // When we are registering on the first interface, rr->updateid is zero in which case
+                        // initialize with the new ID. For subsequent interfaces, we want to use the same ID.
+                        // At the end, all the updates sent across all the interfaces with the same ID.
+                        if (mDNSOpaque16IsZero(rr->updateid))
+                            rr->updateid = msgid;
+                        else
+                            msgid = rr->updateid;
+                    }
+                }
+            }
+        }
+    }
+    else
+        msgid = id;
+
+    while (1)
+    {
+        mDNSu8 *p = m->omsg.data;
+        // To comply with RFC 2782, PutResourceRecord suppresses name compression for SRV records in unicast updates.
+        // For now we follow that same logic for SPS registrations too.
+        // If we decide to compress SRV records in SPS registrations in the future, we can achieve that by creating our
+        // initial DNSMessage with h.flags set to zero, and then update it to UpdateReqFlags right before sending the packet.
+        InitializeDNSMessage(&m->omsg.h, msgid, UpdateReqFlags);
+
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->SendRNow || mDNSUpdateOkToSend(m, rr, intf, scopeid))
+            {
+                if (mDNSPlatformMemSame(owner, &rr->WakeUp, sizeof(*owner)))
+                {
+                    mDNSu8 *newptr;
+                    const mDNSu8 *const limit = m->omsg.data + (m->omsg.h.mDNS_numUpdates ? NormalMaxDNSMessageData : AbsoluteMaxDNSMessageData) - optspace;
+
+                    // If we can't update the keepalive record, don't send it
+                    if (mDNS_KeepaliveRecord(&rr->resrec) && (UpdateKeepaliveRData(m, rr, intf, mDNSfalse, mDNSNULL) != mStatus_NoError))
+                    {
+                        if (scopeid < (sizeof(rr->updateIntID) * mDNSNBBY))
+                        {
+                            bit_clr_opaque64(rr->updateIntID, scopeid);
+                        }
+                        rr->SendRNow = mDNSNULL;
+                        continue;
+                    }
+
+                    if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                        rr->resrec.rrclass |= kDNSClass_UniqueRRSet;    // Temporarily set the 'unique' bit so PutResourceRecord will set it
+                    newptr = PutResourceRecordTTLWithLimit(&m->omsg, p, &m->omsg.h.mDNS_numUpdates, &rr->resrec, rr->resrec.rroriginalttl, limit);
+                    rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;       // Make sure to clear 'unique' bit back to normal state
+                    if (!newptr)
+                        LogSPS("SendSPSRegistration put %s FAILED %d/%d %s", intf->ifname, p - m->omsg.data, limit - m->omsg.data, ARDisplayString(m, rr));
+                    else
+                    {
+                        LogSPS("SendSPSRegistration put %s 0x%x 0x%x (updateid %d)  %s", intf->ifname, rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(m->omsg.h.id), ARDisplayString(m, rr));
+                        rr->SendRNow       = mDNSNULL;
+                        rr->ThisAPInterval = mDNSPlatformOneSecond;
+                        rr->LastAPTime     = m->timenow;
+                        // should be initialized above
+                        if (mDNSOpaque16IsZero(rr->updateid)) LogMsg("SendSPSRegistration: ERROR!! rr %s updateid is zero", ARDisplayString(m, rr));
+                        if (m->NextScheduledResponse - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+                            m->NextScheduledResponse = (rr->LastAPTime + rr->ThisAPInterval);
+                        p = newptr;
+                    }
+                }
+            }
+
+        if (!m->omsg.h.mDNS_numUpdates) break;
+        else
+        {
+            AuthRecord opt;
+            mDNS_SetupResourceRecord(&opt, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+            opt.resrec.rrclass    = NormalMaxDNSMessageData;
+            opt.resrec.rdlength   = sizeof(rdataOPT) * 2;   // Two options in this OPT record
+            opt.resrec.rdestimate = sizeof(rdataOPT) * 2;
+            opt.resrec.rdata->u.opt[0].opt           = kDNSOpt_Lease;
+            opt.resrec.rdata->u.opt[0].optlen        = DNSOpt_LeaseData_Space - 4;
+            opt.resrec.rdata->u.opt[0].u.updatelease = DEFAULT_UPDATE_LEASE;
+            if (!owner->HMAC.l[0])                                          // If no owner data,
+                SetupOwnerOpt(m, intf, &opt.resrec.rdata->u.opt[1]);        // use our own interface information
+            else                                                            // otherwise, use the owner data we were given
+            {
+                opt.resrec.rdata->u.opt[1].u.owner = *owner;
+                opt.resrec.rdata->u.opt[1].opt     = kDNSOpt_Owner;
+                opt.resrec.rdata->u.opt[1].optlen  = DNSOpt_Owner_Space(&owner->HMAC, &owner->IMAC) - 4;
+            }
+            LogSPS("SendSPSRegistration put %s %s", intf->ifname, ARDisplayString(m, &opt));
+            p = PutResourceRecordTTLWithLimit(&m->omsg, p, &m->omsg.h.numAdditionals, &opt.resrec, opt.resrec.rroriginalttl, m->omsg.data + AbsoluteMaxDNSMessageData);
+            if (!p)
+                LogMsg("SendSPSRegistration: Failed to put OPT record (%d updates) %s", m->omsg.h.mDNS_numUpdates, ARDisplayString(m, &opt));
+            else
+            {
+                mStatus err;
+
+                LogSPS("SendSPSRegistration: Sending Update %s %d (%d) id %5d with %d records %d bytes to %#a:%d", intf->ifname, intf->NextSPSAttempt, sps,
+                       mDNSVal16(m->omsg.h.id), m->omsg.h.mDNS_numUpdates, p - m->omsg.data, &intf->SPSAddr[sps], mDNSVal16(intf->SPSPort[sps]));
+                // if (intf->NextSPSAttempt < 5) m->omsg.h.flags = zeroID;	// For simulating packet loss
+                err = mDNSSendDNSMessage(m, &m->omsg, p, intf->InterfaceID, mDNSNULL, &intf->SPSAddr[sps], intf->SPSPort[sps], mDNSNULL, mDNSNULL, mDNSfalse);
+                if (err) LogSPS("SendSPSRegistration: mDNSSendDNSMessage err %d", err);
+                if (err && intf->SPSAddr[sps].type == mDNSAddrType_IPv4 && intf->NetWakeResolve[sps].ThisQInterval == -1)
+                {
+                    LogSPS("SendSPSRegistration %d %##s failed to send to IPv4 address; will try IPv6 instead", sps, intf->NetWakeResolve[sps].qname.c);
+                    intf->NetWakeResolve[sps].qtype = kDNSType_AAAA;
+                    mDNS_StartQuery_internal(m, &intf->NetWakeResolve[sps]);
+                    return;
+                }
+            }
+        }
+    }
+
+    intf->NextSPSAttemptTime = m->timenow + mDNSPlatformOneSecond * 10;     // If successful, update NextSPSAttemptTime
+
+exit:
+    if (mDNSOpaque16IsZero(id) && intf->NextSPSAttempt < 8) intf->NextSPSAttempt++;
+}
+
+mDNSlocal mDNSBool RecordIsFirstOccurrenceOfOwner(mDNS *const m, const AuthRecord *const rr)
+{
+    AuthRecord *ar;
+    for (ar = m->ResourceRecords; ar && ar != rr; ar=ar->next)
+        if (mDNSPlatformMemSame(&rr->WakeUp, &ar->WakeUp, sizeof(rr->WakeUp))) return mDNSfalse;
+    return mDNStrue;
+}
+
+mDNSlocal void mDNSCoreStoreProxyRR(mDNS *const m, const mDNSInterfaceID InterfaceID, AuthRecord *const rr)
+{
+    AuthRecord *newRR = mDNSPlatformMemAllocate(sizeof(AuthRecord));
+
+    if (newRR == mDNSNULL)
+    {
+        LogSPS("%s : could not allocate memory for new resource record", __func__);
+        return;
+    }
+
+    mDNSPlatformMemZero(newRR, sizeof(AuthRecord));
+    mDNS_SetupResourceRecord(newRR, mDNSNULL, InterfaceID, rr->resrec.rrtype,
+                             rr->resrec.rroriginalttl, rr->resrec.RecordType,
+                             rr->ARType, mDNSNULL, mDNSNULL);
+
+    AssignDomainName(&newRR->namestorage, &rr->namestorage);
+    newRR->resrec.rdlength = DomainNameLength(rr->resrec.name);
+    newRR->resrec.namehash = DomainNameHashValue(newRR->resrec.name);
+    newRR->resrec.rrclass  = rr->resrec.rrclass;
+
+    if (rr->resrec.rrtype == kDNSType_A)
+    {
+        newRR->resrec.rdata->u.ipv4 =  rr->resrec.rdata->u.ipv4;
+    }
+    else if (rr->resrec.rrtype == kDNSType_AAAA)
+    {
+        newRR->resrec.rdata->u.ipv6 = rr->resrec.rdata->u.ipv6;
+    }
+    SetNewRData(&newRR->resrec, mDNSNULL, 0);
+
+    // Insert the new node at the head of the list.
+    newRR->next        = m->SPSRRSet;
+    m->SPSRRSet        = newRR;
+    LogSPS("%s : Storing proxy record : %s ", __func__, ARDisplayString(m, rr));
+}
+
+// Some records are interface specific and some are not. The ones that are supposed to be registered
+// on multiple interfaces need to be initialized with all the valid interfaces on which it will be sent.
+// updateIntID bit field tells us on which interfaces we need to register this record. When we get an
+// ack from the sleep proxy server, we clear the interface bit. This way, we know when a record completes
+// registration on all the interfaces
+mDNSlocal void SPSInitRecordsBeforeUpdate(mDNS *const m, mDNSOpaque64 updateIntID, mDNSBool *WakeOnlyService)
+{
+    AuthRecord *ar;
+    LogSPS("SPSInitRecordsBeforeUpdate: UpdateIntID 0x%x 0x%x", updateIntID.l[1], updateIntID.l[0]);
+    
+    *WakeOnlyService = mDNSfalse;
+
+    // Before we store the A and AAAA records that we are going to register with the sleep proxy,
+    // make sure that the old sleep proxy records are removed.
+    mDNSCoreFreeProxyRR(m);
+
+    // For records that are registered only on a specific interface, mark only that bit as it will
+    // never be registered on any other interface. For others, it should be sent on all interfaces.
+    for (ar = m->ResourceRecords; ar; ar=ar->next)
+    {
+        ar->updateIntID = zeroOpaque64;
+        ar->updateid    = zeroID;
+        if (AuthRecord_uDNS(ar))
+        {
+            continue;
+        }
+        if (ar->AuthFlags & AuthFlagsWakeOnly)
+        {
+            if (ar->resrec.RecordType == kDNSRecordTypeShared && ar->RequireGoodbye)
+            {
+                ar->ImmedAnswer = mDNSInterfaceMark;
+                *WakeOnlyService = mDNStrue;
+                continue;
+            }
+        }
+        if (!ar->resrec.InterfaceID)
+        {
+            LogSPS("Setting scopeid (ALL) 0x%x 0x%x for %s", updateIntID.l[1], updateIntID.l[0], ARDisplayString(m, ar));
+            ar->updateIntID = updateIntID;
+        }
+        else
+        {
+            // Filter records that belong to interfaces that we won't register the records on. UpdateIntID captures
+            // exactly this.
+            mDNSu32 scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, ar->resrec.InterfaceID, mDNStrue);
+            if ((scopeid < (sizeof(updateIntID) * mDNSNBBY)) && bit_get_opaque64(updateIntID, scopeid))
+            {
+                bit_set_opaque64(ar->updateIntID, scopeid);
+                LogSPS("SPSInitRecordsBeforeUpdate: Setting scopeid(%d) 0x%x 0x%x for %s", scopeid, ar->updateIntID.l[1],
+                    ar->updateIntID.l[0], ARDisplayString(m, ar));
+            }
+            else
+            {
+                LogSPS("SPSInitRecordsBeforeUpdate: scopeid %d beyond range or not valid for SPS registration", scopeid);
+            }
+        }
+        // Store the A and AAAA records that we registered with the sleep proxy.
+        // We will use this to prevent spurious name conflicts that may occur when we wake up
+        if (ar->resrec.rrtype == kDNSType_A || ar->resrec.rrtype == kDNSType_AAAA)
+        {
+            mDNSCoreStoreProxyRR(m, ar->resrec.InterfaceID, ar);
+        }
+    }
+}
+
+mDNSlocal void SendSPSRegistration(mDNS *const m, NetworkInterfaceInfo *const intf, const mDNSOpaque16 id)
+{
+    AuthRecord *ar;
+    OwnerOptData owner = zeroOwner;
+
+    SendSPSRegistrationForOwner(m, intf, id, &owner);
+
+    for (ar = m->ResourceRecords; ar; ar=ar->next)
+    {
+        if (!mDNSPlatformMemSame(&owner, &ar->WakeUp, sizeof(owner)) && RecordIsFirstOccurrenceOfOwner(m, ar))
+        {
+            owner = ar->WakeUp;
+            SendSPSRegistrationForOwner(m, intf, id, &owner);
+        }
+    }
+}
+
+// RetrySPSRegistrations is called from SendResponses, with the lock held
+mDNSlocal void RetrySPSRegistrations(mDNS *const m)
+{
+    AuthRecord *rr;
+    NetworkInterfaceInfo *intf;
+
+    // First make sure none of our interfaces' NextSPSAttemptTimes are inadvertently set to m->timenow + mDNSPlatformOneSecond * 10
+    for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        if (intf->NextSPSAttempt && intf->NextSPSAttemptTime == m->timenow + mDNSPlatformOneSecond * 10)
+            intf->NextSPSAttemptTime++;
+
+    // Retry any record registrations that are due
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (!AuthRecord_uDNS(rr) && !mDNSOpaque16IsZero(rr->updateid) && m->timenow - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+        {
+            for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+            {
+                // If we still have registrations pending on this interface, send it now
+                mDNSu32 scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, intf->InterfaceID, mDNStrue);
+                if ((scopeid >= (sizeof(rr->updateIntID) * mDNSNBBY) || bit_get_opaque64(rr->updateIntID, scopeid)) &&
+                    (!rr->resrec.InterfaceID || rr->resrec.InterfaceID == intf->InterfaceID))
+                {
+                    LogSPS("RetrySPSRegistrations: 0x%x 0x%x (updateid %d) %s", rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(rr->updateid), ARDisplayString(m, rr));
+                    SendSPSRegistration(m, intf, rr->updateid);
+                }
+            }
+        }
+
+    // For interfaces where we did an SPS registration attempt, increment intf->NextSPSAttempt
+    for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        if (intf->NextSPSAttempt && intf->NextSPSAttemptTime == m->timenow + mDNSPlatformOneSecond * 10 && intf->NextSPSAttempt < 8)
+            intf->NextSPSAttempt++;
+}
+
+mDNSlocal void NetWakeResolve(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    NetworkInterfaceInfo *intf = (NetworkInterfaceInfo *)question->QuestionContext;
+    int sps = (int)(question - intf->NetWakeResolve);
+    (void)m;            // Unused
+    LogSPS("NetWakeResolve: SPS: %d Add: %d %s", sps, AddRecord, RRDisplayString(m, answer));
+
+    if (!AddRecord) return;                                             // Don't care about REMOVE events
+    if (answer->rrtype != question->qtype) return;                      // Don't care about CNAMEs
+
+    // if (answer->rrtype == kDNSType_AAAA && sps == 0) return;	// To test failing to resolve sleep proxy's address
+
+    if (answer->rrtype == kDNSType_SRV)
+    {
+        // 1. Got the SRV record; now look up the target host's IP address
+        mDNS_StopQuery(m, question);
+        intf->SPSPort[sps] = answer->rdata->u.srv.port;
+        AssignDomainName(&question->qname, &answer->rdata->u.srv.target);
+        question->qtype = kDNSType_A;
+        mDNS_StartQuery(m, question);
+    }
+    else if (answer->rrtype == kDNSType_A && answer->rdlength == sizeof(mDNSv4Addr))
+    {
+        // 2. Got an IPv4 address for the target host; record address and initiate an SPS registration if appropriate
+        mDNS_StopQuery(m, question);
+        question->ThisQInterval = -1;
+        intf->SPSAddr[sps].type = mDNSAddrType_IPv4;
+        intf->SPSAddr[sps].ip.v4 = answer->rdata->u.ipv4;
+        mDNS_Lock(m);
+        if (sps == intf->NextSPSAttempt/3) SendSPSRegistration(m, intf, zeroID);    // If we're ready for this result, use it now
+        mDNS_Unlock(m);
+    }
+    else if (answer->rrtype == kDNSType_A && answer->rdlength == 0)
+    {
+        // 3. Got negative response -- target host apparently has IPv6 disabled -- so try looking up the target host's IPv4 address(es) instead
+        mDNS_StopQuery(m, question);
+        LogSPS("NetWakeResolve: SPS %d %##s has no IPv4 address, will try IPv6 instead", sps, question->qname.c);
+        question->qtype = kDNSType_AAAA;
+        mDNS_StartQuery(m, question);
+    }
+    else if (answer->rrtype == kDNSType_AAAA && answer->rdlength == sizeof(mDNSv6Addr) && mDNSv6AddressIsLinkLocal(&answer->rdata->u.ipv6))
+    {
+        // 4. Got the target host's IPv6 link-local address; record address and initiate an SPS registration if appropriate
+        mDNS_StopQuery(m, question);
+        question->ThisQInterval = -1;
+        intf->SPSAddr[sps].type = mDNSAddrType_IPv6;
+        intf->SPSAddr[sps].ip.v6 = answer->rdata->u.ipv6;
+        mDNS_Lock(m);
+        if (sps == intf->NextSPSAttempt/3) SendSPSRegistration(m, intf, zeroID);    // If we're ready for this result, use it now
+        mDNS_Unlock(m);
+    }
+}
+
+mDNSexport mDNSBool mDNSCoreHaveAdvertisedMulticastServices(mDNS *const m)
+{
+    AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (mDNS_KeepaliveRecord(&rr->resrec) || (rr->resrec.rrtype == kDNSType_SRV && !AuthRecord_uDNS(rr) && !mDNSSameIPPort(rr->resrec.rdata->u.srv.port, DiscardPort)))
+            return mDNStrue;
+    return mDNSfalse;
+}
+
+#ifdef APPLE_OSX_mDNSResponder
+// This function is used only in the case of local NIC proxy. For external
+// sleep proxy server, we do this in SPSInitRecordsBeforeUpdate when we
+// walk the resource records.
+mDNSlocal void SendGoodbyesForWakeOnlyService(mDNS *const m, mDNSBool *WakeOnlyService)
+{
+    AuthRecord *rr;
+
+    *WakeOnlyService = mDNSfalse;
+
+    // Mark all the records we need to deregister and send them
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if ((rr->AuthFlags & AuthFlagsWakeOnly) && 
+            rr->resrec.RecordType == kDNSRecordTypeShared && rr->RequireGoodbye)
+        {
+            rr->ImmedAnswer = mDNSInterfaceMark;
+            *WakeOnlyService = mDNStrue;
+        }
+    }
+}
+#endif // APPLE_OSx_mDNSResponder
+
+mDNSlocal void SendSleepGoodbyes(mDNS *const m, mDNSBool AllInterfaces, mDNSBool unicast)
+{
+    AuthRecord *rr;
+    m->SleepState = SleepState_Sleeping;
+
+    // If AllInterfaces is not set, the caller has already marked it appropriately
+    // on which interfaces this should be sent.
+    if (AllInterfaces)
+    {
+        NetworkInterfaceInfo *intf;
+        for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        {
+            intf->SendGoodbyes = 1;
+        }
+    }
+    if (unicast)
+    {
+#ifndef UNICAST_DISABLED
+        SleepRecordRegistrations(m);    // If we have no SPS, need to deregister our uDNS records
+#endif /* UNICAST_DISABLED */
+    }
+
+    // Mark all the records we need to deregister and send them
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.RecordType == kDNSRecordTypeShared && rr->RequireGoodbye)
+            rr->ImmedAnswer = mDNSInterfaceMark;
+    SendResponses(m);
+}
+
+/*
+ * This function attempts to detect if multiple interfaces are on the same subnet.
+ * It makes this determination based only on the IPv4 Addresses and subnet masks.
+ * IPv6 link local addresses that are configured by default on all interfaces make
+ * it hard to make this determination
+ *
+ * The 'real' fix for this would be to send out multicast packets over one interface
+ * and conclude that multiple interfaces are on the same subnet only if these packets
+ * are seen on other interfaces on the same system
+ */
+mDNSlocal mDNSBool skipSameSubnetRegistration(mDNS *const m, mDNSInterfaceID *regID, mDNSu32 count, mDNSInterfaceID intfid)
+{
+    NetworkInterfaceInfo *intf;
+    NetworkInterfaceInfo *newIntf;
+    mDNSu32 i;
+
+    for (newIntf = FirstInterfaceForID(m, intfid); newIntf; newIntf = newIntf->next)
+    {
+        if ((newIntf->InterfaceID != intfid) ||
+            (newIntf->ip.type     != mDNSAddrType_IPv4))
+        {
+            continue;
+        }
+        for ( i = 0; i < count; i++)
+        {
+            for (intf = FirstInterfaceForID(m, regID[i]); intf; intf = intf->next)
+            {
+                if ((intf->InterfaceID != regID[i]) ||
+                    (intf->ip.type     != mDNSAddrType_IPv4))
+                {
+                    continue;
+                }
+                if ((intf->ip.ip.v4.NotAnInteger & intf->mask.ip.v4.NotAnInteger) == (newIntf->ip.ip.v4.NotAnInteger & newIntf->mask.ip.v4.NotAnInteger))
+                {
+                    LogSPS("%s : Already registered for the same subnet (IPv4) for interface %s", __func__, intf->ifname);
+                    return (mDNStrue);
+                }
+            }
+        }
+    }
+    return (mDNSfalse);
+}
+
+mDNSlocal void DoKeepaliveCallbacks(mDNS *m)
+{
+    // Loop through the keepalive records and callback with an error
+    m->CurrentRecord = m->ResourceRecords;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *const rr = m->CurrentRecord;
+        if ((mDNS_KeepaliveRecord(&rr->resrec)) && (rr->resrec.RecordType != kDNSRecordTypeDeregistering))
+        {
+            LogSPS("DoKeepaliveCallbacks: Invoking the callback for %s", ARDisplayString(m, rr));
+            if (rr->RecordCallback)
+                rr->RecordCallback(m, rr, mStatus_BadStateErr);
+        }
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+// BeginSleepProcessing is called, with the lock held, from either mDNS_Execute or mDNSCoreMachineSleep
+mDNSlocal void BeginSleepProcessing(mDNS *const m)
+{
+    mDNSBool SendGoodbyes = mDNStrue;
+    mDNSBool WakeOnlyService  = mDNSfalse;
+    mDNSBool invokeKACallback = mDNStrue;
+    const CacheRecord *sps[3] = { mDNSNULL };
+    mDNSOpaque64 updateIntID = zeroOpaque64;
+    mDNSInterfaceID registeredIntfIDS[128];
+    mDNSu32 registeredCount = 0;
+    int skippedRegistrations = 0;
+
+    m->NextScheduledSPRetry = m->timenow;
+
+    if      (!m->SystemWakeOnLANEnabled) LogSPS("BeginSleepProcessing: m->SystemWakeOnLANEnabled is false");
+    else if (!mDNSCoreHaveAdvertisedMulticastServices(m)) LogSPS("BeginSleepProcessing: No advertised services");
+    else    // If we have at least one advertised service
+    {
+        NetworkInterfaceInfo *intf;
+
+        // Clear out the SCDynamic entry that stores the external SPS information
+        mDNSPlatformClearSPSMACAddr();
+
+        for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        {
+            // Intialize it to false. These values make sense only when SleepState is set to Sleeping.
+            intf->SendGoodbyes = 0;
+
+            // If it is not multicast capable, we could not have possibly discovered sleep proxy
+            // servers.
+            if (!intf->McastTxRx || mDNSPlatformInterfaceIsD2D(intf->InterfaceID))
+            {
+                LogSPS("BeginSleepProcessing: %-6s Ignoring for registrations", intf->ifname);
+                continue;
+            }
+
+            // If we are not capable of WOMP, then don't register with sleep proxy.
+            //
+            // Note: If we are not NetWake capable, we don't browse for the sleep proxy server.
+            // We might find sleep proxy servers in the cache and start a resolve on them.
+            // But then if the interface goes away, we won't stop these questions because
+            // mDNS_DeactivateNetWake_internal assumes that a browse has been started for it
+            // to stop both the browse and resolve questions.
+            if (!intf->NetWake)
+            {
+                LogSPS("BeginSleepProcessing: %-6s not capable of magic packet wakeup", intf->ifname);
+                intf->SendGoodbyes = 1;
+                skippedRegistrations++;
+                continue;
+            }
+
+            // Check if we have already registered with a sleep proxy for this subnet
+            if (skipSameSubnetRegistration(m, registeredIntfIDS, registeredCount, intf->InterfaceID))
+            {
+                LogSPS("%s : Skipping sleep proxy registration on %s", __func__, intf->ifname);
+                continue;
+            }
+
+#if APPLE_OSX_mDNSResponder
+            else if (SupportsInNICProxy(intf))
+            {
+                if (ActivateLocalProxy(m, intf) == mStatus_NoError)
+                {
+                    SendGoodbyesForWakeOnlyService(m, &WakeOnlyService);
+                    SendGoodbyes = mDNSfalse;
+                    invokeKACallback  = mDNSfalse;
+                    LogSPS("BeginSleepProcessing: %-6s using local proxy", intf->ifname);
+                    // This will leave m->SleepState set to SleepState_Transferring,
+                    // which is okay because with no outstanding resolves, or updates in flight,
+                    // mDNSCoreReadyForSleep() will conclude correctly that all the updates have already completed
+
+                    registeredIntfIDS[registeredCount] = intf->InterfaceID;
+                    registeredCount++;
+                }
+            }
+#endif // APPLE_OSX_mDNSResponder
+            else
+            {
+#if APPLE_OSX_mDNSResponder
+                // If on battery, do not attempt to offload to external sleep proxies
+                if (m->SystemWakeOnLANEnabled == mDNS_WakeOnBattery)
+                {
+                    LogSPS("BegingSleepProcessing: Not connected to AC power - Not registering with an external sleep proxy.");
+                    return;
+                }
+#endif // APPLE_OSX_mDNSResponder
+                FindSPSInCache(m, &intf->NetWakeBrowse, sps);
+                if (!sps[0]) LogSPS("BeginSleepProcessing: %-6s %#a No Sleep Proxy Server found (Next Browse Q in %d, interval %d)",
+                                    intf->ifname, &intf->ip, NextQSendTime(&intf->NetWakeBrowse) - m->timenow, intf->NetWakeBrowse.ThisQInterval);
+                else
+                {
+                    int i;
+                    mDNSu32 scopeid;
+                    SendGoodbyes = mDNSfalse;
+                    intf->NextSPSAttempt = 0;
+                    intf->NextSPSAttemptTime = m->timenow + mDNSPlatformOneSecond;
+
+                    scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, intf->InterfaceID, mDNStrue);
+                    // Now we know for sure that we have to wait for registration to complete on this interface.
+                    if (scopeid < (sizeof(updateIntID) * mDNSNBBY))
+                        bit_set_opaque64(updateIntID, scopeid);
+
+                    // Don't need to set m->NextScheduledSPRetry here because we already set "m->NextScheduledSPRetry = m->timenow" above
+                    for (i=0; i<3; i++)
+                    {
+#if ForceAlerts
+                        if (intf->SPSAddr[i].type)
+                        { LogMsg("BeginSleepProcessing: %s %d intf->SPSAddr[i].type %d", intf->ifname, i, intf->SPSAddr[i].type); *(long*)0 = 0; }
+                        if (intf->NetWakeResolve[i].ThisQInterval >= 0)
+                        { LogMsg("BeginSleepProcessing: %s %d intf->NetWakeResolve[i].ThisQInterval %d", intf->ifname, i, intf->NetWakeResolve[i].ThisQInterval); *(long*)0 = 0; }
+#endif
+                        intf->SPSAddr[i].type = mDNSAddrType_None;
+                        if (intf->NetWakeResolve[i].ThisQInterval >= 0) mDNS_StopQuery(m, &intf->NetWakeResolve[i]);
+                        intf->NetWakeResolve[i].ThisQInterval = -1;
+                        if (sps[i])
+                        {
+                            LogSPS("BeginSleepProcessing: %-6s Found Sleep Proxy Server %d TTL %d %s", intf->ifname, i, sps[i]->resrec.rroriginalttl, CRDisplayString(m, sps[i]));
+                            mDNS_SetupQuestion(&intf->NetWakeResolve[i], intf->InterfaceID, &sps[i]->resrec.rdata->u.name, kDNSType_SRV, NetWakeResolve, intf);
+                            intf->NetWakeResolve[i].ReturnIntermed = mDNStrue;
+                            mDNS_StartQuery_internal(m, &intf->NetWakeResolve[i]);
+
+                            // If we are registering with a Sleep Proxy for a new subnet, add it to our list
+                            registeredIntfIDS[registeredCount] = intf->InterfaceID;
+                            registeredCount++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // If we have at least one interface on which we are registering with an external sleep proxy,
+    // initialize all the records appropriately.
+    if (!mDNSOpaque64IsZero(&updateIntID))
+        SPSInitRecordsBeforeUpdate(m, updateIntID, &WakeOnlyService);
+
+    // Call the applicaitons that registered a keepalive record to inform them that we failed to offload
+    // the records to a sleep proxy.
+    if (invokeKACallback)
+    {
+        LogSPS("BeginSleepProcessing: Did not register with an in-NIC proxy - invoking the callbacks for KA records");
+        DoKeepaliveCallbacks(m);
+    }
+
+    // SendSleepGoodbyes last two arguments control whether we send goodbyes on all
+    // interfaces and also deregister unicast registrations.
+    //
+    // - If there are no sleep proxy servers, then send goodbyes on all interfaces
+    //   for both multicast and unicast.
+    // 
+    // - If we skipped registrations on some interfaces, then we have already marked
+    //   them appropriately above. We don't need to send goodbyes for unicast as
+    //   we have registered with at least one sleep proxy.
+    //
+    // - If we are not planning to send any goodbyes, then check for WakeOnlyServices.
+    //
+    // Note: If we are planning to send goodbyes, we mark the record with mDNSInterfaceAny
+    // and call SendResponses which inturn calls ShouldSendGoodbyesBeforeSleep which looks
+    // at WakeOnlyServices first.
+    if (SendGoodbyes)
+    {
+        LogSPS("BeginSleepProcessing: Not registering with Sleep Proxy Server");
+        SendSleepGoodbyes(m, mDNStrue, mDNStrue);
+    }
+    else if (skippedRegistrations)
+    {
+        LogSPS("BeginSleepProcessing: Not registering with Sleep Proxy Server on all interfaces");
+        SendSleepGoodbyes(m, mDNSfalse, mDNSfalse);
+    }
+    else if (WakeOnlyService)
+    {
+        // If we saw WakeOnly service above, send the goodbyes now.
+        LogSPS("BeginSleepProcessing: Sending goodbyes for WakeOnlyServices");
+        SendResponses(m);
+    }
+}
+
+// Call mDNSCoreMachineSleep(m, mDNStrue) when the machine is about to go to sleep.
+// Call mDNSCoreMachineSleep(m, mDNSfalse) when the machine is has just woken up.
+// Normally, the platform support layer below mDNSCore should call this, not the client layer above.
+mDNSexport void mDNSCoreMachineSleep(mDNS *const m, mDNSBool sleep)
+{
+    AuthRecord *rr;
+
+    LogSPS("%s (old state %d) at %ld", sleep ? "Sleeping" : "Waking", m->SleepState, m->timenow);
+
+    if (sleep && !m->SleepState)        // Going to sleep
+    {
+        mDNS_Lock(m);
+        // If we're going to sleep, need to stop advertising that we're a Sleep Proxy Server
+        if (m->SPSSocket)
+        {
+            mDNSu8 oldstate = m->SPSState;
+            mDNS_DropLockBeforeCallback();      // mDNS_DeregisterService expects to be called without the lock held, so we emulate that here
+            m->SPSState = 2;
+#ifndef SPC_DISABLED
+            if (oldstate == 1) mDNS_DeregisterService(m, &m->SPSRecords);
+#else
+			(void)oldstate;
+#endif
+            mDNS_ReclaimLockAfterCallback();
+        }
+
+        m->SleepState = SleepState_Transferring;
+        if (m->SystemWakeOnLANEnabled && m->DelaySleep)
+        {
+            // If we just woke up moments ago, allow ten seconds for networking to stabilize before going back to sleep
+            LogSPS("mDNSCoreMachineSleep: Re-sleeping immediately after waking; will delay for %d ticks", m->DelaySleep - m->timenow);
+            m->SleepLimit = NonZeroTime(m->DelaySleep + mDNSPlatformOneSecond * 10);
+        }
+        else
+        {
+            m->DelaySleep = 0;
+            m->SleepLimit = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 10);
+            m->mDNSStats.Sleeps++;
+            BeginSleepProcessing(m);
+        }
+
+#ifndef UNICAST_DISABLED
+        SuspendLLQs(m);
+#endif
+#if APPLE_OSX_mDNSResponder
+        RemoveAutoTunnel6Record(m);
+#endif
+        LogSPS("mDNSCoreMachineSleep: m->SleepState %d (%s) seq %d", m->SleepState,
+               m->SleepState == SleepState_Transferring ? "Transferring" :
+               m->SleepState == SleepState_Sleeping     ? "Sleeping"     : "?", m->SleepSeqNum);
+        mDNS_Unlock(m);
+    }
+    else if (!sleep)        // Waking up
+    {
+        mDNSu32 slot;
+        CacheGroup *cg;
+        CacheRecord *cr;
+        NetworkInterfaceInfo *intf;
+        mDNSs32 currtime, diff;
+
+        mDNS_Lock(m);
+        // Reset SleepLimit back to 0 now that we're awake again.
+        m->SleepLimit = 0;
+
+        // If we were previously sleeping, but now we're not, increment m->SleepSeqNum to indicate that we're entering a new period of wakefulness
+        if (m->SleepState != SleepState_Awake)
+        {
+            m->SleepState = SleepState_Awake;
+            m->SleepSeqNum++;
+            // If the machine wakes and then immediately tries to sleep again (e.g. a maintenance wake)
+            // then we enforce a minimum delay of 16 seconds before we begin sleep processing.
+            // This is to allow time for the Ethernet link to come up, DHCP to get an address, mDNS to issue queries, etc.,
+            // before we make our determination of whether there's a Sleep Proxy out there we should register with.
+            m->DelaySleep = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 16);
+        }
+
+        if (m->SPSState == 3)
+        {
+            m->SPSState = 0;
+            mDNSCoreBeSleepProxyServer_internal(m, m->SPSType, m->SPSPortability, m->SPSMarginalPower, m->SPSTotalPower, m->SPSFeatureFlags);
+        }
+        m->mDNSStats.Wakes++;
+
+        // ... and the same for NextSPSAttempt
+        for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next)) intf->NextSPSAttempt = -1;
+
+        // Restart unicast and multicast queries
+        mDNSCoreRestartQueries(m);
+
+        // and reactivtate service registrations
+        m->NextSRVUpdate = NonZeroTime(m->timenow + mDNSPlatformOneSecond);
+        LogInfo("mDNSCoreMachineSleep waking: NextSRVUpdate in %d %d", m->NextSRVUpdate - m->timenow, m->timenow);
+
+        // 2. Re-validate our cache records
+        currtime = mDNSPlatformUTC();
+
+#if APPLE_OSX_mDNSResponder
+        // start time of this statistics gathering interval
+        m->StatStartTime = currtime;
+#endif // APPLE_OSX_mDNSResponder
+
+        diff = currtime - m->TimeSlept;
+        FORALL_CACHERECORDS(slot, cg, cr)
+        {
+            // Temporary fix: For unicast cache records, look at how much time we slept.
+            // Adjust the RecvTime by the amount of time we slept so that we age the
+            // cache record appropriately. If it is expired already, purge. If there
+            // is a network change that happens after the wakeup, we might purge the
+            // cache anyways and this helps only in the case where there are no network
+            // changes across sleep/wakeup transition.
+            //
+            // Note: If there is a network/DNS server change that already happened and
+            // these cache entries are already refreshed and we are getting a delayed
+            // wake up notification, we might adjust the TimeRcvd based on the time slept
+            // now which can cause the cache to purge pre-maturely. As this is not a very
+            // common case, this should happen rarely.
+            if (!cr->resrec.InterfaceID)
+            {
+                if (diff > 0)
+                {
+                    mDNSu32 uTTL = RRUnadjustedTTL(cr->resrec.rroriginalttl);
+                    const mDNSs32 remain = uTTL - (m->timenow - cr->TimeRcvd) / mDNSPlatformOneSecond;
+
+                    // -if we have slept longer than the remaining TTL, purge and start fresh. 
+                    // -if we have been sleeping for a long time, we could reduce TimeRcvd below by
+                    //  a sufficiently big value which could cause the value to go into the future
+                    //  because of the signed comparison of time. For this to happen, we should have been
+                    //  sleeping really long (~24 days). For now, we want to be conservative and flush even
+                    //  if we have slept for more than two days.
+
+                    if (diff >= remain || diff > (2 * 24 * 3600))
+                    {
+                        LogInfo("mDNSCoreMachineSleep: %s: Purging cache entry SleptTime %d, Remaining TTL %d",
+                            CRDisplayString(m, cr), diff, remain);
+                        mDNS_PurgeCacheResourceRecord(m, cr);
+                        continue;
+                    }
+                    cr->TimeRcvd -= (diff * mDNSPlatformOneSecond);
+                    if (m->timenow - (cr->TimeRcvd + ((mDNSs32)uTTL * mDNSPlatformOneSecond)) >= 0)
+                    {
+                        LogInfo("mDNSCoreMachineSleep: %s: Purging after adjusting the remaining TTL %d by %d seconds",
+                            CRDisplayString(m, cr), remain, diff);
+                        mDNS_PurgeCacheResourceRecord(m, cr);
+                    }
+                    else
+                    {
+                        LogInfo("mDNSCoreMachineSleep: %s: Adjusted the remain ttl %u by %d seconds", CRDisplayString(m, cr), remain, diff);
+                    }
+                }
+            }
+            else
+            {
+                mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForWake);
+            }
+        }
+
+        // 3. Retrigger probing and announcing for all our authoritative records
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+            if (AuthRecord_uDNS(rr))
+            {
+                ActivateUnicastRegistration(m, rr);
+            }
+            else
+            {
+                mDNSCoreRestartRegistration(m, rr, -1);
+            }
+        }
+
+        // 4. Refresh NAT mappings
+        // We don't want to have to assume that all hardware can necessarily keep accurate
+        // track of passage of time while asleep, so on wake we refresh our NAT mappings.
+        // We typically wake up with no interfaces active, so there's no need to rush to try to find our external address.
+        // But if we do get a network configuration change, mDNSMacOSXNetworkChanged will call uDNS_SetupDNSConfig, which
+        // will call mDNS_SetPrimaryInterfaceInfo, which will call RecreateNATMappings to refresh them, potentially sooner
+        // than five seconds from now.
+        LogInfo("mDNSCoreMachineSleep: recreating NAT mappings in 5 seconds");
+        RecreateNATMappings(m, mDNSPlatformOneSecond * 5);
+        mDNS_Unlock(m);
+    }
+}
+
+mDNSexport mDNSBool mDNSCoreReadyForSleep(mDNS *m, mDNSs32 now)
+{
+    DNSQuestion *q;
+    AuthRecord *rr;
+    NetworkInterfaceInfo *intf;
+
+    mDNS_Lock(m);
+
+    if (m->DelaySleep) goto notready;
+
+    // If we've not hit the sleep limit time, and it's not time for our next retry, we can skip these checks
+    if (m->SleepLimit - now > 0 && m->NextScheduledSPRetry - now > 0) goto notready;
+
+    m->NextScheduledSPRetry = now + 0x40000000UL;
+
+    // See if we might need to retransmit any lost Sleep Proxy Registrations
+    for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        if (intf->NextSPSAttempt >= 0)
+        {
+            if (now - intf->NextSPSAttemptTime >= 0)
+            {
+                LogSPS("mDNSCoreReadyForSleep: retrying for %s SPS %d try %d",
+                       intf->ifname, intf->NextSPSAttempt/3, intf->NextSPSAttempt);
+                SendSPSRegistration(m, intf, zeroID);
+                // Don't need to "goto notready" here, because if we do still have record registrations
+                // that have not been acknowledged yet, we'll catch that in the record list scan below.
+            }
+            else
+            if (m->NextScheduledSPRetry - intf->NextSPSAttemptTime > 0)
+                m->NextScheduledSPRetry = intf->NextSPSAttemptTime;
+        }
+
+    // Scan list of interfaces, and see if we're still waiting for any sleep proxy resolves to complete
+    for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+    {
+        int sps = (intf->NextSPSAttempt == 0) ? 0 : (intf->NextSPSAttempt-1)/3;
+        if (intf->NetWakeResolve[sps].ThisQInterval >= 0)
+        {
+            LogSPS("mDNSCoreReadyForSleep: waiting for SPS Resolve %s %##s (%s)",
+                   intf->ifname, intf->NetWakeResolve[sps].qname.c, DNSTypeName(intf->NetWakeResolve[sps].qtype));
+            goto spsnotready;
+        }
+    }
+
+    // Scan list of registered records
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+        if (!AuthRecord_uDNS(rr))
+            if (!mDNSOpaque64IsZero(&rr->updateIntID))
+            { LogSPS("mDNSCoreReadyForSleep: waiting for SPS updateIntID 0x%x 0x%x (updateid %d) %s", rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(rr->updateid), ARDisplayString(m,rr)); goto spsnotready; }
+
+    // Scan list of private LLQs, and make sure they've all completed their handshake with the server
+    for (q = m->Questions; q; q = q->next)
+        if (!mDNSOpaque16IsZero(q->TargetQID) && q->LongLived && q->ReqLease == 0 && q->tcp)
+        {
+            LogSPS("mDNSCoreReadyForSleep: waiting for LLQ %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+            goto notready;
+        }
+
+    // Scan list of registered records
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+        if (AuthRecord_uDNS(rr))
+        {
+            if (rr->state == regState_Refresh && rr->tcp)
+            { LogSPS("mDNSCoreReadyForSleep: waiting for Record updateIntID 0x%x 0x%x (updateid %d) %s", rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(rr->updateid), ARDisplayString(m,rr)); goto notready; }
+            #if APPLE_OSX_mDNSResponder
+            if (!RecordReadyForSleep(m, rr)) { LogSPS("mDNSCoreReadyForSleep: waiting for %s", ARDisplayString(m, rr)); goto notready; }
+            #endif
+        }
+
+    mDNS_Unlock(m);
+    return mDNStrue;
+
+spsnotready:
+
+    // If we failed to complete sleep proxy registration within ten seconds, we give up on that
+    // and allow up to ten seconds more to complete wide-area deregistration instead
+    if (now - m->SleepLimit >= 0)
+    {
+        LogMsg("Failed to register with SPS, now sending goodbyes");
+
+        for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+            if (intf->NetWakeBrowse.ThisQInterval >= 0)
+            {
+                LogSPS("ReadyForSleep mDNS_DeactivateNetWake %s %##s (%s)",
+                       intf->ifname, intf->NetWakeResolve[0].qname.c, DNSTypeName(intf->NetWakeResolve[0].qtype));
+                mDNS_DeactivateNetWake_internal(m, intf);
+            }
+
+        for (rr = m->ResourceRecords; rr; rr = rr->next)
+            if (!AuthRecord_uDNS(rr))
+                if (!mDNSOpaque64IsZero(&rr->updateIntID))
+                {
+                    LogSPS("ReadyForSleep clearing updateIntID 0x%x 0x%x (updateid %d) for %s", rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(rr->updateid), ARDisplayString(m, rr));
+                    rr->updateIntID = zeroOpaque64;
+                }
+
+        // We'd really like to allow up to ten seconds more here,
+        // but if we don't respond to the sleep notification within 30 seconds
+        // we'll be put back to sleep forcibly without the chance to schedule the next maintenance wake.
+        // Right now we wait 16 sec after wake for all the interfaces to come up, then we wait up to 10 seconds
+        // more for SPS resolves and record registrations to complete, which puts us at 26 seconds.
+        // If we allow just one more second to send our goodbyes, that puts us at 27 seconds.
+        m->SleepLimit = now + mDNSPlatformOneSecond * 1;
+
+        SendSleepGoodbyes(m, mDNStrue, mDNStrue);
+    }
+
+notready:
+    mDNS_Unlock(m);
+    return mDNSfalse;
+}
+
+mDNSexport mDNSs32 mDNSCoreIntervalToNextWake(mDNS *const m, mDNSs32 now)
+{
+    AuthRecord *ar;
+
+    // Even when we have no wake-on-LAN-capable interfaces, or we failed to find a sleep proxy, or we have other
+    // failure scenarios, we still want to wake up in at most 120 minutes, to see if the network environment has changed.
+    // E.g. we might wake up and find no wireless network because the base station got rebooted just at that moment,
+    // and if that happens we don't want to just give up and go back to sleep and never try again.
+    mDNSs32 e = now + (120 * 60 * mDNSPlatformOneSecond);       // Sleep for at most 120 minutes
+
+    NATTraversalInfo *nat;
+    for (nat = m->NATTraversals; nat; nat=nat->next)
+        if (nat->Protocol && nat->ExpiryTime && nat->ExpiryTime - now > mDNSPlatformOneSecond*4)
+        {
+            mDNSs32 t = nat->ExpiryTime - (nat->ExpiryTime - now) / 10;     // Wake up when 90% of the way to the expiry time
+            if (e - t > 0) e = t;
+            LogSPS("ComputeWakeTime: %p %s Int %5d Ext %5d Err %d Retry %5d Interval %5d Expire %5d Wake %5d",
+                   nat, nat->Protocol == NATOp_MapTCP ? "TCP" : "UDP",
+                   mDNSVal16(nat->IntPort), mDNSVal16(nat->ExternalPort), nat->Result,
+                   nat->retryPortMap ? (nat->retryPortMap - now) / mDNSPlatformOneSecond : 0,
+                   nat->retryInterval / mDNSPlatformOneSecond,
+                   nat->ExpiryTime ? (nat->ExpiryTime - now) / mDNSPlatformOneSecond : 0,
+                   (t - now) / mDNSPlatformOneSecond);
+        }
+
+    // This loop checks both the time we need to renew wide-area registrations,
+    // and the time we need to renew Sleep Proxy registrations
+    for (ar = m->ResourceRecords; ar; ar = ar->next)
+        if (ar->expire && ar->expire - now > mDNSPlatformOneSecond*4)
+        {
+            mDNSs32 t = ar->expire - (ar->expire - now) / 10;       // Wake up when 90% of the way to the expiry time
+            if (e - t > 0) e = t;
+            LogSPS("ComputeWakeTime: %p Int %7d Next %7d Expire %7d Wake %7d %s",
+                   ar, ar->ThisAPInterval / mDNSPlatformOneSecond,
+                   (ar->LastAPTime + ar->ThisAPInterval - now) / mDNSPlatformOneSecond,
+                   ar->expire ? (ar->expire - now) / mDNSPlatformOneSecond : 0,
+                   (t - now) / mDNSPlatformOneSecond, ARDisplayString(m, ar));
+        }
+
+    return(e - now);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Packet Reception Functions
+#endif
+
+#define MustSendRecord(RR) ((RR)->NR_AnswerTo || (RR)->NR_AdditionalTo)
+
+mDNSlocal mDNSu8 *GenerateUnicastResponse(const DNSMessage *const query, const mDNSu8 *const end,
+                                          const mDNSInterfaceID InterfaceID, mDNSBool LegacyQuery, DNSMessage *const response, AuthRecord *ResponseRecords)
+{
+    mDNSu8          *responseptr     = response->data;
+    const mDNSu8    *const limit     = response->data + sizeof(response->data);
+    const mDNSu8    *ptr             = query->data;
+    AuthRecord  *rr;
+    mDNSu32 maxttl = 0x70000000;
+    int i;
+
+    // Initialize the response fields so we can answer the questions
+    InitializeDNSMessage(&response->h, query->h.id, ResponseFlags);
+
+    // ***
+    // *** 1. Write out the list of questions we are actually going to answer with this packet
+    // ***
+    if (LegacyQuery)
+    {
+        maxttl = kStaticCacheTTL;
+        for (i=0; i<query->h.numQuestions; i++)                     // For each question...
+        {
+            DNSQuestion q;
+            ptr = getQuestion(query, ptr, end, InterfaceID, &q);    // get the question...
+            if (!ptr) return(mDNSNULL);
+
+            for (rr=ResponseRecords; rr; rr=rr->NextResponse)       // and search our list of proposed answers
+            {
+                if (rr->NR_AnswerTo == ptr)                         // If we're going to generate a record answering this question
+                {                                                   // then put the question in the question section
+                    responseptr = putQuestion(response, responseptr, limit, &q.qname, q.qtype, q.qclass);
+                    if (!responseptr) { debugf("GenerateUnicastResponse: Ran out of space for questions!"); return(mDNSNULL); }
+                    break;      // break out of the ResponseRecords loop, and go on to the next question
+                }
+            }
+        }
+
+        if (response->h.numQuestions == 0) { LogMsg("GenerateUnicastResponse: ERROR! Why no questions?"); return(mDNSNULL); }
+    }
+
+    // ***
+    // *** 2. Write Answers
+    // ***
+    for (rr=ResponseRecords; rr; rr=rr->NextResponse)
+        if (rr->NR_AnswerTo)
+        {
+            mDNSu8 *p = PutResourceRecordTTL(response, responseptr, &response->h.numAnswers, &rr->resrec,
+                                             maxttl < rr->resrec.rroriginalttl ? maxttl : rr->resrec.rroriginalttl);
+            if (p) responseptr = p;
+            else { debugf("GenerateUnicastResponse: Ran out of space for answers!"); response->h.flags.b[0] |= kDNSFlag0_TC; }
+        }
+
+    // ***
+    // *** 3. Write Additionals
+    // ***
+    for (rr=ResponseRecords; rr; rr=rr->NextResponse)
+        if (rr->NR_AdditionalTo && !rr->NR_AnswerTo)
+        {
+            mDNSu8 *p = PutResourceRecordTTL(response, responseptr, &response->h.numAdditionals, &rr->resrec,
+                                             maxttl < rr->resrec.rroriginalttl ? maxttl : rr->resrec.rroriginalttl);
+            if (p) responseptr = p;
+            else debugf("GenerateUnicastResponse: No more space for additionals");
+        }
+
+    return(responseptr);
+}
+
+// AuthRecord *our is our Resource Record
+// CacheRecord *pkt is the Resource Record from the response packet we've witnessed on the network
+// Returns 0 if there is no conflict
+// Returns +1 if there was a conflict and we won
+// Returns -1 if there was a conflict and we lost and have to rename
+mDNSlocal int CompareRData(const AuthRecord *const our, const CacheRecord *const pkt)
+{
+    mDNSu8 ourdata[256], *ourptr = ourdata, *ourend;
+    mDNSu8 pktdata[256], *pktptr = pktdata, *pktend;
+    if (!our) { LogMsg("CompareRData ERROR: our is NULL"); return(+1); }
+    if (!pkt) { LogMsg("CompareRData ERROR: pkt is NULL"); return(+1); }
+
+    ourend = putRData(mDNSNULL, ourdata, ourdata + sizeof(ourdata), &our->resrec);
+    pktend = putRData(mDNSNULL, pktdata, pktdata + sizeof(pktdata), &pkt->resrec);
+    while (ourptr < ourend && pktptr < pktend && *ourptr == *pktptr) { ourptr++; pktptr++; }
+    if (ourptr >= ourend && pktptr >= pktend) return(0);            // If data identical, not a conflict
+
+    if (ourptr >= ourend) return(-1);                               // Our data ran out first; We lost
+    if (pktptr >= pktend) return(+1);                               // Packet data ran out first; We won
+    if (*pktptr > *ourptr) return(-1);                              // Our data is numerically lower; We lost
+    if (*pktptr < *ourptr) return(+1);                              // Packet data is numerically lower; We won
+
+    LogMsg("CompareRData ERROR: Invalid state");
+    return(-1);
+}
+
+// See if we have an authoritative record that's identical to this packet record,
+// whose canonical DependentOn record is the specified master record.
+// The DependentOn pointer is typically used for the TXT record of service registrations
+// It indicates that there is no inherent conflict detection for the TXT record
+// -- it depends on the SRV record to resolve name conflicts
+// If we find any identical ResourceRecords in our authoritative list, then follow their DependentOn
+// pointer chain (if any) to make sure we reach the canonical DependentOn record
+// If the record has no DependentOn, then just return that record's pointer
+// Returns NULL if we don't have any local RRs that are identical to the one from the packet
+mDNSlocal mDNSBool MatchDependentOn(const mDNS *const m, const CacheRecord *const pktrr, const AuthRecord *const master)
+{
+    const AuthRecord *r1;
+    for (r1 = m->ResourceRecords; r1; r1=r1->next)
+    {
+        if (IdenticalResourceRecord(&r1->resrec, &pktrr->resrec))
+        {
+            const AuthRecord *r2 = r1;
+            while (r2->DependentOn) r2 = r2->DependentOn;
+            if (r2 == master) return(mDNStrue);
+        }
+    }
+    for (r1 = m->DuplicateRecords; r1; r1=r1->next)
+    {
+        if (IdenticalResourceRecord(&r1->resrec, &pktrr->resrec))
+        {
+            const AuthRecord *r2 = r1;
+            while (r2->DependentOn) r2 = r2->DependentOn;
+            if (r2 == master) return(mDNStrue);
+        }
+    }
+    return(mDNSfalse);
+}
+
+// Find the canonical RRSet pointer for this RR received in a packet.
+// If we find any identical AuthRecord in our authoritative list, then follow its RRSet
+// pointers (if any) to make sure we return the canonical member of this name/type/class
+// Returns NULL if we don't have any local RRs that are identical to the one from the packet
+mDNSlocal const AuthRecord *FindRRSet(const mDNS *const m, const CacheRecord *const pktrr)
+{
+    const AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (IdenticalResourceRecord(&rr->resrec, &pktrr->resrec))
+        {
+            while (rr->RRSet && rr != rr->RRSet) rr = rr->RRSet;
+            return(rr);
+        }
+    }
+    return(mDNSNULL);
+}
+
+// PacketRRConflict is called when we've received an RR (pktrr) which has the same name
+// as one of our records (our) but different rdata.
+// 1. If our record is not a type that's supposed to be unique, we don't care.
+// 2a. If our record is marked as dependent on some other record for conflict detection, ignore this one.
+// 2b. If the packet rr exactly matches one of our other RRs, and *that* record's DependentOn pointer
+//     points to our record, ignore this conflict (e.g. the packet record matches one of our
+//     TXT records, and that record is marked as dependent on 'our', its SRV record).
+// 3. If we have some *other* RR that exactly matches the one from the packet, and that record and our record
+//    are members of the same RRSet, then this is not a conflict.
+mDNSlocal mDNSBool PacketRRConflict(const mDNS *const m, const AuthRecord *const our, const CacheRecord *const pktrr)
+{
+    // If not supposed to be unique, not a conflict
+    if (!(our->resrec.RecordType & kDNSRecordTypeUniqueMask)) return(mDNSfalse);
+
+    // If a dependent record, not a conflict
+    if (our->DependentOn || MatchDependentOn(m, pktrr, our)) return(mDNSfalse);
+    else
+    {
+        // If the pktrr matches a member of ourset, not a conflict
+        const AuthRecord *ourset = our->RRSet ? our->RRSet : our;
+        const AuthRecord *pktset = FindRRSet(m, pktrr);
+        if (pktset == ourset) return(mDNSfalse);
+
+        // For records we're proxying, where we don't know the full
+        // relationship between the records, having any matching record
+        // in our AuthRecords list is sufficient evidence of non-conflict
+        if (our->WakeUp.HMAC.l[0] && pktset) return(mDNSfalse);
+    }
+
+    // Okay, this is a conflict
+    return(mDNStrue);
+}
+
+// Note: ResolveSimultaneousProbe calls mDNS_Deregister_internal which can call a user callback, which may change
+// the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSlocal void ResolveSimultaneousProbe(mDNS *const m, const DNSMessage *const query, const mDNSu8 *const end,
+                                        DNSQuestion *q, AuthRecord *our)
+{
+    int i;
+    const mDNSu8 *ptr = LocateAuthorities(query, end);
+    mDNSBool FoundUpdate = mDNSfalse;
+
+    for (i = 0; i < query->h.numAuthorities; i++)
+    {
+        ptr = GetLargeResourceRecord(m, query, ptr, end, q->InterfaceID, kDNSRecordTypePacketAuth, &m->rec);
+        if (!ptr) break;
+        if (m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && ResourceRecordAnswersQuestion(&m->rec.r.resrec, q))
+        {
+            FoundUpdate = mDNStrue;
+            if (PacketRRConflict(m, our, &m->rec.r))
+            {
+                int result          = (int)our->resrec.rrclass - (int)m->rec.r.resrec.rrclass;
+                if (!result) result = (int)our->resrec.rrtype  - (int)m->rec.r.resrec.rrtype;
+                if (!result) result = CompareRData(our, &m->rec.r);
+                if (result)
+                {
+                    const char *const msg = (result < 0) ? "lost:" : (result > 0) ? "won: " : "tie: ";
+                    LogMsg("ResolveSimultaneousProbe: %p Pkt Record:        %08lX %s", q->InterfaceID, m->rec.r.resrec.rdatahash, CRDisplayString(m, &m->rec.r));
+                    LogMsg("ResolveSimultaneousProbe: %p Our Record %d %s %08lX %s", our->resrec.InterfaceID, our->ProbeCount, msg, our->resrec.rdatahash, ARDisplayString(m, our));
+                }
+                // If we lost the tie-break for simultaneous probes, we don't immediately give up, because we might be seeing stale packets on the network.
+                // Instead we pause for one second, to give the other host (if real) a chance to establish its name, and then try probing again.
+                // If there really is another live host out there with the same name, it will answer our probes and we'll then rename.
+                if (result < 0)
+                {
+                    m->SuppressProbes   = NonZeroTime(m->timenow + mDNSPlatformOneSecond);
+                    our->ProbeCount     = DefaultProbeCountForTypeUnique;
+                    our->AnnounceCount  = InitialAnnounceCount;
+                    InitializeLastAPTime(m, our);
+                    goto exit;
+                }
+            }
+#if 0
+            else
+            {
+                LogMsg("ResolveSimultaneousProbe: %p Pkt Record:        %08lX %s", q->InterfaceID, m->rec.r.resrec.rdatahash, CRDisplayString(m, &m->rec.r));
+                LogMsg("ResolveSimultaneousProbe: %p Our Record %d ign:  %08lX %s", our->resrec.InterfaceID, our->ProbeCount, our->resrec.rdatahash, ARDisplayString(m, our));
+            }
+#endif
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+    if (!FoundUpdate)
+        LogInfo("ResolveSimultaneousProbe: %##s (%s): No Update Record found", our->resrec.name->c, DNSTypeName(our->resrec.rrtype));
+exit:
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+}
+
+mDNSlocal CacheRecord *FindIdenticalRecordInCache(const mDNS *const m, const ResourceRecord *const pktrr)
+{
+    mDNSu32 slot = HashSlot(pktrr->name);
+    CacheGroup *cg = CacheGroupForRecord(m, slot, pktrr);
+    CacheRecord *rr;
+    mDNSBool match;
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        if (!pktrr->InterfaceID)
+        {
+            mDNSu16 id1 = (pktrr->rDNSServer ? pktrr->rDNSServer->resGroupID : 0);
+            mDNSu16 id2 = (rr->resrec.rDNSServer ? rr->resrec.rDNSServer->resGroupID : 0);
+            match = (id1 == id2);
+        }
+        else match = (pktrr->InterfaceID == rr->resrec.InterfaceID);
+
+        if (match && IdenticalSameNameRecord(pktrr, &rr->resrec)) break;
+    }
+    return(rr);
+}
+mDNSlocal void DeregisterProxyRecord(mDNS *const m, AuthRecord *const rr)
+{
+    rr->WakeUp.HMAC    = zeroEthAddr; // Clear HMAC so that mDNS_Deregister_internal doesn't waste packets trying to wake this host
+    rr->RequireGoodbye = mDNSfalse;   // and we don't want to send goodbye for it
+    mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+    SetSPSProxyListChanged(m->rec.r.resrec.InterfaceID);
+}
+
+mDNSlocal void ClearKeepaliveProxyRecords(mDNS *const m, const OwnerOptData *const owner, AuthRecord *const thelist, const mDNSInterfaceID InterfaceID)
+{
+    if (m->CurrentRecord)
+        LogMsg("ClearIdenticalProxyRecords ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = thelist;
+
+    // Normally, the RDATA of the keepalive record will be different each time and hence we always
+    // clean up the keepalive record.
+    while (m->CurrentRecord)
+    {
+        AuthRecord *const rr = m->CurrentRecord;
+        if (InterfaceID == rr->resrec.InterfaceID && mDNSSameEthAddress(&owner->HMAC, &rr->WakeUp.HMAC))
+        {
+            if (mDNS_KeepaliveRecord(&m->rec.r.resrec))
+            {
+                LogSPS("ClearKeepaliveProxyRecords: Removing %3d H-MAC %.6a I-MAC %.6a %d %d %s",
+                       m->ProxyRecords, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, rr->WakeUp.seq, owner->seq, ARDisplayString(m, rr));
+                DeregisterProxyRecord(m, rr);
+            }
+        }
+        // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+        // new records could have been added to the end of the list as a result of that call.
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+// Called from mDNSCoreReceiveUpdate when we get a sleep proxy registration request,
+// to check our lists and discard any stale duplicates of this record we already have
+mDNSlocal void ClearIdenticalProxyRecords(mDNS *const m, const OwnerOptData *const owner, AuthRecord *const thelist)
+{
+    if (m->CurrentRecord)
+        LogMsg("ClearIdenticalProxyRecords ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = thelist;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *const rr = m->CurrentRecord;
+        if (m->rec.r.resrec.InterfaceID == rr->resrec.InterfaceID && mDNSSameEthAddress(&owner->HMAC, &rr->WakeUp.HMAC))
+            if (IdenticalResourceRecord(&rr->resrec, &m->rec.r.resrec))
+            {
+                LogSPS("ClearIdenticalProxyRecords: Removing %3d H-MAC %.6a I-MAC %.6a %d %d %s",
+                       m->ProxyRecords, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, rr->WakeUp.seq, owner->seq, ARDisplayString(m, rr));
+                DeregisterProxyRecord(m, rr);
+            }
+        // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+        // new records could have been added to the end of the list as a result of that call.
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+// Called from ProcessQuery when we get an mDNS packet with an owner record in it
+mDNSlocal void ClearProxyRecords(mDNS *const m, const OwnerOptData *const owner, AuthRecord *const thelist)
+{
+    if (m->CurrentRecord)
+        LogMsg("ClearProxyRecords ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = thelist;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *const rr = m->CurrentRecord;
+        if (m->rec.r.resrec.InterfaceID == rr->resrec.InterfaceID && mDNSSameEthAddress(&owner->HMAC, &rr->WakeUp.HMAC))
+            if (owner->seq != rr->WakeUp.seq || m->timenow - rr->TimeRcvd > mDNSPlatformOneSecond * 60)
+            {
+                if (rr->AddressProxy.type == mDNSAddrType_IPv6)
+                {
+                    // We don't do this here because we know that the host is waking up at this point, so we don't send
+                    // Unsolicited Neighbor Advertisements -- even Neighbor Advertisements agreeing with what the host should be
+                    // saying itself -- because it can cause some IPv6 stacks to falsely conclude that there's an address conflict.
+                    #if MDNS_USE_Unsolicited_Neighbor_Advertisements
+                    LogSPS("NDP Announcement -- Releasing traffic for H-MAC %.6a I-MAC %.6a %s",
+                           &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m,rr));
+                    SendNDP(m, NDP_Adv, NDP_Override, rr, &rr->AddressProxy.ip.v6, &rr->WakeUp.IMAC, &AllHosts_v6, &AllHosts_v6_Eth);
+                    #endif
+                }
+                LogSPS("ClearProxyRecords: Removing %3d AC %2d %02X H-MAC %.6a I-MAC %.6a %d %d %s",
+                       m->ProxyRecords, rr->AnnounceCount, rr->resrec.RecordType,
+                       &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, rr->WakeUp.seq, owner->seq, ARDisplayString(m, rr));
+                if (rr->resrec.RecordType == kDNSRecordTypeDeregistering) rr->resrec.RecordType = kDNSRecordTypeShared;
+                rr->WakeUp.HMAC = zeroEthAddr;  // Clear HMAC so that mDNS_Deregister_internal doesn't waste packets trying to wake this host
+                rr->RequireGoodbye = mDNSfalse; // and we don't want to send goodbye for it, since real host is now back and functional
+                mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+                SetSPSProxyListChanged(m->rec.r.resrec.InterfaceID);
+            }
+        // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+        // new records could have been added to the end of the list as a result of that call.
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+// ProcessQuery examines a received query to see if we have any answers to give
+mDNSlocal mDNSu8 *ProcessQuery(mDNS *const m, const DNSMessage *const query, const mDNSu8 *const end,
+                               const mDNSAddr *srcaddr, const mDNSInterfaceID InterfaceID, mDNSBool LegacyQuery, mDNSBool QueryWasMulticast,
+                               mDNSBool QueryWasLocalUnicast, DNSMessage *const response)
+{
+    mDNSBool FromLocalSubnet    = srcaddr && mDNS_AddressIsLocalSubnet(m, InterfaceID, srcaddr, mDNSNULL);
+    AuthRecord   *ResponseRecords    = mDNSNULL;
+    AuthRecord  **nrp                = &ResponseRecords;
+
+#if POOF_ENABLED
+    CacheRecord  *ExpectedAnswers    = mDNSNULL;            // Records in our cache we expect to see updated
+    CacheRecord **eap                = &ExpectedAnswers;
+#endif // POOF_ENABLED
+
+    DNSQuestion  *DupQuestions       = mDNSNULL;            // Our questions that are identical to questions in this packet
+    DNSQuestion **dqp                = &DupQuestions;
+    mDNSs32 delayresponse      = 0;
+    mDNSBool SendLegacyResponse = mDNSfalse;
+    const mDNSu8 *ptr;
+    mDNSu8       *responseptr        = mDNSNULL;
+    AuthRecord   *rr;
+    int i;
+    CacheRecord *McastNSEC3Records   = mDNSNULL;
+
+    // ***
+    // *** 1. Look in Additional Section for an OPT record
+    // ***
+    ptr = LocateOptRR(query, end, DNSOpt_OwnerData_ID_Space);
+    if (ptr)
+    {
+        ptr = GetLargeResourceRecord(m, query, ptr, end, InterfaceID, kDNSRecordTypePacketAdd, &m->rec);
+        if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && m->rec.r.resrec.rrtype == kDNSType_OPT)
+        {
+            const rdataOPT *opt;
+            const rdataOPT *const e = (const rdataOPT *)&m->rec.r.resrec.rdata->u.data[m->rec.r.resrec.rdlength];
+            // Find owner sub-option(s). We verify that the MAC is non-zero, otherwise we could inadvertently
+            // delete all our own AuthRecords (which are identified by having zero MAC tags on them).
+            for (opt = &m->rec.r.resrec.rdata->u.opt[0]; opt < e; opt++)
+                if (opt->opt == kDNSOpt_Owner && opt->u.owner.vers == 0 && opt->u.owner.HMAC.l[0])
+                {
+                    ClearProxyRecords(m, &opt->u.owner, m->DuplicateRecords);
+                    ClearProxyRecords(m, &opt->u.owner, m->ResourceRecords);
+                }
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+
+    // 
+    // Look in Authority Section for NSEC3 record
+    // 
+
+    mDNSParseNSEC3Records(m, query, end, InterfaceID, &McastNSEC3Records);
+
+    // ***
+    // *** 2. Parse Question Section and mark potential answers
+    // ***
+    ptr = query->data;
+    for (i=0; i<query->h.numQuestions; i++)                     // For each question...
+    {
+        mDNSBool QuestionNeedsMulticastResponse;
+        int NumAnswersForThisQuestion = 0;
+        AuthRecord *NSECAnswer = mDNSNULL;
+        DNSQuestion pktq, *q;
+        ptr = getQuestion(query, ptr, end, InterfaceID, &pktq); // get the question...
+        if (!ptr) goto exit;
+
+        pktq.AnonInfo = mDNSNULL;
+        if (McastNSEC3Records)
+            InitializeAnonInfoForQuestion(m, &McastNSEC3Records, &pktq);
+        // The only queries that *need* a multicast response are:
+        // * Queries sent via multicast
+        // * from port 5353
+        // * that don't have the kDNSQClass_UnicastResponse bit set
+        // These queries need multicast responses because other clients will:
+        // * suppress their own identical questions when they see these questions, and
+        // * expire their cache records if they don't see the expected responses
+        // For other queries, we may still choose to send the occasional multicast response anyway,
+        // to keep our neighbours caches warm, and for ongoing conflict detection.
+        QuestionNeedsMulticastResponse = QueryWasMulticast && !LegacyQuery && !(pktq.qclass & kDNSQClass_UnicastResponse);
+
+        if (pktq.qclass & kDNSQClass_UnicastResponse)
+            m->mDNSStats.UnicastBitInQueries++;
+        else
+            m->mDNSStats.NormalQueries++;
+
+        // Clear the UnicastResponse flag -- don't want to confuse the rest of the code that follows later
+        pktq.qclass &= ~kDNSQClass_UnicastResponse;
+
+        // Note: We use the m->CurrentRecord mechanism here because calling ResolveSimultaneousProbe
+        // can result in user callbacks which may change the record list and/or question list.
+        // Also note: we just mark potential answer records here, without trying to build the
+        // "ResponseRecords" list, because we don't want to risk user callbacks deleting records
+        // from that list while we're in the middle of trying to build it.
+        if (m->CurrentRecord)
+            LogMsg("ProcessQuery ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+        m->CurrentRecord = m->ResourceRecords;
+        while (m->CurrentRecord)
+        {
+            rr = m->CurrentRecord;
+            m->CurrentRecord = rr->next;
+            if (AnyTypeRecordAnswersQuestion(&rr->resrec, &pktq) && (QueryWasMulticast || QueryWasLocalUnicast || rr->AllowRemoteQuery))
+            {
+                m->mDNSStats.MatchingAnswersForQueries++;
+                if (RRTypeAnswersQuestionType(&rr->resrec, pktq.qtype))
+                {
+                    if (rr->resrec.RecordType == kDNSRecordTypeUnique)
+                        ResolveSimultaneousProbe(m, query, end, &pktq, rr);
+                    else if (ResourceRecordIsValidAnswer(rr))
+                    {
+                        NumAnswersForThisQuestion++;
+                        // As we have verified this question to be part of the same subset,
+                        // set the anonymous data which is needed below when walk the cache
+                        // records to see what answers we should be expecting. The cache records
+                        // may cache only the nsec3RR and not the anonymous data itself. 
+                        if (pktq.AnonInfo && rr->resrec.AnonInfo)
+                            SetAnonData(&pktq, &rr->resrec, mDNStrue);
+
+                        // Note: We should check here if this is a probe-type query, and if so, generate an immediate
+                        // unicast answer back to the source, because timeliness in answering probes is important.
+
+                        // Notes:
+                        // NR_AnswerTo pointing into query packet means "answer via immediate legacy unicast" (may *also* choose to multicast)
+                        // NR_AnswerTo == NR_AnswerUnicast   means "answer via delayed unicast" (to modern querier; may promote to multicast instead)
+                        // NR_AnswerTo == NR_AnswerMulticast means "definitely answer via multicast" (can't downgrade to unicast later)
+                        // If we're not multicasting this record because the kDNSQClass_UnicastResponse bit was set,
+                        // but the multicast querier is not on a matching subnet (e.g. because of overlaid subnets on one link)
+                        // then we'll multicast it anyway (if we unicast, the receiver will ignore it because it has an apparently non-local source)
+                        if (QuestionNeedsMulticastResponse || (!FromLocalSubnet && QueryWasMulticast && !LegacyQuery))
+                        {
+                            // We only mark this question for sending if it is at least one second since the last time we multicast it
+                            // on this interface. If it is more than a second, or LastMCInterface is different, then we may multicast it.
+                            // This is to guard against the case where someone blasts us with queries as fast as they can.
+                            if (m->timenow - (rr->LastMCTime + mDNSPlatformOneSecond) >= 0 ||
+                                (rr->LastMCInterface != mDNSInterfaceMark && rr->LastMCInterface != InterfaceID))
+                                rr->NR_AnswerTo = NR_AnswerMulticast;
+                        }
+                        else if (!rr->NR_AnswerTo) rr->NR_AnswerTo = LegacyQuery ? ptr : NR_AnswerUnicast;
+                    }
+                }
+                else if ((rr->resrec.RecordType & kDNSRecordTypeActiveUniqueMask) && ResourceRecordIsValidAnswer(rr))
+                {
+                    // If we don't have any answers for this question, but we do own another record with the same name,
+                    // then we'll want to mark it to generate an NSEC record on this interface
+                    if (!NSECAnswer) NSECAnswer = rr;
+                }
+            }
+        }
+
+        if (NumAnswersForThisQuestion == 0 && NSECAnswer)
+        {
+            NumAnswersForThisQuestion++;
+            NSECAnswer->SendNSECNow = InterfaceID;
+            m->NextScheduledResponse = m->timenow;
+        }
+
+        // If we couldn't answer this question, someone else might be able to,
+        // so use random delay on response to reduce collisions
+        if (NumAnswersForThisQuestion == 0) delayresponse = mDNSPlatformOneSecond;  // Divided by 50 = 20ms
+
+        if (query->h.flags.b[0] & kDNSFlag0_TC)
+            m->mDNSStats.KnownAnswerMultiplePkts++;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+        if (QuestionNeedsMulticastResponse)
+#else
+        // We only do the following accelerated cache expiration and duplicate question suppression processing
+        // for non-truncated multicast queries with multicast responses.
+        // For any query generating a unicast response we don't do this because we can't assume we will see the response.
+        // For truncated queries we don't do this because a response we're expecting might be suppressed by a subsequent
+        // known-answer packet, and when there's packet loss we can't safely assume we'll receive *all* known-answer packets.
+        if (QuestionNeedsMulticastResponse && !(query->h.flags.b[0] & kDNSFlag0_TC))
+#endif
+        {
+#if POOF_ENABLED
+            const mDNSu32 slot = HashSlot(&pktq.qname);
+            CacheGroup *cg = CacheGroupForName(m, slot, pktq.qnamehash, &pktq.qname);
+            CacheRecord *cr;
+
+            // Make a list indicating which of our own cache records we expect to see updated as a result of this query
+            // Note: Records larger than 1K are not habitually multicast, so don't expect those to be updated
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            if (!(query->h.flags.b[0] & kDNSFlag0_TC))
+#endif // ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            for (cr = cg ? cg->members : mDNSNULL; cr; cr=cr->next)
+                if (SameNameRecordAnswersQuestion(&cr->resrec, &pktq) && cr->resrec.rdlength <= SmallRecordLimit)
+                    if (!cr->NextInKAList && eap != &cr->NextInKAList)
+                    {
+                        *eap = cr;
+                        eap = &cr->NextInKAList;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+                        if (cr->MPUnansweredQ == 0 || m->timenow - cr->MPLastUnansweredQT >= mDNSPlatformOneSecond)
+                        {
+                            // Although MPUnansweredQ is only really used for multi-packet query processing,
+                            // we increment it for both single-packet and multi-packet queries, so that it stays in sync
+                            // with the MPUnansweredKA value, which by necessity is incremented for both query types.
+                            cr->MPUnansweredQ++;
+                            cr->MPLastUnansweredQT = m->timenow;
+                            cr->MPExpectingKA = mDNStrue;
+                        }
+#endif // ENABLE_MULTI_PACKET_QUERY_SNOOPING
+                    }
+#endif // POOF_ENABLED
+
+            // Check if this question is the same as any of mine.
+            // We only do this for non-truncated queries. Right now it would be too complicated to try
+            // to keep track of duplicate suppression state between multiple packets, especially when we
+            // can't guarantee to receive all of the Known Answer packets that go with a particular query.
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            if (!(query->h.flags.b[0] & kDNSFlag0_TC))
+#endif
+            // For anonymous question, the duplicate suppressesion should happen if the
+            // question belongs in the same group. As the group is expected to be
+            // small, we don't do the optimization for now.
+            if (!pktq.AnonInfo)
+            {
+                for (q = m->Questions; q; q=q->next)
+                    if (!q->Target.type && ActiveQuestion(q) && m->timenow - q->LastQTxTime > mDNSPlatformOneSecond / 4)
+                        if (!q->InterfaceID || q->InterfaceID == InterfaceID)
+                            if (q->NextInDQList == mDNSNULL && dqp != &q->NextInDQList)
+                                if (q->qtype == pktq.qtype &&
+                                    q->qclass == pktq.qclass &&
+                                    q->qnamehash == pktq.qnamehash && SameDomainName(&q->qname, &pktq.qname))
+                                { *dqp = q; dqp = &q->NextInDQList; }
+            }
+        }
+        if (pktq.AnonInfo)
+        {
+            FreeAnonInfo(pktq.AnonInfo);
+        }
+    }
+
+    // ***
+    // *** 3. Now we can safely build the list of marked answers
+    // ***
+    for (rr = m->ResourceRecords; rr; rr=rr->next)              // Now build our list of potential answers
+        if (rr->NR_AnswerTo)                                    // If we marked the record...
+            AddRecordToResponseList(&nrp, rr, mDNSNULL);        // ... add it to the list
+
+    // ***
+    // *** 4. Add additional records
+    // ***
+    AddAdditionalsToResponseList(m, ResponseRecords, &nrp, InterfaceID);
+
+    // ***
+    // *** 5. Parse Answer Section and cancel any records disallowed by Known-Answer list
+    // ***
+    for (i=0; i<query->h.numAnswers; i++)                       // For each record in the query's answer section...
+    {
+        // Get the record...
+        CacheRecord *ourcacherr;
+        ptr = GetLargeResourceRecord(m, query, ptr, end, InterfaceID, kDNSRecordTypePacketAns, &m->rec);
+        if (!ptr) goto exit;
+        if (m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative)
+        {
+            // See if this Known-Answer suppresses any of our currently planned answers
+            for (rr=ResponseRecords; rr; rr=rr->NextResponse)
+            {
+                if (MustSendRecord(rr) && ShouldSuppressKnownAnswer(&m->rec.r, rr))
+                {
+                    m->mDNSStats.KnownAnswerSuppressions++;
+                    rr->NR_AnswerTo = mDNSNULL;
+                    rr->NR_AdditionalTo = mDNSNULL;
+                }
+            }
+
+            // See if this Known-Answer suppresses any previously scheduled answers (for multi-packet KA suppression)
+            for (rr=m->ResourceRecords; rr; rr=rr->next)
+            {
+                // If we're planning to send this answer on this interface, and only on this interface, then allow KA suppression
+                if (rr->ImmedAnswer == InterfaceID && ShouldSuppressKnownAnswer(&m->rec.r, rr))
+                {
+                    if (srcaddr->type == mDNSAddrType_IPv4)
+                    {
+                        if (mDNSSameIPv4Address(rr->v4Requester, srcaddr->ip.v4)) rr->v4Requester = zerov4Addr;
+                    }
+                    else if (srcaddr->type == mDNSAddrType_IPv6)
+                    {
+                        if (mDNSSameIPv6Address(rr->v6Requester, srcaddr->ip.v6)) rr->v6Requester = zerov6Addr;
+                    }
+                    if (mDNSIPv4AddressIsZero(rr->v4Requester) && mDNSIPv6AddressIsZero(rr->v6Requester))
+                    {
+                        m->mDNSStats.KnownAnswerSuppressions++;
+                        rr->ImmedAnswer  = mDNSNULL;
+                        rr->ImmedUnicast = mDNSfalse;
+    #if MDNS_LOG_ANSWER_SUPPRESSION_TIMES
+                        LogMsg("Suppressed after%4d: %s", m->timenow - rr->ImmedAnswerMarkTime, ARDisplayString(m, rr));
+    #endif
+                    }
+                }
+            }
+
+            ourcacherr = FindIdenticalRecordInCache(m, &m->rec.r.resrec);
+
+    #if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            // See if this Known-Answer suppresses any answers we were expecting for our cache records. We do this always,
+            // even if the TC bit is not set (the TC bit will *not* be set in the *last* packet of a multi-packet KA list).
+            if (ourcacherr && ourcacherr->MPExpectingKA && m->timenow - ourcacherr->MPLastUnansweredQT < mDNSPlatformOneSecond)
+            {
+                ourcacherr->MPUnansweredKA++;
+                ourcacherr->MPExpectingKA = mDNSfalse;
+            }
+    #endif
+
+#if POOF_ENABLED
+            // Having built our ExpectedAnswers list from the questions in this packet, we then remove
+            // any records that are suppressed by the Known Answer list in this packet.
+            eap = &ExpectedAnswers;
+            while (*eap)
+            {
+                CacheRecord *cr = *eap;
+                if (cr->resrec.InterfaceID == InterfaceID && IdenticalResourceRecord(&m->rec.r.resrec, &cr->resrec))
+                { *eap = cr->NextInKAList; cr->NextInKAList = mDNSNULL; }
+                else eap = &cr->NextInKAList;
+            }
+#endif // POOF_ENABLED
+
+            // See if this Known-Answer is a surprise to us. If so, we shouldn't suppress our own query.
+            if (!ourcacherr)
+            {
+                dqp = &DupQuestions;
+                while (*dqp)
+                {
+                    DNSQuestion *q = *dqp;
+                    if (ResourceRecordAnswersQuestion(&m->rec.r.resrec, q))
+                    { *dqp = q->NextInDQList; q->NextInDQList = mDNSNULL; }
+                    else dqp = &q->NextInDQList;
+                }
+            }
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+
+    // ***
+    // *** 6. Cancel any additionals that were added because of now-deleted records
+    // ***
+    for (rr=ResponseRecords; rr; rr=rr->NextResponse)
+        if (rr->NR_AdditionalTo && !MustSendRecord(rr->NR_AdditionalTo))
+        { rr->NR_AnswerTo = mDNSNULL; rr->NR_AdditionalTo = mDNSNULL; }
+
+    // ***
+    // *** 7. Mark the send flags on the records we plan to send
+    // ***
+    for (rr=ResponseRecords; rr; rr=rr->NextResponse)
+    {
+        if (rr->NR_AnswerTo)
+        {
+            mDNSBool SendMulticastResponse = mDNSfalse;     // Send modern multicast response
+            mDNSBool SendUnicastResponse   = mDNSfalse;     // Send modern unicast response (not legacy unicast response)
+
+#if !TARGET_OS_EMBEDDED
+    // always honor kDNSQClass_UnicastResponse in embedded environment to increase reliability
+    // in high multicast packet loss environments.
+
+            // If it's been one TTL/4 since we multicast this, then send a multicast response 
+            // for conflict detection, etc.
+            if (m->timenow - (rr->LastMCTime + TicksTTL(rr)/4) >= 0)
+            {
+                SendMulticastResponse = mDNStrue;
+                // If this record was marked for modern (delayed) unicast response, then mark it as promoted to
+                // multicast response instead (don't want to end up ALSO setting SendUnicastResponse in the check below).
+                // If this record was marked for legacy unicast response, then we mustn't change the NR_AnswerTo value.
+                if (rr->NR_AnswerTo == NR_AnswerUnicast)
+                {
+                    m->mDNSStats.UnicastDemotedToMulticast++;
+                    rr->NR_AnswerTo = NR_AnswerMulticast;
+                }
+            }
+#endif // !TARGET_OS_EMBEDDED
+
+            // If the client insists on a multicast response, then we'd better send one
+            if      (rr->NR_AnswerTo == NR_AnswerMulticast)
+            {
+                m->mDNSStats.MulticastResponses++;
+                SendMulticastResponse = mDNStrue;
+            }
+            else if (rr->NR_AnswerTo == NR_AnswerUnicast)
+            {
+                m->mDNSStats.UnicastResponses++;
+                SendUnicastResponse   = mDNStrue;
+            }
+            else if (rr->NR_AnswerTo)
+            {
+                SendLegacyResponse    = mDNStrue;
+            }
+            
+
+            if (SendMulticastResponse || SendUnicastResponse)
+            {
+#if MDNS_LOG_ANSWER_SUPPRESSION_TIMES
+                rr->ImmedAnswerMarkTime = m->timenow;
+#endif
+                m->NextScheduledResponse = m->timenow;
+                // If we're already planning to send this on another interface, just send it on all interfaces
+                if (rr->ImmedAnswer && rr->ImmedAnswer != InterfaceID)
+                    rr->ImmedAnswer = mDNSInterfaceMark;
+                else
+                {
+                    rr->ImmedAnswer = InterfaceID;          // Record interface to send it on
+                    if (SendUnicastResponse) rr->ImmedUnicast = mDNStrue;
+                    if (srcaddr->type == mDNSAddrType_IPv4)
+                    {
+                        if      (mDNSIPv4AddressIsZero(rr->v4Requester)) rr->v4Requester = srcaddr->ip.v4;
+                        else if (!mDNSSameIPv4Address(rr->v4Requester, srcaddr->ip.v4)) rr->v4Requester = onesIPv4Addr;
+                    }
+                    else if (srcaddr->type == mDNSAddrType_IPv6)
+                    {
+                        if      (mDNSIPv6AddressIsZero(rr->v6Requester)) rr->v6Requester = srcaddr->ip.v6;
+                        else if (!mDNSSameIPv6Address(rr->v6Requester, srcaddr->ip.v6)) rr->v6Requester = onesIPv6Addr;
+                    }
+                }
+            }
+            // If TC flag is set, it means we should expect that additional known answers may be coming in another packet,
+            // so we allow roughly half a second before deciding to reply (we've observed inter-packet delays of 100-200ms on 802.11)
+            // else, if record is a shared one, spread responses over 100ms to avoid implosion of simultaneous responses
+            // else, for a simple unique record reply, we can reply immediately; no need for delay
+            if      (query->h.flags.b[0] & kDNSFlag0_TC) delayresponse = mDNSPlatformOneSecond * 20;            // Divided by 50 = 400ms
+            else if (rr->resrec.RecordType == kDNSRecordTypeShared) delayresponse = mDNSPlatformOneSecond;      // Divided by 50 = 20ms
+        }
+        else if (rr->NR_AdditionalTo && rr->NR_AdditionalTo->NR_AnswerTo == NR_AnswerMulticast)
+        {
+            // Since additional records are an optimization anyway, we only ever send them on one interface at a time
+            // If two clients on different interfaces do queries that invoke the same optional additional answer,
+            // then the earlier client is out of luck
+            rr->ImmedAdditional = InterfaceID;
+            // No need to set m->NextScheduledResponse here
+            // We'll send these additional records when we send them, or not, as the case may be
+        }
+    }
+
+    // ***
+    // *** 8. If we think other machines are likely to answer these questions, set our packet suppression timer
+    // ***
+    if (delayresponse && (!m->SuppressSending || (m->SuppressSending - m->timenow) < (delayresponse + 49) / 50))
+    {
+#if MDNS_LOG_ANSWER_SUPPRESSION_TIMES
+        mDNSs32 oldss = m->SuppressSending;
+        if (oldss && delayresponse)
+            LogMsg("Current SuppressSending delay%5ld; require%5ld", m->SuppressSending - m->timenow, (delayresponse + 49) / 50);
+#endif
+        // Pick a random delay:
+        // We start with the base delay chosen above (typically either 1 second or 20 seconds),
+        // and add a random value in the range 0-5 seconds (making 1-6 seconds or 20-25 seconds).
+        // This is an integer value, with resolution determined by the platform clock rate.
+        // We then divide that by 50 to get the delay value in ticks. We defer the division until last
+        // to get better results on platforms with coarse clock granularity (e.g. ten ticks per second).
+        // The +49 before dividing is to ensure we round up, not down, to ensure that even
+        // on platforms where the native clock rate is less than fifty ticks per second,
+        // we still guarantee that the final calculated delay is at least one platform tick.
+        // We want to make sure we don't ever allow the delay to be zero ticks,
+        // because if that happens we'll fail the Bonjour Conformance Test.
+        // Our final computed delay is 20-120ms for normal delayed replies,
+        // or 400-500ms in the case of multi-packet known-answer lists.
+        m->SuppressSending = m->timenow + (delayresponse + (mDNSs32)mDNSRandom((mDNSu32)mDNSPlatformOneSecond*5) + 49) / 50;
+        if (m->SuppressSending == 0) m->SuppressSending = 1;
+#if MDNS_LOG_ANSWER_SUPPRESSION_TIMES
+        if (oldss && delayresponse)
+            LogMsg("Set     SuppressSending to   %5ld", m->SuppressSending - m->timenow);
+#endif
+    }
+
+    // ***
+    // *** 9. If query is from a legacy client, or from a new client requesting a unicast reply, then generate a unicast response too
+    // ***
+    if (SendLegacyResponse)
+        responseptr = GenerateUnicastResponse(query, end, InterfaceID, LegacyQuery, response, ResponseRecords);
+
+exit:
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+
+    // ***
+    // *** 10. Finally, clear our link chains ready for use next time
+    // ***
+    while (ResponseRecords)
+    {
+        rr = ResponseRecords;
+        ResponseRecords = rr->NextResponse;
+        rr->NextResponse    = mDNSNULL;
+        rr->NR_AnswerTo     = mDNSNULL;
+        rr->NR_AdditionalTo = mDNSNULL;
+    }
+
+#if POOF_ENABLED
+    while (ExpectedAnswers)
+    {
+        CacheRecord *cr = ExpectedAnswers;
+        ExpectedAnswers = cr->NextInKAList;
+        cr->NextInKAList = mDNSNULL;
+
+        // For non-truncated queries, we can definitively say that we should expect
+        // to be seeing a response for any records still left in the ExpectedAnswers list
+        if (!(query->h.flags.b[0] & kDNSFlag0_TC))
+            if (cr->UnansweredQueries == 0 || m->timenow - cr->LastUnansweredTime >= mDNSPlatformOneSecond)
+            {
+                cr->UnansweredQueries++;
+                cr->LastUnansweredTime = m->timenow;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+                if (cr->UnansweredQueries > 1)
+                    debugf("ProcessQuery: (!TC) UAQ %lu MPQ %lu MPKA %lu %s",
+                           cr->UnansweredQueries, cr->MPUnansweredQ, cr->MPUnansweredKA, CRDisplayString(m, cr));
+#endif // ENABLE_MULTI_PACKET_QUERY_SNOOPING
+                SetNextCacheCheckTimeForRecord(m, cr);
+            }
+
+        // If we've seen multiple unanswered queries for this record,
+        // then mark it to expire in five seconds if we don't get a response by then.
+        if (cr->UnansweredQueries >= MaxUnansweredQueries)
+        {
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            // Only show debugging message if this record was not about to expire anyway
+            if (RRExpireTime(cr) - m->timenow > 4 * mDNSPlatformOneSecond)
+                debugf("ProcessQuery: (Max) UAQ %lu MPQ %lu MPKA %lu mDNS_Reconfirm() for %s",
+                       cr->UnansweredQueries, cr->MPUnansweredQ, cr->MPUnansweredKA, CRDisplayString(m, cr));
+#endif // ENABLE_MULTI_PACKET_QUERY_SNOOPING
+            m->mDNSStats.PoofCacheDeletions++;
+            mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForNoAnswer);
+        }
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+        // Make a guess, based on the multi-packet query / known answer counts, whether we think we
+        // should have seen an answer for this. (We multiply MPQ by 4 and MPKA by 5, to allow for
+        // possible packet loss of up to 20% of the additional KA packets.)
+        else if (cr->MPUnansweredQ * 4 > cr->MPUnansweredKA * 5 + 8)
+        {
+            // We want to do this conservatively.
+            // If there are so many machines on the network that they have to use multi-packet known-answer lists,
+            // then we don't want them to all hit the network simultaneously with their final expiration queries.
+            // By setting the record to expire in four minutes, we achieve two things:
+            // (a) the 90-95% final expiration queries will be less bunched together
+            // (b) we allow some time for us to witness enough other failed queries that we don't have to do our own
+            mDNSu32 remain = (mDNSu32)(RRExpireTime(cr) - m->timenow) / 4;
+            if (remain > 240 * (mDNSu32)mDNSPlatformOneSecond)
+                remain = 240 * (mDNSu32)mDNSPlatformOneSecond;
+
+            // Only show debugging message if this record was not about to expire anyway
+            if (RRExpireTime(cr) - m->timenow > 4 * mDNSPlatformOneSecond)
+                debugf("ProcessQuery: (MPQ) UAQ %lu MPQ %lu MPKA %lu mDNS_Reconfirm() for %s",
+                       cr->UnansweredQueries, cr->MPUnansweredQ, cr->MPUnansweredKA, CRDisplayString(m, cr));
+
+            if (remain <= 60 * (mDNSu32)mDNSPlatformOneSecond)
+                cr->UnansweredQueries++;    // Treat this as equivalent to one definite unanswered query
+            cr->MPUnansweredQ  = 0;         // Clear MPQ/MPKA statistics
+            cr->MPUnansweredKA = 0;
+            cr->MPExpectingKA  = mDNSfalse;
+
+            if (remain < kDefaultReconfirmTimeForNoAnswer)
+                remain = kDefaultReconfirmTimeForNoAnswer;
+            mDNS_Reconfirm_internal(m, cr, remain);
+        }
+#endif // ENABLE_MULTI_PACKET_QUERY_SNOOPING
+    }
+#endif // POOF_ENABLED
+
+    while (DupQuestions)
+    {
+        DNSQuestion *q = DupQuestions;
+        DupQuestions = q->NextInDQList;
+        q->NextInDQList = mDNSNULL;
+        i = RecordDupSuppressInfo(q->DupSuppress, m->timenow, InterfaceID, srcaddr->type);
+        debugf("ProcessQuery: Recorded DSI for %##s (%s) on %p/%s %d", q->qname.c, DNSTypeName(q->qtype), InterfaceID,
+               srcaddr->type == mDNSAddrType_IPv4 ? "v4" : "v6", i);
+    }
+
+    if (McastNSEC3Records)
+    {
+        debugf("ProcessQuery: McastNSEC3Records not used");
+        FreeNSECRecords(m, McastNSEC3Records);
+    }
+
+    return(responseptr);
+}
+
+mDNSlocal void mDNSCoreReceiveQuery(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end,
+                                    const mDNSAddr *srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, mDNSIPPort dstport,
+                                    const mDNSInterfaceID InterfaceID)
+{
+    mDNSu8    *responseend = mDNSNULL;
+    mDNSBool QueryWasLocalUnicast = srcaddr && dstaddr &&
+                                    !mDNSAddrIsDNSMulticast(dstaddr) && mDNS_AddressIsLocalSubnet(m, InterfaceID, srcaddr, mDNSNULL);
+
+    if (!InterfaceID && dstaddr && mDNSAddrIsDNSMulticast(dstaddr))
+    {
+        LogMsg("Ignoring Query from %#-15a:%-5d to %#-15a:%-5d on 0x%p with "
+               "%2d Question%s %2d Answer%s %2d Authorit%s %2d Additional%s %d bytes (Multicast, but no InterfaceID)",
+               srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), InterfaceID,
+               msg->h.numQuestions,   msg->h.numQuestions   == 1 ? ", "   : "s,",
+               msg->h.numAnswers,     msg->h.numAnswers     == 1 ? ", "   : "s,",
+               msg->h.numAuthorities, msg->h.numAuthorities == 1 ? "y,  " : "ies,",
+               msg->h.numAdditionals, msg->h.numAdditionals == 1 ? " "    : "s", end - msg->data);
+        return;
+    }
+
+    verbosedebugf("Received Query from %#-15a:%-5d to %#-15a:%-5d on 0x%p with "
+                  "%2d Question%s %2d Answer%s %2d Authorit%s %2d Additional%s %d bytes",
+                  srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), InterfaceID,
+                  msg->h.numQuestions,   msg->h.numQuestions   == 1 ? ", "   : "s,",
+                  msg->h.numAnswers,     msg->h.numAnswers     == 1 ? ", "   : "s,",
+                  msg->h.numAuthorities, msg->h.numAuthorities == 1 ? "y,  " : "ies,",
+                  msg->h.numAdditionals, msg->h.numAdditionals == 1 ? " "    : "s", end - msg->data);
+
+    responseend = ProcessQuery(m, msg, end, srcaddr, InterfaceID,
+                               !mDNSSameIPPort(srcport, MulticastDNSPort), mDNSAddrIsDNSMulticast(dstaddr), QueryWasLocalUnicast, &m->omsg);
+
+    if (responseend)    // If responseend is non-null, that means we built a unicast response packet
+    {
+        debugf("Unicast Response: %d Question%s, %d Answer%s, %d Additional%s to %#-15a:%d on %p/%ld",
+               m->omsg.h.numQuestions,   m->omsg.h.numQuestions   == 1 ? "" : "s",
+               m->omsg.h.numAnswers,     m->omsg.h.numAnswers     == 1 ? "" : "s",
+               m->omsg.h.numAdditionals, m->omsg.h.numAdditionals == 1 ? "" : "s",
+               srcaddr, mDNSVal16(srcport), InterfaceID, srcaddr->type);
+        mDNSSendDNSMessage(m, &m->omsg, responseend, InterfaceID, mDNSNULL, srcaddr, srcport, mDNSNULL, mDNSNULL, mDNSfalse);
+    }
+}
+
+#if 0
+mDNSlocal mDNSBool TrustedSource(const mDNS *const m, const mDNSAddr *const srcaddr)
+{
+    DNSServer *s;
+    (void)m; // Unused
+    (void)srcaddr; // Unused
+    for (s = m->DNSServers; s; s = s->next)
+        if (mDNSSameAddress(srcaddr, &s->addr)) return(mDNStrue);
+    return(mDNSfalse);
+}
+#endif
+
+struct UDPSocket_struct
+{
+    mDNSIPPort port; // MUST BE FIRST FIELD -- mDNSCoreReceive expects every UDPSocket_struct to begin with mDNSIPPort port
+};
+
+mDNSlocal DNSQuestion *ExpectingUnicastResponseForQuestion(const mDNS *const m, const mDNSIPPort port, const mDNSOpaque16 id, const DNSQuestion *const question, mDNSBool tcp)
+{
+    DNSQuestion *q;
+    for (q = m->Questions; q; q=q->next)
+    {
+        if (!tcp && !q->LocalSocket) continue;
+        if (mDNSSameIPPort(tcp ? q->tcpSrcPort : q->LocalSocket->port, port)     &&
+            mDNSSameOpaque16(q->TargetQID,         id)       &&
+            q->qtype                  == question->qtype     &&
+            q->qclass                 == question->qclass    &&
+            q->qnamehash              == question->qnamehash &&
+            SameDomainName(&q->qname, &question->qname))
+            return(q);
+    }
+    return(mDNSNULL);
+}
+
+// This function is called when we receive a unicast response. This could be the case of a unicast response from the
+// DNS server or a response to the QU query. Hence, the cache record's InterfaceId can be both NULL or non-NULL (QU case)
+mDNSlocal DNSQuestion *ExpectingUnicastResponseForRecord(mDNS *const m,
+                                                         const mDNSAddr *const srcaddr, const mDNSBool SrcLocal, const mDNSIPPort port, const mDNSOpaque16 id, const CacheRecord *const rr, mDNSBool tcp)
+{
+    DNSQuestion *q;
+    (void)id;
+    (void)srcaddr;
+
+    for (q = m->Questions; q; q=q->next)
+    {
+        if (!q->DuplicateOf && ResourceRecordAnswersUnicastResponse(&rr->resrec, q))
+        {
+            if (!mDNSOpaque16IsZero(q->TargetQID))
+            {
+                debugf("ExpectingUnicastResponseForRecord msg->h.id %d q->TargetQID %d for %s", mDNSVal16(id), mDNSVal16(q->TargetQID), CRDisplayString(m, rr));
+
+                if (mDNSSameOpaque16(q->TargetQID, id))
+                {
+                    mDNSIPPort srcp;
+                    if (!tcp)
+                    {
+                        srcp = q->LocalSocket ? q->LocalSocket->port : zeroIPPort;
+                    }
+                    else
+                    {
+                        srcp = q->tcpSrcPort;
+                    }
+                    if (mDNSSameIPPort(srcp, port)) return(q);
+
+                    //	if (mDNSSameAddress(srcaddr, &q->Target))                   return(mDNStrue);
+                    //	if (q->LongLived && mDNSSameAddress(srcaddr, &q->servAddr)) return(mDNStrue); Shouldn't need this now that we have LLQType checking
+                    //	if (TrustedSource(m, srcaddr))                              return(mDNStrue);
+                    LogInfo("WARNING: Ignoring suspect uDNS response for %##s (%s) [q->Target %#a:%d] from %#a:%d %s",
+                            q->qname.c, DNSTypeName(q->qtype), &q->Target, mDNSVal16(srcp), srcaddr, mDNSVal16(port), CRDisplayString(m, rr));
+                    return(mDNSNULL);
+                }
+            }
+            else
+            {
+                if (SrcLocal && q->ExpectUnicastResp && (mDNSu32)(m->timenow - q->ExpectUnicastResp) < (mDNSu32)(mDNSPlatformOneSecond*2))
+                    return(q);
+            }
+        }
+    }
+    return(mDNSNULL);
+}
+
+// Return a pointer to the primary service name, skipping subtype name if present.
+mDNSlocal const domainname *getPrimaryServiceName(const domainname *domainName)
+{
+    const domainname *primaryName = domainName;
+    const domainname *subName = SkipLeadingLabels(domainName, 1);
+    
+    if (SameDomainLabel(subName->c, (const mDNSu8 *)mDNSSubTypeLabel))
+    {
+        // skip "<sub type name>._sub" portion of name
+        primaryName = SkipLeadingLabels(domainName, 2);
+        debugf("getPrimaryServiceName: returning %##s for _sub type", primaryName);
+    }
+
+    return primaryName;
+}
+
+// This function is not called if the packet is from us, which implies that we accept all multicast packets coming from us.
+mDNSlocal mDNSBool ExpectingMulticastResponseForRecord(mDNS *const m, CacheRecord *rr, const mDNSAddr *srcaddr, mDNSBool recordAccepted,
+    CacheRecord **McastNSEC3Records)
+{
+    DNSQuestion *q;
+
+    // Accept A and AAAA if we accepted something before in the same packet as most likely related to the
+    // service records that we may have accepted.
+    if (recordAccepted && (rr->resrec.rrtype == kDNSType_A || rr->resrec.rrtype == kDNSType_AAAA))
+    {
+        LogInfo("ExpectingMulticastResponseForRecord:A:AAAA: accepting %s, from %#a due to same packet %d", CRDisplayString(m, rr), srcaddr, m->PktNum);
+        return mDNStrue;
+    }
+    for (q = m->Questions; q; q=q->next)
+    {
+        if (!q->DuplicateOf && mDNSOpaque16IsZero(q->TargetQID))
+        {
+            mDNSBool ret;
+            // 1. If a resource record answers question, cache it. This also will cache NSECs if it asserts
+            //    non-existence of q->qtype. If we have any matching NSEC3 Records for the question, send
+            //    it along with the resource record. Do it only for questions that are expecting to
+            //    discover only its peers (q->AnonInfo not NULL)
+            if (q->AnonInfo && McastNSEC3Records && !rr->resrec.AnonInfo)
+            {
+                InitializeAnonInfoForCR(m, McastNSEC3Records, rr);
+            }
+            ret = ResourceRecordAnswersQuestion(&rr->resrec, q);
+            if (ret)
+            {
+                // The record and the question belong to the same subset. Set the
+                // anonymous data in the cache record.
+                if (q->AnonInfo && rr->resrec.AnonInfo)
+                {
+                    SetAnonData(q, &rr->resrec, mDNSfalse);
+                }
+                LogInfo("ExpectingMulticastResponseForRecord: Name and Type match, accepting %s, from %#a", CRDisplayString(m, rr), srcaddr);
+                if (rr->resrec.rrtype == kDNSType_NSEC)
+                    LogInfo("ExpectingMulticastResponseForRecord: record %s, question %##s (%s)", CRDisplayString(m, rr), q->qname.c, DNSTypeName(q->qtype));
+                return mDNStrue;
+            }
+            if (rr->resrec.rrtype == kDNSType_SRV || rr->resrec.rrtype == kDNSType_TXT)
+            {
+                // Point to the service type in the record name
+                const domainname *name = SkipLeadingLabels(rr->resrec.name, 1);
+
+                // If question is for a sub type, just compare against the primary service type
+                const domainname *primaryName = getPrimaryServiceName(&q->qname);
+
+                // 2. If the SRV or TXT record matches the service name, then cache it. If the TXT or SRV record is
+                //    before the PTR record in the packet, PTR record may not be in the cache yet and hence the logic
+                //    in (3) below will fail to cache it.
+                if (q->qtype == kDNSType_PTR && name && SameDomainName(primaryName, name))
+                {
+                    LogInfo("ExpectingMulticastResponseForRecord: Accepting %s due to PTR match, question %##s from %#a, pktnum %d",
+                        CRDisplayString(m, rr), q->qname.c, srcaddr, m->PktNum);
+                    return mDNStrue;
+                }
+
+                if (name)
+                {
+                    const mDNSu32 slot = HashSlot(name);
+                    const mDNSu32 namehash = DomainNameHashValue(name);
+                    CacheGroup *cg = CacheGroupForName(m, slot, namehash, name);
+                    CacheRecord *cr;
+     
+                    // 3. Same as in (2), but look in the cache in case we don't have the PTR question.
+
+                    for (cr = cg ? cg->members : mDNSNULL; cr; cr=cr->next)
+                    {
+                        if (cr->resrec.rrtype == kDNSType_PTR)
+                        {
+                            primaryName = getPrimaryServiceName(cr->resrec.name);
+
+                            if (SameDomainName(primaryName, name))
+                            {
+                                LogInfo("ExpectingMulticastResponseForRecord: accepting %s, from %#a, pktnum %d",
+                                    CRDisplayString(m, rr), srcaddr, m->PktNum);
+                                return mDNStrue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    debugf("ExpectingMulticastResponseForRecord: discarding %s, from %#a, pktnum %d", CRDisplayString(m, rr), srcaddr, m->PktNum);
+    return(mDNSfalse);
+}
+
+// Certain data types need more space for in-memory storage than their in-packet rdlength would imply
+// Currently this applies only to rdata types containing more than one domainname,
+// or types where the domainname is not the last item in the structure.
+mDNSlocal mDNSu16 GetRDLengthMem(const ResourceRecord *const rr)
+{
+    switch (rr->rrtype)
+    {
+    case kDNSType_SOA: return sizeof(rdataSOA);
+    case kDNSType_RP:  return sizeof(rdataRP);
+    case kDNSType_PX:  return sizeof(rdataPX);
+    default:           return rr->rdlength;
+    }
+}
+
+mDNSexport CacheRecord *CreateNewCacheEntry(mDNS *const m, const mDNSu32 slot, CacheGroup *cg, mDNSs32 delay, mDNSBool Add, const mDNSAddr *sourceAddress)
+{
+    CacheRecord *rr = mDNSNULL;
+    mDNSu16 RDLength = GetRDLengthMem(&m->rec.r.resrec);
+
+    if (!m->rec.r.resrec.InterfaceID) debugf("CreateNewCacheEntry %s", CRDisplayString(m, &m->rec.r));
+
+    //if (RDLength > InlineCacheRDSize)
+    //	LogInfo("Rdata len %4d > InlineCacheRDSize %d %s", RDLength, InlineCacheRDSize, CRDisplayString(m, &m->rec.r));
+
+    if (!cg) cg = GetCacheGroup(m, slot, &m->rec.r.resrec); // If we don't have a CacheGroup for this name, make one now
+    if (cg) rr = GetCacheRecord(m, cg, RDLength);   // Make a cache record, being careful not to recycle cg
+    if (!rr) NoCacheAnswer(m, &m->rec.r);
+    else
+    {
+        RData *saveptr = rr->resrec.rdata;      // Save the rr->resrec.rdata pointer
+        *rr = m->rec.r;                         // Block copy the CacheRecord object
+        rr->resrec.rdata  = saveptr;            // Restore rr->resrec.rdata after the structure assignment
+        rr->resrec.name   = cg->name;           // And set rr->resrec.name to point into our CacheGroup header
+
+        // We need to add the anonymous info before we call CacheRecordAdd so that
+        // if it finds a matching question with this record, it bumps up the counters like
+        // CurrentAnswers etc. Otherwise, when a cache entry gets removed, CacheRecordRmv
+        // will complain.
+        if (m->rec.r.resrec.AnonInfo)
+        {
+            rr->resrec.AnonInfo = m->rec.r.resrec.AnonInfo;
+            m->rec.r.resrec.AnonInfo = mDNSNULL;
+        }
+        rr->DelayDelivery = delay;
+
+        // If this is an oversized record with external storage allocated, copy rdata to external storage
+        if      (rr->resrec.rdata == (RData*)&rr->smallrdatastorage && RDLength > InlineCacheRDSize)
+            LogMsg("rr->resrec.rdata == &rr->rdatastorage but length > InlineCacheRDSize %##s", m->rec.r.resrec.name->c);
+        else if (rr->resrec.rdata != (RData*)&rr->smallrdatastorage && RDLength <= InlineCacheRDSize)
+            LogMsg("rr->resrec.rdata != &rr->rdatastorage but length <= InlineCacheRDSize %##s", m->rec.r.resrec.name->c);
+        if (RDLength > InlineCacheRDSize)
+            mDNSPlatformMemCopy(rr->resrec.rdata, m->rec.r.resrec.rdata, sizeofRDataHeader + RDLength);
+
+        rr->next = mDNSNULL;                    // Clear 'next' pointer
+        rr->nsec = mDNSNULL;
+        rr->soa  = mDNSNULL;
+
+        if (sourceAddress)
+            rr->sourceAddress = *sourceAddress;
+
+        if (!rr->resrec.InterfaceID)
+        {
+            m->rrcache_totalused_unicast += rr->resrec.rdlength;
+            if (DNSSECRecordType(rr->resrec.rrtype))
+                BumpDNSSECStats(m, kStatsActionIncrement, kStatsTypeMemoryUsage, rr->resrec.rdlength);
+        }
+
+        if (Add)
+        {
+            *(cg->rrcache_tail) = rr;               // Append this record to tail of cache slot list
+            cg->rrcache_tail = &(rr->next);         // Advance tail pointer
+            CacheRecordAdd(m, rr);  // CacheRecordAdd calls SetNextCacheCheckTimeForRecord(m, rr); for us
+        }
+        else
+        {
+            // Can't use the "cg->name" if we are not adding to the cache as the
+            // CacheGroup may be released anytime if it is empty
+            domainname *name = mDNSPlatformMemAllocate(DomainNameLength(cg->name));
+            if (name)
+            {
+                AssignDomainName(name, cg->name);
+                rr->resrec.name   = name;
+            }
+            else
+            {
+                ReleaseCacheRecord(m, rr);
+                NoCacheAnswer(m, &m->rec.r);
+                rr = mDNSNULL;
+            }
+        }
+    }
+    return(rr);
+}
+
+mDNSlocal void RefreshCacheRecord(mDNS *const m, CacheRecord *rr, mDNSu32 ttl)
+{
+    rr->TimeRcvd             = m->timenow;
+    rr->resrec.rroriginalttl = ttl;
+    rr->UnansweredQueries = 0;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+    rr->MPUnansweredQ     = 0;
+    rr->MPUnansweredKA    = 0;
+    rr->MPExpectingKA     = mDNSfalse;
+#endif
+    SetNextCacheCheckTimeForRecord(m, rr);
+}
+
+mDNSexport void GrantCacheExtensions(mDNS *const m, DNSQuestion *q, mDNSu32 lease)
+{
+    CacheRecord *rr;
+    const mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+        if (rr->CRActiveQuestion == q)
+        {
+            //LogInfo("GrantCacheExtensions: new lease %d / %s", lease, CRDisplayString(m, rr));
+            RefreshCacheRecord(m, rr, lease);
+        }
+}
+
+mDNSlocal mDNSu32 GetEffectiveTTL(const uDNS_LLQType LLQType, mDNSu32 ttl)      // TTL in seconds
+{
+    if      (LLQType == uDNS_LLQ_Entire) ttl = kLLQ_DefLease;
+    else if (LLQType == uDNS_LLQ_Events)
+    {
+        // If the TTL is -1 for uDNS LLQ event packet, that means "remove"
+        if (ttl == 0xFFFFFFFF) ttl = 0;
+        else ttl = kLLQ_DefLease;
+    }
+    else    // else not LLQ (standard uDNS response)
+    {
+        // The TTL is already capped to a maximum value in GetLargeResourceRecord, but just to be extra safe we
+        // also do this check here to make sure we can't get overflow below when we add a quarter to the TTL
+        if (ttl > 0x60000000UL / mDNSPlatformOneSecond) ttl = 0x60000000UL / mDNSPlatformOneSecond;
+
+        ttl = RRAdjustTTL(ttl);
+
+        // For mDNS, TTL zero means "delete this record"
+        // For uDNS, TTL zero means: this data is true at this moment, but don't cache it.
+        // For the sake of network efficiency, we impose a minimum effective TTL of 15 seconds.
+        // This means that we'll do our 80, 85, 90, 95% queries at 12.00, 12.75, 13.50, 14.25 seconds
+        // respectively, and then if we get no response, delete the record from the cache at 15 seconds.
+        // This gives the server up to three seconds to respond between when we send our 80% query at 12 seconds
+        // and when we delete the record at 15 seconds. Allowing cache lifetimes less than 15 seconds would
+        // (with the current code) result in the server having even less than three seconds to respond
+        // before we deleted the record and reported a "remove" event to any active questions.
+        // Furthermore, with the current code, if we were to allow a TTL of less than 2 seconds
+        // then things really break (e.g. we end up making a negative cache entry).
+        // In the future we may want to revisit this and consider properly supporting non-cached (TTL=0) uDNS answers.
+        if (ttl < 15) ttl = 15;
+    }
+
+    return ttl;
+}
+
+// When the response does not match the question directly, we still want to cache them sometimes. The current response is
+// in m->rec.
+mDNSlocal mDNSBool IsResponseAcceptable(mDNS *const m, const CacheRecord *crlist, DNSQuestion *q, mDNSBool *nseclist)
+{
+    CacheRecord *const newcr = &m->rec.r;
+    ResourceRecord *rr = &newcr->resrec;
+    const CacheRecord *cr;
+
+    *nseclist = mDNSfalse;
+    for (cr = crlist; cr != (CacheRecord*)1; cr = cr->NextInCFList)
+    {
+        domainname *target = GetRRDomainNameTarget(&cr->resrec);
+        // When we issue a query for A record, the response might contain both a CNAME and A records. Only the CNAME would
+        // match the question and we already created a cache entry in the previous pass of this loop. Now when we process
+        // the A record, it does not match the question because the record name here is the CNAME. Hence we try to
+        // match with the previous records to make it an AcceptableResponse. We have to be careful about setting the
+        // DNSServer value that we got in the previous pass. This can happen for other record types like SRV also.
+
+        if (target && cr->resrec.rdatahash == rr->namehash && SameDomainName(target, rr->name))
+        {
+            LogInfo("IsResponseAcceptable: Found a matching entry for %##s in the CacheFlushRecords %s", rr->name->c, CRDisplayString(m, cr));
+            return (mDNStrue);
+        }
+    }
+
+    // Either the question requires validation or we are validating a response with DNSSEC in which case
+    // we need to accept the RRSIGs also so that we can validate the response. It is also possible that
+    // we receive NSECs for our query which does not match the qname and we need to cache in that case
+    // too. nseclist is set if they have to be cached as part of the negative cache record.
+    if (q && DNSSECQuestion(q))
+    {
+        mDNSBool same = SameDomainName(&q->qname, rr->name);
+        if (same && (q->qtype == rr->rrtype || rr->rrtype == kDNSType_CNAME))
+        {
+            LogInfo("IsResponseAcceptable: Accepting, same name and qtype %s, CR %s", DNSTypeName(q->qtype),
+                    CRDisplayString(m, newcr));
+            return mDNStrue;
+        }
+        // We cache RRSIGS if it covers the question type or NSEC.  If it covers a NSEC,
+        // "nseclist" is set
+        if (rr->rrtype == kDNSType_RRSIG)
+        {
+            RDataBody2 *const rdb = (RDataBody2 *)newcr->smallrdatastorage.data;
+            rdataRRSig *rrsig = &rdb->rrsig;
+            mDNSu16 typeCovered = swap16(rrsig->typeCovered);
+
+            // Note the ordering. If we are looking up the NSEC record, then the RRSIG's typeCovered
+            // would match the qtype and they are cached normally as they are not used to prove the
+            // non-existence of any name. In that case, it is like any other normal dnssec validation
+            // and hence nseclist should not be set.
+
+            if (same && ((typeCovered == q->qtype) || (typeCovered == kDNSType_CNAME)))
+            {
+                LogInfo("IsResponseAcceptable: Accepting RRSIG %s matches question type %s", CRDisplayString(m, newcr),
+                        DNSTypeName(q->qtype));
+                return mDNStrue;
+            }
+            else if (typeCovered == kDNSType_NSEC || typeCovered == kDNSType_NSEC3)
+            {
+                LogInfo("IsResponseAcceptable: Accepting RRSIG %s matches %s type (nseclist = 1)", CRDisplayString(m, newcr), DNSTypeName(typeCovered));
+                *nseclist = mDNStrue;
+                return mDNStrue;
+            }
+            else if (typeCovered == kDNSType_SOA)
+            {
+                LogInfo("IsResponseAcceptable: Accepting RRSIG %s matches SOA type (nseclist = 1)", CRDisplayString(m, newcr));
+                *nseclist = mDNStrue;
+                return mDNStrue;
+            }
+            else return mDNSfalse;
+        }
+        if (rr->rrtype == kDNSType_NSEC)
+        {
+            if (!UNICAST_NSEC(rr))
+            {
+                LogMsg("IsResponseAcceptable: ERROR!! Not a unicast NSEC %s", CRDisplayString(m, newcr));
+                return mDNSfalse;
+            }
+            LogInfo("IsResponseAcceptable: Accepting NSEC %s (nseclist = 1)", CRDisplayString(m, newcr));
+            *nseclist = mDNStrue;
+            return mDNStrue;
+        }
+        if (rr->rrtype == kDNSType_SOA)
+        {
+            LogInfo("IsResponseAcceptable: Accepting SOA %s (nseclist = 1)", CRDisplayString(m, newcr));
+            *nseclist = mDNStrue;
+            return mDNStrue;
+        }
+        else if (rr->rrtype == kDNSType_NSEC3)
+        {
+            LogInfo("IsResponseAcceptable: Accepting NSEC3 %s (nseclist = 1)", CRDisplayString(m, newcr));
+            *nseclist = mDNStrue;
+            return mDNStrue;
+        }
+    }
+    return mDNSfalse;
+}
+
+mDNSlocal void FreeNSECRecords(mDNS *const m, CacheRecord *NSECRecords)
+{
+    CacheRecord *rp, *next;
+
+    for (rp = NSECRecords; rp; rp = next)
+    {
+        next = rp->next;
+        ReleaseCacheRecord(m, rp);
+    }
+}
+
+// If we received zero DNSSEC records even when the DO/EDNS0 bit was set, we need to provide this
+// information to ValidatingResponse question to indicate the DNSSEC status to the application
+mDNSlocal void mDNSCoreReceiveNoDNSSECAnswers(mDNS *const m, const DNSMessage *const response, const mDNSu8 *end, const mDNSAddr *dstaddr,
+    mDNSIPPort dstport, const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    const mDNSu8 *ptr = response->data;
+
+    for (i = 0; i < response->h.numQuestions && ptr && ptr < end; i++)
+    {
+        DNSQuestion pktq;
+        DNSQuestion *qptr = mDNSNULL;
+        ptr = getQuestion(response, ptr, end, InterfaceID, &pktq);
+        if (ptr && (qptr = ExpectingUnicastResponseForQuestion(m, dstport, response->h.id, &pktq, !dstaddr)) &&
+            qptr->ValidatingResponse)
+        {
+            DNSQuestion *next, *q;
+
+            if (qptr->DuplicateOf)
+                LogMsg("mDNSCoreReceiveNoDNSSECAnswers: ERROR!! qptr %##s (%s) Duplicate question matching response", qptr->qname.c, DNSTypeName(qptr->qtype));
+
+            // Be careful to call the callback for duplicate questions first and then the original
+            // question. If we called the callback on the original question, it could stop and 
+            // a duplicate question would become the original question.
+            mDNS_DropLockBeforeCallback();      // Allow client (and us) to legally make mDNS API calls
+            for (q = qptr->next ; q && q != m->NewQuestions; q = next)
+            {
+                next = q->next;
+                if (q->DuplicateOf == qptr)
+                {
+                    if (q->ValidatingResponse)
+                        LogInfo("mDNSCoreReceiveNoDNSSECAnswers: qptr %##s (%s) Duplicate question found", q->qname.c, DNSTypeName(q->qtype));
+                    else
+                        LogMsg("mDNSCoreReceiveNoDNSSECAnswers: ERROR!! qptr %##s (%s) Duplicate question not ValidatingResponse", q->qname.c, DNSTypeName(q->qtype));
+                    if (q->QuestionCallback)
+                        q->QuestionCallback(m, q, mDNSNULL, QC_nodnssec);
+                }
+            }
+            if (qptr->QuestionCallback)
+                qptr->QuestionCallback(m, qptr, mDNSNULL, QC_nodnssec);
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        }
+    }
+}
+
+mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage *const response, const mDNSu8 *end, const mDNSAddr *dstaddr,
+                                               mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, uDNS_LLQType LLQType, mDNSu8 rcode, CacheRecord *NSECRecords)
+{
+    int i;
+    const mDNSu8 *ptr   = response->data;
+    CacheRecord *SOARecord = mDNSNULL;
+
+    for (i = 0; i < response->h.numQuestions && ptr && ptr < end; i++)
+    {
+        DNSQuestion q;
+        DNSQuestion *qptr = mDNSNULL;
+        ptr = getQuestion(response, ptr, end, InterfaceID, &q);
+        if (ptr && (qptr = ExpectingUnicastResponseForQuestion(m, dstport, response->h.id, &q, !dstaddr)))
+        {
+            CacheRecord *rr, *neg = mDNSNULL;
+            mDNSu32 slot = HashSlot(&q.qname);
+            CacheGroup *cg = CacheGroupForName(m, slot, q.qnamehash, &q.qname);
+            for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+                if (SameNameRecordAnswersQuestion(&rr->resrec, qptr))
+                {
+                    // 1. If we got a fresh answer to this query, then don't need to generate a negative entry
+                    if (RRExpireTime(rr) - m->timenow > 0) break;
+                    // 2. If we already had a negative entry, keep track of it so we can resurrect it instead of creating a new one
+                    if (rr->resrec.RecordType == kDNSRecordTypePacketNegative) neg = rr;
+                }
+            // When we're doing parallel unicast and multicast queries for dot-local names (for supporting Microsoft
+            // Active Directory sites) we don't want to waste memory making negative cache entries for all the unicast answers.
+            // Otherwise we just fill up our cache with negative entries for just about every single multicast name we ever look up
+            // (since the Microsoft Active Directory server is going to assert that pretty much every single multicast name doesn't exist).
+            // This is not only a waste of memory, but there's also the problem of those negative entries confusing us later -- e.g. we
+            // suppress sending our mDNS query packet because we think we already have a valid (negative) answer to that query in our cache.
+            // The one exception is that we *DO* want to make a negative cache entry for "local. SOA", for the (common) case where we're
+            // *not* on a Microsoft Active Directory network, and there is no authoritative server for "local". Note that this is not
+            // in conflict with the mDNS spec, because that spec says, "Multicast DNS Zones have no SOA record," so it's okay to cache
+            // negative answers for "local. SOA" from a uDNS server, because the mDNS spec already says that such records do not exist :-)
+            //
+            // By suppressing negative responses, it might take longer to timeout a .local question as it might be expecting a
+            // response e.g., we deliver a positive "A" response and suppress negative "AAAA" response and the upper layer may
+            // be waiting longer to get the AAAA response before returning the "A" response to the application. To handle this
+            // case without creating the negative cache entries, we generate a negative response and let the layer above us
+            // do the appropriate thing. This negative response is also needed for appending new search domains.
+            if (!InterfaceID && q.qtype != kDNSType_SOA && IsLocalDomain(&q.qname))
+            {
+                if (!rr)
+                {
+                    LogInfo("mDNSCoreReceiveNoUnicastAnswers: Generate negative response for %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+                    m->CurrentQuestion = qptr;
+                    // We are not creating a cache record in this case, we need to pass back
+                    // the error we got so that the proxy code can return the right one to
+                    // the application
+                    if (qptr->ProxyQuestion)
+                        qptr->responseFlags = response->h.flags;
+                    GenerateNegativeResponse(m, QC_forceresponse);
+                    m->CurrentQuestion = mDNSNULL;
+                }
+                else
+                {
+                    LogInfo("mDNSCoreReceiveNoUnicastAnswers: Skipping check and not creating a negative cache entry for %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+                }
+            }
+            else
+            {
+                if (!rr)
+                {
+                    // We start off assuming a negative caching TTL of 60 seconds
+                    // but then look to see if we can find an SOA authority record to tell us a better value we should be using
+                    mDNSu32 negttl = 60;
+                    int repeat = 0;
+                    const domainname *name = &q.qname;
+                    mDNSu32 hash = q.qnamehash;
+
+                    // Special case for our special Microsoft Active Directory "local SOA" check.
+                    // Some cheap home gateways don't include an SOA record in the authority section when
+                    // they send negative responses, so we don't know how long to cache the negative result.
+                    // Because we don't want to keep hitting the root name servers with our query to find
+                    // if we're on a network using Microsoft Active Directory using "local" as a private
+                    // internal top-level domain, we make sure to cache the negative result for at least one day.
+                    if (q.qtype == kDNSType_SOA && SameDomainName(&q.qname, &localdomain)) negttl = 60 * 60 * 24;
+
+                    // If we're going to make (or update) a negative entry, then look for the appropriate TTL from the SOA record
+                    if (response->h.numAuthorities && (ptr = LocateAuthorities(response, end)) != mDNSNULL)
+                    {
+                        ptr = GetLargeResourceRecord(m, response, ptr, end, InterfaceID, kDNSRecordTypePacketAuth, &m->rec);
+                        if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && m->rec.r.resrec.rrtype == kDNSType_SOA)
+                        {
+                            const mDNSu32 s = HashSlot(m->rec.r.resrec.name);
+                            CacheGroup *cgSOA = CacheGroupForRecord(m, s, &m->rec.r.resrec);
+                            const rdataSOA *const soa = (const rdataSOA *)m->rec.r.resrec.rdata->u.data;
+                            mDNSu32 ttl_s = soa->min;
+                            // We use the lesser of the SOA.MIN field and the SOA record's TTL, *except*
+                            // for the SOA record for ".", where the record is reported as non-cacheable
+                            // (TTL zero) for some reason, so in this case we just take the SOA record's TTL as-is
+                            if (ttl_s > m->rec.r.resrec.rroriginalttl && m->rec.r.resrec.name->c[0])
+                                ttl_s = m->rec.r.resrec.rroriginalttl;
+                            if (negttl < ttl_s) negttl = ttl_s;
+
+                            // Create the SOA record as we may have to return this to the questions
+                            // that we are acting as a proxy for currently or in the future.
+                            SOARecord = CreateNewCacheEntry(m, s, cgSOA, 1, mDNSfalse, mDNSNULL);
+
+                            // Special check for SOA queries: If we queried for a.b.c.d.com, and got no answer,
+                            // with an Authority Section SOA record for d.com, then this is a hint that the authority
+                            // is d.com, and consequently SOA records b.c.d.com and c.d.com don't exist either.
+                            // To do this we set the repeat count so the while loop below will make a series of negative cache entries for us
+                            //
+                            // For ProxyQuestions, we don't do this as we need to create additional SOA records to cache them
+                            // along with the negative cache record. For simplicity, we don't create the additional records.
+                            if (!qptr->ProxyQuestion && q.qtype == kDNSType_SOA)
+                            {
+                                int qcount = CountLabels(&q.qname);
+                                int scount = CountLabels(m->rec.r.resrec.name);
+                                if (qcount - 1 > scount)
+                                    if (SameDomainName(SkipLeadingLabels(&q.qname, qcount - scount), m->rec.r.resrec.name))
+                                        repeat = qcount - 1 - scount;
+                            }
+                        }
+                        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+                    }
+
+                    // If we already had a negative entry in the cache, then we double our existing negative TTL. This is to avoid
+                    // the case where the record doesn't exist (e.g. particularly for things like our lb._dns-sd._udp.<domain> query),
+                    // and the server returns no SOA record (or an SOA record with a small MIN TTL) so we assume a TTL
+                    // of 60 seconds, and we end up polling the server every minute for a record that doesn't exist.
+                    // With this fix in place, when this happens, we double the effective TTL each time (up to one hour),
+                    // so that we back off our polling rate and don't keep hitting the server continually.
+                    if (neg)
+                    {
+                        if (negttl < neg->resrec.rroriginalttl * 2)
+                            negttl = neg->resrec.rroriginalttl * 2;
+                        if (negttl > 3600)
+                            negttl = 3600;
+                    }
+
+                    negttl = GetEffectiveTTL(LLQType, negttl);  // Add 25% grace period if necessary
+
+                    // If we already had a negative cache entry just update it, else make one or more new negative cache entries.
+                    if (neg)
+                    {
+                        LogInfo("mDNSCoreReceiveNoUnicastAnswers: Renewing negative TTL from %d to %d %s", neg->resrec.rroriginalttl, negttl, CRDisplayString(m, neg));
+                        RefreshCacheRecord(m, neg, negttl);
+                        // When we created the cache for the first time and answered the question, the question's
+                        // interval was set to MaxQuestionInterval. If the cache is about to expire and we are resending
+                        // the queries, the interval should still be at MaxQuestionInterval. If the query is being
+                        // restarted (setting it to InitialQuestionInterval) for other reasons e.g., wakeup,
+                        // we should reset its question interval here to MaxQuestionInterval.
+                        ResetQuestionState(m, qptr);
+                        if (DNSSECQuestion(qptr))
+                            neg->CRDNSSECQuestion = 1;
+                        // Update the NSEC records again.
+                        // TBD: Need to purge and revalidate if the cached NSECS and the new set are not same.
+                        if (NSECRecords)
+                        {
+                            if (!AddNSECSForCacheRecord(m, NSECRecords, neg, rcode))
+                            {
+                                // We might just have an SOA record for zones that are not signed and hence don't log
+                                // this as an error
+                                LogInfo("mDNSCoreReceiveNoUnicastAnswers: AddNSECSForCacheRecord failed to add NSEC for negcr %s during refresh", CRDisplayString(m, neg));
+                                FreeNSECRecords(m, NSECRecords);
+                                neg->CRDNSSECQuestion = 0;
+                            }
+                            NSECRecords = mDNSNULL;
+                        }
+                        if (SOARecord)
+                        {
+                            if (neg->soa)
+                                ReleaseCacheRecord(m, neg->soa);
+                            neg->soa = SOARecord;
+                            SOARecord = mDNSNULL;
+                        }
+                    }
+                    else while (1)
+                        {
+                            CacheRecord *negcr;
+                            debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, name->c, DNSTypeName(q.qtype));
+                            MakeNegativeCacheRecord(m, &m->rec.r, name, hash, q.qtype, q.qclass, negttl, mDNSInterface_Any, qptr->qDNSServer);
+                            m->rec.r.responseFlags = response->h.flags;
+                            // We create SOA records above which might create new cache groups. Earlier
+                            // in the function we looked up the cache group for the name and it could have
+                            // been NULL. If we pass NULL cg to new cache entries that we create below,
+                            // it will create additional cache groups for the same name. To avoid that,
+                            // look up the cache group again to re-initialize cg again.
+                            cg = CacheGroupForName(m, slot, hash, name);
+                            if (NSECRecords && DNSSECQuestion(qptr))
+                            {
+                                // Create the cache entry with delay and then add the NSEC records
+                                // to it and add it immediately.
+                                negcr = CreateNewCacheEntry(m, slot, cg, 1, mDNStrue, mDNSNULL);
+                                if (negcr)
+                                {
+                                    negcr->CRDNSSECQuestion = 0;
+                                    if (!AddNSECSForCacheRecord(m, NSECRecords, negcr, rcode))
+                                    {
+                                        LogInfo("mDNSCoreReceiveNoUnicastAnswers: AddNSECSForCacheRecord failed to add NSEC for negcr %s",
+                                            CRDisplayString(m, negcr));
+                                        FreeNSECRecords(m, NSECRecords);
+                                    }
+                                    else
+                                    {
+                                        negcr->CRDNSSECQuestion = 1;
+                                        LogInfo("mDNSCoreReceiveNoUnicastAnswers: AddNSECSForCacheRecord added neg NSEC for %s", CRDisplayString(m, negcr));
+                                    }
+                                    NSECRecords = mDNSNULL;
+                                    negcr->DelayDelivery = 0;
+                                    CacheRecordDeferredAdd(m, negcr);
+                                }
+                                m->rec.r.resrec.RecordType = 0; // Clear RecordType to show we're not still using it
+                                break;
+                            }
+                            else
+                            {
+                                // Need to add with a delay so that we can tag the SOA record
+                                negcr = CreateNewCacheEntry(m, slot, cg, 1, mDNStrue, mDNSNULL);
+                                if (negcr)
+                                {
+                                    negcr->CRDNSSECQuestion = 0;
+                                    if (DNSSECQuestion(qptr))
+                                        negcr->CRDNSSECQuestion = 1;
+                                    negcr->DelayDelivery = 0;
+
+                                    if (SOARecord)
+                                    {
+                                        if (negcr->soa)
+                                            ReleaseCacheRecord(m, negcr->soa);
+                                        negcr->soa = SOARecord;
+                                        SOARecord = mDNSNULL;
+                                    }
+                                    CacheRecordDeferredAdd(m, negcr);
+                                }
+                            }
+                            m->rec.r.responseFlags = zeroID;
+                            m->rec.r.resrec.RecordType = 0; // Clear RecordType to show we're not still using it
+                            if (!repeat) break;
+                            repeat--;
+                            name = (const domainname *)(name->c + 1 + name->c[0]);
+                            hash = DomainNameHashValue(name);
+                            slot = HashSlot(name);
+                            cg   = CacheGroupForName(m, slot, hash, name);
+                        }
+                }
+            }
+        }
+    }
+    if (NSECRecords) { LogInfo("mDNSCoreReceiveNoUnicastAnswers: NSECRecords not used"); FreeNSECRecords(m, NSECRecords); }
+    if (SOARecord)   { LogInfo("mDNSCoreReceiveNoUnicastAnswers: SOARecord not used"); ReleaseCacheRecord(m, SOARecord); }
+}
+
+mDNSlocal void mDNSCorePrintStoredProxyRecords(mDNS *const m)
+{
+    AuthRecord *rrPtr = mDNSNULL;
+    LogSPS("Stored Proxy records :");
+    for (rrPtr = m->SPSRRSet; rrPtr; rrPtr = rrPtr->next)
+    {
+        LogSPS("%s", ARDisplayString(m, rrPtr));
+    }
+}
+
+mDNSlocal mDNSBool mDNSCoreRegisteredProxyRecord(mDNS *const m, AuthRecord *rr)
+{
+    AuthRecord *rrPtr = mDNSNULL;
+
+    for (rrPtr = m->SPSRRSet; rrPtr; rrPtr = rrPtr->next)
+    {
+        if (IdenticalResourceRecord(&rrPtr->resrec, &rr->resrec))
+        {
+            LogSPS("mDNSCoreRegisteredProxyRecord: Ignoring packet registered with sleep proxy : %s ", ARDisplayString(m, rr));
+            return mDNStrue;
+        }
+    }
+    mDNSCorePrintStoredProxyRecords(m);
+    return mDNSfalse;
+}
+
+mDNSlocal CacheRecord* mDNSCoreReceiveCacheCheck(mDNS *const m, const DNSMessage *const response, uDNS_LLQType LLQType,
+    const mDNSu32 slot, CacheGroup *cg, DNSQuestion *unicastQuestion, CacheRecord ***cfp, CacheRecord **NSECCachePtr,
+    mDNSInterfaceID InterfaceID)
+{
+    CacheRecord *rr;
+    CacheRecord **cflocal = *cfp;
+
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        mDNSBool match;
+        // Resource record received via unicast, the resGroupID should match ?
+        if (!InterfaceID)
+        {
+            mDNSu16 id1 = (rr->resrec.rDNSServer ? rr->resrec.rDNSServer->resGroupID : 0);
+            mDNSu16 id2 = (m->rec.r.resrec.rDNSServer ? m->rec.r.resrec.rDNSServer->resGroupID : 0);
+            match = (id1 == id2);
+        }
+        else
+            match = (rr->resrec.InterfaceID == InterfaceID);
+        // If we found this exact resource record, refresh its TTL
+        if (match && IdenticalSameNameRecord(&m->rec.r.resrec, &rr->resrec))
+        {
+            if (m->rec.r.resrec.rdlength > InlineCacheRDSize)
+                verbosedebugf("mDNSCoreReceiveCacheCheck: Found record size %5d interface %p already in cache: %s",
+                              m->rec.r.resrec.rdlength, InterfaceID, CRDisplayString(m, &m->rec.r));
+
+            if (m->rec.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask)
+            {
+                // If this packet record has the kDNSClass_UniqueRRSet flag set, then add it to our cache flushing list
+                if (rr->NextInCFList == mDNSNULL && *cfp != &rr->NextInCFList && LLQType != uDNS_LLQ_Events)
+                {
+                    *cflocal = rr;
+                    cflocal = &rr->NextInCFList;
+                    *cflocal = (CacheRecord*)1;
+                    *cfp = &rr->NextInCFList;
+                }
+
+                // If this packet record is marked unique, and our previous cached copy was not, then fix it
+                if (!(rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask))
+                {
+                    DNSQuestion *q;
+                    for (q = m->Questions; q; q=q->next)
+                    {
+                        if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+                            q->UniqueAnswers++;
+                    }
+                    rr->resrec.RecordType = m->rec.r.resrec.RecordType;
+                }
+            }
+
+            if (!SameRDataBody(&m->rec.r.resrec, &rr->resrec.rdata->u, SameDomainNameCS))
+            {
+                // If the rdata of the packet record differs in name capitalization from the record in our cache
+                // then mDNSPlatformMemSame will detect this. In this case, throw the old record away, so that clients get
+                // a 'remove' event for the record with the old capitalization, and then an 'add' event for the new one.
+                // <rdar://problem/4015377> mDNS -F returns the same domain multiple times with different casing
+                rr->resrec.rroriginalttl = 0;
+                rr->TimeRcvd = m->timenow;
+                rr->UnansweredQueries = MaxUnansweredQueries;
+                SetNextCacheCheckTimeForRecord(m, rr);
+                LogInfo("mDNSCoreReceiveCacheCheck: Discarding due to domainname case change old: %s", CRDisplayString(m, rr));
+                LogInfo("mDNSCoreReceiveCacheCheck: Discarding due to domainname case change new: %s", CRDisplayString(m, &m->rec.r));
+                LogInfo("mDNSCoreReceiveCacheCheck: Discarding due to domainname case change in %d slot %3d in %d %d",
+                        NextCacheCheckEvent(rr) - m->timenow, slot, m->rrcache_nextcheck[slot] - m->timenow, m->NextCacheCheck - m->timenow);
+                // DO NOT break out here -- we want to continue as if we never found it
+            }
+            else if (!IdenticalAnonInfo(m->rec.r.resrec.AnonInfo, rr->resrec.AnonInfo))
+            {
+                // If the NSEC3 record changed, a few possibilities
+                //
+                // 1) the peer reinitialized e.g., after network change and still part of the
+                //    same set.
+                // 2) the peer went to a different set but we did not see the goodbyes. If we just
+                //    update the nsec3 record, it would be incorrect. Flush the cache so that we
+                //    can deliver a RMV followed by ADD.
+                // 3) if the peer is ourselves and we see the goodbye when moving to a different set
+                //    and so we flush the cache and create a new cache record with the new set information.
+                //    Now we move back to the original set. In this case, we can't just update the
+                //    NSEC3 record alone. We need to flush so that we can deliver an RMV followed by ADD
+                //    when we create the new cache entry.
+                //
+                // Note: For case (1), we could avoid flushing the cache but we can't tell the difference
+                // from the other cases.
+                rr->resrec.rroriginalttl = 0;
+                rr->TimeRcvd = m->timenow;
+                rr->UnansweredQueries = MaxUnansweredQueries;
+                SetNextCacheCheckTimeForRecord(m, rr);
+                LogInfo("mDNSCoreReceiveCacheCheck: AnonInfo changed for %s", CRDisplayString(m, rr));
+                // DO NOT break out here -- we want to continue as if we never found it. When we return
+                // from this function, we will create a new cache entry with the new NSEC3 record
+            }
+            else if (m->rec.r.resrec.rroriginalttl > 0)
+            {
+                DNSQuestion *q;
+
+                m->mDNSStats.CacheRefreshed++;
+
+                if (rr->resrec.rroriginalttl == 0) debugf("uDNS rescuing %s", CRDisplayString(m, rr));
+                RefreshCacheRecord(m, rr, m->rec.r.resrec.rroriginalttl);
+                rr->responseFlags = response->h.flags;
+
+                // If we may have NSEC records returned with the answer (which we don't know yet as it
+                // has not been processed), we need to cache them along with the first cache
+                // record in the list that answers the question so that it can be used for validation
+                // later. The "type" check below is to make sure that we cache on the cache record
+                // that would answer the question. It is possible that we might cache additional things
+                // e.g., MX question might cache A records also, and we want to cache the NSEC on
+                // the record that answers the question.
+                if (response->h.numAnswers && unicastQuestion && unicastQuestion->qtype == rr->resrec.rrtype
+                    && !(*NSECCachePtr))
+                {
+                    LogInfo("mDNSCoreReceiveCacheCheck: rescuing RR %s", CRDisplayString(m, rr));
+                    *NSECCachePtr = rr;
+                }
+                // We have to reset the question interval to MaxQuestionInterval so that we don't keep
+                // polling the network once we get a valid response back. For the first time when a new
+                // cache entry is created, AnswerCurrentQuestionWithResourceRecord does that.
+                // Subsequently, if we reissue questions from within the mDNSResponder e.g., DNS server
+                // configuration changed, without flushing the cache, we reset the question interval here.
+                // Currently, we do this for for both multicast and unicast questions as long as the record
+                // type is unique. For unicast, resource record is always unique and for multicast it is
+                // true for records like A etc. but not for PTR.
+                if (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask)
+                {
+                    for (q = m->Questions; q; q=q->next)
+                    {
+                        if (!q->DuplicateOf && !q->LongLived &&
+                            ActiveQuestion(q) && ResourceRecordAnswersQuestion(&rr->resrec, q))
+                        {
+                            ResetQuestionState(m, q);
+                            debugf("mDNSCoreReceiveCacheCheck: Set MaxQuestionInterval for %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+                            break;      // Why break here? Aren't there other questions we might want to look at?-- SC July 2010
+                        }
+                    }
+                }
+                break;
+            }
+            else
+            {
+            
+                // If the packet TTL is zero, that means we're deleting this record.
+                // To give other hosts on the network a chance to protest, we push the deletion
+                // out one second into the future. Also, we set UnansweredQueries to MaxUnansweredQueries.
+                // Otherwise, we'll do final queries for this record at 80% and 90% of its apparent
+                // lifetime (800ms and 900ms from now) which is a pointless waste of network bandwidth.
+                // If record's current expiry time is more than a second from now, we set it to expire in one second.
+                // If the record is already going to expire in less than one second anyway, we leave it alone --
+                // we don't want to let the goodbye packet *extend* the record's lifetime in our cache.
+                debugf("DE for %s", CRDisplayString(m, rr));
+                if (RRExpireTime(rr) - m->timenow > mDNSPlatformOneSecond)
+                {
+                    rr->resrec.rroriginalttl = 1;
+                    rr->TimeRcvd = m->timenow;
+                    rr->UnansweredQueries = MaxUnansweredQueries;
+                    SetNextCacheCheckTimeForRecord(m, rr);
+                }
+                break;
+            }
+        }
+    }
+    return rr;
+}
+
+mDNSlocal void mDNSParseNSEC3Records(mDNS *const m, const DNSMessage *const response, const mDNSu8 *end,
+    const mDNSInterfaceID InterfaceID, CacheRecord **NSEC3Records)
+{
+    const mDNSu8 *ptr   = response->data;
+    CacheRecord *rr;
+    int i;
+
+    if (!response->h.numAuthorities)
+        return;
+    ptr = LocateAuthorities(response, end);
+    if (!ptr)
+    {
+        LogInfo("mDNSParseNSEC3Records: ERROR can't locate authorities");
+        return;
+    }
+    for (i = 0; i < response->h.numAuthorities && ptr && ptr < end; i++)
+    {
+        mDNSu32 slot;
+        CacheGroup *cg;
+
+        ptr = GetLargeResourceRecord(m, response, ptr, end, InterfaceID, kDNSRecordTypePacketAuth, &m->rec);
+        if (!ptr || m->rec.r.resrec.RecordType == kDNSRecordTypePacketNegative || m->rec.r.resrec.rrtype != kDNSType_NSEC3)
+        {
+            debugf("mDNSParseNSEC3Records: ptr %p, Record %s, ignoring", ptr, CRDisplayString(m, &m->rec.r));
+            m->rec.r.resrec.RecordType = 0;
+            continue;
+        }
+        slot = HashSlot(m->rec.r.resrec.name);
+        cg = CacheGroupForRecord(m, slot, &m->rec.r.resrec);
+        // Create the cache entry but don't add it to the cache it. We need
+        // to cache this along with the main cache record.
+        rr = CreateNewCacheEntry(m, slot, cg, 0, mDNSfalse, mDNSNULL);
+        if (rr)
+        {
+            debugf("mDNSParseNSEC3Records: %s", CRDisplayString(m, rr));
+            *NSEC3Records = rr;
+            NSEC3Records = &rr->next;
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+}
+
+mDNSlocal void mDNSCoreResetRecord(mDNS *const m)
+{
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    if (m->rec.r.resrec.AnonInfo)
+    {
+        FreeAnonInfo(m->rec.r.resrec.AnonInfo); 
+        m->rec.r.resrec.AnonInfo = mDNSNULL;
+    }
+}
+
+#define DEVICE_INFO_RECORD_LABELS 4
+
+// Determine if the record is an instance of _device-info._tcp.local.
+mDNSlocal mDNSBool IsDeviceInfoRecord(const domainname *d)
+{
+    const domainname *afterInstance;
+
+    if (CountLabels(d) != DEVICE_INFO_RECORD_LABELS)
+        return mDNSfalse;
+
+    // skip the instance name
+    afterInstance = SkipLeadingLabels(d, 1);
+    if (SameDomainName(afterInstance, &LocalDeviceInfoName))
+        return mDNStrue;
+
+    return mDNSfalse;
+}
+
+// Note: mDNSCoreReceiveResponse calls mDNS_Deregister_internal which can call a user callback, which may change
+// the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+// InterfaceID non-NULL tells us the interface this multicast response was received on
+// InterfaceID NULL tells us this was a unicast response
+// dstaddr NULL tells us we received this over an outgoing TCP connection we made
+mDNSlocal void mDNSCoreReceiveResponse(mDNS *const m,
+                                       const DNSMessage *const response, const mDNSu8 *end,
+                                       const mDNSAddr *srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, mDNSIPPort dstport,
+                                       const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    mDNSBool myself;
+    mDNSBool ResponseMCast    = dstaddr && mDNSAddrIsDNSMulticast(dstaddr);
+    mDNSBool ResponseSrcLocal = !srcaddr || mDNS_AddressIsLocalSubnet(m, InterfaceID, srcaddr, &myself);
+    DNSQuestion *llqMatch = mDNSNULL;
+    DNSQuestion *unicastQuestion = mDNSNULL;
+    uDNS_LLQType LLQType      = uDNS_recvLLQResponse(m, response, end, srcaddr, srcport, &llqMatch);
+
+    // "(CacheRecord*)1" is a special (non-zero) end-of-list marker
+    // We use this non-zero marker so that records in our CacheFlushRecords list will always have NextInCFList
+    // set non-zero, and that tells GetCacheEntity() that they're not, at this moment, eligible for recycling.
+    CacheRecord *CacheFlushRecords = (CacheRecord*)1;
+    CacheRecord **cfp = &CacheFlushRecords;
+    CacheRecord *NSECRecords = mDNSNULL;
+    CacheRecord *NSECCachePtr = mDNSNULL;
+    CacheRecord **nsecp = &NSECRecords;
+    CacheRecord *McastNSEC3Records = mDNSNULL;
+    mDNSBool nseclist;
+    mDNSu8 rcode = '\0';
+    mDNSBool rrsigsCreated = mDNSfalse;
+    mDNSBool DNSSECQuestion = mDNSfalse;
+    mDNSBool recordAccepted = mDNSfalse;
+    NetworkInterfaceInfo *llintf = FirstIPv4LLInterfaceForID(m, InterfaceID);
+
+    // All records in a DNS response packet are treated as equally valid statements of truth. If we want
+    // to guard against spoof responses, then the only credible protection against that is cryptographic
+    // security, e.g. DNSSEC., not worring about which section in the spoof packet contained the record
+    int firstauthority  =                   response->h.numAnswers;
+    int firstadditional = firstauthority  + response->h.numAuthorities;
+    int totalrecords    = firstadditional + response->h.numAdditionals;
+    const mDNSu8 *ptr   = response->data;
+    DNSServer *uDNSServer = mDNSNULL;
+
+    debugf("Received Response from %#-15a addressed to %#-15a on %p with "
+           "%2d Question%s %2d Answer%s %2d Authorit%s %2d Additional%s %d bytes LLQType %d",
+           srcaddr, dstaddr, InterfaceID,
+           response->h.numQuestions,   response->h.numQuestions   == 1 ? ", "   : "s,",
+           response->h.numAnswers,     response->h.numAnswers     == 1 ? ", "   : "s,",
+           response->h.numAuthorities, response->h.numAuthorities == 1 ? "y,  " : "ies,",
+           response->h.numAdditionals, response->h.numAdditionals == 1 ? " "    : "s", end - response->data, LLQType);
+
+    // According to RFC 2181 <http://www.ietf.org/rfc/rfc2181.txt>
+    //    When a DNS client receives a reply with TC
+    //    set, it should ignore that response, and query again, using a
+    //    mechanism, such as a TCP connection, that will permit larger replies.
+    // It feels wrong to be throwing away data after the network went to all the trouble of delivering it to us, but
+    // delivering some records of the RRSet first and then the remainder a couple of milliseconds later was causing
+    // failures in our Microsoft Active Directory client, which expects to get the entire set of answers at once.
+    // <rdar://problem/6690034> Can't bind to Active Directory
+    // In addition, if the client immediately canceled its query after getting the initial partial response, then we'll
+    // abort our TCP connection, and not complete the operation, and end up with an incomplete RRSet in our cache.
+    // Next time there's a query for this RRSet we'll see answers in our cache, and assume we have the whole RRSet already,
+    // and not even do the TCP query.
+    // Accordingly, if we get a uDNS reply with kDNSFlag0_TC set, we bail out and wait for the TCP response containing the entire RRSet.
+    if (!InterfaceID && (response->h.flags.b[0] & kDNSFlag0_TC)) return;
+
+    if (LLQType == uDNS_LLQ_Ignore) return;
+
+    // 1. We ignore questions (if any) in mDNS response packets
+    // 2. If this is an LLQ response, we handle it much the same
+    // 3. If we get a uDNS UDP response with the TC (truncated) bit set, then we can't treat this
+    //    answer as being the authoritative complete RRSet, and respond by deleting all other
+    //    matching cache records that don't appear in this packet.
+    // Otherwise, this is a authoritative uDNS answer, so arrange for any stale records to be purged
+    if (ResponseMCast || LLQType == uDNS_LLQ_Events || (response->h.flags.b[0] & kDNSFlag0_TC))
+        ptr = LocateAnswers(response, end);
+    // Otherwise, for one-shot queries, any answers in our cache that are not also contained
+    // in this response packet are immediately deemed to be invalid.
+    else
+    {
+        mDNSBool failure, returnEarly;
+        rcode = (mDNSu8)(response->h.flags.b[1] & kDNSFlag1_RC_Mask);
+        failure = !(rcode == kDNSFlag1_RC_NoErr || rcode == kDNSFlag1_RC_NXDomain || rcode == kDNSFlag1_RC_NotAuth);
+        returnEarly = mDNSfalse;
+        // We could possibly combine this with the similar loop at the end of this function --
+        // instead of tagging cache records here and then rescuing them if we find them in the answer section,
+        // we could instead use the "m->PktNum" mechanism to tag each cache record with the packet number in
+        // which it was received (or refreshed), and then at the end if we find any cache records which
+        // answer questions in this packet's question section, but which aren't tagged with this packet's
+        // packet number, then we deduce they are old and delete them
+        for (i = 0; i < response->h.numQuestions && ptr && ptr < end; i++)
+        {
+            DNSQuestion q, *qptr = mDNSNULL;
+            ptr = getQuestion(response, ptr, end, InterfaceID, &q);
+            if (ptr && (qptr = ExpectingUnicastResponseForQuestion(m, dstport, response->h.id, &q, !dstaddr)))
+            {
+                if (!failure)
+                {
+                    CacheRecord *rr;
+                    // Remember the unicast question that we found, which we use to make caching
+                    // decisions later on in this function
+                    const mDNSu32 slot = HashSlot(&q.qname);
+                    CacheGroup *cg = CacheGroupForName(m, slot, q.qnamehash, &q.qname);
+                    if (!mDNSOpaque16IsZero(response->h.id))
+                    {
+                        unicastQuestion = qptr;
+                        if (qptr->qDNSServer && DNSSECQuestion(qptr))
+                        {
+                            LogInfo("mDNSCoreReceiveResponse: Setting aware for %##s (%s) on %#a", qptr->qname.c,
+                                DNSTypeName(qptr->qtype), &qptr->qDNSServer->addr);
+                            qptr->qDNSServer->DNSSECAware = mDNStrue;
+                            qptr->qDNSServer->req_DO = mDNStrue;
+                        }
+                        if (qptr->ValidatingResponse)
+                            DNSSECQuestion = mDNStrue;
+                    }
+                    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+                        if (SameNameRecordAnswersQuestion(&rr->resrec, qptr))
+                        {
+                            debugf("uDNS marking %p %##s (%s) %p %s", q.InterfaceID, q.qname.c, DNSTypeName(q.qtype),
+                                   rr->resrec.InterfaceID, CRDisplayString(m, rr));
+                            // Don't want to disturb rroriginalttl here, because code below might need it for the exponential backoff doubling algorithm
+                            rr->TimeRcvd          = m->timenow - TicksTTL(rr) - 1;
+                            rr->UnansweredQueries = MaxUnansweredQueries;
+                            rr->CRDNSSECQuestion = 0;
+                            if (unicastQuestion && DNSSECQuestion(unicastQuestion))
+                            {
+                                LogInfo("mDNSCoreReceiveResponse: CRDNSSECQuestion set for record %s, question %##s (%s)", CRDisplayString(m, rr),
+                                    unicastQuestion->qname.c, DNSTypeName(unicastQuestion->qtype));
+                                rr->CRDNSSECQuestion = 1;
+                            }
+                        }
+                }
+                else
+                {
+                    if (qptr)
+                    {
+                        // If we recv any error from the DNSServer for a DNSSEC Query and if we know that the server
+                        // is not DNSSEC aware, stop doing DNSSEC for that DNSServer. Note that by setting the
+                        // req_DO to false here, the next retransmission for this question will turn off validation
+                        // and hence retransmit without the EDNS0/DOK option.
+                        if (DNSSECOptionalQuestion(qptr) && qptr->qDNSServer && !qptr->qDNSServer->DNSSECAware)
+                        {
+                            LogInfo("mDNSCoreReceiveResponse: Server %p responded with code %d to DNSSEC Query %##s (%s), clear DO flag", 
+                                    qptr->qDNSServer, rcode, q.qname.c, DNSTypeName(q.qtype));
+                            qptr->qDNSServer->req_DO = mDNSfalse;    
+                        }
+                        // For Unicast DNS Queries, penalize the DNSServer
+                        else
+                        {
+                            LogInfo("mDNSCoreReceiveResponse: Server %p responded with code %d to query %##s (%s)", 
+                                    qptr->qDNSServer, rcode, q.qname.c, DNSTypeName(q.qtype));
+                            PenalizeDNSServer(m, qptr, response->h.flags);
+                        }
+                    }
+                    returnEarly = mDNStrue;
+                }
+            }
+        }
+        if (returnEarly)
+        {
+            LogInfo("Ignoring %2d Answer%s %2d Authorit%s %2d Additional%s",
+                    response->h.numAnswers,     response->h.numAnswers     == 1 ? ", " : "s,",
+                    response->h.numAuthorities, response->h.numAuthorities == 1 ? "y,  " : "ies,",
+                    response->h.numAdditionals, response->h.numAdditionals == 1 ? "" : "s");
+            // not goto exit because we won't have any CacheFlushRecords and we do not want to
+            // generate negative cache entries (we want to query the next server)
+            return;
+        }
+        if (unicastQuestion && DNSSECQuestion(unicastQuestion))
+        {
+            BumpDNSSECStats(m, kStatsActionSet, kStatsTypeMsgSize, (end - response->data));
+        }
+    }
+
+    // Parse the NSEC3 records from the Authority section before we process
+    // the Answer section so that we can cache them along with the proper
+    // cache records we create.
+    if (mDNSOpaque16IsZero(response->h.id))
+        mDNSParseNSEC3Records(m, response, end, InterfaceID, &McastNSEC3Records);
+
+    for (i = 0; i < totalrecords && ptr && ptr < end; i++)
+    {
+        // All responses sent via LL multicast are acceptable for caching
+        // All responses received over our outbound TCP connections are acceptable for caching
+        mDNSBool AcceptableResponse = ResponseMCast || !dstaddr || LLQType;
+        // (Note that just because we are willing to cache something, that doesn't necessarily make it a trustworthy answer
+        // to any specific question -- any code reading records from the cache needs to make that determination for itself.)
+
+        const mDNSu8 RecordType =
+            (i < firstauthority ) ? (mDNSu8)kDNSRecordTypePacketAns  :
+            (i < firstadditional) ? (mDNSu8)kDNSRecordTypePacketAuth : (mDNSu8)kDNSRecordTypePacketAdd;
+        ptr = GetLargeResourceRecord(m, response, ptr, end, InterfaceID, RecordType, &m->rec);
+        if (!ptr) goto exit;        // Break out of the loop and clean up our CacheFlushRecords list before exiting
+
+        if (m->rec.r.resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            mDNSCoreResetRecord(m);
+            continue;
+        }
+
+        // We have already parsed the NSEC3 records and cached them approrpriately for
+        // multicast responses.
+        if (mDNSOpaque16IsZero(response->h.id) && m->rec.r.resrec.rrtype == kDNSType_NSEC3)
+        {
+            mDNSCoreResetRecord(m);
+            continue;
+        }
+        // Don't want to cache OPT or TSIG pseudo-RRs
+        if (m->rec.r.resrec.rrtype == kDNSType_TSIG)
+        {
+            mDNSCoreResetRecord(m);
+            continue;
+        }
+        if (m->rec.r.resrec.rrtype == kDNSType_OPT)
+        {
+            const rdataOPT *opt;
+            const rdataOPT *const e = (const rdataOPT *)&m->rec.r.resrec.rdata->u.data[m->rec.r.resrec.rdlength];
+            // Find owner sub-option(s). We verify that the MAC is non-zero, otherwise we could inadvertently
+            // delete all our own AuthRecords (which are identified by having zero MAC tags on them).
+            for (opt = &m->rec.r.resrec.rdata->u.opt[0]; opt < e; opt++)
+                if (opt->opt == kDNSOpt_Owner && opt->u.owner.vers == 0 && opt->u.owner.HMAC.l[0])
+                {
+                    ClearProxyRecords(m, &opt->u.owner, m->DuplicateRecords);
+                    ClearProxyRecords(m, &opt->u.owner, m->ResourceRecords);
+                }
+            mDNSCoreResetRecord(m);
+            continue;
+        }
+        // if a CNAME record points to itself, then don't add it to the cache
+        if ((m->rec.r.resrec.rrtype == kDNSType_CNAME) && SameDomainName(m->rec.r.resrec.name, &m->rec.r.resrec.rdata->u.name))
+        {
+            LogInfo("mDNSCoreReceiveResponse: CNAME loop domain name %##s", m->rec.r.resrec.name->c);
+            mDNSCoreResetRecord(m);
+            continue;
+        }
+
+        // When we receive uDNS LLQ responses, we assume a long cache lifetime --
+        // In the case of active LLQs, we'll get remove events when the records actually do go away
+        // In the case of polling LLQs, we assume the record remains valid until the next poll
+        if (!mDNSOpaque16IsZero(response->h.id))
+            m->rec.r.resrec.rroriginalttl = GetEffectiveTTL(LLQType, m->rec.r.resrec.rroriginalttl);
+
+        // If response was not sent via LL multicast,
+        // then see if it answers a recent query of ours, which would also make it acceptable for caching.
+        if (!ResponseMCast)
+        {
+            if (LLQType)
+            {
+                // For Long Lived queries that are both sent over UDP and Private TCP, LLQType is set.
+                // Even though it is AcceptableResponse, we need a matching DNSServer pointer for the
+                // queries to get ADD/RMV events. To lookup the question, we can't use
+                // ExpectingUnicastResponseForRecord as the port numbers don't match. uDNS_recvLLQRespose
+                // has already matched the question using the 64 bit Id in the packet and we use that here.
+
+                if (llqMatch != mDNSNULL) m->rec.r.resrec.rDNSServer = uDNSServer = llqMatch->qDNSServer;
+
+                // If this is a DNSSEC question that is also LongLived, don't accept records from the
+                // Additional/Authority section blindly. We need to go through IsAcceptableResponse below
+                // so that NSEC/NSEC3 record are cached in the nseclist if we accept them. This can happen
+                // for both negative responses and wildcard expanded positive responses as both of come
+                // back with NSEC/NSEC3s.
+                if (unicastQuestion && DNSSECQuestion(unicastQuestion))
+                    AcceptableResponse = mDNSfalse;
+            }
+            else if (!AcceptableResponse || !dstaddr)
+            {
+                // For responses that come over TCP (Responses that can't fit within UDP) or TLS (Private queries
+                // that are not long lived e.g., AAAA lookup in a Private domain), it is indicated by !dstaddr.
+                // Even though it is AcceptableResponse, we still need a DNSServer pointer for the resource records that
+                // we create.
+
+                if (!mDNSOpaque16IsZero(response->h.id))
+                {
+                    DNSQuestion *q = ExpectingUnicastResponseForRecord(m, srcaddr, ResponseSrcLocal, dstport, response->h.id, &m->rec.r, !dstaddr);
+
+                    // Initialize the DNS server on the resource record which will now filter what questions we answer with
+                    // this record.
+                    //
+                    // We could potentially lookup the DNS server based on the source address, but that may not work always
+                    // and that's why ExpectingUnicastResponseForRecord does not try to verify whether the response came
+                    // from the DNS server that queried. We follow the same logic here. If we can find a matching quetion based
+                    // on the "id" and "source port", then this response answers the question and assume the response
+                    // came from the same DNS server that we sent the query to.
+
+                    if (q != mDNSNULL)
+                    {
+                        AcceptableResponse = mDNStrue;
+                        if (!InterfaceID)
+                        {
+                            debugf("mDNSCoreReceiveResponse: InterfaceID %p %##s (%s)", q->InterfaceID, q->qname.c, DNSTypeName(q->qtype));
+                            m->rec.r.resrec.rDNSServer = uDNSServer = q->qDNSServer;
+                        }
+                        else
+                            LogInfo("mDNSCoreReceiveResponse: InterfaceID %p %##s (%s)", q->InterfaceID, q->qname.c, DNSTypeName(q->qtype));
+                    }
+                    else
+                    {
+                        // If we can't find a matching question, we need to see whether we have seen records earlier that matched
+                        // the question. The code below does that. So, make this record unacceptable for now
+                        if (!InterfaceID)
+                        {
+                            debugf("mDNSCoreReceiveResponse: Can't find question for record name %##s", m->rec.r.resrec.name->c);
+                            AcceptableResponse = mDNSfalse;
+                        }
+                    }
+                }
+                else if (ExpectingMulticastResponseForRecord(m, &m->rec.r, srcaddr, recordAccepted, &McastNSEC3Records))
+                {
+                    recordAccepted = mDNStrue;
+                    AcceptableResponse = mDNStrue;
+                    LogInfo("mDNSCoreReceiveResponse: Accepting record in response to QU question %s, InterfaceID %p", CRDisplayString(m, &m->rec.r),
+                        InterfaceID);
+                }
+                else if (IsDeviceInfoRecord(m->rec.r.resrec.name))
+                {
+                    recordAccepted = mDNStrue;
+                    AcceptableResponse = mDNStrue;
+                    LogInfo("mDNSCoreReceiveResponse: Accepting _device-info record %s, InterfaceID %p",
+                         CRDisplayString(m, &m->rec.r), InterfaceID);
+                }
+            }
+        }
+        else if (llintf && llintf->IgnoreIPv4LL && m->rec.r.resrec.rrtype == kDNSType_A)
+        {
+            CacheRecord *const rr = &m->rec.r;
+            RDataBody2 *const rdb = (RDataBody2 *)rr->smallrdatastorage.data;
+
+            // If we are supposed to ignore link-local addresses on this interface, drop
+            // all "A" records that have link-local address in them.
+            if (mDNSv4AddressIsLinkLocal(&rdb->ipv4))
+            {
+                LogInfo("mDNSResponder: Dropping LinkLocal packet %s", CRDisplayString(m, &m->rec.r));
+                mDNSCoreResetRecord(m);
+                continue;
+            }
+        }
+
+        // 1. Check that this packet resource record does not conflict with any of ours
+        if (mDNSOpaque16IsZero(response->h.id) && m->rec.r.resrec.rrtype != kDNSType_NSEC)
+        {
+            if (m->CurrentRecord)
+                LogMsg("mDNSCoreReceiveResponse ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+            m->CurrentRecord = m->ResourceRecords;
+            while (m->CurrentRecord)
+            {
+                AuthRecord *rr = m->CurrentRecord;
+                m->CurrentRecord = rr->next;
+                // We accept all multicast responses, and unicast responses resulting from queries we issued
+                // For other unicast responses, this code accepts them only for responses with an
+                // (apparently) local source address that pertain to a record of our own that's in probing state
+                if (!AcceptableResponse && !(ResponseSrcLocal && rr->resrec.RecordType == kDNSRecordTypeUnique)) continue;
+
+                if (PacketRRMatchesSignature(&m->rec.r, rr))        // If interface, name, type (if shared record) and class match...
+                {
+                    // ... check to see if type and rdata are identical
+                    if (IdenticalSameNameRecord(&m->rec.r.resrec, &rr->resrec))
+                    {
+                        // If the RR in the packet is identical to ours, just check they're not trying to lower the TTL on us
+                        if (m->rec.r.resrec.rroriginalttl >= rr->resrec.rroriginalttl/2 || m->SleepState)
+                        {
+                            // If we were planning to send on this -- and only this -- interface, then we don't need to any more
+                            if      (rr->ImmedAnswer == InterfaceID) { rr->ImmedAnswer = mDNSNULL; rr->ImmedUnicast = mDNSfalse; }
+                        }
+                        else
+                        {
+                            if      (rr->ImmedAnswer == mDNSNULL)    { rr->ImmedAnswer = InterfaceID;       m->NextScheduledResponse = m->timenow; }
+                            else if (rr->ImmedAnswer != InterfaceID) { rr->ImmedAnswer = mDNSInterfaceMark; m->NextScheduledResponse = m->timenow; }
+                        }
+                    }
+                    // else, the packet RR has different type or different rdata -- check to see if this is a conflict
+                    else if (m->rec.r.resrec.rroriginalttl > 0 && PacketRRConflict(m, rr, &m->rec.r))
+                    {
+                        LogInfo("mDNSCoreReceiveResponse: Pkt Record: %08lX %s", m->rec.r.resrec.rdatahash, CRDisplayString(m, &m->rec.r));
+                        LogInfo("mDNSCoreReceiveResponse: Our Record: %08lX %s", rr->resrec.rdatahash, ARDisplayString(m, rr));
+
+                        // If this record is marked DependentOn another record for conflict detection purposes,
+                        // then *that* record has to be bumped back to probing state to resolve the conflict
+                        if (rr->DependentOn)
+                        {
+                            while (rr->DependentOn) rr = rr->DependentOn;
+                            LogInfo("mDNSCoreReceiveResponse: Dep Record: %08lX %s", rr->resrec.rdatahash, ARDisplayString(m, rr));
+                        }
+
+                        // If we've just whacked this record's ProbeCount, don't need to do it again
+                        if (rr->ProbeCount > DefaultProbeCountForTypeUnique)
+                            LogInfo("mDNSCoreReceiveResponse: Already reset to Probing: %s", ARDisplayString(m, rr));
+                        else if (rr->ProbeCount == DefaultProbeCountForTypeUnique)
+                            LogMsg("mDNSCoreReceiveResponse: Ignoring response received before we even began probing: %s", ARDisplayString(m, rr));
+                        else
+                        {
+                            LogMsg("mDNSCoreReceiveResponse: Received from %#a:%d %s", srcaddr, mDNSVal16(srcport), CRDisplayString(m, &m->rec.r));
+                            // If we'd previously verified this record, put it back to probing state and try again
+                            if (rr->resrec.RecordType == kDNSRecordTypeVerified)
+                            {
+                                LogMsg("mDNSCoreReceiveResponse: Resetting to Probing: %s", ARDisplayString(m, rr));
+                                rr->resrec.RecordType     = kDNSRecordTypeUnique;
+                                // We set ProbeCount to one more than the usual value so we know we've already touched this record.
+                                // This is because our single probe for "example-name.local" could yield a response with (say) two A records and
+                                // three AAAA records in it, and we don't want to call RecordProbeFailure() five times and count that as five conflicts.
+                                // This special value is recognised and reset to DefaultProbeCountForTypeUnique in SendQueries().
+                                rr->ProbeCount     = DefaultProbeCountForTypeUnique + 1;
+                                rr->AnnounceCount  = InitialAnnounceCount;
+                                InitializeLastAPTime(m, rr);
+                                RecordProbeFailure(m, rr);  // Repeated late conflicts also cause us to back off to the slower probing rate
+                            }
+                            // If we're probing for this record, we just failed
+                            else if (rr->resrec.RecordType == kDNSRecordTypeUnique)
+                            {
+                                // Before we call deregister, check if this is a packet we registered with the sleep proxy.
+                                if (!mDNSCoreRegisteredProxyRecord(m, rr))
+                                {
+                                    LogMsg("mDNSCoreReceiveResponse: ProbeCount %d; will deregister %s", rr->ProbeCount, ARDisplayString(m, rr));
+                                    
+                                    m->mDNSStats.NameConflicts++;
+                                    mDNS_Deregister_internal(m, rr, mDNS_Dereg_conflict);
+                                }
+                            }
+                            // We assumed this record must be unique, but we were wrong. (e.g. There are two mDNSResponders on the
+                            // same machine giving different answers for the reverse mapping record, or there are two machines on the
+                            // network using the same IP address.) This is simply a misconfiguration, and there's nothing we can do
+                            // to fix it -- e.g. it's not our job to be trying to change the machine's IP address. We just discard our
+                            // record to avoid continued conflicts (as we do for a conflict on our Unique records) and get on with life.
+                            else if (rr->resrec.RecordType == kDNSRecordTypeKnownUnique)
+                            {
+                                LogMsg("mDNSCoreReceiveResponse: Unexpected conflict discarding %s", ARDisplayString(m, rr));
+                                m->mDNSStats.KnownUniqueNameConflicts++;
+                                mDNS_Deregister_internal(m, rr, mDNS_Dereg_conflict);
+                            }
+                            else
+                                LogMsg("mDNSCoreReceiveResponse: Unexpected record type %X %s", rr->resrec.RecordType, ARDisplayString(m, rr));
+                        }
+                    }
+                    // Else, matching signature, different type or rdata, but not a considered a conflict.
+                    // If the packet record has the cache-flush bit set, then we check to see if we
+                    // have any record(s) of the same type that we should re-assert to rescue them
+                    // (see note about "multi-homing and bridged networks" at the end of this function).
+                    else if (m->rec.r.resrec.rrtype == rr->resrec.rrtype)
+                        if ((m->rec.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask) && m->timenow - rr->LastMCTime > mDNSPlatformOneSecond/2)
+                        { rr->ImmedAnswer = mDNSInterfaceMark; m->NextScheduledResponse = m->timenow; }
+                }
+            }
+        }
+
+        nseclist = mDNSfalse;
+        if (!AcceptableResponse)
+        {
+            AcceptableResponse = IsResponseAcceptable(m, CacheFlushRecords, unicastQuestion, &nseclist);
+            if (AcceptableResponse) m->rec.r.resrec.rDNSServer = uDNSServer;
+        }
+
+        // 2. See if we want to add this packet resource record to our cache
+        // We only try to cache answers if we have a cache to put them in
+        // Also, we ignore any apparent attempts at cache poisoning unicast to us that do not answer any outstanding active query
+        if (!AcceptableResponse) LogInfo("mDNSCoreReceiveResponse ignoring %s", CRDisplayString(m, &m->rec.r));
+        if (m->rrcache_size && AcceptableResponse)
+        {
+            const mDNSu32 slot = HashSlot(m->rec.r.resrec.name);
+            CacheGroup *cg = CacheGroupForRecord(m, slot, &m->rec.r.resrec);
+            CacheRecord *rr = mDNSNULL;
+
+            if (McastNSEC3Records)
+                InitializeAnonInfoForCR(m, &McastNSEC3Records, &m->rec.r);
+
+            // 2a. Check if this packet resource record is already in our cache.
+            //
+            // If this record should go in the nseclist, don't look in the cache for updating it.
+            // They are supposed to be cached under the "nsec" field of the cache record for
+            // validation. Just create the cache record. 
+            if (!nseclist)
+            {
+                rr = mDNSCoreReceiveCacheCheck(m, response, LLQType, slot, cg, unicastQuestion, &cfp, &NSECCachePtr, InterfaceID);
+            }
+
+            // If mDNSOppCaching is set (which affects only multicast), enable opportunistic caching in which case we cache
+            // everything that was received over multicast. Otherwise, we are selective about the caching.
+            //
+            // Cache everything that is from ourselves (that's how we answer any questions looking for them). Otherwise call
+            // ExpectingMulticastResponseForRecord which decides whether to cache this record or not.
+            //
+            if (!m->mDNSOppCaching && !rr && !myself && mDNSOpaque16IsZero(response->h.id))
+            {
+                if (!ExpectingMulticastResponseForRecord(m, &m->rec.r, srcaddr, recordAccepted, &McastNSEC3Records))
+                {
+                    //LogMsg("mDNSCoreReceiveResponse: discarding %s", CRDisplayString(m, &m->rec.r));
+                    mDNSCoreResetRecord(m);
+                    continue;
+                }
+                else
+                {
+                    recordAccepted = mDNStrue;
+                }
+            }
+
+
+            // If packet resource record not in our cache, add it now
+            // (unless it is just a deletion of a record we never had, in which case we don't care)
+            if (!rr && m->rec.r.resrec.rroriginalttl > 0)
+            {
+                const mDNSBool AddToCFList = (m->rec.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask) && (LLQType != uDNS_LLQ_Events);
+                mDNSs32 delay;
+
+                if (AddToCFList)
+                    delay = NonZeroTime(m->timenow + mDNSPlatformOneSecond);
+                else
+                    delay = CheckForSoonToExpireRecords(m, m->rec.r.resrec.name, m->rec.r.resrec.namehash, slot, mDNSNULL);
+
+                // If unique, assume we may have to delay delivery of this 'add' event.
+                // Below, where we walk the CacheFlushRecords list, we either call CacheRecordDeferredAdd()
+                // to immediately to generate answer callbacks, or we call ScheduleNextCacheCheckTime()
+                // to schedule an mDNS_Execute task at the appropriate time.
+                rr = CreateNewCacheEntry(m, slot, cg, delay, !nseclist, srcaddr);
+                if (rr)
+                {
+                    rr->responseFlags = response->h.flags;
+                    // If we are not creating signatures, then we need to inform DNSSEC so that
+                    // it does not wait forever. Don't do this if we got NSEC records
+                    // as it indicates that this name does not exist.
+                    if (rr->resrec.rrtype == kDNSType_RRSIG && !nseclist)
+                    {
+                        rrsigsCreated = mDNStrue;
+                    }
+                    // Remember whether we created a cache record in response to a DNSSEC question.
+                    // This helps DNSSEC code not to reissue the question to fetch the DNSSEC records.
+                    rr->CRDNSSECQuestion = 0;
+                    if (unicastQuestion && DNSSECQuestion(unicastQuestion))
+                    {
+                        LogInfo("mDNSCoreReceiveResponse: CRDNSSECQuestion set for new record %s, question %##s (%s)", CRDisplayString(m, rr),
+                            unicastQuestion->qname.c, DNSTypeName(unicastQuestion->qtype));
+                        rr->CRDNSSECQuestion = 1;
+                    }
+                    // NSEC/NSEC3 records and its signatures are cached with the negative cache entry
+                    // which we should be creating below. It is also needed in the wildcard
+                    // expanded answer case and in that case it is cached along with the answer.
+                    if (nseclist)
+                    {
+                        rr->TimeRcvd = m->timenow;
+                        *nsecp = rr;
+                        nsecp = &rr->next;
+                    }
+                    else if (AddToCFList)
+                    {
+                        *cfp = rr;
+                        cfp = &rr->NextInCFList;
+                        *cfp = (CacheRecord*)1;
+                    }
+                    else if (rr->DelayDelivery)
+                    {
+                        ScheduleNextCacheCheckTime(m, slot, rr->DelayDelivery);
+                    }
+                }
+            }
+            else
+            {
+                if (rr && rr->resrec.AnonInfo && m->rec.r.resrec.AnonInfo)
+                {
+                    CopyAnonInfoForCR(m, rr, &m->rec.r);
+                }
+            }
+        }
+        mDNSCoreResetRecord(m);
+    }
+
+exit:
+    mDNSCoreResetRecord(m);
+
+    // If we've just received one or more records with their cache flush bits set,
+    // then scan that cache slot to see if there are any old stale records we need to flush
+    while (CacheFlushRecords != (CacheRecord*)1)
+    {
+        CacheRecord *r1 = CacheFlushRecords, *r2;
+        const mDNSu32 slot = HashSlot(r1->resrec.name);
+        const CacheGroup *cg = CacheGroupForRecord(m, slot, &r1->resrec);
+        CacheFlushRecords = CacheFlushRecords->NextInCFList;
+        r1->NextInCFList = mDNSNULL;
+
+        // Look for records in the cache with the same signature as this new one with the cache flush
+        // bit set, and either (a) if they're fresh, just make sure the whole RRSet has the same TTL
+        // (as required by DNS semantics) or (b) if they're old, mark them for deletion in one second.
+        // We make these TTL adjustments *only* for records that still have *more* than one second
+        // remaining to live. Otherwise, a record that we tagged for deletion half a second ago
+        // (and now has half a second remaining) could inadvertently get its life extended, by either
+        // (a) if we got an explicit goodbye packet half a second ago, the record would be considered
+        // "fresh" and would be incorrectly resurrected back to the same TTL as the rest of the RRSet,
+        // or (b) otherwise, the record would not be fully resurrected, but would be reset to expire
+        // in one second, thereby inadvertently delaying its actual expiration, instead of hastening it.
+        // If this were to happen repeatedly, the record's expiration could be deferred indefinitely.
+        // To avoid this, we need to ensure that the cache flushing operation will only act to
+        // *decrease* a record's remaining lifetime, never *increase* it.
+        for (r2 = cg ? cg->members : mDNSNULL; r2; r2=r2->next)
+        {
+            mDNSu16 id1;
+            mDNSu16 id2;
+            if (!r1->resrec.InterfaceID)
+            {
+                id1 = (r1->resrec.rDNSServer ? r1->resrec.rDNSServer->resGroupID : 0);
+                id2 = (r2->resrec.rDNSServer ? r2->resrec.rDNSServer->resGroupID : 0);
+            }
+            else
+            {
+                id1 = id2 = 0;
+            }
+            // When we receive new RRSIGs e.g., for DNSKEY record, we should not flush the old
+            // RRSIGS e.g., for TXT record. To do so, we need to look at the typeCovered field of
+            // the new RRSIG that we received. Process only if the typeCovered matches.
+            if ((r1->resrec.rrtype == r2->resrec.rrtype) && (r1->resrec.rrtype == kDNSType_RRSIG))
+            {
+                rdataRRSig *rrsig1 = (rdataRRSig *)(((RDataBody2 *)(r1->resrec.rdata->u.data))->data);
+                rdataRRSig *rrsig2 = (rdataRRSig *)(((RDataBody2 *)(r2->resrec.rdata->u.data))->data);
+                if (swap16(rrsig1->typeCovered) != swap16(rrsig2->typeCovered))
+                {
+                    debugf("mDNSCoreReceiveResponse: Received RRSIG typeCovered %s, found %s, not processing",
+                        DNSTypeName(swap16(rrsig1->typeCovered)), DNSTypeName(swap16(rrsig2->typeCovered)));
+                    continue;
+                }
+            }
+             
+            // For Unicast (null InterfaceID) the resolver IDs should also match
+            if ((r1->resrec.InterfaceID == r2->resrec.InterfaceID) &&
+                (r1->resrec.InterfaceID || (id1 == id2)) &&
+                r1->resrec.rrtype      == r2->resrec.rrtype &&
+                r1->resrec.rrclass     == r2->resrec.rrclass)
+            {
+                // If record is recent, just ensure the whole RRSet has the same TTL (as required by DNS semantics)
+                // else, if record is old, mark it to be flushed
+                if (m->timenow - r2->TimeRcvd < mDNSPlatformOneSecond && RRExpireTime(r2) - m->timenow > mDNSPlatformOneSecond)
+                {
+                    // If we find mismatched TTLs in an RRSet, correct them.
+                    // We only do this for records with a TTL of 2 or higher. It's possible to have a
+                    // goodbye announcement with the cache flush bit set (or a case-change on record rdata,
+                    // which we treat as a goodbye followed by an addition) and in that case it would be
+                    // inappropriate to synchronize all the other records to a TTL of 0 (or 1).
+                    // We suppress the message for the specific case of correcting from 240 to 60 for type TXT,
+                    // because certain early Bonjour devices are known to have this specific mismatch, and
+                    // there's no point filling syslog with messages about something we already know about.
+                    // We also don't log this for uDNS responses, since a caching name server is obliged
+                    // to give us an aged TTL to correct for how long it has held the record,
+                    // so our received TTLs are expected to vary in that case
+                    if (r2->resrec.rroriginalttl != r1->resrec.rroriginalttl && r1->resrec.rroriginalttl > 1)
+                    {
+                        if (!(r2->resrec.rroriginalttl == 240 && r1->resrec.rroriginalttl == 60 && r2->resrec.rrtype == kDNSType_TXT) &&
+                            mDNSOpaque16IsZero(response->h.id))
+                            LogInfo("Correcting TTL from %4d to %4d for %s",
+                                    r2->resrec.rroriginalttl, r1->resrec.rroriginalttl, CRDisplayString(m, r2));
+                        r2->resrec.rroriginalttl = r1->resrec.rroriginalttl;
+                    }
+                    r2->TimeRcvd = m->timenow;
+                }
+                else                // else, if record is old, mark it to be flushed
+                {
+                    verbosedebugf("Cache flush new %p age %d expire in %d %s", r1, m->timenow - r1->TimeRcvd, RRExpireTime(r1) - m->timenow, CRDisplayString(m, r1));
+                    verbosedebugf("Cache flush old %p age %d expire in %d %s", r2, m->timenow - r2->TimeRcvd, RRExpireTime(r2) - m->timenow, CRDisplayString(m, r2));
+                    // We set stale records to expire in one second.
+                    // This gives the owner a chance to rescue it if necessary.
+                    // This is important in the case of multi-homing and bridged networks:
+                    //   Suppose host X is on Ethernet. X then connects to an AirPort base station, which happens to be
+                    //   bridged onto the same Ethernet. When X announces its AirPort IP address with the cache-flush bit
+                    //   set, the AirPort packet will be bridged onto the Ethernet, and all other hosts on the Ethernet
+                    //   will promptly delete their cached copies of the (still valid) Ethernet IP address record.
+                    //   By delaying the deletion by one second, we give X a change to notice that this bridging has
+                    //   happened, and re-announce its Ethernet IP address to rescue it from deletion from all our caches.
+
+                    // We set UnansweredQueries to MaxUnansweredQueries to avoid expensive and unnecessary
+                    // final expiration queries for this record.
+
+                    // If a record is deleted twice, first with an explicit DE record, then a second time by virtue of the cache
+                    // flush bit on the new record replacing it, then we allow the record to be deleted immediately, without the usual
+                    // one-second grace period. This improves responsiveness for mDNS_Update(), as used for things like iChat status updates.
+                    // <rdar://problem/5636422> Updating TXT records is too slow
+                    // We check for "rroriginalttl == 1" because we want to include records tagged by the "packet TTL is zero" check above,
+                    // which sets rroriginalttl to 1, but not records tagged by the rdata case-change check, which sets rroriginalttl to 0.
+                    if (r2->TimeRcvd == m->timenow && r2->resrec.rroriginalttl == 1 && r2->UnansweredQueries == MaxUnansweredQueries)
+                    {
+                        LogInfo("Cache flush for DE record %s", CRDisplayString(m, r2));
+                        r2->resrec.rroriginalttl = 0;
+                    }
+                    else if (RRExpireTime(r2) - m->timenow > mDNSPlatformOneSecond)
+                    {
+                        // We only set a record to expire in one second if it currently has *more* than a second to live
+                        // If it's already due to expire in a second or less, we just leave it alone
+                        r2->resrec.rroriginalttl = 1;
+                        r2->UnansweredQueries = MaxUnansweredQueries;
+                        r2->TimeRcvd = m->timenow - 1;
+                        // We use (m->timenow - 1) instead of m->timenow, because we use that to identify records
+                        // that we marked for deletion via an explicit DE record
+                    }
+                }
+                SetNextCacheCheckTimeForRecord(m, r2);
+            }
+        }
+
+        if (r1->DelayDelivery)  // If we were planning to delay delivery of this record, see if we still need to
+        {
+            // If we had a unicast question for this response with at least one positive answer and we
+            // have NSECRecords, it is most likely a wildcard expanded answer. Cache the NSEC and its
+            // signatures along with the cache record which will be used for validation later. If
+            // we rescued a few records earlier in this function, then NSECCachePtr would be set. In that
+            // use that instead.
+            if (response->h.numAnswers && unicastQuestion && NSECRecords)
+            {
+                if (!NSECCachePtr)
+                {
+                    LogInfo("mDNSCoreReceiveResponse: Updating NSECCachePtr to %s", CRDisplayString(m, r1));
+                    NSECCachePtr = r1;
+                }
+                // Note: We need to do this before we call CacheRecordDeferredAdd as this
+                // might start the verification process which needs these NSEC records
+                if (!AddNSECSForCacheRecord(m, NSECRecords, NSECCachePtr, rcode))
+                { 
+                    LogInfo("mDNSCoreReceiveResponse: AddNSECSForCacheRecord failed to add NSEC for %s", CRDisplayString(m, NSECCachePtr));
+                    FreeNSECRecords(m, NSECRecords);
+                }
+                NSECRecords = mDNSNULL;
+                NSECCachePtr = mDNSNULL;
+            }
+            r1->DelayDelivery = CheckForSoonToExpireRecords(m, r1->resrec.name, r1->resrec.namehash, slot, mDNSNULL);
+            // If no longer delaying, deliver answer now, else schedule delivery for the appropriate time
+            if (!r1->DelayDelivery) CacheRecordDeferredAdd(m, r1);
+            else ScheduleNextCacheCheckTime(m, slot, r1->DelayDelivery);
+        }
+    }
+
+    // If we have not consumed the NSEC records yet e.g., just refreshing the cache,
+    // update them now for future validations.
+    if (NSECRecords && NSECCachePtr)
+    {
+        LogInfo("mDNSCoreReceieveResponse: Updating NSEC records in %s", CRDisplayString(m, NSECCachePtr));
+        if (!AddNSECSForCacheRecord(m, NSECRecords, NSECCachePtr, rcode))
+        { 
+            LogInfo("mDNSCoreReceiveResponse: AddNSECSForCacheRecord failed to add NSEC for %s", CRDisplayString(m, NSECCachePtr));
+            FreeNSECRecords(m, NSECRecords);
+        }
+        NSECRecords = mDNSNULL;
+        NSECCachePtr = mDNSNULL;
+    }
+
+    // If there is at least one answer and we did not create RRSIGs and there was a
+    // ValidatingResponse question waiting for this response, give a hint that no RRSIGs
+    // were created. We don't need to give a hint:
+    //
+    // - if we have no answers, the mDNSCoreReceiveNoUnicastAnswers below should
+    //   generate a negative response
+    //
+    // - if we have NSECRecords, it means we might have a potential proof for
+    //   non-existence of name that we are looking for
+    //
+    if (response->h.numAnswers && !rrsigsCreated && DNSSECQuestion && !NSECRecords)
+        mDNSCoreReceiveNoDNSSECAnswers(m, response, end, dstaddr, dstport, InterfaceID);
+
+    // See if we need to generate negative cache entries for unanswered unicast questions
+    mDNSCoreReceiveNoUnicastAnswers(m, response, end, dstaddr, dstport, InterfaceID, LLQType, rcode, NSECRecords);
+
+    if (McastNSEC3Records)
+    {
+        debugf("mDNSCoreReceiveResponse: McastNSEC3Records not used");
+        FreeNSECRecords(m, McastNSEC3Records);
+    }
+}
+
+// ScheduleWakeup causes all proxy records with WakeUp.HMAC matching mDNSEthAddr 'e' to be deregistered, causing
+// multiple wakeup magic packets to be sent if appropriate, and all records to be ultimately freed after a few seconds.
+// ScheduleWakeup is called on mDNS record conflicts, ARP conflicts, NDP conflicts, or reception of trigger traffic
+// that warrants waking the sleeping host.
+// ScheduleWakeup must be called with the lock held (ScheduleWakeupForList uses mDNS_Deregister_internal)
+
+mDNSlocal void ScheduleWakeupForList(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSEthAddr *e, AuthRecord *const thelist)
+{
+    // We need to use the m->CurrentRecord mechanism here when dealing with DuplicateRecords list as
+    // mDNS_Deregister_internal deregisters duplicate records immediately as they are not used
+    // to send wakeups or goodbyes. See the comment in that function for more details. To keep it
+    // simple, we use the same mechanism for both lists.
+    if (!e->l[0])
+    {
+        LogMsg("ScheduleWakeupForList ERROR: Target HMAC is zero");
+        return;
+    }
+    m->CurrentRecord = thelist;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *const rr = m->CurrentRecord;
+        if (rr->resrec.InterfaceID == InterfaceID && rr->resrec.RecordType != kDNSRecordTypeDeregistering && mDNSSameEthAddress(&rr->WakeUp.HMAC, e))
+        {
+            LogInfo("ScheduleWakeupForList: Scheduling wakeup packets for %s", ARDisplayString(m, rr));
+            mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+        }
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+mDNSlocal void ScheduleWakeup(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSEthAddr *e)
+{
+    if (!e->l[0]) { LogMsg("ScheduleWakeup ERROR: Target HMAC is zero"); return; }
+    ScheduleWakeupForList(m, InterfaceID, e, m->DuplicateRecords);
+    ScheduleWakeupForList(m, InterfaceID, e, m->ResourceRecords);
+}
+
+mDNSlocal void SPSRecordCallback(mDNS *const m, AuthRecord *const ar, mStatus result)
+{
+    if (result && result != mStatus_MemFree)
+        LogInfo("SPS Callback %d %s", result, ARDisplayString(m, ar));
+
+    if (result == mStatus_NameConflict)
+    {
+        mDNS_Lock(m);
+        LogMsg("%-7s Conflicting mDNS -- waking %.6a %s", InterfaceNameForID(m, ar->resrec.InterfaceID), &ar->WakeUp.HMAC, ARDisplayString(m, ar));
+        if (ar->WakeUp.HMAC.l[0])
+        {
+            SendWakeup(m, ar->resrec.InterfaceID, &ar->WakeUp.IMAC, &ar->WakeUp.password);  // Send one wakeup magic packet
+            ScheduleWakeup(m, ar->resrec.InterfaceID, &ar->WakeUp.HMAC);                    // Schedule all other records with the same owner to be woken
+        }
+        mDNS_Unlock(m);
+    }
+
+    if (result == mStatus_NameConflict || result == mStatus_MemFree)
+    {
+        m->ProxyRecords--;
+        mDNSPlatformMemFree(ar);
+        mDNS_UpdateAllowSleep(m);
+    }
+}
+
+mDNSlocal mDNSu8 *GetValueForMACAddr(mDNSu8 *ptr, mDNSu8 *limit, mDNSEthAddr *eth)
+{
+    int     i;
+    mDNSs8  hval   = 0;
+    int     colons = 0;
+    mDNSu8  val    = 0;
+
+    for (i = 0; ptr < limit && *ptr != ' ' && i < 17; i++, ptr++)
+    {
+        hval = HexVal(*ptr);
+        if (hval != -1)
+        {
+            val <<= 4;
+            val |= hval;
+        }
+        else if (*ptr == ':')
+        {
+            eth->b[colons] = val;
+            colons++;
+            val = 0;
+        }
+    }
+    if (colons != 5)
+    {
+        LogMsg("GetValueForMACAddr: Address malformed colons %d", colons);
+        return mDNSNULL;
+    }
+    eth->b[colons] = val;
+    return ptr;
+}
+
+mDNSlocal mDNSu8 *GetValueForIPv6Addr(mDNSu8 *ptr, mDNSu8 *limit, mDNSv6Addr *v6)
+{
+    int hval;
+    int value;
+    int numBytes;
+    int digitsProcessed;
+    int zeroFillStart;
+    int numColons;
+    mDNSu8 v6addr[16];
+
+    // RFC 3513: Section 2.2 specifies IPv6 presentation format. The following parsing
+    // handles both (1) and (2) and does not handle embedded IPv4 addresses.
+    //
+    // First forms a address in "v6addr", then expands to fill the zeroes in and returns
+    // the result in "v6"
+
+    numColons = numBytes = value = digitsProcessed = zeroFillStart = 0;
+    while (ptr < limit && *ptr != ' ')
+    {
+        hval = HexVal(*ptr);
+        if (hval != -1)
+        {
+            value <<= 4;
+            value |= hval;
+            digitsProcessed = 1;
+        }
+        else if (*ptr == ':')
+        {
+            if (!digitsProcessed)
+            {
+                // If we have already seen a "::", we should not see one more. Handle the special
+                // case of "::"
+                if (numColons)
+                {
+                    // if we never filled any bytes and the next character is space (we have reached the end)
+                    // we are done
+                    if (!numBytes && (ptr + 1) < limit && *(ptr + 1) == ' ')
+                    {
+                        mDNSPlatformMemZero(v6->b, 16);
+                        return ptr + 1;
+                    }
+                    LogMsg("GetValueForIPv6Addr: zeroFillStart non-zero %d", zeroFillStart);
+                    return mDNSNULL;
+                }
+
+                // We processed "::". We need to fill zeroes later. For now, mark the
+                // point where we will start filling zeroes from.
+                zeroFillStart = numBytes;
+                numColons++;
+            }
+            else if ((ptr + 1) < limit && *(ptr + 1) == ' ')
+            {
+                // We have a trailing ":" i.e., no more characters after ":"
+                LogMsg("GetValueForIPv6Addr: Trailing colon");
+                return mDNSNULL;
+            }
+            else
+            {
+                // For a fully expanded IPv6 address, we fill the 14th and 15th byte outside of this while
+                // loop below as there is no ":" at the end. Hence, the last two bytes that can possibly
+                // filled here is 12 and 13.
+                if (numBytes > 13) { LogMsg("GetValueForIPv6Addr:1: numBytes is %d", numBytes); return mDNSNULL; }
+
+                v6addr[numBytes++] = (mDNSu8) ((value >> 8) & 0xFF);
+                v6addr[numBytes++] = (mDNSu8) (value & 0xFF);
+                digitsProcessed = value = 0;
+
+                // Make sure that we did not fill the 13th and 14th byte above
+                if (numBytes > 14) { LogMsg("GetValueForIPv6Addr:2: numBytes is %d", numBytes); return mDNSNULL; }
+            }
+        }
+        ptr++;
+    }
+
+    // We should be processing the last set of bytes following the last ":" here
+    if (!digitsProcessed)
+    {
+        LogMsg("GetValueForIPv6Addr: no trailing bytes after colon, numBytes is %d", numBytes);
+        return mDNSNULL;
+    }
+
+    if (numBytes > 14) { LogMsg("GetValueForIPv6Addr:3: numBytes is %d", numBytes); return mDNSNULL; }
+    v6addr[numBytes++] = (mDNSu8) ((value >> 8) & 0xFF);
+    v6addr[numBytes++] = (mDNSu8) (value & 0xFF);
+
+    if (zeroFillStart)
+    {
+        int i, j, n;
+        for (i = 0; i < zeroFillStart; i++)
+            v6->b[i] = v6addr[i];
+        for (j = i, n = 0; n < 16 - numBytes; j++, n++)
+            v6->b[j] = 0;
+        for (; j < 16; i++, j++)
+            v6->b[j] = v6addr[i];
+    }
+    else if (numBytes == 16)
+        mDNSPlatformMemCopy(v6->b, v6addr, 16);
+    else
+    {
+        LogMsg("GetValueForIPv6addr: Not enough bytes for IPv6 address, numBytes is %d", numBytes);
+        return mDNSNULL;
+    }
+    return ptr;
+}
+
+mDNSlocal mDNSu8 *GetValueForIPv4Addr(mDNSu8 *ptr, mDNSu8 *limit, mDNSv4Addr *v4)
+{
+    mDNSu32 val;
+    int dots = 0;
+    val = 0;
+
+    for ( ; ptr < limit && *ptr != ' '; ptr++)
+    {
+        if (*ptr >= '0' &&  *ptr <= '9')
+            val = val * 10 + *ptr - '0';
+        else if (*ptr == '.')
+        {
+            v4->b[dots++] = val;
+            val = 0;
+        }
+        else
+        {
+            // We have a zero at the end and if we reached that, then we are done.
+            if (*ptr == 0 && ptr == limit - 1 && dots == 3)
+            {
+                v4->b[dots] = val;
+                return ptr + 1;
+            }
+            else { LogMsg("GetValueForIPv4Addr: something wrong ptr(%p) %c, limit %p, dots %d", ptr, *ptr, limit, dots); return mDNSNULL; }
+        }
+    }
+    if (dots != 3) { LogMsg("GetValueForIPv4Addr: Address malformed dots %d", dots); return mDNSNULL; }
+    v4->b[dots] = val;
+    return ptr;
+}
+
+mDNSlocal mDNSu8 *GetValueForKeepalive(mDNSu8 *ptr, mDNSu8 *limit, mDNSu32 *value)
+{
+    mDNSu32 val;
+
+    val = 0;
+    for ( ; ptr < limit && *ptr != ' '; ptr++)
+    {
+        if (*ptr < '0' || *ptr > '9')
+        {
+            // We have a zero at the end and if we reached that, then we are done.
+            if (*ptr == 0 && ptr == limit - 1)
+            {
+                *value = val;
+                return ptr + 1;
+            }
+            else { LogMsg("GetValueForKeepalive: *ptr %d, ptr %p, limit %p, ptr +1 %d", *ptr, ptr, limit, *(ptr + 1)); return mDNSNULL; }
+        }
+        val = val * 10 + *ptr - '0';
+    }
+    *value = val;
+    return ptr;
+}
+
+mDNSlocal void mDNS_ExtractKeepaliveInfo(AuthRecord *ar, mDNSu32 *timeout, mDNSAddr *laddr, mDNSAddr *raddr, mDNSEthAddr *eth, mDNSu32 *seq,
+                                         mDNSu32 *ack, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu16 *win)
+{
+    if (ar->resrec.rrtype != kDNSType_NULL)
+        return;
+
+    if (mDNS_KeepaliveRecord(&ar->resrec))
+    {
+        int len = ar->resrec.rdlength;
+        mDNSu8 *ptr = &ar->resrec.rdata->u.txt.c[1];
+        mDNSu8 *limit = ptr + len - 1; // Exclude the first byte that is the length
+        mDNSu32 value = 0;
+
+        while (ptr < limit)
+        {
+            mDNSu8 param = *ptr;
+            ptr += 2;   // Skip the letter and the "="
+            if (param == 'h')
+            {
+                laddr->type = mDNSAddrType_IPv4;
+                ptr = GetValueForIPv4Addr(ptr, limit, &laddr->ip.v4);
+            }
+            else if (param == 'd')
+            {
+                raddr->type = mDNSAddrType_IPv4;
+                ptr = GetValueForIPv4Addr(ptr, limit, &raddr->ip.v4);
+            }
+            if (param == 'H')
+            {
+                laddr->type = mDNSAddrType_IPv6;
+                ptr = GetValueForIPv6Addr(ptr, limit, &laddr->ip.v6);
+            }
+            else if (param == 'D')
+            {
+                raddr->type = mDNSAddrType_IPv6;
+                ptr = GetValueForIPv6Addr(ptr, limit, &raddr->ip.v6);
+            }
+            else if (param == 'm')
+            {
+                ptr = GetValueForMACAddr(ptr, limit, eth);
+            }
+            else
+            {
+                ptr = GetValueForKeepalive(ptr, limit, &value);
+            }
+            if (!ptr) { LogMsg("mDNS_ExtractKeepaliveInfo: Cannot parse\n"); return; }
+
+            // Extract everything in network order so that it is easy for sending a keepalive and also
+            // for matching incoming TCP packets
+            switch (param)
+            {
+            case 't':
+                *timeout = value;
+                //if (*timeout < 120) *timeout = 120;
+                break;
+            case 'h':
+            case 'H':
+            case 'd':
+            case 'D':
+            case 'm':
+            case 'i':
+            case 'c':
+                break;
+            case 'l':
+                lport->NotAnInteger = swap16((mDNSu16)value);
+                break;
+            case 'r':
+                rport->NotAnInteger = swap16((mDNSu16)value);
+                break;
+            case 's':
+                *seq = swap32(value);
+                break;
+            case 'a':
+                *ack = swap32(value);
+                break;
+            case 'w':
+                *win = swap16((mDNSu16)value);
+                break;
+            default:
+                LogMsg("mDNS_ExtractKeepaliveInfo: unknown value %c\n", param);
+                ptr = limit;
+                break;
+            }
+            ptr++; // skip the space
+        }
+    }
+}
+
+// Matches the proxied auth records to the incoming TCP packet and returns the match and its sequence and ack in "rseq" and "rack" so that
+// the clients need not retrieve this information from the auth record again.
+mDNSlocal AuthRecord* mDNS_MatchKeepaliveInfo(mDNS *const m, const mDNSAddr* pladdr, const mDNSAddr* praddr, const mDNSIPPort plport,
+                                              const mDNSIPPort prport, mDNSu32 *rseq, mDNSu32 *rack)
+{
+    AuthRecord *ar;
+    mDNSAddr laddr, raddr;
+    mDNSEthAddr eth;
+    mDNSIPPort lport, rport;
+    mDNSu32 timeout, seq, ack;
+    mDNSu16 win;
+
+    for (ar = m->ResourceRecords; ar; ar=ar->next)
+    {
+        timeout = seq = ack = 0;
+        win = 0;
+        laddr = raddr = zeroAddr;
+        lport = rport = zeroIPPort;
+
+        if (!ar->WakeUp.HMAC.l[0]) continue;
+
+        mDNS_ExtractKeepaliveInfo(ar, &timeout, &laddr, &raddr, &eth, &seq, &ack, &lport, &rport, &win);
+
+        // Did we parse correctly ?
+        if (!timeout || mDNSAddressIsZero(&laddr) || mDNSAddressIsZero(&raddr) || !seq || !ack || mDNSIPPortIsZero(lport) || mDNSIPPortIsZero(rport) || !win)
+        {
+            debugf("mDNS_MatchKeepaliveInfo: not a valid record %s for keepalive", ARDisplayString(m, ar));
+            continue;
+        }
+
+        debugf("mDNS_MatchKeepaliveInfo: laddr %#a pladdr %#a, raddr %#a praddr %#a, lport %d plport %d, rport %d prport %d",
+               &laddr, pladdr, &raddr, praddr, mDNSVal16(lport), mDNSVal16(plport), mDNSVal16(rport), mDNSVal16(prport));
+
+        // Does it match the incoming TCP packet ?
+        if (mDNSSameAddress(&laddr, pladdr) && mDNSSameAddress(&raddr, praddr) && mDNSSameIPPort(lport, plport) && mDNSSameIPPort(rport, prport))
+        {
+            // returning in network order
+            *rseq = seq;
+            *rack = ack;
+            return ar;
+        }
+    }
+    return mDNSNULL;
+}
+
+mDNSlocal void mDNS_SendKeepalives(mDNS *const m)
+{
+    AuthRecord *ar;
+
+    for (ar = m->ResourceRecords; ar; ar=ar->next)
+    {
+        mDNSu32 timeout, seq, ack;
+        mDNSu16 win;
+        mDNSAddr laddr, raddr;
+        mDNSEthAddr eth;
+        mDNSIPPort lport, rport;
+
+        timeout = seq = ack = 0;
+        win = 0;
+
+        laddr = raddr = zeroAddr;
+        lport = rport = zeroIPPort;
+
+        if (!ar->WakeUp.HMAC.l[0]) continue;
+
+        mDNS_ExtractKeepaliveInfo(ar, &timeout, &laddr, &raddr, &eth, &seq, &ack, &lport, &rport, &win);
+
+        if (!timeout || mDNSAddressIsZero(&laddr) || mDNSAddressIsZero(&raddr) || !seq || !ack || mDNSIPPortIsZero(lport) || mDNSIPPortIsZero(rport) || !win)
+        {
+            debugf("mDNS_SendKeepalives: not a valid record %s for keepalive", ARDisplayString(m, ar));
+            continue;
+        }
+        LogMsg("mDNS_SendKeepalives: laddr %#a raddr %#a lport %d rport %d", &laddr, &raddr, mDNSVal16(lport), mDNSVal16(rport));
+
+        // When we receive a proxy update, we set KATimeExpire to zero so that we always send a keepalive
+        // immediately (to detect any potential problems). After that we always set it to a non-zero value.
+        if (!ar->KATimeExpire || (m->timenow - ar->KATimeExpire >= 0))
+        {
+            mDNSPlatformSendKeepalive(&laddr, &raddr, &lport, &rport, seq, ack, win);
+            ar->KATimeExpire = NonZeroTime(m->timenow + timeout * mDNSPlatformOneSecond);
+        }
+        if (m->NextScheduledKA - ar->KATimeExpire > 0)
+            m->NextScheduledKA = ar->KATimeExpire;
+    }
+}
+
+mDNSlocal void mDNS_SendKeepaliveACK(mDNS *const m, AuthRecord *ar)
+{
+    if (ar != mDNSNULL)
+    {
+        LogInfo("mDNS_SendKeepalivesACK: AuthRecord is NULL");
+        return;
+    }
+    mDNSu32     timeout, seq, ack;
+    mDNSu16     win;
+    mDNSAddr    laddr, raddr;
+    mDNSEthAddr eth;
+    mDNSIPPort  lport, rport;
+
+    timeout = seq = ack = 0;
+    win = 0;
+
+    laddr = raddr = zeroAddr;
+    lport = rport = zeroIPPort;
+
+    mDNS_ExtractKeepaliveInfo(ar, &timeout, &laddr, &raddr, &eth, &seq, &ack, &lport, &rport, &win);
+
+    if (!timeout || mDNSAddressIsZero(&laddr) || mDNSAddressIsZero(&raddr) || !seq || !ack || mDNSIPPortIsZero(lport) || mDNSIPPortIsZero(rport) || !win)
+    {
+        LogInfo("mDNS_SendKeepaliveACK: not a valid record %s for keepalive", ARDisplayString(m, ar));
+        return;
+    }
+    LogMsg("mDNS_SendKeepaliveACK: laddr %#a raddr %#a lport %d rport %d", &laddr, &raddr, mDNSVal16(lport), mDNSVal16(rport));
+    mDNSPlatformSendKeepalive(&laddr, &raddr, &lport, &rport, seq, ack, win);
+}
+
+mDNSlocal void mDNSCoreReceiveUpdate(mDNS *const m,
+                                     const DNSMessage *const msg, const mDNSu8 *end,
+                                     const mDNSAddr *srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, mDNSIPPort dstport,
+                                     const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    AuthRecord opt;
+    mDNSu8 *p = m->omsg.data;
+    OwnerOptData owner = zeroOwner;     // Need to zero this, so we'll know if this Update packet was missing its Owner option
+    mDNSu32 updatelease = 0;
+    const mDNSu8 *ptr;
+
+    LogSPS("Received Update from %#-15a:%-5d to %#-15a:%-5d on 0x%p with "
+           "%2d Question%s %2d Answer%s %2d Authorit%s %2d Additional%s %d bytes",
+           srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), InterfaceID,
+           msg->h.numQuestions,   msg->h.numQuestions   == 1 ? ", "   : "s,",
+           msg->h.numAnswers,     msg->h.numAnswers     == 1 ? ", "   : "s,",
+           msg->h.numAuthorities, msg->h.numAuthorities == 1 ? "y,  " : "ies,",
+           msg->h.numAdditionals, msg->h.numAdditionals == 1 ? " "    : "s", end - msg->data);
+
+    if (!InterfaceID || !m->SPSSocket || !mDNSSameIPPort(dstport, m->SPSSocket->port)) return;
+
+    if (mDNS_PacketLoggingEnabled)
+        DumpPacket(m, mStatus_NoError, mDNSfalse, "UDP", srcaddr, srcport, dstaddr, dstport, msg, end);
+
+    ptr = LocateOptRR(msg, end, DNSOpt_LeaseData_Space + DNSOpt_OwnerData_ID_Space);
+    if (ptr)
+    {
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, 0, kDNSRecordTypePacketAdd, &m->rec);
+        if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && m->rec.r.resrec.rrtype == kDNSType_OPT)
+        {
+            const rdataOPT *o;
+            const rdataOPT *const e = (const rdataOPT *)&m->rec.r.resrec.rdata->u.data[m->rec.r.resrec.rdlength];
+            for (o = &m->rec.r.resrec.rdata->u.opt[0]; o < e; o++)
+            {
+                if      (o->opt == kDNSOpt_Lease) updatelease = o->u.updatelease;
+                else if (o->opt == kDNSOpt_Owner && o->u.owner.vers == 0) owner       = o->u.owner;
+            }
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+
+    InitializeDNSMessage(&m->omsg.h, msg->h.id, UpdateRespFlags);
+
+    if (!updatelease || !owner.HMAC.l[0])
+    {
+        static int msgs = 0;
+        if (msgs < 100)
+        {
+            msgs++;
+            LogMsg("Refusing sleep proxy registration from %#a:%d:%s%s", srcaddr, mDNSVal16(srcport),
+                   !updatelease ? " No lease" : "", !owner.HMAC.l[0] ? " No owner" : "");
+        }
+        m->omsg.h.flags.b[1] |= kDNSFlag1_RC_FormErr;
+    }
+    else if (m->ProxyRecords + msg->h.mDNS_numUpdates > MAX_PROXY_RECORDS)
+    {
+        static int msgs = 0;
+        if (msgs < 100)
+        {
+            msgs++;
+            LogMsg("Refusing sleep proxy registration from %#a:%d: Too many records %d + %d = %d > %d", srcaddr, mDNSVal16(srcport),
+                   m->ProxyRecords, msg->h.mDNS_numUpdates, m->ProxyRecords + msg->h.mDNS_numUpdates, MAX_PROXY_RECORDS);
+        }
+        m->omsg.h.flags.b[1] |= kDNSFlag1_RC_Refused;
+    }
+    else
+    {
+        LogSPS("Received Update for H-MAC %.6a I-MAC %.6a Password %.6a seq %d", &owner.HMAC, &owner.IMAC, &owner.password, owner.seq);
+
+        if (updatelease > 24 * 60 * 60)
+            updatelease = 24 * 60 * 60;
+
+        if (updatelease > 0x40000000UL / mDNSPlatformOneSecond)
+            updatelease = 0x40000000UL / mDNSPlatformOneSecond;
+
+        ptr = LocateAuthorities(msg, end);
+
+        // Clear any stale TCP keepalive records that may exist
+        ClearKeepaliveProxyRecords(m, &owner, m->DuplicateRecords, InterfaceID);
+        ClearKeepaliveProxyRecords(m, &owner, m->ResourceRecords, InterfaceID);
+
+        for (i = 0; i < msg->h.mDNS_numUpdates && ptr && ptr < end; i++)
+        {
+            ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAuth, &m->rec);
+            if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative)
+            {
+                mDNSu16 RDLengthMem = GetRDLengthMem(&m->rec.r.resrec);
+                AuthRecord *ar = mDNSPlatformMemAllocate(sizeof(AuthRecord) - sizeof(RDataBody) + RDLengthMem);
+                if (!ar)
+                {
+                    m->omsg.h.flags.b[1] |= kDNSFlag1_RC_Refused;
+                    break;
+                }
+                else
+                {
+                    mDNSu8 RecordType = m->rec.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask ? kDNSRecordTypeUnique : kDNSRecordTypeShared;
+                    m->rec.r.resrec.rrclass &= ~kDNSClass_UniqueRRSet;
+                    // All stale keepalive records have been flushed prior to this loop.
+                    if (!mDNS_KeepaliveRecord(&m->rec.r.resrec))
+                    {
+                        ClearIdenticalProxyRecords(m, &owner, m->DuplicateRecords); // Make sure we don't have any old stale duplicates of this record
+                        ClearIdenticalProxyRecords(m, &owner, m->ResourceRecords);
+                    }
+                    mDNS_SetupResourceRecord(ar, mDNSNULL, InterfaceID, m->rec.r.resrec.rrtype, m->rec.r.resrec.rroriginalttl, RecordType, AuthRecordAny, SPSRecordCallback, ar);
+                    AssignDomainName(&ar->namestorage, m->rec.r.resrec.name);
+                    ar->resrec.rdlength = GetRDLength(&m->rec.r.resrec, mDNSfalse);
+                    ar->resrec.rdata->MaxRDLength = RDLengthMem;
+                    mDNSPlatformMemCopy(ar->resrec.rdata->u.data, m->rec.r.resrec.rdata->u.data, RDLengthMem);
+                    ar->ForceMCast = mDNStrue;
+                    ar->WakeUp     = owner;
+                    if (m->rec.r.resrec.rrtype == kDNSType_PTR)
+                    {
+                        mDNSs32 t = ReverseMapDomainType(m->rec.r.resrec.name);
+                        if      (t == mDNSAddrType_IPv4) GetIPv4FromName(&ar->AddressProxy, m->rec.r.resrec.name);
+                        else if (t == mDNSAddrType_IPv6) GetIPv6FromName(&ar->AddressProxy, m->rec.r.resrec.name);
+                        debugf("mDNSCoreReceiveUpdate: PTR %d %d %#a %s", t, ar->AddressProxy.type, &ar->AddressProxy, ARDisplayString(m, ar));
+                        if (ar->AddressProxy.type) SetSPSProxyListChanged(InterfaceID);
+                    }
+                    ar->TimeRcvd   = m->timenow;
+                    ar->TimeExpire = m->timenow + updatelease * mDNSPlatformOneSecond;
+                    if (m->NextScheduledSPS - ar->TimeExpire > 0)
+                        m->NextScheduledSPS = ar->TimeExpire;
+                    ar->KATimeExpire = 0;
+                    mDNS_Register_internal(m, ar);
+
+                    m->ProxyRecords++;
+                    mDNS_UpdateAllowSleep(m);
+                    LogSPS("SPS Registered %4d %X %s", m->ProxyRecords, RecordType, ARDisplayString(m,ar));
+                }
+            }
+            m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+        }
+
+        if (m->omsg.h.flags.b[1] & kDNSFlag1_RC_Mask)
+        {
+            LogMsg("Refusing sleep proxy registration from %#a:%d: Out of memory", srcaddr, mDNSVal16(srcport));
+            ClearProxyRecords(m, &owner, m->DuplicateRecords);
+            ClearProxyRecords(m, &owner, m->ResourceRecords);
+        }
+        else
+        {
+            mDNS_SetupResourceRecord(&opt, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+            opt.resrec.rrclass    = NormalMaxDNSMessageData;
+            opt.resrec.rdlength   = sizeof(rdataOPT);   // One option in this OPT record
+            opt.resrec.rdestimate = sizeof(rdataOPT);
+            opt.resrec.rdata->u.opt[0].opt           = kDNSOpt_Lease;
+            opt.resrec.rdata->u.opt[0].u.updatelease = updatelease;
+            p = PutResourceRecordTTLWithLimit(&m->omsg, p, &m->omsg.h.numAdditionals, &opt.resrec, opt.resrec.rroriginalttl, m->omsg.data + AbsoluteMaxDNSMessageData);
+        }
+    }
+
+    if (p) mDNSSendDNSMessage(m, &m->omsg, p, InterfaceID, m->SPSSocket, srcaddr, srcport, mDNSNULL, mDNSNULL, mDNSfalse);
+    mDNS_SendKeepalives(m);
+}
+
+mDNSlocal void mDNSCoreReceiveUpdateR(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *end, const mDNSAddr *srcaddr, const mDNSInterfaceID InterfaceID)
+{
+    if (InterfaceID)
+    {
+        mDNSu32 updatelease = 60 * 60;      // If SPS fails to indicate lease time, assume one hour
+        const mDNSu8 *ptr = LocateOptRR(msg, end, DNSOpt_LeaseData_Space);
+        if (ptr)
+        {
+            ptr = GetLargeResourceRecord(m, msg, ptr, end, 0, kDNSRecordTypePacketAdd, &m->rec);
+            if (ptr && m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && m->rec.r.resrec.rrtype == kDNSType_OPT)
+            {
+                const rdataOPT *o;
+                const rdataOPT *const e = (const rdataOPT *)&m->rec.r.resrec.rdata->u.data[m->rec.r.resrec.rdlength];
+                for (o = &m->rec.r.resrec.rdata->u.opt[0]; o < e; o++)
+                    if (o->opt == kDNSOpt_Lease)
+                    {
+                        updatelease = o->u.updatelease;
+                        LogSPS("Sleep Proxy granted lease time %4d seconds, updateid %d, InterfaceID %p", updatelease, mDNSVal16(msg->h.id), InterfaceID);
+                    }
+            }
+            m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+        }
+
+        if (m->CurrentRecord)
+            LogMsg("mDNSCoreReceiveUpdateR ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+        m->CurrentRecord = m->ResourceRecords;
+        while (m->CurrentRecord)
+        {
+            AuthRecord *const rr = m->CurrentRecord;
+            if (rr->resrec.InterfaceID == InterfaceID || (!rr->resrec.InterfaceID && (rr->ForceMCast || IsLocalDomain(rr->resrec.name))))
+                if (mDNSSameOpaque16(rr->updateid, msg->h.id))
+                {
+                    // We successfully completed this record's registration on this "InterfaceID". Clear that bit.
+                    // Clear the updateid when we are done sending on all interfaces.
+                    mDNSu32 scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, InterfaceID, mDNStrue);
+                    if (scopeid < (sizeof(rr->updateIntID) * mDNSNBBY))
+                        bit_clr_opaque64(rr->updateIntID, scopeid);
+                    if (mDNSOpaque64IsZero(&rr->updateIntID))
+                        rr->updateid = zeroID;
+                    rr->expire   = NonZeroTime(m->timenow + updatelease * mDNSPlatformOneSecond);
+                    LogSPS("Sleep Proxy %s record %5d 0x%x 0x%x (%d) %s", rr->WakeUp.HMAC.l[0] ? "transferred" : "registered", updatelease, rr->updateIntID.l[1], rr->updateIntID.l[0], mDNSVal16(rr->updateid), ARDisplayString(m,rr));
+                    if (rr->WakeUp.HMAC.l[0])
+                    {
+                        rr->WakeUp.HMAC = zeroEthAddr;  // Clear HMAC so that mDNS_Deregister_internal doesn't waste packets trying to wake this host
+                        rr->RequireGoodbye = mDNSfalse; // and we don't want to send goodbye for it
+                        mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+                    }
+                }
+            // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+            // new records could have been added to the end of the list as a result of that call.
+            if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+                m->CurrentRecord = rr->next;
+        }
+
+        // Update the dynamic store with the IP Address and MAC address of the sleep proxy
+        char *ifname = InterfaceNameForID(m, InterfaceID);
+        mDNSAddr spsaddr;
+        mDNSPlatformMemCopy(&spsaddr, srcaddr, sizeof (mDNSAddr));
+        mDNSPlatformStoreSPSMACAddr(&spsaddr, ifname);
+    }
+    // If we were waiting to go to sleep, then this SPS registration or wide-area record deletion
+    // may have been the thing we were waiting for, so schedule another check to see if we can sleep now.
+    if (m->SleepLimit) m->NextScheduledSPRetry = m->timenow;
+}
+
+mDNSexport void MakeNegativeCacheRecord(mDNS *const m, CacheRecord *const cr,
+                                        const domainname *const name, const mDNSu32 namehash, const mDNSu16 rrtype, const mDNSu16 rrclass, mDNSu32 ttl_seconds, mDNSInterfaceID InterfaceID, DNSServer *dnsserver)
+{
+    if (cr == &m->rec.r && m->rec.r.resrec.RecordType)
+    {
+        LogMsg("MakeNegativeCacheRecord: m->rec appears to be already in use for %s", CRDisplayString(m, &m->rec.r));
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+    }
+
+    // Create empty resource record
+    cr->resrec.RecordType    = kDNSRecordTypePacketNegative;
+    cr->resrec.InterfaceID   = InterfaceID;
+    cr->resrec.rDNSServer    = dnsserver;
+    cr->resrec.name          = name;    // Will be updated to point to cg->name when we call CreateNewCacheEntry
+    cr->resrec.rrtype        = rrtype;
+    cr->resrec.rrclass       = rrclass;
+    cr->resrec.rroriginalttl = ttl_seconds;
+    cr->resrec.rdlength      = 0;
+    cr->resrec.rdestimate    = 0;
+    cr->resrec.namehash      = namehash;
+    cr->resrec.rdatahash     = 0;
+    cr->resrec.rdata = (RData*)&cr->smallrdatastorage;
+    cr->resrec.rdata->MaxRDLength = 0;
+
+    cr->NextInKAList       = mDNSNULL;
+    cr->TimeRcvd           = m->timenow;
+    cr->DelayDelivery      = 0;
+    cr->NextRequiredQuery  = m->timenow;
+    cr->LastUsed           = m->timenow;
+    cr->CRActiveQuestion   = mDNSNULL;
+    cr->UnansweredQueries  = 0;
+    cr->LastUnansweredTime = 0;
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+    cr->MPUnansweredQ      = 0;
+    cr->MPLastUnansweredQT = 0;
+    cr->MPUnansweredKA     = 0;
+    cr->MPExpectingKA      = mDNSfalse;
+#endif
+    cr->NextInCFList       = mDNSNULL;
+    cr->nsec               = mDNSNULL;
+    cr->soa                = mDNSNULL;
+    cr->CRDNSSECQuestion   = 0;
+    // Initialize to the basic one and the caller can set it to more
+    // specific based on the response if any
+    cr->responseFlags      = ResponseFlags;
+}
+
+mDNSexport void mDNSCoreReceive(mDNS *const m, void *const pkt, const mDNSu8 *const end,
+                                const mDNSAddr *const srcaddr, const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport,
+                                const mDNSInterfaceID InterfaceID)
+{
+    mDNSInterfaceID ifid = InterfaceID;
+    DNSMessage  *msg  = (DNSMessage *)pkt;
+    const mDNSu8 StdQ = kDNSFlag0_QR_Query    | kDNSFlag0_OP_StdQuery;
+    const mDNSu8 StdR = kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery;
+    const mDNSu8 UpdQ = kDNSFlag0_QR_Query    | kDNSFlag0_OP_Update;
+    const mDNSu8 UpdR = kDNSFlag0_QR_Response | kDNSFlag0_OP_Update;
+    mDNSu8 QR_OP;
+    mDNSu8 *ptr = mDNSNULL;
+    mDNSBool TLS = (dstaddr == (mDNSAddr *)1);  // For debug logs: dstaddr = 0 means TCP; dstaddr = 1 means TLS
+    if (TLS) dstaddr = mDNSNULL;
+
+#ifndef UNICAST_DISABLED
+    if (mDNSSameAddress(srcaddr, &m->Router))
+    {
+#ifdef _LEGACY_NAT_TRAVERSAL_
+        if (mDNSSameIPPort(srcport, SSDPPort) || (m->SSDPSocket && mDNSSameIPPort(dstport, m->SSDPSocket->port)))
+        {
+            mDNS_Lock(m);
+            LNT_ConfigureRouterInfo(m, InterfaceID, pkt, (mDNSu16)(end - (mDNSu8 *)pkt));
+            mDNS_Unlock(m);
+            return;
+        }
+#endif
+        if (mDNSSameIPPort(srcport, NATPMPPort))
+        {
+            mDNS_Lock(m);
+            uDNS_ReceiveNATPacket(m, InterfaceID, pkt, (mDNSu16)(end - (mDNSu8 *)pkt));
+            mDNS_Unlock(m);
+            return;
+        }
+    }
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    else if (m->SSDPSocket && mDNSSameIPPort(dstport, m->SSDPSocket->port)) { debugf("Ignoring SSDP response from %#a:%d", srcaddr, mDNSVal16(srcport)); return; }
+#endif
+
+#endif
+    if ((unsigned)(end - (mDNSu8 *)pkt) < sizeof(DNSMessageHeader))
+    {
+        LogMsg("DNS Message from %#a:%d to %#a:%d length %d too short", srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), end - (mDNSu8 *)pkt);
+        return;
+    }
+    QR_OP = (mDNSu8)(msg->h.flags.b[0] & kDNSFlag0_QROP_Mask);
+    // Read the integer parts which are in IETF byte-order (MSB first, LSB second)
+    ptr = (mDNSu8 *)&msg->h.numQuestions;
+    msg->h.numQuestions   = (mDNSu16)((mDNSu16)ptr[0] << 8 | ptr[1]);
+    msg->h.numAnswers     = (mDNSu16)((mDNSu16)ptr[2] << 8 | ptr[3]);
+    msg->h.numAuthorities = (mDNSu16)((mDNSu16)ptr[4] << 8 | ptr[5]);
+    msg->h.numAdditionals = (mDNSu16)((mDNSu16)ptr[6] << 8 | ptr[7]);
+
+    if (!m) { LogMsg("mDNSCoreReceive ERROR m is NULL"); return; }
+
+    // We use zero addresses and all-ones addresses at various places in the code to indicate special values like "no address"
+    // If we accept and try to process a packet with zero or all-ones source address, that could really mess things up
+    if (srcaddr && !mDNSAddressIsValid(srcaddr)) { debugf("mDNSCoreReceive ignoring packet from %#a", srcaddr); return; }
+
+    mDNS_Lock(m);
+    m->PktNum++;
+    if (mDNSOpaque16IsZero(msg->h.id))
+    {
+        m->MPktNum++;
+#if APPLE_OSX_mDNSResponder
+        // Track the number of multicast packets received from a source outside our subnet.
+        // Check the destination address to avoid accounting for spurious packets that
+        // comes in with message id zero.
+        if (!mDNS_AddressIsLocalSubnet(m, InterfaceID, srcaddr, mDNSNULL) &&
+            mDNSAddressIsAllDNSLinkGroup(dstaddr))
+        {
+            m->RemoteSubnet++;
+        }
+#endif // #if APPLE_OSX_mDNSResponder
+    }
+
+#ifndef UNICAST_DISABLED
+    if (!dstaddr || (!mDNSAddressIsAllDNSLinkGroup(dstaddr) && (QR_OP == StdR || QR_OP == UpdR)))
+        if (!mDNSOpaque16IsZero(msg->h.id)) // uDNS_ReceiveMsg only needs to get real uDNS responses, not "QU" mDNS responses
+        {
+            ifid = mDNSInterface_Any;
+            if (mDNS_PacketLoggingEnabled)
+                DumpPacket(m, mStatus_NoError, mDNSfalse, TLS ? "TLS" : !dstaddr ? "TCP" : "UDP", srcaddr, srcport, dstaddr, dstport, msg, end);
+            uDNS_ReceiveMsg(m, msg, end, srcaddr, srcport);
+            // Note: mDNSCore also needs to get access to received unicast responses
+        }
+#endif
+    if      (QR_OP == StdQ) mDNSCoreReceiveQuery   (m, msg, end, srcaddr, srcport, dstaddr, dstport, ifid);
+    else if (QR_OP == StdR) mDNSCoreReceiveResponse(m, msg, end, srcaddr, srcport, dstaddr, dstport, ifid);
+    else if (QR_OP == UpdQ) mDNSCoreReceiveUpdate  (m, msg, end, srcaddr, srcport, dstaddr, dstport, InterfaceID);
+    else if (QR_OP == UpdR) mDNSCoreReceiveUpdateR (m, msg, end, srcaddr,                            InterfaceID);
+    else
+    {
+        LogMsg("Unknown DNS packet type %02X%02X from %#-15a:%-5d to %#-15a:%-5d length %d on %p (ignored)",
+               msg->h.flags.b[0], msg->h.flags.b[1], srcaddr, mDNSVal16(srcport), dstaddr, mDNSVal16(dstport), end - (mDNSu8 *)pkt, InterfaceID);
+        if (mDNS_LoggingEnabled)
+        {
+            int i = 0;
+            while (i<end - (mDNSu8 *)pkt)
+            {
+                char buffer[128];
+                char *p = buffer + mDNS_snprintf(buffer, sizeof(buffer), "%04X", i);
+                do if (i<end - (mDNSu8 *)pkt) p += mDNS_snprintf(p, sizeof(buffer), " %02X", ((mDNSu8 *)pkt)[i]);while (++i & 15);
+                LogInfo("%s", buffer);
+            }
+        }
+    }
+    // Packet reception often causes a change to the task list:
+    // 1. Inbound queries can cause us to need to send responses
+    // 2. Conflicing response packets received from other hosts can cause us to need to send defensive responses
+    // 3. Other hosts announcing deletion of shared records can cause us to need to re-assert those records
+    // 4. Response packets that answer questions may cause our client to issue new questions
+    mDNS_Unlock(m);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Searcher Functions
+#endif
+
+// Targets are considered the same if both queries are untargeted, or
+// if both are targeted to the same address+port
+// (If Target address is zero, TargetPort is undefined)
+#define SameQTarget(A,B) (((A)->Target.type == mDNSAddrType_None && (B)->Target.type == mDNSAddrType_None) || \
+                          (mDNSSameAddress(& (A)->Target, & (B)->Target) && mDNSSameIPPort((A)->TargetPort, (B)->TargetPort)))
+
+// Note: We explicitly disallow making a public query be a duplicate of a private one. This is to avoid the
+// circular deadlock where a client does a query for something like "dns-sd -Q _dns-query-tls._tcp.company.com SRV"
+// and we have a key for company.com, so we try to locate the private query server for company.com, which necessarily entails
+// doing a standard DNS query for the _dns-query-tls._tcp SRV record for company.com. If we make the latter (public) query
+// a duplicate of the former (private) query, then it will block forever waiting for an answer that will never come.
+//
+// We keep SuppressUnusable questions separate so that we can return a quick response to them and not get blocked behind
+// the queries that are not marked SuppressUnusable. But if the query is not suppressed, they are treated the same as
+// non-SuppressUnusable questions. This should be fine as the goal of SuppressUnusable is to return quickly only if it
+// is suppressed. If it is not suppressed, we do try all the DNS servers for valid answers like any other question.
+// The main reason for this design is that cache entries point to a *single* question and that question is responsible
+// for keeping the cache fresh as long as it is active. Having multiple active question for a single cache entry
+// breaks this design principle.
+//
+
+// If IsLLQ(Q) is true, it means the question is both:
+// (a) long-lived and
+// (b) being performed by a unicast DNS long-lived query (either full LLQ, or polling)
+// for multicast questions, we don't want to treat LongLived as anything special
+#define IsLLQ(Q) ((Q)->LongLived && !mDNSOpaque16IsZero((Q)->TargetQID))
+
+mDNSlocal DNSQuestion *FindDuplicateQuestion(const mDNS *const m, const DNSQuestion *const question)
+{
+    DNSQuestion *q;
+    // Note: A question can only be marked as a duplicate of one that occurs *earlier* in the list.
+    // This prevents circular references, where two questions are each marked as a duplicate of the other.
+    // Accordingly, we break out of the loop when we get to 'question', because there's no point searching
+    // further in the list.
+    for (q = m->Questions; q && q != question; q=q->next)       // Scan our list for another question
+        if (q->InterfaceID == question->InterfaceID &&          // with the same InterfaceID,
+            SameQTarget(q, question)                &&          // and same unicast/multicast target settings
+            q->qtype      == question->qtype        &&          // type,
+            q->qclass     == question->qclass       &&          // class,
+            IsLLQ(q)      == IsLLQ(question)        &&          // and long-lived status matches
+            (!q->AuthInfo || question->AuthInfo)    &&          // to avoid deadlock, don't make public query dup of a private one
+            (q->AnonInfo  == question->AnonInfo)    &&          // Anonymous query not a dup of normal query
+            (q->SuppressQuery == question->SuppressQuery) &&    // Questions that are suppressed/not suppressed
+            (q->ValidationRequired == question->ValidationRequired) &&  // Questions that require DNSSEC validation
+            (q->ValidatingResponse == question->ValidatingResponse) &&  // Questions that are validating responses using DNSSEC
+            (q->DisallowPID == question->DisallowPID)     &&            // Disallowing a PID should not affect a PID that is allowed
+            (q->BrowseThreshold == question->BrowseThreshold) &&  // browse thresholds must match
+            q->qnamehash  == question->qnamehash    &&
+            SameDomainName(&q->qname, &question->qname))        // and name
+            return(q);
+    return(mDNSNULL);
+}
+
+// This is called after a question is deleted, in case other identical questions were being suppressed as duplicates
+mDNSlocal void UpdateQuestionDuplicates(mDNS *const m, DNSQuestion *const question)
+{
+    DNSQuestion *q;
+    DNSQuestion *first = mDNSNULL;
+
+    // This is referring to some other question as duplicate. No other question can refer to this
+    // question as a duplicate.
+    if (question->DuplicateOf)
+    {
+        LogInfo("UpdateQuestionDuplicates: question %p %##s (%s) duplicate of %p %##s (%s)",
+                question, question->qname.c, DNSTypeName(question->qtype),
+                question->DuplicateOf, question->DuplicateOf->qname.c, DNSTypeName(question->DuplicateOf->qtype));
+        return;
+    }
+
+    for (q = m->Questions; q; q=q->next)        // Scan our list of questions
+        if (q->DuplicateOf == question)         // To see if any questions were referencing this as their duplicate
+        {
+            q->DuplicateOf = first;
+            if (!first)
+            {
+                first = q;
+                // If q used to be a duplicate, but now is not,
+                // then inherit the state from the question that's going away
+                q->LastQTime         = question->LastQTime;
+                q->ThisQInterval     = question->ThisQInterval;
+                q->ExpectUnicastResp = question->ExpectUnicastResp;
+                q->LastAnswerPktNum  = question->LastAnswerPktNum;
+                q->RecentAnswerPkts  = question->RecentAnswerPkts;
+                q->RequestUnicast    = question->RequestUnicast;
+                q->LastQTxTime       = question->LastQTxTime;
+                q->CNAMEReferrals    = question->CNAMEReferrals;
+                q->nta               = question->nta;
+                q->servAddr          = question->servAddr;
+                q->servPort          = question->servPort;
+                q->qDNSServer        = question->qDNSServer;
+                q->validDNSServers   = question->validDNSServers;
+                q->unansweredQueries = question->unansweredQueries;
+                q->noServerResponse  = question->noServerResponse;
+                q->triedAllServersOnce = question->triedAllServersOnce;
+
+                q->TargetQID         = question->TargetQID;
+                if (q->LocalSocket)
+                {
+                    mDNSPlatformUDPClose(q->LocalSocket);
+                }
+                    
+                q->LocalSocket       = question->LocalSocket;
+
+                q->state             = question->state;
+                //	q->tcp               = question->tcp;
+                q->ReqLease          = question->ReqLease;
+                q->expire            = question->expire;
+                q->ntries            = question->ntries;
+                q->id                = question->id;
+
+                question->LocalSocket = mDNSNULL;
+                question->nta        = mDNSNULL;    // If we've got a GetZoneData in progress, transfer it to the newly active question
+                //	question->tcp        = mDNSNULL;
+
+                if (q->LocalSocket)
+                    debugf("UpdateQuestionDuplicates transferred LocalSocket pointer for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+
+                if (q->nta)
+                {
+                    LogInfo("UpdateQuestionDuplicates transferred nta pointer for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                    q->nta->ZoneDataContext = q;
+                }
+
+                // Need to work out how to safely transfer this state too -- appropriate context pointers need to be updated or the code will crash
+                if (question->tcp) LogInfo("UpdateQuestionDuplicates did not transfer tcp pointer");
+
+                if (question->state == LLQ_Established)
+                {
+                    LogInfo("UpdateQuestionDuplicates transferred LLQ state for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                    question->state = 0;    // Must zero question->state, or mDNS_StopQuery_internal will clean up and cancel our LLQ from the server
+                }
+
+                SetNextQueryTime(m,q);
+            }
+        }
+}
+
+mDNSexport McastResolver *mDNS_AddMcastResolver(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, mDNSu32 timeout)
+{
+    McastResolver **p = &m->McastResolvers;
+    McastResolver *tmp = mDNSNULL;
+
+    if (!d) d = (const domainname *)"";
+
+    LogInfo("mDNS_AddMcastResolver: Adding %##s, InterfaceID %p, timeout %u", d->c, interface, timeout);
+
+    mDNS_CheckLock(m);
+
+    while (*p)  // Check if we already have this {interface, domain} tuple registered
+    {
+        if ((*p)->interface == interface && SameDomainName(&(*p)->domain, d))
+        {
+            if (!((*p)->flags & DNSServer_FlagDelete)) LogMsg("Note: Mcast Resolver domain %##s (%p) registered more than once", d->c, interface);
+            (*p)->flags &= ~DNSServer_FlagDelete;
+            tmp = *p;
+            *p = tmp->next;
+            tmp->next = mDNSNULL;
+        }
+        else
+            p=&(*p)->next;
+    }
+
+    if (tmp) *p = tmp; // move to end of list, to ensure ordering from platform layer
+    else
+    {
+        // allocate, add to list
+        *p = mDNSPlatformMemAllocate(sizeof(**p));
+        if (!*p) LogMsg("mDNS_AddMcastResolver: ERROR!! - malloc");
+        else
+        {
+            (*p)->interface = interface;
+            (*p)->flags     = DNSServer_FlagNew;
+            (*p)->timeout   = timeout;
+            AssignDomainName(&(*p)->domain, d);
+            (*p)->next = mDNSNULL;
+        }
+    }
+    return(*p);
+}
+
+mDNSinline mDNSs32 PenaltyTimeForServer(mDNS *m, DNSServer *server)
+{
+    mDNSs32 ptime = 0;
+    if (server->penaltyTime != 0)
+    {
+        ptime = server->penaltyTime - m->timenow;
+        if (ptime < 0)
+        {
+            // This should always be a positive value between 0 and DNSSERVER_PENALTY_TIME
+            // If it does not get reset in ResetDNSServerPenalties for some reason, we do it
+            // here
+            LogMsg("PenaltyTimeForServer: PenaltyTime negative %d, (server penaltyTime %d, timenow %d) resetting the penalty",
+                   ptime, server->penaltyTime, m->timenow);
+            server->penaltyTime = 0;
+            ptime = 0;
+        }
+    }
+    return ptime;
+}
+
+//Checks to see whether the newname is a better match for the name, given the best one we have
+//seen so far (given in bestcount).
+//Returns -1 if the newname is not a better match
+//Returns 0 if the newname is the same as the old match
+//Returns 1 if the newname is a better match
+mDNSlocal int BetterMatchForName(const domainname *name, int namecount, const domainname *newname, int newcount,
+                                 int bestcount)
+{
+    // If the name contains fewer labels than the new server's domain or the new name
+    // contains fewer labels than the current best, then it can't possibly be a better match
+    if (namecount < newcount || newcount < bestcount) return -1;
+
+    // If there is no match, return -1 and the caller will skip this newname for
+    // selection
+    //
+    // If we find a match and the number of labels is the same as bestcount, then
+    // we return 0 so that the caller can do additional logic to pick one of
+    // the best based on some other factors e.g., penaltyTime
+    //
+    // If we find a match and the number of labels is more than bestcount, then we
+    // return 1 so that the caller can pick this over the old one.
+    //
+    // Note: newcount can either be equal or greater than bestcount beause of the
+    // check above.
+
+    if (SameDomainName(SkipLeadingLabels(name, namecount - newcount), newname))
+        return bestcount == newcount ? 0 : 1;
+    else
+        return -1;
+}
+
+// Normally, we have McastResolvers for .local, in-addr.arpa and ip6.arpa. But there
+// can be queries that can forced to multicast (ForceMCast) even though they don't end in these
+// names. In that case, we give a default timeout of 5 seconds
+#define DEFAULT_MCAST_TIMEOUT   5
+mDNSlocal mDNSu32 GetTimeoutForMcastQuestion(mDNS *m, DNSQuestion *question)
+{
+    McastResolver *curmatch = mDNSNULL;
+    int bestmatchlen = -1, namecount = CountLabels(&question->qname);
+    McastResolver *curr;
+    int bettermatch, currcount;
+    for (curr = m->McastResolvers; curr; curr = curr->next)
+    {
+        currcount = CountLabels(&curr->domain);
+        bettermatch = BetterMatchForName(&question->qname, namecount, &curr->domain, currcount, bestmatchlen);
+        // Take the first best match. If there are multiple equally good matches (bettermatch = 0), we take
+        // the timeout value from the first one
+        if (bettermatch == 1)
+        {
+            curmatch = curr;
+            bestmatchlen = currcount;
+        }
+    }
+    LogInfo("GetTimeoutForMcastQuestion: question %##s curmatch %p, Timeout %d", question->qname.c, curmatch,
+            curmatch ? curmatch->timeout : DEFAULT_MCAST_TIMEOUT);
+    return ( curmatch ? curmatch->timeout : DEFAULT_MCAST_TIMEOUT);
+}
+
+// Returns true if it is a Domain Enumeration Query
+mDNSexport mDNSBool DomainEnumQuery(const domainname *qname)
+{
+    const mDNSu8 *mDNS_DEQLabels[] = { (const mDNSu8 *)"\001b", (const mDNSu8 *)"\002db", (const mDNSu8 *)"\002lb",
+                                       (const mDNSu8 *)"\001r", (const mDNSu8 *)"\002dr", (const mDNSu8 *)mDNSNULL, };
+    const domainname *d = qname;
+    const mDNSu8 *label;
+    int i = 0;
+
+    // We need at least 3 labels (DEQ prefix) + one more label to make a meaningful DE query
+    if (CountLabels(qname) < 4) { debugf("DomainEnumQuery: question %##s, not enough labels", qname->c); return mDNSfalse; }
+
+    label = (const mDNSu8 *)d;
+    while (mDNS_DEQLabels[i] != (const mDNSu8 *)mDNSNULL)
+    {
+        if (SameDomainLabel(mDNS_DEQLabels[i], label)) {debugf("DomainEnumQuery: DEQ %##s, label1 match", qname->c); break;}
+        i++;
+    }
+    if (mDNS_DEQLabels[i] == (const mDNSu8 *)mDNSNULL)
+    {
+        debugf("DomainEnumQuery: Not a DEQ %##s, label1 mismatch", qname->c);
+        return mDNSfalse;
+    }
+    debugf("DomainEnumQuery: DEQ %##s, label1 match", qname->c);
+
+    // CountLabels already verified the number of labels
+    d = (const domainname *)(d->c + 1 + d->c[0]);   // Second Label
+    label = (const mDNSu8 *)d;
+    if (!SameDomainLabel(label, (const mDNSu8 *)"\007_dns-sd"))
+    {
+        debugf("DomainEnumQuery: Not a DEQ %##s, label2 mismatch", qname->c);
+        return(mDNSfalse);
+    }
+    debugf("DomainEnumQuery: DEQ %##s, label2 match", qname->c);
+
+    d = (const domainname *)(d->c + 1 + d->c[0]);   // Third Label
+    label = (const mDNSu8 *)d;
+    if (!SameDomainLabel(label, (const mDNSu8 *)"\004_udp"))
+    {
+        debugf("DomainEnumQuery: Not a DEQ %##s, label3 mismatch", qname->c);
+        return(mDNSfalse);
+    }
+    debugf("DomainEnumQuery: DEQ %##s, label3 match", qname->c);
+
+    debugf("DomainEnumQuery: Question %##s is a Domain Enumeration query", qname->c);
+
+    return mDNStrue;
+}
+
+// Note: InterfaceID is the InterfaceID of the question
+mDNSlocal mDNSBool DNSServerMatch(DNSServer *d, mDNSInterfaceID InterfaceID, mDNSs32 ServiceID)
+{
+    // 1) Unscoped questions (NULL InterfaceID) should  consider *only* unscoped DNSServers ( DNSServer
+    // with "scoped" set to kScopeNone)
+    //
+    // 2) Scoped questions (non-NULL InterfaceID) should consider *only* scoped DNSServers (DNSServer
+    // with "scoped" set to kScopeInterfaceId) and their InterfaceIDs should match.
+    //
+    // 3) Scoped questions (non-zero ServiceID) should consider *only* scoped DNSServers (DNSServer
+    // with "scoped" set to kScopeServiceID) and their ServiceIDs should match.
+    //    
+    // The first condition in the "if" statement checks to see if both the question and the DNSServer are
+    // unscoped. The question is unscoped only if InterfaceID is zero and ServiceID is -1.
+    //
+    // If the first condition fails, following are the possible cases (the notes below are using
+    // InterfaceID for discussion and the same holds good for ServiceID):
+    //
+    // - DNSServer is not scoped, InterfaceID is not NULL - we should skip the current DNSServer entry
+    //   as scoped questions should not pick non-scoped DNSServer entry (Refer to (2) above).
+    //
+    // - DNSServer is scoped, InterfaceID is NULL - we should skip the current DNSServer entry as
+    //   unscoped question should not match scoped DNSServer (Refer to (1) above). The InterfaceID check
+    //   would fail in this case.
+    //
+    // - DNSServer is scoped and InterfaceID is not NULL - the InterfaceID of the question and the DNSServer
+    //   should match (Refer to (2) above).
+    //
+    // Note: mDNSInterface_Unicast is used only by .local unicast questions and are treated as unscoped.
+    // If a question is scoped both to InterfaceID and ServiceID, the question will be scoped to InterfaceID.
+
+    if (((d->scoped == kScopeNone) && ((!InterfaceID && ServiceID == -1) || InterfaceID == mDNSInterface_Unicast)) ||
+        ((d->scoped == kScopeInterfaceID) && d->interface == InterfaceID) ||
+        ((d->scoped == kScopeServiceID) && d->serviceID == ServiceID))
+    {
+        return mDNStrue;
+    }
+    return mDNSfalse;
+}
+
+// Sets all the Valid DNS servers for a question
+mDNSexport mDNSu32 SetValidDNSServers(mDNS *m, DNSQuestion *question)
+{
+    int bestmatchlen = -1, namecount = CountLabels(&question->qname);
+    DNSServer *curr;
+    int bettermatch, currcount;
+    int index = 0;
+    mDNSu32 timeout = 0;
+    mDNSBool DEQuery;
+
+    question->validDNSServers = zeroOpaque64;
+    DEQuery = DomainEnumQuery(&question->qname);
+    for (curr = m->DNSServers; curr; curr = curr->next)
+    {
+        debugf("SetValidDNSServers: Parsing DNS server Address %#a (Domain %##s), Scope: %d", &curr->addr, curr->domain.c, curr->scoped);
+        // skip servers that will soon be deleted
+        if (curr->flags & DNSServer_FlagDelete)
+        {
+            debugf("SetValidDNSServers: Delete set for index %d, DNS server %#a (Domain %##s), scoped %d", index, &curr->addr, curr->domain.c, curr->scoped);
+            continue;
+        }
+
+        // This happens normally when you unplug the interface where we reset the interfaceID to mDNSInterface_Any for all
+        // the DNS servers whose scope match the interfaceID. Few seconds later, we also receive the updated DNS configuration.
+        // But any questions that has mDNSInterface_Any scope that are started/restarted before we receive the update
+        // (e.g., CheckSuppressUnusableQuestions is called when interfaces are deregistered with the core) should not
+        // match the scoped entries by mistake.
+        //
+        // Note: DNS configuration change will help pick the new dns servers but currently it does not affect the timeout
+
+        if (curr->scoped && curr->interface == mDNSInterface_Any)
+        {
+            debugf("SetValidDNSServers: Scoped DNS server %#a (Domain %##s) with Interface Any", &curr->addr, curr->domain.c);
+            continue;
+        }
+
+        currcount = CountLabels(&curr->domain);
+        if ((!DEQuery || !curr->cellIntf) && DNSServerMatch(curr, question->InterfaceID, question->ServiceID))
+        {
+            bettermatch = BetterMatchForName(&question->qname, namecount, &curr->domain, currcount, bestmatchlen);
+
+            // If we found a better match (bettermatch == 1) then clear all the bits
+            // corresponding to the old DNSServers that we have may set before and start fresh.
+            // If we find an equal match, then include that DNSServer also by setting the corresponding
+            // bit
+            if ((bettermatch == 1) || (bettermatch == 0))
+            {
+                bestmatchlen = currcount;
+                if (bettermatch)
+                {
+                    debugf("SetValidDNSServers: Resetting all the bits");
+                    question->validDNSServers = zeroOpaque64;
+                    timeout = 0;
+                }
+                debugf("SetValidDNSServers: question %##s Setting the bit for DNS server Address %#a (Domain %##s), Scoped:%d index %d,"
+                       " Timeout %d, interface %p", question->qname.c, &curr->addr, curr->domain.c, curr->scoped, index, curr->timeout,
+                       curr->interface);
+                timeout += curr->timeout;
+                if (DEQuery)
+                    debugf("DomainEnumQuery: Question %##s, DNSServer %#a, cell %d", question->qname.c, &curr->addr, curr->cellIntf);
+                bit_set_opaque64(question->validDNSServers, index);
+            }
+        }
+        index++;
+    }
+    question->noServerResponse = 0;
+
+    debugf("SetValidDNSServers: ValidDNSServer bits  0x%x%x for question %p %##s (%s)",
+           question->validDNSServers.l[1], question->validDNSServers.l[0], question, question->qname.c, DNSTypeName(question->qtype));
+    // If there are no matching resolvers, then use the default timeout value.
+    // For ProxyQuestion, shorten the timeout so that dig does not timeout on us in case of no response.
+    return ((question->ProxyQuestion || question->ValidatingResponse) ? DEFAULT_UDNSSEC_TIMEOUT : timeout ? timeout : DEFAULT_UDNS_TIMEOUT);
+}
+
+// Get the Best server that matches a name. If you find penalized servers, look for the one
+// that will come out of the penalty box soon
+mDNSlocal DNSServer *GetBestServer(mDNS *m, const domainname *name, mDNSInterfaceID InterfaceID, mDNSs32 ServiceID, mDNSOpaque64 validBits,
+    int *selected, mDNSBool nameMatch)
+{
+    DNSServer *curmatch = mDNSNULL;
+    int bestmatchlen = -1, namecount = name ? CountLabels(name) : 0;
+    DNSServer *curr;
+    mDNSs32 bestPenaltyTime, currPenaltyTime;
+    int bettermatch, currcount;
+    int index = 0;
+    int currindex = -1;
+
+    debugf("GetBestServer: ValidDNSServer bits  0x%x%x", validBits.l[1], validBits.l[0]);
+    bestPenaltyTime = DNSSERVER_PENALTY_TIME + 1;
+    for (curr = m->DNSServers; curr; curr = curr->next)
+    {
+        // skip servers that will soon be deleted
+        if (curr->flags & DNSServer_FlagDelete)
+        {
+            debugf("GetBestServer: Delete set for index %d, DNS server %#a (Domain %##s), scoped %d", index, &curr->addr, curr->domain.c, curr->scoped);
+            continue;
+        }
+
+        // Check if this is a valid DNSServer
+        if (!bit_get_opaque64(validBits, index))
+        {
+            debugf("GetBestServer: continuing for index %d", index);
+            index++;
+            continue;
+        }
+
+        currcount = CountLabels(&curr->domain);
+        currPenaltyTime = PenaltyTimeForServer(m, curr);
+
+        debugf("GetBestServer: Address %#a (Domain %##s), PenaltyTime(abs) %d, PenaltyTime(rel) %d",
+               &curr->addr, curr->domain.c, curr->penaltyTime, currPenaltyTime);
+
+        // If there are multiple best servers for a given question, we will pick the first one
+        // if none of them are penalized. If some of them are penalized in that list, we pick
+        // the least penalized one. BetterMatchForName walks through all best matches and
+        // "currPenaltyTime < bestPenaltyTime" check lets us either pick the first best server
+        // in the list when there are no penalized servers and least one among them
+        // when there are some penalized servers.
+
+        if (DNSServerMatch(curr, InterfaceID, ServiceID))
+        {
+
+            // If we know that all the names are already equally good matches, then skip calling BetterMatchForName.
+            // This happens when we initially walk all the DNS servers and set the validity bit on the question.
+            // Actually we just need PenaltyTime match, but for the sake of readability we just skip the expensive
+            // part and still do some redundant steps e.g., InterfaceID match
+
+            if (nameMatch)
+                bettermatch = BetterMatchForName(name, namecount, &curr->domain, currcount, bestmatchlen);
+            else
+                bettermatch = 0;
+
+            // If we found a better match (bettermatch == 1) then we don't need to
+            // compare penalty times. But if we found an equal match, then we compare
+            // the penalty times to pick a better match
+
+            if ((bettermatch == 1) || ((bettermatch == 0) && currPenaltyTime < bestPenaltyTime))
+            {
+                currindex = index;
+                curmatch = curr;
+                bestmatchlen = currcount;
+                bestPenaltyTime = currPenaltyTime;
+            }
+        }
+        index++;
+    }
+    if (selected) *selected = currindex;
+    return curmatch;
+}
+
+// Look up a DNS Server, matching by name and InterfaceID
+mDNSlocal DNSServer *GetServerForName(mDNS *m, const domainname *name, mDNSInterfaceID InterfaceID, mDNSs32 ServiceID)
+{
+    DNSServer *curmatch = mDNSNULL;
+    char *ifname = mDNSNULL;    // for logging purposes only
+    mDNSOpaque64 allValid;
+
+    if ((InterfaceID == mDNSInterface_Unicast) || (InterfaceID == mDNSInterface_LocalOnly))
+        InterfaceID = mDNSNULL;
+
+    if (InterfaceID) ifname = InterfaceNameForID(m, InterfaceID);
+
+    // By passing in all ones, we make sure that every DNS server is considered
+    allValid.l[0] = allValid.l[1] = 0xFFFFFFFF;
+
+    curmatch = GetBestServer(m, name, InterfaceID, ServiceID, allValid, mDNSNULL, mDNStrue);
+
+    if (curmatch != mDNSNULL)
+        LogInfo("GetServerForName: DNS server %#a:%d (Penalty Time Left %d) (Scope %s:%p) found for name %##s", &curmatch->addr,
+                mDNSVal16(curmatch->port), (curmatch->penaltyTime ? (curmatch->penaltyTime - m->timenow) : 0), ifname ? ifname : "None",
+                InterfaceID, name);
+    else
+        LogInfo("GetServerForName: no DNS server (Scope %s:%p) found for name %##s", ifname ? ifname : "None", InterfaceID, name);
+
+    return(curmatch);
+}
+
+// Look up a DNS Server for a question within its valid DNSServer bits
+mDNSexport DNSServer *GetServerForQuestion(mDNS *m, DNSQuestion *question)
+{
+    DNSServer *curmatch = mDNSNULL;
+    char *ifname = mDNSNULL;    // for logging purposes only
+    mDNSInterfaceID InterfaceID = question->InterfaceID;
+    const domainname *name = &question->qname;
+    int currindex;
+
+    if ((InterfaceID == mDNSInterface_Unicast) || (InterfaceID == mDNSInterface_LocalOnly))
+        InterfaceID = mDNSNULL;
+
+    if (InterfaceID)
+        ifname = InterfaceNameForID(m, InterfaceID);
+
+    if (!mDNSOpaque64IsZero(&question->validDNSServers))
+    {
+        curmatch = GetBestServer(m, name, InterfaceID, question->ServiceID, question->validDNSServers, &currindex, mDNSfalse);
+        if (currindex != -1)
+            bit_clr_opaque64(question->validDNSServers, currindex);
+    }
+
+    if (curmatch != mDNSNULL)
+    {
+        LogInfo("GetServerForQuestion: %p DNS server (%p) %#a:%d (Penalty Time Left %d) (Scope %s:%p:%d) found for name %##s (%s)",
+                question, curmatch, &curmatch->addr, mDNSVal16(curmatch->port),
+                (curmatch->penaltyTime ? (curmatch->penaltyTime - m->timenow) : 0), ifname ? ifname : "None",
+                InterfaceID, question->ServiceID, name, DNSTypeName(question->qtype));
+    }
+    else
+    {
+        LogInfo("GetServerForQuestion: %p no DNS server (Scope %s:%p:%d) found for name %##s (%s)",
+            question, ifname ? ifname : "None", InterfaceID, question->ServiceID, name, DNSTypeName(question->qtype));
+    }
+
+    return(curmatch);
+}
+
+
+#define ValidQuestionTarget(Q) (((Q)->Target.type == mDNSAddrType_IPv4 || (Q)->Target.type == mDNSAddrType_IPv6) && \
+                                (mDNSSameIPPort((Q)->TargetPort, UnicastDNSPort) || mDNSSameIPPort((Q)->TargetPort, MulticastDNSPort)))
+
+// Called in normal client context (lock not held)
+mDNSlocal void LLQNATCallback(mDNS *m, NATTraversalInfo *n)
+{
+    DNSQuestion *q;
+    mDNS_Lock(m);
+    LogInfo("LLQNATCallback external address:port %.4a:%u, NAT result %d", &n->ExternalAddress, mDNSVal16(n->ExternalPort), n->Result);
+    n->clientContext = mDNSNULL; // we received at least one callback since starting this NAT-T
+    for (q = m->Questions; q; q=q->next)
+        if (ActiveQuestion(q) && !mDNSOpaque16IsZero(q->TargetQID) && q->LongLived)
+            startLLQHandshake(m, q);    // If ExternalPort is zero, will do StartLLQPolling instead
+#if APPLE_OSX_mDNSResponder
+    UpdateAutoTunnelDomainStatuses(m);
+#endif
+    mDNS_Unlock(m);
+}
+
+mDNSlocal mDNSBool IsPrivateDomain(mDNS *const m, DNSQuestion *q)
+{
+    DomainAuthInfo *AuthInfo;
+    // Skip Private domains as we have special addresses to get the hosts in the Private domain
+    AuthInfo = GetAuthInfoForName_internal(m, &q->qname);
+    if (AuthInfo && !AuthInfo->deltime && AuthInfo->AutoTunnel)
+    {
+        debugf("IsPrivateDomain: %##s true", q->qname.c);
+        return mDNStrue;
+    }
+    else
+    {
+        debugf("IsPrivateDomain: %##s false", q->qname.c);
+        return mDNSfalse;
+    }
+}
+
+// This function takes the DNSServer as a separate argument because sometimes the
+// caller has not yet assigned the DNSServer, but wants to evaluate the SuppressQuery
+// status before switching to it.
+mDNSlocal mDNSBool ShouldSuppressUnicastQuery(mDNS *const m, DNSQuestion *q, DNSServer *d)
+{
+    // Some callers don't check for the qtype
+    if (q->qtype != kDNSType_A && q->qtype != kDNSType_AAAA)
+    {
+        LogInfo("ShouldSuppressUnicastQuery: Query not suppressed for %##s, qtype %s, not A/AAAA type", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+
+    // Private domains are exempted irrespective of what the DNSServer says
+    if (IsPrivateDomain(m, q))
+    {
+        LogInfo("ShouldSuppressUnicastQuery: Query not suppressed for %##s, qtype %s, Private Domain", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+
+    if (!d)
+    {
+        LogInfo("ShouldSuppressUnicastQuery: Query suppressed for %##s, qtype %s, as the DNS server is NULL", q->qname.c, DNSTypeName(q->qtype));
+        return mDNStrue;
+    }
+    
+    // Check if the DNS Configuration allows A/AAAA queries to be sent
+    if ((q->qtype == kDNSType_A) && (d->req_A))
+    {
+        LogInfo("ShouldSuppressUnicastQuery: Query not suppressed for %##s, qtype %s, DNSServer %##s %#a:%d allows A queries", q->qname.c,
+                DNSTypeName(q->qtype), d->domain.c, &d->addr, mDNSVal16(d->port));
+        return mDNSfalse;
+    }
+    if ((q->qtype == kDNSType_AAAA) && (d->req_AAAA))
+    {
+        LogInfo("ShouldSuppressUnicastQuery: Query not suppressed for %##s, qtype %s, DNSServer %##s %#a:%d allows AAAA queries", q->qname.c,
+                DNSTypeName(q->qtype), d->domain.c, &d->addr, mDNSVal16(d->port));
+        return mDNSfalse;
+    }
+
+    LogInfo("ShouldSuppressUnicastQuery: Query suppressed for %##s, qtype %s, since DNS Configuration does not allow (req_A is %s and req_AAAA is %s)",
+        q->qname.c, DNSTypeName(q->qtype), d->req_A ? "true" : "false", d->req_AAAA ? "true" : "false");
+
+    return mDNStrue;
+}
+
+mDNSlocal mDNSBool ShouldSuppressDotLocalQuery(mDNS *const m, DNSQuestion *q)
+{
+    NetworkInterfaceInfo *intf;
+    AuthRecord *rr;
+    mDNSBool ret;
+
+    // Check to see if there is at least one interface other than loopback and don't suppress
+    // .local questions if you find one. If we have at least one interface, it means that
+    // we can send unicast queries for the .local name and we don't want to suppress
+    // multicast in that case as upper layers don't know how to handle if we return a 
+    // negative response for multicast followed by a positive response for unicast.
+    //
+    // Note: we used to check for multicast capable interfaces instead of just any interface
+    // present. That did not work in the case where we have a valid interface for unicast
+    // but not multicast capable e.g., cellular, as we ended up delivering a negative response 
+    // first and the upper layer did not wait for the positive response that came later.
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+    {
+        if (intf->InterfaceActive && !intf->Loopback)
+        {
+            LogInfo("ShouldSuppressDotLocalQuery: Found interface %s, not suppressing", intf->ifname);
+            return mDNSfalse;
+        }
+    }
+
+    // 1. If we find a LocalOnly or P2P record answering this question, then don't suppress it.
+    //    Set m->CurrentQuestion as it is required by AnswerQuestionWithLORecord.
+    m->CurrentQuestion = q;
+    ret = AnswerQuestionWithLORecord(m, q, mDNStrue);
+    m->CurrentQuestion = mDNSNULL;
+
+    if (ret)
+    {
+        LogInfo("ShouldSuppressDotLocalQuery: Found LocalOnly record for %##s (%s), not suppressing", q->qname.c,
+            DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+
+    // 2. If we find a local AuthRecord answering this question, then don't suppress it. 
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+    {
+        if (ResourceRecordAnswersQuestion(&rr->resrec, q))
+        {
+            LogInfo("ShouldSuppressDotLocalQuery: Found resource record %s for %##s (%s) not suppressing", ARDisplayString(m, rr),
+                q->qname.c, DNSTypeName(q->qtype));
+            return mDNSfalse;
+        }
+    }
+    return mDNStrue;
+}
+
+mDNSlocal mDNSBool ShouldSuppressQuery(mDNS *const m, DNSQuestion *q)
+{
+    if (q->qtype != kDNSType_A && q->qtype != kDNSType_AAAA)
+    {
+        LogInfo("ShouldSuppressQuery: Query not suppressed for %##s, qtype %s, not A/AAAA type", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+
+    // We still want the ability to be able to listen to the local services and hence
+    // don't fail .local query if we have local records that can potentially answer
+    // the question.
+    if (q->InterfaceID != mDNSInterface_Unicast && IsLocalDomain(&q->qname))
+    {
+        if (!ShouldSuppressDotLocalQuery(m, q))
+        {
+            LogInfo("ShouldSuppressQuery: Query not suppressed for %##s, qtype %s, Local question", q->qname.c, DNSTypeName(q->qtype));
+            return mDNSfalse;
+        }
+        else
+        {
+            LogInfo("ShouldSuppressQuery: Query suppressed for %##s, qtype %s, Local question", q->qname.c, DNSTypeName(q->qtype));
+            return mDNStrue;
+        }
+    }
+
+    return (ShouldSuppressUnicastQuery(m, q, q->qDNSServer));
+}
+
+mDNSlocal void CacheRecordRmvEventsForCurrentQuestion(mDNS *const m, DNSQuestion *q)
+{
+    CacheRecord *rr;
+    mDNSu32 slot;
+    CacheGroup *cg;
+
+    slot = HashSlot(&q->qname);
+    cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        // Don't deliver RMV events for negative records
+        if (rr->resrec.RecordType == kDNSRecordTypePacketNegative)
+        {
+            LogInfo("CacheRecordRmvEventsForCurrentQuestion: CacheRecord %s Suppressing RMV events for question %p %##s (%s), CRActiveQuestion %p, CurrentAnswers %d",
+                    CRDisplayString(m, rr), q, q->qname.c, DNSTypeName(q->qtype), rr->CRActiveQuestion, q->CurrentAnswers);
+            continue;
+        }
+
+        if (SameNameRecordAnswersQuestion(&rr->resrec, q))
+        {
+            LogInfo("CacheRecordRmvEventsForCurrentQuestion: Calling AnswerCurrentQuestionWithResourceRecord (RMV) for question %##s using resource record %s LocalAnswers %d",
+                    q->qname.c, CRDisplayString(m, rr), q->LOAddressAnswers);
+
+            q->CurrentAnswers--;
+            if (rr->resrec.rdlength > SmallRecordLimit) q->LargeAnswers--;
+            if (rr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) q->UniqueAnswers--;
+
+            if (rr->CRActiveQuestion == q)
+            {
+                DNSQuestion *qptr;
+                // If this was the active question for this cache entry, it was the one that was
+                // responsible for keeping the cache entry fresh when the cache entry was reaching
+                // its expiry. We need to handover the responsibility to someone else. Otherwise,
+                // when the cache entry is about to expire, we won't find an active question
+                // (pointed by CRActiveQuestion) to refresh the cache.
+                for (qptr = m->Questions; qptr; qptr=qptr->next)
+                    if (qptr != q && ActiveQuestion(qptr) && ResourceRecordAnswersQuestion(&rr->resrec, qptr))
+                        break;
+
+                if (qptr)
+                    LogInfo("CacheRecordRmvEventsForCurrentQuestion: Updating CRActiveQuestion to %p for cache record %s, "
+                            "Original question CurrentAnswers %d, new question CurrentAnswers %d, SuppressUnusable %d, SuppressQuery %d",
+                            qptr, CRDisplayString(m,rr), q->CurrentAnswers, qptr->CurrentAnswers, qptr->SuppressUnusable, qptr->SuppressQuery);
+
+                rr->CRActiveQuestion = qptr;        // Question used to be active; new value may or may not be null
+                if (!qptr) m->rrcache_active--; // If no longer active, decrement rrcache_active count
+            }
+            AnswerCurrentQuestionWithResourceRecord(m, rr, QC_rmv);
+            if (m->CurrentQuestion != q) break;     // If callback deleted q, then we're finished here
+        }
+    }
+}
+
+mDNSlocal mDNSBool IsQuestionNew(mDNS *const m, DNSQuestion *question)
+{
+    DNSQuestion *q;
+    for (q = m->NewQuestions; q; q = q->next)
+        if (q == question) return mDNStrue;
+    return mDNSfalse;
+}
+
+mDNSlocal mDNSBool LocalRecordRmvEventsForQuestion(mDNS *const m, DNSQuestion *q)
+{
+    AuthRecord *rr;
+    mDNSu32 slot;
+    AuthGroup *ag;
+
+    if (m->CurrentQuestion)
+        LogMsg("LocalRecordRmvEventsForQuestion: ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+
+    if (IsQuestionNew(m, q))
+    {
+        LogInfo("LocalRecordRmvEventsForQuestion: New Question %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mDNStrue;
+    }
+    m->CurrentQuestion = q;
+    slot = AuthHashSlot(&q->qname);
+    ag = AuthGroupForName(&m->rrauth, slot, q->qnamehash, &q->qname);
+    if (ag)
+    {
+        for (rr = ag->members; rr; rr=rr->next)
+            // Filter the /etc/hosts records - LocalOnly, Unique, A/AAAA/CNAME
+            if (UniqueLocalOnlyRecord(rr) && LocalOnlyRecordAnswersQuestion(rr, q))
+            {
+                LogInfo("LocalRecordRmvEventsForQuestion: Delivering possible Rmv events with record %s",
+                        ARDisplayString(m, rr));
+                if (q->CurrentAnswers <= 0 || q->LOAddressAnswers <= 0)
+                {
+                    LogMsg("LocalRecordRmvEventsForQuestion: ERROR!! CurrentAnswers or LOAddressAnswers is zero %p %##s"
+                           " (%s) CurrentAnswers %d, LOAddressAnswers %d", q, q->qname.c, DNSTypeName(q->qtype),
+                           q->CurrentAnswers, q->LOAddressAnswers);
+                    continue;
+                }
+                AnswerLocalQuestionWithLocalAuthRecord(m, rr, QC_rmv);      // MUST NOT dereference q again
+                if (m->CurrentQuestion != q) { m->CurrentQuestion = mDNSNULL; return mDNSfalse; }
+            }
+    }
+    m->CurrentQuestion = mDNSNULL;
+    return mDNStrue;
+}
+
+// Returns false if the question got deleted while delivering the RMV events
+// The caller should handle the case
+mDNSlocal mDNSBool CacheRecordRmvEventsForQuestion(mDNS *const m, DNSQuestion *q)
+{
+    if (m->CurrentQuestion)
+        LogMsg("CacheRecordRmvEventsForQuestion: ERROR m->CurrentQuestion already set: %##s (%s)",
+               m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+
+    // If it is a new question, we have not delivered any ADD events yet. So, don't deliver RMV events.
+    // If this question was answered using local auth records, then you can't deliver RMVs using cache
+    if (!IsQuestionNew(m, q) && !q->LOAddressAnswers)
+    {
+        m->CurrentQuestion = q;
+        CacheRecordRmvEventsForCurrentQuestion(m, q);
+        if (m->CurrentQuestion != q) { m->CurrentQuestion = mDNSNULL; return mDNSfalse; }
+        m->CurrentQuestion = mDNSNULL;
+    }
+    else { LogInfo("CacheRecordRmvEventsForQuestion: Question %p %##s (%s) is a new question", q, q->qname.c, DNSTypeName(q->qtype)); }
+    return mDNStrue;
+}
+
+mDNSlocal void SuppressStatusChanged(mDNS *const m, DNSQuestion *q, DNSQuestion **restart)
+{
+    // NOTE: CacheRecordRmvEventsForQuestion will not generate RMV events for queries that have non-zero
+    // LOddressAnswers. Hence it is important that we call CacheRecordRmvEventsForQuestion before
+    // LocalRecordRmvEventsForQuestion (which decrements LOAddressAnswers)
+    if (q->SuppressQuery)
+    {
+        q->SuppressQuery = mDNSfalse;
+        if (!CacheRecordRmvEventsForQuestion(m, q))
+        {
+            LogInfo("SuppressStatusChanged: Question deleted while delivering RMV events from cache");
+            return;
+        }
+        q->SuppressQuery = mDNStrue;
+    }
+
+    // SuppressUnusable does not affect questions that are answered from the local records (/etc/hosts)
+    // and SuppressQuery status does not mean anything for these questions. As we are going to stop the
+    // question below, we need to deliver the RMV events so that the ADDs that will be delivered during
+    // the restart will not be a duplicate ADD
+    if (!LocalRecordRmvEventsForQuestion(m, q))
+    {
+        LogInfo("SuppressStatusChanged: Question deleted while delivering RMV events from Local AuthRecords");
+        return;
+    }
+
+    // There are two cases here.
+    //
+    // 1. Previously it was suppressed and now it is not suppressed, restart the question so
+    // that it will start as a new question. Note that we can't just call ActivateUnicastQuery
+    // because when we get the response, if we had entries in the cache already, it will not answer
+    // this question if the cache entry did not change. Hence, we need to restart
+    // the query so that it can be answered from the cache.
+    //
+    // 2. Previously it was not suppressed and now it is suppressed. We need to restart the questions
+    // so that we redo the duplicate checks in mDNS_StartQuery_internal. A SuppressUnusable question
+    // is a duplicate of non-SuppressUnusable question if it is not suppressed (SuppressQuery is false).
+    // A SuppressUnusable question is not a duplicate of non-SuppressUnusable question if it is suppressed
+    // (SuppressQuery is true). The reason for this is that when a question is suppressed, we want an
+    // immediate response and not want to be blocked behind a question that is querying DNS servers. When
+    // the question is not suppressed, we don't want two active questions sending packets on the wire.
+    // This affects both efficiency and also the current design where there is only one active question
+    // pointed to from a cache entry.
+    //
+    // We restart queries in a two step process by first calling stop and build a temporary list which we
+    // will restart at the end. The main reason for the two step process is to handle duplicate questions.
+    // If there are duplicate questions, calling stop inherits the values from another question on the list (which
+    // will soon become the real question) including q->ThisQInterval which might be zero if it was
+    // suppressed before. At the end when we have restarted all questions, none of them is active as each
+    // inherits from one another and we need to reactivate one of the questions here which is a little hacky.
+    //
+    // It is much cleaner and less error prone to build a list of questions and restart at the end.
+
+    LogInfo("SuppressStatusChanged: Stop question %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+    mDNS_StopQuery_internal(m, q);
+    q->next = *restart;
+    *restart = q;
+}
+
+// The caller should hold the lock
+mDNSexport void CheckSuppressUnusableQuestions(mDNS *const m)
+{
+    DNSQuestion *q;
+    DNSQuestion *restart = mDNSNULL;
+
+    // We look through all questions including new questions. During network change events,
+    // we potentially restart questions here in this function that ends up as new questions,
+    // which may be suppressed at this instance. Before it is handled we get another network
+    // event that changes the status e.g., address becomes available. If we did not process
+    // new questions, we would never change its SuppressQuery status.
+    //
+    // CurrentQuestion is used by RmvEventsForQuestion below. While delivering RMV events, the
+    // application callback can potentially stop the current question (detected by CurrentQuestion) or
+    // *any* other question which could be the next one that we may process here. RestartQuestion
+    // points to the "next" question which will be automatically advanced in mDNS_StopQuery_internal
+    // if the "next" question is stopped while the CurrentQuestion is stopped
+    if (m->RestartQuestion)
+        LogMsg("CheckSuppressUnusableQuestions: ERROR!! m->RestartQuestion already set: %##s (%s)",
+               m->RestartQuestion->qname.c, DNSTypeName(m->RestartQuestion->qtype));
+    m->RestartQuestion = m->Questions;
+    while (m->RestartQuestion)
+    {
+        q = m->RestartQuestion;
+        m->RestartQuestion = q->next;
+        if (q->SuppressUnusable)
+        {
+            mDNSBool old = q->SuppressQuery;
+            q->SuppressQuery = ShouldSuppressQuery(m, q);
+            if (q->SuppressQuery != old)
+            {
+                // Previously it was not suppressed, Generate RMV events for the ADDs that we might have delivered before
+                // followed by a negative cache response. Temporarily turn off suppression so that
+                // AnswerCurrentQuestionWithResourceRecord can answer the question
+                SuppressStatusChanged(m, q, &restart);
+            }
+        }
+    }
+    while (restart)
+    {
+        q = restart;
+        restart = restart->next;
+        q->next = mDNSNULL;
+        LogInfo("CheckSuppressUnusableQuestions: Start question %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+        mDNS_StartQuery_internal(m, q);
+    }
+}
+
+mDNSlocal void RestartUnicastQuestions(mDNS *const m)
+{
+    DNSQuestion *q;
+    DNSQuestion *restart = mDNSNULL;
+
+    if (m->RestartQuestion)
+        LogMsg("RestartUnicastQuestions: ERROR!! m->RestartQuestion already set: %##s (%s)",
+               m->RestartQuestion->qname.c, DNSTypeName(m->RestartQuestion->qtype));
+    m->RestartQuestion = m->Questions;
+    while (m->RestartQuestion)
+    {
+        q = m->RestartQuestion;
+        m->RestartQuestion = q->next;
+        if (q->Restart)
+        {
+            if (mDNSOpaque16IsZero(q->TargetQID))
+                LogMsg("RestartUnicastQuestions: ERROR!! Restart set for multicast question %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                
+            q->Restart = 0;
+            SuppressStatusChanged(m, q, &restart);
+        }
+    }
+    while (restart)
+    {
+        q = restart;
+        restart = restart->next;
+        q->next = mDNSNULL;
+        LogInfo("RestartUnicastQuestions: Start question %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+        mDNS_StartQuery_internal(m, q);
+    }
+}
+
+
+// ValidateParameters() is called by mDNS_StartQuery_internal() to check the client parameters of 
+// DNS Question that are already set by the client before calling mDNS_StartQuery() 
+mDNSlocal mStatus ValidateParameters(mDNS *const m, DNSQuestion *const question)
+{
+
+    if (question->Target.type && !ValidQuestionTarget(question))
+    {
+        LogMsg("ValidateParameters: Warning! Target.type = %ld port = %u (Client forgot to initialize before calling mDNS_StartQuery? for question %##s)",
+               question->Target.type, mDNSVal16(question->TargetPort), question->qname.c);
+        question->Target.type = mDNSAddrType_None;
+    }
+
+    // If no question->Target specified, clear TargetPort
+    if (!question->Target.type) 
+        question->TargetPort = zeroIPPort;
+
+    if (!ValidateDomainName(&question->qname))
+    {
+        LogMsg("ValidateParameters: Attempt to start query with invalid qname %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+        return(mStatus_Invalid);
+    }
+
+    // If this question is referencing a specific interface, verify it exists 
+    if (question->InterfaceID && question->InterfaceID != mDNSInterface_LocalOnly && question->InterfaceID != mDNSInterface_Unicast && question->InterfaceID != mDNSInterface_P2P)
+    {
+        NetworkInterfaceInfo *intf = FirstInterfaceForID(m, question->InterfaceID);
+        if (!intf)
+            LogMsg("ValidateParameters: Note: InterfaceID %p for question %##s (%s) not currently found in active interface list",
+                    question->InterfaceID, question->qname.c, DNSTypeName(question->qtype));
+    }
+    
+    return(mStatus_NoError);
+}
+
+// InitDNSConfig() is called by InitCommonState() to initialize the DNS configuration of the Question.    
+// These are a subset of the internal uDNS fields. Must be done before ShouldSuppressQuery() & mDNS_PurgeForQuestion()
+mDNSlocal void InitDNSConfig(mDNS *const m, DNSQuestion *const question)
+{
+    // First reset all DNS Configuration
+    question->qDNSServer          = mDNSNULL;
+    question->validDNSServers     = zeroOpaque64;
+    question->triedAllServersOnce = 0;                                                                                                                                
+    question->noServerResponse    = 0;  
+    question->StopTime            = 0;
+
+    // Need not initialize the DNS Configuration for Local Only OR P2P Questions
+    if (question->InterfaceID == mDNSInterface_LocalOnly || question->InterfaceID == mDNSInterface_P2P)
+        return;
+    // Proceed to initialize DNS Configuration (some are set in SetValidDNSServers())
+    if (!mDNSOpaque16IsZero(question->TargetQID))
+    {     
+        mDNSu32 timeout = SetValidDNSServers(m, question);
+        // We set the timeout whenever mDNS_StartQuery_internal is called. This means if we have
+        // a networking change/search domain change that calls this function again we keep
+        // reinitializing the timeout value which means it may never timeout. If this becomes
+        // a common case in the future, we can easily fix this by adding extra state that
+        // indicates that we have already set the StopTime.
+        //
+        // Note that we set the timeout for all questions. If this turns out to be a duplicate, 
+        // it gets a full timeout value even if the original question times out earlier.
+        if (question->TimeoutQuestion)
+        {
+            question->StopTime = NonZeroTime(m->timenow + timeout * mDNSPlatformOneSecond);
+            LogInfo("InitDNSConfig: Setting StopTime on question %p %##s (%s)", question, question->qname.c, DNSTypeName(question->qtype));
+        }
+
+        question->qDNSServer = GetServerForQuestion(m, question);
+        LogInfo("InitDNSConfig: question %p %##s (%s) Timeout %d, DNS Server %#a:%d",
+                 question, question->qname.c, DNSTypeName(question->qtype), timeout,
+                 question->qDNSServer ? &question->qDNSServer->addr : mDNSNULL,
+                 mDNSVal16(question->qDNSServer ? question->qDNSServer->port : zeroIPPort));
+    }
+    else
+    {     
+        if (question->TimeoutQuestion)
+            question->StopTime = NonZeroTime(m->timenow + GetTimeoutForMcastQuestion(m, question) * mDNSPlatformOneSecond);
+    }
+    // Set StopTime here since it is a part of DNS Configuration 
+    if (question->StopTime)
+        SetNextQueryStopTime(m, question);
+    // SetNextQueryTime() need not be initialized for LocalOnly OR P2P Questions since those questions
+    // will never be transmitted on the wire. Hence we call SetNextQueryTime() here.
+    SetNextQueryTime(m,question); 
+}
+
+// InitCommonState() is called by mDNS_StartQuery_internal() to initialize the common(uDNS/mDNS) internal
+// state fields of the DNS Question. These are independent of the Client layer.
+mDNSlocal mDNSBool InitCommonState(mDNS *const m, DNSQuestion *const question)
+{
+    mDNSBool purge;
+    int i;
+
+    // Note: In the case where we already have the answer to this question in our cache, that may be all the client
+    // wanted, and they may immediately cancel their question. In this case, sending an actual query on the wire would
+    // be a waste. For that reason, we schedule our first query to go out in half a second (InitialQuestionInterval).
+    // If AnswerNewQuestion() finds that we have *no* relevant answers currently in our cache, then it will accelerate
+    // that to go out immediately.
+    question->next              = mDNSNULL;
+    // ThisQInterval should be initialized before any memory allocations occur. If malloc
+    // debugging is turned on within mDNSResponder (see mDNSDebug.h for details) it validates
+    // the question list to check if ThisQInterval is negative which means the question has been
+    // stopped and can't be on the list. The question is already on the list and ThisQInterval
+    // can be negative if the caller just stopped it and starting it again. Hence, it always has to
+    // be initialized. CheckForSoonToExpireRecords below prints the cache records when logging is
+    // turned ON which can allocate memory e.g., base64 encoding, in the case of DNSSEC.
+    question->ThisQInterval     = InitialQuestionInterval;                  // MUST be > zero for an active question
+    question->qnamehash         = DomainNameHashValue(&question->qname);
+    question->DelayAnswering    = CheckForSoonToExpireRecords(m, &question->qname, question->qnamehash, HashSlot(&question->qname), &purge);
+    question->LastQTime         = m->timenow;
+    question->ExpectUnicastResp = 0;
+    question->LastAnswerPktNum  = m->PktNum;
+    question->RecentAnswerPkts  = 0;
+    question->CurrentAnswers    = 0;
+
+#if APPLE_OSX_mDNSResponder
+
+// Initial browse threshold used by Finder.
+#define mDNSFinderBrowseThreshold 20
+
+    // Set the threshold at which we move to a passive browse state,
+    // not actively sending queries.
+    if (question->flags & kDNSServiceFlagsThresholdOne)
+        question->BrowseThreshold   = 1;
+    else if (question->flags & kDNSServiceFlagsThresholdFinder)
+        question->BrowseThreshold   = mDNSFinderBrowseThreshold;
+    else
+        question->BrowseThreshold   = 0;
+
+#else   // APPLE_OSX_mDNSResponder
+   question->BrowseThreshold   = 0;
+#endif  // APPLE_OSX_mDNSResponder
+    question->CachedAnswerNeedsUpdate = mDNSfalse;
+
+    question->LargeAnswers      = 0;
+    question->UniqueAnswers     = 0;
+    question->LOAddressAnswers  = 0;
+    question->FlappingInterface1 = mDNSNULL;
+    question->FlappingInterface2 = mDNSNULL;
+
+    question->ServiceID = mDNSPlatformGetServiceID(m, question);
+    
+    InitDNSConfig(m, question);
+
+    question->AuthInfo          = GetAuthInfoForQuestion(m, question);
+    question->SuppressQuery     = 0;
+    if (question->SuppressUnusable)
+        question->SuppressQuery = ShouldSuppressQuery(m, question);
+
+    // If ServiceID is 0 or the policy disallows making DNS requests,
+    // set DisallowPID
+    question->DisallowPID       = (question->ServiceID == 0 || (mDNSPlatformAllowPID(m, question) == 0));
+    if (question->DisallowPID)
+    {
+        LogInfo("InitCommonState: Query suppressed for %##s (%s), PID %d/ServiceID %d not allowed", question->qname.c,
+            DNSTypeName(question->qtype), question->pid, question->ServiceID);
+    }
+
+    question->NextInDQList      = mDNSNULL;
+    question->SendQNow          = mDNSNULL;
+    question->SendOnAll         = mDNSfalse;
+
+#if mDNS_REQUEST_UNICAST_RESPONSE
+    question->RequestUnicast    = SET_QU_IN_FIRST_FOUR_QUERIES;
+#else   // mDNS_REQUEST_UNICAST_RESPONSE
+    question->RequestUnicast    = SET_QU_IN_FIRST_QUERY;
+#endif  // mDNS_REQUEST_UNICAST_RESPONSE
+
+#if APPLE_OSX_mDNSResponder
+    // Request unicast response for first 4 queries to increase
+    // reliability in an environment with high multicast packet loss.
+    // Must set to one more than the number of unicast queries you want, since SendQueries()
+    // decrements it before calling BuildQuestion() which acts on it.
+    if (question->flags & kDNSServiceFlagsUnicastResponse)
+    {
+        question->RequestUnicast    = SET_QU_IN_FIRST_FOUR_QUERIES;
+        LogInfo("InitCommonState: setting RequestUnicast = %d for %##s (%s)", question->RequestUnicast, question->qname.c,
+            DNSTypeName(question->qtype));
+    } 
+    else if (question->flags & kDNSServiceFlagsThresholdFinder)
+    {
+        // always send one request with QU bit set when kDNSServiceFlagsThresholdFinder is set
+#if mDNS_REQUEST_UNICAST_RESPONSE
+        question->RequestUnicast    = SET_QU_IN_FIRST_FOUR_QUERIES;
+#else   // mDNS_REQUEST_UNICAST_RESPONSE
+        question->RequestUnicast    = SET_QU_IN_FIRST_QUERY;
+#endif  // mDNS_REQUEST_UNICAST_RESPONSE
+
+        LogInfo("InitCommonState: kDNSServiceFlagsThresholdFinder set, setting RequestUnicast = %d for %##s (%s)", 
+            question->RequestUnicast, question->qname.c, DNSTypeName(question->qtype));
+    }
+#endif  // APPLE_OSX_mDNSResponder
+
+    question->LastQTxTime       = m->timenow;
+    question->CNAMEReferrals    = 0; 
+
+    question->WakeOnResolveCount = 0;
+    if (question->WakeOnResolve)
+    {     
+        question->WakeOnResolveCount = InitialWakeOnResolveCount;
+        purge = mDNStrue;
+    }     
+
+    for (i=0; i<DupSuppressInfoSize; i++)
+        question->DupSuppress[i].InterfaceID = mDNSNULL;
+
+    question->Restart = 0;
+
+    debugf("InitCommonState: Question %##s (%s) Interface %p Now %d Send in %d Answer in %d (%p) %s (%p)",
+            question->qname.c, DNSTypeName(question->qtype), question->InterfaceID, m->timenow,
+            NextQSendTime(question) - m->timenow,
+            question->DelayAnswering ? question->DelayAnswering - m->timenow : 0,
+            question, question->DuplicateOf ? "duplicate of" : "not duplicate", question->DuplicateOf);
+
+    if (question->DelayAnswering)
+        LogInfo("InitCommonState: Delaying answering for %d ticks while cache stabilizes for %##s (%s)",
+                 question->DelayAnswering - m->timenow, question->qname.c, DNSTypeName(question->qtype));
+
+    return(purge);
+}
+
+// Excludes the DNS Config fields which are already handled by InitDNSConfig()
+mDNSlocal void InitWABState(DNSQuestion *const question)
+{
+    // We'll create our question->LocalSocket on demand, if needed.
+    // We won't need one for duplicate questions, or from questions answered immediately out of the cache.
+    // We also don't need one for LLQs because (when we're using NAT) we want them all to share a single
+    // NAT mapping for receiving inbound add/remove events.
+    question->LocalSocket       = mDNSNULL; 
+    question->unansweredQueries = 0;
+    question->nta               = mDNSNULL;
+    question->servAddr          = zeroAddr;
+    question->servPort          = zeroIPPort;
+    question->tcp               = mDNSNULL;
+    question->NoAnswer          = NoAnswer_Normal;
+}
+
+mDNSlocal void InitLLQNATState(mDNS *const m)
+{
+    // If we don't have our NAT mapping active, start it now
+    if (!m->LLQNAT.clientCallback)
+    {
+        m->LLQNAT.Protocol       = NATOp_MapUDP;
+        m->LLQNAT.IntPort        = m->UnicastPort4;
+        m->LLQNAT.RequestedPort  = m->UnicastPort4;
+        m->LLQNAT.clientCallback = LLQNATCallback;
+        m->LLQNAT.clientContext  = (void*)1; // Means LLQ NAT Traversal just started
+        mDNS_StartNATOperation_internal(m, &m->LLQNAT);
+    }
+}
+
+mDNSlocal void InitLLQState(DNSQuestion *const question)
+{
+    question->state             = LLQ_InitialRequest;
+    question->ReqLease          = 0;
+    question->expire            = 0;
+    question->ntries            = 0;
+    question->id                = zeroOpaque64;
+}
+
+// InitDNSSECProxyState() is called by mDNS_StartQuery_internal() to initialize
+// DNSSEC & DNS Proxy fields of the DNS Question. 
+mDNSlocal void InitDNSSECProxyState(mDNS *const m, DNSQuestion *const question)
+{
+    (void) m;
+
+    // DNS server selection affects DNSSEC. Turn off validation if req_DO is not set
+    // or the request is going over cellular interface.
+    //
+    // Note: This needs to be done here before we call FindDuplicateQuestion as it looks
+    // at ValidationRequired setting also.
+    if (question->qDNSServer)
+    {
+        if (question->qDNSServer->cellIntf)
+        {
+            LogInfo("InitDNSSECProxyState: Turning off validation for %##s (%s); going over cell", question->qname.c, DNSTypeName(question->qtype));
+            question->ValidationRequired = mDNSfalse;
+        }
+        if (DNSSECOptionalQuestion(question) && !(question->qDNSServer->req_DO))
+        {
+            LogInfo("InitDNSSECProxyState: Turning off validation for %##s (%s); req_DO false",
+                question->qname.c, DNSTypeName(question->qtype));
+            question->ValidationRequired = DNSSEC_VALIDATION_NONE;
+        }
+    }
+    question->ValidationState = (question->ValidationRequired ? DNSSECValRequired : DNSSECValNotRequired);
+    question->ValidationStatus = 0;
+    question->responseFlags    = zeroID;
+}
+
+// Once the question is completely initialized including the duplicate logic, this function
+// is called to finalize the unicast question which requires flushing the cache if needed,
+// activating the query etc.
+mDNSlocal void FinalizeUnicastQuestion(mDNS *const m, DNSQuestion *question, mDNSBool purge)
+{
+    // Ensure DNS related info of duplicate question is same as the orig question
+    if (question->DuplicateOf)
+    {
+        question->validDNSServers = question->DuplicateOf->validDNSServers;
+        question->qDNSServer = question->DuplicateOf->qDNSServer;
+        LogInfo("FinalizeUnicastQuestion: Duplicate question %p (%p) %##s (%s), DNS Server %#a:%d",
+                 question, question->DuplicateOf, question->qname.c, DNSTypeName(question->qtype),
+                 question->qDNSServer ? &question->qDNSServer->addr : mDNSNULL,
+                 mDNSVal16(question->qDNSServer ? question->qDNSServer->port : zeroIPPort));
+    }
+
+    ActivateUnicastQuery(m, question, mDNSfalse);
+
+    // If purge was set above, flush the cache. Need to do this after we set the
+    // DNS server on the question
+    if (purge)
+    {
+        question->DelayAnswering = 0;
+        mDNS_PurgeForQuestion(m, question);
+    }
+    else if (!question->DuplicateOf && DNSSECQuestion(question))
+    {
+        // For DNSSEC questions, we need to have the RRSIGs also for verification.
+        CheckForDNSSECRecords(m, question);
+    }
+    if (question->LongLived)
+    {
+        // Unlike other initializations, InitLLQNATState should be done after
+        // we determine that it is a unicast question.  LongLived is set for
+        // both multicast and unicast browse questions but we should initialize
+        // the LLQ NAT state only for unicast. Otherwise we will unnecessarily
+        // start the NAT traversal that is not needed.
+        InitLLQNATState(m);
+#if APPLE_OSX_mDNSResponder
+        UpdateAutoTunnelDomainStatuses(m);
+#endif
+    }
+}
+
+mDNSexport mStatus mDNS_StartQuery_internal(mDNS *const m, DNSQuestion *const question)
+{
+    DNSQuestion **q;
+    mStatus vStatus;
+    mDNSBool purge;
+
+    // First check for cache space (can't do queries if there is no cache space allocated)
+    if (m->rrcache_size == 0)
+        return(mStatus_NoCache);
+
+    vStatus = ValidateParameters(m, question);
+    if (vStatus)
+        return(vStatus);
+    
+    question->TargetQID =
+#ifndef UNICAST_DISABLED
+                          (question->Target.type || Question_uDNS(question)) ? mDNS_NewMessageID(m) :
+#endif // UNICAST_DISABLED
+                          zeroID;
+    debugf("mDNS_StartQuery_internal: %##s (%s)", question->qname.c, DNSTypeName(question->qtype)); 
+    
+    // Note: It important that new questions are appended at the *end* of the list, not prepended at the start
+    q = &m->Questions;
+    if (question->InterfaceID == mDNSInterface_LocalOnly || question->InterfaceID == mDNSInterface_P2P) 
+        q = &m->LocalOnlyQuestions;
+    while (*q && *q != question) 
+        q=&(*q)->next;
+
+    if (*q)
+    {
+        LogMsg("mDNS_StartQuery_internal: Error! Tried to add a question %##s (%s) %p that's already in the active list",
+                question->qname.c, DNSTypeName(question->qtype), question);
+        return(mStatus_AlreadyRegistered);
+    }
+    *q = question;
+    
+
+    // Intialize the question. The only ordering constraint we have today is that
+    // InitDNSSECProxyState should be called after the DNS server is selected (in
+    // InitCommonState -> InitDNSConfig) as DNS server selection affects DNSSEC
+    // validation.
+
+    purge = InitCommonState(m, question);
+    InitWABState(question);
+    InitLLQState(question);
+    InitDNSSECProxyState(m, question);
+
+    // FindDuplicateQuestion should be called last after all the intialization
+    // as the duplicate logic could be potentially based on any field in the
+    // question.
+    question->DuplicateOf  = FindDuplicateQuestion(m, question);
+    if (question->DuplicateOf) 
+        question->AuthInfo = question->DuplicateOf->AuthInfo; 
+
+    if (question->InterfaceID == mDNSInterface_LocalOnly || question->InterfaceID == mDNSInterface_P2P)
+    {
+        if (!m->NewLocalOnlyQuestions) 
+            m->NewLocalOnlyQuestions = question;
+    }
+    else
+    {
+        if (!m->NewQuestions) 
+            m->NewQuestions = question;
+
+        // If the question's id is non-zero, then it's Wide Area
+        // MUST NOT do this Wide Area setup until near the end of
+        // mDNS_StartQuery_internal -- this code may itself issue queries (e.g. SOA,
+        // NS, etc.) and if we haven't finished setting up our own question and setting
+        // m->NewQuestions if necessary then we could end up recursively re-entering
+        // this routine with the question list data structures in an inconsistent state.
+        if (!mDNSOpaque16IsZero(question->TargetQID))
+        {
+            FinalizeUnicastQuestion(m, question, purge);
+        }
+        else
+        {
+            if (purge)
+            {
+                LogInfo("mDNS_StartQuery_internal: Purging for %##s", question->qname.c);
+                mDNS_PurgeForQuestion(m, question);
+            }
+        }
+    }
+
+    return(mStatus_NoError);
+}
+
+// CancelGetZoneData is an internal routine (i.e. must be called with the lock already held)
+mDNSexport void CancelGetZoneData(mDNS *const m, ZoneData *nta)
+{
+    debugf("CancelGetZoneData %##s (%s)", nta->question.qname.c, DNSTypeName(nta->question.qtype));
+    // This function may be called anytime to free the zone information.The question may or may not have stopped.
+    // If it was already stopped, mDNS_StopQuery_internal would have set q->ThisQInterval to -1 and should not
+    // call it again
+    if (nta->question.ThisQInterval != -1)
+    {
+        mDNS_StopQuery_internal(m, &nta->question);
+        if (nta->question.ThisQInterval != -1)
+            LogMsg("CancelGetZoneData: Question %##s (%s) ThisQInterval %d not -1", nta->question.qname.c, DNSTypeName(nta->question.qtype), nta->question.ThisQInterval);
+    }
+    mDNSPlatformMemFree(nta);
+}
+
+mDNSexport mStatus mDNS_StopQuery_internal(mDNS *const m, DNSQuestion *const question)
+{
+    const mDNSu32 slot = HashSlot(&question->qname);
+    CacheGroup *cg = CacheGroupForName(m, slot, question->qnamehash, &question->qname);
+    CacheRecord *rr;
+    DNSQuestion **qp = &m->Questions;
+
+    //LogInfo("mDNS_StopQuery_internal %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+
+    if (question->InterfaceID == mDNSInterface_LocalOnly || question->InterfaceID == mDNSInterface_P2P) qp = &m->LocalOnlyQuestions;
+    while (*qp && *qp != question) qp=&(*qp)->next;
+    if (*qp) *qp = (*qp)->next;
+    else
+    {
+#if !ForceAlerts
+        if (question->ThisQInterval >= 0)   // Only log error message if the query was supposed to be active
+#endif
+        LogMsg("mDNS_StopQuery_internal: Question %##s (%s) not found in active list",
+               question->qname.c, DNSTypeName(question->qtype));
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+        return(mStatus_BadReferenceErr);
+    }
+
+    // Take care to cut question from list *before* calling UpdateQuestionDuplicates
+    UpdateQuestionDuplicates(m, question);
+    // But don't trash ThisQInterval until afterwards.
+    question->ThisQInterval = -1;
+
+    // If there are any cache records referencing this as their active question, then see if there is any
+    // other question that is also referencing them, else their CRActiveQuestion needs to get set to NULL.
+    for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+    {
+        if (rr->CRActiveQuestion == question)
+        {
+            DNSQuestion *q;
+            // Checking for ActiveQuestion filters questions that are suppressed also
+            // as suppressed questions are not active
+            for (q = m->Questions; q; q=q->next)        // Scan our list of questions
+                if (ActiveQuestion(q) && ResourceRecordAnswersQuestion(&rr->resrec, q))
+                    break;
+            if (q)
+                debugf("mDNS_StopQuery_internal: Updating CRActiveQuestion to %p for cache record %s, Original question CurrentAnswers %d, new question "
+                       "CurrentAnswers %d, SuppressQuery %d", q, CRDisplayString(m,rr), question->CurrentAnswers, q->CurrentAnswers, q->SuppressQuery);
+            rr->CRActiveQuestion = q;       // Question used to be active; new value may or may not be null
+            if (!q) m->rrcache_active--;    // If no longer active, decrement rrcache_active count
+        }
+    }
+
+    // If we just deleted the question that CacheRecordAdd() or CacheRecordRmv() is about to look at,
+    // bump its pointer forward one question.
+    if (m->CurrentQuestion == question)
+    {
+        debugf("mDNS_StopQuery_internal: Just deleted the currently active question: %##s (%s)",
+               question->qname.c, DNSTypeName(question->qtype));
+        m->CurrentQuestion = question->next;
+    }
+
+    if (m->NewQuestions == question)
+    {
+        debugf("mDNS_StopQuery_internal: Just deleted a new question that wasn't even answered yet: %##s (%s)",
+               question->qname.c, DNSTypeName(question->qtype));
+        m->NewQuestions = question->next;
+    }
+
+    if (m->NewLocalOnlyQuestions == question) m->NewLocalOnlyQuestions = question->next;
+
+    if (m->RestartQuestion == question)
+    {
+        LogMsg("mDNS_StopQuery_internal: Just deleted the current restart question: %##s (%s)",
+               question->qname.c, DNSTypeName(question->qtype));
+        m->RestartQuestion = question->next;
+    }
+
+    if (m->ValidationQuestion == question)
+    {
+        LogInfo("mDNS_StopQuery_internal: Just deleted the current Validation question: %##s (%s)",
+               question->qname.c, DNSTypeName(question->qtype));
+        m->ValidationQuestion = question->next;
+    }
+
+    // Take care not to trash question->next until *after* we've updated m->CurrentQuestion and m->NewQuestions
+    question->next = mDNSNULL;
+
+    // LogMsg("mDNS_StopQuery_internal: Question %##s (%s) removed", question->qname.c, DNSTypeName(question->qtype));
+
+    // And finally, cancel any associated GetZoneData operation that's still running.
+    // Must not do this until last, because there's a good chance the GetZoneData question is the next in the list,
+    // so if we delete it earlier in this routine, we could find that our "question->next" pointer above is already
+    // invalid before we even use it. By making sure that we update m->CurrentQuestion and m->NewQuestions if necessary
+    // *first*, then they're all ready to be updated a second time if necessary when we cancel our GetZoneData query.
+    if (question->tcp) { DisposeTCPConn(question->tcp); question->tcp = mDNSNULL; }
+    if (question->LocalSocket) { mDNSPlatformUDPClose(question->LocalSocket); question->LocalSocket = mDNSNULL; }
+    if (!mDNSOpaque16IsZero(question->TargetQID) && question->LongLived)
+    {
+        // Scan our list to see if any more wide-area LLQs remain. If not, stop our NAT Traversal.
+        DNSQuestion *q;
+        for (q = m->Questions; q; q=q->next)
+            if (!mDNSOpaque16IsZero(q->TargetQID) && q->LongLived) break;
+        if (!q)
+        {
+            if (!m->LLQNAT.clientCallback)       // Should never happen, but just in case...
+            {
+                LogMsg("mDNS_StopQuery ERROR LLQNAT.clientCallback NULL");
+            }
+            else
+            {
+                LogInfo("Stopping LLQNAT");
+                mDNS_StopNATOperation_internal(m, &m->LLQNAT);
+                m->LLQNAT.clientCallback = mDNSNULL; // Means LLQ NAT Traversal not running
+            }
+        }
+
+        // If necessary, tell server it can delete this LLQ state
+        if (question->state == LLQ_Established)
+        {
+            question->ReqLease = 0;
+            sendLLQRefresh(m, question);
+            // If we need need to make a TCP connection to cancel the LLQ, that's going to take a little while.
+            // We clear the tcp->question backpointer so that when the TCP connection completes, it doesn't
+            // crash trying to access our cancelled question, but we don't cancel the TCP operation itself --
+            // we let that run out its natural course and complete asynchronously.
+            if (question->tcp)
+            {
+                question->tcp->question = mDNSNULL;
+                question->tcp           = mDNSNULL;
+            }
+        }
+#if APPLE_OSX_mDNSResponder
+        UpdateAutoTunnelDomainStatuses(m);
+#endif
+    }
+    // wait until we send the refresh above which needs the nta
+    if (question->nta) { CancelGetZoneData(m, question->nta); question->nta = mDNSNULL; }
+
+    if (question->ValidationRequired && question->DNSSECAuthInfo)
+    {
+        LogInfo("mDNS_StopQuery_internal: freeing DNSSECAuthInfo %##s", question->qname.c);
+        question->DAIFreeCallback(m, question->DNSSECAuthInfo);
+        question->DNSSECAuthInfo = mDNSNULL;
+    }
+    if (question->AnonInfo)
+    {
+        FreeAnonInfo(question->AnonInfo);
+        question->AnonInfo = mDNSNULL;
+    }
+
+    return(mStatus_NoError);
+}
+
+mDNSexport mStatus mDNS_StartQuery(mDNS *const m, DNSQuestion *const question)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_StartQuery_internal(m, question);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_StopQuery(mDNS *const m, DNSQuestion *const question)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_StopQuery_internal(m, question);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+// Note that mDNS_StopQueryWithRemoves() does not currently implement the full generality of the other APIs
+// Specifically, question callbacks invoked as a result of this call cannot themselves make API calls.
+// We invoke the callback without using mDNS_DropLockBeforeCallback/mDNS_ReclaimLockAfterCallback
+// specifically to catch and report if the client callback does try to make API calls
+mDNSexport mStatus mDNS_StopQueryWithRemoves(mDNS *const m, DNSQuestion *const question)
+{
+    mStatus status;
+    DNSQuestion *qq;
+    mDNS_Lock(m);
+
+    // Check if question is new -- don't want to give remove events for a question we haven't even answered yet
+    for (qq = m->NewQuestions; qq; qq=qq->next) if (qq == question) break;
+
+    status = mDNS_StopQuery_internal(m, question);
+    if (status == mStatus_NoError && !qq)
+    {
+        const CacheRecord *rr;
+        const mDNSu32 slot = HashSlot(&question->qname);
+        CacheGroup *const cg = CacheGroupForName(m, slot, question->qnamehash, &question->qname);
+        LogInfo("Generating terminal removes for %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+        for (rr = cg ? cg->members : mDNSNULL; rr; rr=rr->next)
+            if (rr->resrec.RecordType != kDNSRecordTypePacketNegative && SameNameRecordAnswersQuestion(&rr->resrec, question))
+            {
+                // Don't use mDNS_DropLockBeforeCallback() here, since we don't allow API calls
+                if (question->QuestionCallback)
+                    question->QuestionCallback(m, question, &rr->resrec, mDNSfalse);
+            }
+    }
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_Reconfirm(mDNS *const m, CacheRecord *const cr)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForNoAnswer);
+    if (status == mStatus_NoError) ReconfirmAntecedents(m, cr->resrec.name, cr->resrec.namehash, 0);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_ReconfirmByValue(mDNS *const m, ResourceRecord *const rr)
+{
+    mStatus status = mStatus_BadReferenceErr;
+    CacheRecord *cr;
+    mDNS_Lock(m);
+    cr = FindIdenticalRecordInCache(m, rr);
+    debugf("mDNS_ReconfirmByValue: %p %s", cr, RRDisplayString(m, rr));
+    if (cr) status = mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForNoAnswer);
+    if (status == mStatus_NoError) ReconfirmAntecedents(m, cr->resrec.name, cr->resrec.namehash, 0);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSlocal mStatus mDNS_StartBrowse_internal(mDNS *const m, DNSQuestion *const question,
+                                            const domainname *const srv, const domainname *const domain,
+                                            const mDNSu8 *anondata, const mDNSInterfaceID InterfaceID, mDNSu32 flags,
+                                            mDNSBool ForceMCast, mDNSBool useBackgroundTrafficClass,
+                                            mDNSQuestionCallback *Callback, void *Context)
+{
+    question->InterfaceID      = InterfaceID;
+    question->flags            = flags;
+    question->Target           = zeroAddr;
+    question->qtype            = kDNSType_PTR;
+    question->qclass           = kDNSClass_IN;
+    question->LongLived        = mDNStrue;
+    question->ExpectUnique     = mDNSfalse;
+    question->ForceMCast       = ForceMCast;
+    question->ReturnIntermed   = mDNSfalse;
+    question->SuppressUnusable = mDNSfalse;
+    question->SearchListIndex  = 0;
+    question->AppendSearchDomains = 0;
+    question->RetryWithSearchDomains = mDNSfalse;
+    question->TimeoutQuestion  = 0;
+    question->WakeOnResolve    = 0;
+    question->UseBackgroundTrafficClass = useBackgroundTrafficClass;
+    question->ValidationRequired = 0;
+    question->ValidatingResponse = 0;
+    question->ProxyQuestion    = 0;
+    question->qnameOrig        = mDNSNULL;
+    question->AnonInfo         = mDNSNULL;
+    question->QuestionCallback = Callback;
+    question->QuestionContext  = Context;
+
+    if (!ConstructServiceName(&question->qname, mDNSNULL, srv, domain))
+        return(mStatus_BadParamErr);
+
+    if (anondata)
+    {
+        question->AnonInfo = AllocateAnonInfo(&question->qname, anondata, mDNSPlatformStrLen(anondata), mDNSNULL);
+        if (!question->AnonInfo)
+            return(mStatus_BadParamErr);
+    }
+
+    return(mDNS_StartQuery_internal(m, question));
+}
+
+mDNSexport mStatus mDNS_StartBrowse(mDNS *const m, DNSQuestion *const question,
+                                    const domainname *const srv, const domainname *const domain,
+                                    const mDNSu8 *anondata, const mDNSInterfaceID InterfaceID, mDNSu32 flags,
+                                    mDNSBool ForceMCast, mDNSBool useBackgroundTrafficClass,
+                                    mDNSQuestionCallback *Callback, void *Context)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_StartBrowse_internal(m, question, srv, domain, anondata, InterfaceID, flags, ForceMCast, useBackgroundTrafficClass, Callback, Context);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSlocal mDNSBool MachineHasActiveIPv6(mDNS *const m)
+{
+    NetworkInterfaceInfo *intf;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+        if (intf->ip.type == mDNSAddrType_IPv6) return(mDNStrue);
+    return(mDNSfalse);
+}
+
+mDNSlocal void FoundServiceInfoSRV(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    ServiceInfoQuery *query = (ServiceInfoQuery *)question->QuestionContext;
+    mDNSBool PortChanged = !mDNSSameIPPort(query->info->port, answer->rdata->u.srv.port);
+    if (!AddRecord) return;
+    if (answer->rrtype != kDNSType_SRV) return;
+
+    query->info->port = answer->rdata->u.srv.port;
+
+    // If this is our first answer, then set the GotSRV flag and start the address query
+    if (!query->GotSRV)
+    {
+        query->GotSRV             = mDNStrue;
+        query->qAv4.InterfaceID   = answer->InterfaceID;
+        AssignDomainName(&query->qAv4.qname, &answer->rdata->u.srv.target);
+        query->qAv6.InterfaceID   = answer->InterfaceID;
+        AssignDomainName(&query->qAv6.qname, &answer->rdata->u.srv.target);
+        mDNS_StartQuery(m, &query->qAv4);
+        // Only do the AAAA query if this machine actually has IPv6 active
+        if (MachineHasActiveIPv6(m)) mDNS_StartQuery(m, &query->qAv6);
+    }
+    // If this is not our first answer, only re-issue the address query if the target host name has changed
+    else if ((query->qAv4.InterfaceID != query->qSRV.InterfaceID && query->qAv4.InterfaceID != answer->InterfaceID) ||
+             !SameDomainName(&query->qAv4.qname, &answer->rdata->u.srv.target))
+    {
+        mDNS_StopQuery(m, &query->qAv4);
+        if (query->qAv6.ThisQInterval >= 0) mDNS_StopQuery(m, &query->qAv6);
+        if (SameDomainName(&query->qAv4.qname, &answer->rdata->u.srv.target) && !PortChanged)
+        {
+            // If we get here, it means:
+            // 1. This is not our first SRV answer
+            // 2. The interface ID is different, but the target host and port are the same
+            // This implies that we're seeing the exact same SRV record on more than one interface, so we should
+            // make our address queries at least as broad as the original SRV query so that we catch all the answers.
+            query->qAv4.InterfaceID = query->qSRV.InterfaceID;  // Will be mDNSInterface_Any, or a specific interface
+            query->qAv6.InterfaceID = query->qSRV.InterfaceID;
+        }
+        else
+        {
+            query->qAv4.InterfaceID   = answer->InterfaceID;
+            AssignDomainName(&query->qAv4.qname, &answer->rdata->u.srv.target);
+            query->qAv6.InterfaceID   = answer->InterfaceID;
+            AssignDomainName(&query->qAv6.qname, &answer->rdata->u.srv.target);
+        }
+        debugf("FoundServiceInfoSRV: Restarting address queries for %##s (%s)", query->qAv4.qname.c, DNSTypeName(query->qAv4.qtype));
+        mDNS_StartQuery(m, &query->qAv4);
+        // Only do the AAAA query if this machine actually has IPv6 active
+        if (MachineHasActiveIPv6(m)) mDNS_StartQuery(m, &query->qAv6);
+    }
+    else if (query->ServiceInfoQueryCallback && query->GotADD && query->GotTXT && PortChanged)
+    {
+        if (++query->Answers >= 100)
+            debugf("**** WARNING **** Have given %lu answers for %##s (SRV) %##s %u",
+                   query->Answers, query->qSRV.qname.c, answer->rdata->u.srv.target.c,
+                   mDNSVal16(answer->rdata->u.srv.port));
+        query->ServiceInfoQueryCallback(m, query);
+    }
+    // CAUTION: MUST NOT do anything more with query after calling query->Callback(), because the client's
+    // callback function is allowed to do anything, including deleting this query and freeing its memory.
+}
+
+mDNSlocal void FoundServiceInfoTXT(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    ServiceInfoQuery *query = (ServiceInfoQuery *)question->QuestionContext;
+    if (!AddRecord) return;
+    if (answer->rrtype != kDNSType_TXT) return;
+    if (answer->rdlength > sizeof(query->info->TXTinfo)) return;
+
+    query->GotTXT       = mDNStrue;
+    query->info->TXTlen = answer->rdlength;
+    query->info->TXTinfo[0] = 0;        // In case answer->rdlength is zero
+    mDNSPlatformMemCopy(query->info->TXTinfo, answer->rdata->u.txt.c, answer->rdlength);
+
+    verbosedebugf("FoundServiceInfoTXT: %##s GotADD=%d", query->info->name.c, query->GotADD);
+
+    // CAUTION: MUST NOT do anything more with query after calling query->Callback(), because the client's
+    // callback function is allowed to do anything, including deleting this query and freeing its memory.
+    if (query->ServiceInfoQueryCallback && query->GotADD)
+    {
+        if (++query->Answers >= 100)
+            debugf("**** WARNING **** have given %lu answers for %##s (TXT) %#s...",
+                   query->Answers, query->qSRV.qname.c, answer->rdata->u.txt.c);
+        query->ServiceInfoQueryCallback(m, query);
+    }
+}
+
+mDNSlocal void FoundServiceInfo(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    ServiceInfoQuery *query = (ServiceInfoQuery *)question->QuestionContext;
+    //LogInfo("FoundServiceInfo %d %s", AddRecord, RRDisplayString(m, answer));
+    if (!AddRecord) return;
+
+    if (answer->rrtype == kDNSType_A)
+    {
+        query->info->ip.type = mDNSAddrType_IPv4;
+        query->info->ip.ip.v4 = answer->rdata->u.ipv4;
+    }
+    else if (answer->rrtype == kDNSType_AAAA)
+    {
+        query->info->ip.type = mDNSAddrType_IPv6;
+        query->info->ip.ip.v6 = answer->rdata->u.ipv6;
+    }
+    else
+    {
+        debugf("FoundServiceInfo: answer %##s type %d (%s) unexpected", answer->name->c, answer->rrtype, DNSTypeName(answer->rrtype));
+        return;
+    }
+
+    query->GotADD = mDNStrue;
+    query->info->InterfaceID = answer->InterfaceID;
+
+    verbosedebugf("FoundServiceInfo v%ld: %##s GotTXT=%d", query->info->ip.type, query->info->name.c, query->GotTXT);
+
+    // CAUTION: MUST NOT do anything more with query after calling query->Callback(), because the client's
+    // callback function is allowed to do anything, including deleting this query and freeing its memory.
+    if (query->ServiceInfoQueryCallback && query->GotTXT)
+    {
+        if (++query->Answers >= 100)
+            debugf(answer->rrtype == kDNSType_A ?
+                   "**** WARNING **** have given %lu answers for %##s (A) %.4a" :
+                   "**** WARNING **** have given %lu answers for %##s (AAAA) %.16a",
+                   query->Answers, query->qSRV.qname.c, &answer->rdata->u.data);
+        query->ServiceInfoQueryCallback(m, query);
+    }
+}
+
+// On entry, the client must have set the name and InterfaceID fields of the ServiceInfo structure
+// If the query is not interface-specific, then InterfaceID may be zero
+// Each time the Callback is invoked, the remainder of the fields will have been filled in
+// In addition, InterfaceID will be updated to give the interface identifier corresponding to that response
+mDNSexport mStatus mDNS_StartResolveService(mDNS *const m,
+                                            ServiceInfoQuery *query, ServiceInfo *info, mDNSServiceInfoQueryCallback *Callback, void *Context)
+{
+    mStatus status;
+    mDNS_Lock(m);
+
+    query->qSRV.ThisQInterval       = -1;       // So that mDNS_StopResolveService() knows whether to cancel this question
+    query->qSRV.InterfaceID         = info->InterfaceID;
+    query->qSRV.flags               = 0;
+    query->qSRV.Target              = zeroAddr;
+    AssignDomainName(&query->qSRV.qname, &info->name);
+    query->qSRV.qtype               = kDNSType_SRV;
+    query->qSRV.qclass              = kDNSClass_IN;
+    query->qSRV.LongLived           = mDNSfalse;
+    query->qSRV.ExpectUnique        = mDNStrue;
+    query->qSRV.ForceMCast          = mDNSfalse;
+    query->qSRV.ReturnIntermed      = mDNSfalse;
+    query->qSRV.SuppressUnusable    = mDNSfalse;
+    query->qSRV.SearchListIndex     = 0;
+    query->qSRV.AppendSearchDomains = 0;
+    query->qSRV.RetryWithSearchDomains = mDNSfalse;
+    query->qSRV.TimeoutQuestion     = 0;
+    query->qSRV.WakeOnResolve       = 0;
+    query->qSRV.UseBackgroundTrafficClass = mDNSfalse;
+    query->qSRV.ValidationRequired  = 0;
+    query->qSRV.ValidatingResponse  = 0;
+    query->qSRV.ProxyQuestion       = 0;
+    query->qSRV.qnameOrig           = mDNSNULL;
+    query->qSRV.AnonInfo            = mDNSNULL;
+    query->qSRV.QuestionCallback    = FoundServiceInfoSRV;
+    query->qSRV.QuestionContext     = query;
+
+    query->qTXT.ThisQInterval       = -1;       // So that mDNS_StopResolveService() knows whether to cancel this question
+    query->qTXT.InterfaceID         = info->InterfaceID;
+    query->qTXT.flags               = 0;
+    query->qTXT.Target              = zeroAddr;
+    AssignDomainName(&query->qTXT.qname, &info->name);
+    query->qTXT.qtype               = kDNSType_TXT;
+    query->qTXT.qclass              = kDNSClass_IN;
+    query->qTXT.LongLived           = mDNSfalse;
+    query->qTXT.ExpectUnique        = mDNStrue;
+    query->qTXT.ForceMCast          = mDNSfalse;
+    query->qTXT.ReturnIntermed      = mDNSfalse;
+    query->qTXT.SuppressUnusable    = mDNSfalse;
+    query->qTXT.SearchListIndex     = 0;
+    query->qTXT.AppendSearchDomains = 0;
+    query->qTXT.RetryWithSearchDomains = mDNSfalse;
+    query->qTXT.TimeoutQuestion     = 0;
+    query->qTXT.WakeOnResolve       = 0;
+    query->qTXT.UseBackgroundTrafficClass = mDNSfalse;
+    query->qTXT.ValidationRequired  = 0;
+    query->qTXT.ValidatingResponse  = 0;
+    query->qTXT.ProxyQuestion       = 0;
+    query->qTXT.qnameOrig           = mDNSNULL;
+    query->qTXT.AnonInfo            = mDNSNULL;
+    query->qTXT.QuestionCallback    = FoundServiceInfoTXT;
+    query->qTXT.QuestionContext     = query;
+
+    query->qAv4.ThisQInterval       = -1;       // So that mDNS_StopResolveService() knows whether to cancel this question
+    query->qAv4.InterfaceID         = info->InterfaceID;
+    query->qAv4.flags               = 0;
+    query->qAv4.Target              = zeroAddr;
+    query->qAv4.qname.c[0]          = 0;
+    query->qAv4.qtype               = kDNSType_A;
+    query->qAv4.qclass              = kDNSClass_IN;
+    query->qAv4.LongLived           = mDNSfalse;
+    query->qAv4.ExpectUnique        = mDNStrue;
+    query->qAv4.ForceMCast          = mDNSfalse;
+    query->qAv4.ReturnIntermed      = mDNSfalse;
+    query->qAv4.SuppressUnusable    = mDNSfalse;
+    query->qAv4.SearchListIndex     = 0;
+    query->qAv4.AppendSearchDomains = 0;
+    query->qAv4.RetryWithSearchDomains = mDNSfalse;
+    query->qAv4.TimeoutQuestion     = 0;
+    query->qAv4.WakeOnResolve       = 0;
+    query->qAv4.UseBackgroundTrafficClass = mDNSfalse;
+    query->qAv4.ValidationRequired  = 0;
+    query->qAv4.ValidatingResponse  = 0;
+    query->qAv4.ProxyQuestion       = 0;
+    query->qAv4.qnameOrig           = mDNSNULL;
+    query->qAv4.AnonInfo            = mDNSNULL;
+    query->qAv4.QuestionCallback    = FoundServiceInfo;
+    query->qAv4.QuestionContext     = query;
+
+    query->qAv6.ThisQInterval       = -1;       // So that mDNS_StopResolveService() knows whether to cancel this question
+    query->qAv6.InterfaceID         = info->InterfaceID;
+    query->qAv6.flags               = 0;
+    query->qAv6.Target              = zeroAddr;
+    query->qAv6.qname.c[0]          = 0;
+    query->qAv6.qtype               = kDNSType_AAAA;
+    query->qAv6.qclass              = kDNSClass_IN;
+    query->qAv6.LongLived           = mDNSfalse;
+    query->qAv6.ExpectUnique        = mDNStrue;
+    query->qAv6.ForceMCast          = mDNSfalse;
+    query->qAv6.ReturnIntermed      = mDNSfalse;
+    query->qAv6.SuppressUnusable    = mDNSfalse;
+    query->qAv6.SearchListIndex     = 0;
+    query->qAv6.AppendSearchDomains = 0;
+    query->qAv6.RetryWithSearchDomains = mDNSfalse;
+    query->qAv6.TimeoutQuestion     = 0;
+    query->qAv6.UseBackgroundTrafficClass = mDNSfalse;
+    query->qAv6.ValidationRequired  = 0;
+    query->qAv6.ValidatingResponse  = 0;
+    query->qAv6.ProxyQuestion       = 0;
+    query->qAv6.qnameOrig           = mDNSNULL;
+    query->qAv6.AnonInfo            = mDNSNULL;
+    query->qAv6.QuestionCallback    = FoundServiceInfo;
+    query->qAv6.QuestionContext     = query;
+
+    query->GotSRV                   = mDNSfalse;
+    query->GotTXT                   = mDNSfalse;
+    query->GotADD                   = mDNSfalse;
+    query->Answers                  = 0;
+
+    query->info                     = info;
+    query->ServiceInfoQueryCallback = Callback;
+    query->ServiceInfoQueryContext  = Context;
+
+//	info->name      = Must already be set up by client
+//	info->interface = Must already be set up by client
+    info->ip        = zeroAddr;
+    info->port      = zeroIPPort;
+    info->TXTlen    = 0;
+
+    // We use mDNS_StartQuery_internal here because we're already holding the lock
+    status = mDNS_StartQuery_internal(m, &query->qSRV);
+    if (status == mStatus_NoError) status = mDNS_StartQuery_internal(m, &query->qTXT);
+    if (status != mStatus_NoError) mDNS_StopResolveService(m, query);
+
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport void    mDNS_StopResolveService (mDNS *const m, ServiceInfoQuery *q)
+{
+    mDNS_Lock(m);
+    // We use mDNS_StopQuery_internal here because we're already holding the lock
+    if (q->qSRV.ThisQInterval >= 0) mDNS_StopQuery_internal(m, &q->qSRV);
+    if (q->qTXT.ThisQInterval >= 0) mDNS_StopQuery_internal(m, &q->qTXT);
+    if (q->qAv4.ThisQInterval >= 0) mDNS_StopQuery_internal(m, &q->qAv4);
+    if (q->qAv6.ThisQInterval >= 0) mDNS_StopQuery_internal(m, &q->qAv6);
+    mDNS_Unlock(m);
+}
+
+mDNSexport mStatus mDNS_GetDomains(mDNS *const m, DNSQuestion *const question, mDNS_DomainType DomainType, const domainname *dom,
+                                   const mDNSInterfaceID InterfaceID, mDNSQuestionCallback *Callback, void *Context)
+{
+    question->InterfaceID      = InterfaceID;
+    question->flags            = 0;
+    question->Target           = zeroAddr;
+    question->qtype            = kDNSType_PTR;
+    question->qclass           = kDNSClass_IN;
+    question->LongLived        = mDNSfalse;
+    question->ExpectUnique     = mDNSfalse;
+    question->ForceMCast       = mDNSfalse;
+    question->ReturnIntermed   = mDNSfalse;
+    question->SuppressUnusable = mDNSfalse;
+    question->SearchListIndex  = 0;
+    question->AppendSearchDomains = 0;
+    question->RetryWithSearchDomains = mDNSfalse;
+    question->TimeoutQuestion  = 0;
+    question->WakeOnResolve    = 0;
+    question->UseBackgroundTrafficClass = mDNSfalse;
+    question->ValidationRequired = 0;
+    question->ValidatingResponse = 0;
+    question->ProxyQuestion    = 0;
+    question->qnameOrig        = mDNSNULL;
+    question->AnonInfo         = mDNSNULL;
+    question->pid              = mDNSPlatformGetPID();
+    question->QuestionCallback = Callback;
+    question->QuestionContext  = Context;
+    if (DomainType > mDNS_DomainTypeMax) return(mStatus_BadParamErr);
+    if (!MakeDomainNameFromDNSNameString(&question->qname, mDNS_DomainTypeNames[DomainType])) return(mStatus_BadParamErr);
+    if (!dom) dom = &localdomain;
+    if (!AppendDomainName(&question->qname, dom)) return(mStatus_BadParamErr);
+    return(mDNS_StartQuery(m, question));
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Responder Functions
+#endif
+
+mDNSexport mStatus mDNS_Register(mDNS *const m, AuthRecord *const rr)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_Register_internal(m, rr);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_Update(mDNS *const m, AuthRecord *const rr, mDNSu32 newttl,
+                               const mDNSu16 newrdlength, RData *const newrdata, mDNSRecordUpdateCallback *Callback)
+{
+    if (!ValidateRData(rr->resrec.rrtype, newrdlength, newrdata))
+    {
+        LogMsg("Attempt to update record with invalid rdata: %s", GetRRDisplayString_rdb(&rr->resrec, &newrdata->u, m->MsgBuffer));
+        return(mStatus_Invalid);
+    }
+
+    mDNS_Lock(m);
+
+    // If TTL is unspecified, leave TTL unchanged
+    if (newttl == 0) newttl = rr->resrec.rroriginalttl;
+
+    // If we already have an update queued up which has not gone through yet, give the client a chance to free that memory
+    if (rr->NewRData)
+    {
+        RData *n = rr->NewRData;
+        rr->NewRData = mDNSNULL;                            // Clear the NewRData pointer ...
+        if (rr->UpdateCallback)
+            rr->UpdateCallback(m, rr, n, rr->newrdlength);  // ...and let the client free this memory, if necessary
+    }
+
+    rr->NewRData             = newrdata;
+    rr->newrdlength          = newrdlength;
+    rr->UpdateCallback       = Callback;
+
+#ifndef UNICAST_DISABLED
+    if (rr->ARType != AuthRecordLocalOnly && rr->ARType != AuthRecordP2P && !IsLocalDomain(rr->resrec.name))
+    {
+        mStatus status = uDNS_UpdateRecord(m, rr);
+        // The caller frees the memory on error, don't retain stale pointers
+        if (status != mStatus_NoError) { rr->NewRData = mDNSNULL; rr->newrdlength = 0; }
+        mDNS_Unlock(m);
+        return(status);
+    }
+#endif
+
+    if (RRLocalOnly(rr) || (rr->resrec.rroriginalttl == newttl &&
+                            rr->resrec.rdlength == newrdlength && mDNSPlatformMemSame(rr->resrec.rdata->u.data, newrdata->u.data, newrdlength)))
+        CompleteRDataUpdate(m, rr);
+    else
+    {
+        rr->AnnounceCount = InitialAnnounceCount;
+        InitializeLastAPTime(m, rr);
+        while (rr->NextUpdateCredit && m->timenow - rr->NextUpdateCredit >= 0) GrantUpdateCredit(rr);
+        if (!rr->UpdateBlocked && rr->UpdateCredits) rr->UpdateCredits--;
+        if (!rr->NextUpdateCredit) rr->NextUpdateCredit = NonZeroTime(m->timenow + kUpdateCreditRefreshInterval);
+        if (rr->AnnounceCount > rr->UpdateCredits + 1) rr->AnnounceCount = (mDNSu8)(rr->UpdateCredits + 1);
+        if (rr->UpdateCredits <= 5)
+        {
+            mDNSu32 delay = 6 - rr->UpdateCredits;      // Delay 1 second, then 2, then 3, etc. up to 6 seconds maximum
+            if (!rr->UpdateBlocked) rr->UpdateBlocked = NonZeroTime(m->timenow + (mDNSs32)delay * mDNSPlatformOneSecond);
+            rr->ThisAPInterval *= 4;
+            rr->LastAPTime = rr->UpdateBlocked - rr->ThisAPInterval;
+            LogMsg("Excessive update rate for %##s; delaying announcement by %ld second%s",
+                   rr->resrec.name->c, delay, delay > 1 ? "s" : "");
+        }
+        rr->resrec.rroriginalttl = newttl;
+    }
+
+    mDNS_Unlock(m);
+    return(mStatus_NoError);
+}
+
+// Note: mDNS_Deregister calls mDNS_Deregister_internal which can call a user callback, which may change
+// the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSexport mStatus mDNS_Deregister(mDNS *const m, AuthRecord *const rr)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+// Circular reference: AdvertiseInterface references mDNS_HostNameCallback, which calls mDNS_SetFQDN, which call AdvertiseInterface
+mDNSlocal void mDNS_HostNameCallback(mDNS *const m, AuthRecord *const rr, mStatus result);
+
+mDNSlocal NetworkInterfaceInfo *FindFirstAdvertisedInterface(mDNS *const m)
+{
+    NetworkInterfaceInfo *intf;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+        if (intf->Advertise) break;
+    return(intf);
+}
+
+mDNSlocal void AdvertiseInterface(mDNS *const m, NetworkInterfaceInfo *set)
+{
+    char buffer[MAX_REVERSE_MAPPING_NAME];
+    NetworkInterfaceInfo *primary;
+
+    if (!set->McastTxRx)
+    {
+        LogInfo("AdvertiseInterface: Returning, not multicast capable %s", set->ifname);
+        return;
+    }
+#if TARGET_OS_EMBEDDED
+    if (!m->AutoTargetServices)
+    {
+        LogInfo("AdvertiseInterface: Returning due to AutoTargetServices zero for %s", set->ifname);
+        return;
+    }
+#endif
+
+    primary = FindFirstAdvertisedInterface(m);
+    if (!primary) primary = set; // If no existing advertised interface, this new NetworkInterfaceInfo becomes our new primary
+
+    // If interface is marked as a direct link, we can assume the address record is unique
+    // and does not need to go through the probe phase of the probe/announce packet sequence.
+    mDNSu8 recordType = (set->DirectLink ? kDNSRecordTypeKnownUnique : kDNSRecordTypeUnique);
+
+    if (set->DirectLink)
+        LogInfo("AdvertiseInterface: Marking address record as kDNSRecordTypeKnownUnique for %s", set->ifname);
+
+    // Send dynamic update for non-linklocal IPv4 Addresses
+    mDNS_SetupResourceRecord(&set->RR_A,     mDNSNULL, set->InterfaceID, kDNSType_A,     kHostNameTTL, recordType,      AuthRecordAny, mDNS_HostNameCallback, set);
+    mDNS_SetupResourceRecord(&set->RR_PTR,   mDNSNULL, set->InterfaceID, kDNSType_PTR,   kHostNameTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    mDNS_SetupResourceRecord(&set->RR_HINFO, mDNSNULL, set->InterfaceID, kDNSType_HINFO, kHostNameTTL, kDNSRecordTypeUnique,      AuthRecordAny, mDNSNULL, mDNSNULL);
+
+#if ANSWER_REMOTE_HOSTNAME_QUERIES
+    set->RR_A.AllowRemoteQuery  = mDNStrue;
+    set->RR_PTR.AllowRemoteQuery  = mDNStrue;
+    set->RR_HINFO.AllowRemoteQuery  = mDNStrue;
+#endif
+    // 1. Set up Address record to map from host name ("foo.local.") to IP address
+    // 2. Set up reverse-lookup PTR record to map from our address back to our host name
+    AssignDomainName(&set->RR_A.namestorage, &m->MulticastHostname);
+    if (set->ip.type == mDNSAddrType_IPv4)
+    {
+        set->RR_A.resrec.rrtype = kDNSType_A;
+        set->RR_A.resrec.rdata->u.ipv4 = set->ip.ip.v4;
+        // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+        mDNS_snprintf(buffer, sizeof(buffer), "%d.%d.%d.%d.in-addr.arpa.",
+                      set->ip.ip.v4.b[3], set->ip.ip.v4.b[2], set->ip.ip.v4.b[1], set->ip.ip.v4.b[0]);
+    }
+    else if (set->ip.type == mDNSAddrType_IPv6)
+    {
+        int i;
+        set->RR_A.resrec.rrtype = kDNSType_AAAA;
+        set->RR_A.resrec.rdata->u.ipv6 = set->ip.ip.v6;
+        for (i = 0; i < 16; i++)
+        {
+            static const char hexValues[] = "0123456789ABCDEF";
+            buffer[i * 4    ] = hexValues[set->ip.ip.v6.b[15 - i] & 0x0F];
+            buffer[i * 4 + 1] = '.';
+            buffer[i * 4 + 2] = hexValues[set->ip.ip.v6.b[15 - i] >> 4];
+            buffer[i * 4 + 3] = '.';
+        }
+        mDNS_snprintf(&buffer[64], sizeof(buffer)-64, "ip6.arpa.");
+    }
+
+    MakeDomainNameFromDNSNameString(&set->RR_PTR.namestorage, buffer);
+    set->RR_PTR.AutoTarget = Target_AutoHost;   // Tell mDNS that the target of this PTR is to be kept in sync with our host name
+    set->RR_PTR.ForceMCast = mDNStrue;          // This PTR points to our dot-local name, so don't ever try to write it into a uDNS server
+
+    set->RR_A.RRSet = &primary->RR_A;           // May refer to self
+
+    mDNS_Register_internal(m, &set->RR_A);
+    mDNS_Register_internal(m, &set->RR_PTR);
+
+#if APPLE_OSX_mDNSResponder
+    // must be after the mDNS_Register_internal() calls so that records have complete rdata fields, etc
+    D2D_start_advertising_interface(set);
+#endif // APPLE_OSX_mDNSResponder
+
+    if (!NO_HINFO && m->HIHardware.c[0] > 0 && m->HISoftware.c[0] > 0 && m->HIHardware.c[0] + m->HISoftware.c[0] <= 254)
+    {
+        mDNSu8 *p = set->RR_HINFO.resrec.rdata->u.data;
+        AssignDomainName(&set->RR_HINFO.namestorage, &m->MulticastHostname);
+        set->RR_HINFO.DependentOn = &set->RR_A;
+        mDNSPlatformMemCopy(p, &m->HIHardware, 1 + (mDNSu32)m->HIHardware.c[0]);
+        p += 1 + (int)p[0];
+        mDNSPlatformMemCopy(p, &m->HISoftware, 1 + (mDNSu32)m->HISoftware.c[0]);
+        mDNS_Register_internal(m, &set->RR_HINFO);
+    }
+    else
+    {
+        debugf("Not creating HINFO record: platform support layer provided no information");
+        set->RR_HINFO.resrec.RecordType = kDNSRecordTypeUnregistered;
+    }
+}
+
+mDNSlocal void DeadvertiseInterface(mDNS *const m, NetworkInterfaceInfo *set)
+{
+    NetworkInterfaceInfo *intf;
+
+    // If we still have address records referring to this one, update them
+    NetworkInterfaceInfo *primary = FindFirstAdvertisedInterface(m);
+    AuthRecord *A = primary ? &primary->RR_A : mDNSNULL;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+        if (intf->RR_A.RRSet == &set->RR_A)
+            intf->RR_A.RRSet = A;
+
+    // Unregister these records.
+    // When doing the mDNS_Exit processing, we first call DeadvertiseInterface for each interface, so by the time the platform
+    // support layer gets to call mDNS_DeregisterInterface, the address and PTR records have already been deregistered for it.
+    // Also, in the event of a name conflict, one or more of our records will have been forcibly deregistered.
+    // To avoid unnecessary and misleading warning messages, we check the RecordType before calling mDNS_Deregister_internal().
+    if (set->RR_A.resrec.RecordType) mDNS_Deregister_internal(m, &set->RR_A,     mDNS_Dereg_normal);
+    if (set->RR_PTR.resrec.RecordType) mDNS_Deregister_internal(m, &set->RR_PTR,   mDNS_Dereg_normal);
+    if (set->RR_HINFO.resrec.RecordType) mDNS_Deregister_internal(m, &set->RR_HINFO, mDNS_Dereg_normal);
+
+#if APPLE_OSX_mDNSResponder
+    D2D_stop_advertising_interface(set);
+#endif // APPLE_OSX_mDNSResponder
+
+}
+
+mDNSlocal void AdvertiseAllInterfaceRecords(mDNS *const m)
+{
+    NetworkInterfaceInfo *intf;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+    {
+        if (intf->Advertise)
+        {
+            LogInfo("AdvertiseInterface: Advertising for ifname %s", intf->ifname);
+            AdvertiseInterface(m, intf);
+        }
+    }
+}
+
+mDNSlocal void DeadvertiseAllInterfaceRecords(mDNS *const m)
+{
+#if TARGET_OS_EMBEDDED
+    NetworkInterfaceInfo *intf;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+    {
+        if (intf->Advertise)
+        {
+            LogInfo("DeadvertiseInterface: Deadvertising for ifname %s", intf->ifname);
+            DeadvertiseInterface(m, intf);
+        }
+    }
+#else
+    (void) m; //unused
+#endif
+}
+
+mDNSexport void mDNS_SetFQDN(mDNS *const m)
+{
+    domainname newmname;
+    NetworkInterfaceInfo *intf;
+    AuthRecord *rr;
+    newmname.c[0] = 0;
+
+    if (!AppendDomainLabel(&newmname, &m->hostlabel))  { LogMsg("ERROR: mDNS_SetFQDN: Cannot create MulticastHostname"); return; }
+    if (!AppendLiteralLabelString(&newmname, "local")) { LogMsg("ERROR: mDNS_SetFQDN: Cannot create MulticastHostname"); return; }
+
+    mDNS_Lock(m);
+
+    if (SameDomainNameCS(&m->MulticastHostname, &newmname)) debugf("mDNS_SetFQDN - hostname unchanged");
+    else
+    {
+        AssignDomainName(&m->MulticastHostname, &newmname);
+
+        // 1. Stop advertising our address records on all interfaces
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+            if (intf->Advertise) DeadvertiseInterface(m, intf);
+
+        // 2. Start advertising our address records using the new name
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+            if (intf->Advertise) AdvertiseInterface(m, intf);
+    }
+
+    // 3. Make sure that any AutoTarget SRV records (and the like) get updated
+    for (rr = m->ResourceRecords;  rr; rr=rr->next) if (rr->AutoTarget) SetTargetToHostName(m, rr);
+    for (rr = m->DuplicateRecords; rr; rr=rr->next) if (rr->AutoTarget) SetTargetToHostName(m, rr);
+
+    mDNS_Unlock(m);
+}
+
+mDNSlocal void mDNS_HostNameCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)rr;   // Unused parameter
+
+    #if MDNS_DEBUGMSGS
+    {
+        char *msg = "Unknown result";
+        if      (result == mStatus_NoError) msg = "Name registered";
+        else if (result == mStatus_NameConflict) msg = "Name conflict";
+        debugf("mDNS_HostNameCallback: %##s (%s) %s (%ld)", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), msg, result);
+    }
+    #endif
+
+    if (result == mStatus_NoError)
+    {
+        // Notify the client that the host name is successfully registered
+        if (m->MainCallback)
+            m->MainCallback(m, mStatus_NoError);
+    }
+    else if (result == mStatus_NameConflict)
+    {
+        domainlabel oldlabel = m->hostlabel;
+
+        // 1. First give the client callback a chance to pick a new name
+        if (m->MainCallback)
+            m->MainCallback(m, mStatus_NameConflict);
+
+        // 2. If the client callback didn't do it, add (or increment) an index ourselves
+        // This needs to be case-INSENSITIVE compare, because we need to know that the name has been changed so as to
+        // remedy the conflict, and a name that differs only in capitalization will just suffer the exact same conflict again.
+        if (SameDomainLabel(m->hostlabel.c, oldlabel.c))
+            IncrementLabelSuffix(&m->hostlabel, mDNSfalse);
+
+        // 3. Generate the FQDNs from the hostlabel,
+        // and make sure all SRV records, etc., are updated to reference our new hostname
+        mDNS_SetFQDN(m);
+        LogMsg("Local Hostname %#s.local already in use; will try %#s.local instead", oldlabel.c, m->hostlabel.c);
+    }
+    else if (result == mStatus_MemFree)
+    {
+        // .local hostnames do not require goodbyes - we ignore the MemFree (which is sent directly by
+        // mDNS_Deregister_internal), and allow the caller to deallocate immediately following mDNS_DeadvertiseInterface
+        debugf("mDNS_HostNameCallback: MemFree (ignored)");
+    }
+    else
+        LogMsg("mDNS_HostNameCallback: Unknown error %d for registration of record %s", result,  rr->resrec.name->c);
+}
+
+mDNSlocal void UpdateInterfaceProtocols(mDNS *const m, NetworkInterfaceInfo *active)
+{
+    NetworkInterfaceInfo *intf;
+    active->IPv4Available = mDNSfalse;
+    active->IPv6Available = mDNSfalse;
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+        if (intf->InterfaceID == active->InterfaceID)
+        {
+            if (intf->ip.type == mDNSAddrType_IPv4 && intf->McastTxRx) active->IPv4Available = mDNStrue;
+            if (intf->ip.type == mDNSAddrType_IPv6 && intf->McastTxRx) active->IPv6Available = mDNStrue;
+        }
+}
+
+mDNSlocal void RestartRecordGetZoneData(mDNS * const m)
+{
+    AuthRecord *rr;
+    LogInfo("RestartRecordGetZoneData: ResourceRecords");
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (AuthRecord_uDNS(rr) && rr->state != regState_NoTarget)
+        {
+            debugf("RestartRecordGetZoneData: StartGetZoneData for %##s", rr->resrec.name->c);
+            // Zero out the updateid so that if we have a pending response from the server, it won't
+            // be accepted as a valid response. If we accept the response, we might free the new "nta"
+            if (rr->nta) { rr->updateid = zeroID; CancelGetZoneData(m, rr->nta); }
+            rr->nta = StartGetZoneData(m, rr->resrec.name, ZoneServiceUpdate, RecordRegistrationGotZoneData, rr);
+        }
+}
+
+mDNSlocal void InitializeNetWakeState(mDNS *const m, NetworkInterfaceInfo *set)
+{
+    int i;
+    // We initialize ThisQInterval to -1 indicating that the question has not been started
+    // yet. If the question (browse) is started later during interface registration, it will
+    // be stopped during interface deregistration. We can't sanity check to see if the
+    // question has been stopped or not before initializing it to -1 because we need to
+    // initialize it to -1 the very first time.
+    
+    set->NetWakeBrowse.ThisQInterval = -1;
+    for (i=0; i<3; i++)
+    {
+        set->NetWakeResolve[i].ThisQInterval = -1;
+        set->SPSAddr[i].type = mDNSAddrType_None;
+    }
+    set->NextSPSAttempt     = -1;
+    set->NextSPSAttemptTime = m->timenow;
+}
+
+mDNSexport void mDNS_ActivateNetWake_internal(mDNS *const m, NetworkInterfaceInfo *set)
+{
+    NetworkInterfaceInfo *p = m->HostInterfaces;
+    while (p && p != set) p=p->next;
+    if (!p) { LogMsg("mDNS_ActivateNetWake_internal: NetworkInterfaceInfo %p not found in active list", set); return; }
+
+    if (set->InterfaceActive)
+    {
+        LogSPS("ActivateNetWake for %s (%#a)", set->ifname, &set->ip);
+        mDNS_StartBrowse_internal(m, &set->NetWakeBrowse, &SleepProxyServiceType, &localdomain, mDNSNULL, set->InterfaceID, 0, mDNSfalse, mDNSfalse, m->SPSBrowseCallback, set);
+    }
+}
+
+mDNSexport void mDNS_DeactivateNetWake_internal(mDNS *const m, NetworkInterfaceInfo *set)
+{
+    NetworkInterfaceInfo *p = m->HostInterfaces;
+    while (p && p != set) p=p->next;
+    if (!p) { LogMsg("mDNS_DeactivateNetWake_internal: NetworkInterfaceInfo %p not found in active list", set); return; }
+
+    // Note: We start the browse only if the interface is NetWake capable and we use this to
+    // stop the resolves also. Hence, the resolves should not be started without the browse
+    // being started i.e, resolves should not happen unless NetWake capable which is
+    // guaranteed by BeginSleepProcessing.
+    if (set->NetWakeBrowse.ThisQInterval >= 0)
+    {
+        int i;
+        LogSPS("DeactivateNetWake for %s (%#a)", set->ifname, &set->ip);
+
+        // Stop our browse and resolve operations
+        mDNS_StopQuery_internal(m, &set->NetWakeBrowse);
+        for (i=0; i<3; i++) if (set->NetWakeResolve[i].ThisQInterval >= 0) mDNS_StopQuery_internal(m, &set->NetWakeResolve[i]);
+
+        // Make special call to the browse callback to let it know it can to remove all records for this interface
+        if (m->SPSBrowseCallback)
+        {
+            mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+            m->SPSBrowseCallback(m, &set->NetWakeBrowse, mDNSNULL, mDNSfalse);
+            mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        }
+
+        // Reset our variables back to initial state, so we're ready for when NetWake is turned back on
+        // (includes resetting NetWakeBrowse.ThisQInterval back to -1)
+        InitializeNetWakeState(m, set);
+    }
+}
+
+mDNSexport mStatus mDNS_RegisterInterface(mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping)
+{
+    AuthRecord *rr;
+    mDNSBool FirstOfType = mDNStrue;
+    NetworkInterfaceInfo **p = &m->HostInterfaces;
+
+    if (!set->InterfaceID)
+    { LogMsg("mDNS_RegisterInterface: Error! Tried to register a NetworkInterfaceInfo %#a with zero InterfaceID", &set->ip); return(mStatus_Invalid); }
+
+    if (!mDNSAddressIsValidNonZero(&set->mask))
+    { LogMsg("mDNS_RegisterInterface: Error! Tried to register a NetworkInterfaceInfo %#a with invalid mask %#a", &set->ip, &set->mask); return(mStatus_Invalid); }
+
+    mDNS_Lock(m);
+
+    // Assume this interface will be active now, unless we find a duplicate already in the list
+    set->InterfaceActive = mDNStrue;
+    set->IPv4Available   = (mDNSu8)(set->ip.type == mDNSAddrType_IPv4 && set->McastTxRx);
+    set->IPv6Available   = (mDNSu8)(set->ip.type == mDNSAddrType_IPv6 && set->McastTxRx);
+
+    InitializeNetWakeState(m, set);
+
+    // Scan list to see if this InterfaceID is already represented
+    while (*p)
+    {
+        if (*p == set)
+        {
+            LogMsg("mDNS_RegisterInterface: Error! Tried to register a NetworkInterfaceInfo that's already in the list");
+            mDNS_Unlock(m);
+            return(mStatus_AlreadyRegistered);
+        }
+
+        if ((*p)->InterfaceID == set->InterfaceID)
+        {
+            // This InterfaceID already represented by a different interface in the list, so mark this instance inactive for now
+            set->InterfaceActive = mDNSfalse;
+            if (set->ip.type == (*p)->ip.type) FirstOfType = mDNSfalse;
+            if (set->ip.type == mDNSAddrType_IPv4 && set->McastTxRx) (*p)->IPv4Available = mDNStrue;
+            if (set->ip.type == mDNSAddrType_IPv6 && set->McastTxRx) (*p)->IPv6Available = mDNStrue;
+        }
+
+        p=&(*p)->next;
+    }
+
+    set->next = mDNSNULL;
+    *p = set;
+
+    if (set->Advertise)
+        AdvertiseInterface(m, set);
+
+    LogInfo("mDNS_RegisterInterface: InterfaceID %p %s (%#a) %s", set->InterfaceID, set->ifname, &set->ip,
+            set->InterfaceActive ?
+            "not represented in list; marking active and retriggering queries" :
+            "already represented in list; marking inactive for now");
+
+    if (set->NetWake) mDNS_ActivateNetWake_internal(m, set);
+
+    // In early versions of OS X the IPv6 address remains on an interface even when the interface is turned off,
+    // giving the false impression that there's an active representative of this interface when there really isn't.
+    // Therefore, when registering an interface, we want to re-trigger our questions and re-probe our Resource Records,
+    // even if we believe that we previously had an active representative of this interface.
+    if (set->McastTxRx && (FirstOfType || set->InterfaceActive))
+    {
+        DNSQuestion *q;
+        // Normally, after an interface comes up, we pause half a second before beginning probing.
+        // This is to guard against cases where there's rapid interface changes, where we could be confused by
+        // seeing packets we ourselves sent just moments ago (perhaps when this interface had a different address)
+        // which are then echoed back after a short delay by some Ethernet switches and some 802.11 base stations.
+        // We don't want to do a probe, and then see a stale echo of an announcement we ourselves sent,
+        // and think it's a conflicting answer to our probe.
+        // In the case of a flapping interface, we pause for five seconds, and reduce the announcement count to one packet.
+        const mDNSs32 probedelay  = flapping ? mDNSPlatformOneSecond * 5 : mDNSPlatformOneSecond / 2;
+        const mDNSu8 numannounce = flapping ? (mDNSu8)1                 : InitialAnnounceCount;
+
+        // Use a small amount of randomness:
+        // In the case of a network administrator turning on an Ethernet hub so that all the
+        // connected machines establish link at exactly the same time, we don't want them all
+        // to go and hit the network with identical queries at exactly the same moment.
+        // We set a random delay of up to InitialQuestionInterval (1/3 second).
+        // We must *never* set m->SuppressSending to more than that (or set it repeatedly in a way
+        // that causes mDNSResponder to remain in a prolonged state of SuppressSending, because
+        // suppressing packet sending for more than about 1/3 second can cause protocol correctness
+        // to start to break down (e.g. we don't answer probes fast enough, and get name conflicts).
+        // See <rdar://problem/4073853> mDNS: m->SuppressSending set too enthusiastically
+        if (!m->SuppressSending) m->SuppressSending = m->timenow + (mDNSs32)mDNSRandom((mDNSu32)InitialQuestionInterval);
+
+        if (flapping)
+        {
+            LogMsg("mDNS_RegisterInterface: Frequent transitions for interface %s (%#a)", set->ifname, &set->ip);
+            m->mDNSStats.InterfaceUpFlap++;
+        }
+
+        LogInfo("mDNS_RegisterInterface: %s (%#a) probedelay %d", set->ifname, &set->ip, probedelay);
+        if (m->SuppressProbes == 0 ||
+            m->SuppressProbes - NonZeroTime(m->timenow + probedelay) < 0)
+            m->SuppressProbes = NonZeroTime(m->timenow + probedelay);
+
+        // Include OWNER option in packets for 60 seconds after connecting to the network. Setting
+        // it here also handles the wake up case as the network link comes UP after waking causing
+        // us to reconnect to the network. If we do this as part of the wake up code, it is possible
+        // that the network link comes UP after 60 seconds and we never set the OWNER option
+        m->AnnounceOwner = NonZeroTime(m->timenow + 60 * mDNSPlatformOneSecond);
+        LogInfo("mDNS_RegisterInterface: Setting AnnounceOwner");
+
+        m->mDNSStats.InterfaceUp++;
+        for (q = m->Questions; q; q=q->next)                                // Scan our list of questions
+        {
+            if (mDNSOpaque16IsZero(q->TargetQID))
+            {
+                if (!q->InterfaceID || q->InterfaceID == set->InterfaceID)      // If non-specific Q, or Q on this specific interface,
+                {                                                               // then reactivate this question
+                    // If flapping, delay between first and second queries is nine seconds instead of one second
+                    mDNSBool dodelay = flapping && (q->FlappingInterface1 == set->InterfaceID || q->FlappingInterface2 == set->InterfaceID);
+                    mDNSs32 initial  = dodelay ? InitialQuestionInterval * QuestionIntervalStep2 : InitialQuestionInterval;
+                    mDNSs32 qdelay   = dodelay ? mDNSPlatformOneSecond * 5 : 0;
+                    if (dodelay) LogInfo("No cache records expired for %##s (%s); okay to delay questions a little", q->qname.c, DNSTypeName(q->qtype));
+
+                    if (!q->ThisQInterval || q->ThisQInterval > initial)
+                    {
+                        q->ThisQInterval = initial;
+
+#if mDNS_REQUEST_UNICAST_RESPONSE
+                        q->RequestUnicast = SET_QU_IN_FIRST_FOUR_QUERIES;
+#else   // mDNS_REQUEST_UNICAST_RESPONSE
+                        q->RequestUnicast = SET_QU_IN_FIRST_QUERY;
+#endif  // mDNS_REQUEST_UNICAST_RESPONSE
+
+                    }
+                    q->LastQTime = m->timenow - q->ThisQInterval + qdelay;
+                    q->RecentAnswerPkts = 0;
+                    // Change the salt
+                    ReInitAnonInfo(&q->AnonInfo, &q->qname);
+                    SetNextQueryTime(m,q);
+                }
+            }
+        }
+
+        // For all our non-specific authoritative resource records (and any dormant records specific to this interface)
+        // we now need them to re-probe if necessary, and then re-announce.
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+        {
+            if (!rr->resrec.InterfaceID || rr->resrec.InterfaceID == set->InterfaceID)
+            {
+                // Change the salt
+                ReInitAnonInfo(&rr->resrec.AnonInfo, rr->resrec.name);
+                mDNSCoreRestartRegistration(m, rr, numannounce);
+            }
+        }
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_IPHONE
+        DNSSECProbe(m);
+#endif
+    }
+
+    RestartRecordGetZoneData(m);
+
+    mDNS_UpdateAllowSleep(m);
+
+    mDNS_Unlock(m);
+    return(mStatus_NoError);
+}
+
+// Note: mDNS_DeregisterInterface calls mDNS_Deregister_internal which can call a user callback, which may change
+// the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSexport void mDNS_DeregisterInterface(mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping)
+{
+    NetworkInterfaceInfo **p = &m->HostInterfaces;
+    mDNSBool revalidate = mDNSfalse;
+
+    mDNS_Lock(m);
+
+    // Find this record in our list
+    while (*p && *p != set) p=&(*p)->next;
+    if (!*p) { debugf("mDNS_DeregisterInterface: NetworkInterfaceInfo not found in list"); mDNS_Unlock(m); return; }
+
+    mDNS_DeactivateNetWake_internal(m, set);
+
+    // Unlink this record from our list
+    *p = (*p)->next;
+    set->next = mDNSNULL;
+
+    if (!set->InterfaceActive)
+    {
+        // If this interface not the active member of its set, update the v4/v6Available flags for the active member
+        NetworkInterfaceInfo *intf;
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+            if (intf->InterfaceActive && intf->InterfaceID == set->InterfaceID)
+                UpdateInterfaceProtocols(m, intf);
+    }
+    else
+    {
+        NetworkInterfaceInfo *intf = FirstInterfaceForID(m, set->InterfaceID);
+        if (intf)
+        {
+            LogInfo("mDNS_DeregisterInterface: Another representative of InterfaceID %p %s (%#a) exists;"
+                    " making it active", set->InterfaceID, set->ifname, &set->ip);
+            if (intf->InterfaceActive)
+                LogMsg("mDNS_DeregisterInterface: ERROR intf->InterfaceActive already set for %s (%#a)", set->ifname, &set->ip);
+            intf->InterfaceActive = mDNStrue;
+            UpdateInterfaceProtocols(m, intf);
+
+            if (intf->NetWake) mDNS_ActivateNetWake_internal(m, intf);
+
+            // See if another representative *of the same type* exists. If not, we mave have gone from
+            // dual-stack to v6-only (or v4-only) so we need to reconfirm which records are still valid.
+            for (intf = m->HostInterfaces; intf; intf = intf->next)
+                if (intf->InterfaceID == set->InterfaceID && intf->ip.type == set->ip.type)
+                    break;
+            if (!intf) revalidate = mDNStrue;
+        }
+        else
+        {
+            mDNSu32 slot;
+            CacheGroup *cg;
+            CacheRecord *rr;
+            DNSQuestion *q;
+
+            LogInfo("mDNS_DeregisterInterface: Last representative of InterfaceID %p %s (%#a) deregistered;"
+                    " marking questions etc. dormant", set->InterfaceID, set->ifname, &set->ip);
+
+            m->mDNSStats.InterfaceDown++;
+
+            if (set->McastTxRx && flapping)
+            {
+                LogMsg("DeregisterInterface: Frequent transitions for interface %s (%#a)", set->ifname, &set->ip);
+                m->mDNSStats.InterfaceDownFlap++;
+            }
+
+            // 1. Deactivate any questions specific to this interface, and tag appropriate questions
+            // so that mDNS_RegisterInterface() knows how swiftly it needs to reactivate them
+            for (q = m->Questions; q; q=q->next)
+            {
+                if (q->InterfaceID == set->InterfaceID) q->ThisQInterval = 0;
+                if (!q->InterfaceID || q->InterfaceID == set->InterfaceID)
+                {
+                    q->FlappingInterface2 = q->FlappingInterface1;
+                    q->FlappingInterface1 = set->InterfaceID;       // Keep history of the last two interfaces to go away
+                }
+            }
+
+            // 2. Flush any cache records received on this interface
+            revalidate = mDNSfalse;     // Don't revalidate if we're flushing the records
+            FORALL_CACHERECORDS(slot, cg, rr)
+            {
+                if (rr->resrec.InterfaceID == set->InterfaceID)
+                {
+                    // If this interface is deemed flapping,
+                    // postpone deleting the cache records in case the interface comes back again
+                    if (set->McastTxRx && flapping)
+                    {
+                        // For a flapping interface we want these record to go away after 30 seconds
+                        mDNS_Reconfirm_internal(m, rr, kDefaultReconfirmTimeForFlappingInterface);
+                        // We set UnansweredQueries = MaxUnansweredQueries so we don't waste time doing any queries for them --
+                        // if the interface does come back, any relevant questions will be reactivated anyway
+                        rr->UnansweredQueries = MaxUnansweredQueries;
+                    }
+                    else
+                    {
+                        mDNS_PurgeCacheResourceRecord(m, rr);
+                    }
+                }
+            }
+        }
+    }
+
+    // If we were advertising on this interface, deregister those address and reverse-lookup records now
+    if (set->Advertise) DeadvertiseInterface(m, set);
+
+    // If we have any cache records received on this interface that went away, then re-verify them.
+    // In some versions of OS X the IPv6 address remains on an interface even when the interface is turned off,
+    // giving the false impression that there's an active representative of this interface when there really isn't.
+    // Don't need to do this when shutting down, because *all* interfaces are about to go away
+    if (revalidate && !m->ShutdownTime)
+    {
+        mDNSu32 slot;
+        CacheGroup *cg;
+        CacheRecord *rr;
+        FORALL_CACHERECORDS(slot, cg, rr)
+        if (rr->resrec.InterfaceID == set->InterfaceID)
+            mDNS_Reconfirm_internal(m, rr, kDefaultReconfirmTimeForFlappingInterface);
+    }
+
+    mDNS_UpdateAllowSleep(m);
+
+    mDNS_Unlock(m);
+}
+
+mDNSlocal void SetAnonInfoSRS(ServiceRecordSet *sr, int NumSubTypes)
+{
+    int i, len;
+
+    if (!sr->AnonData)
+        return;
+
+    len = mDNSPlatformStrLen(sr->AnonData);
+    if (sr->RR_PTR.resrec.AnonInfo)
+    {
+        LogMsg("SetAnonInfoSRS: Freeing AnonInfo for PTR record %##s, should have been freed already", sr->RR_PTR.resrec.name->c);
+        FreeAnonInfo(sr->RR_PTR.resrec.AnonInfo);
+    }
+    sr->RR_PTR.resrec.AnonInfo = AllocateAnonInfo(sr->RR_PTR.resrec.name, sr->AnonData, len, mDNSNULL);
+    for (i=0; i<NumSubTypes; i++)
+    {
+        if (sr->SubTypes[i].resrec.AnonInfo)
+        {
+            LogMsg("SetAnonInfoSRS: Freeing AnonInfo for subtype record %##s, should have been freed already", sr->SubTypes[i].resrec.name->c);
+            FreeAnonInfo(sr->SubTypes[i].resrec.AnonInfo);
+        }
+        sr->SubTypes[i].resrec.AnonInfo = AllocateAnonInfo(sr->SubTypes[i].resrec.name, sr->AnonData, len, mDNSNULL);
+    }
+}
+
+mDNSlocal void ResetAnonInfoSRS(ServiceRecordSet *sr, int NumSubTypes)
+{
+    int i;
+
+    if (!sr->AnonData)
+        return;
+    if (sr->RR_PTR.resrec.AnonInfo)
+    {
+        FreeAnonInfo(sr->RR_PTR.resrec.AnonInfo);
+        sr->RR_PTR.resrec.AnonInfo = mDNSNULL;
+    }
+    for (i=0; i<NumSubTypes; i++)
+    {
+        if (sr->SubTypes[i].resrec.AnonInfo)
+        {
+            FreeAnonInfo(sr->SubTypes[i].resrec.AnonInfo);
+            sr->SubTypes[i].resrec.AnonInfo = mDNSNULL;
+        }
+    }
+}
+
+mDNSlocal void ServiceCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    ServiceRecordSet *sr = (ServiceRecordSet *)rr->RecordContext;
+    (void)m;    // Unused parameter
+
+    #if MDNS_DEBUGMSGS
+    {
+        char *msg = "Unknown result";
+        if      (result == mStatus_NoError) msg = "Name Registered";
+        else if (result == mStatus_NameConflict) msg = "Name Conflict";
+        else if (result == mStatus_MemFree) msg = "Memory Free";
+        debugf("ServiceCallback: %##s (%s) %s (%d)", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), msg, result);
+    }
+    #endif
+
+    // Only pass on the NoError acknowledgement for the SRV record (when it finishes probing)
+    if (result == mStatus_NoError && rr != &sr->RR_SRV) return;
+
+    // If we got a name conflict on either SRV or TXT, forcibly deregister this service, and record that we did that
+    if (result == mStatus_NameConflict)
+    {
+        sr->Conflict = mDNStrue;                // Record that this service set had a conflict
+        mDNS_DeregisterService(m, sr);          // Unlink the records from our list
+        return;
+    }
+
+    if (result == mStatus_MemFree)
+    {
+        // If the SRV/TXT/PTR records, or the _services._dns-sd._udp record, or any of the subtype PTR records,
+        // are still in the process of deregistering, don't pass on the NameConflict/MemFree message until
+        // every record is finished cleaning up.
+        mDNSu32 i;
+        ExtraResourceRecord *e = sr->Extras;
+
+        if (sr->RR_SRV.resrec.RecordType != kDNSRecordTypeUnregistered) return;
+        if (sr->RR_TXT.resrec.RecordType != kDNSRecordTypeUnregistered) return;
+        if (sr->RR_PTR.resrec.RecordType != kDNSRecordTypeUnregistered) return;
+        if (sr->RR_ADV.resrec.RecordType != kDNSRecordTypeUnregistered) return;
+        for (i=0; i<sr->NumSubTypes; i++) if (sr->SubTypes[i].resrec.RecordType != kDNSRecordTypeUnregistered) return;
+
+        while (e)
+        {
+            if (e->r.resrec.RecordType != kDNSRecordTypeUnregistered) return;
+            e = e->next;
+        }
+        ResetAnonInfoSRS(sr, sr->NumSubTypes);
+
+        // If this ServiceRecordSet was forcibly deregistered, and now its memory is ready for reuse,
+        // then we can now report the NameConflict to the client
+        if (sr->Conflict) result = mStatus_NameConflict;
+
+    }
+
+    LogInfo("ServiceCallback: All records %s for %##s", (result == mStatus_MemFree ? "Unregistered" : "Registered"), sr->RR_PTR.resrec.name->c);
+    // CAUTION: MUST NOT do anything more with sr after calling sr->Callback(), because the client's callback
+    // function is allowed to do anything, including deregistering this service and freeing its memory.
+    if (sr->ServiceCallback)
+        sr->ServiceCallback(m, sr, result);
+}
+
+mDNSlocal void NSSCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    ServiceRecordSet *sr = (ServiceRecordSet *)rr->RecordContext;
+    if (sr->ServiceCallback)
+        sr->ServiceCallback(m, sr, result);
+}
+
+
+mDNSlocal AuthRecType setAuthRecType(mDNSInterfaceID InterfaceID, mDNSu32 flags)
+{
+    AuthRecType artype;
+
+    if (InterfaceID == mDNSInterface_LocalOnly)
+        artype = AuthRecordLocalOnly;
+    else if (InterfaceID == mDNSInterface_P2P)
+        artype = AuthRecordP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & coreFlagIncludeP2P)
+            && (flags & coreFlagIncludeAWDL))
+        artype = AuthRecordAnyIncludeAWDLandP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & coreFlagIncludeP2P))
+        artype = AuthRecordAnyIncludeP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & coreFlagIncludeAWDL))
+        artype = AuthRecordAnyIncludeAWDL;
+    else
+        artype = AuthRecordAny;
+
+    return artype;
+}
+
+// Note:
+// Name is first label of domain name (any dots in the name are actual dots, not label separators)
+// Type is service type (e.g. "_ipp._tcp.")
+// Domain is fully qualified domain name (i.e. ending with a null label)
+// We always register a TXT, even if it is empty (so that clients are not
+// left waiting forever looking for a nonexistent record.)
+// If the host parameter is mDNSNULL or the root domain (ASCII NUL),
+// then the default host name (m->MulticastHostname) is automatically used
+// If the optional target host parameter is set, then the storage it points to must remain valid for the lifetime of the service registration
+mDNSexport mStatus mDNS_RegisterService(mDNS *const m, ServiceRecordSet *sr,
+                                        const domainlabel *const name, const domainname *const type, const domainname *const domain,
+                                        const domainname *const host, mDNSIPPort port, const mDNSu8 txtinfo[], mDNSu16 txtlen,
+                                        AuthRecord *SubTypes, mDNSu32 NumSubTypes,
+                                        mDNSInterfaceID InterfaceID, mDNSServiceCallback Callback, void *Context, mDNSu32 flags)
+{
+    mStatus err;
+    mDNSu32 i;
+    mDNSu32 hostTTL;
+    AuthRecType artype;
+    mDNSu8 recordType = (flags & coreFlagKnownUnique) ? kDNSRecordTypeKnownUnique : kDNSRecordTypeUnique;
+
+    sr->ServiceCallback = Callback;
+    sr->ServiceContext  = Context;
+    sr->Conflict        = mDNSfalse;
+
+    sr->Extras          = mDNSNULL;
+    sr->NumSubTypes     = NumSubTypes;
+    sr->SubTypes        = SubTypes;
+    sr->flags           = flags;
+
+    artype = setAuthRecType(InterfaceID, flags);
+
+    // Initialize the AuthRecord objects to sane values
+    // Need to initialize everything correctly *before* making the decision whether to do a RegisterNoSuchService and bail out
+    mDNS_SetupResourceRecord(&sr->RR_ADV, mDNSNULL, InterfaceID, kDNSType_PTR, kStandardTTL, kDNSRecordTypeAdvisory, artype, ServiceCallback, sr);
+    mDNS_SetupResourceRecord(&sr->RR_PTR, mDNSNULL, InterfaceID, kDNSType_PTR, kStandardTTL, kDNSRecordTypeShared,   artype, ServiceCallback, sr);
+
+    if (flags & coreFlagWakeOnly)
+    {
+        sr->RR_PTR.AuthFlags = AuthFlagsWakeOnly;
+    }
+
+    if (SameDomainName(type, (const domainname *) "\x4" "_ubd" "\x4" "_tcp"))
+        hostTTL = kHostNameSmallTTL;
+    else
+        hostTTL = kHostNameTTL;
+
+    mDNS_SetupResourceRecord(&sr->RR_SRV, mDNSNULL, InterfaceID, kDNSType_SRV, hostTTL, recordType, artype, ServiceCallback, sr);
+    mDNS_SetupResourceRecord(&sr->RR_TXT, mDNSNULL, InterfaceID, kDNSType_TXT, kStandardTTL, kDNSRecordTypeUnique, artype, ServiceCallback, sr);
+
+    // If port number is zero, that means the client is really trying to do a RegisterNoSuchService
+    if (mDNSIPPortIsZero(port))
+        return(mDNS_RegisterNoSuchService(m, &sr->RR_SRV, name, type, domain, mDNSNULL, InterfaceID, NSSCallback, sr, flags));
+
+    // If the client is registering an oversized TXT record,
+    // it is the client's responsibility to alloate a ServiceRecordSet structure that is large enough for it
+    if (sr->RR_TXT.resrec.rdata->MaxRDLength < txtlen)
+        sr->RR_TXT.resrec.rdata->MaxRDLength = txtlen;
+
+    // Set up the record names
+    // For now we only create an advisory record for the main type, not for subtypes
+    // We need to gain some operational experience before we decide if there's a need to create them for subtypes too
+    if (ConstructServiceName(&sr->RR_ADV.namestorage, (const domainlabel*)"\x09_services", (const domainname*)"\x07_dns-sd\x04_udp", domain) == mDNSNULL)
+        return(mStatus_BadParamErr);
+    if (ConstructServiceName(&sr->RR_PTR.namestorage, mDNSNULL, type, domain) == mDNSNULL) return(mStatus_BadParamErr);
+    if (ConstructServiceName(&sr->RR_SRV.namestorage, name,     type, domain) == mDNSNULL) return(mStatus_BadParamErr);
+    AssignDomainName(&sr->RR_TXT.namestorage, sr->RR_SRV.resrec.name);
+
+    // 1. Set up the ADV record rdata to advertise our service type
+    AssignDomainName(&sr->RR_ADV.resrec.rdata->u.name, sr->RR_PTR.resrec.name);
+
+    // 2. Set up the PTR record rdata to point to our service name
+    // We set up two additionals, so when a client asks for this PTR we automatically send the SRV and the TXT too
+    // Note: uDNS registration code assumes that Additional1 points to the SRV record
+    AssignDomainName(&sr->RR_PTR.resrec.rdata->u.name, sr->RR_SRV.resrec.name);
+    sr->RR_PTR.Additional1 = &sr->RR_SRV;
+    sr->RR_PTR.Additional2 = &sr->RR_TXT;
+
+    // 2a. Set up any subtype PTRs to point to our service name
+    // If the client is using subtypes, it is the client's responsibility to have
+    // already set the first label of the record name to the subtype being registered
+    for (i=0; i<NumSubTypes; i++)
+    {
+        domainname st;
+        AssignDomainName(&st, sr->SubTypes[i].resrec.name);
+        st.c[1+st.c[0]] = 0;            // Only want the first label, not the whole FQDN (particularly for mDNS_RenameAndReregisterService())
+        AppendDomainName(&st, type);
+        mDNS_SetupResourceRecord(&sr->SubTypes[i], mDNSNULL, InterfaceID, kDNSType_PTR, kStandardTTL, kDNSRecordTypeShared, artype, ServiceCallback, sr);
+        if (ConstructServiceName(&sr->SubTypes[i].namestorage, mDNSNULL, &st, domain) == mDNSNULL) return(mStatus_BadParamErr);
+        AssignDomainName(&sr->SubTypes[i].resrec.rdata->u.name, &sr->RR_SRV.namestorage);
+        sr->SubTypes[i].Additional1 = &sr->RR_SRV;
+        sr->SubTypes[i].Additional2 = &sr->RR_TXT;
+    }
+    
+    SetAnonInfoSRS(sr, NumSubTypes);
+
+    // 3. Set up the SRV record rdata.
+    sr->RR_SRV.resrec.rdata->u.srv.priority = 0;
+    sr->RR_SRV.resrec.rdata->u.srv.weight   = 0;
+    sr->RR_SRV.resrec.rdata->u.srv.port     = port;
+
+    // Setting AutoTarget tells DNS that the target of this SRV is to be automatically kept in sync with our host name
+    if (host && host->c[0]) AssignDomainName(&sr->RR_SRV.resrec.rdata->u.srv.target, host);
+    else { sr->RR_SRV.AutoTarget = Target_AutoHost; sr->RR_SRV.resrec.rdata->u.srv.target.c[0] = '\0'; }
+
+    // 4. Set up the TXT record rdata,
+    // and set DependentOn because we're depending on the SRV record to find and resolve conflicts for us
+    // Note: uDNS registration code assumes that DependentOn points to the SRV record
+    if (txtinfo == mDNSNULL) sr->RR_TXT.resrec.rdlength = 0;
+    else if (txtinfo != sr->RR_TXT.resrec.rdata->u.txt.c)
+    {
+        sr->RR_TXT.resrec.rdlength = txtlen;
+        if (sr->RR_TXT.resrec.rdlength > sr->RR_TXT.resrec.rdata->MaxRDLength) return(mStatus_BadParamErr);
+        mDNSPlatformMemCopy(sr->RR_TXT.resrec.rdata->u.txt.c, txtinfo, txtlen);
+    }
+    sr->RR_TXT.DependentOn = &sr->RR_SRV;
+
+    mDNS_Lock(m);
+    // It is important that we register SRV first. uDNS assumes that SRV is registered first so
+    // that if the SRV cannot find a target, rest of the records that belong to this service
+    // will not be activated.
+    err = mDNS_Register_internal(m, &sr->RR_SRV);
+    // If we can't register the SRV record due to errors, bail out. It has not been inserted in
+    // any list and hence no need to deregister. We could probably do similar checks for other
+    // records below and bail out. For now, this seems to be sufficient to address rdar://9304275
+    if (err)
+    {
+        mDNS_Unlock(m);
+        return err;
+    }
+    if (!err) err = mDNS_Register_internal(m, &sr->RR_TXT);
+    // We register the RR_PTR last, because we want to be sure that in the event of a forced call to
+    // mDNS_StartExit, the RR_PTR will be the last one to be forcibly deregistered, since that is what triggers
+    // the mStatus_MemFree callback to ServiceCallback, which in turn passes on the mStatus_MemFree back to
+    // the client callback, which is then at liberty to free the ServiceRecordSet memory at will. We need to
+    // make sure we've deregistered all our records and done any other necessary cleanup before that happens.
+    if (!err) err = mDNS_Register_internal(m, &sr->RR_ADV);
+    for (i=0; i<NumSubTypes; i++) if (!err) err = mDNS_Register_internal(m, &sr->SubTypes[i]);
+    if (!err) err = mDNS_Register_internal(m, &sr->RR_PTR);
+
+    mDNS_Unlock(m);
+
+    if (err) mDNS_DeregisterService(m, sr);
+    return(err);
+}
+
+mDNSexport mStatus mDNS_AddRecordToService(mDNS *const m, ServiceRecordSet *sr,
+                                           ExtraResourceRecord *extra, RData *rdata, mDNSu32 ttl,  mDNSu32 flags)
+{
+    ExtraResourceRecord **e;
+    mStatus status;
+    AuthRecType artype;
+    mDNSInterfaceID InterfaceID = sr->RR_PTR.resrec.InterfaceID;
+
+    artype = setAuthRecType(InterfaceID, flags);
+
+    extra->next = mDNSNULL;
+    mDNS_SetupResourceRecord(&extra->r, rdata, sr->RR_PTR.resrec.InterfaceID,
+                             extra->r.resrec.rrtype, ttl, kDNSRecordTypeUnique, artype, ServiceCallback, sr);
+    AssignDomainName(&extra->r.namestorage, sr->RR_SRV.resrec.name);
+
+    mDNS_Lock(m);
+    e = &sr->Extras;
+    while (*e) e = &(*e)->next;
+
+    if (ttl == 0) ttl = kStandardTTL;
+
+    extra->r.DependentOn = &sr->RR_SRV;
+
+    debugf("mDNS_AddRecordToService adding record to %##s %s %d",
+           extra->r.resrec.name->c, DNSTypeName(extra->r.resrec.rrtype), extra->r.resrec.rdlength);
+
+    status = mDNS_Register_internal(m, &extra->r);
+    if (status == mStatus_NoError) *e = extra;
+
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_RemoveRecordFromService(mDNS *const m, ServiceRecordSet *sr, ExtraResourceRecord *extra,
+                                                mDNSRecordCallback MemFreeCallback, void *Context)
+{
+    ExtraResourceRecord **e;
+    mStatus status;
+
+    mDNS_Lock(m);
+    e = &sr->Extras;
+    while (*e && *e != extra) e = &(*e)->next;
+    if (!*e)
+    {
+        debugf("mDNS_RemoveRecordFromService failed to remove record from %##s", extra->r.resrec.name->c);
+        status = mStatus_BadReferenceErr;
+    }
+    else
+    {
+        debugf("mDNS_RemoveRecordFromService removing record from %##s", extra->r.resrec.name->c);
+        extra->r.RecordCallback = MemFreeCallback;
+        extra->r.RecordContext  = Context;
+        *e = (*e)->next;
+        status = mDNS_Deregister_internal(m, &extra->r, mDNS_Dereg_normal);
+    }
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_RenameAndReregisterService(mDNS *const m, ServiceRecordSet *const sr, const domainlabel *newname)
+{
+    // Note: Don't need to use mDNS_Lock(m) here, because this code is just using public routines
+    // mDNS_RegisterService() and mDNS_AddRecordToService(), which do the right locking internally.
+    domainlabel name1, name2;
+    domainname type, domain;
+    const domainname *host = sr->RR_SRV.AutoTarget ? mDNSNULL : &sr->RR_SRV.resrec.rdata->u.srv.target;
+    ExtraResourceRecord *extras = sr->Extras;
+    mStatus err;
+
+    DeconstructServiceName(sr->RR_SRV.resrec.name, &name1, &type, &domain);
+    if (!newname)
+    {
+        name2 = name1;
+        IncrementLabelSuffix(&name2, mDNStrue);
+        newname = &name2;
+    }
+
+    if (SameDomainName(&domain, &localdomain))
+        debugf("%##s service renamed from \"%#s\" to \"%#s\"", type.c, name1.c, newname->c);
+    else debugf("%##s service (domain %##s) renamed from \"%#s\" to \"%#s\"",type.c, domain.c, name1.c, newname->c);
+
+    err = mDNS_RegisterService(m, sr, newname, &type, &domain,
+                               host, sr->RR_SRV.resrec.rdata->u.srv.port, sr->RR_TXT.resrec.rdata->u.txt.c, sr->RR_TXT.resrec.rdlength,
+                               sr->SubTypes, sr->NumSubTypes,
+                               sr->RR_PTR.resrec.InterfaceID, sr->ServiceCallback, sr->ServiceContext, sr->flags);
+
+    // mDNS_RegisterService() just reset sr->Extras to NULL.
+    // Fortunately we already grabbed ourselves a copy of this pointer (above), so we can now run
+    // through the old list of extra records, and re-add them to our freshly created service registration
+    while (!err && extras)
+    {
+        ExtraResourceRecord *e = extras;
+        extras = extras->next;
+        err = mDNS_AddRecordToService(m, sr, e, e->r.resrec.rdata, e->r.resrec.rroriginalttl, 0);
+    }
+
+    return(err);
+}
+
+// Note: mDNS_DeregisterService calls mDNS_Deregister_internal which can call a user callback,
+// which may change the record list and/or question list.
+// Any code walking either list must use the CurrentQuestion and/or CurrentRecord mechanism to protect against this.
+mDNSexport mStatus mDNS_DeregisterService_drt(mDNS *const m, ServiceRecordSet *sr, mDNS_Dereg_type drt)
+{
+    // If port number is zero, that means this was actually registered using mDNS_RegisterNoSuchService()
+    if (mDNSIPPortIsZero(sr->RR_SRV.resrec.rdata->u.srv.port)) return(mDNS_DeregisterNoSuchService(m, &sr->RR_SRV));
+
+    if (sr->RR_PTR.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        debugf("Service set for %##s already deregistered", sr->RR_SRV.resrec.name->c);
+        return(mStatus_BadReferenceErr);
+    }
+    else if (sr->RR_PTR.resrec.RecordType == kDNSRecordTypeDeregistering)
+    {
+        LogInfo("Service set for %##s already in the process of deregistering", sr->RR_SRV.resrec.name->c);
+        // Avoid race condition:
+        // If a service gets a conflict, then we set the Conflict flag to tell us to generate
+        // an mStatus_NameConflict message when we get the mStatus_MemFree for our PTR record.
+        // If the client happens to deregister the service in the middle of that process, then
+        // we clear the flag back to the normal state, so that we deliver a plain mStatus_MemFree
+        // instead of incorrectly promoting it to mStatus_NameConflict.
+        // This race condition is exposed particularly when the conformance test generates
+        // a whole batch of simultaneous conflicts across a range of services all advertised
+        // using the same system default name, and if we don't take this precaution then
+        // we end up incrementing m->nicelabel multiple times instead of just once.
+        // <rdar://problem/4060169> Bug when auto-renaming Computer Name after name collision
+        sr->Conflict = mDNSfalse;
+        return(mStatus_NoError);
+    }
+    else
+    {
+        mDNSu32 i;
+        mStatus status;
+        ExtraResourceRecord *e;
+        mDNS_Lock(m);
+        e = sr->Extras;
+
+        // We use mDNS_Dereg_repeat because, in the event of a collision, some or all of the
+        // SRV, TXT, or Extra records could have already been automatically deregistered, and that's okay
+        mDNS_Deregister_internal(m, &sr->RR_SRV, mDNS_Dereg_repeat);
+        mDNS_Deregister_internal(m, &sr->RR_TXT, mDNS_Dereg_repeat);
+
+        mDNS_Deregister_internal(m, &sr->RR_ADV, drt);
+
+        // We deregister all of the extra records, but we leave the sr->Extras list intact
+        // in case the client wants to do a RenameAndReregister and reinstate the registration
+        while (e)
+        {
+            mDNS_Deregister_internal(m, &e->r, mDNS_Dereg_repeat);
+            e = e->next;
+        }
+
+        for (i=0; i<sr->NumSubTypes; i++)
+            mDNS_Deregister_internal(m, &sr->SubTypes[i], drt);
+
+        status = mDNS_Deregister_internal(m, &sr->RR_PTR, drt);
+        mDNS_Unlock(m);
+        return(status);
+    }
+}
+
+// Create a registration that asserts that no such service exists with this name.
+// This can be useful where there is a given function is available through several protocols.
+// For example, a printer called "Stuart's Printer" may implement printing via the "pdl-datastream" and "IPP"
+// protocols, but not via "LPR". In this case it would be prudent for the printer to assert the non-existence of an
+// "LPR" service called "Stuart's Printer". Without this precaution, another printer than offers only "LPR" printing
+// could inadvertently advertise its service under the same name "Stuart's Printer", which might be confusing for users.
+mDNSexport mStatus mDNS_RegisterNoSuchService(mDNS *const m, AuthRecord *const rr,
+                                              const domainlabel *const name, const domainname *const type, const domainname *const domain,
+                                              const domainname *const host,
+                                              const mDNSInterfaceID InterfaceID, mDNSRecordCallback Callback, void *Context, mDNSu32 flags)
+{
+    AuthRecType artype;
+
+    artype = setAuthRecType(InterfaceID, flags);
+
+    mDNS_SetupResourceRecord(rr, mDNSNULL, InterfaceID, kDNSType_SRV, kHostNameTTL, kDNSRecordTypeUnique, artype, Callback, Context);
+    if (ConstructServiceName(&rr->namestorage, name, type, domain) == mDNSNULL) return(mStatus_BadParamErr);
+    rr->resrec.rdata->u.srv.priority    = 0;
+    rr->resrec.rdata->u.srv.weight      = 0;
+    rr->resrec.rdata->u.srv.port        = zeroIPPort;
+    if (host && host->c[0]) AssignDomainName(&rr->resrec.rdata->u.srv.target, host);
+    else rr->AutoTarget = Target_AutoHost;
+    return(mDNS_Register(m, rr));
+}
+
+mDNSexport mStatus mDNS_AdvertiseDomains(mDNS *const m, AuthRecord *rr,
+                                         mDNS_DomainType DomainType, const mDNSInterfaceID InterfaceID, char *domname)
+{
+    AuthRecType artype;
+
+    if (InterfaceID == mDNSInterface_LocalOnly)
+        artype = AuthRecordLocalOnly;
+    else if (InterfaceID == mDNSInterface_P2P)
+        artype = AuthRecordP2P;
+    else
+        artype = AuthRecordAny;
+    mDNS_SetupResourceRecord(rr, mDNSNULL, InterfaceID, kDNSType_PTR, kStandardTTL, kDNSRecordTypeShared, artype, mDNSNULL, mDNSNULL);
+    if (!MakeDomainNameFromDNSNameString(&rr->namestorage, mDNS_DomainTypeNames[DomainType])) return(mStatus_BadParamErr);
+    if (!MakeDomainNameFromDNSNameString(&rr->resrec.rdata->u.name, domname)) return(mStatus_BadParamErr);
+    return(mDNS_Register(m, rr));
+}
+
+mDNSlocal mDNSBool mDNS_IdUsedInResourceRecordsList(mDNS * const m, mDNSOpaque16 id)
+{
+    AuthRecord *r;
+    for (r = m->ResourceRecords; r; r=r->next) if (mDNSSameOpaque16(id, r->updateid)) return mDNStrue;
+    return mDNSfalse;
+}
+
+mDNSlocal mDNSBool mDNS_IdUsedInQuestionsList(mDNS * const m, mDNSOpaque16 id)
+{
+    DNSQuestion *q;
+    for (q = m->Questions; q; q=q->next) if (mDNSSameOpaque16(id, q->TargetQID)) return mDNStrue;
+    return mDNSfalse;
+}
+
+mDNSexport mDNSOpaque16 mDNS_NewMessageID(mDNS * const m)
+{
+    mDNSOpaque16 id;
+    int i;
+
+    for (i=0; i<10; i++)
+    {
+        id = mDNSOpaque16fromIntVal(1 + (mDNSu16)mDNSRandom(0xFFFE));
+        if (!mDNS_IdUsedInResourceRecordsList(m, id) && !mDNS_IdUsedInQuestionsList(m, id)) break;
+    }
+
+    debugf("mDNS_NewMessageID: %5d", mDNSVal16(id));
+
+    return id;
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Sleep Proxy Server
+#endif
+
+mDNSlocal void RestartARPProbing(mDNS *const m, AuthRecord *const rr)
+{
+    // If we see an ARP from a machine we think is sleeping, then either
+    // (i) the machine has woken, or
+    // (ii) it's just a stray old packet from before the machine slept
+    // To handle the second case, we reset ProbeCount, so we'll suppress our own answers for a while, to avoid
+    // generating ARP conflicts with a waking machine, and set rr->LastAPTime so we'll start probing again in 10 seconds.
+    // If the machine has just woken then we'll discard our records when we see the first new mDNS probe from that machine.
+    // If it was a stray old packet, then after 10 seconds we'll probe again and then start answering ARPs again. In this case we *do*
+    // need to send new ARP Announcements, because the owner's ARP broadcasts will have updated neighboring ARP caches, so we need to
+    // re-assert our (temporary) ownership of that IP address in order to receive subsequent packets addressed to that IPv4 address.
+
+    rr->resrec.RecordType = kDNSRecordTypeUnique;
+    rr->ProbeCount        = DefaultProbeCountForTypeUnique;
+    rr->ProbeRestartCount++;
+
+    // If we haven't started announcing yet (and we're not already in ten-second-delay mode) the machine is probably
+    // still going to sleep, so we just reset rr->ProbeCount so we'll continue probing until it stops responding.
+    // If we *have* started announcing, the machine is probably in the process of waking back up, so in that case
+    // we're more cautious and we wait ten seconds before probing it again. We do this because while waking from
+    // sleep, some network interfaces tend to lose or delay inbound packets, and without this delay, if the waking machine
+    // didn't answer our three probes within three seconds then we'd announce and cause it an unnecessary address conflict.
+    if (rr->AnnounceCount == InitialAnnounceCount && m->timenow - rr->LastAPTime >= 0)
+        InitializeLastAPTime(m, rr);
+    else
+    {
+        rr->AnnounceCount  = InitialAnnounceCount;
+        rr->ThisAPInterval = mDNSPlatformOneSecond;
+        rr->LastAPTime     = m->timenow + mDNSPlatformOneSecond * 9;    // Send first packet at rr->LastAPTime + rr->ThisAPInterval, i.e. 10 seconds from now
+        SetNextAnnounceProbeTime(m, rr);
+    }
+}
+
+mDNSlocal void mDNSCoreReceiveRawARP(mDNS *const m, const ARP_EthIP *const arp, const mDNSInterfaceID InterfaceID)
+{
+    static const mDNSOpaque16 ARP_op_request = { { 0, 1 } };
+    AuthRecord *rr;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID);
+    if (!intf) return;
+
+    mDNS_Lock(m);
+
+    // Pass 1:
+    // Process ARP Requests and Probes (but not Announcements), and generate an ARP Reply if necessary.
+    // We also process ARPs from our own kernel (and 'answer' them by injecting a local ARP table entry)
+    // We ignore ARP Announcements here -- Announcements are not questions, they're assertions, so we don't need to answer them.
+    // The times we might need to react to an ARP Announcement are:
+    // (i) as an indication that the host in question has not gone to sleep yet (so we should delay beginning to proxy for it) or
+    // (ii) if it's a conflicting Announcement from another host
+    // -- and we check for these in Pass 2 below.
+    if (mDNSSameOpaque16(arp->op, ARP_op_request) && !mDNSSameIPv4Address(arp->spa, arp->tpa))
+    {
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->resrec.InterfaceID == InterfaceID && rr->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                rr->AddressProxy.type == mDNSAddrType_IPv4 && mDNSSameIPv4Address(rr->AddressProxy.ip.v4, arp->tpa))
+            {
+                static const char msg1[] = "ARP Req from owner -- re-probing";
+                static const char msg2[] = "Ignoring  ARP Request from      ";
+                static const char msg3[] = "Creating Local ARP Cache entry  ";
+                static const char msg4[] = "Answering ARP Request from      ";
+                const char *const msg = mDNSSameEthAddress(&arp->sha, &rr->WakeUp.IMAC) ? msg1 :
+                                        (rr->AnnounceCount == InitialAnnounceCount)     ? msg2 :
+                                        mDNSSameEthAddress(&arp->sha, &intf->MAC)       ? msg3 : msg4;
+                LogSPS("%-7s %s %.6a %.4a for %.4a -- H-MAC %.6a I-MAC %.6a %s",
+                       intf->ifname, msg, &arp->sha, &arp->spa, &arp->tpa, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                if (msg == msg1)
+                {
+                    if ( rr->ProbeRestartCount < MAX_PROBE_RESTARTS)
+                        RestartARPProbing(m, rr);
+                    else
+                        LogSPS("Reached maximum number of restarts for probing - %s", ARDisplayString(m,rr));
+                }
+                else if (msg == msg3)
+                {
+                    mDNSPlatformSetLocalAddressCacheEntry(m, &rr->AddressProxy, &rr->WakeUp.IMAC, InterfaceID);
+                }
+                else if (msg == msg4)
+                {
+                    SendARP(m, 2, rr, &arp->tpa, &arp->sha, &arp->spa, &arp->sha);
+                }
+            }
+    }
+
+    // Pass 2:
+    // For all types of ARP packet we check the Sender IP address to make sure it doesn't conflict with any AddressProxy record we're holding.
+    // (Strictly speaking we're only checking Announcement/Request/Reply packets, since ARP Probes have zero Sender IP address,
+    // so by definition (and by design) they can never conflict with any real (i.e. non-zero) IP address).
+    // We ignore ARPs we sent ourselves (Sender MAC address is our MAC address) because our own proxy ARPs do not constitute a conflict that we need to handle.
+    // If we see an apparently conflicting ARP, we check the sender hardware address:
+    //   If the sender hardware address is the original owner this is benign, so we just suppress our own proxy answering for a while longer.
+    //   If the sender hardware address is *not* the original owner, then this is a conflict, and we need to wake the sleeping machine to handle it.
+    if (mDNSSameEthAddress(&arp->sha, &intf->MAC))
+        debugf("ARP from self for %.4a", &arp->tpa);
+    else
+    {
+        if (!mDNSSameIPv4Address(arp->spa, zerov4Addr))
+            for (rr = m->ResourceRecords; rr; rr=rr->next)
+                if (rr->resrec.InterfaceID == InterfaceID && rr->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                    rr->AddressProxy.type == mDNSAddrType_IPv4 && mDNSSameIPv4Address(rr->AddressProxy.ip.v4, arp->spa) && (rr->ProbeRestartCount < MAX_PROBE_RESTARTS))
+                {
+                    if (mDNSSameEthAddress(&zeroEthAddr, &rr->WakeUp.HMAC))
+                    {
+                        LogSPS("%-7s ARP from %.6a %.4a for %.4a -- Invalid H-MAC %.6a I-MAC %.6a %s", intf->ifname,
+                                &arp->sha, &arp->spa, &arp->tpa, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                    }
+                    else
+                    {
+                        RestartARPProbing(m, rr);
+                        if (mDNSSameEthAddress(&arp->sha, &rr->WakeUp.IMAC))
+                        {
+                            LogSPS("%-7s ARP %s from owner %.6a %.4a for %-15.4a -- re-starting probing for %s", intf->ifname,
+                                    mDNSSameIPv4Address(arp->spa, arp->tpa) ? "Announcement " : mDNSSameOpaque16(arp->op, ARP_op_request) ? "Request      " : "Response     ",
+                                    &arp->sha, &arp->spa, &arp->tpa, ARDisplayString(m, rr));
+                        }
+                        else
+                        {
+                            LogMsg("%-7s Conflicting ARP from %.6a %.4a for %.4a -- waking H-MAC %.6a I-MAC %.6a %s", intf->ifname,
+                                    &arp->sha, &arp->spa, &arp->tpa, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                            ScheduleWakeup(m, rr->resrec.InterfaceID, &rr->WakeUp.HMAC);
+                        }
+                    }
+                }
+    }
+
+    mDNS_Unlock(m);
+}
+
+/*
+   // Option 1 is Source Link Layer Address Option
+   // Option 2 is Target Link Layer Address Option
+   mDNSlocal const mDNSEthAddr *GetLinkLayerAddressOption(const IPv6NDP *const ndp, const mDNSu8 *const end, mDNSu8 op)
+    {
+    const mDNSu8 *options = (mDNSu8 *)(ndp+1);
+    while (options < end)
+        {
+        debugf("NDP Option %02X len %2d %d", options[0], options[1], end - options);
+        if (options[0] == op && options[1] == 1) return (const mDNSEthAddr*)(options+2);
+        options += options[1] * 8;
+        }
+    return mDNSNULL;
+    }
+ */
+
+mDNSlocal void mDNSCoreReceiveRawND(mDNS *const m, const mDNSEthAddr *const sha, const mDNSv6Addr *spa,
+                                    const IPv6NDP *const ndp, const mDNSu8 *const end, const mDNSInterfaceID InterfaceID)
+{
+    AuthRecord *rr;
+    NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID);
+    if (!intf) return;
+
+    mDNS_Lock(m);
+
+    // Pass 1: Process Neighbor Solicitations, and generate a Neighbor Advertisement if necessary.
+    if (ndp->type == NDP_Sol)
+    {
+        //const mDNSEthAddr *const sha = GetLinkLayerAddressOption(ndp, end, NDP_SrcLL);
+        (void)end;
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->resrec.InterfaceID == InterfaceID && rr->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                rr->AddressProxy.type == mDNSAddrType_IPv6 && mDNSSameIPv6Address(rr->AddressProxy.ip.v6, ndp->target))
+            {
+                static const char msg1[] = "NDP Req from owner -- re-probing";
+                static const char msg2[] = "Ignoring  NDP Request from      ";
+                static const char msg3[] = "Creating Local NDP Cache entry  ";
+                static const char msg4[] = "Answering NDP Request from      ";
+                static const char msg5[] = "Answering NDP Probe   from      ";
+                const char *const msg = sha && mDNSSameEthAddress(sha, &rr->WakeUp.IMAC) ? msg1 :
+                                        (rr->AnnounceCount == InitialAnnounceCount)      ? msg2 :
+                                        sha && mDNSSameEthAddress(sha, &intf->MAC)       ? msg3 :
+                                        spa && mDNSIPv6AddressIsZero(*spa)               ? msg4 : msg5;
+                LogSPS("%-7s %s %.6a %.16a for %.16a -- H-MAC %.6a I-MAC %.6a %s",
+                       intf->ifname, msg, sha, spa, &ndp->target, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                if (msg == msg1)
+                {
+                    if (rr->ProbeRestartCount < MAX_PROBE_RESTARTS)
+                        RestartARPProbing(m, rr);
+                    else
+                        LogSPS("Reached maximum number of restarts for probing - %s", ARDisplayString(m,rr));
+                }
+                else if (msg == msg3)
+                    mDNSPlatformSetLocalAddressCacheEntry(m, &rr->AddressProxy, &rr->WakeUp.IMAC, InterfaceID);
+                else if (msg == msg4) 
+                    SendNDP(m, NDP_Adv, NDP_Solicited, rr, &ndp->target, mDNSNULL, spa, sha);
+                else if (msg == msg5) 
+                    SendNDP(m, NDP_Adv, 0, rr, &ndp->target, mDNSNULL, &AllHosts_v6, &AllHosts_v6_Eth);
+            }
+    }
+
+    // Pass 2: For all types of NDP packet we check the Sender IP address to make sure it doesn't conflict with any AddressProxy record we're holding.
+    if (mDNSSameEthAddress(sha, &intf->MAC))
+        debugf("NDP from self for %.16a", &ndp->target);
+    else
+    {
+        // For Neighbor Advertisements we check the Target address field, not the actual IPv6 source address.
+        // When a machine has both link-local and routable IPv6 addresses, it may send NDP packets making assertions
+        // about its routable IPv6 address, using its link-local address as the source address for all NDP packets.
+        // Hence it is the NDP target address we care about, not the actual packet source address.
+        if (ndp->type == NDP_Adv) spa = &ndp->target;
+        if (!mDNSSameIPv6Address(*spa, zerov6Addr))
+            for (rr = m->ResourceRecords; rr; rr=rr->next)
+                if (rr->resrec.InterfaceID == InterfaceID && rr->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                    rr->AddressProxy.type == mDNSAddrType_IPv6 && mDNSSameIPv6Address(rr->AddressProxy.ip.v6, *spa) && (rr->ProbeRestartCount < MAX_PROBE_RESTARTS))
+                {
+                    if (mDNSSameEthAddress(&zeroEthAddr, &rr->WakeUp.HMAC))
+                    {
+                        LogSPS("%-7s NDP from %.6a %.16a for %.16a -- Invalid H-MAC %.6a I-MAC %.6a %s", intf->ifname,
+                                    sha, spa, &ndp->target, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                    }
+                    else
+                    {
+                        RestartARPProbing(m, rr);
+                        if (mDNSSameEthAddress(sha, &rr->WakeUp.IMAC))
+                        {
+                            LogSPS("%-7s NDP %s from owner %.6a %.16a for %.16a -- re-starting probing for %s", intf->ifname,
+                                    ndp->type == NDP_Sol ? "Solicitation " : "Advertisement", sha, spa, &ndp->target, ARDisplayString(m, rr));
+                        }
+                        else
+                        {
+                            LogMsg("%-7s Conflicting NDP from %.6a %.16a for %.16a -- waking H-MAC %.6a I-MAC %.6a %s", intf->ifname,
+                                    sha, spa, &ndp->target, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, rr));
+                            ScheduleWakeup(m, rr->resrec.InterfaceID, &rr->WakeUp.HMAC);
+                        }
+                    }
+                }
+    }
+
+    mDNS_Unlock(m);
+}
+
+mDNSlocal void mDNSCoreReceiveRawTransportPacket(mDNS *const m, const mDNSEthAddr *const sha, const mDNSAddr *const src, const mDNSAddr *const dst, const mDNSu8 protocol,
+                                                 const mDNSu8 *const p, const TransportLayerPacket *const t, const mDNSu8 *const end, const mDNSInterfaceID InterfaceID, const mDNSu16 len)
+{
+    const mDNSIPPort port = (protocol == 0x06) ? t->tcp.dst : (protocol == 0x11) ? t->udp.dst : zeroIPPort;
+    mDNSBool wake = mDNSfalse;
+    mDNSBool kaWake = mDNSfalse;
+
+    switch (protocol)
+    {
+        #define XX wake ? "Received" : "Ignoring", end-p
+    case 0x01:  LogSPS("Ignoring %d-byte ICMP from %#a to %#a", end-p, src, dst);
+        break;
+
+    case 0x06:  {
+        AuthRecord *kr;
+        mDNSu32 seq, ack;
+                    #define TH_FIN  0x01
+                    #define TH_SYN  0x02
+                    #define TH_RST  0x04
+                    #define TH_ACK  0x10
+
+        kr = mDNS_MatchKeepaliveInfo(m, dst, src, port, t->tcp.src, &seq, &ack);
+        if (kr)
+        {
+            LogSPS("mDNSCoreReceiveRawTransportPacket: Found a Keepalive record from %#a:%d  to %#a:%d", src, mDNSVal16(t->tcp.src), dst, mDNSVal16(port));
+            // Plan to wake if
+            // (a) RST or FIN is set (the keepalive that we sent could have caused a reset)
+            // (b) packet that contains new data and acks a sequence number higher than the one
+            //     we have been sending in the keepalive
+
+            wake = ((t->tcp.flags & TH_RST) || (t->tcp.flags & TH_FIN)) ;
+            if (!wake)
+            {
+                mDNSu8 *ptr;
+                mDNSu32 pseq, pack;
+                mDNSBool data = mDNSfalse;
+                mDNSu8 tcphlen;
+
+                // Convert to host order
+                ptr = (mDNSu8 *)&seq;
+                seq = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
+
+                ptr = (mDNSu8 *)&ack;
+                ack = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
+
+                pseq = t->tcp.seq;
+                ptr = (mDNSu8 *)&pseq;
+                pseq = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
+
+                pack = t->tcp.ack;
+                ptr = (mDNSu8 *)&pack;
+                pack = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3];
+
+                // If the other side is acking one more than our sequence number (keepalive is one
+                // less than the last valid sequence sent) and it's sequence is more than what we
+                // acked before
+                //if (end - p - 34  - ((t->tcp.offset >> 4) * 4) > 0) data = mDNStrue;
+                tcphlen = ((t->tcp.offset >> 4) * 4);
+                if (end - ((mDNSu8 *)t + tcphlen) > 0) data = mDNStrue;
+                wake = ((int)(pack - seq) > 0) && ((int)(pseq - ack) >= 0) && data;
+
+                // If we got a regular keepalive on a connection that was registed with the KeepAlive API, respond with an ACK
+                if ((t->tcp.flags & TH_ACK) && (data == mDNSfalse) &&
+                    ((int)(ack - pseq) == 1))
+                {
+                    // Send an ACK;
+                    mDNS_SendKeepaliveACK(m, kr);
+                }
+                LogSPS("mDNSCoreReceiveRawTransportPacket: End %p, hlen %d, Datalen %d, pack %u, seq %u, pseq %u, ack %u, wake %d",
+                       end, tcphlen, end - ((mDNSu8 *)t + tcphlen), pack, seq, pseq, ack, wake);
+            }
+            else { LogSPS("mDNSCoreReceiveRawTransportPacket: waking because of RST or FIN th_flags %d", t->tcp.flags); }
+            kaWake = wake;
+        }
+        else
+        {
+            // Plan to wake if
+            // (a) RST is not set, AND
+            // (b) packet is SYN, SYN+FIN, or plain data packet (no SYN or FIN). We won't wake for FIN alone.
+            wake = (!(t->tcp.flags & TH_RST) && (t->tcp.flags & (TH_FIN|TH_SYN)) != TH_FIN);
+
+            // For now, to reduce spurious wakeups, we wake only for TCP SYN,
+            // except for ssh connections, where we'll wake for plain data packets too
+            if  (!mDNSSameIPPort(port, SSHPort) && !(t->tcp.flags & 2)) wake = mDNSfalse;
+
+            LogSPS("%s %d-byte TCP from %#a:%d to %#a:%d%s%s%s", XX,
+                   src, mDNSVal16(t->tcp.src), dst, mDNSVal16(port),
+                   (t->tcp.flags & 2) ? " SYN" : "",
+                   (t->tcp.flags & 1) ? " FIN" : "",
+                   (t->tcp.flags & 4) ? " RST" : "");
+        }
+        break;
+    }
+
+    case 0x11:  {
+                    #define ARD_AsNumber 3283
+        static const mDNSIPPort ARD = { { ARD_AsNumber >> 8, ARD_AsNumber & 0xFF } };
+        const mDNSu16 udplen = (mDNSu16)((mDNSu16)t->bytes[4] << 8 | t->bytes[5]);                  // Length *including* 8-byte UDP header
+        if (udplen >= sizeof(UDPHeader))
+        {
+            const mDNSu16 datalen = udplen - sizeof(UDPHeader);
+            wake = mDNStrue;
+
+            // For Back to My Mac UDP port 4500 (IPSEC) packets, we do some special handling
+            if (mDNSSameIPPort(port, IPSECPort))
+            {
+                // Specifically ignore NAT keepalive packets
+                if (datalen == 1 && end >= &t->bytes[9] && t->bytes[8] == 0xFF) wake = mDNSfalse;
+                else
+                {
+                    // Skip over the Non-ESP Marker if present
+                    const mDNSBool NonESP = (end >= &t->bytes[12] && t->bytes[8] == 0 && t->bytes[9] == 0 && t->bytes[10] == 0 && t->bytes[11] == 0);
+                    const IKEHeader *const ike    = (IKEHeader *)(t + (NonESP ? 12 : 8));
+                    const mDNSu16 ikelen = datalen - (NonESP ? 4 : 0);
+                    if (ikelen >= sizeof(IKEHeader) && end >= ((mDNSu8 *)ike) + sizeof(IKEHeader))
+                        if ((ike->Version & 0x10) == 0x10)
+                        {
+                            // ExchangeType ==  5 means 'Informational' <http://www.ietf.org/rfc/rfc2408.txt>
+                            // ExchangeType == 34 means 'IKE_SA_INIT'   <http://www.iana.org/assignments/ikev2-parameters>
+                            if (ike->ExchangeType == 5 || ike->ExchangeType == 34) wake = mDNSfalse;
+                            LogSPS("%s %d-byte IKE ExchangeType %d", XX, ike->ExchangeType);
+                        }
+                }
+            }
+
+            // For now, because we haven't yet worked out a clean elegant way to do this, we just special-case the
+            // Apple Remote Desktop port number -- we ignore all packets to UDP 3283 (the "Net Assistant" port),
+            // except for Apple Remote Desktop's explicit manual wakeup packet, which looks like this:
+            // UDP header (8 bytes)
+            // Payload: 13 88 00 6a 41 4e 41 20 (8 bytes) ffffffffffff (6 bytes) 16xMAC (96 bytes) = 110 bytes total
+            if (mDNSSameIPPort(port, ARD)) wake = (datalen >= 110 && end >= &t->bytes[10] && t->bytes[8] == 0x13 && t->bytes[9] == 0x88);
+
+            LogSPS("%s %d-byte UDP from %#a:%d to %#a:%d", XX, src, mDNSVal16(t->udp.src), dst, mDNSVal16(port));
+        }
+    }
+    break;
+
+    case 0x3A:  if (&t->bytes[len] <= end)
+        {
+            mDNSu16 checksum = IPv6CheckSum(&src->ip.v6, &dst->ip.v6, protocol, t->bytes, len);
+            if (!checksum) mDNSCoreReceiveRawND(m, sha, &src->ip.v6, &t->ndp, &t->bytes[len], InterfaceID);
+            else LogInfo("IPv6CheckSum bad %04X %02X%02X from %#a to %#a", checksum, t->bytes[2], t->bytes[3], src, dst);
+        }
+        break;
+
+    default:    LogSPS("Ignoring %d-byte IP packet unknown protocol %d from %#a to %#a", end-p, protocol, src, dst);
+        break;
+    }
+
+    if (wake)
+    {
+        AuthRecord *rr, *r2;
+
+        mDNS_Lock(m);
+        for (rr = m->ResourceRecords; rr; rr=rr->next)
+            if (rr->resrec.InterfaceID == InterfaceID &&
+                rr->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                rr->AddressProxy.type && mDNSSameAddress(&rr->AddressProxy, dst))
+            {
+                const mDNSu8 *const tp = (protocol == 6) ? (const mDNSu8 *)"\x4_tcp" : (const mDNSu8 *)"\x4_udp";
+                for (r2 = m->ResourceRecords; r2; r2=r2->next)
+                    if (r2->resrec.InterfaceID == InterfaceID && mDNSSameEthAddress(&r2->WakeUp.HMAC, &rr->WakeUp.HMAC) &&
+                        r2->resrec.RecordType != kDNSRecordTypeDeregistering &&
+                        r2->resrec.rrtype == kDNSType_SRV && mDNSSameIPPort(r2->resrec.rdata->u.srv.port, port) &&
+                        SameDomainLabel(ThirdLabel(r2->resrec.name)->c, tp))
+                        break;
+                if (!r2 && mDNSSameIPPort(port, IPSECPort)) r2 = rr;    // So that we wake for BTMM IPSEC packets, even without a matching SRV record
+                if (!r2 && kaWake) r2 = rr;                             // So that we wake for keepalive packets, even without a matching SRV record
+                if (r2)
+                {
+                    LogMsg("Waking host at %s %#a H-MAC %.6a I-MAC %.6a for %s",
+                           InterfaceNameForID(m, rr->resrec.InterfaceID), dst, &rr->WakeUp.HMAC, &rr->WakeUp.IMAC, ARDisplayString(m, r2));
+                    ScheduleWakeup(m, rr->resrec.InterfaceID, &rr->WakeUp.HMAC);
+                }
+                else
+                    LogSPS("Sleeping host at %s %#a %.6a has no service on %#s %d",
+                           InterfaceNameForID(m, rr->resrec.InterfaceID), dst, &rr->WakeUp.HMAC, tp, mDNSVal16(port));
+            }
+        mDNS_Unlock(m);
+    }
+}
+
+mDNSexport void mDNSCoreReceiveRawPacket(mDNS *const m, const mDNSu8 *const p, const mDNSu8 *const end, const mDNSInterfaceID InterfaceID)
+{
+    static const mDNSOpaque16 Ethertype_ARP  = { { 0x08, 0x06 } };  // Ethertype 0x0806 = ARP
+    static const mDNSOpaque16 Ethertype_IPv4 = { { 0x08, 0x00 } };  // Ethertype 0x0800 = IPv4
+    static const mDNSOpaque16 Ethertype_IPv6 = { { 0x86, 0xDD } };  // Ethertype 0x86DD = IPv6
+    static const mDNSOpaque16 ARP_hrd_eth    = { { 0x00, 0x01 } };  // Hardware address space (Ethernet = 1)
+    static const mDNSOpaque16 ARP_pro_ip     = { { 0x08, 0x00 } };  // Protocol address space (IP = 0x0800)
+
+    // Note: BPF guarantees that the NETWORK LAYER header will be word aligned, not the link-layer header.
+    // In other words, we can safely assume that pkt below (ARP, IPv4 or IPv6) is properly word aligned,
+    // but if pkt is 4-byte aligned, that necessarily means that eth CANNOT also be 4-byte aligned
+    // since it points to a an address 14 bytes before pkt.
+    const EthernetHeader     *const eth = (const EthernetHeader *)p;
+    const NetworkLayerPacket *const pkt = (const NetworkLayerPacket *)(eth+1);
+    mDNSAddr src, dst;
+    #define RequiredCapLen(P) ((P)==0x01 ? 4 : (P)==0x06 ? 20 : (P)==0x11 ? 8 : (P)==0x3A ? 24 : 0)
+
+    // Is ARP? Length must be at least 14 + 28 = 42 bytes
+    if (end >= p+42 && mDNSSameOpaque16(eth->ethertype, Ethertype_ARP) && mDNSSameOpaque16(pkt->arp.hrd, ARP_hrd_eth) && mDNSSameOpaque16(pkt->arp.pro, ARP_pro_ip))
+        mDNSCoreReceiveRawARP(m, &pkt->arp, InterfaceID);
+    // Is IPv4 with zero fragmentation offset? Length must be at least 14 + 20 = 34 bytes
+    else if (end >= p+34 && mDNSSameOpaque16(eth->ethertype, Ethertype_IPv4) && (pkt->v4.flagsfrags.b[0] & 0x1F) == 0 && pkt->v4.flagsfrags.b[1] == 0)
+    {
+        const mDNSu8 *const trans = p + 14 + (pkt->v4.vlen & 0xF) * 4;
+        debugf("Got IPv4 %02X from %.4a to %.4a", pkt->v4.protocol, &pkt->v4.src, &pkt->v4.dst);
+        src.type = mDNSAddrType_IPv4; src.ip.v4 = pkt->v4.src;
+        dst.type = mDNSAddrType_IPv4; dst.ip.v4 = pkt->v4.dst;
+        if (end >= trans + RequiredCapLen(pkt->v4.protocol))
+            mDNSCoreReceiveRawTransportPacket(m, &eth->src, &src, &dst, pkt->v4.protocol, p, (TransportLayerPacket*)trans, end, InterfaceID, 0);
+    }
+    // Is IPv6? Length must be at least 14 + 28 = 42 bytes
+    else if (end >= p+54 && mDNSSameOpaque16(eth->ethertype, Ethertype_IPv6))
+    {
+        const mDNSu8 *const trans = p + 54;
+        debugf("Got IPv6  %02X from %.16a to %.16a", pkt->v6.pro, &pkt->v6.src, &pkt->v6.dst);
+        src.type = mDNSAddrType_IPv6; src.ip.v6 = pkt->v6.src;
+        dst.type = mDNSAddrType_IPv6; dst.ip.v6 = pkt->v6.dst;
+        if (end >= trans + RequiredCapLen(pkt->v6.pro))
+            mDNSCoreReceiveRawTransportPacket(m, &eth->src, &src, &dst, pkt->v6.pro, p, (TransportLayerPacket*)trans, end, InterfaceID,
+                                              (mDNSu16)pkt->bytes[4] << 8 | pkt->bytes[5]);
+    }
+}
+
+mDNSlocal void ConstructSleepProxyServerName(mDNS *const m, domainlabel *name)
+{
+    name->c[0] = (mDNSu8)mDNS_snprintf((char*)name->c+1, 62, "%d-%d-%d-%d.%d %#s",
+                                       m->SPSType, m->SPSPortability, m->SPSMarginalPower, m->SPSTotalPower, m->SPSFeatureFlags, &m->nicelabel);
+}
+
+#ifndef SPC_DISABLED
+mDNSlocal void SleepProxyServerCallback(mDNS *const m, ServiceRecordSet *const srs, mStatus result)
+{
+    if (result == mStatus_NameConflict)
+        mDNS_RenameAndReregisterService(m, srs, mDNSNULL);
+    else if (result == mStatus_MemFree)
+    {
+        if (m->SleepState)
+            m->SPSState = 3;
+        else
+        {
+            m->SPSState = (mDNSu8)(m->SPSSocket != mDNSNULL);
+            if (m->SPSState)
+            {
+                domainlabel name;
+                ConstructSleepProxyServerName(m, &name);
+                mDNS_RegisterService(m, srs,
+                                     &name, &SleepProxyServiceType, &localdomain,
+                                     mDNSNULL, m->SPSSocket->port, // Host, port
+                                     (mDNSu8 *)"", 1,           // TXT data, length
+                                     mDNSNULL, 0,               // Subtypes (none)
+                                     mDNSInterface_Any,         // Interface ID
+                                     SleepProxyServerCallback, mDNSNULL, 0); // Callback, context, flags
+            }
+            LogSPS("Sleep Proxy Server %#s %s", srs->RR_SRV.resrec.name->c, m->SPSState ? "started" : "stopped");
+        }
+    }
+}
+#endif
+
+// Called with lock held
+mDNSexport void mDNSCoreBeSleepProxyServer_internal(mDNS *const m, mDNSu8 sps, mDNSu8 port, mDNSu8 marginalpower, mDNSu8 totpower, mDNSu8 features)
+{
+    // This routine uses mDNS_DeregisterService and calls SleepProxyServerCallback, so we execute in user callback context
+    mDNS_DropLockBeforeCallback();
+
+    // If turning off SPS, close our socket
+    // (Do this first, BEFORE calling mDNS_DeregisterService below)
+    if (!sps && m->SPSSocket) { mDNSPlatformUDPClose(m->SPSSocket); m->SPSSocket = mDNSNULL; }
+
+    // If turning off, or changing type, deregister old name
+#ifndef SPC_DISABLED
+    if (m->SPSState == 1 && sps != m->SPSType)
+    { m->SPSState = 2; mDNS_DeregisterService_drt(m, &m->SPSRecords, sps ? mDNS_Dereg_rapid : mDNS_Dereg_normal); }
+#endif // SPC_DISABLED
+
+    // Record our new SPS parameters
+    m->SPSType          = sps;
+    m->SPSPortability   = port;
+    m->SPSMarginalPower = marginalpower;
+    m->SPSTotalPower    = totpower;
+    m->SPSFeatureFlags  = features;
+    // If turning on, open socket and advertise service
+    if (sps)
+    {
+        if (!m->SPSSocket)
+        {
+            m->SPSSocket = mDNSPlatformUDPSocket(m, zeroIPPort);
+            if (!m->SPSSocket) { LogMsg("mDNSCoreBeSleepProxyServer: Failed to allocate SPSSocket"); goto fail; }
+        }
+#ifndef SPC_DISABLED
+        if (m->SPSState == 0) SleepProxyServerCallback(m, &m->SPSRecords, mStatus_MemFree);
+#endif // SPC_DISABLED
+    }
+    else if (m->SPSState)
+    {
+        LogSPS("mDNSCoreBeSleepProxyServer turning off from state %d; will wake clients", m->SPSState);
+        m->NextScheduledSPS = m->timenow;
+    }
+fail:
+    mDNS_ReclaimLockAfterCallback();
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Startup and Shutdown
+#endif
+
+mDNSlocal void mDNS_GrowCache_internal(mDNS *const m, CacheEntity *storage, mDNSu32 numrecords)
+{
+    if (storage && numrecords)
+    {
+        mDNSu32 i;
+        debugf("Adding cache storage for %d more records (%d bytes)", numrecords, numrecords*sizeof(CacheEntity));
+        for (i=0; i<numrecords; i++) storage[i].next = &storage[i+1];
+        storage[numrecords-1].next = m->rrcache_free;
+        m->rrcache_free = storage;
+        m->rrcache_size += numrecords;
+    }
+}
+
+mDNSexport void mDNS_GrowCache(mDNS *const m, CacheEntity *storage, mDNSu32 numrecords)
+{
+    mDNS_Lock(m);
+    mDNS_GrowCache_internal(m, storage, numrecords);
+    mDNS_Unlock(m);
+}
+
+mDNSexport mStatus mDNS_Init(mDNS *const m, mDNS_PlatformSupport *const p,
+                             CacheEntity *rrcachestorage, mDNSu32 rrcachesize,
+                             mDNSBool AdvertiseLocalAddresses, mDNSCallback *Callback, void *Context)
+{
+    mDNSu32 slot;
+    mDNSs32 timenow;
+    mStatus result;
+
+    if (!rrcachestorage) rrcachesize = 0;
+
+    m->p                             = p;
+    m->CanReceiveUnicastOn5353       = mDNSfalse; // Assume we can't receive unicasts on 5353, unless platform layer tells us otherwise
+    m->AdvertiseLocalAddresses       = AdvertiseLocalAddresses;
+    m->DivertMulticastAdvertisements = mDNSfalse;
+    m->mDNSPlatformStatus            = mStatus_Waiting;
+    m->UnicastPort4                  = zeroIPPort;
+    m->UnicastPort6                  = zeroIPPort;
+    m->PrimaryMAC                    = zeroEthAddr;
+    m->MainCallback                  = Callback;
+    m->MainContext                   = Context;
+    m->rec.r.resrec.RecordType       = 0;
+    m->rec.r.resrec.AnonInfo         = mDNSNULL;
+
+    // For debugging: To catch and report locking failures
+    m->mDNS_busy               = 0;
+    m->mDNS_reentrancy         = 0;
+    m->ShutdownTime            = 0;
+    m->lock_rrcache            = 0;
+    m->lock_Questions          = 0;
+    m->lock_Records            = 0;
+
+    // Task Scheduling variables
+    result = mDNSPlatformTimeInit();
+    if (result != mStatus_NoError) return(result);
+    m->timenow_adjust = (mDNSs32)mDNSRandom(0xFFFFFFFF);
+    timenow = mDNS_TimeNow_NoLock(m);
+
+    m->timenow                 = 0;     // MUST only be set within mDNS_Lock/mDNS_Unlock section
+    m->timenow_last            = timenow;
+    m->NextScheduledEvent      = timenow;
+    m->SuppressSending         = timenow;
+    m->NextCacheCheck          = timenow + 0x78000000;
+    m->NextScheduledQuery      = timenow + 0x78000000;
+    m->NextScheduledProbe      = timenow + 0x78000000;
+    m->NextScheduledResponse   = timenow + 0x78000000;
+    m->NextScheduledNATOp      = timenow + 0x78000000;
+    m->NextScheduledSPS        = timenow + 0x78000000;
+    m->NextScheduledKA         = timenow + 0x78000000;
+    m->NextScheduledStopTime   = timenow + 0x78000000;
+    m->RandomQueryDelay        = 0;
+    m->RandomReconfirmDelay    = 0;
+    m->PktNum                  = 0;
+    m->MPktNum                 = 0;
+    m->LocalRemoveEvents       = mDNSfalse;
+    m->SleepState              = SleepState_Awake;
+    m->SleepSeqNum             = 0;
+    m->SystemWakeOnLANEnabled  = mDNSfalse;
+    m->AnnounceOwner           = NonZeroTime(timenow + 60 * mDNSPlatformOneSecond);
+    m->DelaySleep              = 0;
+    m->SleepLimit              = 0;
+
+#if APPLE_OSX_mDNSResponder
+    m->StatStartTime           = mDNSPlatformUTC();
+    m->NextStatLogTime         = m->StatStartTime + kDefaultNextStatsticsLogTime;
+    m->ActiveStatTime          = 0;
+    m->UnicastPacketsSent      = 0;
+    m->MulticastPacketsSent    = 0;
+    m->RemoteSubnet            = 0;
+#endif // APPLE_OSX_mDNSResponder
+
+    // These fields only required for mDNS Searcher...
+    m->Questions               = mDNSNULL;
+    m->NewQuestions            = mDNSNULL;
+    m->CurrentQuestion         = mDNSNULL;
+    m->LocalOnlyQuestions      = mDNSNULL;
+    m->NewLocalOnlyQuestions   = mDNSNULL;
+    m->RestartQuestion         = mDNSNULL;
+    m->ValidationQuestion      = mDNSNULL;
+    m->rrcache_size            = 0;
+    m->rrcache_totalused       = 0;
+    m->rrcache_active          = 0;
+    m->rrcache_report          = 10;
+    m->rrcache_free            = mDNSNULL;
+
+    for (slot = 0; slot < CACHE_HASH_SLOTS; slot++)
+    {
+        m->rrcache_hash[slot]      = mDNSNULL;
+        m->rrcache_nextcheck[slot] = timenow + 0x78000000;;
+    }
+
+    mDNS_GrowCache_internal(m, rrcachestorage, rrcachesize);
+    m->rrauth.rrauth_free            = mDNSNULL;
+
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+        m->rrauth.rrauth_hash[slot] = mDNSNULL;
+
+    // Fields below only required for mDNS Responder...
+    m->hostlabel.c[0]          = 0;
+    m->nicelabel.c[0]          = 0;
+    m->MulticastHostname.c[0]  = 0;
+    m->HIHardware.c[0]         = 0;
+    m->HISoftware.c[0]         = 0;
+    m->ResourceRecords         = mDNSNULL;
+    m->DuplicateRecords        = mDNSNULL;
+    m->NewLocalRecords         = mDNSNULL;
+    m->NewLocalOnlyRecords     = mDNSfalse;
+    m->CurrentRecord           = mDNSNULL;
+    m->HostInterfaces          = mDNSNULL;
+    m->ProbeFailTime           = 0;
+    m->NumFailedProbes         = 0;
+    m->SuppressProbes          = 0;
+
+#ifndef UNICAST_DISABLED
+    m->NextuDNSEvent            = timenow + 0x78000000;
+    m->NextSRVUpdate            = timenow + 0x78000000;
+
+    m->DNSServers               = mDNSNULL;
+
+    m->Router                   = zeroAddr;
+    m->AdvertisedV4             = zeroAddr;
+    m->AdvertisedV6             = zeroAddr;
+
+    m->AuthInfoList             = mDNSNULL;
+
+    m->ReverseMap.ThisQInterval = -1;
+    m->StaticHostname.c[0]      = 0;
+    m->FQDN.c[0]                = 0;
+    m->Hostnames                = mDNSNULL;
+    m->AutoTunnelNAT.clientContext = mDNSNULL;
+
+    m->WABBrowseQueriesCount    = 0;
+    m->WABLBrowseQueriesCount   = 0;
+    m->WABRegQueriesCount       = 0;
+#if !TARGET_OS_EMBEDDED
+    m->mDNSOppCaching           = mDNStrue;
+#else
+    m->mDNSOppCaching           = mDNSfalse;
+#endif
+    m->AutoTargetServices       = 0;
+
+    // NAT traversal fields
+    m->LLQNAT.clientCallback    = mDNSNULL;
+    m->LLQNAT.clientContext     = mDNSNULL;
+    m->NATTraversals            = mDNSNULL;
+    m->CurrentNATTraversal      = mDNSNULL;
+    m->retryIntervalGetAddr     = 0;    // delta between time sent and retry
+    m->retryGetAddr             = timenow + 0x78000000; // absolute time when we retry
+    m->ExtAddress               = zerov4Addr;
+    m->PCPNonce[0]              = mDNSRandom(-1);
+    m->PCPNonce[1]              = mDNSRandom(-1);
+    m->PCPNonce[2]              = mDNSRandom(-1);
+
+    m->NATMcastRecvskt          = mDNSNULL;
+    m->LastNATupseconds         = 0;
+    m->LastNATReplyLocalTime    = timenow;
+    m->LastNATMapResultCode     = NATErr_None;
+
+    m->UPnPInterfaceID          = 0;
+    m->SSDPSocket               = mDNSNULL;
+    m->SSDPWANPPPConnection     = mDNSfalse;
+    m->UPnPRouterPort           = zeroIPPort;
+    m->UPnPSOAPPort             = zeroIPPort;
+    m->UPnPRouterURL            = mDNSNULL;
+    m->UPnPWANPPPConnection     = mDNSfalse;
+    m->UPnPSOAPURL              = mDNSNULL;
+    m->UPnPRouterAddressString  = mDNSNULL;
+    m->UPnPSOAPAddressString    = mDNSNULL;
+    m->SPSType                  = 0;
+    m->SPSPortability           = 0;
+    m->SPSMarginalPower         = 0;
+    m->SPSTotalPower            = 0;
+    m->SPSFeatureFlags          = 0;
+    m->SPSState                 = 0;
+    m->SPSProxyListChanged      = mDNSNULL;
+    m->SPSSocket                = mDNSNULL;
+    m->SPSBrowseCallback        = mDNSNULL;
+    m->ProxyRecords             = 0;
+
+#endif
+
+#if APPLE_OSX_mDNSResponder
+    m->TunnelClients            = mDNSNULL;
+
+#if !NO_WCF
+    CHECK_WCF_FUNCTION(WCFConnectionNew)
+    {
+        m->WCF = WCFConnectionNew();
+        if (!m->WCF) { LogMsg("WCFConnectionNew failed"); return -1; }
+    }
+#endif
+
+#endif
+
+    result = mDNSPlatformInit(m);
+
+#ifndef UNICAST_DISABLED
+    // It's better to do this *after* the platform layer has set up the
+    // interface list and security credentials
+    uDNS_SetupDNSConfig(m);                     // Get initial DNS configuration
+#endif
+
+    return(result);
+}
+
+mDNSexport void mDNS_ConfigChanged(mDNS *const m)
+{
+    if (m->SPSState == 1)
+    {
+        domainlabel name, newname;
+#ifndef SPC_DISABLED
+        domainname type, domain;
+        DeconstructServiceName(m->SPSRecords.RR_SRV.resrec.name, &name, &type, &domain);
+#endif // SPC_DISABLED
+        ConstructSleepProxyServerName(m, &newname);
+        if (!SameDomainLabelCS(name.c, newname.c))
+        {
+            LogSPS("Renaming SPS from “%#s” to “%#s”", name.c, newname.c);
+            // When SleepProxyServerCallback gets the mStatus_MemFree message,
+            // it will reregister the service under the new name
+            m->SPSState = 2;
+#ifndef SPC_DISABLED
+            mDNS_DeregisterService_drt(m, &m->SPSRecords, mDNS_Dereg_rapid);
+#endif // SPC_DISABLED
+        }
+    }
+
+    if (m->MainCallback)
+        m->MainCallback(m, mStatus_ConfigChanged);
+}
+
+mDNSlocal void DynDNSHostNameCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;    // unused
+    debugf("NameStatusCallback: result %d for registration of name %##s", result, rr->resrec.name->c);
+    mDNSPlatformDynDNSHostNameStatusChanged(rr->resrec.name, result);
+}
+
+mDNSlocal void PurgeOrReconfirmCacheRecord(mDNS *const m, CacheRecord *cr, const DNSServer * const ptr, mDNSBool lameduck)
+{
+    mDNSBool purge = cr->resrec.RecordType == kDNSRecordTypePacketNegative ||
+                     cr->resrec.rrtype     == kDNSType_A ||
+                     cr->resrec.rrtype     == kDNSType_AAAA ||
+                     cr->resrec.rrtype     == kDNSType_SRV;
+
+    (void) lameduck;
+    (void) ptr;
+    debugf("PurgeOrReconfirmCacheRecord: %s cache record due to %s server %p %#a:%d (%##s): %s",
+           purge    ? "purging"   : "reconfirming",
+           lameduck ? "lame duck" : "new",
+           ptr, &ptr->addr, mDNSVal16(ptr->port), ptr->domain.c, CRDisplayString(m, cr));
+
+    if (purge)
+    {
+        LogInfo("PurgeorReconfirmCacheRecord: Purging Resourcerecord %s, RecordType %x", CRDisplayString(m, cr), cr->resrec.RecordType);
+        mDNS_PurgeCacheResourceRecord(m, cr);
+    }
+    else
+    {
+        LogInfo("PurgeorReconfirmCacheRecord: Reconfirming Resourcerecord %s, RecordType %x", CRDisplayString(m, cr), cr->resrec.RecordType);
+        mDNS_Reconfirm_internal(m, cr, kDefaultReconfirmTimeForNoAnswer);
+    }
+}
+
+mDNSlocal void mDNS_PurgeForQuestion(mDNS *const m, DNSQuestion *q)
+{
+    const mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    CacheRecord *rp;
+    mDNSu8 validatingResponse = 0;
+
+    // For DNSSEC questions, purge the corresponding RRSIGs also.
+    if (DNSSECQuestion(q))
+    {
+        validatingResponse = q->ValidatingResponse;
+        q->ValidatingResponse = mDNStrue;
+    }
+    for (rp = cg ? cg->members : mDNSNULL; rp; rp = rp->next)
+    {
+        if (SameNameRecordAnswersQuestion(&rp->resrec, q))
+        {
+            LogInfo("mDNS_PurgeForQuestion: Flushing %s", CRDisplayString(m, rp));
+            mDNS_PurgeCacheResourceRecord(m, rp);
+        }
+    }
+    if (DNSSECQuestion(q))
+    {
+        q->ValidatingResponse = validatingResponse;
+    }
+}
+
+// For DNSSEC question, we need the DNSSEC records also. If the cache does not
+// have the DNSSEC records, we need to re-issue the question with EDNS0/DO bit set.
+// Just re-issuing the question for RRSIGs does not work in practice as the response
+// may not contain the RRSIGs whose typeCovered field matches the question's qtype.
+//
+// For negative responses, we need the NSECs to prove the non-existence. If we don't
+// have the cached NSECs, purge them. For positive responses, if we don't have the
+// RRSIGs and if we have not already issued the question with EDNS0/DO bit set, purge
+// them.
+mDNSlocal void CheckForDNSSECRecords(mDNS *const m, DNSQuestion *q)
+{
+    const mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    CacheRecord *rp;
+
+    for (rp = cg ? cg->members : mDNSNULL; rp; rp = rp->next)
+    {
+        if (SameNameRecordAnswersQuestion(&rp->resrec, q))
+        {
+            if (rp->resrec.RecordType != kDNSRecordTypePacketNegative || !rp->nsec)
+            {
+                if (!rp->CRDNSSECQuestion)
+                {
+                    LogInfo("CheckForDNSSECRecords: Flushing %s", CRDisplayString(m, rp));
+                    mDNS_PurgeCacheResourceRecord(m, rp);
+                }
+            }
+        }
+    }
+}
+
+// Check for a positive unicast response to the question but with qtype
+mDNSexport mDNSBool mDNS_CheckForCacheRecord(mDNS *const m, DNSQuestion *q, mDNSu16 qtype)
+{
+    DNSQuestion question;
+    const mDNSu32 slot = HashSlot(&q->qname);
+    CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+    CacheRecord *rp;
+
+    // Create an identical question but with qtype
+    mDNS_SetupQuestion(&question, q->InterfaceID, &q->qname, qtype, mDNSNULL, mDNSNULL);
+    question.qDNSServer = q->qDNSServer;
+
+    for (rp = cg ? cg->members : mDNSNULL; rp; rp = rp->next)
+    {
+        if (!rp->resrec.InterfaceID && rp->resrec.RecordType != kDNSRecordTypePacketNegative &&
+            SameNameRecordAnswersQuestion(&rp->resrec, &question))
+        {
+            LogInfo("mDNS_CheckForCacheRecord: Found %s", CRDisplayString(m, rp));
+            return mDNStrue;
+        }
+    }
+    return mDNSfalse;
+}
+
+mDNSexport void DNSServerChangeForQuestion(mDNS *const m, DNSQuestion *q, DNSServer *new)
+{
+    DNSQuestion *qptr;
+
+    (void) m;
+
+    if (q->DuplicateOf)
+        LogMsg("DNSServerChangeForQuestion: ERROR: Called for duplicate question %##s", q->qname.c);
+
+    // Make sure all the duplicate questions point to the same DNSServer so that delivery
+    // of events for all of them are consistent. Duplicates for a question are always inserted
+    // after in the list.
+    q->qDNSServer = new;
+    for (qptr = q->next ; qptr; qptr = qptr->next)
+    {
+        if (qptr->DuplicateOf == q) { qptr->validDNSServers = q->validDNSServers; qptr->qDNSServer = new; }
+    }
+}
+
+mDNSlocal void SetConfigState(mDNS *const m, mDNSBool delete)
+{
+    McastResolver *mr;
+    DNSServer *ptr;
+
+    if (delete)
+    {
+        for (ptr = m->DNSServers; ptr; ptr = ptr->next)
+        {
+            ptr->penaltyTime = 0;
+            NumUnicastDNSServers--;
+            ptr->flags |= DNSServer_FlagDelete;
+        }
+        // We handle the mcast resolvers here itself as mDNSPlatformSetDNSConfig looks at
+        // mcast resolvers. Today we get both mcast and ucast configuration using the same
+        // API
+        for (mr = m->McastResolvers; mr; mr = mr->next)
+            mr->flags |= McastResolver_FlagDelete;
+    }
+    else
+    {
+        for (ptr = m->DNSServers; ptr; ptr = ptr->next)
+        {
+            ptr->penaltyTime = 0;
+            NumUnicastDNSServers++;
+            ptr->flags &= ~DNSServer_FlagDelete;
+        }
+        for (mr = m->McastResolvers; mr; mr = mr->next)
+            mr->flags &= ~McastResolver_FlagDelete;
+    }
+}
+
+mDNSexport mStatus uDNS_SetupDNSConfig(mDNS *const m)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    mDNSBool Restart = mDNSfalse;
+    mDNSAddr v4, v6, r;
+    domainname fqdn;
+    DNSServer   *ptr, **p = &m->DNSServers;
+    const DNSServer *oldServers = m->DNSServers;
+    DNSQuestion *q;
+    McastResolver *mr, **mres = &m->McastResolvers;
+
+    debugf("uDNS_SetupDNSConfig: entry");
+
+    // Let the platform layer get the current DNS information and setup the WAB queries if needed.
+    uDNS_SetupWABQueries(m);
+
+    mDNS_Lock(m);
+
+    // We need to first mark all the entries to be deleted. If the configuration changed, then
+    // the entries would be undeleted appropriately. Otherwise, we need to clear them.
+    //
+    // Note: The last argument to mDNSPlatformSetDNSConfig is "mDNStrue" which means ack the
+    // configuration. We already processed search domains in uDNS_SetupWABQueries above and
+    // hence we are ready to ack the configuration as this is the last call to mDNSPlatformSetConfig
+    // for the dns configuration change notification.
+    SetConfigState(m, mDNStrue);
+    if (!mDNSPlatformSetDNSConfig(m, mDNStrue, mDNSfalse, &fqdn, mDNSNULL, mDNSNULL, mDNStrue))
+    {
+        SetConfigState(m, mDNSfalse);
+        mDNS_Unlock(m);
+        LogInfo("uDNS_SetupDNSConfig: No configuration change");
+        return mStatus_NoError;
+    }
+
+    // For now, we just delete the mcast resolvers. We don't deal with cache or
+    // questions here. Neither question nor cache point to mcast resolvers. Questions
+    // do inherit the timeout values from mcast resolvers. But we don't bother
+    // affecting them as they never change.
+    while (*mres)
+    {
+        if (((*mres)->flags & DNSServer_FlagDelete) != 0)
+        {
+            mr = *mres;
+            *mres = (*mres)->next;
+            debugf("uDNS_SetupDNSConfig: Deleting mcast resolver %##s", mr, mr->domain.c);
+            mDNSPlatformMemFree(mr);
+        }
+        else
+        {
+            (*mres)->flags &= ~McastResolver_FlagNew;
+            mres = &(*mres)->next;
+        }
+    }
+
+    // Update our qDNSServer pointers before we go and free the DNSServer object memory
+    //
+    // All non-scoped resolvers share the same resGroupID. At no point in time a cache entry using DNSServer
+    // from scoped resolver will be used to answer non-scoped questions and vice versa, as scoped and non-scoped
+    // resolvers don't share the same resGroupID. A few examples to describe the interaction with how we pick
+    // DNSServers and flush the cache.
+    //
+    // - A non-scoped question picks DNSServer X, creates a cache entry with X. If a new resolver gets added later that
+    //   is a better match, we pick the new DNSServer for the question and activate the unicast query. We may or may not
+    //   flush the cache (See PurgeOrReconfirmCacheRecord). In either case, we don't change the cache record's DNSServer
+    //   pointer immediately (qDNSServer and rDNSServer may be different but still share the same resGroupID). If we don't
+    //   flush the cache immediately, the record's rDNSServer pointer will be updated (in mDNSCoreReceiveResponse)
+    //   later when we get the response. If we purge the cache, we still deliver a RMV when it is purged even though
+    //   we don't update the cache record's DNSServer pointer to match the question's DNSSever, as they both point to
+    //   the same resGroupID.
+    //
+    //   Note: If the new DNSServer comes back with a different response than what we have in the cache, we will deliver a RMV
+    //   of the old followed by ADD of the new records.
+    //
+    // - A non-scoped question picks DNSServer X,  creates a cache entry with X. If the resolver gets removed later, we will
+    //   pick a new DNSServer for the question which may or may not be NULL and set the cache record's pointer to the same
+    //   as in question's qDNSServer if the cache record is not flushed. If there is no active question, it will be set to NULL.
+    //
+    // - Two questions scoped and non-scoped for the same name will pick two different DNSServer and will end up creating separate
+    //   cache records and as the resGroupID is different, you can't use the cache record from the scoped DNSServer to answer the
+    //   non-scoped question and vice versa.
+    //
+    for (q = m->Questions; q; q=q->next)
+    {
+        if (!mDNSOpaque16IsZero(q->TargetQID))
+        {
+            DNSServer *s, *t;
+            DNSQuestion *qptr;
+            if (q->DuplicateOf) continue;
+            SetValidDNSServers(m, q);
+            q->triedAllServersOnce = 0;
+            s = GetServerForQuestion(m, q);
+            t = q->qDNSServer;
+            if (t != s)
+            {
+                mDNSBool old, new;
+                // If DNS Server for this question has changed, reactivate it
+                LogInfo("uDNS_SetupDNSConfig: Updating DNS Server from %#a:%d (%##s) to %#a:%d (%##s) for question %##s (%s) (scope:%p)",
+                        t ? &t->addr : mDNSNULL, mDNSVal16(t ? t->port : zeroIPPort), t ? t->domain.c : (mDNSu8*)"",
+                        s ? &s->addr : mDNSNULL, mDNSVal16(s ? s->port : zeroIPPort), s ? s->domain.c : (mDNSu8*)"",
+                        q->qname.c, DNSTypeName(q->qtype), q->InterfaceID);
+
+                old = q->SuppressQuery;
+                new = ShouldSuppressUnicastQuery(m, q, s);
+                if (old != new)
+                {
+                    // Changing the DNS server affected the SuppressQuery status. We need to
+                    // deliver RMVs for the previous ADDs (if any) before switching to the new
+                    // DNSServer.  To keep it simple, we walk all the questions and mark them
+                    // to be restarted and then handle all of them at once.
+                    q->Restart = 1;
+                    q->SuppressQuery = new;
+                    for (qptr = q->next ; qptr; qptr = qptr->next)
+                    {
+                        if (qptr->DuplicateOf == q)
+                            qptr->Restart = 1;
+                    }
+                    Restart = mDNStrue;
+                }
+                else
+                {
+                    DNSServerChangeForQuestion(m, q, s);
+                    q->unansweredQueries = 0;
+
+                    // If we had sent a query out to DNSServer "t" and we are changing to "s", we
+                    // need to ignore the responses coming back from "t" as the DNS configuration
+                    // has changed e.g., when a new interface is coming up and that becomes the primary
+                    // interface, we switch to the DNS servers configured for the primary interface. In
+                    // this case, we should not accept responses associated with the previous interface as
+                    // the "name" could resolve differently on this new primary interface. Hence, discard
+                    // in-flight responses.
+                    q->TargetQID = mDNS_NewMessageID(m);
+
+                    if (!QuerySuppressed(q))
+                    {
+                        debugf("uDNS_SetupDNSConfig: Activating query %p %##s (%s)", q, q->qname.c, DNSTypeName(q->qtype));
+                        ActivateUnicastQuery(m, q, mDNStrue);
+                        // ActivateUnicastQuery is called for duplicate questions also as it does something
+                        // special for AutoTunnel questions
+                        for (qptr = q->next ; qptr; qptr = qptr->next)
+                        {
+                            if (qptr->DuplicateOf == q) ActivateUnicastQuery(m, qptr, mDNStrue);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                debugf("uDNS_SetupDNSConfig: Not Updating DNS server question %p %##s (%s) DNS server %#a:%d %p %d",
+                       q, q->qname.c, DNSTypeName(q->qtype), t ? &t->addr : mDNSNULL, mDNSVal16(t ? t->port : zeroIPPort), q->DuplicateOf, q->SuppressUnusable);
+                for (qptr = q->next ; qptr; qptr = qptr->next)
+                    if (qptr->DuplicateOf == q) { qptr->validDNSServers = q->validDNSServers; qptr->qDNSServer = q->qDNSServer; }
+            }
+        }
+    }
+    if (Restart)
+        RestartUnicastQuestions(m);
+
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if (cr->resrec.InterfaceID)
+            continue;
+
+        // We already walked the questions and restarted/reactivated them if the dns server
+        // change affected the question. That should take care of updating the cache. But
+        // what if there is no active question at this point when the DNS server change
+        // happened ? There could be old cache entries lying around and if we don't flush
+        // them, a new question after the DNS server change could pick up these stale
+        // entries and get a wrong answer.
+        //
+        // For cache entries that have active questions we might have skipped rescheduling
+        // the questions if they were suppressed (see above). To keep it simple, we walk
+        // all the cache entries to make sure that there are no stale entries. We use the
+        // active question's InterfaceID/ServiceID for looking up the right DNS server.
+        // Note that the unscoped value for ServiceID is -1.
+        //
+        // Note: If GetServerForName returns NULL, it could either mean that there are no
+        // DNS servers or no matching DNS servers for this question. In either case,
+        // the cache should get purged below when we process deleted DNS servers.
+
+        ptr = GetServerForName(m, cr->resrec.name,
+                               (cr->CRActiveQuestion ? cr->CRActiveQuestion->InterfaceID : mDNSNULL),
+                               (cr->CRActiveQuestion ? cr->CRActiveQuestion->ServiceID   : -1));
+
+        // Purge or Reconfirm if this cache entry would use the new DNS server
+        if (ptr && (ptr != cr->resrec.rDNSServer))
+        {
+            // As the DNSServers for this cache record is not the same anymore, we don't
+            // want any new questions to pick this old value. If there is no active question,
+            // we can't possibly re-confirm, so purge in that case. If it is a DNSSEC question,
+            // purge the cache as the DNSSEC capabilities of the DNS server may have changed.
+
+            if (cr->CRActiveQuestion == mDNSNULL || DNSSECQuestion(cr->CRActiveQuestion))
+            {
+                LogInfo("uDNS_SetupDNSConfig: Purging Resourcerecord %s, New DNS server %#a , Old DNS server %#a", CRDisplayString(m, cr),
+                        &ptr->addr, (cr->resrec.rDNSServer != mDNSNULL ?  &cr->resrec.rDNSServer->addr : mDNSNULL));
+                mDNS_PurgeCacheResourceRecord(m, cr);
+            }
+            else
+            {
+                LogInfo("uDNS_SetupDNSConfig: Purging/Reconfirming Resourcerecord %s, New DNS server %#a, Old DNS server %#a", CRDisplayString(m, cr),
+                        &ptr->addr, (cr->resrec.rDNSServer != mDNSNULL ?  &cr->resrec.rDNSServer->addr : mDNSNULL));
+                PurgeOrReconfirmCacheRecord(m, cr, ptr, mDNSfalse);
+            }
+        }
+    }
+
+    while (*p)
+    {
+        if (((*p)->flags & DNSServer_FlagDelete) != 0)
+        {
+            // Scan our cache, looking for uDNS records that we would have queried this server for.
+            // We reconfirm any records that match, because in this world of split DNS, firewalls, etc.
+            // different DNS servers can give different answers to the same question.
+            ptr = *p;
+            FORALL_CACHERECORDS(slot, cg, cr)
+            {
+                if (cr->resrec.InterfaceID) continue;
+                if (cr->resrec.rDNSServer == ptr)
+                {
+                    // If we don't have an active question for this cache record, neither Purge can
+                    // generate RMV events nor Reconfirm can send queries out. Just set the DNSServer
+                    // pointer on the record NULL so that we don't point to freed memory (We might dereference
+                    // DNSServer pointers from resource record for logging purposes).
+                    //
+                    // If there is an active question, point to its DNSServer as long as it does not point to the
+                    // freed one. We already went through the questions above and made them point at either the
+                    // new server or NULL if there is no server.
+
+                    if (cr->CRActiveQuestion)
+                    {
+                        DNSQuestion *qptr = cr->CRActiveQuestion;
+
+                        if (qptr->qDNSServer == ptr)
+                        {
+                            LogMsg("uDNS_SetupDNSConfig: ERROR!! Cache Record %s  Active question %##s (%s) (scope:%p) poining to DNSServer Address %#a"
+                                   " to be freed", CRDisplayString(m, cr),  qptr->qname.c, DNSTypeName(qptr->qtype), qptr->InterfaceID, &ptr->addr);
+                            qptr->validDNSServers = zeroOpaque64;
+                            qptr->qDNSServer = mDNSNULL;
+                            cr->resrec.rDNSServer = mDNSNULL;
+                        }
+                        else
+                        {
+                            LogInfo("uDNS_SetupDNSConfig: Cache Record %s,  Active question %##s (%s) (scope:%p), pointing to DNSServer %#a (to be deleted),"
+                                    " resetting to  question's DNSServer Address %#a", CRDisplayString(m, cr),  qptr->qname.c, DNSTypeName(qptr->qtype),
+                                    qptr->InterfaceID, &ptr->addr, (qptr->qDNSServer ? &qptr->qDNSServer->addr : mDNSNULL));
+                            cr->resrec.rDNSServer = qptr->qDNSServer;
+                        }
+                    }
+                    else
+                    {
+                        LogInfo("uDNS_SetupDNSConfig: Cache Record %##s has no Active question, Record's DNSServer Address %#a, Server to be deleted %#a",
+                                cr->resrec.name, &cr->resrec.rDNSServer->addr, &ptr->addr);
+                        cr->resrec.rDNSServer = mDNSNULL;
+                    }
+
+                    PurgeOrReconfirmCacheRecord(m, cr, ptr, mDNStrue);
+                }
+            }
+            *p = (*p)->next;
+            LogInfo("uDNS_SetupDNSConfig: Deleting server %p %#a:%d (%##s) %d", ptr, &ptr->addr, mDNSVal16(ptr->port), ptr->domain.c, NumUnicastDNSServers);
+            mDNSPlatformMemFree(ptr);
+        }
+        else
+        {
+            (*p)->flags &= ~DNSServer_FlagNew;
+            p = &(*p)->next;
+        }
+    }
+
+    // If we now have no DNS servers at all and we used to have some, then immediately purge all unicast cache records (including for LLQs).
+    // This is important for giving prompt remove events when the user disconnects the Ethernet cable or turns off wireless.
+    // Otherwise, stale data lingers for 5-10 seconds, which is not the user-experience people expect from Bonjour.
+    // Similarly, if we now have some DNS servers and we used to have none, we want to purge any fake negative results we may have generated.
+    if ((m->DNSServers != mDNSNULL) != (oldServers != mDNSNULL))
+    {
+        int count = 0;
+        FORALL_CACHERECORDS(slot, cg, cr)
+        {
+            if (!cr->resrec.InterfaceID)
+            {
+                mDNS_PurgeCacheResourceRecord(m, cr);
+                count++;
+            }
+        }
+        LogInfo("uDNS_SetupDNSConfig: %s available; purged %d unicast DNS records from cache",
+                m->DNSServers ? "DNS server became" : "No DNS servers", count);
+
+        // Force anything that needs to get zone data to get that information again
+        RestartRecordGetZoneData(m);
+    }
+
+    // Did our FQDN change?
+    if (!SameDomainName(&fqdn, &m->FQDN))
+    {
+        if (m->FQDN.c[0]) mDNS_RemoveDynDNSHostName(m, &m->FQDN);
+
+        AssignDomainName(&m->FQDN, &fqdn);
+
+        if (m->FQDN.c[0])
+        {
+            mDNSPlatformDynDNSHostNameStatusChanged(&m->FQDN, 1);
+            mDNS_AddDynDNSHostName(m, &m->FQDN, DynDNSHostNameCallback, mDNSNULL);
+        }
+    }
+
+    mDNS_Unlock(m);
+
+    // handle router and primary interface changes
+    v4 = v6 = r = zeroAddr;
+    v4.type = r.type = mDNSAddrType_IPv4;
+
+    if (mDNSPlatformGetPrimaryInterface(m, &v4, &v6, &r) == mStatus_NoError && !mDNSv4AddressIsLinkLocal(&v4.ip.v4))
+    {
+        mDNS_SetPrimaryInterfaceInfo(m,
+                                     !mDNSIPv4AddressIsZero(v4.ip.v4) ? &v4 : mDNSNULL,
+                                     !mDNSIPv6AddressIsZero(v6.ip.v6) ? &v6 : mDNSNULL,
+                                     !mDNSIPv4AddressIsZero(r.ip.v4) ? &r  : mDNSNULL);
+    }
+    else
+    {
+        mDNS_SetPrimaryInterfaceInfo(m, mDNSNULL, mDNSNULL, mDNSNULL);
+        if (m->FQDN.c[0]) mDNSPlatformDynDNSHostNameStatusChanged(&m->FQDN, 1); // Set status to 1 to indicate temporary failure
+    }
+
+    debugf("uDNS_SetupDNSConfig: number of unicast DNS servers %d", NumUnicastDNSServers);
+    return mStatus_NoError;
+}
+
+mDNSexport void mDNSCoreInitComplete(mDNS *const m, mStatus result)
+{
+    m->mDNSPlatformStatus = result;
+    if (m->MainCallback)
+    {
+        mDNS_Lock(m);
+        mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+        m->MainCallback(m, mStatus_NoError);
+        mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+        mDNS_Unlock(m);
+    }
+}
+
+mDNSlocal void DeregLoop(mDNS *const m, AuthRecord *const start)
+{
+    m->CurrentRecord = start;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rr = m->CurrentRecord;
+        LogInfo("DeregLoop: %s deregistration for %p %02X %s",
+                (rr->resrec.RecordType != kDNSRecordTypeDeregistering) ? "Initiating  " : "Accelerating",
+                rr, rr->resrec.RecordType, ARDisplayString(m, rr));
+        if (rr->resrec.RecordType != kDNSRecordTypeDeregistering)
+            mDNS_Deregister_internal(m, rr, mDNS_Dereg_rapid);
+        else if (rr->AnnounceCount > 1)
+        {
+            rr->AnnounceCount = 1;
+            rr->LastAPTime = m->timenow - rr->ThisAPInterval;
+        }
+        // Mustn't advance m->CurrentRecord until *after* mDNS_Deregister_internal, because
+        // new records could have been added to the end of the list as a result of that call.
+        if (m->CurrentRecord == rr) // If m->CurrentRecord was not advanced for us, do it now
+            m->CurrentRecord = rr->next;
+    }
+}
+
+mDNSexport void mDNS_StartExit(mDNS *const m)
+{
+    NetworkInterfaceInfo *intf;
+    AuthRecord *rr;
+
+    mDNS_Lock(m);
+
+    LogInfo("mDNS_StartExit");
+    m->ShutdownTime = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 5);
+
+    mDNSCoreBeSleepProxyServer_internal(m, 0, 0, 0, 0, 0);
+
+#if APPLE_OSX_mDNSResponder
+#if !NO_WCF
+    CHECK_WCF_FUNCTION(WCFConnectionDealloc)
+    {
+        if (m->WCF) WCFConnectionDealloc((WCFConnection *)m->WCF);
+    }
+#endif
+#endif
+
+#ifndef UNICAST_DISABLED
+    {
+        SearchListElem *s;
+        SuspendLLQs(m);
+        // Don't need to do SleepRecordRegistrations() here
+        // because we deregister all records and services later in this routine
+        while (m->Hostnames) mDNS_RemoveDynDNSHostName(m, &m->Hostnames->fqdn);
+
+        // For each member of our SearchList, deregister any records it may have created, and cut them from the list.
+        // Otherwise they'll be forcibly deregistered for us (without being cut them from the appropriate list)
+        // and we may crash because the list still contains dangling pointers.
+        for (s = SearchList; s; s = s->next)
+            while (s->AuthRecs)
+            {
+                ARListElem *dereg = s->AuthRecs;
+                s->AuthRecs = s->AuthRecs->next;
+                mDNS_Deregister_internal(m, &dereg->ar, mDNS_Dereg_normal); // Memory will be freed in the FreeARElemCallback
+            }
+    }
+#endif
+
+    for (intf = m->HostInterfaces; intf; intf = intf->next)
+        if (intf->Advertise)
+            DeadvertiseInterface(m, intf);
+
+    // Shut down all our active NAT Traversals
+    while (m->NATTraversals)
+    {
+        NATTraversalInfo *t = m->NATTraversals;
+        mDNS_StopNATOperation_internal(m, t);       // This will cut 't' from the list, thereby advancing m->NATTraversals in the process
+
+        // After stopping the NAT Traversal, we zero out the fields.
+        // This has particularly important implications for our AutoTunnel records --
+        // when we deregister our AutoTunnel records below, we don't want their mStatus_MemFree
+        // handlers to just turn around and attempt to re-register those same records.
+        // Clearing t->ExternalPort/t->RequestedPort will cause the mStatus_MemFree callback handlers
+        // to not do this.
+        t->ExternalAddress = zerov4Addr;
+        t->NewAddress      = zerov4Addr;
+        t->ExternalPort    = zeroIPPort;
+        t->RequestedPort   = zeroIPPort;
+        t->Lifetime        = 0;
+        t->Result          = mStatus_NoError;
+    }
+
+    // Make sure there are nothing but deregistering records remaining in the list
+    if (m->CurrentRecord)
+        LogMsg("mDNS_StartExit: ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+
+    // We're in the process of shutting down, so queries, etc. are no longer available.
+    // Consequently, determining certain information, e.g. the uDNS update server's IP
+    // address, will not be possible.  The records on the main list are more likely to
+    // already contain such information, so we deregister the duplicate records first.
+    LogInfo("mDNS_StartExit: Deregistering duplicate resource records");
+    DeregLoop(m, m->DuplicateRecords);
+    LogInfo("mDNS_StartExit: Deregistering resource records");
+    DeregLoop(m, m->ResourceRecords);
+
+    // If we scheduled a response to send goodbye packets, we set NextScheduledResponse to now. Normally when deregistering records,
+    // we allow up to 100ms delay (to help improve record grouping) but when shutting down we don't want any such delay.
+    if (m->NextScheduledResponse - m->timenow < mDNSPlatformOneSecond)
+    {
+        m->NextScheduledResponse = m->timenow;
+        m->SuppressSending = 0;
+    }
+
+    if (m->ResourceRecords) LogInfo("mDNS_StartExit: Sending final record deregistrations");
+    else LogInfo("mDNS_StartExit: No deregistering records remain");
+
+    for (rr = m->DuplicateRecords; rr; rr = rr->next)
+        LogMsg("mDNS_StartExit: Should not still have Duplicate Records remaining: %02X %s", rr->resrec.RecordType, ARDisplayString(m, rr));
+
+    // If any deregistering records remain, send their deregistration announcements before we exit
+    if (m->mDNSPlatformStatus != mStatus_NoError) DiscardDeregistrations(m);
+
+    mDNS_Unlock(m);
+
+    LogInfo("mDNS_StartExit: done");
+}
+
+mDNSexport void mDNS_FinalExit(mDNS *const m)
+{
+    mDNSu32 rrcache_active = 0;
+    mDNSu32 rrcache_totalused = 0;
+    mDNSu32 slot;
+    AuthRecord *rr;
+
+    LogInfo("mDNS_FinalExit: mDNSPlatformClose");
+    mDNSPlatformClose(m);
+
+    rrcache_totalused = m->rrcache_totalused;
+    for (slot = 0; slot < CACHE_HASH_SLOTS; slot++)
+    {
+        while (m->rrcache_hash[slot])
+        {
+            CacheGroup *cg = m->rrcache_hash[slot];
+            while (cg->members)
+            {
+                CacheRecord *cr = cg->members;
+                cg->members = cg->members->next;
+                if (cr->CRActiveQuestion) rrcache_active++;
+                ReleaseCacheRecord(m, cr);
+            }
+            cg->rrcache_tail = &cg->members;
+            ReleaseCacheGroup(m, &m->rrcache_hash[slot]);
+        }
+    }
+    debugf("mDNS_FinalExit: RR Cache was using %ld records, %lu active", rrcache_totalused, rrcache_active);
+    if (rrcache_active != m->rrcache_active)
+        LogMsg("*** ERROR *** rrcache_active %lu != m->rrcache_active %lu", rrcache_active, m->rrcache_active);
+
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+        LogMsg("mDNS_FinalExit failed to send goodbye for: %p %02X %s", rr, rr->resrec.RecordType, ARDisplayString(m, rr));
+
+    LogInfo("mDNS_FinalExit: done");
+}
diff --git a/mDNSResponder/mDNSCore/mDNSDebug.h b/mDNSResponder/mDNSCore/mDNSDebug.h
new file mode 100755
index 00000000..5467ae64
--- /dev/null
+++ b/mDNSResponder/mDNSCore/mDNSDebug.h
@@ -0,0 +1,166 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __mDNSDebug_h
+#define __mDNSDebug_h
+
+// Set MDNS_DEBUGMSGS to 0 to optimize debugf() calls out of the compiled code
+// Set MDNS_DEBUGMSGS to 1 to generate normal debugging messages
+// Set MDNS_DEBUGMSGS to 2 to generate verbose debugging messages
+// MDNS_DEBUGMSGS is normally set in the project options (or makefile) but can also be set here if desired
+// (If you edit the file here to turn on MDNS_DEBUGMSGS while you're debugging some code, be careful
+// not to accidentally check-in that change by mistake when you check in your other changes.)
+
+//#undef MDNS_DEBUGMSGS
+//#define MDNS_DEBUGMSGS 2
+
+// Set MDNS_CHECK_PRINTF_STYLE_FUNCTIONS to 1 to enable extra GCC compiler warnings
+// Note: You don't normally want to do this, because it generates a bunch of
+// spurious warnings for the following custom extensions implemented by mDNS_vsnprintf:
+//    warning: `#' flag used with `%s' printf format    (for %#s              -- pascal string format)
+//    warning: repeated `#' flag in format              (for %##s             -- DNS name string format)
+//    warning: double format, pointer arg (arg 2)       (for %.4a, %.16a, %#a -- IP address formats)
+#define MDNS_CHECK_PRINTF_STYLE_FUNCTIONS 0
+
+typedef enum
+{
+    MDNS_LOG_MSG,
+    MDNS_LOG_OPERATION,
+    MDNS_LOG_SPS,
+    MDNS_LOG_INFO,
+    MDNS_LOG_DEBUG,
+} mDNSLogLevel_t;
+
+// Set this symbol to 1 to answer remote queries for our Address, reverse mapping PTR, and HINFO records
+#define ANSWER_REMOTE_HOSTNAME_QUERIES 0
+
+// Set this symbol to 1 to do extra debug checks on malloc() and free()
+// Set this symbol to 2 to write a log message for every malloc() and free()
+//#define MACOSX_MDNS_MALLOC_DEBUGGING 1
+
+//#define ForceAlerts 1
+//#define LogTimeStamps 1
+
+// Developer-settings section ends here
+
+#if MDNS_CHECK_PRINTF_STYLE_FUNCTIONS
+#define IS_A_PRINTF_STYLE_FUNCTION(F,A) __attribute__ ((format(printf,F,A)))
+#else
+#define IS_A_PRINTF_STYLE_FUNCTION(F,A)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Variable argument macro support. Use ANSI C99 __VA_ARGS__ where possible. Otherwise, use the next best thing.
+
+#if (defined(__GNUC__))
+    #if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2)))
+        #define MDNS_C99_VA_ARGS        1
+        #define MDNS_GNU_VA_ARGS        0
+    #else
+        #define MDNS_C99_VA_ARGS        0
+        #define MDNS_GNU_VA_ARGS        1
+    #endif
+    #define MDNS_HAS_VA_ARG_MACROS      1
+#elif (_MSC_VER >= 1400) // Visual Studio 2005 and later
+    #define MDNS_C99_VA_ARGS            1
+    #define MDNS_GNU_VA_ARGS            0
+    #define MDNS_HAS_VA_ARG_MACROS      1
+#elif (defined(__MWERKS__))
+    #define MDNS_C99_VA_ARGS            1
+    #define MDNS_GNU_VA_ARGS            0
+    #define MDNS_HAS_VA_ARG_MACROS      1
+#else
+    #define MDNS_C99_VA_ARGS            0
+    #define MDNS_GNU_VA_ARGS            0
+    #define MDNS_HAS_VA_ARG_MACROS      0
+#endif
+
+#if (MDNS_HAS_VA_ARG_MACROS)
+    #if (MDNS_C99_VA_ARGS)
+        #define debug_noop(... ) ((void)0)
+        #define LogMsg(... )           LogMsgWithLevel(MDNS_LOG_MSG, __VA_ARGS__)
+        #define LogOperation(... )     do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_OPERATION, __VA_ARGS__);} while (0)
+        #define LogSPS(... )           do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_SPS,       __VA_ARGS__);} while (0)
+        #define LogInfo(... )          do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_INFO,      __VA_ARGS__);} while (0)
+    #elif (MDNS_GNU_VA_ARGS)
+        #define debug_noop( ARGS... ) ((void)0)
+        #define LogMsg( ARGS... )       LogMsgWithLevel(MDNS_LOG_MSG, ARGS)
+        #define LogOperation( ARGS... ) do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_OPERATION, ARGS);} while (0)
+        #define LogSPS( ARGS... )       do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_SPS,       ARGS);} while (0)
+        #define LogInfo( ARGS... )      do { if (mDNS_LoggingEnabled) LogMsgWithLevel(MDNS_LOG_INFO,      ARGS);} while (0)
+    #else
+        #error Unknown variadic macros
+    #endif
+#else
+// If your platform does not support variadic macros, you need to define the following variadic functions.
+// See mDNSShared/mDNSDebug.c for sample implementation
+    #define debug_noop 1 ? (void)0 : (void)
+    #define LogMsg LogMsg_
+    #define LogOperation (mDNS_LoggingEnabled == 0) ? ((void)0) : LogOperation_
+    #define LogSPS       (mDNS_LoggingEnabled == 0) ? ((void)0) : LogSPS_
+    #define LogInfo      (mDNS_LoggingEnabled == 0) ? ((void)0) : LogInfo_
+extern void LogMsg_(const char *format, ...)       IS_A_PRINTF_STYLE_FUNCTION(1,2);
+extern void LogOperation_(const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(1,2);
+extern void LogSPS_(const char *format, ...)       IS_A_PRINTF_STYLE_FUNCTION(1,2);
+extern void LogInfo_(const char *format, ...)      IS_A_PRINTF_STYLE_FUNCTION(1,2);
+#endif
+
+#if MDNS_DEBUGMSGS
+#define debugf debugf_
+extern void debugf_(const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(1,2);
+#else
+#define debugf debug_noop
+#endif
+
+#if MDNS_DEBUGMSGS > 1
+#define verbosedebugf verbosedebugf_
+extern void verbosedebugf_(const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(1,2);
+#else
+#define verbosedebugf debug_noop
+#endif
+
+extern int mDNS_LoggingEnabled;
+extern int mDNS_PacketLoggingEnabled;
+extern int mDNS_McastLoggingEnabled;
+extern int mDNS_McastTracingEnabled;
+extern int mDNS_DebugMode;          // If non-zero, LogMsg() writes to stderr instead of syslog
+extern const char ProgramName[];
+
+extern void LogMsgWithLevel(mDNSLogLevel_t logLevel, const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(2,3);
+// LogMsgNoIdent needs to be fixed so that it logs without the ident prefix like it used to
+// (or completely overhauled to use the new "log to a separate file" facility)
+#define LogMsgNoIdent LogMsg
+
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING >= 1
+extern void *mallocL(char *msg, unsigned int size);
+extern void freeL(char *msg, void *x);
+extern void LogMemCorruption(const char *format, ...);
+extern void uds_validatelists(void);
+extern void udns_validatelists(void *const v);
+#else
+#define mallocL(X,Y) malloc(Y)
+#define freeL(X,Y) free(Y)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mDNSResponder/mDNSCore/mDNSEmbeddedAPI.h b/mDNSResponder/mDNSCore/mDNSEmbeddedAPI.h
new file mode 100755
index 00000000..785ed3fe
--- /dev/null
+++ b/mDNSResponder/mDNSCore/mDNSEmbeddedAPI.h
@@ -0,0 +1,3586 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+   NOTE:
+   If you're building an application that uses DNS Service Discovery
+   this is probably NOT the header file you're looking for.
+   In most cases you will want to use /usr/include/dns_sd.h instead.
+
+   This header file defines the lowest level raw interface to mDNSCore,
+   which is appropriate *only* on tiny embedded systems where everything
+   runs in a single address space and memory is extremely constrained.
+   All the APIs here are malloc-free, which means that the caller is
+   responsible for passing in a pointer to the relevant storage that
+   will be used in the execution of that call, and (when called with
+   correct parameters) all the calls are guaranteed to succeed. There
+   is never a case where a call can suffer intermittent failures because
+   the implementation calls malloc() and sometimes malloc() returns NULL
+   because memory is so limited that no more is available.
+   This is primarily for devices that need to have precisely known fixed
+   memory requirements, with absolutely no uncertainty or run-time variation,
+   but that certainty comes at a cost of more difficult programming.
+
+   For applications running on general-purpose desktop operating systems
+   (Mac OS, Linux, Solaris, Windows, etc.) the API you should use is
+   /usr/include/dns_sd.h, which defines the API by which multiple
+   independent client processes communicate their DNS Service Discovery
+   requests to a single "mdnsd" daemon running in the background.
+
+   Even on platforms that don't run multiple independent processes in
+   multiple independent address spaces, you can still use the preferred
+   dns_sd.h APIs by linking in "dnssd_clientshim.c", which implements
+   the standard "dns_sd.h" API calls, allocates any required storage
+   using malloc(), and then calls through to the low-level malloc-free
+   mDNSCore routines defined here. This has the benefit that even though
+   you're running on a small embedded system with a single address space,
+   you can still use the exact same client C code as you'd use on a
+   general-purpose desktop system.
+
+ */
+
+#ifndef __mDNSEmbeddedAPI_h
+#define __mDNSEmbeddedAPI_h
+
+#if defined(EFI32) || defined(EFI64) || defined(EFIX64)
+// EFI doesn't have stdarg.h unless it's building with GCC.
+#include "Tiano.h"
+#if !defined(__GNUC__)
+#define va_list         VA_LIST
+#define va_start(a, b)  VA_START(a, b)
+#define va_end(a)       VA_END(a)
+#define va_arg(a, b)    VA_ARG(a, b)
+#endif
+#else
+#include <stdarg.h>     // stdarg.h is required for for va_list support for the mDNS_vsnprintf declaration
+#endif
+
+#include "mDNSDebug.h"
+#if APPLE_OSX_mDNSResponder
+#include <uuid/uuid.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ***************************************************************************
+// Feature removal compile options & limited resource targets
+
+// The following compile options are responsible for removing certain features from mDNSCore to reduce the
+// memory footprint for use in embedded systems with limited resources.
+
+// UNICAST_DISABLED - disables unicast DNS functionality, including Wide Area Bonjour
+// ANONYMOUS_DISABLED - disables anonymous functionality
+// DNSSEC_DISABLED - disables DNSSEC functionality
+// SPC_DISABLED - disables Bonjour Sleep Proxy client
+// IDLESLEEPCONTROL_DISABLED - disables sleep control for Bonjour Sleep Proxy clients
+
+// In order to disable the above features pass the option to your compiler, e.g. -D UNICAST_DISABLED
+
+// Additionally, the LIMITED_RESOURCES_TARGET compile option will eliminate caching and
+// and reduce the maximum DNS message sizes.
+
+#ifdef LIMITED_RESOURCES_TARGET
+// Don't support jumbo frames
+#define AbsoluteMaxDNSMessageData 	1500
+// StandardAuthRDSize is 264 (256+8), which is large enough to hold a maximum-sized SRV record (6 + 256 bytes)
+#define MaximumRDSize				264
+// Don't cache anything
+#define AUTH_HASH_SLOTS 			1
+#define CACHE_HASH_SLOTS			1
+#endif
+
+// ***************************************************************************
+// Function scope indicators
+
+// If you see "mDNSlocal" before a function name in a C file, it means the function is not callable outside this file
+#ifndef mDNSlocal
+#define mDNSlocal static
+#endif
+// If you see "mDNSexport" before a symbol in a C file, it means the symbol is exported for use by clients
+// For every "mDNSexport" in a C file, there needs to be a corresponding "extern" declaration in some header file
+// (When a C file #includes a header file, the "extern" declarations tell the compiler:
+// "This symbol exists -- but not necessarily in this C file.")
+#ifndef mDNSexport
+#define mDNSexport
+#endif
+
+// Explanation: These local/export markers are a little habit of mine for signaling the programmers' intentions.
+// When "mDNSlocal" is just a synonym for "static", and "mDNSexport" is a complete no-op, you could be
+// forgiven for asking what purpose they serve. The idea is that if you see "mDNSexport" in front of a
+// function definition it means the programmer intended it to be exported and callable from other files
+// in the project. If you see "mDNSlocal" in front of a function definition it means the programmer
+// intended it to be private to that file. If you see neither in front of a function definition it
+// means the programmer forgot (so you should work out which it is supposed to be, and fix it).
+// Using "mDNSlocal" instead of "static" makes it easier to do a textual searches for one or the other.
+// For example you can do a search for "static" to find if any functions declare any local variables as "static"
+// (generally a bad idea unless it's also "const", because static storage usually risks being non-thread-safe)
+// without the results being cluttered with hundreds of matches for functions declared static.
+// - Stuart Cheshire
+
+// ***************************************************************************
+// Structure packing macro
+
+// If we're not using GNUC, it's not fatal.
+// Most compilers naturally pack the on-the-wire structures correctly anyway, so a plain "struct" is usually fine.
+// In the event that structures are not packed correctly, mDNS_Init() will detect this and report an error, so the
+// developer will know what's wrong, and can investigate what needs to be done on that compiler to provide proper packing.
+#ifndef packedstruct
+ #if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9)))
+  #define packedstruct struct __attribute__((__packed__))
+  #define packedunion  union  __attribute__((__packed__))
+ #else
+  #define packedstruct struct
+  #define packedunion  union
+ #endif
+#endif
+
+// ***************************************************************************
+#if 0
+#pragma mark - DNS Resource Record class and type constants
+#endif
+
+typedef enum                            // From RFC 1035
+{
+    kDNSClass_IN               = 1,     // Internet
+    kDNSClass_CS               = 2,     // CSNET
+    kDNSClass_CH               = 3,     // CHAOS
+    kDNSClass_HS               = 4,     // Hesiod
+    kDNSClass_NONE             = 254,   // Used in DNS UPDATE [RFC 2136]
+
+    kDNSClass_Mask             = 0x7FFF, // Multicast DNS uses the bottom 15 bits to identify the record class...
+    kDNSClass_UniqueRRSet      = 0x8000, // ... and the top bit indicates that all other cached records are now invalid
+
+    kDNSQClass_ANY             = 255,   // Not a DNS class, but a DNS query class, meaning "all classes"
+    kDNSQClass_UnicastResponse = 0x8000 // Top bit set in a question means "unicast response acceptable"
+} DNS_ClassValues;
+
+typedef enum                // From RFC 1035
+{
+    kDNSType_A = 1,         //  1 Address
+    kDNSType_NS,            //  2 Name Server
+    kDNSType_MD,            //  3 Mail Destination
+    kDNSType_MF,            //  4 Mail Forwarder
+    kDNSType_CNAME,         //  5 Canonical Name
+    kDNSType_SOA,           //  6 Start of Authority
+    kDNSType_MB,            //  7 Mailbox
+    kDNSType_MG,            //  8 Mail Group
+    kDNSType_MR,            //  9 Mail Rename
+    kDNSType_NULL,          // 10 NULL RR
+    kDNSType_WKS,           // 11 Well-known-service
+    kDNSType_PTR,           // 12 Domain name pointer
+    kDNSType_HINFO,         // 13 Host information
+    kDNSType_MINFO,         // 14 Mailbox information
+    kDNSType_MX,            // 15 Mail Exchanger
+    kDNSType_TXT,           // 16 Arbitrary text string
+    kDNSType_RP,            // 17 Responsible person
+    kDNSType_AFSDB,         // 18 AFS cell database
+    kDNSType_X25,           // 19 X_25 calling address
+    kDNSType_ISDN,          // 20 ISDN calling address
+    kDNSType_RT,            // 21 Router
+    kDNSType_NSAP,          // 22 NSAP address
+    kDNSType_NSAP_PTR,      // 23 Reverse NSAP lookup (deprecated)
+    kDNSType_SIG,           // 24 Security signature
+    kDNSType_KEY,           // 25 Security key
+    kDNSType_PX,            // 26 X.400 mail mapping
+    kDNSType_GPOS,          // 27 Geographical position (withdrawn)
+    kDNSType_AAAA,          // 28 IPv6 Address
+    kDNSType_LOC,           // 29 Location Information
+    kDNSType_NXT,           // 30 Next domain (security)
+    kDNSType_EID,           // 31 Endpoint identifier
+    kDNSType_NIMLOC,        // 32 Nimrod Locator
+    kDNSType_SRV,           // 33 Service record
+    kDNSType_ATMA,          // 34 ATM Address
+    kDNSType_NAPTR,         // 35 Naming Authority PoinTeR
+    kDNSType_KX,            // 36 Key Exchange
+    kDNSType_CERT,          // 37 Certification record
+    kDNSType_A6,            // 38 IPv6 Address (deprecated)
+    kDNSType_DNAME,         // 39 Non-terminal DNAME (for IPv6)
+    kDNSType_SINK,          // 40 Kitchen sink (experimental)
+    kDNSType_OPT,           // 41 EDNS0 option (meta-RR)
+    kDNSType_APL,           // 42 Address Prefix List
+    kDNSType_DS,            // 43 Delegation Signer
+    kDNSType_SSHFP,         // 44 SSH Key Fingerprint
+    kDNSType_IPSECKEY,      // 45 IPSECKEY
+    kDNSType_RRSIG,         // 46 RRSIG
+    kDNSType_NSEC,          // 47 Denial of Existence
+    kDNSType_DNSKEY,        // 48 DNSKEY
+    kDNSType_DHCID,         // 49 DHCP Client Identifier
+    kDNSType_NSEC3,         // 50 Hashed Authenticated Denial of Existence
+    kDNSType_NSEC3PARAM,    // 51 Hashed Authenticated Denial of Existence
+
+    kDNSType_HIP = 55,      // 55 Host Identity Protocol
+
+    kDNSType_SPF = 99,      // 99 Sender Policy Framework for E-Mail
+    kDNSType_UINFO,         // 100 IANA-Reserved
+    kDNSType_UID,           // 101 IANA-Reserved
+    kDNSType_GID,           // 102 IANA-Reserved
+    kDNSType_UNSPEC,        // 103 IANA-Reserved
+
+    kDNSType_TKEY = 249,    // 249 Transaction key
+    kDNSType_TSIG,          // 250 Transaction signature
+    kDNSType_IXFR,          // 251 Incremental zone transfer
+    kDNSType_AXFR,          // 252 Transfer zone of authority
+    kDNSType_MAILB,         // 253 Transfer mailbox records
+    kDNSType_MAILA,         // 254 Transfer mail agent records
+    kDNSQType_ANY           // Not a DNS type, but a DNS query type, meaning "all types"
+} DNS_TypeValues;
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Simple types
+#endif
+
+// mDNS defines its own names for these common types to simplify portability across
+// multiple platforms that may each have their own (different) names for these types.
+typedef unsigned char mDNSBool;
+typedef   signed char mDNSs8;
+typedef unsigned char mDNSu8;
+typedef   signed short mDNSs16;
+typedef unsigned short mDNSu16;
+
+// Source: http://www.unix.org/version2/whatsnew/lp64_wp.html
+// http://software.intel.com/sites/products/documentation/hpc/mkl/lin/MKL_UG_structure/Support_for_ILP64_Programming.htm
+// It can be safely assumed that int is 32bits on the platform
+#if defined(_ILP64) || defined(__ILP64__)
+typedef   signed int32 mDNSs32;
+typedef unsigned int32 mDNSu32;
+#else
+typedef   signed int mDNSs32;
+typedef unsigned int mDNSu32;
+#endif
+
+// To enforce useful type checking, we make mDNSInterfaceID be a pointer to a dummy struct
+// This way, mDNSInterfaceIDs can be assigned, and compared with each other, but not with other types
+// Declaring the type to be the typical generic "void *" would lack this type checking
+typedef struct mDNSInterfaceID_dummystruct { void *dummy; } *mDNSInterfaceID;
+
+// These types are for opaque two- and four-byte identifiers.
+// The "NotAnInteger" fields of the unions allow the value to be conveniently passed around in a
+// register for the sake of efficiency, and compared for equality or inequality, but don't forget --
+// just because it is in a register doesn't mean it is an integer. Operations like greater than,
+// less than, add, multiply, increment, decrement, etc., are undefined for opaque identifiers,
+// and if you make the mistake of trying to do those using the NotAnInteger field, then you'll
+// find you get code that doesn't work consistently on big-endian and little-endian machines.
+#if defined(_WIN32)
+ #pragma pack(push,2)
+#endif
+typedef       union { mDNSu8 b[ 2]; mDNSu16 NotAnInteger; } mDNSOpaque16;
+typedef       union { mDNSu8 b[ 4]; mDNSu32 NotAnInteger; } mDNSOpaque32;
+typedef packedunion { mDNSu8 b[ 6]; mDNSu16 w[3]; mDNSu32 l[1]; } mDNSOpaque48;
+typedef       union { mDNSu8 b[ 8]; mDNSu16 w[4]; mDNSu32 l[2]; } mDNSOpaque64;
+typedef       union { mDNSu8 b[16]; mDNSu16 w[8]; mDNSu32 l[4]; } mDNSOpaque128;
+#if defined(_WIN32)
+ #pragma pack(pop)
+#endif
+
+typedef mDNSOpaque16 mDNSIPPort;        // An IP port is a two-byte opaque identifier (not an integer)
+typedef mDNSOpaque32 mDNSv4Addr;        // An IP address is a four-byte opaque identifier (not an integer)
+typedef mDNSOpaque128 mDNSv6Addr;       // An IPv6 address is a 16-byte opaque identifier (not an integer)
+typedef mDNSOpaque48 mDNSEthAddr;       // An Ethernet address is a six-byte opaque identifier (not an integer)
+
+// Bit operations for opaque 64 bit quantity. Uses the 32 bit quantity(l[2]) to set and clear bits
+#define mDNSNBBY 8
+#define bit_set_opaque64(op64, index) (op64.l[((index))/(sizeof(mDNSu32) * mDNSNBBY)] |= (1 << ((index) % (sizeof(mDNSu32) * mDNSNBBY))))
+#define bit_clr_opaque64(op64, index) (op64.l[((index))/(sizeof(mDNSu32) * mDNSNBBY)] &= ~(1 << ((index) % (sizeof(mDNSu32) * mDNSNBBY))))
+#define bit_get_opaque64(op64, index) (op64.l[((index))/(sizeof(mDNSu32) * mDNSNBBY)] & (1 << ((index) % (sizeof(mDNSu32) * mDNSNBBY))))
+
+enum
+{
+    mDNSAddrType_None    = 0,
+    mDNSAddrType_IPv4    = 4,
+    mDNSAddrType_IPv6    = 6,
+    mDNSAddrType_Unknown = ~0   // Special marker value used in known answer list recording
+};
+
+enum
+{
+    mDNSTransport_None = 0,
+    mDNSTransport_UDP  = 1,
+    mDNSTransport_TCP  = 2
+};
+
+typedef struct
+{
+    mDNSs32 type;
+    union { mDNSv6Addr v6; mDNSv4Addr v4; } ip;
+} mDNSAddr;
+
+enum { mDNSfalse = 0, mDNStrue = 1 };
+
+#define mDNSNULL 0L
+
+enum
+{
+    mStatus_Waiting           = 1,
+    mStatus_NoError           = 0,
+
+    // mDNS return values are in the range FFFE FF00 (-65792) to FFFE FFFF (-65537)
+    // The top end of the range (FFFE FFFF) is used for error codes;
+    // the bottom end of the range (FFFE FF00) is used for non-error values;
+
+    // Error codes:
+    mStatus_UnknownErr                = -65537,     // First value: 0xFFFE FFFF
+    mStatus_NoSuchNameErr             = -65538,
+    mStatus_NoMemoryErr               = -65539,
+    mStatus_BadParamErr               = -65540,
+    mStatus_BadReferenceErr           = -65541,
+    mStatus_BadStateErr               = -65542,
+    mStatus_BadFlagsErr               = -65543,
+    mStatus_UnsupportedErr            = -65544,
+    mStatus_NotInitializedErr         = -65545,
+    mStatus_NoCache                   = -65546,
+    mStatus_AlreadyRegistered         = -65547,
+    mStatus_NameConflict              = -65548,
+    mStatus_Invalid                   = -65549,
+    mStatus_Firewall                  = -65550,
+    mStatus_Incompatible              = -65551,
+    mStatus_BadInterfaceErr           = -65552,
+    mStatus_Refused                   = -65553,
+    mStatus_NoSuchRecord              = -65554,
+    mStatus_NoAuth                    = -65555,
+    mStatus_NoSuchKey                 = -65556,
+    mStatus_NATTraversal              = -65557,
+    mStatus_DoubleNAT                 = -65558,
+    mStatus_BadTime                   = -65559,
+    mStatus_BadSig                    = -65560,     // while we define this per RFC 2845, BIND 9 returns Refused for bad/missing signatures
+    mStatus_BadKey                    = -65561,
+    mStatus_TransientErr              = -65562,     // transient failures, e.g. sending packets shortly after a network transition or wake from sleep
+    mStatus_ServiceNotRunning         = -65563,     // Background daemon not running
+    mStatus_NATPortMappingUnsupported = -65564,     // NAT doesn't support PCP, NAT-PMP or UPnP
+    mStatus_NATPortMappingDisabled    = -65565,     // NAT supports PCP, NAT-PMP or UPnP, but it's disabled by the administrator
+    mStatus_NoRouter                  = -65566,
+    mStatus_PollingMode               = -65567,
+    mStatus_Timeout                   = -65568,
+    // -65568 to -65786 currently unused; available for allocation
+
+    // tcp connection status
+    mStatus_ConnPending       = -65787,
+    mStatus_ConnFailed        = -65788,
+    mStatus_ConnEstablished   = -65789,
+
+    // Non-error values:
+    mStatus_GrowCache         = -65790,
+    mStatus_ConfigChanged     = -65791,
+    mStatus_MemFree           = -65792      // Last value: 0xFFFE FF00
+                                // mStatus_MemFree is the last legal mDNS error code, at the end of the range allocated for mDNS
+};
+
+typedef mDNSs32 mStatus;
+#define MaxIp 5 // Needs to be consistent with MaxInputIf in dns_services.h
+
+typedef enum { q_stop = 0, q_start } q_state;
+typedef enum { reg_stop = 0, reg_start } reg_state;
+
+// RFC 1034/1035 specify that a domain label consists of a length byte plus up to 63 characters
+#define MAX_DOMAIN_LABEL 63
+typedef struct { mDNSu8 c[ 64]; } domainlabel;      // One label: length byte and up to 63 characters
+
+// RFC 1034/1035/2181 specify that a domain name (length bytes and data bytes) may be up to 255 bytes long,
+// plus the terminating zero at the end makes 256 bytes total in the on-the-wire format.
+#define MAX_DOMAIN_NAME 256
+typedef struct { mDNSu8 c[256]; } domainname;       // Up to 256 bytes of length-prefixed domainlabels
+
+typedef struct { mDNSu8 c[256]; } UTF8str255;       // Null-terminated C string
+
+// The longest legal textual form of a DNS name is 1009 bytes, including the C-string terminating NULL at the end.
+// Explanation:
+// When a native domainname object is converted to printable textual form using ConvertDomainNameToCString(),
+// non-printing characters are represented in the conventional DNS way, as '\ddd', where ddd is a three-digit decimal number.
+// The longest legal domain name is 256 bytes, in the form of four labels as shown below:
+// Length byte, 63 data bytes, length byte, 63 data bytes, length byte, 63 data bytes, length byte, 62 data bytes, zero byte.
+// Each label is encoded textually as characters followed by a trailing dot.
+// If every character has to be represented as a four-byte escape sequence, then this makes the maximum textual form four labels
+// plus the C-string terminating NULL as shown below:
+// 63*4+1 + 63*4+1 + 63*4+1 + 62*4+1 + 1 = 1009.
+// Note that MAX_ESCAPED_DOMAIN_LABEL is not normally used: If you're only decoding a single label, escaping is usually not required.
+// It is for domain names, where dots are used as label separators, that proper escaping is vital.
+#define MAX_ESCAPED_DOMAIN_LABEL 254
+#define MAX_ESCAPED_DOMAIN_NAME 1009
+
+// MAX_REVERSE_MAPPING_NAME
+// For IPv4: "123.123.123.123.in-addr.arpa."  30 bytes including terminating NUL
+// For IPv6: "x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.x.ip6.arpa."  74 bytes including terminating NUL
+
+#define MAX_REVERSE_MAPPING_NAME_V4 30
+#define MAX_REVERSE_MAPPING_NAME_V6 74
+#define MAX_REVERSE_MAPPING_NAME    74
+
+// Most records have a TTL of 75 minutes, so that their 80% cache-renewal query occurs once per hour.
+// For records containing a hostname (in the name on the left, or in the rdata on the right),
+// like A, AAAA, reverse-mapping PTR, and SRV, we use a two-minute TTL by default, because we don't want
+// them to hang around for too long in the cache if the host in question crashes or otherwise goes away.
+
+#define kStandardTTL (3600UL * 100 / 80)
+#define kHostNameTTL 120UL
+
+// Some applications want to register their SRV records with a lower ttl so that in case the server
+// using a dynamic port number restarts, the clients will not have stale information for more than
+// 10 seconds
+
+#define kHostNameSmallTTL 10UL
+
+
+// Multicast DNS uses announcements (gratuitous responses) to update peer caches.
+// This means it is feasible to use relatively larger TTL values than we might otherwise
+// use, because we have a cache coherency protocol to keep the peer caches up to date.
+// With Unicast DNS, once an authoritative server gives a record with a certain TTL value to a client
+// or caching server, that client or caching server is entitled to hold onto the record until its TTL
+// expires, and has no obligation to contact the authoritative server again until that time arrives.
+// This means that whereas Multicast DNS can use announcements to pre-emptively update stale data
+// before it would otherwise have expired, standard Unicast DNS (not using LLQs) has no equivalent
+// mechanism, and TTL expiry is the *only* mechanism by which stale data gets deleted. Because of this,
+// we currently limit the TTL to ten seconds in such cases where no dynamic cache updating is possible.
+#define kStaticCacheTTL 10
+
+#define DefaultTTLforRRType(X) (((X) == kDNSType_A || (X) == kDNSType_AAAA || (X) == kDNSType_SRV) ? kHostNameTTL : kStandardTTL)
+#define mDNS_KeepaliveRecord(rr) ((rr)->rrtype == kDNSType_NULL && SameDomainLabel(SecondLabel((rr)->name)->c, (mDNSu8 *)"\x0A_keepalive"))
+
+// Number of times keepalives are sent if no ACK is received before waking up the system
+// this is analogous to net.inet.tcp.keepcnt
+#define kKeepaliveRetryCount    10
+// The frequency at which keepalives are retried if no ACK is received
+#define kKeepaliveRetryInterval 30
+
+typedef struct AuthRecord_struct AuthRecord;
+typedef struct ServiceRecordSet_struct ServiceRecordSet;
+typedef struct CacheRecord_struct CacheRecord;
+typedef struct CacheGroup_struct CacheGroup;
+typedef struct AuthGroup_struct AuthGroup;
+typedef struct DNSQuestion_struct DNSQuestion;
+typedef struct ZoneData_struct ZoneData;
+typedef struct mDNS_struct mDNS;
+typedef struct mDNS_PlatformSupport_struct mDNS_PlatformSupport;
+typedef struct NATTraversalInfo_struct NATTraversalInfo;
+typedef struct ResourceRecord_struct ResourceRecord;
+
+// Structure to abstract away the differences between TCP/SSL sockets, and one for UDP sockets
+// The actual definition of these structures appear in the appropriate platform support code
+typedef struct TCPSocket_struct TCPSocket;
+typedef struct UDPSocket_struct UDPSocket;
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - DNS Message structures
+#endif
+
+#define mDNS_numZones   numQuestions
+#define mDNS_numPrereqs numAnswers
+#define mDNS_numUpdates numAuthorities
+
+typedef packedstruct
+{
+    mDNSOpaque16 id;
+    mDNSOpaque16 flags;
+    mDNSu16 numQuestions;
+    mDNSu16 numAnswers;
+    mDNSu16 numAuthorities;
+    mDNSu16 numAdditionals;
+} DNSMessageHeader;
+
+// We can send and receive packets up to 9000 bytes (Ethernet Jumbo Frame size, if that ever becomes widely used)
+// However, in the normal case we try to limit packets to 1500 bytes so that we don't get IP fragmentation on standard Ethernet
+// 40 (IPv6 header) + 8 (UDP header) + 12 (DNS message header) + 1440 (DNS message body) = 1500 total
+#ifndef AbsoluteMaxDNSMessageData
+#define AbsoluteMaxDNSMessageData 8940
+#endif
+#define NormalMaxDNSMessageData 1440
+typedef packedstruct
+{
+    DNSMessageHeader h;                     // Note: Size 12 bytes
+    mDNSu8 data[AbsoluteMaxDNSMessageData]; // 40 (IPv6) + 8 (UDP) + 12 (DNS header) + 8940 (data) = 9000
+} DNSMessage;
+
+typedef struct tcpInfo_t
+{
+    mDNS             *m;
+    TCPSocket        *sock;
+    DNSMessage request;
+    int requestLen;
+    DNSQuestion      *question;   // For queries
+    AuthRecord       *rr;         // For record updates
+    mDNSAddr Addr;
+    mDNSIPPort Port;
+    mDNSIPPort SrcPort;
+    DNSMessage       *reply;
+    mDNSu16 replylen;
+    unsigned long nread;
+    int numReplies;
+} tcpInfo_t;
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Other Packet Format Structures
+#endif
+
+typedef packedstruct
+{
+    mDNSEthAddr dst;
+    mDNSEthAddr src;
+    mDNSOpaque16 ethertype;
+} EthernetHeader;           // 14 bytes
+
+typedef packedstruct
+{
+    mDNSOpaque16 hrd;
+    mDNSOpaque16 pro;
+    mDNSu8 hln;
+    mDNSu8 pln;
+    mDNSOpaque16 op;
+    mDNSEthAddr sha;
+    mDNSv4Addr spa;
+    mDNSEthAddr tha;
+    mDNSv4Addr tpa;
+} ARP_EthIP;                // 28 bytes
+
+typedef packedstruct
+{
+    mDNSu8 vlen;
+    mDNSu8 tos;
+    mDNSu16 totlen;
+    mDNSOpaque16 id;
+    mDNSOpaque16 flagsfrags;
+    mDNSu8 ttl;
+    mDNSu8 protocol;        // Payload type: 0x06 = TCP, 0x11 = UDP
+    mDNSu16 checksum;
+    mDNSv4Addr src;
+    mDNSv4Addr dst;
+} IPv4Header;               // 20 bytes
+
+typedef packedstruct
+{
+    mDNSu32 vcf;            // Version, Traffic Class, Flow Label
+    mDNSu16 len;            // Payload Length
+    mDNSu8 pro;             // Type of next header: 0x06 = TCP, 0x11 = UDP, 0x3A = ICMPv6
+    mDNSu8 ttl;             // Hop Limit
+    mDNSv6Addr src;
+    mDNSv6Addr dst;
+} IPv6Header;               // 40 bytes
+
+typedef packedstruct
+{
+    mDNSv6Addr src;
+    mDNSv6Addr dst;
+    mDNSOpaque32 len;
+    mDNSOpaque32 pro;
+} IPv6PseudoHeader;         // 40 bytes
+
+typedef union
+{
+    mDNSu8 bytes[20];
+    ARP_EthIP arp;
+    IPv4Header v4;
+    IPv6Header v6;
+} NetworkLayerPacket;
+
+typedef packedstruct
+{
+    mDNSIPPort src;
+    mDNSIPPort dst;
+    mDNSu32 seq;
+    mDNSu32 ack;
+    mDNSu8 offset;
+    mDNSu8 flags;
+    mDNSu16 window;
+    mDNSu16 checksum;
+    mDNSu16 urgent;
+} TCPHeader;                // 20 bytes; IP protocol type 0x06
+
+typedef struct
+{
+    mDNSInterfaceID IntfId;
+    mDNSu32 seq;
+    mDNSu32 ack;
+    mDNSu16 window;
+} mDNSTCPInfo;
+
+typedef packedstruct
+{
+    mDNSIPPort src;
+    mDNSIPPort dst;
+    mDNSu16 len;            // Length including UDP header (i.e. minimum value is 8 bytes)
+    mDNSu16 checksum;
+} UDPHeader;                // 8 bytes; IP protocol type 0x11
+
+typedef packedstruct
+{
+    mDNSu8 type;            // 0x87 == Neighbor Solicitation, 0x88 == Neighbor Advertisement
+    mDNSu8 code;
+    mDNSu16 checksum;
+    mDNSu32 flags_res;      // R/S/O flags and reserved bits
+    mDNSv6Addr target;
+    // Typically 8 bytes of options are also present
+} IPv6NDP;                  // 24 bytes or more; IP protocol type 0x3A
+
+typedef struct
+{
+    mDNSAddr    ipaddr;
+    char        ethaddr[18];
+} IPAddressMACMapping;
+
+#define NDP_Sol 0x87
+#define NDP_Adv 0x88
+
+#define NDP_Router    0x80
+#define NDP_Solicited 0x40
+#define NDP_Override  0x20
+
+#define NDP_SrcLL 1
+#define NDP_TgtLL 2
+
+typedef union
+{
+    mDNSu8 bytes[20];
+    TCPHeader tcp;
+    UDPHeader udp;
+    IPv6NDP ndp;
+} TransportLayerPacket;
+
+typedef packedstruct
+{
+    mDNSOpaque64 InitiatorCookie;
+    mDNSOpaque64 ResponderCookie;
+    mDNSu8 NextPayload;
+    mDNSu8 Version;
+    mDNSu8 ExchangeType;
+    mDNSu8 Flags;
+    mDNSOpaque32 MessageID;
+    mDNSu32 Length;
+} IKEHeader;                // 28 bytes
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Resource Record structures
+#endif
+
+// Authoritative Resource Records:
+// There are four basic types: Shared, Advisory, Unique, Known Unique
+
+// * Shared Resource Records do not have to be unique
+// -- Shared Resource Records are used for DNS-SD service PTRs
+// -- It is okay for several hosts to have RRs with the same name but different RDATA
+// -- We use a random delay on responses to reduce collisions when all the hosts respond to the same query
+// -- These RRs typically have moderately high TTLs (e.g. one hour)
+// -- These records are announced on startup and topology changes for the benefit of passive listeners
+// -- These records send a goodbye packet when deregistering
+//
+// * Advisory Resource Records are like Shared Resource Records, except they don't send a goodbye packet
+//
+// * Unique Resource Records should be unique among hosts within any given mDNS scope
+// -- The majority of Resource Records are of this type
+// -- If two entities on the network have RRs with the same name but different RDATA, this is a conflict
+// -- Responses may be sent immediately, because only one host should be responding to any particular query
+// -- These RRs typically have low TTLs (e.g. a few minutes)
+// -- On startup and after topology changes, a host issues queries to verify uniqueness
+
+// * Known Unique Resource Records are treated like Unique Resource Records, except that mDNS does
+// not have to verify their uniqueness because this is already known by other means (e.g. the RR name
+// is derived from the host's IP or Ethernet address, which is already known to be a unique identifier).
+
+// Summary of properties of different record types:
+// Probe?    Does this record type send probes before announcing?
+// Conflict? Does this record type react if we observe an apparent conflict?
+// Goodbye?  Does this record type send a goodbye packet on departure?
+//
+//               Probe? Conflict? Goodbye? Notes
+// Unregistered                            Should not appear in any list (sanity check value)
+// Shared         No      No       Yes     e.g. Service PTR record
+// Deregistering  No      No       Yes     Shared record about to announce its departure and leave the list
+// Advisory       No      No       No
+// Unique         Yes     Yes      No      Record intended to be unique -- will probe to verify
+// Verified       Yes     Yes      No      Record has completed probing, and is verified unique
+// KnownUnique    No      Yes      No      Record is assumed by other means to be unique
+
+// Valid lifecycle of a record:
+// Unregistered ->                   Shared      -> Deregistering -(goodbye)-> Unregistered
+// Unregistered ->                   Advisory                               -> Unregistered
+// Unregistered -> Unique -(probe)-> Verified                               -> Unregistered
+// Unregistered ->                   KnownUnique                            -> Unregistered
+
+// Each Authoritative kDNSRecordType has only one bit set. This makes it easy to quickly see if a record
+// is one of a particular set of types simply by performing the appropriate bitwise masking operation.
+
+// Cache Resource Records (received from the network):
+// There are four basic types: Answer, Unique Answer, Additional, Unique Additional
+// Bit 7 (the top bit) of kDNSRecordType is always set for Cache Resource Records; always clear for Authoritative Resource Records
+// Bit 6 (value 0x40) is set for answer records; clear for authority/additional records
+// Bit 5 (value 0x20) is set for records received with the kDNSClass_UniqueRRSet
+
+enum
+{
+    kDNSRecordTypeUnregistered     = 0x00,  // Not currently in any list
+    kDNSRecordTypeDeregistering    = 0x01,  // Shared record about to announce its departure and leave the list
+
+    kDNSRecordTypeUnique           = 0x02,  // Will become a kDNSRecordTypeVerified when probing is complete
+
+    kDNSRecordTypeAdvisory         = 0x04,  // Like Shared, but no goodbye packet
+    kDNSRecordTypeShared           = 0x08,  // Shared means record name does not have to be unique -- use random delay on responses
+
+    kDNSRecordTypeVerified         = 0x10,  // Unique means mDNS should check that name is unique (and then send immediate responses)
+    kDNSRecordTypeKnownUnique      = 0x20,  // Known Unique means mDNS can assume name is unique without checking
+                                            // For Dynamic Update records, Known Unique means the record must already exist on the server.
+    kDNSRecordTypeUniqueMask       = (kDNSRecordTypeUnique | kDNSRecordTypeVerified | kDNSRecordTypeKnownUnique),
+    kDNSRecordTypeActiveSharedMask = (kDNSRecordTypeAdvisory         | kDNSRecordTypeShared),
+    kDNSRecordTypeActiveUniqueMask = (kDNSRecordTypeVerified         | kDNSRecordTypeKnownUnique),
+    kDNSRecordTypeActiveMask       = (kDNSRecordTypeActiveSharedMask | kDNSRecordTypeActiveUniqueMask),
+
+    kDNSRecordTypePacketAdd        = 0x80,  // Received in the Additional  Section of a DNS Response
+    kDNSRecordTypePacketAddUnique  = 0x90,  // Received in the Additional  Section of a DNS Response with kDNSClass_UniqueRRSet set
+    kDNSRecordTypePacketAuth       = 0xA0,  // Received in the Authorities Section of a DNS Response
+    kDNSRecordTypePacketAuthUnique = 0xB0,  // Received in the Authorities Section of a DNS Response with kDNSClass_UniqueRRSet set
+    kDNSRecordTypePacketAns        = 0xC0,  // Received in the Answer      Section of a DNS Response
+    kDNSRecordTypePacketAnsUnique  = 0xD0,  // Received in the Answer      Section of a DNS Response with kDNSClass_UniqueRRSet set
+
+    kDNSRecordTypePacketNegative   = 0xF0,  // Pseudo-RR generated to cache non-existence results like NXDomain
+
+    kDNSRecordTypePacketUniqueMask = 0x10   // True for PacketAddUnique, PacketAnsUnique, PacketAuthUnique, kDNSRecordTypePacketNegative
+};
+
+typedef packedstruct { mDNSu16 priority; mDNSu16 weight; mDNSIPPort port; domainname target;   } rdataSRV;
+typedef packedstruct { mDNSu16 preference;                                domainname exchange; } rdataMX;
+typedef packedstruct { domainname mbox; domainname txt;                                        } rdataRP;
+typedef packedstruct { mDNSu16 preference; domainname map822; domainname mapx400;              } rdataPX;
+
+typedef packedstruct
+{
+    domainname mname;
+    domainname rname;
+    mDNSs32 serial;     // Modular counter; increases when zone changes
+    mDNSu32 refresh;    // Time in seconds that a slave waits after successful replication of the database before it attempts replication again
+    mDNSu32 retry;      // Time in seconds that a slave waits after an unsuccessful replication attempt before it attempts replication again
+    mDNSu32 expire;     // Time in seconds that a slave holds on to old data while replication attempts remain unsuccessful
+    mDNSu32 min;        // Nominally the minimum record TTL for this zone, in seconds; also used for negative caching.
+} rdataSOA;
+
+// http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml
+// Algorithm used for RRSIG, DS and DNS KEY
+#define CRYPTO_RSA_SHA1             0x05
+#define CRYPTO_DSA_NSEC3_SHA1       0x06
+#define CRYPTO_RSA_NSEC3_SHA1       0x07
+#define CRYPTO_RSA_SHA256           0x08
+#define CRYPTO_RSA_SHA512           0x0A
+
+#define CRYPTO_ALG_MAX              0x0B
+
+// alg - same as in RRSIG, DNS KEY or DS.
+// RFC 4034 defines SHA1
+// RFC 4509 defines SHA256
+// Note: NSEC3 also uses 1 for SHA1 and hence we will reuse for now till a new
+// value is assigned.
+//
+#define SHA1_DIGEST_TYPE        1
+#define SHA256_DIGEST_TYPE      2
+#define DIGEST_TYPE_MAX         3
+
+// We need support for base64 and base32 encoding for displaying KEY, NSEC3
+// To make this platform agnostic, we define two types which the platform
+// needs to support
+#define ENC_BASE32              1
+#define ENC_BASE64              2
+#define ENC_ALG_MAX             3
+
+#define DS_FIXED_SIZE           4
+typedef packedstruct
+{
+    mDNSu16 keyTag;
+    mDNSu8 alg;
+    mDNSu8 digestType;
+    mDNSu8  *digest;
+} rdataDS;
+
+typedef struct TrustAnchor
+{
+    struct TrustAnchor *next;
+    int digestLen;
+    mDNSu32 validFrom;
+    mDNSu32 validUntil; 
+    domainname zone;
+    rdataDS rds;
+} TrustAnchor;
+
+//size of rdataRRSIG excluding signerName and signature (which are variable fields)
+#define RRSIG_FIXED_SIZE      18
+typedef packedstruct
+{
+    mDNSu16 typeCovered;
+    mDNSu8 alg;
+    mDNSu8 labels;
+    mDNSu32 origTTL;
+    mDNSu32 sigExpireTime;
+    mDNSu32 sigInceptTime;
+    mDNSu16 keyTag;
+    mDNSu8 *signerName;
+    // mDNSu8 *signature
+} rdataRRSig;
+
+// RFC 4034: For DNS Key RR
+// flags - the valid value for DNSSEC is 256 (Zone signing key - ZSK) and 257 (Secure Entry Point) which also
+// includes the ZSK bit
+//
+#define DNSKEY_ZONE_SIGN_KEY        0x100
+#define DNSKEY_SECURE_ENTRY_POINT   0x101
+
+// proto - the only valid value for protocol is 3 (See RFC 4034)
+#define DNSKEY_VALID_PROTO_VALUE    0x003
+
+// alg - The only mandatory algorithm that we support is RSA/SHA-1
+// DNSSEC_RSA_SHA1_ALG
+
+#define DNSKEY_FIXED_SIZE          4
+typedef packedstruct
+{
+    mDNSu16 flags;
+    mDNSu8 proto;
+    mDNSu8 alg;
+    mDNSu8  *data;
+} rdataDNSKey;
+
+#define NSEC3_FIXED_SIZE          5
+#define NSEC3_FLAGS_OPTOUT        1
+#define NSEC3_MAX_ITERATIONS      2500
+typedef packedstruct
+{
+    mDNSu8 alg;
+    mDNSu8 flags;
+    mDNSu16 iterations;
+    mDNSu8 saltLength;
+    mDNSu8 *salt;
+    // hashLength, nxt, bitmap
+} rdataNSEC3;
+
+// In the multicast usage of NSEC3, we know the actual size of RData
+// 4 bytes : HashAlg, Flags,Iterations
+// 5 bytes : Salt Length 1 byte, Salt 4 bytes
+// 21 bytes : HashLength 1 byte, Hash 20 bytes
+// 34 bytes : Window number, Bitmap length, Type bit map to include the first 256 types
+#define MCAST_NSEC3_RDLENGTH (4 + 5 + 21 + 34)
+#define SHA1_HASH_LENGTH 20
+
+// Base32 encoding takes 5 bytes of the input and encodes as 8 bytes of output.
+// For example, SHA-1 hash of 20 bytes will be encoded as 20/5 * 8 = 32 base32
+// bytes. For a max domain name size of 255 bytes of base32 encoding : (255/8)*5
+// is the max hash length possible.
+#define NSEC3_MAX_HASH_LEN	155
+// In NSEC3, the names are hashed and stored in the first label and hence cannot exceed label
+// size.
+#define NSEC3_MAX_B32_LEN	MAX_DOMAIN_LABEL
+
+// We define it here instead of dnssec.h so that these values can be used
+// in files without bringing in all of dnssec.h unnecessarily.
+typedef enum
+{
+    DNSSEC_Secure = 1,      // Securely validated and has a chain up to the trust anchor
+    DNSSEC_Insecure,        // Cannot build a chain up to the trust anchor
+    DNSSEC_Indeterminate,   // Not used currently
+    DNSSEC_Bogus,           // failed to validate signatures
+    DNSSEC_NoResponse       // No DNSSEC records to start with
+} DNSSECStatus;
+
+#define DNSSECRecordType(rrtype) (((rrtype) == kDNSType_RRSIG) || ((rrtype) == kDNSType_NSEC) || ((rrtype) == kDNSType_DNSKEY) || ((rrtype) == kDNSType_DS) || \
+                                  ((rrtype) == kDNSType_NSEC3))
+
+typedef enum
+{
+    platform_OSX = 1,   // OSX Platform 
+    platform_iOS,       // iOS Platform 
+    platform_Atv,       // Atv Platform 
+    platform_NonApple   // Non-Apple (Windows, POSIX) Platform
+} Platform_t;
+
+// EDNS Option Code registrations are recorded in the "DNS EDNS0 Options" section of
+// <http://www.iana.org/assignments/dns-parameters>
+
+#define kDNSOpt_LLQ   1
+#define kDNSOpt_Lease 2
+#define kDNSOpt_NSID  3
+#define kDNSOpt_Owner 4
+#define kDNSOpt_Trace 65001  // 65001-65534 Reserved for Local/Experimental Use 
+
+typedef struct
+{
+    mDNSu16 vers;
+    mDNSu16 llqOp;
+    mDNSu16 err;        // Or UDP reply port, in setup request
+    // Note: In the in-memory form, there's typically a two-byte space here, so that the following 64-bit id is word-aligned
+    mDNSOpaque64 id;
+    mDNSu32 llqlease;
+} LLQOptData;
+
+typedef struct
+{
+    mDNSu8 vers;            // Version number of this Owner OPT record
+    mDNSs8 seq;             // Sleep/wake epoch
+    mDNSEthAddr HMAC;       // Host's primary identifier (e.g. MAC of on-board Ethernet)
+    mDNSEthAddr IMAC;       // Interface's MAC address (if different to primary MAC)
+    mDNSOpaque48 password;  // Optional password
+} OwnerOptData;
+
+typedef struct
+{
+    mDNSu8    platf;      // Running platform (see enum Platform_t)
+    mDNSu32   mDNSv;      // mDNSResponder Version (DNS_SD_H defined in dns_sd.h)
+} TracerOptData;
+
+// Note: rdataOPT format may be repeated an arbitrary number of times in a single resource record
+typedef packedstruct
+{
+    mDNSu16 opt;
+    mDNSu16 optlen;
+    union { LLQOptData llq; mDNSu32 updatelease; OwnerOptData owner; TracerOptData tracer; } u;
+} rdataOPT;
+
+// Space needed to put OPT records into a packet:
+// Header         11  bytes (name 1, type 2, class 2, TTL 4, length 2)
+// LLQ   rdata    18  bytes (opt 2, len 2, vers 2, op 2, err 2, id 8, lease 4)
+// Lease rdata     8  bytes (opt 2, len 2, lease 4)
+// Owner rdata 12-24  bytes (opt 2, len 2, owner 8-20)
+// Trace rdata     9  bytes (opt 2, len 2, platf 1, mDNSv 4)
+
+
+#define DNSOpt_Header_Space                 11
+#define DNSOpt_LLQData_Space               (4 + 2 + 2 + 2 + 8 + 4)
+#define DNSOpt_LeaseData_Space             (4 + 4)
+#define DNSOpt_OwnerData_ID_Space          (4 + 2 + 6)
+#define DNSOpt_OwnerData_ID_Wake_Space     (4 + 2 + 6 + 6)
+#define DNSOpt_OwnerData_ID_Wake_PW4_Space (4 + 2 + 6 + 6 + 4)
+#define DNSOpt_OwnerData_ID_Wake_PW6_Space (4 + 2 + 6 + 6 + 6)
+#define DNSOpt_TraceData_Space             (4 + 1 + 4)
+
+#define ValidOwnerLength(X) (   (X) == DNSOpt_OwnerData_ID_Space          - 4 || \
+                                (X) == DNSOpt_OwnerData_ID_Wake_Space     - 4 || \
+                                (X) == DNSOpt_OwnerData_ID_Wake_PW4_Space - 4 || \
+                                (X) == DNSOpt_OwnerData_ID_Wake_PW6_Space - 4    )
+
+#define DNSOpt_Owner_Space(A,B) (mDNSSameEthAddress((A),(B)) ? DNSOpt_OwnerData_ID_Space : DNSOpt_OwnerData_ID_Wake_Space)
+
+#define DNSOpt_Data_Space(O) (                                  \
+        (O)->opt == kDNSOpt_LLQ   ? DNSOpt_LLQData_Space   :        \
+        (O)->opt == kDNSOpt_Lease ? DNSOpt_LeaseData_Space :        \
+        (O)->opt == kDNSOpt_Trace ? DNSOpt_TraceData_Space :        \
+        (O)->opt == kDNSOpt_Owner ? DNSOpt_Owner_Space(&(O)->u.owner.HMAC, &(O)->u.owner.IMAC) : 0x10000)
+
+// NSEC record is defined in RFC 4034.
+// 16 bit RRTYPE space is split into 256 windows and each window has 256 bits (32 bytes).
+// If we create a structure for NSEC, it's size would be:
+//
+//   256 bytes domainname 'nextname'
+// + 256 * 34 = 8704 bytes of bitmap data
+// = 8960 bytes total
+//
+// This would be a waste, as types about 256 are not very common. But it would be odd, if we receive
+// a type above 256 (.US zone had TYPE65534 when this code was written) and not able to handle it.
+// Hence, we handle any size by not fixing a strucure in place. The following is just a placeholder
+// and never used anywhere.
+//
+#define NSEC_MCAST_WINDOW_SIZE 32
+typedef struct
+{
+    domainname *next; //placeholders are uncommented because C89 in Windows requires that a struct has at least a member.
+    char bitmap[32];
+} rdataNSEC;
+
+// StandardAuthRDSize is 264 (256+8), which is large enough to hold a maximum-sized SRV record (6 + 256 bytes)
+// MaximumRDSize is 8K the absolute maximum we support (at least for now)
+#define StandardAuthRDSize 264
+#ifndef MaximumRDSize
+#define MaximumRDSize 8192
+#endif
+
+// InlineCacheRDSize is 68
+// Records received from the network with rdata this size or less have their rdata stored right in the CacheRecord object
+// Records received from the network with rdata larger than this have additional storage allocated for the rdata
+// A quick unscientific sample from a busy network at Apple with lots of machines revealed this:
+// 1461 records in cache
+// 292 were one-byte TXT records
+// 136 were four-byte A records
+// 184 were sixteen-byte AAAA records
+// 780 were various PTR, TXT and SRV records from 12-64 bytes
+// Only 69 records had rdata bigger than 64 bytes
+// Note that since CacheRecord object and a CacheGroup object are allocated out of the same pool, it's sensible to
+// have them both be the same size. Making one smaller without making the other smaller won't actually save any memory.
+#define InlineCacheRDSize 68
+
+// The RDataBody union defines the common rdata types that fit into our 264-byte limit
+typedef union
+{
+    mDNSu8 data[StandardAuthRDSize];
+    mDNSv4Addr ipv4;        // For 'A' record
+    domainname name;        // For PTR, NS, CNAME, DNAME
+    UTF8str255 txt;
+    rdataMX mx;
+    mDNSv6Addr ipv6;        // For 'AAAA' record
+    rdataSRV srv;
+    rdataOPT opt[2];        // For EDNS0 OPT record; RDataBody may contain multiple variable-length rdataOPT objects packed together
+} RDataBody;
+
+// The RDataBody2 union is the same as above, except it includes fields for the larger types like soa, rp, px
+typedef union
+{
+    mDNSu8 data[StandardAuthRDSize];
+    mDNSv4Addr ipv4;        // For 'A' record
+    domainname name;        // For PTR, NS, CNAME, DNAME
+    rdataSOA soa;           // This is large; not included in the normal RDataBody definition
+    UTF8str255 txt;
+    rdataMX mx;
+    rdataRP rp;             // This is large; not included in the normal RDataBody definition
+    rdataPX px;             // This is large; not included in the normal RDataBody definition
+    mDNSv6Addr ipv6;        // For 'AAAA' record
+    rdataSRV srv;
+    rdataOPT opt[2];        // For EDNS0 OPT record; RDataBody may contain multiple variable-length rdataOPT objects packed together
+    rdataDS ds;
+    rdataDNSKey key;
+    rdataRRSig rrsig;
+} RDataBody2;
+
+typedef struct
+{
+    mDNSu16 MaxRDLength;    // Amount of storage allocated for rdata (usually sizeof(RDataBody))
+    mDNSu16 padding;        // So that RDataBody is aligned on 32-bit boundary
+    RDataBody u;
+} RData;
+
+// sizeofRDataHeader should be 4 bytes
+#define sizeofRDataHeader (sizeof(RData) - sizeof(RDataBody))
+
+// RData_small is a smaller version of the RData object, used for inline data storage embedded in a CacheRecord_struct
+typedef struct
+{
+    mDNSu16 MaxRDLength;    // Storage allocated for data (may be greater than InlineCacheRDSize if additional storage follows this object)
+    mDNSu16 padding;        // So that data is aligned on 32-bit boundary
+    mDNSu8 data[InlineCacheRDSize];
+} RData_small;
+
+// Note: Within an mDNSRecordCallback mDNS all API calls are legal except mDNS_Init(), mDNS_Exit(), mDNS_Execute()
+typedef void mDNSRecordCallback (mDNS *const m, AuthRecord *const rr, mStatus result);
+
+// Note:
+// Restrictions: An mDNSRecordUpdateCallback may not make any mDNS API calls.
+// The intent of this callback is to allow the client to free memory, if necessary.
+// The internal data structures of the mDNS code may not be in a state where mDNS API calls may be made safely.
+typedef void mDNSRecordUpdateCallback (mDNS *const m, AuthRecord *const rr, RData *OldRData, mDNSu16 OldRDLen);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - NAT Traversal structures and constants
+#endif
+
+#define NATMAP_MAX_RETRY_INTERVAL    ((mDNSPlatformOneSecond * 60) * 15)    // Max retry interval is 15 minutes
+#define NATMAP_MIN_RETRY_INTERVAL     (mDNSPlatformOneSecond * 2)           // Min retry interval is 2 seconds
+#define NATMAP_INIT_RETRY             (mDNSPlatformOneSecond / 4)           // start at 250ms w/ exponential decay
+#define NATMAP_DEFAULT_LEASE          (60 * 60 * 2)                         // 2 hour lease life in seconds
+#define NATMAP_VERS 0
+
+typedef enum
+{
+    NATOp_AddrRequest    = 0,
+    NATOp_MapUDP         = 1,
+    NATOp_MapTCP         = 2,
+
+    NATOp_AddrResponse   = 0x80 | 0,
+    NATOp_MapUDPResponse = 0x80 | 1,
+    NATOp_MapTCPResponse = 0x80 | 2,
+} NATOp_t;
+
+enum
+{
+    NATErr_None    = 0,
+    NATErr_Vers    = 1,
+    NATErr_Refused = 2,
+    NATErr_NetFail = 3,
+    NATErr_Res     = 4,
+    NATErr_Opcode  = 5
+};
+
+typedef mDNSu16 NATErr_t;
+
+typedef packedstruct
+{
+    mDNSu8 vers;
+    mDNSu8 opcode;
+} NATAddrRequest;
+
+typedef packedstruct
+{
+    mDNSu8 vers;
+    mDNSu8 opcode;
+    mDNSu16 err;
+    mDNSu32 upseconds;          // Time since last NAT engine reboot, in seconds
+    mDNSv4Addr ExtAddr;
+} NATAddrReply;
+
+typedef packedstruct
+{
+    mDNSu8 vers;
+    mDNSu8 opcode;
+    mDNSOpaque16 unused;
+    mDNSIPPort intport;
+    mDNSIPPort extport;
+    mDNSu32 NATReq_lease;
+} NATPortMapRequest;
+
+typedef packedstruct
+{
+    mDNSu8 vers;
+    mDNSu8 opcode;
+    mDNSu16 err;
+    mDNSu32 upseconds;          // Time since last NAT engine reboot, in seconds
+    mDNSIPPort intport;
+    mDNSIPPort extport;
+    mDNSu32 NATRep_lease;
+} NATPortMapReply;
+
+// PCP Support for IPv4 mappings
+
+#define PCP_VERS 0x02
+#define PCP_WAITSECS_AFTER_EPOCH_INVALID 5
+
+typedef enum
+{
+    PCPOp_Announce = 0,
+    PCPOp_Map      = 1
+} PCPOp_t;
+
+typedef enum
+{
+    PCPProto_All = 0,
+    PCPProto_TCP = 6,
+    PCPProto_UDP = 17
+} PCPProto_t;
+
+typedef enum
+{
+    PCPResult_Success         = 0,
+    PCPResult_UnsuppVersion   = 1,
+    PCPResult_NotAuthorized   = 2,
+    PCPResult_MalformedReq    = 3,
+    PCPResult_UnsuppOpcode    = 4,
+    PCPResult_UnsuppOption    = 5,
+    PCPResult_MalformedOption = 6,
+    PCPResult_NetworkFailure  = 7,
+    PCPResult_NoResources     = 8,
+    PCPResult_UnsuppProtocol  = 9,
+    PCPResult_UserExQuota     = 10,
+    PCPResult_CantProvideExt  = 11,
+    PCPResult_AddrMismatch    = 12,
+    PCPResult_ExcesRemotePeer = 13
+} PCPResult_t;
+
+typedef packedstruct
+{
+    mDNSu8       version;
+    mDNSu8       opCode;
+    mDNSOpaque16 reserved;
+    mDNSu32      lifetime;
+    mDNSv6Addr   clientAddr;
+    mDNSu32      nonce[3];
+    mDNSu8       protocol;
+    mDNSu8       reservedMapOp[3];
+    mDNSIPPort   intPort;
+    mDNSIPPort   extPort;
+    mDNSv6Addr   extAddress;
+} PCPMapRequest;
+
+typedef packedstruct
+{
+    mDNSu8     version;
+    mDNSu8     opCode;
+    mDNSu8     reserved;
+    mDNSu8     result;
+    mDNSu32    lifetime;
+    mDNSu32    epoch;
+    mDNSu32    clientAddrParts[3];
+    mDNSu32    nonce[3];
+    mDNSu8     protocol;
+    mDNSu8     reservedMapOp[3];
+    mDNSIPPort intPort;
+    mDNSIPPort extPort;
+    mDNSv6Addr extAddress;
+} PCPMapReply;
+
+// LNT Support
+
+typedef enum
+{
+    LNTDiscoveryOp      = 1,
+    LNTExternalAddrOp   = 2,
+    LNTPortMapOp        = 3,
+    LNTPortMapDeleteOp  = 4
+} LNTOp_t;
+
+#define LNT_MAXBUFSIZE 8192
+typedef struct tcpLNTInfo_struct tcpLNTInfo;
+struct tcpLNTInfo_struct
+{
+    tcpLNTInfo       *next;
+    mDNS             *m;
+    NATTraversalInfo *parentNATInfo;    // pointer back to the parent NATTraversalInfo
+    TCPSocket        *sock;
+    LNTOp_t op;                         // operation performed using this connection
+    mDNSAddr Address;                   // router address
+    mDNSIPPort Port;                    // router port
+    mDNSu8           *Request;          // xml request to router
+    int requestLen;
+    mDNSu8           *Reply;            // xml reply from router
+    int replyLen;
+    unsigned long nread;                // number of bytes read so far
+    int retries;                        // number of times we've tried to do this port mapping
+};
+
+typedef void (*NATTraversalClientCallback)(mDNS *m, NATTraversalInfo *n);
+
+// if m->timenow <  ExpiryTime then we have an active mapping, and we'll renew halfway to expiry
+// if m->timenow >= ExpiryTime then our mapping has expired, and we're trying to create one
+
+typedef enum
+{
+    NATTProtocolNone    = 0,
+    NATTProtocolNATPMP  = 1,
+    NATTProtocolUPNPIGD = 2,
+    NATTProtocolPCP     = 3,
+} NATTProtocol;
+
+struct NATTraversalInfo_struct
+{
+    // Internal state fields. These are used internally by mDNSCore; the client layer needn't be concerned with them.
+    NATTraversalInfo           *next;
+
+    mDNSs32 ExpiryTime;                             // Time this mapping expires, or zero if no mapping
+    mDNSs32 retryInterval;                          // Current interval, between last packet we sent and the next one
+    mDNSs32 retryPortMap;                           // If Protocol is nonzero, time to send our next mapping packet
+    mStatus NewResult;                              // New error code; will be copied to Result just prior to invoking callback
+    NATTProtocol lastSuccessfulProtocol;            // To send correct deletion request & update non-PCP external address operations
+    mDNSBool sentNATPMP;                            // Whether we just sent a NAT-PMP packet, so we won't send another if
+                                                    //    we receive another NAT-PMP "Unsupported Version" packet
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    tcpLNTInfo tcpInfo;                             // Legacy NAT traversal (UPnP) TCP connection
+#endif
+
+    // Result fields: When the callback is invoked these fields contain the answers the client is looking for
+    // When the callback is invoked ExternalPort is *usually* set to be the same the same as RequestedPort, except:
+    // (a) When we're behind a NAT gateway with port mapping disabled, ExternalPort is reported as zero to
+    //     indicate that we don't currently have a working mapping (but RequestedPort retains the external port
+    //     we'd like to get, the next time we meet an accomodating NAT gateway willing to give us one).
+    // (b) When we have a routable non-RFC1918 address, we don't *need* a port mapping, so ExternalPort
+    //     is reported as the same as our InternalPort, since that is effectively our externally-visible port too.
+    //     Again, RequestedPort retains the external port we'd like to get the next time we find ourself behind a NAT gateway.
+    // To improve stability of port mappings, RequestedPort is updated any time we get a successful
+    // mapping response from the PCP, NAT-PMP or UPnP gateway. For example, if we ask for port 80, and
+    // get assigned port 81, then thereafter we'll contine asking for port 81.
+    mDNSInterfaceID InterfaceID;
+    mDNSv4Addr ExternalAddress;                     // Initially set to onesIPv4Addr, until first callback
+    mDNSv4Addr NewAddress;                          // May be updated with actual value assigned by gateway
+    mDNSIPPort ExternalPort;
+    mDNSu32 Lifetime;
+    mStatus Result;
+
+    // Client API fields: The client must set up these fields *before* making any NAT traversal API calls
+    mDNSu8 Protocol;                                // NATOp_MapUDP or NATOp_MapTCP, or zero if just requesting the external IP address
+    mDNSIPPort IntPort;                             // Client's internal port number (doesn't change)
+    mDNSIPPort RequestedPort;                       // Requested external port; may be updated with actual value assigned by gateway
+    mDNSu32 NATLease;                               // Requested lifetime in seconds (doesn't change)
+    NATTraversalClientCallback clientCallback;
+    void                       *clientContext;
+};
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - DNSServer & McastResolver structures and constants
+#endif
+
+enum
+{
+    DNSServer_Untested = 0,
+    DNSServer_Passed   = 1,
+    DNSServer_Failed   = 2,
+    DNSServer_Disabled = 3
+};
+
+enum
+{
+    DNSServer_FlagDelete = 1,
+    DNSServer_FlagNew    = 2
+};
+
+enum
+{
+    McastResolver_FlagDelete = 1,
+    McastResolver_FlagNew    = 2
+};
+
+typedef struct McastResolver
+{
+    struct McastResolver *next;
+    mDNSInterfaceID interface;
+    mDNSu32 flags;              // Set when we're planning to delete this from the list
+    domainname domain;
+    mDNSu32 timeout;            // timeout value for questions
+} McastResolver;
+
+// scoped values for DNSServer matching
+enum
+{
+    kScopeNone         = 0,        // DNS server used by unscoped questions
+    kScopeInterfaceID  = 1,        // Scoped DNS server used only by scoped questions
+    kScopeServiceID    = 2         // Service specific DNS server used only by questions
+                                   // have a matching serviceID
+};
+
+// Note: DNSSECAware is set if we are able to get a valid response to
+// a DNSSEC question. In some cases it is possible that the proxy
+// strips the EDNS0 option and we just get a plain response with no
+// signatures. But we still mark DNSSECAware in that case. As DNSSECAware
+// is only used to determine whether DNSSEC_VALIDATION_SECURE_OPTIONAL
+// should be turned off or not, it is sufficient that we are getting
+// responses back.
+typedef struct DNSServer
+{
+    struct DNSServer *next;
+    mDNSInterfaceID interface;  // DNS requests should be sent on this interface
+    mDNSs32 serviceID;
+    mDNSAddr addr;
+    mDNSIPPort port;
+    mDNSOpaque16 testid;
+    mDNSu32 flags;              // Set when we're planning to delete this from the list
+    mDNSu32 teststate;          // Have we sent bug-detection query to this server?
+    mDNSs32 lasttest;           // Time we sent last bug-detection query to this server
+    domainname domain;          // name->server matching for "split dns"
+    mDNSs32 penaltyTime;        // amount of time this server is penalized
+    mDNSu32 scoped;             // See the scoped enum above
+    mDNSu32 timeout;            // timeout value for questions
+    mDNSBool cellIntf;          // Resolver from Cellular Interface ?
+    mDNSu16 resGroupID;         // ID of the resolver group that contains this DNSServer
+    mDNSBool req_A;             // If set, send v4 query (DNSConfig allows A queries)
+    mDNSBool req_AAAA;          // If set, send v6 query (DNSConfig allows AAAA queries)
+    mDNSBool req_DO;            // If set, okay to send DNSSEC queries (EDNS DO bit is supported)
+    mDNSBool retransDO;         // Total Retransmissions for queries sent with DO option
+    mDNSBool DNSSECAware;       // set if we are able to receive a response to a request
+                                // sent with DO option.
+} DNSServer;
+
+typedef struct
+{
+    mDNSu8 *AnonData;
+    int AnonDataLen;
+    mDNSu32 salt;
+    ResourceRecord *nsec3RR;
+    mDNSInterfaceID SendNow;     // The interface ID that this record should be sent on
+} AnonymousInfo;
+
+struct ResourceRecord_struct
+{
+    mDNSu8 RecordType;                  // See enum above
+    mDNSu16 rrtype;
+    mDNSu16 rrclass;
+    mDNSu32 rroriginalttl;              // In seconds
+    mDNSu16 rdlength;                   // Size of the raw rdata, in bytes, in the on-the-wire format
+                                        // (In-memory storage may be larger, for structures containing 'holes', like SOA)
+    mDNSu16 rdestimate;                 // Upper bound on on-the-wire size of rdata after name compression
+    mDNSu32 namehash;                   // Name-based (i.e. case-insensitive) hash of name
+    mDNSu32 rdatahash;                  // For rdata containing domain name (e.g. PTR, SRV, CNAME etc.), case-insensitive name hash
+                                        // else, for all other rdata, 32-bit hash of the raw rdata
+                                        // Note: This requirement is important. Various routines like AddAdditionalsToResponseList(),
+                                        // ReconfirmAntecedents(), etc., use rdatahash as a pre-flight check to see
+                                        // whether it's worth doing a full SameDomainName() call. If the rdatahash
+                                        // is not a correct case-insensitive name hash, they'll get false negatives.
+
+    // Grouping pointers together at the end of the structure improves the memory layout efficiency
+    mDNSInterfaceID InterfaceID;        // Set if this RR is specific to one interface
+                                        // For records received off the wire, InterfaceID is *always* set to the receiving interface
+                                        // For our authoritative records, InterfaceID is usually zero, except for those few records
+                                        // that are interface-specific (e.g. address records, especially linklocal addresses)
+    const domainname *name;
+    RData           *rdata;             // Pointer to storage for this rdata
+    DNSServer       *rDNSServer;        // Unicast DNS server authoritative for this entry;null for multicast
+    AnonymousInfo   *AnonInfo;          // Anonymous Information
+};
+
+
+// Unless otherwise noted, states may apply to either independent record registrations or service registrations
+typedef enum
+{
+    regState_Zero              = 0,
+    regState_Pending           = 1,     // update sent, reply not received
+    regState_Registered        = 2,     // update sent, reply received
+    regState_DeregPending      = 3,     // dereg sent, reply not received
+    regState_Unregistered      = 4,     // not in any list
+    regState_Refresh           = 5,     // outstanding refresh (or target change) message
+    regState_NATMap            = 6,     // establishing NAT port mapping
+    regState_UpdatePending     = 7,     // update in flight as result of mDNS_Update call
+    regState_NoTarget          = 8,     // SRV Record registration pending registration of hostname
+    regState_NATError          = 9     // unable to complete NAT traversal
+} regState_t;
+
+enum
+{
+    Target_Manual = 0,
+    Target_AutoHost = 1,
+    Target_AutoHostAndNATMAP = 2
+};
+
+typedef enum
+{
+    mergeState_Zero = 0,
+    mergeState_DontMerge = 1  // Set on fatal error conditions to disable merging
+} mergeState_t;
+
+#define AUTH_GROUP_NAME_SIZE    128
+struct AuthGroup_struct             // Header object for a list of AuthRecords with the same name
+{
+    AuthGroup      *next;               // Next AuthGroup object in this hash table bucket
+    mDNSu32 namehash;                   // Name-based (i.e. case insensitive) hash of name
+    AuthRecord     *members;            // List of CacheRecords with this same name
+    AuthRecord    **rrauth_tail;        // Tail end of that list
+    domainname     *name;               // Common name for all AuthRecords in this list
+    AuthRecord     *NewLocalOnlyRecords;
+    mDNSu8 namestorage[AUTH_GROUP_NAME_SIZE];
+};
+
+#ifndef AUTH_HASH_SLOTS
+#define AUTH_HASH_SLOTS 499
+#endif
+#define FORALL_AUTHRECORDS(SLOT,AG,AR)                              \
+    for ((SLOT) = 0; (SLOT) < AUTH_HASH_SLOTS; (SLOT)++)                                                                     \
+        for ((AG)=m->rrauth.rrauth_hash[(SLOT)]; (AG); (AG)=(AG)->next)                                                                         \
+            for ((AR) = (AG)->members; (AR); (AR)=(AR)->next)
+
+typedef union AuthEntity_union AuthEntity;
+union AuthEntity_union { AuthEntity *next; AuthGroup ag; };
+typedef struct {
+    mDNSu32 rrauth_size;                // Total number of available auth entries
+    mDNSu32 rrauth_totalused;           // Number of auth entries currently occupied
+    mDNSu32 rrauth_report;
+    mDNSu8 rrauth_lock;                 // For debugging: Set at times when these lists may not be modified
+    AuthEntity *rrauth_free;
+    AuthGroup *rrauth_hash[AUTH_HASH_SLOTS];
+}AuthHash;
+
+// AuthRecordAny includes mDNSInterface_Any and interface specific auth records.
+typedef enum
+{
+    AuthRecordAny,              // registered for *Any, NOT including P2P interfaces
+    AuthRecordAnyIncludeP2P,    // registered for *Any, including P2P interfaces
+    AuthRecordAnyIncludeAWDL,   // registered for *Any, including AWDL interface
+    AuthRecordAnyIncludeAWDLandP2P, // registered for *Any, including AWDL and P2P interfaces
+    AuthRecordLocalOnly,
+    AuthRecordP2P               // discovered over D2D/P2P framework
+} AuthRecType;
+
+typedef enum
+{
+    AuthFlagsWakeOnly = 0x1     // WakeOnly service
+} AuthRecordFlags;
+
+struct AuthRecord_struct
+{
+    // For examples of how to set up this structure for use in mDNS_Register(),
+    // see mDNS_AdvertiseInterface() or mDNS_RegisterService().
+    // Basically, resrec and persistent metadata need to be set up before calling mDNS_Register().
+    // mDNS_SetupResourceRecord() is avaliable as a helper routine to set up most fields to sensible default values for you
+
+    AuthRecord     *next;               // Next in list; first element of structure for efficiency reasons
+    // Field Group 1: Common ResourceRecord fields
+    ResourceRecord resrec;              // 36 bytes when compiling for 32-bit; 48 when compiling for 64-bit
+
+    // Field Group 2: Persistent metadata for Authoritative Records
+    AuthRecord     *Additional1;        // Recommended additional record to include in response (e.g. SRV for PTR record)
+    AuthRecord     *Additional2;        // Another additional (e.g. TXT for PTR record)
+    AuthRecord     *DependentOn;        // This record depends on another for its uniqueness checking
+    AuthRecord     *RRSet;              // This unique record is part of an RRSet
+    mDNSRecordCallback *RecordCallback; // Callback function to call for state changes, and to free memory asynchronously on deregistration
+    void           *RecordContext;      // Context parameter for the callback function
+    mDNSu8 AutoTarget;                  // Set if the target of this record (PTR, CNAME, SRV, etc.) is our host name
+    mDNSu8 AllowRemoteQuery;            // Set if we allow hosts not on the local link to query this record
+    mDNSu8 ForceMCast;                  // Set by client to advertise solely via multicast, even for apparently unicast names
+    mDNSu8 AuthFlags;
+
+    OwnerOptData WakeUp;                // WakeUp.HMAC.l[0] nonzero indicates that this is a Sleep Proxy record
+    mDNSAddr AddressProxy;              // For reverse-mapping Sleep Proxy PTR records, address in question
+    mDNSs32 TimeRcvd;                   // In platform time units
+    mDNSs32 TimeExpire;                 // In platform time units
+    AuthRecType ARType;                 // LocalOnly, P2P or Normal ?
+    mDNSs32 KATimeExpire;               // In platform time units: time to send keepalive packet for the proxy record
+
+    // Field Group 3: Transient state for Authoritative Records
+    mDNSu8 Acknowledged;                // Set if we've given the success callback to the client
+    mDNSu8 ProbeRestartCount;           // Number of times we have restarted probing
+    mDNSu8 ProbeCount;                  // Number of probes remaining before this record is valid (kDNSRecordTypeUnique)
+    mDNSu8 AnnounceCount;               // Number of announcements remaining (kDNSRecordTypeShared)
+    mDNSu8 RequireGoodbye;              // Set if this RR has been announced on the wire and will require a goodbye packet
+    mDNSu8 AnsweredLocalQ;              // Set if this AuthRecord has been delivered to any local question (LocalOnly or mDNSInterface_Any)
+    mDNSu8 IncludeInProbe;              // Set if this RR is being put into a probe right now
+    mDNSu8 ImmedUnicast;                // Set if we may send our response directly via unicast to the requester
+    mDNSInterfaceID SendNSECNow;        // Set if we need to generate associated NSEC data for this rrname
+    mDNSInterfaceID ImmedAnswer;        // Someone on this interface issued a query we need to answer (all-ones for all interfaces)
+#if MDNS_LOG_ANSWER_SUPPRESSION_TIMES
+    mDNSs32 ImmedAnswerMarkTime;
+#endif
+    mDNSInterfaceID ImmedAdditional;    // Hint that we might want to also send this record, just to be helpful
+    mDNSInterfaceID SendRNow;           // The interface this query is being sent on right now
+    mDNSv4Addr v4Requester;             // Recent v4 query for this record, or all-ones if more than one recent query
+    mDNSv6Addr v6Requester;             // Recent v6 query for this record, or all-ones if more than one recent query
+    AuthRecord     *NextResponse;       // Link to the next element in the chain of responses to generate
+    const mDNSu8   *NR_AnswerTo;        // Set if this record was selected by virtue of being a direct answer to a question
+    AuthRecord     *NR_AdditionalTo;    // Set if this record was selected by virtue of being additional to another
+    mDNSs32 ThisAPInterval;             // In platform time units: Current interval for announce/probe
+    mDNSs32 LastAPTime;                 // In platform time units: Last time we sent announcement/probe
+    mDNSs32 LastMCTime;                 // Last time we multicast this record (used to guard against packet-storm attacks)
+    mDNSInterfaceID LastMCInterface;    // Interface this record was multicast on at the time LastMCTime was recorded
+    RData          *NewRData;           // Set if we are updating this record with new rdata
+    mDNSu16 newrdlength;                // ... and the length of the new RData
+    mDNSRecordUpdateCallback *UpdateCallback;
+    mDNSu32 UpdateCredits;              // Token-bucket rate limiting of excessive updates
+    mDNSs32 NextUpdateCredit;           // Time next token is added to bucket
+    mDNSs32 UpdateBlocked;              // Set if update delaying is in effect
+
+    // Field Group 4: Transient uDNS state for Authoritative Records
+    regState_t state;           // Maybe combine this with resrec.RecordType state? Right now it's ambiguous and confusing.
+                                // e.g. rr->resrec.RecordType can be kDNSRecordTypeUnregistered,
+                                // and rr->state can be regState_Unregistered
+                                // What if we find one of those statements is true and the other false? What does that mean?
+    mDNSBool uselease;          // dynamic update contains (should contain) lease option
+    mDNSs32 expire;             // In platform time units: expiration of lease (-1 for static)
+    mDNSBool Private;           // If zone is private, DNS updates may have to be encrypted to prevent eavesdropping
+    mDNSOpaque16 updateid;      // Identifier to match update request and response -- also used when transferring records to Sleep Proxy
+    mDNSOpaque64 updateIntID;   // Interface IDs (one bit per interface index)to which updates have been sent
+    const domainname *zone;     // the zone that is updated
+    ZoneData  *nta;
+    struct tcpInfo_t *tcp;
+    NATTraversalInfo NATinfo;
+    mDNSBool SRVChanged;       // temporarily deregistered service because its SRV target or port changed
+    mergeState_t mState;       // Unicast Record Registrations merge state
+    mDNSu8 refreshCount;        // Number of refreshes to the server
+    mStatus updateError;        // Record update resulted in Error ?
+
+    // uDNS_UpdateRecord support fields
+    // Do we really need all these in *addition* to NewRData and newrdlength above?
+    void *UpdateContext;    // Context parameter for the update callback function
+    mDNSu16 OrigRDLen;      // previously registered, being deleted
+    mDNSu16 InFlightRDLen;  // currently being registered
+    mDNSu16 QueuedRDLen;    // pending operation (re-transmitting if necessary) THEN register the queued update
+    RData *OrigRData;
+    RData *InFlightRData;
+    RData *QueuedRData;
+
+    // Field Group 5: Large data objects go at the end
+    domainname namestorage;
+    RData rdatastorage;                 // Normally the storage is right here, except for oversized records
+    // rdatastorage MUST be the last thing in the structure -- when using oversized AuthRecords, extra bytes
+    // are appended after the end of the AuthRecord, logically augmenting the size of the rdatastorage
+    // DO NOT ADD ANY MORE FIELDS HERE
+};
+
+// IsLocalDomain alone is not sufficient to determine that a record is mDNS or uDNS. By default domain names within
+// the "local" pseudo-TLD (and within the IPv4 and IPv6 link-local reverse mapping domains) are automatically treated
+// as mDNS records, but it is also possible to force any record (even those not within one of the inherently local
+// domains) to be handled as an mDNS record by setting the ForceMCast flag, or by setting a non-zero InterfaceID.
+// For example, the reverse-mapping PTR record created in AdvertiseInterface sets the ForceMCast flag, since it points to
+// a dot-local hostname, and therefore it would make no sense to register this record with a wide-area Unicast DNS server.
+// The same applies to Sleep Proxy records, which we will answer for when queried via mDNS, but we never want to try
+// to register them with a wide-area Unicast DNS server -- and we probably don't have the required credentials anyway.
+// Currently we have no concept of a wide-area uDNS record scoped to a particular interface, so if the InterfaceID is
+// nonzero we treat this the same as ForceMCast.
+// Note: Question_uDNS(Q) is used in *only* one place -- on entry to mDNS_StartQuery_internal, to decide whether to set TargetQID.
+// Everywhere else in the code, the determination of whether a question is unicast is made by checking to see if TargetQID is nonzero.
+#define AuthRecord_uDNS(R) ((R)->resrec.InterfaceID == mDNSInterface_Any && !(R)->ForceMCast && !IsLocalDomain((R)->resrec.name))
+#define Question_uDNS(Q)   ((Q)->InterfaceID == mDNSInterface_Unicast || (Q)->ProxyQuestion || \
+                            ((Q)->InterfaceID != mDNSInterface_LocalOnly && (Q)->InterfaceID != mDNSInterface_P2P && !(Q)->ForceMCast && !IsLocalDomain(&(Q)->qname)))
+
+#define RRLocalOnly(rr) ((rr)->ARType == AuthRecordLocalOnly || (rr)->ARType == AuthRecordP2P)
+
+#define RRAny(rr) ((rr)->ARType == AuthRecordAny || (rr)->ARType == AuthRecordAnyIncludeP2P || (rr)->ARType == AuthRecordAnyIncludeAWDL || (rr)->ARType == AuthRecordAnyIncludeAWDLandP2P)
+
+// Question (A or AAAA) that is suppressed currently because IPv4 or IPv6 address
+// is not available locally for A or AAAA question respectively. Also, if the
+// query is disallowed for the "pid" that we are sending on behalf of, suppress it.
+#define QuerySuppressed(Q) (((Q)->SuppressUnusable && (Q)->SuppressQuery) || ((Q)->DisallowPID))
+
+#define PrivateQuery(Q) ((Q)->AuthInfo && (Q)->AuthInfo->AutoTunnel)
+
+// Normally we always lookup the cache and /etc/hosts before sending the query on the wire. For single label
+// queries (A and AAAA) that are unqualified (indicated by AppendSearchDomains), we want to append search
+// domains before we try them as such
+#define ApplySearchDomainsFirst(q) ((q)->AppendSearchDomains && (CountLabels(&((q)->qname))) == 1)
+
+// Wrapper struct for Auth Records for higher-level code that cannot use the AuthRecord's ->next pointer field
+typedef struct ARListElem
+{
+    struct ARListElem *next;
+    AuthRecord ar;          // Note: Must be last element of structure, to accomodate oversized AuthRecords
+} ARListElem;
+
+struct CacheRecord_struct
+{
+    CacheRecord    *next;               // Next in list; first element of structure for efficiency reasons
+    ResourceRecord resrec;              // 36 bytes when compiling for 32-bit; 48 when compiling for 64-bit
+
+    // Transient state for Cache Records
+    CacheRecord    *NextInKAList;       // Link to the next element in the chain of known answers to send
+    mDNSs32 TimeRcvd;                   // In platform time units
+    mDNSs32 DelayDelivery;              // Set if we want to defer delivery of this answer to local clients
+    mDNSs32 NextRequiredQuery;          // In platform time units
+    mDNSs32 LastUsed;                   // In platform time units
+    DNSQuestion    *CRActiveQuestion;   // Points to an active question referencing this answer. Can never point to a NewQuestion.
+    mDNSs32 LastUnansweredTime;         // In platform time units; last time we incremented UnansweredQueries
+    mDNSu8  UnansweredQueries;          // Number of times we've issued a query for this record without getting an answer
+    mDNSu8  CRDNSSECQuestion;           // Set to 1 if this was created in response to a DNSSEC question
+    mDNSOpaque16 responseFlags;         // Second 16 bit in the DNS response
+#if ENABLE_MULTI_PACKET_QUERY_SNOOPING
+    mDNSu32 MPUnansweredQ;              // Multi-packet query handling: Number of times we've seen a query for this record
+    mDNSs32 MPLastUnansweredQT;         // Multi-packet query handling: Last time we incremented MPUnansweredQ
+    mDNSu32 MPUnansweredKA;             // Multi-packet query handling: Number of times we've seen this record in a KA list
+    mDNSBool MPExpectingKA;             // Multi-packet query handling: Set when we increment MPUnansweredQ; allows one KA
+#endif
+    CacheRecord    *NextInCFList;       // Set if this is in the list of records we just received with the cache flush bit set
+    CacheRecord    *nsec;               // NSEC records needed for non-existence proofs
+    CacheRecord    *soa;                // SOA record to return for proxy questions
+
+    mDNSAddr sourceAddress;             // node from which we received this record
+    // Size to here is 76 bytes when compiling 32-bit; 104 bytes when compiling 64-bit
+    RData_small smallrdatastorage;      // Storage for small records is right here (4 bytes header + 68 bytes data = 72 bytes)
+};
+
+// Should match the CacheGroup_struct members, except namestorage[].  Only used to calculate
+// the size of the namestorage array in CacheGroup_struct so that
+// sizeof(CacheGroup) == sizeof(CacheRecord)
+struct CacheGroup_base
+{
+    CacheGroup     *next;
+    mDNSu32         namehash;
+    CacheRecord    *members;
+    CacheRecord   **rrcache_tail;
+    domainname     *name;
+};
+
+struct CacheGroup_struct                // Header object for a list of CacheRecords with the same name
+{
+    CacheGroup     *next;               // Next CacheGroup object in this hash table bucket
+    mDNSu32         namehash;           // Name-based (i.e. case insensitive) hash of name
+    CacheRecord    *members;            // List of CacheRecords with this same name
+    CacheRecord   **rrcache_tail;       // Tail end of that list
+    domainname     *name;               // Common name for all CacheRecords in this list
+    mDNSu8 namestorage[sizeof(CacheRecord) - sizeof(struct CacheGroup_base)];  // match sizeof(CacheRecord)
+};
+
+// Storage sufficient to hold either a CacheGroup header or a CacheRecord
+// -- for best efficiency (to avoid wasted unused storage) they should be the same size
+typedef union CacheEntity_union CacheEntity;
+union CacheEntity_union { CacheEntity *next; CacheGroup cg; CacheRecord cr; };
+
+typedef struct
+{
+    CacheRecord r;
+    mDNSu8 _extradata[MaximumRDSize-InlineCacheRDSize];     // Glue on the necessary number of extra bytes
+    domainname namestorage;                                 // Needs to go *after* the extra rdata bytes
+} LargeCacheRecord;
+
+typedef struct HostnameInfo
+{
+    struct HostnameInfo *next;
+    NATTraversalInfo natinfo;
+    domainname fqdn;
+    AuthRecord arv4;                          // registered IPv4 address record
+    AuthRecord arv6;                          // registered IPv6 address record
+    mDNSRecordCallback *StatusCallback;       // callback to deliver success or error code to client layer
+    const void *StatusContext;                // Client Context
+} HostnameInfo;
+
+typedef struct ExtraResourceRecord_struct ExtraResourceRecord;
+struct ExtraResourceRecord_struct
+{
+    ExtraResourceRecord *next;
+    mDNSu32 ClientID;  // Opaque ID field to be used by client to map an AddRecord call to a set of Extra records
+    AuthRecord r;
+    // Note: Add any additional fields *before* the AuthRecord in this structure, not at the end.
+    // In some cases clients can allocate larger chunks of memory and set r->rdata->MaxRDLength to indicate
+    // that this extra memory is available, which would result in any fields after the AuthRecord getting smashed
+};
+
+// Note: Within an mDNSServiceCallback mDNS all API calls are legal except mDNS_Init(), mDNS_Exit(), mDNS_Execute()
+typedef void mDNSServiceCallback (mDNS *const m, ServiceRecordSet *const sr, mStatus result);
+
+// A ServiceRecordSet has no special meaning to the core code of the Multicast DNS protocol engine;
+// it is just a convenience structure to group together the records that make up a standard service
+// registration so that they can be allocted and deallocted together as a single memory object.
+// It contains its own ServiceCallback+ServiceContext to report aggregate results up to the next layer of software above.
+// It also contains:
+//  * the basic PTR/SRV/TXT triplet used to represent any DNS-SD service
+//  * the "_services" PTR record for service enumeration
+//  * the optional list of SubType PTR records
+//  * the optional list of additional records attached to the service set (e.g. iChat pictures)
+
+struct ServiceRecordSet_struct
+{
+    // These internal state fields are used internally by mDNSCore; the client layer needn't be concerned with them.
+    // No fields need to be set up by the client prior to calling mDNS_RegisterService();
+    // all required data is passed as parameters to that function.
+    mDNSServiceCallback *ServiceCallback;
+    void                *ServiceContext;
+    mDNSBool Conflict;              // Set if this record set was forcibly deregistered because of a conflict
+
+    ExtraResourceRecord *Extras;    // Optional list of extra AuthRecords attached to this service registration
+    mDNSu32 NumSubTypes;
+    AuthRecord          *SubTypes;
+    const mDNSu8        *AnonData;
+    mDNSu32             flags;      // saved for subsequent calls to mDNS_RegisterService() if records 
+                                    // need to be re-registered.
+    AuthRecord RR_ADV;              // e.g. _services._dns-sd._udp.local. PTR _printer._tcp.local.
+    AuthRecord RR_PTR;              // e.g. _printer._tcp.local.        PTR Name._printer._tcp.local.
+    AuthRecord RR_SRV;              // e.g. Name._printer._tcp.local.   SRV 0 0 port target
+    AuthRecord RR_TXT;              // e.g. Name._printer._tcp.local.   TXT PrintQueueName
+    // Don't add any fields after AuthRecord RR_TXT.
+    // This is where the implicit extra space goes if we allocate a ServiceRecordSet containing an oversized RR_TXT record
+};
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Question structures
+#endif
+
+// We record the last eight instances of each duplicate query
+// This gives us v4/v6 on each of Ethernet, AirPort and Firewire, and two free slots "for future expansion"
+// If the host has more active interfaces that this it is not fatal -- duplicate question suppression will degrade gracefully.
+// Since we will still remember the last eight, the busiest interfaces will still get the effective duplicate question suppression.
+#define DupSuppressInfoSize 8
+
+typedef struct
+{
+    mDNSs32 Time;
+    mDNSInterfaceID InterfaceID;
+    mDNSs32 Type;                           // v4 or v6?
+} DupSuppressInfo;
+
+typedef enum
+{
+    LLQ_InitialRequest    = 1,
+    LLQ_SecondaryRequest  = 2,
+    LLQ_Established       = 3,
+    LLQ_Poll              = 4
+} LLQ_State;
+
+// LLQ constants
+#define kLLQ_Vers      1
+#define kLLQ_DefLease  7200 // 2 hours
+#define kLLQ_MAX_TRIES 3    // retry an operation 3 times max
+#define kLLQ_INIT_RESEND 2 // resend an un-ack'd packet after 2 seconds, then double for each additional
+// LLQ Operation Codes
+#define kLLQOp_Setup     1
+#define kLLQOp_Refresh   2
+#define kLLQOp_Event     3
+
+// LLQ Errror Codes
+enum
+{
+    LLQErr_NoError    = 0,
+    LLQErr_ServFull   = 1,
+    LLQErr_Static     = 2,
+    LLQErr_FormErr    = 3,
+    LLQErr_NoSuchLLQ  = 4,
+    LLQErr_BadVers    = 5,
+    LLQErr_UnknownErr = 6
+};
+
+enum { NoAnswer_Normal = 0, NoAnswer_Suspended = 1, NoAnswer_Fail = 2 };
+
+#define HMAC_LEN    64
+#define HMAC_IPAD   0x36
+#define HMAC_OPAD   0x5c
+#define MD5_LEN     16
+
+#define AutoTunnelUnregistered(X) (                                               \
+        (X)->AutoTunnelHostRecord.resrec.RecordType == kDNSRecordTypeUnregistered && \
+        (X)->AutoTunnelTarget.resrec.RecordType == kDNSRecordTypeUnregistered && \
+        (X)->AutoTunnelDeviceInfo.resrec.RecordType == kDNSRecordTypeUnregistered && \
+        (X)->AutoTunnelService.resrec.RecordType == kDNSRecordTypeUnregistered && \
+        (X)->AutoTunnel6Record.resrec.RecordType == kDNSRecordTypeUnregistered )
+
+// Internal data structure to maintain authentication information
+typedef struct DomainAuthInfo
+{
+    struct DomainAuthInfo *next;
+    mDNSs32 deltime;                        // If we're planning to delete this DomainAuthInfo, the time we want it deleted
+    mDNSBool   AutoTunnel;                  // Whether this is AutoTunnel
+    AuthRecord AutoTunnelHostRecord;        // User-visible hostname; used as SRV target for AutoTunnel services
+    AuthRecord AutoTunnelTarget;            // Opaque hostname of tunnel endpoint; used as SRV target for AutoTunnelService record
+    AuthRecord AutoTunnelDeviceInfo;        // Device info of tunnel endpoint
+    AuthRecord AutoTunnelService;           // Service record (possibly NAT-Mapped) of IKE daemon implementing tunnel endpoint
+    AuthRecord AutoTunnel6Record;           // AutoTunnel AAAA Record obtained from awacsd
+    mDNSBool AutoTunnelServiceStarted;         // Whether a service has been registered in this domain
+    mDNSv6Addr AutoTunnelInnerAddress;
+    domainname domain;
+    domainname keyname;
+    domainname hostname;
+    mDNSIPPort port;
+    char b64keydata[32];
+    mDNSu8 keydata_ipad[HMAC_LEN];              // padded key for inner hash rounds
+    mDNSu8 keydata_opad[HMAC_LEN];              // padded key for outer hash rounds
+} DomainAuthInfo;
+
+// Note: Within an mDNSQuestionCallback mDNS all API calls are legal except mDNS_Init(), mDNS_Exit(), mDNS_Execute()
+// Note: Any value other than QC_rmv i.e., any non-zero value will result in kDNSServiceFlagsAdd to the application
+// layer. These values are used within mDNSResponder and not sent across to the application. QC_addnocache is for
+// delivering a response without adding to the cache. QC_forceresponse is superset of QC_addnocache where in
+// addition to not entering in the cache, it also forces the negative response through.
+typedef enum { QC_rmv = 0, QC_add, QC_addnocache, QC_forceresponse, QC_dnssec , QC_nodnssec, QC_suppressed } QC_result;
+typedef void mDNSQuestionCallback (mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord);
+typedef void AsyncDispatchFunc(mDNS *const m, void *context);
+typedef void DNSSECAuthInfoFreeCallback(mDNS *const m, void *context);
+extern void mDNSPlatformDispatchAsync(mDNS *const m, void *context, AsyncDispatchFunc func);
+
+#define NextQSendTime(Q)  ((Q)->LastQTime + (Q)->ThisQInterval)
+#define ActiveQuestion(Q) ((Q)->ThisQInterval > 0 && !(Q)->DuplicateOf)
+#define TimeToSendThisQuestion(Q,time) (ActiveQuestion(Q) && (time) - NextQSendTime(Q) >= 0)
+
+// q->ValidationStatus is either DNSSECValNotRequired or DNSSECValRequired and then moves onto DNSSECValInProgress.
+// When Validation is done, we mark all "DNSSECValInProgress" questions "DNSSECValDone". If we are answering
+// questions from /etc/hosts, then we go straight to DNSSECValDone from the initial state.
+typedef enum { DNSSECValNotRequired = 0, DNSSECValRequired, DNSSECValInProgress, DNSSECValDone } DNSSECValState;
+
+// ValidationRequired can be set to the following values:
+//
+// SECURE validation is set to determine whether something is secure or bogus 
+// INSECURE validation is set internally by dnssec code to indicate that it is currently proving something
+// is insecure
+#define DNSSEC_VALIDATION_NONE              0x00
+#define DNSSEC_VALIDATION_SECURE            0x01
+#define DNSSEC_VALIDATION_SECURE_OPTIONAL   0x02
+#define DNSSEC_VALIDATION_INSECURE          0x03
+
+// For both ValidationRequired and ValidatingResponse question, we validate DNSSEC responses.
+// For ProxyQuestion with DNSSECOK, we just receive the DNSSEC records to pass them along without
+// validation and if the CD bit is not set, we also validate.
+#define DNSSECQuestion(q) ((q)->ValidationRequired || (q)->ValidatingResponse || ((q)->ProxyQuestion && (q)->ProxyDNSSECOK))
+
+// ValidatingQuestion is used when we need to know whether we are validating the DNSSEC responses for a question
+#define ValidatingQuestion(q) ((q)->ValidationRequired || (q)->ValidatingResponse)
+
+#define DNSSECOptionalQuestion(q) ((q)->ValidationRequired == DNSSEC_VALIDATION_SECURE_OPTIONAL)
+
+// Given the resource record and the question, should we follow the CNAME ?
+#define FollowCNAME(q, rr, AddRecord)   (AddRecord && (q)->qtype != kDNSType_CNAME && \
+                                         (rr)->RecordType != kDNSRecordTypePacketNegative && \
+                                         (rr)->rrtype == kDNSType_CNAME)
+
+// RFC 4122 defines it to be 16 bytes 
+#define UUID_SIZE       16
+
+struct DNSQuestion_struct
+{
+    // Internal state fields. These are used internally by mDNSCore; the client layer needn't be concerned with them.
+    DNSQuestion          *next;
+    mDNSu32 qnamehash;
+    mDNSs32 DelayAnswering;                 // Set if we want to defer answering this question until the cache settles
+    mDNSs32 LastQTime;                      // Last scheduled transmission of this Q on *all* applicable interfaces
+    mDNSs32 ThisQInterval;                  // LastQTime + ThisQInterval is the next scheduled transmission of this Q
+                                            // ThisQInterval > 0 for an active question;
+                                            // ThisQInterval = 0 for a suspended question that's still in the list
+                                            // ThisQInterval = -1 for a cancelled question (should not still be in list)
+    mDNSs32 ExpectUnicastResp;              // Set when we send a query with the kDNSQClass_UnicastResponse bit set
+    mDNSs32 LastAnswerPktNum;               // The sequence number of the last response packet containing an answer to this Q
+    mDNSu32 RecentAnswerPkts;               // Number of answers since the last time we sent this query
+    mDNSu32 CurrentAnswers;                 // Number of records currently in the cache that answer this question
+    mDNSu32 BrowseThreshold;                // If we have received at least this number of answers,
+                                            // set the next question interval to MaxQuestionInterval
+    mDNSu32 LargeAnswers;                   // Number of answers with rdata > 1024 bytes
+    mDNSu32 UniqueAnswers;                  // Number of answers received with kDNSClass_UniqueRRSet bit set
+    mDNSInterfaceID FlappingInterface1;     // Set when an interface goes away, to flag if remove events are delivered for this Q
+    mDNSInterfaceID FlappingInterface2;     // Set when an interface goes away, to flag if remove events are delivered for this Q
+    DomainAuthInfo       *AuthInfo;         // Non-NULL if query is currently being done using Private DNS
+    DNSQuestion          *DuplicateOf;
+    DNSQuestion          *NextInDQList;
+    AnonymousInfo        *AnonInfo;         // Anonymous Information
+    DupSuppressInfo DupSuppress[DupSuppressInfoSize];
+    mDNSInterfaceID SendQNow;               // The interface this query is being sent on right now
+    mDNSBool SendOnAll;                     // Set if we're sending this question on all active interfaces
+    mDNSBool CachedAnswerNeedsUpdate;       // See SendQueries().  Set if we're sending this question 
+                                            // because a cached answer needs to be refreshed.
+    mDNSu32 RequestUnicast;                 // Non-zero if we want to send query with kDNSQClass_UnicastResponse bit set
+    mDNSs32 LastQTxTime;                    // Last time this Q was sent on one (but not necessarily all) interfaces
+    mDNSu32 CNAMEReferrals;                 // Count of how many CNAME redirections we've done
+    mDNSBool SuppressQuery;                 // This query should be suppressed and not sent on the wire
+    mDNSu8 LOAddressAnswers;                // Number of answers from the local only auth records that are
+                                            // answering A, AAAA, CNAME, or PTR (/etc/hosts)
+    mDNSu8 WakeOnResolveCount;              // Number of wakes that should be sent on resolve
+    mDNSs32 StopTime;                       // Time this question should be stopped by giving them a negative answer
+
+    // DNSSEC fields
+    DNSSECValState ValidationState;            // Current state of the Validation process
+    DNSSECStatus ValidationStatus;             // Validation status for "ValidationRequired" questions (dnssec)
+    mDNSu8 ValidatingResponse;                 // Question trying to validate a response (dnssec) on behalf of
+                                               // ValidationRequired question
+    void *DNSSECAuthInfo;
+    DNSSECAuthInfoFreeCallback *DAIFreeCallback;
+
+    // Wide Area fields. These are used internally by the uDNS core (Unicast)
+    UDPSocket            *LocalSocket;
+
+    // |-> DNS Configuration related fields used in uDNS (Subset of Wide Area/Unicast fields)
+    DNSServer            *qDNSServer;       // Caching server for this query (in the absence of an SRV saying otherwise)
+    mDNSOpaque64 validDNSServers;           // Valid DNSServers for this question
+    mDNSu16 noServerResponse;               // At least one server did not respond.
+    mDNSu16 triedAllServersOnce;            // Tried all DNS servers once
+    mDNSu8 unansweredQueries;               // The number of unanswered queries to this server
+
+    ZoneData             *nta;              // Used for getting zone data for private or LLQ query
+    mDNSAddr servAddr;                      // Address and port learned from _dns-llq, _dns-llq-tls or _dns-query-tls SRV query
+    mDNSIPPort servPort;
+    struct tcpInfo_t *tcp;
+    mDNSIPPort tcpSrcPort;                  // Local Port TCP packet received on;need this as tcp struct is disposed
+                                            // by tcpCallback before calling into mDNSCoreReceive
+    mDNSu8 NoAnswer;                        // Set if we want to suppress answers until tunnel setup has completed
+    mDNSu8 Restart;                         // This question should be restarted soon
+
+    // LLQ-specific fields. These fields are only meaningful when LongLived flag is set
+    LLQ_State state;
+    mDNSu32 ReqLease;                       // seconds (relative)
+    mDNSs32 expire;                         // ticks (absolute)
+    mDNSs16 ntries;                         // for UDP: the number of packets sent for this LLQ state
+                                            // for TCP: there is some ambiguity in the use of this variable, but in general, it is
+                                            //          the number of TCP/TLS connection attempts for this LLQ state, or
+                                            //          the number of packets sent for this TCP/TLS connection
+    mDNSOpaque64 id;
+
+    // DNS Proxy fields
+    mDNSOpaque16 responseFlags;             // Temporary place holder for the error we get back from the DNS server
+                                            // till we populate in the cache
+    mDNSBool     DisallowPID;               // Is the query allowed for the "PID" that we are sending on behalf of ?
+    mDNSs32      ServiceID;                 // Service identifier to match against the DNS server
+    
+    // Client API fields: The client must set up these fields *before* calling mDNS_StartQuery()
+    mDNSInterfaceID InterfaceID;            // Non-zero if you want to issue queries only on a single specific IP interface
+    mDNSu32  flags;                         // flags from original DNSService*() API request.
+    mDNSAddr Target;                        // Non-zero if you want to direct queries to a specific unicast target address
+    mDNSIPPort TargetPort;                  // Must be set if Target is set
+    mDNSOpaque16 TargetQID;                 // Must be set if Target is set
+    domainname qname;
+    mDNSu16 qtype;
+    mDNSu16 qclass;
+    mDNSBool LongLived;                     // Set by client for calls to mDNS_StartQuery to indicate LLQs to unicast layer.
+    mDNSBool ExpectUnique;                  // Set by client if it's expecting unique RR(s) for this question, not shared RRs
+    mDNSBool ForceMCast;                    // Set by client to force mDNS query, even for apparently uDNS names
+    mDNSBool ReturnIntermed;                // Set by client to request callbacks for intermediate CNAME/NXDOMAIN results
+    mDNSBool SuppressUnusable;              // Set by client to suppress unusable queries to be sent on the wire
+    mDNSu8 RetryWithSearchDomains;          // Retry with search domains if there is no entry in the cache or AuthRecords
+    mDNSu8 TimeoutQuestion;                 // Timeout this question if there is no reply in configured time
+    mDNSu8 WakeOnResolve;                   // Send wakeup on resolve
+    mDNSu8 UseBackgroundTrafficClass;       // Use background traffic class for request
+    mDNSs8 SearchListIndex;                 // Index into SearchList; Used by the client layer but not touched by core
+    mDNSs8 AppendSearchDomains;             // Search domains can be appended for this query
+    mDNSs8 AppendLocalSearchDomains;        // Search domains ending in .local can be appended for this query
+    mDNSu8 ValidationRequired;              // Requires DNSSEC validation.
+    mDNSu8 ProxyQuestion;                   // Proxy Question
+    mDNSu8 ProxyDNSSECOK;                   // Proxy Question with EDNS0 DNSSEC OK bit set
+    mDNSs32 pid;                            // Process ID of the client that is requesting the question
+    mDNSu8  uuid[UUID_SIZE];                // Unique ID of the client that is requesting the question (valid only if pid is zero)
+    domainname           *qnameOrig;        // Copy of the original question name if it is not fully qualified
+    mDNSQuestionCallback *QuestionCallback;
+    void                 *QuestionContext;
+};
+
+typedef struct
+{
+    // Client API fields: The client must set up name and InterfaceID *before* calling mDNS_StartResolveService()
+    // When the callback is invoked, ip, port, TXTlen and TXTinfo will have been filled in with the results learned from the network.
+    domainname name;
+    mDNSInterfaceID InterfaceID;        // ID of the interface the response was received on
+    mDNSAddr ip;                        // Remote (destination) IP address where this service can be accessed
+    mDNSIPPort port;                    // Port where this service can be accessed
+    mDNSu16 TXTlen;
+    mDNSu8 TXTinfo[2048];               // Additional demultiplexing information (e.g. LPR queue name)
+} ServiceInfo;
+
+// Note: Within an mDNSServiceInfoQueryCallback mDNS all API calls are legal except mDNS_Init(), mDNS_Exit(), mDNS_Execute()
+typedef struct ServiceInfoQuery_struct ServiceInfoQuery;
+typedef void mDNSServiceInfoQueryCallback (mDNS *const m, ServiceInfoQuery *query);
+struct ServiceInfoQuery_struct
+{
+    // Internal state fields. These are used internally by mDNSCore; the client layer needn't be concerned with them.
+    // No fields need to be set up by the client prior to calling mDNS_StartResolveService();
+    // all required data is passed as parameters to that function.
+    // The ServiceInfoQuery structure memory is working storage for mDNSCore to discover the requested information
+    // and place it in the ServiceInfo structure. After the client has called mDNS_StopResolveService(), it may
+    // dispose of the ServiceInfoQuery structure while retaining the results in the ServiceInfo structure.
+    DNSQuestion qSRV;
+    DNSQuestion qTXT;
+    DNSQuestion qAv4;
+    DNSQuestion qAv6;
+    mDNSu8 GotSRV;
+    mDNSu8 GotTXT;
+    mDNSu8 GotADD;
+    mDNSu32 Answers;
+    ServiceInfo                  *info;
+    mDNSServiceInfoQueryCallback *ServiceInfoQueryCallback;
+    void                         *ServiceInfoQueryContext;
+};
+
+typedef enum { ZoneServiceUpdate, ZoneServiceQuery, ZoneServiceLLQ } ZoneService;
+
+typedef void ZoneDataCallback (mDNS *const m, mStatus err, const ZoneData *result);
+
+struct ZoneData_struct
+{
+    domainname ChildName;               // Name for which we're trying to find the responsible server
+    ZoneService ZoneService;            // Which service we're seeking for this zone (update, query, or LLQ)
+    domainname       *CurrentSOA;       // Points to somewhere within ChildName
+    domainname ZoneName;                // Discovered result: Left-hand-side of SOA record
+    mDNSu16 ZoneClass;                  // Discovered result: DNS Class from SOA record
+    domainname Host;                    // Discovered result: Target host from SRV record
+    mDNSIPPort Port;                    // Discovered result: Update port, query port, or LLQ port from SRV record
+    mDNSAddr Addr;                      // Discovered result: Address of Target host from SRV record
+    mDNSBool ZonePrivate;               // Discovered result: Does zone require encrypted queries?
+    ZoneDataCallback *ZoneDataCallback; // Caller-specified function to be called upon completion
+    void             *ZoneDataContext;
+    DNSQuestion question;               // Storage for any active question
+};
+
+extern ZoneData *StartGetZoneData(mDNS *const m, const domainname *const name, const ZoneService target, ZoneDataCallback callback, void *callbackInfo);
+extern void CancelGetZoneData(mDNS *const m, ZoneData *nta);
+extern mDNSBool IsGetZoneDataQuestion(DNSQuestion *q);
+
+typedef struct DNameListElem
+{
+    struct DNameListElem *next;
+    mDNSu32 uid;
+    domainname name;
+} DNameListElem;
+
+#if APPLE_OSX_mDNSResponder
+// Different states that we go through locating the peer
+#define TC_STATE_AAAA_PEER          0x000000001     /* Peer's BTMM IPv6 address */
+#define TC_STATE_AAAA_PEER_RELAY    0x000000002     /* Peer's IPv6 Relay address */
+#define TC_STATE_SRV_PEER           0x000000003     /* Peer's SRV Record corresponding to IPv4 address */
+#define TC_STATE_ADDR_PEER          0x000000004     /* Peer's IPv4 address */
+
+typedef struct ClientTunnel
+{
+    struct ClientTunnel *next;
+    domainname dstname;
+    mDNSBool MarkedForDeletion;
+    mDNSv6Addr loc_inner;
+    mDNSv4Addr loc_outer;
+    mDNSv6Addr loc_outer6;
+    mDNSv6Addr rmt_inner;
+    mDNSv4Addr rmt_outer;
+    mDNSv6Addr rmt_outer6;
+    mDNSIPPort rmt_outer_port;
+    mDNSu16 tc_state;
+    DNSQuestion q;
+} ClientTunnel;
+#endif
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - NetworkInterfaceInfo_struct
+#endif
+
+typedef struct NetworkInterfaceInfo_struct NetworkInterfaceInfo;
+
+// A NetworkInterfaceInfo_struct serves two purposes:
+// 1. It holds the address, PTR and HINFO records to advertise a given IP address on a given physical interface
+// 2. It tells mDNSCore which physical interfaces are available; each physical interface has its own unique InterfaceID.
+//    Since there may be multiple IP addresses on a single physical interface,
+//    there may be multiple NetworkInterfaceInfo_structs with the same InterfaceID.
+//    In this case, to avoid sending the same packet n times, when there's more than one
+//    struct with the same InterfaceID, mDNSCore picks one member of the set to be the
+//    active representative of the set; all others have the 'InterfaceActive' flag unset.
+
+struct NetworkInterfaceInfo_struct
+{
+    // Internal state fields. These are used internally by mDNSCore; the client layer needn't be concerned with them.
+    NetworkInterfaceInfo *next;
+
+    mDNSu8 InterfaceActive;             // Set if interface is sending & receiving packets (see comment above)
+    mDNSu8 IPv4Available;               // If InterfaceActive, set if v4 available on this InterfaceID
+    mDNSu8 IPv6Available;               // If InterfaceActive, set if v6 available on this InterfaceID
+
+    DNSQuestion NetWakeBrowse;
+    DNSQuestion NetWakeResolve[3];      // For fault-tolerance, we try up to three Sleep Proxies
+    mDNSAddr SPSAddr[3];
+    mDNSIPPort SPSPort[3];
+    mDNSs32 NextSPSAttempt;             // -1 if we're not currently attempting to register with any Sleep Proxy
+    mDNSs32 NextSPSAttemptTime;
+
+    // Standard AuthRecords that every Responder host should have (one per active IP address)
+    AuthRecord RR_A;                    // 'A' or 'AAAA' (address) record for our ".local" name
+    AuthRecord RR_PTR;                  // PTR (reverse lookup) record
+    AuthRecord RR_HINFO;
+
+    // Client API fields: The client must set up these fields *before* calling mDNS_RegisterInterface()
+    mDNSInterfaceID InterfaceID;        // Identifies physical interface; MUST NOT be 0, -1, or -2
+    mDNSAddr ip;                        // The IPv4 or IPv6 address to advertise
+    mDNSAddr mask;
+    mDNSEthAddr MAC;
+    char ifname[64];                    // Windows uses a GUID string for the interface name, which doesn't fit in 16 bytes
+    mDNSu8 Advertise;                   // False if you are only searching on this interface
+    mDNSu8 McastTxRx;                   // Send/Receive multicast on this { InterfaceID, address family } ?
+    mDNSu8 NetWake;                     // Set if Wake-On-Magic-Packet is enabled on this interface
+    mDNSu8 Loopback;                    // Set if this is the loopback interface
+    mDNSu8 IgnoreIPv4LL;                // Set if IPv4 Link-Local addresses have to be ignored.
+    mDNSu8 SendGoodbyes;                // Send goodbyes on this interface while sleeping
+    mDNSBool DirectLink;                // a direct link, indicating we can skip the probe for
+                                        // address records
+};
+
+#define SLE_DELETE                      0x00000001
+#define SLE_WAB_BROWSE_QUERY_STARTED    0x00000002
+#define SLE_WAB_LBROWSE_QUERY_STARTED   0x00000004
+#define SLE_WAB_REG_QUERY_STARTED       0x00000008
+
+typedef struct SearchListElem
+{
+    struct SearchListElem *next;
+    domainname domain;
+    int flag;
+    mDNSInterfaceID InterfaceID;
+    DNSQuestion BrowseQ;
+    DNSQuestion DefBrowseQ;
+    DNSQuestion AutomaticBrowseQ;
+    DNSQuestion RegisterQ;
+    DNSQuestion DefRegisterQ;
+    int numCfAnswers;
+    ARListElem *AuthRecs;
+} SearchListElem;
+
+// For domain enumeration and automatic browsing
+// This is the user's DNS search list.
+// In each of these domains we search for our special pointer records (lb._dns-sd._udp.<domain>, etc.)
+// to discover recommended domains for domain enumeration (browse, default browse, registration,
+// default registration) and possibly one or more recommended automatic browsing domains.
+extern SearchListElem *SearchList;      // This really ought to be part of mDNS_struct -- SC
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Main mDNS object, used to hold all the mDNS state
+#endif
+
+typedef void mDNSCallback (mDNS *const m, mStatus result);
+
+#ifndef CACHE_HASH_SLOTS
+#define CACHE_HASH_SLOTS 499
+#endif
+
+enum
+{
+    SleepState_Awake = 0,
+    SleepState_Transferring = 1,
+    SleepState_Sleeping = 2
+};
+
+typedef enum
+{
+    kStatsActionIncrement,
+    kStatsActionDecrement,
+    kStatsActionClear,
+    kStatsActionSet
+} DNSSECStatsAction;
+
+typedef enum
+{
+    kStatsTypeMemoryUsage,
+    kStatsTypeLatency,
+    kStatsTypeExtraPackets,
+    kStatsTypeStatus,
+    kStatsTypeProbe,
+    kStatsTypeMsgSize
+} DNSSECStatsType;
+
+typedef struct
+{
+    mDNSu32 TotalMemUsed;
+    mDNSu32 Latency0;           // 0 to 4 ms
+    mDNSu32 Latency5;           // 5 to  9 ms
+    mDNSu32 Latency10;          // 10 to 19 ms
+    mDNSu32 Latency20;          // 20 to 49 ms
+    mDNSu32 Latency50;          // 50 to 99 ms
+    mDNSu32 Latency100;         // >= 100 ms
+    mDNSu32 ExtraPackets0;      // 0 to 2 packets
+    mDNSu32 ExtraPackets3;      // 3 to 6 packets
+    mDNSu32 ExtraPackets7;      // 7 to 9 packets
+    mDNSu32 ExtraPackets10;     // >= 10 packets
+    mDNSu32 SecureStatus;
+    mDNSu32 InsecureStatus;
+    mDNSu32 IndeterminateStatus;
+    mDNSu32 BogusStatus;
+    mDNSu32 NoResponseStatus;
+    mDNSu32 NumProbesSent;      // Number of probes sent
+    mDNSu32 MsgSize0;           // DNSSEC message size <= 1024
+    mDNSu32 MsgSize1;           // DNSSEC message size <= 2048
+    mDNSu32 MsgSize2;           // DNSSEC message size > 2048
+} DNSSECStatistics;
+
+typedef struct
+{
+    mDNSu32 NameConflicts;                  // Normal Name conflicts
+    mDNSu32 KnownUniqueNameConflicts;       // Name Conflicts for KnownUnique Records
+    mDNSu32 DupQuerySuppressions;           // Duplicate query suppressions
+    mDNSu32 KnownAnswerSuppressions;        // Known Answer suppressions
+    mDNSu32 KnownAnswerMultiplePkts;        // Known Answer in queries spannign multiple packets
+    mDNSu32 PoofCacheDeletions;             // Number of times the cache was deleted due to POOF
+    mDNSu32 UnicastBitInQueries;            // Queries with QU bit set
+    mDNSu32 NormalQueries;                  // Queries with QU bit not set
+    mDNSu32 MatchingAnswersForQueries;      // Queries for which we had a response
+    mDNSu32 UnicastResponses;               // Unicast responses to queries
+    mDNSu32 MulticastResponses;             // Multicast responses to queries
+    mDNSu32 UnicastDemotedToMulticast;      // Number of times unicast demoted to multicast
+    mDNSu32 Sleeps;                         // Total sleeps
+    mDNSu32 Wakes;                          // Total wakes
+    mDNSu32 InterfaceUp;                    // Total Interface UP events
+    mDNSu32 InterfaceUpFlap;                // Total Interface UP events with flaps
+    mDNSu32 InterfaceDown;                  // Total Interface Down events
+    mDNSu32 InterfaceDownFlap;              // Total Interface Down events with flaps
+    mDNSu32 CacheRefreshQueries;            // Number of queries that we sent for refreshing cache
+    mDNSu32 CacheRefreshed;                 // Number of times the cache was refreshed due to a response
+    mDNSu32 WakeOnResolves;                 // Number of times we did a wake on resolve
+} mDNSStatistics;
+extern void LogMDNSStatistics(mDNS *const m);
+
+struct mDNS_struct
+{
+    // Internal state fields. These hold the main internal state of mDNSCore;
+    // the client layer needn't be concerned with them.
+    // No fields need to be set up by the client prior to calling mDNS_Init();
+    // all required data is passed as parameters to that function.
+
+    mDNS_PlatformSupport *p;            // Pointer to platform-specific data of indeterminite size
+    mDNSBool CanReceiveUnicastOn5353;
+    mDNSBool AdvertiseLocalAddresses;
+    mDNSBool DivertMulticastAdvertisements; // from interfaces that do not advertise local addresses to local-only
+    mStatus mDNSPlatformStatus;
+    mDNSIPPort UnicastPort4;
+    mDNSIPPort UnicastPort6;
+    mDNSEthAddr PrimaryMAC;             // Used as unique host ID
+    mDNSCallback *MainCallback;
+    void         *MainContext;
+
+    // For debugging: To catch and report locking failures
+    mDNSu32 mDNS_busy;                  // Incremented between mDNS_Lock/mDNS_Unlock section
+    mDNSu32 mDNS_reentrancy;            // Incremented when calling a client callback
+    mDNSu8 lock_rrcache;                // For debugging: Set at times when these lists may not be modified
+    mDNSu8 lock_Questions;
+    mDNSu8 lock_Records;
+#ifndef MaxMsg
+    #define MaxMsg 512
+#endif
+    char MsgBuffer[MaxMsg];             // Temp storage used while building error log messages
+
+    // Task Scheduling variables
+    mDNSs32 timenow_adjust;             // Correction applied if we ever discover time went backwards
+    mDNSs32 timenow;                    // The time that this particular activation of the mDNS code started
+    mDNSs32 timenow_last;               // The time the last time we ran
+    mDNSs32 NextScheduledEvent;         // Derived from values below
+    mDNSs32 ShutdownTime;               // Set when we're shutting down; allows us to skip some unnecessary steps
+    mDNSs32 SuppressSending;            // Don't send local-link mDNS packets during this time
+    mDNSs32 NextCacheCheck;             // Next time to refresh cache record before it expires
+    mDNSs32 NextScheduledQuery;         // Next time to send query in its exponential backoff sequence
+    mDNSs32 NextScheduledProbe;         // Next time to probe for new authoritative record
+    mDNSs32 NextScheduledResponse;      // Next time to send authoritative record(s) in responses
+    mDNSs32 NextScheduledNATOp;         // Next time to send NAT-traversal packets
+    mDNSs32 NextScheduledSPS;           // Next time to purge expiring Sleep Proxy records
+    mDNSs32 NextScheduledKA;            // Next time to send Keepalive packets (SPS)
+    mDNSs32 RandomQueryDelay;           // For de-synchronization of query packets on the wire
+    mDNSu32 RandomReconfirmDelay;       // For de-synchronization of reconfirmation queries on the wire
+    mDNSs32 PktNum;                     // Unique sequence number assigned to each received packet
+    mDNSs32 MPktNum;                    // Unique sequence number assigned to each received Multicast packet
+    mDNSu8 LocalRemoveEvents;           // Set if we may need to deliver remove events for local-only questions and/or local-only records
+    mDNSu8 SleepState;                  // Set if we're sleeping
+    mDNSu8 SleepSeqNum;                 // "Epoch number" of our current period of wakefulness
+    mDNSu8 SystemWakeOnLANEnabled;      // Set if we want to register with a Sleep Proxy before going to sleep
+    mDNSu8 SentSleepProxyRegistration;  // Set if we registered (or tried to register) with a Sleep Proxy
+    mDNSu8 SystemSleepOnlyIfWakeOnLAN;  // Set if we may only sleep if we managed to register with a Sleep Proxy
+    mDNSs32 AnnounceOwner;              // After waking from sleep, include OWNER option in packets until this time
+    mDNSs32 DelaySleep;                 // To inhibit re-sleeping too quickly right after wake
+    mDNSs32 SleepLimit;                 // Time window to allow deregistrations, etc.,
+                                        // during which underying platform layer should inhibit system sleep
+    mDNSs32 TimeSlept;                  // Time we went to sleep.
+
+    mDNSs32 StatStartTime;              // Time we started gathering statistics during this interval.
+    mDNSs32 NextStatLogTime;            // Next time to log statistics.
+    mDNSs32 ActiveStatTime;             // Total time awake/gathering statistics for this log period.
+    mDNSs32 UnicastPacketsSent;         // Number of unicast packets sent.
+    mDNSs32 MulticastPacketsSent;       // Number of multicast packets sent.
+    mDNSs32 RemoteSubnet;               // Multicast packets received from outside our subnet.
+
+    mDNSs32 NextScheduledSPRetry;       // Time next sleep proxy registration action is required.
+                                        // Only valid if SleepLimit is nonzero and DelaySleep is zero.
+
+    mDNSs32 NextScheduledStopTime;      // Next time to stop a question
+
+
+    // These fields only required for mDNS Searcher...
+    DNSQuestion *Questions;             // List of all registered questions, active and inactive
+    DNSQuestion *NewQuestions;          // Fresh questions not yet answered from cache
+    DNSQuestion *CurrentQuestion;       // Next question about to be examined in AnswerLocalQuestions()
+    DNSQuestion *LocalOnlyQuestions;    // Questions with InterfaceID set to mDNSInterface_LocalOnly or mDNSInterface_P2P
+    DNSQuestion *NewLocalOnlyQuestions; // Fresh local-only or P2P questions not yet answered
+    DNSQuestion *RestartQuestion;       // Questions that are being restarted (stop followed by start)
+    DNSQuestion *ValidationQuestion;    // Questions that are being validated (dnssec)
+    mDNSu32 rrcache_size;               // Total number of available cache entries
+    mDNSu32 rrcache_totalused;          // Number of cache entries currently occupied
+    mDNSu32 rrcache_totalused_unicast;  // Number of cache entries currently occupied by unicast
+    mDNSu32 rrcache_active;             // Number of cache entries currently occupied by records that answer active questions
+    mDNSu32 rrcache_report;
+    CacheEntity *rrcache_free;
+    CacheGroup *rrcache_hash[CACHE_HASH_SLOTS];
+    mDNSs32 rrcache_nextcheck[CACHE_HASH_SLOTS];
+
+    AuthHash rrauth;
+
+    // Fields below only required for mDNS Responder...
+    domainlabel nicelabel;              // Rich text label encoded using canonically precomposed UTF-8
+    domainlabel hostlabel;              // Conforms to RFC 1034 "letter-digit-hyphen" ARPANET host name rules
+    domainname MulticastHostname;       // Fully Qualified "dot-local" Host Name, e.g. "Foo.local."
+    UTF8str255 HIHardware;
+    UTF8str255 HISoftware;
+    AuthRecord DeviceInfo;
+    AuthRecord *ResourceRecords;
+    AuthRecord *DuplicateRecords;       // Records currently 'on hold' because they are duplicates of existing records
+    AuthRecord *NewLocalRecords;        // Fresh AuthRecords (public) not yet delivered to our local-only questions
+    AuthRecord *CurrentRecord;          // Next AuthRecord about to be examined
+    mDNSBool NewLocalOnlyRecords;       // Fresh AuthRecords (local only) not yet delivered to our local questions
+    NetworkInterfaceInfo *HostInterfaces;
+    mDNSs32 ProbeFailTime;
+    mDNSu32 NumFailedProbes;
+    mDNSs32 SuppressProbes;
+    Platform_t mDNS_plat;
+
+    // Unicast-specific data
+    mDNSs32 NextuDNSEvent;                  // uDNS next event
+    mDNSs32 NextSRVUpdate;                  // Time to perform delayed update
+
+    DNSServer        *DNSServers;           // list of DNS servers
+    McastResolver    *McastResolvers;       // list of Mcast Resolvers
+
+    mDNSAddr Router;
+    mDNSAddr AdvertisedV4;                  // IPv4 address pointed to by hostname
+    mDNSAddr AdvertisedV6;                  // IPv6 address pointed to by hostname
+
+    DomainAuthInfo   *AuthInfoList;         // list of domains requiring authentication for updates
+
+    DNSQuestion ReverseMap;                 // Reverse-map query to find static hostname for service target
+    DNSQuestion AutomaticBrowseDomainQ;
+    domainname StaticHostname;              // Current answer to reverse-map query
+    domainname FQDN;
+    HostnameInfo     *Hostnames;            // List of registered hostnames + hostname metadata
+    NATTraversalInfo AutoTunnelNAT;         // Shared between all AutoTunnel DomainAuthInfo structs
+    mDNSv6Addr AutoTunnelRelayAddr;
+
+    mDNSu32 WABBrowseQueriesCount;          // Number of WAB Browse domain enumeration queries (b, db) callers
+    mDNSu32 WABLBrowseQueriesCount;         // Number of legacy WAB Browse domain enumeration queries (lb) callers
+    mDNSu32 WABRegQueriesCount;             // Number of WAB Registration domain enumeration queries (r, dr) callers
+    mDNSu8 SearchDomainsHash[MD5_LEN];
+
+    // NAT-Traversal fields
+    NATTraversalInfo LLQNAT;                    // Single shared NAT Traversal to receive inbound LLQ notifications
+    NATTraversalInfo *NATTraversals;
+    NATTraversalInfo *CurrentNATTraversal;
+    mDNSs32 retryIntervalGetAddr;               // delta between time sent and retry for NAT-PMP & UPnP/IGD external address request
+    mDNSs32 retryGetAddr;                       // absolute time when we retry for NAT-PMP & UPnP/IGD external address request
+    mDNSv4Addr ExtAddress;                      // the external address discovered via NAT-PMP or UPnP/IGD
+    mDNSu32 PCPNonce[3];                        // the nonce if using PCP
+
+    UDPSocket        *NATMcastRecvskt;          // For receiving PCP & NAT-PMP announcement multicasts from router on port 5350
+    mDNSu32 LastNATupseconds;                   // NAT engine uptime in seconds, from most recent NAT packet
+    mDNSs32 LastNATReplyLocalTime;              // Local time in ticks when most recent NAT packet was received
+    mDNSu16 LastNATMapResultCode;               // Most recent error code for mappings
+
+    tcpLNTInfo tcpAddrInfo;                     // legacy NAT traversal TCP connection info for external address
+    tcpLNTInfo tcpDeviceInfo;                   // legacy NAT traversal TCP connection info for device info
+    tcpLNTInfo       *tcpInfoUnmapList;         // list of pending unmap requests
+    mDNSInterfaceID UPnPInterfaceID;
+    UDPSocket        *SSDPSocket;               // For SSDP request/response
+    mDNSBool SSDPWANPPPConnection;              // whether we should send the SSDP query for WANIPConnection or WANPPPConnection
+    mDNSIPPort UPnPRouterPort;                  // port we send discovery messages to
+    mDNSIPPort UPnPSOAPPort;                    // port we send SOAP messages to
+    mDNSu8           *UPnPRouterURL;            // router's URL string
+    mDNSBool UPnPWANPPPConnection;              // whether we're using WANIPConnection or WANPPPConnection
+    mDNSu8           *UPnPSOAPURL;              // router's SOAP control URL string
+    mDNSu8           *UPnPRouterAddressString;  // holds both the router's address and port
+    mDNSu8           *UPnPSOAPAddressString;    // holds both address and port for SOAP messages
+
+    // Sleep Proxy client fields
+    AuthRecord *SPSRRSet;                       // To help the client keep track of the records registered with the sleep proxy
+
+    // Sleep Proxy Server fields
+    mDNSu8 SPSType;                             // 0 = off, 10-99 encodes desirability metric
+    mDNSu8 SPSPortability;                      // 10-99
+    mDNSu8 SPSMarginalPower;                    // 10-99
+    mDNSu8 SPSTotalPower;                       // 10-99
+    mDNSu8 SPSFeatureFlags;                     // Features supported. Currently 1 = TCP KeepAlive supported.
+    mDNSu8 SPSState;                            // 0 = off, 1 = running, 2 = shutting down, 3 = suspended during sleep
+    mDNSInterfaceID SPSProxyListChanged;
+    UDPSocket        *SPSSocket;
+#ifndef SPC_DISABLED
+    ServiceRecordSet SPSRecords;
+#endif
+    mDNSQuestionCallback *SPSBrowseCallback;    // So the platform layer can do something useful with SPS browse results
+    int ProxyRecords;                           // Total number of records we're holding as proxy
+    #define           MAX_PROXY_RECORDS 10000   /* DOS protection: 400 machines at 25 records each */
+
+#if APPLE_OSX_mDNSResponder
+    ClientTunnel     *TunnelClients;
+    uuid_t asl_uuid;                            // uuid for ASL logging
+    void            *WCF;
+#endif
+    // DNS Proxy fields
+    mDNSu32 dp_ipintf[MaxIp];                   // input interface index list from the DNS Proxy Client
+    mDNSu32 dp_opintf;                          // output interface index from the DNS Proxy Client
+
+    TrustAnchor     *TrustAnchors;
+    int             notifyToken;
+    int             uds_listener_skt;           // Listening socket for incoming UDS clients
+    mDNSBool        mDNSOppCaching;             // Opportunistic Caching
+    mDNSu32         AutoTargetServices;         // # of services that have AutoTarget set
+    DNSSECStatistics DNSSECStats;
+    mDNSStatistics   mDNSStats;
+
+    // Fixed storage, to avoid creating large objects on the stack
+    // The imsg is declared as a union with a pointer type to enforce CPU-appropriate alignment
+    union { DNSMessage m; void *p; } imsg;  // Incoming message received from wire
+    DNSMessage omsg;                        // Outgoing message we're building
+    LargeCacheRecord rec;                   // Resource Record extracted from received message
+};
+
+#define FORALL_CACHERECORDS(SLOT,CG,CR)                           \
+    for ((SLOT) = 0; (SLOT) < CACHE_HASH_SLOTS; (SLOT)++)                                                                   \
+        for ((CG)=m->rrcache_hash[(SLOT)]; (CG); (CG)=(CG)->next)                                                                   \
+            for ((CR) = (CG)->members; (CR); (CR)=(CR)->next)
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Useful Static Constants
+#endif
+
+extern const mDNSInterfaceID mDNSInterface_Any;             // Zero
+extern const mDNSInterfaceID mDNSInterface_LocalOnly;       // Special value
+extern const mDNSInterfaceID mDNSInterface_Unicast;         // Special value
+extern const mDNSInterfaceID mDNSInterfaceMark;             // Special value
+extern const mDNSInterfaceID mDNSInterface_P2P;             // Special value
+extern const mDNSInterfaceID uDNSInterfaceMark;             // Special value
+
+extern const mDNSIPPort DiscardPort;
+extern const mDNSIPPort SSHPort;
+extern const mDNSIPPort UnicastDNSPort;
+extern const mDNSIPPort SSDPPort;
+extern const mDNSIPPort IPSECPort;
+extern const mDNSIPPort NSIPCPort;
+extern const mDNSIPPort NATPMPAnnouncementPort;
+extern const mDNSIPPort NATPMPPort;
+extern const mDNSIPPort DNSEXTPort;
+extern const mDNSIPPort MulticastDNSPort;
+extern const mDNSIPPort LoopbackIPCPort;
+extern const mDNSIPPort PrivateDNSPort;
+
+extern const OwnerOptData zeroOwner;
+
+extern const mDNSIPPort zeroIPPort;
+extern const mDNSv4Addr zerov4Addr;
+extern const mDNSv6Addr zerov6Addr;
+extern const mDNSEthAddr zeroEthAddr;
+extern const mDNSv4Addr onesIPv4Addr;
+extern const mDNSv6Addr onesIPv6Addr;
+extern const mDNSEthAddr onesEthAddr;
+extern const mDNSAddr zeroAddr;
+
+extern const mDNSv4Addr AllDNSAdminGroup;
+extern const mDNSv4Addr AllHosts_v4;
+extern const mDNSv6Addr AllHosts_v6;
+extern const mDNSv6Addr NDP_prefix;
+extern const mDNSEthAddr AllHosts_v6_Eth;
+extern const mDNSAddr AllDNSLinkGroup_v4;
+extern const mDNSAddr AllDNSLinkGroup_v6;
+
+extern const mDNSOpaque16 zeroID;
+extern const mDNSOpaque16 onesID;
+extern const mDNSOpaque16 QueryFlags;
+extern const mDNSOpaque16 uQueryFlags;
+extern const mDNSOpaque16 DNSSecQFlags;
+extern const mDNSOpaque16 ResponseFlags;
+extern const mDNSOpaque16 UpdateReqFlags;
+extern const mDNSOpaque16 UpdateRespFlags;
+
+extern const mDNSOpaque64 zeroOpaque64;
+
+extern mDNSBool StrictUnicastOrdering;
+extern mDNSu8 NumUnicastDNSServers;
+
+#define localdomain           (*(const domainname *)"\x5" "local")
+#define DeviceInfoName        (*(const domainname *)"\xC" "_device-info" "\x4" "_tcp")
+#define LocalDeviceInfoName   (*(const domainname *)"\xC" "_device-info" "\x4" "_tcp" "\x5" "local")
+#define SleepProxyServiceType (*(const domainname *)"\xC" "_sleep-proxy" "\x4" "_udp")
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Inline functions
+#endif
+
+#if (defined(_MSC_VER))
+    #define mDNSinline static __inline
+#elif ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9)))
+    #define mDNSinline static inline
+#endif
+
+// If we're not doing inline functions, then this header needs to have the extern declarations
+#if !defined(mDNSinline)
+extern mDNSs32      NonZeroTime(mDNSs32 t);
+extern mDNSu16      mDNSVal16(mDNSOpaque16 x);
+extern mDNSOpaque16 mDNSOpaque16fromIntVal(mDNSu16 v);
+#endif
+
+// If we're compiling the particular C file that instantiates our inlines, then we
+// define "mDNSinline" (to empty string) so that we generate code in the following section
+#if (!defined(mDNSinline) && mDNS_InstantiateInlines)
+#define mDNSinline
+#endif
+
+#ifdef mDNSinline
+
+mDNSinline mDNSs32 NonZeroTime(mDNSs32 t) { if (t) return(t);else return(1);}
+
+mDNSinline mDNSu16 mDNSVal16(mDNSOpaque16 x) { return((mDNSu16)((mDNSu16)x.b[0] <<  8 | (mDNSu16)x.b[1])); }
+
+mDNSinline mDNSOpaque16 mDNSOpaque16fromIntVal(mDNSu16 v)
+{
+    mDNSOpaque16 x;
+    x.b[0] = (mDNSu8)(v >> 8);
+    x.b[1] = (mDNSu8)(v & 0xFF);
+    return(x);
+}
+
+#endif
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Main Client Functions
+#endif
+
+// Every client should call mDNS_Init, passing in storage for the mDNS object and the mDNS_PlatformSupport object.
+//
+// Clients that are only advertising services should use mDNS_Init_NoCache and mDNS_Init_ZeroCacheSize.
+// Clients that plan to perform queries (mDNS_StartQuery, mDNS_StartBrowse, mDNS_StartResolveService, etc.)
+// need to provide storage for the resource record cache, or the query calls will return 'mStatus_NoCache'.
+// The rrcachestorage parameter is the address of memory for the resource record cache, and
+// the rrcachesize parameter is the number of entries in the CacheRecord array passed in.
+// (i.e. the size of the cache memory needs to be sizeof(CacheRecord) * rrcachesize).
+// OS X 10.3 Panther uses an initial cache size of 64 entries, and then mDNSCore sends an
+// mStatus_GrowCache message if it needs more.
+//
+// Most clients should use mDNS_Init_AdvertiseLocalAddresses. This causes mDNSCore to automatically
+// create the correct address records for all the hosts interfaces. If you plan to advertise
+// services being offered by the local machine, this is almost always what you want.
+// There are two cases where you might use mDNS_Init_DontAdvertiseLocalAddresses:
+// 1. A client-only device, that browses for services but doesn't advertise any of its own.
+// 2. A proxy-registration service, that advertises services being offered by other machines, and takes
+//    the appropriate steps to manually create the correct address records for those other machines.
+// In principle, a proxy-like registration service could manually create address records for its own machine too,
+// but this would be pointless extra effort when using mDNS_Init_AdvertiseLocalAddresses does that for you.
+//
+// Note that a client-only device that wishes to prohibit multicast advertisements (e.g. from
+// higher-layer API calls) must also set DivertMulticastAdvertisements in the mDNS structure and
+// advertise local address(es) on a loopback interface.
+//
+// When mDNS has finished setting up the client's callback is called
+// A client can also spin and poll the mDNSPlatformStatus field to see when it changes from mStatus_Waiting to mStatus_NoError
+//
+// Call mDNS_StartExit to tidy up before exiting
+// Because exiting may be an asynchronous process (e.g. if unicast records need to be deregistered)
+// client layer may choose to wait until mDNS_ExitNow() returns true before calling mDNS_FinalExit().
+//
+// Call mDNS_Register with a completed AuthRecord object to register a resource record
+// If the resource record type is kDNSRecordTypeUnique (or kDNSknownunique) then if a conflicting resource record is discovered,
+// the resource record's mDNSRecordCallback will be called with error code mStatus_NameConflict. The callback should deregister
+// the record, and may then try registering the record again after picking a new name (e.g. by automatically appending a number).
+// Following deregistration, the RecordCallback will be called with result mStatus_MemFree to signal that it is safe to deallocate
+// the record's storage (memory must be freed asynchronously to allow for goodbye packets and dynamic update deregistration).
+//
+// Call mDNS_StartQuery to initiate a query. mDNS will proceed to issue Multicast DNS query packets, and any time a response
+// is received containing a record which matches the question, the DNSQuestion's mDNSAnswerCallback function will be called
+// Call mDNS_StopQuery when no more answers are required
+//
+// Care should be taken on multi-threaded or interrupt-driven environments.
+// The main mDNS routines call mDNSPlatformLock() on entry and mDNSPlatformUnlock() on exit;
+// each platform layer needs to implement these appropriately for its respective platform.
+// For example, if the support code on a particular platform implements timer callbacks at interrupt time, then
+// mDNSPlatformLock/Unlock need to disable interrupts or do similar concurrency control to ensure that the mDNS
+// code is not entered by an interrupt-time timer callback while in the middle of processing a client call.
+
+extern mStatus mDNS_Init      (mDNS *const m, mDNS_PlatformSupport *const p,
+                               CacheEntity *rrcachestorage, mDNSu32 rrcachesize,
+                               mDNSBool AdvertiseLocalAddresses,
+                               mDNSCallback *Callback, void *Context);
+// See notes above on use of NoCache/ZeroCacheSize
+#define mDNS_Init_NoCache                     mDNSNULL
+#define mDNS_Init_ZeroCacheSize               0
+// See notes above on use of Advertise/DontAdvertiseLocalAddresses
+#define mDNS_Init_AdvertiseLocalAddresses     mDNStrue
+#define mDNS_Init_DontAdvertiseLocalAddresses mDNSfalse
+#define mDNS_Init_NoInitCallback              mDNSNULL
+#define mDNS_Init_NoInitCallbackContext       mDNSNULL
+
+extern void    mDNS_ConfigChanged(mDNS *const m);
+extern void    mDNS_GrowCache (mDNS *const m, CacheEntity *storage, mDNSu32 numrecords);
+extern void    mDNS_GrowAuth (mDNS *const m, AuthEntity *storage, mDNSu32 numrecords);
+extern void    mDNS_StartExit (mDNS *const m);
+extern void    mDNS_FinalExit (mDNS *const m);
+#define mDNS_Close(m) do { mDNS_StartExit(m); mDNS_FinalExit(m); } while(0)
+#define mDNS_ExitNow(m, now) ((now) - (m)->ShutdownTime >= 0 || (!(m)->ResourceRecords))
+
+extern mDNSs32 mDNS_Execute   (mDNS *const m);
+
+extern mStatus mDNS_Register  (mDNS *const m, AuthRecord *const rr);
+extern mStatus mDNS_Update    (mDNS *const m, AuthRecord *const rr, mDNSu32 newttl,
+                               const mDNSu16 newrdlength, RData *const newrdata, mDNSRecordUpdateCallback *Callback);
+extern mStatus mDNS_Deregister(mDNS *const m, AuthRecord *const rr);
+
+extern mStatus mDNS_StartQuery(mDNS *const m, DNSQuestion *const question);
+extern mStatus mDNS_StopQuery (mDNS *const m, DNSQuestion *const question);
+extern mStatus mDNS_StopQueryWithRemoves(mDNS *const m, DNSQuestion *const question);
+extern mStatus mDNS_Reconfirm (mDNS *const m, CacheRecord *const cacherr);
+extern mStatus mDNS_Reconfirm_internal(mDNS *const m, CacheRecord *const rr, mDNSu32 interval);
+extern mStatus mDNS_ReconfirmByValue(mDNS *const m, ResourceRecord *const rr);
+extern void    mDNS_PurgeCacheResourceRecord(mDNS *const m, CacheRecord *rr);
+extern mDNSs32 mDNS_TimeNow(const mDNS *const m);
+
+extern mStatus mDNS_StartNATOperation(mDNS *const m, NATTraversalInfo *traversal);
+extern mStatus mDNS_StopNATOperation(mDNS *const m, NATTraversalInfo *traversal);
+extern mStatus mDNS_StopNATOperation_internal(mDNS *m, NATTraversalInfo *traversal);
+
+extern DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name);
+
+extern void    mDNS_UpdateAllowSleep(mDNS *const m);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Platform support functions that are accessible to the client layer too
+#endif
+
+extern mDNSs32 mDNSPlatformOneSecond;
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - General utility and helper functions
+#endif
+
+// mDNS_Dereg_normal is used for most calls to mDNS_Deregister_internal
+// mDNS_Dereg_rapid is used to send one goodbye instead of three, when we want the memory available for reuse sooner
+// mDNS_Dereg_conflict is used to indicate that this record is being forcibly deregistered because of a conflict
+// mDNS_Dereg_repeat is used when cleaning up, for records that may have already been forcibly deregistered
+typedef enum { mDNS_Dereg_normal, mDNS_Dereg_rapid, mDNS_Dereg_conflict, mDNS_Dereg_repeat } mDNS_Dereg_type;
+
+// mDNS_RegisterService is a single call to register the set of resource records associated with a given named service.
+//
+// mDNS_StartResolveService is single call which is equivalent to multiple calls to mDNS_StartQuery,
+// to find the IP address, port number, and demultiplexing information for a given named service.
+// As with mDNS_StartQuery, it executes asynchronously, and calls the ServiceInfoQueryCallback when the answer is
+// found. After the service is resolved, the client should call mDNS_StopResolveService to complete the transaction.
+// The client can also call mDNS_StopResolveService at any time to abort the transaction.
+//
+// mDNS_AddRecordToService adds an additional record to a Service Record Set.  This record may be deregistered
+// via mDNS_RemoveRecordFromService, or by deregistering the service.  mDNS_RemoveRecordFromService is passed a
+// callback to free the memory associated with the extra RR when it is safe to do so.  The ExtraResourceRecord
+// object can be found in the record's context pointer.
+
+// mDNS_GetBrowseDomains is a special case of the mDNS_StartQuery call, where the resulting answers
+// are a list of PTR records indicating (in the rdata) domains that are recommended for browsing.
+// After getting the list of domains to browse, call mDNS_StopQuery to end the search.
+// mDNS_GetDefaultBrowseDomain returns the name of the domain that should be highlighted by default.
+//
+// mDNS_GetRegistrationDomains and mDNS_GetDefaultRegistrationDomain are the equivalent calls to get the list
+// of one or more domains that should be offered to the user as choices for where they may register their service,
+// and the default domain in which to register in the case where the user has made no selection.
+
+extern void    mDNS_SetupResourceRecord(AuthRecord *rr, RData *RDataStorage, mDNSInterfaceID InterfaceID,
+                                        mDNSu16 rrtype, mDNSu32 ttl, mDNSu8 RecordType, AuthRecType artype, mDNSRecordCallback Callback, void *Context);
+
+// mDNS_RegisterService() flags parameter bit definitions.
+// Note these are only defined to transfer the corresponding DNSServiceFlags settings into mDNSCore routines,
+// since code in mDNSCore does not include the DNSServiceFlags definitions in dns_sd.h.
+enum
+{
+    coreFlagIncludeP2P   = 0x1,     // include P2P interfaces when using mDNSInterface_Any
+    coreFlagIncludeAWDL  = 0x2,     // include AWDL interface when using mDNSInterface_Any
+    coreFlagKnownUnique  = 0x4,     // client guarantees that SRV and TXT record names are unique
+    coreFlagWakeOnly     = 0x8      // Service won't be registered with sleep proxy
+};
+
+extern mStatus mDNS_RegisterService  (mDNS *const m, ServiceRecordSet *sr,
+                                      const domainlabel *const name, const domainname *const type, const domainname *const domain,
+                                      const domainname *const host, mDNSIPPort port, const mDNSu8 txtinfo[], mDNSu16 txtlen,
+                                      AuthRecord *SubTypes, mDNSu32 NumSubTypes,
+                                      mDNSInterfaceID InterfaceID, mDNSServiceCallback Callback, void *Context, mDNSu32 flags);
+extern mStatus mDNS_AddRecordToService(mDNS *const m, ServiceRecordSet *sr, ExtraResourceRecord *extra, RData *rdata, mDNSu32 ttl,  mDNSu32 flags);
+extern mStatus mDNS_RemoveRecordFromService(mDNS *const m, ServiceRecordSet *sr, ExtraResourceRecord *extra, mDNSRecordCallback MemFreeCallback, void *Context);
+extern mStatus mDNS_RenameAndReregisterService(mDNS *const m, ServiceRecordSet *const sr, const domainlabel *newname);
+extern mStatus mDNS_DeregisterService_drt(mDNS *const m, ServiceRecordSet *sr, mDNS_Dereg_type drt);
+#define mDNS_DeregisterService(M,S) mDNS_DeregisterService_drt((M), (S), mDNS_Dereg_normal)
+
+extern mStatus mDNS_RegisterNoSuchService(mDNS *const m, AuthRecord *const rr,
+                                          const domainlabel *const name, const domainname *const type, const domainname *const domain,
+                                          const domainname *const host,
+                                          const mDNSInterfaceID InterfaceID, mDNSRecordCallback Callback, void *Context, mDNSu32 flags);
+#define        mDNS_DeregisterNoSuchService mDNS_Deregister
+
+extern void mDNS_SetupQuestion(DNSQuestion *const q, const mDNSInterfaceID InterfaceID, const domainname *const name,
+                               const mDNSu16 qtype, mDNSQuestionCallback *const callback, void *const context);
+
+extern mStatus mDNS_StartBrowse(mDNS *const m, DNSQuestion *const question,
+                                const domainname *const srv, const domainname *const domain, const mDNSu8 *anondata,
+                                const mDNSInterfaceID InterfaceID, mDNSu32 flags,
+                                mDNSBool ForceMCast, mDNSBool useBackgroundTrafficClass,
+                                mDNSQuestionCallback *Callback, void *Context);
+#define        mDNS_StopBrowse mDNS_StopQuery
+
+extern mStatus mDNS_StartResolveService(mDNS *const m, ServiceInfoQuery *query, ServiceInfo *info, mDNSServiceInfoQueryCallback *Callback, void *Context);
+extern void    mDNS_StopResolveService (mDNS *const m, ServiceInfoQuery *query);
+
+typedef enum
+{
+    mDNS_DomainTypeBrowse              = 0,
+    mDNS_DomainTypeBrowseDefault       = 1,
+    mDNS_DomainTypeBrowseAutomatic     = 2,
+    mDNS_DomainTypeRegistration        = 3,
+    mDNS_DomainTypeRegistrationDefault = 4,
+
+    mDNS_DomainTypeMax = 4
+} mDNS_DomainType;
+
+extern const char *const mDNS_DomainTypeNames[];
+
+extern mStatus mDNS_GetDomains(mDNS *const m, DNSQuestion *const question, mDNS_DomainType DomainType, const domainname *dom,
+                               const mDNSInterfaceID InterfaceID, mDNSQuestionCallback *Callback, void *Context);
+#define        mDNS_StopGetDomains mDNS_StopQuery
+extern mStatus mDNS_AdvertiseDomains(mDNS *const m, AuthRecord *rr, mDNS_DomainType DomainType, const mDNSInterfaceID InterfaceID, char *domname);
+#define        mDNS_StopAdvertiseDomains mDNS_Deregister
+
+extern mDNSOpaque16 mDNS_NewMessageID(mDNS *const m);
+extern mDNSBool mDNS_AddressIsLocalSubnet(mDNS *const m, const mDNSInterfaceID InterfaceID, const mDNSAddr *addr, mDNSBool *myself);
+
+extern DNSServer *GetServerForQuestion(mDNS *m, DNSQuestion *question);
+extern mDNSu32 SetValidDNSServers(mDNS *m, DNSQuestion *question);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - DNS name utility functions
+#endif
+
+// In order to expose the full capabilities of the DNS protocol (which allows any arbitrary eight-bit values
+// in domain name labels, including unlikely characters like ascii nulls and even dots) all the mDNS APIs
+// work with DNS's native length-prefixed strings. For convenience in C, the following utility functions
+// are provided for converting between C's null-terminated strings and DNS's length-prefixed strings.
+
+// Assignment
+// A simple C structure assignment of a domainname can cause a protection fault by accessing unmapped memory,
+// because that object is defined to be 256 bytes long, but not all domainname objects are truly the full size.
+// This macro uses mDNSPlatformMemCopy() to make sure it only touches the actual bytes that are valid.
+#define AssignDomainName(DST, SRC) do { mDNSu16 len__ = DomainNameLength((SRC)); \
+                                        if (len__ <= MAX_DOMAIN_NAME) mDNSPlatformMemCopy((DST)->c, (SRC)->c, len__);else (DST)->c[0] = 0;} while(0)
+
+// Comparison functions
+#define SameDomainLabelCS(A,B) ((A)[0] == (B)[0] && mDNSPlatformMemSame((A)+1, (B)+1, (A)[0]))
+extern mDNSBool SameDomainLabel(const mDNSu8 *a, const mDNSu8 *b);
+extern mDNSBool SameDomainName(const domainname *const d1, const domainname *const d2);
+extern mDNSBool SameDomainNameCS(const domainname *const d1, const domainname *const d2);
+typedef mDNSBool DomainNameComparisonFn (const domainname *const d1, const domainname *const d2);
+extern mDNSBool IsLocalDomain(const domainname *d);     // returns true for domains that by default should be looked up using link-local multicast
+
+#define StripFirstLabel(X) ((const domainname *)& (X)->c[(X)->c[0] ? 1 + (X)->c[0] : 0])
+
+#define FirstLabel(X)  ((const domainlabel *)(X))
+#define SecondLabel(X) ((const domainlabel *)StripFirstLabel(X))
+#define ThirdLabel(X)  ((const domainlabel *)StripFirstLabel(StripFirstLabel(X)))
+
+extern const mDNSu8 *LastLabel(const domainname *d);
+
+// Get total length of domain name, in native DNS format, including terminal root label
+//   (e.g. length of "com." is 5 (length byte, three data bytes, final zero)
+extern mDNSu16  DomainNameLengthLimit(const domainname *const name, const mDNSu8 *limit);
+#define DomainNameLength(name) DomainNameLengthLimit((name), (name)->c + MAX_DOMAIN_NAME)
+
+// Append functions to append one or more labels to an existing native format domain name:
+//   AppendLiteralLabelString adds a single label from a literal C string, with no escape character interpretation.
+//   AppendDNSNameString      adds zero or more labels from a C string using conventional DNS dots-and-escaping interpretation
+//   AppendDomainLabel        adds a single label from a native format domainlabel
+//   AppendDomainName         adds zero or more labels from a native format domainname
+extern mDNSu8  *AppendLiteralLabelString(domainname *const name, const char *cstr);
+extern mDNSu8  *AppendDNSNameString     (domainname *const name, const char *cstr);
+extern mDNSu8  *AppendDomainLabel       (domainname *const name, const domainlabel *const label);
+extern mDNSu8  *AppendDomainName        (domainname *const name, const domainname *const append);
+
+// Convert from null-terminated string to native DNS format:
+//   The DomainLabel form makes a single label from a literal C string, with no escape character interpretation.
+//   The DomainName form makes native format domain name from a C string using conventional DNS interpretation:
+//     dots separate labels, and within each label, '\.' represents a literal dot, '\\' represents a literal
+//     backslash and backslash with three decimal digits (e.g. \000) represents an arbitrary byte value.
+extern mDNSBool MakeDomainLabelFromLiteralString(domainlabel *const label, const char *cstr);
+extern mDNSu8  *MakeDomainNameFromDNSNameString (domainname  *const name,  const char *cstr);
+
+// Convert native format domainlabel or domainname back to C string format
+// IMPORTANT:
+// When using ConvertDomainLabelToCString, the target buffer must be MAX_ESCAPED_DOMAIN_LABEL (254) bytes long
+// to guarantee there will be no buffer overrun. It is only safe to use a buffer shorter than this in rare cases
+// where the label is known to be constrained somehow (for example, if the label is known to be either "_tcp" or "_udp").
+// Similarly, when using ConvertDomainNameToCString, the target buffer must be MAX_ESCAPED_DOMAIN_NAME (1009) bytes long.
+// See definitions of MAX_ESCAPED_DOMAIN_LABEL and MAX_ESCAPED_DOMAIN_NAME for more detailed explanation.
+extern char    *ConvertDomainLabelToCString_withescape(const domainlabel *const name, char *cstr, char esc);
+#define         ConvertDomainLabelToCString_unescaped(D,C) ConvertDomainLabelToCString_withescape((D), (C), 0)
+#define         ConvertDomainLabelToCString(D,C)           ConvertDomainLabelToCString_withescape((D), (C), '\\')
+extern char    *ConvertDomainNameToCString_withescape(const domainname *const name, char *cstr, char esc);
+#define         ConvertDomainNameToCString_unescaped(D,C) ConvertDomainNameToCString_withescape((D), (C), 0)
+#define         ConvertDomainNameToCString(D,C)           ConvertDomainNameToCString_withescape((D), (C), '\\')
+
+extern void     ConvertUTF8PstringToRFC1034HostLabel(const mDNSu8 UTF8Name[], domainlabel *const hostlabel);
+
+extern mDNSu8  *ConstructServiceName(domainname *const fqdn, const domainlabel *name, const domainname *type, const domainname *const domain);
+extern mDNSBool DeconstructServiceName(const domainname *const fqdn, domainlabel *const name, domainname *const type, domainname *const domain);
+
+// Note: Some old functions have been replaced by more sensibly-named versions.
+// You can uncomment the hash-defines below if you don't want to have to change your source code right away.
+// When updating your code, note that (unlike the old versions) *all* the new routines take the target object
+// as their first parameter.
+//#define ConvertCStringToDomainName(SRC,DST)  MakeDomainNameFromDNSNameString((DST),(SRC))
+//#define ConvertCStringToDomainLabel(SRC,DST) MakeDomainLabelFromLiteralString((DST),(SRC))
+//#define AppendStringLabelToName(DST,SRC)     AppendLiteralLabelString((DST),(SRC))
+//#define AppendStringNameToName(DST,SRC)      AppendDNSNameString((DST),(SRC))
+//#define AppendDomainLabelToName(DST,SRC)     AppendDomainLabel((DST),(SRC))
+//#define AppendDomainNameToName(DST,SRC)      AppendDomainName((DST),(SRC))
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Other utility functions and macros
+#endif
+
+// mDNS_vsnprintf/snprintf return the number of characters written, excluding the final terminating null.
+// The output is always null-terminated: for example, if the output turns out to be exactly buflen long,
+// then the output will be truncated by one character to allow space for the terminating null.
+// Unlike standard C vsnprintf/snprintf, they return the number of characters *actually* written,
+// not the number of characters that *would* have been printed were buflen unlimited.
+extern mDNSu32 mDNS_vsnprintf(char *sbuffer, mDNSu32 buflen, const char *fmt, va_list arg);
+extern mDNSu32 mDNS_snprintf(char *sbuffer, mDNSu32 buflen, const char *fmt, ...) IS_A_PRINTF_STYLE_FUNCTION(3,4);
+extern mDNSu32 NumCacheRecordsForInterfaceID(const mDNS *const m, mDNSInterfaceID id);
+extern char *DNSTypeName(mDNSu16 rrtype);
+extern char *GetRRDisplayString_rdb(const ResourceRecord *const rr, const RDataBody *const rd1, char *const buffer);
+#define RRDisplayString(m, rr) GetRRDisplayString_rdb(rr, &(rr)->rdata->u, (m)->MsgBuffer)
+#define ARDisplayString(m, rr) GetRRDisplayString_rdb(&(rr)->resrec, &(rr)->resrec.rdata->u, (m)->MsgBuffer)
+#define CRDisplayString(m, rr) GetRRDisplayString_rdb(&(rr)->resrec, &(rr)->resrec.rdata->u, (m)->MsgBuffer)
+extern mDNSBool mDNSSameAddress(const mDNSAddr *ip1, const mDNSAddr *ip2);
+extern void IncrementLabelSuffix(domainlabel *name, mDNSBool RichText);
+extern mDNSBool mDNSv4AddrIsRFC1918(const mDNSv4Addr * const addr);  // returns true for RFC1918 private addresses
+#define mDNSAddrIsRFC1918(X) ((X)->type == mDNSAddrType_IPv4 && mDNSv4AddrIsRFC1918(&(X)->ip.v4))
+
+// For PCP
+extern void mDNSAddrMapIPv4toIPv6(mDNSv4Addr* in, mDNSv6Addr* out);
+extern mDNSBool mDNSAddrIPv4FromMappedIPv6(mDNSv6Addr *in, mDNSv4Addr *out);
+
+#define mDNSSameIPPort(A,B)      ((A).NotAnInteger == (B).NotAnInteger)
+#define mDNSSameOpaque16(A,B)    ((A).NotAnInteger == (B).NotAnInteger)
+#define mDNSSameOpaque32(A,B)    ((A).NotAnInteger == (B).NotAnInteger)
+#define mDNSSameOpaque64(A,B)    ((A)->l[0] == (B)->l[0] && (A)->l[1] == (B)->l[1])
+
+#define mDNSSameIPv4Address(A,B) ((A).NotAnInteger == (B).NotAnInteger)
+#define mDNSSameIPv6Address(A,B) ((A).l[0] == (B).l[0] && (A).l[1] == (B).l[1] && (A).l[2] == (B).l[2] && (A).l[3] == (B).l[3])
+#define mDNSSameIPv6NetworkPart(A,B) ((A).l[0] == (B).l[0] && (A).l[1] == (B).l[1])
+#define mDNSSameEthAddress(A,B)  ((A)->w[0] == (B)->w[0] && (A)->w[1] == (B)->w[1] && (A)->w[2] == (B)->w[2])
+
+#define mDNSIPPortIsZero(A)      ((A).NotAnInteger                            == 0)
+#define mDNSOpaque16IsZero(A)    ((A).NotAnInteger                            == 0)
+#define mDNSOpaque64IsZero(A)    (((A)->l[0] | (A)->l[1]                    ) == 0)
+#define mDNSIPv4AddressIsZero(A) ((A).NotAnInteger                            == 0)
+#define mDNSIPv6AddressIsZero(A) (((A).l[0] | (A).l[1] | (A).l[2] | (A).l[3]) == 0)
+#define mDNSEthAddressIsZero(A)  (((A).w[0] | (A).w[1] | (A).w[2]           ) == 0)
+
+#define mDNSIPv4AddressIsOnes(A) ((A).NotAnInteger == 0xFFFFFFFF)
+#define mDNSIPv6AddressIsOnes(A) (((A).l[0] & (A).l[1] & (A).l[2] & (A).l[3]) == 0xFFFFFFFF)
+
+#define mDNSAddressIsAllDNSLinkGroup(X) (                                                            \
+        ((X)->type == mDNSAddrType_IPv4 && mDNSSameIPv4Address((X)->ip.v4, AllDNSLinkGroup_v4.ip.v4)) || \
+        ((X)->type == mDNSAddrType_IPv6 && mDNSSameIPv6Address((X)->ip.v6, AllDNSLinkGroup_v6.ip.v6))    )
+
+#define mDNSAddressIsZero(X) (                                                \
+        ((X)->type == mDNSAddrType_IPv4 && mDNSIPv4AddressIsZero((X)->ip.v4))  || \
+        ((X)->type == mDNSAddrType_IPv6 && mDNSIPv6AddressIsZero((X)->ip.v6))     )
+
+#define mDNSAddressIsValidNonZero(X) (                                        \
+        ((X)->type == mDNSAddrType_IPv4 && !mDNSIPv4AddressIsZero((X)->ip.v4)) || \
+        ((X)->type == mDNSAddrType_IPv6 && !mDNSIPv6AddressIsZero((X)->ip.v6))    )
+
+#define mDNSAddressIsOnes(X) (                                                \
+        ((X)->type == mDNSAddrType_IPv4 && mDNSIPv4AddressIsOnes((X)->ip.v4))  || \
+        ((X)->type == mDNSAddrType_IPv6 && mDNSIPv6AddressIsOnes((X)->ip.v6))     )
+
+#define mDNSAddressIsValid(X) (                                                                                             \
+        ((X)->type == mDNSAddrType_IPv4) ? !(mDNSIPv4AddressIsZero((X)->ip.v4) || mDNSIPv4AddressIsOnes((X)->ip.v4)) :          \
+        ((X)->type == mDNSAddrType_IPv6) ? !(mDNSIPv6AddressIsZero((X)->ip.v6) || mDNSIPv6AddressIsOnes((X)->ip.v6)) : mDNSfalse)
+
+#define mDNSv4AddressIsLinkLocal(X) ((X)->b[0] ==  169 &&  (X)->b[1]         ==  254)
+#define mDNSv6AddressIsLinkLocal(X) ((X)->b[0] == 0xFE && ((X)->b[1] & 0xC0) == 0x80)
+
+#define mDNSAddressIsLinkLocal(X)  (                                                    \
+        ((X)->type == mDNSAddrType_IPv4) ? mDNSv4AddressIsLinkLocal(&(X)->ip.v4) :          \
+        ((X)->type == mDNSAddrType_IPv6) ? mDNSv6AddressIsLinkLocal(&(X)->ip.v6) : mDNSfalse)
+
+#define mDNSv4AddressIsLoopback(X) ((X)->b[0] == 127 && (X)->b[1] == 0 && (X)->b[2] == 0 && (X)->b[3] == 1)
+#define mDNSv6AddressIsLoopback(X) ((((X)->l[0] | (X)->l[1] | (X)->l[2]) == 0) && ((X)->b[12] == 0 && (X)->b[13] == 0 && (X)->b[14] == 0 && (X)->b[15] == 1))
+
+#define mDNSAddressIsLoopback(X)  (                                                         \
+        ((X)->type == mDNSAddrType_IPv4) ? mDNSv4AddressIsLoopback(&(X)->ip.v4) :           \
+        ((X)->type == mDNSAddrType_IPv6) ? mDNSv6AddressIsLoopback(&(X)->ip.v6) : mDNSfalse)
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Authentication Support
+#endif
+
+// Unicast DNS and Dynamic Update specific Client Calls
+//
+// mDNS_SetSecretForDomain tells the core to authenticate (via TSIG with an HMAC_MD5 hash of the shared secret)
+// when dynamically updating a given zone (and its subdomains).  The key used in authentication must be in
+// domain name format.  The shared secret must be a null-terminated base64 encoded string.  A minimum size of
+// 16 bytes (128 bits) is recommended for an MD5 hash as per RFC 2485.
+// Calling this routine multiple times for a zone replaces previously entered values.  Call with a NULL key
+// to disable authentication for the zone.  A non-NULL autoTunnelPrefix means this is an AutoTunnel domain,
+// and the value is prepended to the IPSec identifier (used for key lookup)
+
+extern mStatus mDNS_SetSecretForDomain(mDNS *m, DomainAuthInfo *info,
+                                       const domainname *domain, const domainname *keyname, const char *b64keydata, const domainname *hostname, mDNSIPPort *port, mDNSBool autoTunnel);
+
+extern void RecreateNATMappings(mDNS *const m, const mDNSu32 waitTicks);
+
+// Hostname/Unicast Interface Configuration
+
+// All hostnames advertised point to one IPv4 address and/or one IPv6 address, set via SetPrimaryInterfaceInfo.  Invoking this routine
+// updates all existing hostnames to point to the new address.
+
+// A hostname is added via AddDynDNSHostName, which points to the primary interface's v4 and/or v6 addresss
+
+// The status callback is invoked to convey success or failure codes - the callback should not modify the AuthRecord or free memory.
+// Added hostnames may be removed (deregistered) via mDNS_RemoveDynDNSHostName.
+
+// Host domains added prior to specification of the primary interface address and computer name will be deferred until
+// these values are initialized.
+
+// DNS servers used to resolve unicast queries are specified by mDNS_AddDNSServer.
+// For "split" DNS configurations, in which queries for different domains are sent to different servers (e.g. VPN and external),
+// a domain may be associated with a DNS server.  For standard configurations, specify the root label (".") or NULL.
+
+extern void mDNS_AddDynDNSHostName(mDNS *m, const domainname *fqdn, mDNSRecordCallback *StatusCallback, const void *StatusContext);
+extern void mDNS_RemoveDynDNSHostName(mDNS *m, const domainname *fqdn);
+extern void mDNS_SetPrimaryInterfaceInfo(mDNS *m, const mDNSAddr *v4addr,  const mDNSAddr *v6addr, const mDNSAddr *router);
+extern DNSServer *mDNS_AddDNSServer(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, mDNSs32 serviceID, const mDNSAddr *addr,
+                                    const mDNSIPPort port, mDNSu32 scoped, mDNSu32 timeout, mDNSBool cellIntf, mDNSu16 resGroupID, mDNSBool reqA,
+                                    mDNSBool reqAAAA, mDNSBool reqDO);
+extern void PenalizeDNSServer(mDNS *const m, DNSQuestion *q, mDNSOpaque16 responseFlags);
+extern void mDNS_AddSearchDomain(const domainname *const domain, mDNSInterfaceID InterfaceID);
+
+extern McastResolver *mDNS_AddMcastResolver(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, mDNSu32 timeout);
+
+// We use ((void *)0) here instead of mDNSNULL to avoid compile warnings on gcc 4.2
+#define mDNS_AddSearchDomain_CString(X, I) \
+    do { domainname d__; if (((X) != (void*)0) && MakeDomainNameFromDNSNameString(&d__, (X)) && d__.c[0]) mDNS_AddSearchDomain(&d__, I);} while(0)
+
+// Routines called by the core, exported by DNSDigest.c
+
+// Convert an arbitrary base64 encoded key key into an HMAC key (stored in AuthInfo struct)
+extern mDNSs32 DNSDigest_ConstructHMACKeyfromBase64(DomainAuthInfo *info, const char *b64key);
+
+// sign a DNS message.  The message must be complete, with all values in network byte order.  end points to the end
+// of the message, and is modified by this routine.  numAdditionals is a pointer to the number of additional
+// records in HOST byte order, which is incremented upon successful completion of this routine.  The function returns
+// the new end pointer on success, and NULL on failure.
+extern void DNSDigest_SignMessage(DNSMessage *msg, mDNSu8 **end, DomainAuthInfo *info, mDNSu16 tcode);
+
+#define SwapDNSHeaderBytes(M) do { \
+    (M)->h.numQuestions   = (mDNSu16)((mDNSu8 *)&(M)->h.numQuestions  )[0] << 8 | ((mDNSu8 *)&(M)->h.numQuestions  )[1]; \
+    (M)->h.numAnswers     = (mDNSu16)((mDNSu8 *)&(M)->h.numAnswers    )[0] << 8 | ((mDNSu8 *)&(M)->h.numAnswers    )[1]; \
+    (M)->h.numAuthorities = (mDNSu16)((mDNSu8 *)&(M)->h.numAuthorities)[0] << 8 | ((mDNSu8 *)&(M)->h.numAuthorities)[1]; \
+    (M)->h.numAdditionals = (mDNSu16)((mDNSu8 *)&(M)->h.numAdditionals)[0] << 8 | ((mDNSu8 *)&(M)->h.numAdditionals)[1]; \
+} while (0)
+
+#define DNSDigest_SignMessageHostByteOrder(M,E,INFO) \
+    do { SwapDNSHeaderBytes(M); DNSDigest_SignMessage((M), (E), (INFO), 0); SwapDNSHeaderBytes(M); } while (0)
+
+// verify a DNS message.  The message must be complete, with all values in network byte order.  end points to the
+// end of the record.  tsig is a pointer to the resource record that contains the TSIG OPT record.  info is
+// the matching key to use for verifying the message.  This function expects that the additionals member
+// of the DNS message header has already had one subtracted from it.
+extern mDNSBool DNSDigest_VerifyMessage(DNSMessage *msg, mDNSu8 *end, LargeCacheRecord *tsig, DomainAuthInfo *info, mDNSu16 *rcode, mDNSu16 *tcode);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - PlatformSupport interface
+#endif
+
+// This section defines the interface to the Platform Support layer.
+// Normal client code should not use any of types defined here, or directly call any of the functions defined here.
+// The definitions are placed here because sometimes clients do use these calls indirectly, via other supported client operations.
+// For example, AssignDomainName is a macro defined using mDNSPlatformMemCopy()
+
+// Every platform support module must provide the following functions.
+// mDNSPlatformInit() typically opens a communication endpoint, and starts listening for mDNS packets.
+// When Setup is complete, the platform support layer calls mDNSCoreInitComplete().
+// mDNSPlatformSendUDP() sends one UDP packet
+// When a packet is received, the PlatformSupport code calls mDNSCoreReceive()
+// mDNSPlatformClose() tidies up on exit
+//
+// Note: mDNSPlatformMemAllocate/mDNSPlatformMemFree are only required for handling oversized resource records and unicast DNS.
+// If your target platform has a well-defined specialized application, and you know that all the records it uses
+// are InlineCacheRDSize or less, then you can just make a simple mDNSPlatformMemAllocate() stub that always returns
+// NULL. InlineCacheRDSize is a compile-time constant, which is set by default to 68. If you need to handle records
+// a little larger than this and you don't want to have to implement run-time allocation and freeing, then you
+// can raise the value of this constant to a suitable value (at the expense of increased memory usage).
+//
+// USE CAUTION WHEN CALLING mDNSPlatformRawTime: The m->timenow_adjust correction factor needs to be added
+// Generally speaking:
+// Code that's protected by the main mDNS lock should just use the m->timenow value
+// Code outside the main mDNS lock should use mDNS_TimeNow(m) to get properly adjusted time
+// In certain cases there may be reasons why it's necessary to get the time without taking the lock first
+// (e.g. inside the routines that are doing the locking and unlocking, where a call to get the lock would result in a
+// recursive loop); in these cases use mDNS_TimeNow_NoLock(m) to get mDNSPlatformRawTime with the proper correction factor added.
+//
+// mDNSPlatformUTC returns the time, in seconds, since Jan 1st 1970 UTC and is required for generating TSIG records
+
+extern mStatus  mDNSPlatformInit        (mDNS *const m);
+extern void     mDNSPlatformClose       (mDNS *const m);
+extern mStatus  mDNSPlatformSendUDP(const mDNS *const m, const void *const msg, const mDNSu8 *const end,
+                                    mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
+                                    mDNSIPPort dstport, mDNSBool useBackgroundTrafficClass);
+
+extern mDNSBool mDNSPlatformPeekUDP     (mDNS *const m, UDPSocket *src);
+extern void     mDNSPlatformLock        (const mDNS *const m);
+extern void     mDNSPlatformUnlock      (const mDNS *const m);
+
+extern void     mDNSPlatformStrCopy     (      void *dst, const void *src);
+extern mDNSu32  mDNSPlatformStrLen      (                 const void *src);
+extern void     mDNSPlatformMemCopy     (      void *dst, const void *src, mDNSu32 len);
+extern mDNSBool mDNSPlatformMemSame     (const void *dst, const void *src, mDNSu32 len);
+extern int      mDNSPlatformMemCmp      (const void *dst, const void *src, mDNSu32 len);
+extern void     mDNSPlatformMemZero     (      void *dst,                  mDNSu32 len);
+extern void mDNSPlatformQsort       (void *base, int nel, int width, int (*compar)(const void *, const void *));
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+#define         mDNSPlatformMemAllocate(X) mallocL(# X, X)
+#else
+extern void *   mDNSPlatformMemAllocate (mDNSu32 len);
+#endif
+extern void     mDNSPlatformMemFree     (void *mem);
+
+// If the platform doesn't have a strong PRNG, we define a naive multiply-and-add based on a seed
+// from the platform layer.  Long-term, we should embed an arc4 implementation, but the strength
+// will still depend on the randomness of the seed.
+#if !defined(_PLATFORM_HAS_STRONG_PRNG_) && (_BUILDING_XCODE_PROJECT_ || defined(_WIN32))
+#define _PLATFORM_HAS_STRONG_PRNG_ 1
+#endif
+#if _PLATFORM_HAS_STRONG_PRNG_
+extern mDNSu32  mDNSPlatformRandomNumber(void);
+#else
+extern mDNSu32  mDNSPlatformRandomSeed  (void);
+#endif // _PLATFORM_HAS_STRONG_PRNG_
+
+extern mStatus  mDNSPlatformTimeInit    (void);
+extern mDNSs32  mDNSPlatformRawTime     (void);
+extern mDNSs32  mDNSPlatformUTC         (void);
+#define mDNS_TimeNow_NoLock(m) (mDNSPlatformRawTime() + (m)->timenow_adjust)
+
+#if MDNS_DEBUGMSGS
+extern void mDNSPlatformWriteDebugMsg(const char *msg);
+#endif
+extern void mDNSPlatformWriteLogMsg(const char *ident, const char *msg, mDNSLogLevel_t loglevel);
+
+#if APPLE_OSX_mDNSResponder
+// Utility function for ASL logging
+mDNSexport void mDNSASLLog(uuid_t *uuid, const char *subdomain, const char *result, const char *signature, const char *fmt, ...);
+
+// Log unicast and multicast traffic statistics once a day. Also used for DNSSEC statistics.
+#define kDefaultNextStatsticsLogTime (24 * 60 * 60)
+
+extern void mDNSLogStatistics(mDNS *const m);
+
+#endif // APPLE_OSX_mDNSResponder
+
+// Platform support modules should provide the following functions to map between opaque interface IDs
+// and interface indexes in order to support the DNS-SD API. If your target platform does not support
+// multiple interfaces and/or does not support the DNS-SD API, these functions can be empty.
+extern mDNSInterfaceID mDNSPlatformInterfaceIDfromInterfaceIndex(mDNS *const m, mDNSu32 ifindex);
+extern mDNSu32 mDNSPlatformInterfaceIndexfromInterfaceID(mDNS *const m, mDNSInterfaceID id, mDNSBool suppressNetworkChange);
+
+// Every platform support module must provide the following functions if it is to support unicast DNS
+// and Dynamic Update.
+// All TCP socket operations implemented by the platform layer MUST NOT BLOCK.
+// mDNSPlatformTCPConnect initiates a TCP connection with a peer, adding the socket descriptor to the
+// main event loop.  The return value indicates whether the connection succeeded, failed, or is pending
+// (i.e. the call would block.)  On return, the descriptor parameter is set to point to the connected socket.
+// The TCPConnectionCallback is subsequently invoked when the connection
+// completes (in which case the ConnectionEstablished parameter is true), or data is available for
+// reading on the socket (indicated by the ConnectionEstablished parameter being false.)  If the connection
+// asynchronously fails, the TCPConnectionCallback should be invoked as usual, with the error being
+// returned in subsequent calls to PlatformReadTCP or PlatformWriteTCP.  (This allows for platforms
+// with limited asynchronous error detection capabilities.)  PlatformReadTCP and PlatformWriteTCP must
+// return the number of bytes read/written, 0 if the call would block, and -1 if an error.  PlatformReadTCP
+// should set the closed argument if the socket has been closed.
+// PlatformTCPCloseConnection must close the connection to the peer and remove the descriptor from the
+// event loop.  CloseConnectin may be called at any time, including in a ConnectionCallback.
+
+typedef enum
+{
+    kTCPSocketFlags_Zero   = 0,
+    kTCPSocketFlags_UseTLS = (1 << 0)
+} TCPSocketFlags;
+
+typedef void (*TCPConnectionCallback)(TCPSocket *sock, void *context, mDNSBool ConnectionEstablished, mStatus err);
+extern TCPSocket *mDNSPlatformTCPSocket(mDNS *const m, TCPSocketFlags flags, mDNSIPPort *port, mDNSBool useBackgroundTrafficClass); // creates a TCP socket
+extern TCPSocket *mDNSPlatformTCPAccept(TCPSocketFlags flags, int sd);
+extern int        mDNSPlatformTCPGetFD(TCPSocket *sock);
+extern mStatus    mDNSPlatformTCPConnect(TCPSocket *sock, const mDNSAddr *dst, mDNSOpaque16 dstport, domainname *hostname,
+                                         mDNSInterfaceID InterfaceID, TCPConnectionCallback callback, void *context);
+extern void       mDNSPlatformTCPCloseConnection(TCPSocket *sock);
+extern long       mDNSPlatformReadTCP(TCPSocket *sock, void *buf, unsigned long buflen, mDNSBool *closed);
+extern long       mDNSPlatformWriteTCP(TCPSocket *sock, const char *msg, unsigned long len);
+extern UDPSocket *mDNSPlatformUDPSocket(mDNS *const m, const mDNSIPPort requestedport);
+extern mDNSu16    mDNSPlatformGetUDPPort(UDPSocket *sock);
+extern void       mDNSPlatformUDPClose(UDPSocket *sock);
+extern void       mDNSPlatformReceiveBPF_fd(mDNS *const m, int fd);
+extern void       mDNSPlatformUpdateProxyList(mDNS *const m, const mDNSInterfaceID InterfaceID);
+extern void       mDNSPlatformSendRawPacket(const void *const msg, const mDNSu8 *const end, mDNSInterfaceID InterfaceID);
+extern void       mDNSPlatformSetLocalAddressCacheEntry(mDNS *const m, const mDNSAddr *const tpa, const mDNSEthAddr *const tha, mDNSInterfaceID InterfaceID);
+extern void       mDNSPlatformSourceAddrForDest(mDNSAddr *const src, const mDNSAddr *const dst);
+extern void       mDNSPlatformSendKeepalive(mDNSAddr *sadd, mDNSAddr *dadd, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu32 seq, mDNSu32 ack, mDNSu16 win);
+extern mStatus    mDNSPlatformRetrieveTCPInfo(mDNS *const m, mDNSAddr *laddr, mDNSIPPort *lport, mDNSAddr *raddr,  mDNSIPPort *rport, mDNSTCPInfo *mti);
+extern mStatus    mDNSPlatformGetRemoteMacAddr(mDNS *const m, mDNSAddr *raddr);
+extern mStatus    mDNSPlatformStoreSPSMACAddr(mDNSAddr *spsaddr, char *ifname);
+extern mStatus    mDNSPlatformClearSPSMACAddr(void);
+
+// mDNSPlatformTLSSetupCerts/mDNSPlatformTLSTearDownCerts used by dnsextd
+extern mStatus    mDNSPlatformTLSSetupCerts(void);
+extern void       mDNSPlatformTLSTearDownCerts(void);
+
+// Platforms that support unicast browsing and dynamic update registration for clients who do not specify a domain
+// in browse/registration calls must implement these routines to get the "default" browse/registration list.
+
+extern mDNSBool   mDNSPlatformSetDNSConfig(mDNS *const m, mDNSBool setservers, mDNSBool setsearch, domainname *const fqdn, DNameListElem **RegDomains,
+                        DNameListElem **BrowseDomains, mDNSBool ackConfig);
+extern mStatus    mDNSPlatformGetPrimaryInterface(mDNS *const m, mDNSAddr *v4, mDNSAddr *v6, mDNSAddr *router);
+extern void       mDNSPlatformDynDNSHostNameStatusChanged(const domainname *const dname, const mStatus status);
+
+extern void       mDNSPlatformSetAllowSleep(mDNS *const m, mDNSBool allowSleep, const char *reason);
+extern void       mDNSPlatformSendWakeupPacket(mDNS *const m, mDNSInterfaceID InterfaceID, char *EthAddr, char *IPAddr, int iteration);
+
+extern mDNSBool   mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID);
+extern mDNSBool   mDNSPlatformInterfaceIsAWDL(const NetworkInterfaceInfo *intf);
+extern mDNSBool   mDNSPlatformValidRecordForQuestion(const ResourceRecord *const rr, const DNSQuestion *const q);
+extern mDNSBool   mDNSPlatformValidRecordForInterface(AuthRecord *rr, const NetworkInterfaceInfo *intf);
+extern mDNSBool   mDNSPlatformValidQuestionForInterface(DNSQuestion *q, const NetworkInterfaceInfo *intf);
+
+extern void mDNSPlatformFormatTime(unsigned long t, mDNSu8 *buf, int bufsize);
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+// Support for legacy NAT traversal protocols, implemented by the platform layer and callable by the core.
+extern void     LNT_SendDiscoveryMsg(mDNS *m);
+extern void     LNT_ConfigureRouterInfo(mDNS *m, const mDNSInterfaceID InterfaceID, const mDNSu8 *const data, const mDNSu16 len);
+extern mStatus  LNT_GetExternalAddress(mDNS *m);
+extern mStatus  LNT_MapPort(mDNS *m, NATTraversalInfo *const n);
+extern mStatus  LNT_UnmapPort(mDNS *m, NATTraversalInfo *const n);
+extern void     LNT_ClearState(mDNS *const m);
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+// The core mDNS code provides these functions, for the platform support code to call at appropriate times
+//
+// mDNS_SetFQDN() is called once on startup (typically from mDNSPlatformInit())
+// and then again on each subsequent change of the host name.
+//
+// mDNS_RegisterInterface() is used by the platform support layer to inform mDNSCore of what
+// physical and/or logical interfaces are available for sending and receiving packets.
+// Typically it is called on startup for each available interface, but register/deregister may be
+// called again later, on multiple occasions, to inform the core of interface configuration changes.
+// If set->Advertise is set non-zero, then mDNS_RegisterInterface() also registers the standard
+// resource records that should be associated with every publicised IP address/interface:
+// -- Name-to-address records (A/AAAA)
+// -- Address-to-name records (PTR)
+// -- Host information (HINFO)
+// IMPORTANT: The specified mDNSInterfaceID MUST NOT be 0, -1, or -2; these values have special meaning
+// mDNS_RegisterInterface does not result in the registration of global hostnames via dynamic update -
+// see mDNS_SetPrimaryInterfaceInfo, mDNS_AddDynDNSHostName, etc. for this purpose.
+// Note that the set may be deallocated immediately after it is deregistered via mDNS_DeegisterInterface.
+//
+// mDNS_RegisterDNS() is used by the platform support layer to provide the core with the addresses of
+// available domain name servers for unicast queries/updates.  RegisterDNS() should be called once for
+// each name server, typically at startup, or when a new name server becomes available.  DeregiterDNS()
+// must be called whenever a registered name server becomes unavailable.  DeregisterDNSList deregisters
+// all registered servers.  mDNS_DNSRegistered() returns true if one or more servers are registered in the core.
+//
+// mDNSCoreInitComplete() is called when the platform support layer is finished.
+// Typically this is at the end of mDNSPlatformInit(), but may be later
+// (on platforms like OT that allow asynchronous initialization of the networking stack).
+//
+// mDNSCoreReceive() is called when a UDP packet is received
+//
+// mDNSCoreMachineSleep() is called when the machine sleeps or wakes
+// (This refers to heavyweight laptop-style sleep/wake that disables network access,
+// not lightweight second-by-second CPU power management modes.)
+
+extern void     mDNS_SetFQDN(mDNS *const m);
+extern void     mDNS_ActivateNetWake_internal  (mDNS *const m, NetworkInterfaceInfo *set);
+extern void     mDNS_DeactivateNetWake_internal(mDNS *const m, NetworkInterfaceInfo *set);
+extern mStatus  mDNS_RegisterInterface  (mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping);
+extern void     mDNS_DeregisterInterface(mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping);
+extern void     mDNSCoreInitComplete(mDNS *const m, mStatus result);
+extern void     mDNSCoreReceive(mDNS *const m, void *const msg, const mDNSu8 *const end,
+                                const mDNSAddr *const srcaddr, const mDNSIPPort srcport,
+                                const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID);
+extern void     mDNSCoreRestartQueries(mDNS *const m);
+extern void     mDNSCoreRestartQuestion(mDNS *const m, DNSQuestion *q);
+extern void     mDNSCoreRestartRegistration(mDNS *const m, AuthRecord  *rr, int announceCount);
+typedef void (*FlushCache)(mDNS *const m);
+typedef void (*CallbackBeforeStartQuery)(mDNS *const m, void *context);
+extern void     mDNSCoreRestartAddressQueries(mDNS *const m, mDNSBool SearchDomainsChanged, FlushCache flushCacheRecords,
+                                              CallbackBeforeStartQuery beforeQueryStart, void *context);
+extern mDNSBool mDNSCoreHaveAdvertisedMulticastServices(mDNS *const m);
+extern void     mDNSCoreMachineSleep(mDNS *const m, mDNSBool wake);
+extern mDNSBool mDNSCoreReadyForSleep(mDNS *m, mDNSs32 now);
+extern mDNSs32  mDNSCoreIntervalToNextWake(mDNS *const m, mDNSs32 now);
+
+extern void     mDNSCoreReceiveRawPacket  (mDNS *const m, const mDNSu8 *const p, const mDNSu8 *const end, const mDNSInterfaceID InterfaceID);
+
+extern mDNSBool mDNSAddrIsDNSMulticast(const mDNSAddr *ip);
+
+extern CacheRecord *CreateNewCacheEntry(mDNS *const m, const mDNSu32 slot, CacheGroup *cg, mDNSs32 delay, mDNSBool Add, const mDNSAddr *sourceAddress);
+extern CacheGroup *CacheGroupForName(const mDNS *const m, const mDNSu32 slot, const mDNSu32 namehash, const domainname *const name);
+extern void ReleaseCacheRecord(mDNS *const m, CacheRecord *r);
+extern void ScheduleNextCacheCheckTime(mDNS *const m, const mDNSu32 slot, const mDNSs32 event);
+extern void SetNextCacheCheckTimeForRecord(mDNS *const m, CacheRecord *const rr);
+extern void GrantCacheExtensions(mDNS *const m, DNSQuestion *q, mDNSu32 lease);
+extern void MakeNegativeCacheRecord(mDNS *const m, CacheRecord *const cr,
+                                    const domainname *const name, const mDNSu32 namehash, const mDNSu16 rrtype, const mDNSu16 rrclass, mDNSu32 ttl_seconds,
+                                    mDNSInterfaceID InterfaceID, DNSServer *dnsserver);
+extern void CompleteDeregistration(mDNS *const m, AuthRecord *rr);
+extern void AnswerCurrentQuestionWithResourceRecord(mDNS *const m, CacheRecord *const rr, const QC_result AddRecord);
+extern void AnswerQuestionByFollowingCNAME(mDNS *const m, DNSQuestion *q, ResourceRecord *rr);
+extern char *InterfaceNameForID(mDNS *const m, const mDNSInterfaceID InterfaceID);
+extern void DNSServerChangeForQuestion(mDNS *const m, DNSQuestion *q, DNSServer *newServer);
+extern void ActivateUnicastRegistration(mDNS *const m, AuthRecord *const rr);
+extern void CheckSuppressUnusableQuestions(mDNS *const m);
+extern void RetrySearchDomainQuestions(mDNS *const m);
+extern mDNSBool DomainEnumQuery(const domainname *qname);
+extern mStatus UpdateKeepaliveRData(mDNS *const m, AuthRecord *rr, NetworkInterfaceInfo *const intf, mDNSBool updateMac, char *ethAddr);
+extern void  UpdateKeepaliveRMACAsync(mDNS *const m, void *context);
+extern void UpdateRMACCallback(mDNS *const m, void *context);
+
+// Used only in logging to restrict the number of /etc/hosts entries printed
+extern void FreeEtcHosts(mDNS *const m, AuthRecord *const rr, mStatus result);
+// exported for using the hash for /etc/hosts AuthRecords
+extern AuthGroup *AuthGroupForName(AuthHash *r, const mDNSu32 slot, const mDNSu32 namehash, const domainname *const name);
+extern AuthGroup *AuthGroupForRecord(AuthHash *r, const mDNSu32 slot, const ResourceRecord *const rr);
+extern AuthGroup *InsertAuthRecord(mDNS *const m, AuthHash *r, AuthRecord *rr);
+extern AuthGroup *RemoveAuthRecord(mDNS *const m, AuthHash *r, AuthRecord *rr);
+extern mDNSBool mDNS_CheckForCacheRecord(mDNS *const m, DNSQuestion *q, mDNSu16 qtype);
+
+// For now this AutoTunnel stuff is specific to Mac OS X.
+// In the future, if there's demand, we may see if we can abstract it out cleanly into the platform layer
+#if APPLE_OSX_mDNSResponder
+extern void AutoTunnelCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord);
+extern void AddNewClientTunnel(mDNS *const m, DNSQuestion *const q);
+extern void StartServerTunnel(mDNS *const m, DomainAuthInfo *const info);
+extern void UpdateAutoTunnelDomainStatuses(const mDNS *const m);
+extern void RemoveAutoTunnel6Record(mDNS *const m);
+extern mDNSBool RecordReadyForSleep(mDNS *const m, AuthRecord *rr);
+// For now this LocalSleepProxy stuff is specific to Mac OS X.
+// In the future, if there's demand, we may see if we can abstract it out cleanly into the platform layer
+extern mStatus ActivateLocalProxy(mDNS *const m, NetworkInterfaceInfo *const intf);
+extern void mDNSPlatformUpdateDNSStatus(mDNS *const m, DNSQuestion *q);
+extern void mDNSPlatformTriggerDNSRetry(mDNS *const m, DNSQuestion *v4q, DNSQuestion *v6q);
+extern void mDNSPlatformLogToFile(int log_level, const char *buffer);
+extern mDNSBool SupportsInNICProxy(NetworkInterfaceInfo *const intf);
+#endif
+
+typedef void ProxyCallback (mDNS *const m, void *socket, void *const msg, const mDNSu8 *const end, const mDNSAddr *const srcaddr,
+    const mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID InterfaceID, void *context);
+extern void mDNSPlatformInitDNSProxySkts(mDNS *const m, ProxyCallback *UDPCallback, ProxyCallback *TCPCallback);
+extern void mDNSPlatformCloseDNSProxySkts(mDNS *const m);
+extern void mDNSPlatformDisposeProxyContext(void *context);
+extern mDNSu8 *DNSProxySetAttributes(DNSQuestion *q, DNSMessageHeader *h, DNSMessage *msg, mDNSu8 *start, mDNSu8 *limit);
+
+// Sleep Assertions are specific to Mac OS X
+#if APPLE_OSX_mDNSResponder
+extern void mDNSPlatformSleepAssertion(mDNS *const m, double timeout);
+#endif
+
+extern mDNSBool mDNSPlatformAllowPID(mDNS *const m, DNSQuestion *q);
+extern mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q);
+extern void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q);
+extern mDNSs32 mDNSPlatformGetPID(void);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Sleep Proxy
+#endif
+
+// Sleep Proxy Server Property Encoding
+//
+// Sleep Proxy Servers are advertised using a structured service name, consisting of four
+// metrics followed by a human-readable name. The metrics assist clients in deciding which
+// Sleep Proxy Server(s) to use when multiple are available on the network. Each metric
+// is a two-digit decimal number in the range 10-99. Lower metrics are generally better.
+//
+//   AA-BB-CC-DD.FF Name
+//
+// Metrics:
+//
+// AA = Intent
+// BB = Portability
+// CC = Marginal Power
+// DD = Total Power
+// FF = Features Supported (Currently TCP Keepalive only)
+//
+//
+// ** Intent Metric **
+//
+// 20 = Dedicated Sleep Proxy Server -- a device, permanently powered on,
+//      installed for the express purpose of providing Sleep Proxy Service.
+//
+// 30 = Primary Network Infrastructure Hardware -- a router, DHCP server, NAT gateway,
+//      or similar permanently installed device which is permanently powered on.
+//      This is hardware designed for the express purpose of being network
+//      infrastructure, and for most home users is typically a single point
+//      of failure for the local network -- e.g. most home users only have
+//      a single NAT gateway / DHCP server. Even though in principle the
+//      hardware might technically be capable of running different software,
+//      a typical user is unlikely to do that. e.g. AirPort base station.
+//
+// 40 = Primary Network Infrastructure Software -- a general-purpose computer
+//      (e.g. Mac, Windows, Linux, etc.) which is currently running DHCP server
+//      or NAT gateway software, but the user could choose to turn that off
+//      fairly easily. e.g. iMac running Internet Sharing
+//
+// 50 = Secondary Network Infrastructure Hardware -- like primary infrastructure
+//      hardware, except not a single point of failure for the entire local network.
+//      For example, an AirPort base station in bridge mode. This may have clients
+//      associated with it, and if it goes away those clients will be inconvenienced,
+//      but unlike the NAT gateway / DHCP server, the entire local network is not
+//      dependent on it.
+//
+// 60 = Secondary Network Infrastructure Software -- like 50, but in a general-
+//      purpose CPU.
+//
+// 70 = Incidentally Available Hardware -- a device which has no power switch
+//      and is generally left powered on all the time. Even though it is not a
+//      part of what we conventionally consider network infrastructure (router,
+//      DHCP, NAT, DNS, etc.), and the rest of the network can operate fine
+//      without it, since it's available and unlikely to be turned off, it is a
+//      reasonable candidate for providing Sleep Proxy Service e.g. Apple TV,
+//      or an AirPort base station in client mode, associated with an existing
+//      wireless network (e.g. AirPort Express connected to a music system, or
+//      being used to share a USB printer).
+//
+// 80 = Incidentally Available Software -- a general-purpose computer which
+//      happens at this time to be set to "never sleep", and as such could be
+//      useful as a Sleep Proxy Server, but has not been intentionally provided
+//      for this purpose. Of all the Intent Metric categories this is the
+//      one most likely to be shut down or put to sleep without warning.
+//      However, if nothing else is availalable, it may be better than nothing.
+//      e.g. Office computer in the workplace which has been set to "never sleep"
+//
+//
+// ** Portability Metric **
+//
+// Inversely related to mass of device, on the basis that, all other things
+// being equal, heavier devices are less likely to be moved than lighter devices.
+// E.g. A MacBook running Internet Sharing is probably more likely to be
+// put to sleep and taken away than a Mac Pro running Internet Sharing.
+// The Portability Metric is a logarithmic decibel scale, computed by taking the
+// (approximate) mass of the device in milligrammes, taking the base 10 logarithm
+// of that, multiplying by 10, and subtracting the result from 100:
+//
+//   Portability Metric = 100 - (log10(mg) * 10)
+//
+// The Portability Metric is not necessarily computed literally from the actual
+// mass of the device; the intent is just that lower numbers indicate more
+// permanent devices, and higher numbers indicate devices more likely to be
+// removed from the network, e.g., in order of increasing portability:
+//
+// Mac Pro < iMac < Laptop < iPhone
+//
+// Example values:
+//
+// 10 = 1 metric tonne
+// 40 = 1kg
+// 70 = 1g
+// 90 = 10mg
+//
+//
+// ** Marginal Power and Total Power Metrics **
+//
+// The Marginal Power Metric is the power difference between sleeping and staying awake
+// to be a Sleep Proxy Server.
+//
+// The Total Power Metric is the total power consumption when being Sleep Proxy Server.
+//
+// The Power Metrics use a logarithmic decibel scale, computed as ten times the
+// base 10 logarithm of the (approximate) power in microwatts:
+//
+//   Power Metric = log10(uW) * 10
+//
+// Higher values indicate higher power consumption. Example values:
+//
+// 10 =  10 uW
+// 20 = 100 uW
+// 30 =   1 mW
+// 60 =   1 W
+// 90 =   1 kW
+
+typedef enum
+{
+    mDNSSleepProxyMetric_Dedicated          = 20,
+    mDNSSleepProxyMetric_PrimaryHardware    = 30,
+    mDNSSleepProxyMetric_PrimarySoftware    = 40,
+    mDNSSleepProxyMetric_SecondaryHardware  = 50,
+    mDNSSleepProxyMetric_SecondarySoftware  = 60,
+    mDNSSleepProxyMetric_IncidentalHardware = 70,
+    mDNSSleepProxyMetric_IncidentalSoftware = 80
+} mDNSSleepProxyMetric;
+
+typedef enum
+{
+    mDNS_NoWake        = 0, // System does not support Wake on LAN
+    mDNS_WakeOnAC      = 1, // System supports Wake on LAN when connected to AC power only
+    mDNS_WakeOnBattery = 2  // System supports Wake on LAN on battery
+} mDNSWakeForNetworkAccess;
+
+extern void mDNSCoreBeSleepProxyServer_internal(mDNS *const m, mDNSu8 sps, mDNSu8 port, mDNSu8 marginalpower, mDNSu8 totpower, mDNSu8 features);
+#define mDNSCoreBeSleepProxyServer(M,S,P,MP,TP,F)                       \
+    do { mDNS_Lock(m); mDNSCoreBeSleepProxyServer_internal((M),(S),(P),(MP),(TP),(F)); mDNS_Unlock(m); } while(0)
+
+extern void FindSPSInCache(mDNS *const m, const DNSQuestion *const q, const CacheRecord *sps[3]);
+#define PrototypeSPSName(X) ((X)[0] >= 11 && (X)[3] == '-' && (X)[ 4] == '9' && (X)[ 5] == '9' && \
+                             (X)[6] == '-' && (X)[ 7] == '9' && (X)[ 8] == '9' && \
+                             (X)[9] == '-' && (X)[10] == '9' && (X)[11] == '9'    )
+#define ValidSPSName(X) ((X)[0] >= 5 && mDNSIsDigit((X)[1]) && mDNSIsDigit((X)[2]) && mDNSIsDigit((X)[4]) && mDNSIsDigit((X)[5]))
+#define SPSMetric(X) (!ValidSPSName(X) || PrototypeSPSName(X) ? 1000000 : \
+                      ((X)[1]-'0') * 100000 + ((X)[2]-'0') * 10000 + ((X)[4]-'0') * 1000 + ((X)[5]-'0') * 100 + ((X)[7]-'0') * 10 + ((X)[8]-'0'))
+#define LocalSPSMetric(X) ( (X)->SPSType * 10000 + (X)->SPSPortability * 100 + (X)->SPSMarginalPower)
+#define SPSFeatures(X) ((X)[0] >= 13 && (X)[12] =='.' ? ((X)[13]-'0') : 0 )
+
+#define MD5_DIGEST_LENGTH   16          /* digest length in bytes */
+#define MD5_BLOCK_BYTES     64          /* block size in bytes */
+#define MD5_BLOCK_LONG       (MD5_BLOCK_BYTES / sizeof(mDNSu32))
+
+typedef struct MD5state_st
+{
+    mDNSu32 A,B,C,D;
+    mDNSu32 Nl,Nh;
+    mDNSu32 data[MD5_BLOCK_LONG];
+    int num;
+} MD5_CTX;
+
+extern int MD5_Init(MD5_CTX *c);
+extern int MD5_Update(MD5_CTX *c, const void *data, unsigned long len);
+extern int MD5_Final(unsigned char *md, MD5_CTX *c);
+
+// ***************************************************************************
+#if 0
+#pragma mark -
+#pragma mark - Compile-Time assertion checks
+#endif
+
+// Some C compiler cleverness. We can make the compiler check certain things for
+// us, and report compile-time errors if anything is wrong. The usual way to do
+// this would be to use a run-time "if" statement, but then you don't find out
+// what's wrong until you run the software. This way, if the assertion condition
+// is false, the array size is negative, and the complier complains immediately.
+
+struct CompileTimeAssertionChecks_mDNS
+{
+    // Check that the compiler generated our on-the-wire packet format structure definitions
+    // properly packed, without adding padding bytes to align fields on 32-bit or 64-bit boundaries.
+    char assert0[(sizeof(rdataSRV)         == 262                          ) ? 1 : -1];
+    char assert1[(sizeof(DNSMessageHeader) ==  12                          ) ? 1 : -1];
+    char assert2[(sizeof(DNSMessage)       ==  12+AbsoluteMaxDNSMessageData) ? 1 : -1];
+    char assert3[(sizeof(mDNSs8)           ==   1                          ) ? 1 : -1];
+    char assert4[(sizeof(mDNSu8)           ==   1                          ) ? 1 : -1];
+    char assert5[(sizeof(mDNSs16)          ==   2                          ) ? 1 : -1];
+    char assert6[(sizeof(mDNSu16)          ==   2                          ) ? 1 : -1];
+    char assert7[(sizeof(mDNSs32)          ==   4                          ) ? 1 : -1];
+    char assert8[(sizeof(mDNSu32)          ==   4                          ) ? 1 : -1];
+    char assert9[(sizeof(mDNSOpaque16)     ==   2                          ) ? 1 : -1];
+    char assertA[(sizeof(mDNSOpaque32)     ==   4                          ) ? 1 : -1];
+    char assertB[(sizeof(mDNSOpaque128)    ==  16                          ) ? 1 : -1];
+    char assertC[(sizeof(CacheRecord  )    ==  sizeof(CacheGroup)          ) ? 1 : -1];
+    char assertD[(sizeof(int)              >=  4                           ) ? 1 : -1];
+    char assertE[(StandardAuthRDSize       >=  256                         ) ? 1 : -1];
+    char assertF[(sizeof(EthernetHeader)   ==   14                         ) ? 1 : -1];
+    char assertG[(sizeof(ARP_EthIP     )   ==   28                         ) ? 1 : -1];
+    char assertH[(sizeof(IPv4Header    )   ==   20                         ) ? 1 : -1];
+    char assertI[(sizeof(IPv6Header    )   ==   40                         ) ? 1 : -1];
+    char assertJ[(sizeof(IPv6NDP       )   ==   24                         ) ? 1 : -1];
+    char assertK[(sizeof(UDPHeader     )   ==    8                         ) ? 1 : -1];
+    char assertL[(sizeof(IKEHeader     )   ==   28                         ) ? 1 : -1];
+    char assertM[(sizeof(TCPHeader     )   ==   20                         ) ? 1 : -1];
+
+    // Check our structures are reasonable sizes. Including overly-large buffers, or embedding
+    // other overly-large structures instead of having a pointer to them, can inadvertently
+    // cause structure sizes (and therefore memory usage) to balloon unreasonably.
+    char sizecheck_RDataBody           [(sizeof(RDataBody)            ==   264) ? 1 : -1];
+    char sizecheck_ResourceRecord      [(sizeof(ResourceRecord)       <=    72) ? 1 : -1];
+    char sizecheck_AuthRecord          [(sizeof(AuthRecord)           <=  1208) ? 1 : -1];
+    char sizecheck_CacheRecord         [(sizeof(CacheRecord)          <=   232) ? 1 : -1];
+    char sizecheck_CacheGroup          [(sizeof(CacheGroup)           <=   232) ? 1 : -1];
+    char sizecheck_DNSQuestion         [(sizeof(DNSQuestion)          <=   832) ? 1 : -1];
+
+// Checks commented out when sizeof(DNSQuestion) change cascaded into having to change yet another
+// set of hardcoded size values because these structures contain one or more DNSQuestion
+// instances.
+//     char sizecheck_ZoneData            [(sizeof(ZoneData)             <=  1648) ? 1 : -1];
+    char sizecheck_NATTraversalInfo    [(sizeof(NATTraversalInfo)     <=   200) ? 1 : -1];
+    char sizecheck_HostnameInfo        [(sizeof(HostnameInfo)         <=  3050) ? 1 : -1];
+    char sizecheck_DNSServer           [(sizeof(DNSServer)            <=   340) ? 1 : -1];
+//    char sizecheck_NetworkInterfaceInfo[(sizeof(NetworkInterfaceInfo) <=  6988) ? 1 : -1];
+    char sizecheck_ServiceRecordSet    [(sizeof(ServiceRecordSet)     <=  5540) ? 1 : -1];
+    char sizecheck_DomainAuthInfo      [(sizeof(DomainAuthInfo)       <=  7888) ? 1 : -1];
+//    char sizecheck_ServiceInfoQuery    [(sizeof(ServiceInfoQuery)     <=  3302) ? 1 : -1];
+#if APPLE_OSX_mDNSResponder
+//    char sizecheck_ClientTunnel        [(sizeof(ClientTunnel)         <=  1160) ? 1 : -1];
+#endif
+};
+
+// Routine to initialize device-info TXT record contents
+mDNSu32 initializeDeviceInfoTXT(mDNS *m, mDNSu8 *ptr);
+
+#if APPLE_OSX_mDNSResponder
+extern void D2D_start_advertising_interface(NetworkInterfaceInfo *interface);
+extern void D2D_stop_advertising_interface(NetworkInterfaceInfo *interface);
+#endif
+
+// ***************************************************************************
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mDNSResponder/mDNSCore/nsec.c b/mDNSResponder/mDNSCore/nsec.c
new file mode 100644
index 00000000..a9f16b3f
--- /dev/null
+++ b/mDNSResponder/mDNSCore/nsec.c
@@ -0,0 +1,1266 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// nsec.c: This file contains support functions to validate NSEC records for
+// NODATA and NXDOMAIN error.
+// ***************************************************************************
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+#include "nsec.h"
+#include "nsec3.h"
+
+// Define DNSSEC_DISABLED to remove all the DNSSEC functionality
+// and use the stub functions implemented later in this file.
+
+#ifndef DNSSEC_DISABLED
+
+// Implementation Notes
+//
+// NSEC records in DNSSEC are used for authenticated denial of existence i.e., if the response to a query
+// results in NXDOMAIN or NODATA error, the response also contains NSEC records in the additional section
+// to prove the non-existence of the original name. In most of the cases, NSEC records don't have any
+// relationship to the original name queried i.e, if they are cached based on the name like other records,
+// it can't be located to prove the non-existence of the original name. Hence, we create a negative cache
+// record like we do for the NXDOMAIN/NODATA error and then cache the NSEC records as part of that. Sometimes,
+// NSEC records are also used for wildcard expanded answer in which case they are cached with the cache record
+// that is created for the original name. NSEC records are freed when the parent cache (the record that they
+// are attached to is expired).
+//
+// NSEC records also can be queried like any other record and hence can exist independent of the negative
+// cache record. It exists as part of negative cache record only when we get a NXDOMAIN/NODATA error with
+// NSEC records. When a query results in NXDOMAIN/NODATA error and needs to be validated, the NSEC
+// records (and its RRSIGS) are cached as part of the negative cache record. The NSEC records that
+// exist separately from the negative cache record should not be used to answer ValidationRequired/
+// ValidatingResponse questions as it may not be sufficient to prove the non-existence of the name.
+// The exception is when the NSEC record is looked up explicitly. See DNSSECRecordAnswersQuestion
+// for more details.
+//
+
+mDNSlocal CacheRecord *NSECParentForQuestion(mDNS *const m, DNSQuestion *q)
+{
+    CacheGroup *cg;
+    CacheRecord *cr;
+    mDNSu32 slot;
+    mDNSu32 namehash;
+
+    slot = HashSlot(&q->qname);
+    namehash = DomainNameHashValue(&q->qname);
+    cg = CacheGroupForName(m, slot, namehash, &q->qname);
+    if (!cg)
+    {
+        LogDNSSEC("NSECParentForQuestion: Cannot find cg for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSNULL;
+    }
+    for (cr = cg->members; cr; cr = cr->next)
+        if (SameNameRecordAnswersQuestion(&cr->resrec, q))
+            return cr;
+    return mDNSNULL;
+}
+
+mDNSlocal void UpdateParent(DNSSECVerifier *dv)
+{
+    AuthChainLink(dv->parent, dv->ac);
+    ResetAuthChain(dv);
+    dv->parent->NumPackets += dv->NumPackets;
+}
+
+// Note: This should just call the parent callback which will free the DNSSECVerifier.
+mDNSlocal void VerifyNSECCallback(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status)
+{
+    if (!dv->parent)
+    {
+        LogMsg("VerifyNSECCCallback: ERROR!! no parent DV\n");
+        FreeDNSSECVerifier(m, dv);
+        return;
+    }
+    if (dv->ac)
+    {
+        // Before we free the "dv", we need to update the
+        // parent with our AuthChain information
+        UpdateParent(dv);
+    }
+    // "status" indicates whether we are able to successfully verify
+    // the NSEC/NSEC3 signatures. For NSEC3, the OptOut flag may be set
+    // for which we need to deliver insecure result.
+    if ((dv->parent->flags & NSEC3_OPT_OUT) && (status == DNSSEC_Secure))
+    {
+        dv->parent->DVCallback(m, dv->parent, DNSSEC_Insecure);
+    }
+    else
+    {
+        dv->parent->DVCallback(m, dv->parent, status);
+    }
+    // The callback we called in the previous line should recursively
+    // free all the DNSSECVerifiers starting from dv->parent and above.
+    // So, set that to NULL and free the "dv" itself here.
+    dv->parent = mDNSNULL;
+    FreeDNSSECVerifier(m, dv);
+}
+
+// If the caller provides a callback, it takes the responsibility of calling the original callback
+// in "pdv" when it is done.
+//
+// INPUT:
+//
+// rr: The NSEC record that should be verified
+// rv: The NSEC record can also be provided like this
+// pdv: Parent DNSSECVerifier which will be called when the verification is done.
+// callback:  As part of the proof, we need multiple NSEC verifications before we call the "pdv" callback in
+// which case a intermediate "callback" is provided which can be used to do multiple verifications.
+// ncr: The cache record where the RRSIGS are cached
+//
+// NSEC records and signatures are cached along with the cache record so that we can expire them all together. We can't cache
+// them based on the name hash like other records as in most cases the returned NSECs has a different name than we asked for
+// (except for NODATA error where the name exists but type does not exist).
+//
+mDNSexport void VerifyNSEC(mDNS *const m, ResourceRecord *rr, RRVerifier *rv, DNSSECVerifier *pdv, CacheRecord *ncr, DNSSECVerifierCallback callback)
+{
+    DNSSECVerifier *dv = mDNSNULL;
+    CacheRecord **rp;
+    const domainname *name;
+    mDNSu16 rrtype;
+
+    if (!rv && !rr)
+    {
+        LogDNSSEC("VerifyNSEC: Both rr and rv are NULL");
+        goto error;
+    }
+    if (!pdv)
+    {
+        LogDNSSEC("VerifyNSEC: ERROR!! pdv is NULL");
+        return;
+    }
+    // Remember the name and type for which we are verifying, so that when we are done processing all
+    // the verifications, we can trace it back.
+    //
+    // Note: Currently it is not used because when the verification completes as we just
+    // call the "pdv" callback which has its origName and origType.
+    if (rr)
+    {
+        name = rr->name;
+        rrtype = rr->rrtype;
+    }
+    else
+    {
+        name = &rv->name;
+        rrtype = rv->rrtype;
+    }
+
+    dv = AllocateDNSSECVerifier(m, name, rrtype, pdv->q.InterfaceID, DNSSEC_VALIDATION_SECURE,
+        (callback ? callback : VerifyNSECCallback), mDNSNULL);
+    if (!dv)
+    {
+        LogMsg("VerifyNSEC: mDNSPlatformMemAlloc failed");
+        return;
+    }
+
+    dv->parent = pdv;
+
+    if (AddRRSetToVerifier(dv, rr, rv, RRVS_rr) != mStatus_NoError)
+    {
+        LogMsg("VerifyNSEC: ERROR!! AddRRSetToVerifier failed to add NSEC");
+        goto error;
+    }
+
+    // Add the signatures after validating them
+    rp = &(ncr->nsec);
+    while (*rp)
+    {
+        if ((*rp)->resrec.rrtype == kDNSType_RRSIG)
+        {
+            ValidateRRSIG(dv, RRVS_rrsig, &(*rp)->resrec);
+        }
+        rp=&(*rp)->next;
+    }
+
+    if (!dv->rrset)
+    {
+        LogMsg("VerifyNSEC: ERROR!! AddRRSetToVerifier missing rrset");
+        goto error;
+    }
+    // Expired signatures.
+    if (!dv->rrsig)
+        goto error;
+
+    // Next step is to fetch the keys
+    dv->next = RRVS_key;
+
+    StartDNSSECVerification(m, dv);
+    return;
+error:
+    pdv->DVCallback(m, pdv, DNSSEC_Bogus);
+    if (dv)
+    {
+        dv->parent = mDNSNULL;
+        FreeDNSSECVerifier(m, dv);
+    }
+    return;
+}
+
+mDNSlocal void DeleteCachedNSECS(mDNS *const m, CacheRecord *cr)
+{
+    CacheRecord *rp, *next;
+
+    if (cr->nsec) LogDNSSEC("DeleteCachedNSECS: Deleting NSEC Records\n");
+    for (rp = cr->nsec; rp; rp = next)
+    {
+        next  = rp->next;
+        ReleaseCacheRecord(m, rp);
+    }
+    cr->nsec = mDNSNULL;
+}
+
+// Returns success if it adds the nsecs and the rrsigs to the cache record. Otherwise, it returns
+// failure (mDNSfalse)
+mDNSexport mDNSBool AddNSECSForCacheRecord(mDNS *const m, CacheRecord *crlist, CacheRecord *negcr, mDNSu8 rcode)
+{
+    CacheRecord *cr;
+    mDNSBool nsecs_seen = mDNSfalse;
+    mDNSBool nsec3s_seen = mDNSfalse;
+
+    if (rcode != kDNSFlag1_RC_NoErr && rcode != kDNSFlag1_RC_NXDomain)
+    {
+        LogMsg("AddNSECSForCacheRecord: Addings nsecs for rcode %d", rcode);
+        return mDNSfalse;
+    }
+
+    // Sanity check the list to see if we have anything else other than
+    // NSECs and its RRSIGs
+    for (cr = crlist; cr; cr = cr->next)
+    {
+        if (cr->resrec.rrtype != kDNSType_NSEC && cr->resrec.rrtype != kDNSType_NSEC3 &&
+            cr->resrec.rrtype != kDNSType_SOA && cr->resrec.rrtype != kDNSType_RRSIG)
+        {
+            LogMsg("AddNSECSForCacheRecord: ERROR!! Adding Wrong record %s", CRDisplayString(m, cr));
+            return mDNSfalse;
+        }
+        if (cr->resrec.rrtype == kDNSType_RRSIG)
+        {
+            RDataBody2 *const rdb = (RDataBody2 *)cr->smallrdatastorage.data;
+            rdataRRSig *rrsig = &rdb->rrsig;
+            mDNSu16 tc = swap16(rrsig->typeCovered);
+            if (tc != kDNSType_NSEC && tc != kDNSType_NSEC3 && tc != kDNSType_SOA)
+            {
+                LogMsg("AddNSECSForCacheRecord:ERROR!! Adding RRSIG with Wrong type %s", CRDisplayString(m, cr));
+                return mDNSfalse;
+            }
+        }
+        else if (cr->resrec.rrtype == kDNSType_NSEC)
+        {
+            nsecs_seen = mDNStrue;
+        }
+        else if (cr->resrec.rrtype == kDNSType_NSEC3)
+        {
+            nsec3s_seen = mDNStrue;
+        }
+        LogDNSSEC("AddNSECSForCacheRecord: Found a valid record %s", CRDisplayString(m, cr));
+    }
+    if ((nsecs_seen && nsec3s_seen) || (!nsecs_seen && !nsec3s_seen))
+    {
+        LogDNSSEC("AddNSECSForCacheRecord:ERROR  nsecs_seen %d, nsec3s_seen %d", nsecs_seen, nsec3s_seen);
+        return mDNSfalse;
+    }
+    DeleteCachedNSECS(m, negcr);
+    LogDNSSEC("AddNSECSForCacheRecord: Adding NSEC Records for %s", CRDisplayString(m, negcr));
+    negcr->nsec = crlist;
+    return mDNStrue;
+}
+
+// Return the number of labels that matches starting from the right (excluding the
+// root label)
+mDNSexport int CountLabelsMatch(const domainname *const d1, const domainname *const d2)
+{
+    int count, c1, c2;
+    int match, i, skip1, skip2;
+
+    c1 = CountLabels(d1);
+    skip1 = c1 - 1;
+    c2 = CountLabels(d2);
+    skip2 = c2 - 1;
+
+    // Root label always matches. And we don't include it here to
+    // match CountLabels
+    match = 0;
+
+    // Compare as many labels as possible starting from the rightmost
+    count = c1 < c2 ? c1 : c2;
+    for (i = count; i > 0; i--)
+    {
+        const domainname *da, *db;
+
+        da = SkipLeadingLabels(d1, skip1);
+        db = SkipLeadingLabels(d2, skip2);
+        if (!SameDomainName(da, db)) return match;
+        skip1--;
+        skip2--;
+        match++;
+    }
+    return match;
+}
+
+// Empty Non-Terminal (ENT): if the qname is bigger than nsec owner's name and a
+// subdomain of the nsec's nxt field, then the qname is a empty non-terminal. For
+// example, if you are looking for (in RFC 4035 example zone) "y.w.example  A"
+// record, if it is a ENT, then it would return
+//
+// x.w.example. 3600 NSEC x.y.w.example. MX RRSIG NSEC
+//
+// This function is normally called before checking for wildcard matches. If you
+// find this NSEC, there is no need to look for a wildcard record
+// that could possibly answer the question.
+mDNSlocal mDNSBool NSECAnswersENT(const ResourceRecord *const rr, domainname *qname)
+{
+    const domainname *oname = rr->name;
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    const domainname *nxt = (const domainname *)&rdb->data;
+    int ret;
+    int subdomain;
+
+    // Is the owner name smaller than qname?
+    ret = DNSSECCanonicalOrder(oname, qname, mDNSNULL);
+    if (ret < 0)
+    {
+        // Is the next domain field a subdomain of qname ?
+        ret = DNSSECCanonicalOrder(nxt, qname, &subdomain);
+        if (subdomain)
+        {
+            if (ret <= 0)
+            {
+                LogMsg("NSECAnswersENT: ERROR!! DNSSECCanonicalOrder subdomain set "
+                       " qname %##s, NSEC %##s", qname->c, rr->name->c);
+            }
+            return mDNStrue;
+        }
+    }
+    return mDNSfalse;
+}
+
+mDNSlocal const domainname *NSECClosestEncloser(ResourceRecord *rr, domainname *qname)
+{
+    const domainname *oname = rr->name;
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    const domainname *nxt = (const domainname *)&rdb->data;
+    int match1, match2;
+
+    match1 = CountLabelsMatch(oname, qname);
+    match2 = CountLabelsMatch(nxt, qname);
+    // Return the closest i.e the one that matches more labels
+    if (match1 > match2)
+        return SkipLeadingLabels(oname, CountLabels(oname) - match1);
+    else
+        return SkipLeadingLabels(nxt, CountLabels(nxt) - match2);
+}
+
+// Assumption: NSEC has been validated outside of this function
+//
+// Does the name exist given the name and NSEC rr ?
+//
+// Returns -1 if it is an inappropriate nsec
+// Returns 1 if the name exists
+// Returns 0 if the name does not exist
+//
+mDNSlocal int NSECNameExists(mDNS *const m, ResourceRecord *rr, domainname *name, mDNSu16 qtype)
+{
+    const RDataBody2 *const rdb = (RDataBody2 *)rr->rdata->u.data;
+    const domainname *nxt = (const domainname *)&rdb->data;
+    const domainname *oname = rr->name; // owner name
+    int ret1, subdomain1;
+    int ret2, subdomain2;
+    int ret3, subdomain3;
+
+    ret1 = DNSSECCanonicalOrder(oname, name, &subdomain1);
+    if (ret1 > 0)
+    {
+        LogDNSSEC("NSECNameExists: owner name %##s is bigger than name %##s", oname->c, name->c);
+        return -1;
+    }
+
+    // Section 4.1 of draft-ietf-dnsext-dnssec-bis-updates-14:
+    //
+    //   Ancestor delegation NSEC or NSEC3 RRs MUST NOT be used to assume non-
+    //   existence of any RRs below that zone cut, which include all RRs at
+    //   that (original) owner name other than DS RRs, and all RRs below that
+    //   owner name regardless of type.
+    //
+    // This also implies that we can't use the child side NSEC for DS question.
+
+    if (!ret1)
+    {
+        mDNSBool soa = RRAssertsExistence(rr, kDNSType_SOA);
+        mDNSBool ns = RRAssertsExistence(rr, kDNSType_NS);
+
+        // We are here because the owner name is the same as "name". Make sure the
+        // NSEC has the right NS and SOA bits set.
+        if (qtype != kDNSType_DS && ns && !soa)
+        {
+            LogDNSSEC("NSECNameExists: Parent side NSEC %s can't be used for question %##s (%s)",
+                      RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+            return -1;
+        }
+        else if (qtype == kDNSType_DS && soa)
+        {
+            LogDNSSEC("NSECNameExists: Child side NSEC %s can't be used for question %##s (%s)",
+                      RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+            return -1;
+        }
+        LogDNSSEC("NSECNameExists: owner name %##s is same as name %##s", oname->c, name->c);
+        return 1;
+    }
+
+    // If the name is a.b.com and NSEC's owner name is b.com i.e., a subdomain
+    // and nsec comes from the parent (NS is set and SOA is not set), then this
+    // NSEC can't be used for names below the owner name.
+    //
+    // Similarly if DNAME is set, we can't use it here. See RFC2672-bis-dname
+    // appendix.
+    if (subdomain1 && (RRAssertsExistence(rr, kDNSType_DNAME) ||
+                       (RRAssertsNonexistence(rr, kDNSType_SOA) && RRAssertsExistence(rr, kDNSType_NS))))
+    {
+        LogDNSSEC("NSECNameExists: NSEC %s comes from the parent, can't use it here",
+                  RRDisplayString(m, rr));
+        return -1;
+    }
+
+    // At this stage, we know that name is greater than the owner name and
+    // the nsec is not from the parent side.
+    //
+    // Compare with the next field in the nsec.
+    //
+    ret2 = DNSSECCanonicalOrder(name, nxt, &subdomain2);
+
+    // Exact match with the nsec next name
+    if (!ret2)
+    {
+        LogDNSSEC("NSECNameExists: name %##s is same as nxt name %##s", name->c, nxt->c);
+        return 1;
+    }
+
+    ret3 = DNSSECCanonicalOrder(oname, nxt, &subdomain3);
+
+    if (!ret3)
+    {
+        // Pathological case of a single name in the domain. This means only the
+        // apex of the zone itself exists. Nothing below it. "subdomain2" indicates
+        // that name is a subdmain of "next" and hence below the zone.
+        if (subdomain2)
+        {
+            LogDNSSEC("NSECNameExists: owner name %##s subdomain of nxt name %##s", oname->c, nxt->c);
+            return 0;
+        }
+        else
+        {
+            LogDNSSEC("NSECNameExists: Single name in zone, owner name %##s is same as nxt name %##s", oname->c, nxt->c);
+            return -1;
+        }
+    }
+
+    if (ret3 < 0)
+    {
+        // Regular NSEC in the zone. Make sure that the "name" lies within
+        // oname and next. oname < name and name < next
+        if (ret1 < 0 && ret2 < 0)
+        {
+            LogDNSSEC("NSECNameExists: Normal NSEC name %##s lies within owner %##s and nxt name %##s",
+                      name->c, oname->c, nxt->c);
+            return 0;
+        }
+        else
+        {
+            LogDNSSEC("NSECNameExists: Normal NSEC name %##s does not lie within owner %##s and nxt name %##s",
+                      name->c, oname->c, nxt->c);
+            return -1;
+        }
+    }
+    else
+    {
+        // Last NSEC in the zone. The "next" is pointing to the apex. All names
+        // should be a subdomain of that and the name should be bigger than
+        // oname
+        if (ret1 < 0 && subdomain2)
+        {
+            LogDNSSEC("NSECNameExists: Last NSEC name %##s lies within owner %##s and nxt name %##s",
+                      name->c, oname->c, nxt->c);
+            return 0;
+        }
+        else
+        {
+            LogDNSSEC("NSECNameExists: Last NSEC name %##s does not lie within owner %##s and nxt name %##s",
+                      name->c, oname->c, nxt->c);
+            return -1;
+        }
+    }
+
+    LogDNSSEC("NSECNameExists: NSEC %s did not match any case", RRDisplayString(m, rr));
+    return -1;
+}
+
+// If the answer was result of a wildcard match, then this function proves
+// that a proper wildcard was used to answer the question and that the
+// original name does not exist
+mDNSexport void WildcardAnswerProof(mDNS *const m, DNSSECVerifier *dv)
+{
+    CacheRecord *ncr;
+    CacheRecord **rp;
+    const domainname *ce;
+    DNSQuestion q;
+    CacheRecord **nsec3 = mDNSNULL;
+
+    LogDNSSEC("WildcardAnswerProof: Question %##s (%s)", dv->origName.c, DNSTypeName(dv->origType));
+    //
+    // RFC 4035: Section 3.1.3.3
+    //
+    // 1) We used a wildcard because the qname does not exist, so verify
+    //    that the qname does not exist
+    //
+    // 2) Is the wildcard the right one ?
+    //
+    // Unfortunately, this is not well explained in that section. Refer to
+    // RFC 5155 section 7.2.6.
+
+    // Walk the list of nsecs we received and see if they prove that
+    // the name does not exist
+
+    mDNSPlatformMemZero(&q, sizeof(DNSQuestion));
+    q.ThisQInterval = -1;
+    InitializeQuestion(m, &q, dv->InterfaceID, &dv->origName, dv->origType, mDNSNULL, mDNSNULL);
+
+    ncr = NSECParentForQuestion(m, &q);
+    if (!ncr)
+    {
+        LogMsg("WildcardAnswerProof: Can't find NSEC Parent for %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+        goto error;
+    }
+    else
+    {
+        LogDNSSEC("WildcardAnswerProof: found %s", CRDisplayString(m, ncr));
+    }
+    rp = &(ncr->nsec);
+    while (*rp)
+    {
+        if ((*rp)->resrec.rrtype == kDNSType_NSEC)
+        {
+            CacheRecord *cr = *rp;
+            if (!NSECNameExists(m, &cr->resrec, &dv->origName, dv->origType))
+                break;
+        }
+        else if ((*rp)->resrec.rrtype == kDNSType_NSEC3)
+        {
+            nsec3 = rp;
+        }
+        rp=&(*rp)->next;
+    }
+    if (!(*rp))
+    {
+        mDNSBool ret = mDNSfalse;
+        if (nsec3)
+        {
+            ret = NSEC3WildcardAnswerProof(m, ncr, dv);
+        }
+        if (!ret)
+        {
+            LogDNSSEC("WildcardAnswerProof: NSEC3 wildcard proof failed for %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+            goto error;
+        }
+        rp = nsec3;
+    }
+    else
+    {
+        ce = NSECClosestEncloser(&((*rp)->resrec), &dv->origName);
+        if (!ce)
+        {
+            LogMsg("WildcardAnswerProof: ERROR!! Closest Encloser NULL for %##s (%s)", q.qname.c, DNSTypeName(q.qtype));
+            goto error;
+        }
+        if (!SameDomainName(ce, dv->wildcardName))
+        {
+            LogMsg("WildcardAnswerProof: ERROR!! Closest Encloser %##s does not match wildcard name %##s", q.qname.c, dv->wildcardName->c);
+            goto error;
+        }
+    }
+
+    VerifyNSEC(m, &((*rp)->resrec), mDNSNULL, dv, ncr, mDNSNULL);
+    return;
+error:
+    dv->DVCallback(m, dv, DNSSEC_Bogus);
+}
+
+// We have a NSEC. Need to see if it proves that NODATA exists for the given name. Note that this
+// function does not prove anything as proof may require more than one NSEC and this function
+// processes only one NSEC at a time.
+//
+// Returns mDNSfalse if the NSEC does not prove the NODATA error
+// Returns mDNStrue if the NSEC proves the NODATA error
+//
+mDNSlocal mDNSBool NSECNoDataError(mDNS *const m, ResourceRecord *rr, domainname *name, mDNSu16 qtype, domainname **wildcard)
+{
+    const domainname *oname = rr->name; // owner name
+
+    if (wildcard) *wildcard = mDNSNULL;
+    // RFC 4035
+    //
+    // section 3.1.3.1 : Name matches. Prove that the type does not exist and also CNAME is
+    // not set as in that case CNAME should have been returned ( CNAME part is mentioned in
+    // section 4.3 of dnssec-bis-updates.) Without the CNAME check, a positive response can
+    // be converted to a NODATA/NOERROR response.
+    //
+    // section 3.1.3.4 : No exact match for the name but there is a wildcard that could match
+    // the name but not the type. There are two NSECs in this case. One of them is a wildcard
+    // NSEC and another NSEC proving that the qname does not exist. We are called with one
+    // NSEC at a time. We return what we matched and the caller should decide whether all
+    // conditions are met for the proof.
+    if (SameDomainName(oname, name))
+    {
+        mDNSBool soa = RRAssertsExistence(rr, kDNSType_SOA);
+        mDNSBool ns = RRAssertsExistence(rr, kDNSType_NS);
+        if (qtype != kDNSType_DS)
+        {
+            // For non-DS type questions, we don't want to use the parent side records to
+            // answer it
+            if (ns && !soa)
+            {
+                LogDNSSEC("NSECNoDataError: Parent side NSEC %s, can't use for child qname %##s (%s)",
+                          RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+                return mDNSfalse;
+            }
+        }
+        else
+        {
+            if (soa)
+            {
+                LogDNSSEC("NSECNoDataError: Child side NSEC %s, can't use for parent qname %##s (%s)",
+                          RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+                return mDNSfalse;
+            }
+        }
+        if (RRAssertsExistence(rr, qtype) || RRAssertsExistence(rr, kDNSType_CNAME))
+        {
+            LogMsg("NSECNoDataError: ERROR!! qtype %s exists in %s", DNSTypeName(qtype), RRDisplayString(m, rr));
+            return mDNSfalse;
+        }
+        LogDNSSEC("NSECNoDataError: qype %s does not exist in %s", DNSTypeName(qtype), RRDisplayString(m, rr));
+        return mDNStrue;
+    }
+    else
+    {
+        // Name does not exist. Before we check for a wildcard match, make sure that
+        // this is not an ENT.
+        if (NSECAnswersENT(rr, name))
+        {
+            LogDNSSEC("NSECNoDataError: name %##s exists %s", name->c, RRDisplayString(m, rr));
+            return mDNSfalse;
+        }
+
+        // Wildcard check. If this is a wildcard NSEC, then check to see if we could
+        // have answered the question using this wildcard and it should not have the
+        // "qtype" passed in with its bitmap.
+        //
+        // See RFC 4592, on how wildcards are used to synthesize answers. Find the
+        // closest encloser and the qname should be a subdomain i.e if the wildcard
+        // is *.x.example, x.example is the closest encloser and the qname should be
+        // a subdomain e.g., y.x.example or z.y.x.example and so on.
+        if (oname->c[0] == 1 && oname->c[1] == '*')
+        {
+            int r, s;
+            const domainname *ce = SkipLeadingLabels(oname, 1);
+
+            r = DNSSECCanonicalOrder(name, ce, &s);
+            if (s)
+            {
+                if (RRAssertsExistence(rr, qtype) || RRAssertsExistence(rr, kDNSType_CNAME))
+                {
+                    LogMsg("NSECNoDataError: ERROR!! qtype %s exists in wildcard %s", DNSTypeName(qtype), RRDisplayString(m, rr));
+                    return mDNSfalse;
+                }
+                if (qtype == kDNSType_DS && RRAssertsExistence(rr, kDNSType_SOA))
+                {
+                    LogDNSSEC("NSECNoDataError: Child side wildcard NSEC %s, can't use for parent qname %##s (%s)",
+                              RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+                    return mDNSfalse;
+                }
+                else if (qtype != kDNSType_DS && RRAssertsNonexistence(rr, kDNSType_SOA) &&
+                    RRAssertsExistence(rr, kDNSType_NS))
+                {
+                    // Don't use the parent side record for this
+                    LogDNSSEC("NSECNoDataError: Parent side wildcard NSEC %s, can't use for child qname %##s (%s)",
+                              RRDisplayString(m, rr), name->c, DNSTypeName(qtype));
+                    return mDNSfalse;
+                }
+                *wildcard = (domainname *)ce;
+                LogDNSSEC("NSECNoDataError: qtype %s does not exist in wildcard %s", DNSTypeName(qtype), RRDisplayString(m, rr));
+                return mDNStrue;
+            }
+        }
+        return mDNSfalse;
+    }
+}
+
+mDNSexport void NoDataNSECCallback(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status)
+{
+    RRVerifier *rv;
+    DNSSECVerifier *pdv;
+    CacheRecord *ncr;
+
+    LogDNSSEC("NoDataNSECCallback: called");
+    if (!dv->parent)
+    {
+        LogMsg("NoDataNSECCCallback: no parent DV");
+        FreeDNSSECVerifier(m, dv);
+        return;
+    }
+
+    if (dv->ac)
+    {
+        // Before we free the "dv", we need to update the
+        // parent with our AuthChain information
+        UpdateParent(dv);
+    }
+
+    pdv = dv->parent;
+
+    // We don't care about the "dv" that was allocated in VerifyNSEC
+    // as it just verifies one of the nsecs. Get the original verifier and
+    // verify the other NSEC like we did the first time.
+    dv->parent = mDNSNULL;
+    FreeDNSSECVerifier(m, dv);
+
+    if (status != DNSSEC_Secure)
+    {
+        goto error;
+    }
+
+    ncr = NSECParentForQuestion(m, &pdv->q);
+    if (!ncr)
+    {
+        LogMsg("NoDataNSECCallback: Can't find NSEC Parent for %##s (%s)", pdv->q.qname.c, DNSTypeName(pdv->q.qtype));
+        goto error;
+    }
+    rv = pdv->pendingNSEC;
+    pdv->pendingNSEC = rv->next;
+    // We might have more than one pendingNSEC in the case of NSEC3. If this is the last one,
+    // we don't need to come back here; let the regular NSECCallback call the original callback.
+    rv->next = mDNSNULL;
+    LogDNSSEC("NoDataNSECCallback: Verifying %##s (%s)", rv->name.c, DNSTypeName(rv->rrtype));
+    if (!pdv->pendingNSEC)
+        VerifyNSEC(m, mDNSNULL, rv, pdv, ncr, mDNSNULL);
+    else
+        VerifyNSEC(m, mDNSNULL, rv, pdv, ncr, NoDataNSECCallback);
+    return;
+
+error:
+    pdv->DVCallback(m, pdv, status);
+}
+
+mDNSexport void NameErrorNSECCallback(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status)
+{
+    RRVerifier *rv;
+    DNSSECVerifier *pdv;
+    CacheRecord *ncr;
+
+    LogDNSSEC("NameErrorNSECCallback: called");
+    if (!dv->parent)
+    {
+        LogMsg("NameErrorNSECCCallback: no parent DV");
+        FreeDNSSECVerifier(m, dv);
+        return;
+    }
+
+    if (dv->ac)
+    {
+        // Before we free the "dv", we need to update the
+        // parent with our AuthChain information
+        UpdateParent(dv);
+    }
+
+    pdv = dv->parent;
+    // We don't care about the "dv" that was allocated in VerifyNSEC
+    // as it just verifies one of the nsecs. Get the original verifier and
+    // verify the other NSEC like we did the first time.
+    dv->parent = mDNSNULL;
+    FreeDNSSECVerifier(m, dv);
+
+    if (status != DNSSEC_Secure)
+    {
+        goto error;
+    }
+
+    ncr = NSECParentForQuestion(m, &pdv->q);
+    if (!ncr)
+    {
+        LogMsg("NameErrorNSECCallback: Can't find NSEC Parent for %##s (%s)", pdv->q.qname.c, DNSTypeName(pdv->q.qtype));
+        goto error;
+    }
+    rv = pdv->pendingNSEC;
+    pdv->pendingNSEC = rv->next;
+    // We might have more than one pendingNSEC in the case of NSEC3. If this is the last one,
+    // we don't need to come back here; let the regular NSECCallback call the original callback.
+    rv->next = mDNSNULL;
+    LogDNSSEC("NameErrorNSECCallback: Verifying %##s (%s)", rv->name.c, DNSTypeName(rv->rrtype));
+    if (!pdv->pendingNSEC)
+        VerifyNSEC(m, mDNSNULL, rv, pdv, ncr, mDNSNULL);
+    else
+        VerifyNSEC(m, mDNSNULL, rv, pdv, ncr, NameErrorNSECCallback);
+
+    return;
+
+error:
+    pdv->DVCallback(m, pdv, status);
+}
+
+// We get a NODATA error with no records in answer section. This proves
+// that qname does not exist.
+mDNSlocal void NoDataProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr)
+{
+    CacheRecord **rp;
+    domainname *wildcard = mDNSNULL;
+    const domainname *ce = mDNSNULL;
+    ResourceRecord *nsec_wild = mDNSNULL;
+    ResourceRecord *nsec_noname = mDNSNULL;
+
+    // NODATA Error could mean two things. The name exists with no type or there is a
+    // wildcard that matches the name but no type. This is done by NSECNoDataError.
+    //
+    // If it is the case of wildcard, there are two NSECs. One is the wildcard NSEC and
+    // the other NSEC to prove that there is no other closer match.
+
+    wildcard = mDNSNULL;
+    rp = &(ncr->nsec);
+    while (*rp)
+    {
+        if ((*rp)->resrec.rrtype == kDNSType_NSEC)
+        {
+            CacheRecord *cr = *rp;
+            if (NSECNoDataError(m, &cr->resrec, &dv->q.qname, dv->q.qtype, &wildcard))
+            {
+                if (wildcard)
+                {
+                    dv->flags |= WILDCARD_PROVES_NONAME_EXISTS;
+                    LogDNSSEC("NoDataProof: NSEC %s proves NODATA error for %##s (%s)",
+                              RRDisplayString(m, &(*rp)->resrec), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+                }
+                else
+                {
+                    dv->flags |= NSEC_PROVES_NOTYPE_EXISTS;
+                    LogDNSSEC("NoDataProof: NSEC %s proves NOTYPE error for %##s (%s)",
+                              RRDisplayString(m, &(*rp)->resrec), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+                }
+                nsec_wild = &cr->resrec;
+            }
+            if (!NSECNameExists(m, &cr->resrec, &dv->q.qname, dv->q.qtype))
+            {
+                LogDNSSEC("NoDataProof: NSEC %s proves that  name %##s (%s) does not exist",
+                          RRDisplayString(m, &(*rp)->resrec), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+                // If we have a wildcard, then we should check to see if the closest
+                // encloser is the same as the wildcard.
+                ce = NSECClosestEncloser(&cr->resrec, &dv->q.qname);
+                dv->flags |= NSEC_PROVES_NONAME_EXISTS;
+                nsec_noname = &cr->resrec;
+            }
+        }
+        rp=&(*rp)->next;
+    }
+    if (!nsec_noname && !nsec_wild)
+    {
+        LogDNSSEC("NoDataProof: No valid NSECs for %##s (%s)", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+        goto error;
+    }
+    // If the type exists, then we have to verify just that NSEC
+    if (!(dv->flags & NSEC_PROVES_NOTYPE_EXISTS))
+    {
+        // If we have a wildcard, then we should have a "ce" which matches the wildcard
+        // If we don't have a wildcard, then we should have proven that the name does not
+        // exist which means we would have set the "ce".
+        if (wildcard && !ce)
+        {
+            LogMsg("NoDataProof: Cannot prove that the name %##s (%s) does not exist", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+            goto error;
+        }
+        if (wildcard && !SameDomainName(wildcard, ce))
+        {
+            LogMsg("NoDataProof: wildcard %##s does not match closest encloser %##s", wildcard->c, ce->c);
+            goto error;
+        }
+        // If a single NSEC can prove both, then we just have validate that one NSEC.
+        if (nsec_wild == nsec_noname)
+        {
+            nsec_noname = mDNSNULL;
+            dv->flags &= ~NSEC_PROVES_NONAME_EXISTS;
+        }
+    }
+
+    if ((dv->flags & (WILDCARD_PROVES_NONAME_EXISTS|NSEC_PROVES_NONAME_EXISTS)) ==
+        (WILDCARD_PROVES_NONAME_EXISTS|NSEC_PROVES_NONAME_EXISTS))
+    {
+        mStatus status;
+        RRVerifier *r = AllocateRRVerifier(nsec_noname, &status);
+        if (!r) goto error;
+        // First verify wildcard NSEC and then when we are done, we
+        // will verify the noname nsec
+        dv->pendingNSEC = r;
+        LogDNSSEC("NoDataProof: Verifying wild and noname %s", RRDisplayString(m, nsec_wild));
+        VerifyNSEC(m, nsec_wild, mDNSNULL, dv, ncr, NoDataNSECCallback);
+    }
+    else if ((dv->flags & WILDCARD_PROVES_NONAME_EXISTS) ||
+             (dv->flags & NSEC_PROVES_NOTYPE_EXISTS))
+    {
+        LogDNSSEC("NoDataProof: Verifying wild %s", RRDisplayString(m, nsec_wild));
+        VerifyNSEC(m, nsec_wild, mDNSNULL, dv, ncr, mDNSNULL);
+    }
+    else if (dv->flags & NSEC_PROVES_NONAME_EXISTS)
+    {
+        LogDNSSEC("NoDataProof: Verifying noname %s", RRDisplayString(m, nsec_noname));
+        VerifyNSEC(m, nsec_noname, mDNSNULL, dv, ncr, mDNSNULL);
+    }
+    return;
+error:
+    LogDNSSEC("NoDataProof: Error return");
+    dv->DVCallback(m, dv, DNSSEC_Bogus);
+}
+
+mDNSlocal mDNSBool NSECNoWildcard(mDNS *const m, ResourceRecord *rr, domainname *qname, mDNSu16 qtype)
+{
+    const domainname *ce;
+    domainname wild;
+
+    // If the query name is c.x.w.example and if the name does not exist, we should get
+    // get a nsec back that looks something like this:
+    //
+    //      w.example NSEC a.w.example
+    //
+    // First, we need to get the closest encloser which in this case is w.example. Wild
+    // card synthesis works by finding the closest encloser first and then look for
+    // a "*" label (assuming * label does not appear in the question). If it does not
+    // exists, it would return the NSEC at that name. And the wildcard name at the
+    // closest encloser "*.w.example" would be covered by such an NSEC. (Appending "*"
+    // makes it bigger than w.example and "* is smaller than "a" for the above NSEC)
+    //
+    ce = NSECClosestEncloser(rr, qname);
+    if (!ce) { LogMsg("NSECNoWildcard: No closest encloser for rr %s, qname %##s (%s)", qname->c, DNSTypeName(qtype)); return mDNSfalse; }
+
+    wild.c[0] = 1;
+    wild.c[1] = '*';
+    wild.c[2] = 0;
+    if (!AppendDomainName(&wild, ce))
+    {
+        LogMsg("NSECNoWildcard: ERROR!! Can't append domainname closest encloser name %##s, qname %##s (%s)", ce->c, qname->c, DNSTypeName(qtype));
+        return mDNSfalse;
+    }
+    if (NSECNameExists(m, rr, &wild, qtype) != 0)
+    {
+        LogDNSSEC("NSECNoWildcard: Wildcard name %##s exists or not valid qname %##s (%s)", wild.c, qname->c, DNSTypeName(qtype));
+        return mDNSfalse;
+    }
+    LogDNSSEC("NSECNoWildcard: Wildcard name %##s does not exist for record %s, qname %##s (%s)", wild.c,
+              RRDisplayString(m, rr), qname->c, DNSTypeName(qtype));
+    return mDNStrue;
+}
+
+// We get a NXDOMAIN error with no records in answer section. This proves
+// that qname does not exist.
+mDNSlocal void NameErrorProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr)
+{
+    CacheRecord **rp;
+    ResourceRecord *nsec_wild = mDNSNULL;
+    ResourceRecord *nsec_noname = mDNSNULL;
+    mStatus status;
+
+    // NXDOMAIN Error. We need to prove that the qname does not exist and there
+    // is no wildcard that can be used to answer the question.
+
+    rp = &(ncr->nsec);
+    while (*rp)
+    {
+        if ((*rp)->resrec.rrtype == kDNSType_NSEC)
+        {
+            CacheRecord *cr = *rp;
+            if (!NSECNameExists(m, &cr->resrec, &dv->q.qname, dv->q.qtype))
+            {
+                LogDNSSEC("NameErrorProof: NSEC %s proves name does not exist for %##s (%s)",
+                          RRDisplayString(m, &(*rp)->resrec), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+                // If we have a wildcard, then we should check to see if the closest
+                // encloser is the same as the wildcard.
+                dv->flags |= NSEC_PROVES_NONAME_EXISTS;
+                nsec_noname = &cr->resrec;
+            }
+            if (NSECNoWildcard(m, &cr->resrec, &dv->q.qname, dv->q.qtype))
+            {
+                dv->flags |= WILDCARD_PROVES_NONAME_EXISTS;
+                nsec_wild = &cr->resrec;
+                LogDNSSEC("NameErrorProof: NSEC %s proves wildcard cannot answer question for %##s (%s)",
+                          RRDisplayString(m, &(*rp)->resrec), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+            }
+        }
+        rp=&(*rp)->next;
+    }
+    if (!nsec_noname || !nsec_wild)
+    {
+        LogMsg("NameErrorProof: Proof failed for %##s (%s) noname %p, wild %p", dv->q.qname.c, DNSTypeName(dv->q.qtype), nsec_noname, nsec_wild);
+        goto error;
+    }
+
+    // First verify wildcard NSEC and then when we are done, we will verify the noname nsec.
+    // Sometimes a single NSEC can prove both that the "qname" does not exist and a wildcard
+    // could not have produced qname. These are a few examples where this can happen.
+    //
+    // 1. If the zone is example.com and you look up *.example.com and if there are no wildcards,
+    //    you will get a NSEC back "example.com NSEC a.example.com". This proves that both the
+    //    name does not exist and *.example.com also does not exist
+    //
+    // 2. If the zone is example.com and it has a record like this:
+    //
+    //					example.com NSEC d.example.com
+    //
+    // any name you lookup in between like a.example.com,b.example.com etc. you will get a single
+    // NSEC back. In that case we just have to verify only once.
+    //
+    if (nsec_wild != nsec_noname)
+    {
+        RRVerifier *r = AllocateRRVerifier(nsec_noname, &status);
+        if (!r) goto error;
+        dv->pendingNSEC = r;
+        LogDNSSEC("NoDataProof: Verifying wild %s", RRDisplayString(m, nsec_wild));
+        VerifyNSEC(m, nsec_wild, mDNSNULL, dv, ncr, NameErrorNSECCallback);
+    }
+    else
+    {
+        LogDNSSEC("NoDataProof: Verifying only one %s", RRDisplayString(m, nsec_wild));
+        VerifyNSEC(m, nsec_wild, mDNSNULL, dv, ncr, mDNSNULL);
+    }
+    return;
+error:
+    dv->DVCallback(m, dv, DNSSEC_Bogus);
+}
+
+mDNSexport CacheRecord *NSECRecordIsDelegation(mDNS *const m, domainname *name, mDNSu16 qtype)
+{
+    CacheGroup *cg;
+    CacheRecord *cr;
+    mDNSu32 slot, namehash;
+
+    slot = HashSlot(name);
+    namehash = DomainNameHashValue(name);
+
+    cg = CacheGroupForName(m, (const mDNSu32)slot, namehash, name);
+    if (!cg)
+    {
+        LogDNSSEC("NSECRecordForName: cg NULL for %##s", name);
+        return mDNSNULL;
+    }
+    for (cr = cg->members; cr; cr = cr->next)
+    {
+        if (cr->resrec.RecordType == kDNSRecordTypePacketNegative && cr->resrec.rrtype == qtype)
+        {
+            CacheRecord *ncr;
+            for (ncr = cr->nsec; ncr; ncr = ncr->next)
+            {
+                if (ncr->resrec.rrtype == kDNSType_NSEC &&
+                    SameDomainName(ncr->resrec.name, name))
+                {
+                    // See the Insecure Delegation Proof section in dnssec-bis: DS bit and SOA bit
+                    // should be absent
+                    if (RRAssertsExistence(&ncr->resrec, kDNSType_SOA) ||
+                        RRAssertsExistence(&ncr->resrec, kDNSType_DS))
+                    {
+                        LogDNSSEC("NSECRecordForName: found record %s for %##s (%s), but DS or SOA bit set", CRDisplayString(m, ncr), name,
+                            DNSTypeName(qtype));
+                        return mDNSNULL;
+                    }
+                    // Section 2.3 of RFC 4035 states that:
+                    //
+                    // Each owner name in the zone that has authoritative data or a delegation point NS RRset MUST
+                    // have an NSEC resource record. 
+                    //
+                    // So, if we have an NSEC record matching the question name with the NS bit set,
+                    // then this is a delegation.
+                    //
+                    if (RRAssertsExistence(&ncr->resrec, kDNSType_NS))
+                    {
+                        LogDNSSEC("NSECRecordForName: found record %s for %##s (%s)", CRDisplayString(m, ncr), name, DNSTypeName(qtype));
+                        return ncr;
+                    }
+                    else
+                    {
+                        LogDNSSEC("NSECRecordForName: found record %s for %##s (%s), but NS bit is not set", CRDisplayString(m, ncr), name,
+                            DNSTypeName(qtype));
+                        return mDNSNULL;
+                    }
+                }
+            }
+        }
+    }
+    return mDNSNULL;
+}
+
+mDNSlocal void StartInsecureProof(mDNS * const m, DNSSECVerifier *dv)
+{
+    domainname trigger;
+    DNSSECVerifier *prevdv = mDNSNULL;
+
+    // Remember the name that triggered the insecure proof
+    AssignDomainName(&trigger, &dv->q.qname);
+    while (dv->parent)
+    {
+        prevdv = dv;
+        dv = dv->parent;
+    }
+    if (prevdv)
+    {
+        prevdv->parent = mDNSNULL;
+        FreeDNSSECVerifier(m, prevdv);
+    }
+    // For Optional DNSSEC, we are opportunistically verifying dnssec. We don't care
+    // if something results in bogus as we still want to deliver results to the
+    // application e.g., CNAME processing results in bogus because the path is broken,
+    // but we still want to follow CNAMEs so that we can deliver the final results to
+    // the application.
+    if (dv->ValidationRequired == DNSSEC_VALIDATION_SECURE_OPTIONAL)
+    {
+        LogDNSSEC("StartInsecureProof: Aborting insecure proof for %##s (%s)", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+
+    LogDNSSEC("StartInsecureProof for %##s (%s)", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+    // Don't start the insecure proof again after we finish the one that we start here by
+    // setting InsecureProofDone.
+    dv->InsecureProofDone = 1;
+    ProveInsecure(m, dv, mDNSNULL, &trigger);
+    return;
+}
+
+mDNSexport void ValidateWithNSECS(mDNS *const m, DNSSECVerifier *dv, CacheRecord *cr)
+{
+    LogDNSSEC("ValidateWithNSECS: called for %s", CRDisplayString(m, cr));
+
+    // If we are encountering a break in the chain of trust i.e., NSEC/NSEC3s for
+    // DS query, then do the insecure proof. This is important because if we
+    // validate these NSECs normally and prove that they are "secure", we will
+    // end up delivering the secure result to the original question where as
+    // these NSEC/NSEC3s actually prove that DS does not exist and hence insecure.
+    //
+    // This break in the chain can happen after we have partially validated the
+    // path (dv->ac is non-NULL) or the first time (dv->ac is NULL) after we
+    // fetched the DNSKEY (dv->key is non-NULL). We don't want to do this
+    // if we have just started the non-existence proof (dv->key is NULL) as
+    // it does not indicate a break in the chain of trust.
+    //
+    // If we are already doing a insecurity proof, don't start another one. In
+    // the case of NSECs, it is possible that insecurity proof starts and it
+    // gets NSECs and as part of validating that we receive more NSECS in which
+    // case we don't want to start another insecurity proof.
+    if (dv->ValidationRequired != DNSSEC_VALIDATION_INSECURE &&
+        (!dv->parent || dv->parent->ValidationRequired != DNSSEC_VALIDATION_INSECURE))
+    {
+         if ((dv->ac && dv->q.qtype == kDNSType_DS) ||
+             (!dv->ac && dv->key && dv->q.qtype == kDNSType_DS))
+        {
+            LogDNSSEC("ValidateWithNSECS: Starting insecure proof: name %##s ac %p, key %p, parent %p", dv->q.qname.c,
+                dv->ac, dv->key, dv->parent);
+            StartInsecureProof(m, dv);
+            return;
+        }
+    }
+    // "parent" is set when we are validating a NSEC and we should not be here in
+    // the normal case when parent is set. For example, we are looking up the A
+    // record for www.example.com and following can happen.
+    //
+    // a) Record does not exist and we get a NSEC
+    // b) While validating (a), we get an NSEC for the first DS record that we look up
+    // c) Record exists but we get NSECs for the first DS record
+    // d) We are able to partially validate (a) or (b), but we get NSECs somewhere in
+    //    the chain
+    //
+    // For (a), parent is not set as we are not validating the NSEC yet. Hence we would
+    // start the validation now.
+    //
+    // For (b), the parent is set, but should be caught by the above "if" block because we 
+    // should have gotten the DNSKEY at least. In the case of nested insecurity proof,
+    // we would end up here and fail with bogus.
+    //
+    // For (c), the parent is not set and should be caught by the above "if" block because we 
+    // should have gotten the DNSKEY at least.
+    //
+    // For (d), the above "if" block would catch it as "dv->ac" is non-NULL.
+    // 
+    // Hence, we should not come here in the normal case. Possible pathological cases are:
+    // Insecure proof getting NSECs while validating NSECs, getting NSECs for DNSKEY for (c)
+    // above etc.
+    if (dv->parent)
+    {
+        LogDNSSEC("ValidateWithNSECS: dv parent set for %##s (%s)", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+    if (cr->resrec.RecordType == kDNSRecordTypePacketNegative)
+    {
+        mDNSu8 rcode;
+        CacheRecord *neg = cr->nsec;
+        mDNSBool nsecs_seen = mDNSfalse;
+
+        while (neg)
+        {
+            // The list can only have NSEC or NSEC3s. This was checked when we added the
+            // NSECs to the cache record.
+            if (neg->resrec.rrtype == kDNSType_NSEC)
+                nsecs_seen = mDNStrue;
+            LogDNSSEC("ValidateWithNSECS: NSECCached Record %s", CRDisplayString(m, neg));
+            neg = neg->next;
+        }
+
+        rcode = (mDNSu8)(cr->responseFlags.b[1] & kDNSFlag1_RC_Mask);
+        if (rcode == kDNSFlag1_RC_NoErr)
+        {
+            if (nsecs_seen)
+                NoDataProof(m, dv, cr);
+            else
+                NSEC3NoDataProof(m, dv, cr);
+        }
+        else if (rcode == kDNSFlag1_RC_NXDomain)
+        {
+            if (nsecs_seen)
+                NameErrorProof(m, dv, cr);
+            else
+                NSEC3NameErrorProof(m, dv, cr);
+        }
+        else
+        {
+            LogDNSSEC("ValidateWithNSECS: Rcode %d invalid", rcode);
+            dv->DVCallback(m, dv, DNSSEC_Bogus);
+        }
+    }
+    else
+    {
+        LogMsg("ValidateWithNSECS: Not a valid cache record %s for NSEC proofs", CRDisplayString(m, cr));
+        dv->DVCallback(m, dv, DNSSEC_Bogus);
+        return;
+    }
+}
+
+#else // !DNSSEC_DISABLED
+
+mDNSexport mDNSBool AddNSECSForCacheRecord(mDNS *const m, CacheRecord *crlist, CacheRecord *negcr, mDNSu8 rcode)
+{
+    (void)m;
+    (void)crlist;
+    (void)negcr;
+    (void)rcode;
+
+    return mDNSfalse;
+}
+
+#endif // !DNSSEC_DISABLED
diff --git a/mDNSResponder/mDNSCore/nsec.h b/mDNSResponder/mDNSCore/nsec.h
new file mode 100644
index 00000000..3dbb841f
--- /dev/null
+++ b/mDNSResponder/mDNSCore/nsec.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __NSEC_H
+#define __NSEC_H
+
+#include "dnssec.h"
+
+extern mDNSBool AddNSECSForCacheRecord(mDNS *const m, CacheRecord *crlist, CacheRecord *negcr, mDNSu8 rcode);
+extern void WildcardAnswerProof(mDNS *const m, DNSSECVerifier *dv);
+extern void ValidateWithNSECS(mDNS *const m, DNSSECVerifier *dv, CacheRecord *rr);
+extern mDNSBool NSECAnswersDS(mDNS *const m, ResourceRecord *rr, DNSQuestion *q);
+extern int CountLabelsMatch(const domainname *const d1, const domainname *const d2);
+extern void NameErrorNSECCallback(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status);
+extern void VerifyNSEC(mDNS *const m, ResourceRecord *rr, RRVerifier *rv, DNSSECVerifier *pdv, CacheRecord *ncr,
+	DNSSECVerifierCallback callback);
+extern CacheRecord *NSECRecordIsDelegation(mDNS *const m, domainname *name, mDNSu16 qtype);
+extern void NoDataNSECCallback(mDNS *const m, DNSSECVerifier *dv, DNSSECStatus status);
+
+#endif // __NSEC_H
diff --git a/mDNSResponder/mDNSCore/nsec3.c b/mDNSResponder/mDNSCore/nsec3.c
new file mode 100644
index 00000000..a039418a
--- /dev/null
+++ b/mDNSResponder/mDNSCore/nsec3.c
@@ -0,0 +1,769 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// nsec3.c: This file contains support functions to validate NSEC3 records for
+// NODATA and NXDOMAIN error.
+// ***************************************************************************
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+#include "CryptoAlg.h"
+#include "nsec3.h"
+#include "nsec.h"
+
+// Define DNSSEC_DISABLED to remove all the DNSSEC functionality
+// and use the stub functions implemented later in this file.
+
+#ifndef DNSSEC_DISABLED
+
+typedef enum 
+{
+    NSEC3ClosestEncloser,
+    NSEC3Covers,
+    NSEC3CEProof
+} NSEC3FindValues;
+
+//#define NSEC3_DEBUG 1
+
+#if NSEC3_DEBUG
+mDNSlocal void PrintHash(mDNSu8 *digest, int digestlen, char *buffer, int buflen)
+{
+    int length = 0;
+    for (int j = 0; j < digestlen; j++)
+    {
+        length += mDNS_snprintf(buffer+length, buflen-length-1, "%x", digest[j]);
+    }
+}
+#endif
+
+mDNSlocal mDNSBool NSEC3OptOut(CacheRecord *cr)
+{
+    const RDataBody2 *const rdb = (RDataBody2 *)cr->resrec.rdata->u.data;
+    rdataNSEC3 *nsec3 = (rdataNSEC3 *)rdb->data;
+    return (nsec3->flags & NSEC3_FLAGS_OPTOUT);
+}
+
+mDNSlocal int NSEC3SameName(const mDNSu8 *name, int namelen, const mDNSu8 *nsecName, int nsecLen)
+{
+    int i;
+
+    // Note: With NSEC3, the lengths should always be same. 
+    if (namelen != nsecLen)
+    {
+        LogMsg("NSEC3SameName: ERROR!! namelen %d, nsecLen %d", namelen, nsecLen);
+        return ((namelen < nsecLen) ? -1 : 1);
+    }
+
+    for (i = 0; i < namelen; i++)
+    {
+        mDNSu8 ac = *name++;
+        mDNSu8 bc = *nsecName++;
+        if (mDNSIsUpperCase(ac)) ac += 'a' - 'A';
+        if (mDNSIsUpperCase(bc)) bc += 'a' - 'A';
+        if (ac != bc)
+        {
+            verbosedebugf("NSEC3SameName: returning ac %c, bc %c", ac, bc);
+            return ((ac < bc) ? -1 : 1);
+        }
+    }
+    return 0;
+}
+
+// Does the NSEC3 in "ncr" covers the "name" ?
+// hashName is hash of the "name" and b32Name is the base32 encoded equivalent.
+mDNSlocal mDNSBool NSEC3CoversName(mDNS *const m, CacheRecord *ncr, const mDNSu8 *hashName, int hashLen, const mDNSu8 *b32Name,
+	int b32len)
+{
+    mDNSu8 *nxtName;
+    int nxtLength;
+    int ret, ret1, ret2;
+    const mDNSu8 b32nxtname[NSEC3_MAX_B32_LEN+1];
+    int b32nxtlen;
+
+    NSEC3Parse(&ncr->resrec, mDNSNULL, &nxtLength, &nxtName, mDNSNULL, mDNSNULL);
+
+    if (nxtLength != hashLen || ncr->resrec.name->c[0] != b32len)
+        return mDNSfalse;
+
+    // Compare the owner names and the "nxt" names.
+    //
+    // Owner name is base32 encoded and hence use the base32 encoded name b32name.
+    // nxt name is binary and hence use the binary value in hashName. 
+    ret1 = NSEC3SameName(&ncr->resrec.name->c[1], ncr->resrec.name->c[0], b32Name, b32len);
+    ret2 = DNSMemCmp(nxtName, hashName, hashLen);
+
+#if NSEC3_DEBUG
+    {
+        char nxtbuf1[50];
+        char nxtbuf2[50];
+
+        PrintHash(nxtName, nxtLength, nxtbuf1, sizeof(nxtbuf1));
+        PrintHash((mDNSu8 *)hashName, hashLen, nxtbuf2, sizeof(nxtbuf2));
+        LogMsg("NSEC3CoversName: Owner name %s, name %s", &ncr->resrec.name->c[1], b32Name);
+        LogMsg("NSEC3CoversName: Nxt hash name %s, name %s", nxtbuf1, nxtbuf2);
+    }
+#endif
+
+    // "name" is greater than the owner name and smaller than nxtName. This also implies
+	// that nxtName > owner name implying that it is normal NSEC3.
+    if (ret1 < 0 && ret2 > 0)
+    {
+        LogDNSSEC("NSEC3CoversName: NSEC3 %s covers %s (Normal)", CRDisplayString(m, ncr), b32Name);
+        return mDNStrue;
+    }
+    // Need to compare the owner name and "nxt" to see if this is the last
+    // NSEC3 in the zone. Only the owner name is in base32 and hence we need to
+    // convert the nxtName to base32.
+    b32nxtlen = baseEncode((char *)b32nxtname, sizeof(b32nxtname), nxtName, nxtLength, ENC_BASE32);
+    if (!b32nxtlen)
+    {
+        LogDNSSEC("NSEC3CoversName: baseEncode of nxtName of %s failed", CRDisplayString(m, ncr));
+        return mDNSfalse;
+    }
+    if (b32len != b32nxtlen)
+    {
+        LogDNSSEC("NSEC3CoversName: baseEncode of nxtName for %s resulted in wrong length b32nxtlen %d, b32len %d",
+            CRDisplayString(m, ncr), b32len, b32nxtlen);
+        return mDNSfalse;
+    }
+    LogDNSSEC("NSEC3CoversName: Owner name %s, b32nxtname %s, ret1 %d, ret2 %d", &ncr->resrec.name->c[1], b32nxtname, ret1, ret2);
+
+    // If it is the last NSEC3 in the zone nxt < "name" and NSEC3SameName returns -1.
+    //
+    // - ret1 < 0 means "name > owner"
+    // - ret2 > 0 means "name < nxt"
+    // 
+    // Note: We also handle the case of only NSEC3 in the zone where NSEC3SameName returns zero.
+    ret = NSEC3SameName(b32nxtname, b32nxtlen, &ncr->resrec.name->c[1], ncr->resrec.name->c[0]);
+    if (ret <= 0 &&
+        (ret1 < 0 || ret2 > 0))
+    {
+        LogDNSSEC("NSEC3CoversName: NSEC3 %s covers %s (Last), ret1 %d, ret2 %d", CRDisplayString(m, ncr), b32Name, ret1, ret2);
+        return mDNStrue;
+    }
+
+    return mDNSfalse;
+}
+
+// This function can be called with NSEC3ClosestEncloser, NSEC3Covers and NSEC3CEProof
+//
+// Passing in NSEC3ClosestEncloser means "find an exact match for the origName".
+// Passing in NSEC3Covers means "find an NSEC3 that covers the origName".
+//
+// i.e., in both cases the nsec3 records are iterated to find the best match and returned.
+// With NSEC3ClosestEncloser, as we are just looking for a name match, extra checks for
+// the types being present or absent will not be checked.
+//
+// If NSEC3CEProof is passed, the name is tried as such first by iterating through all NSEC3s
+// finding a ClosestEncloser or CloserEncloser and then one label skipped from the left and
+// retried again till both the closest and closer encloser is found.
+//
+// ncr is the negative cache record that has the NSEC3 chain
+// origName is the name for which we are trying to find the ClosestEncloser etc.
+// closestEncloser and closerEncloser are the return values of the function
+// ce is the closest encloser that will be returned if we find one
+mDNSlocal mDNSBool NSEC3Find(mDNS *const m, NSEC3FindValues val, CacheRecord *ncr, domainname *origName, CacheRecord **closestEncloser,
+	CacheRecord **closerEncloser, const domainname **ce, mDNSu16 qtype)
+{
+    int i;
+    int labelCount = CountLabels(origName);
+    CacheRecord *cr;
+    rdataNSEC3 *nsec3;
+
+    (void) qtype; // unused
+    // Pick the first NSEC for the iterations, salt etc.
+    for (cr = ncr->nsec; cr; cr = cr->next)
+    {
+        if (cr->resrec.rrtype == kDNSType_NSEC3)
+        {
+            const RDataBody2 *const rdb = (RDataBody2 *)cr->resrec.rdata->u.data;
+            nsec3 = (rdataNSEC3 *)rdb->data;
+            break;
+        }
+    }
+    if (!cr)
+    {
+        LogMsg("NSEC3Find: cr NULL");
+        return mDNSfalse;
+    }
+
+    // Note: The steps defined in this function are for "NSEC3CEProof". As part of NSEC3CEProof,
+    // we need to find both the closestEncloser and closerEncloser which can also be found
+    // by passing NSEC3ClosestEncloser and NSEC3Covers respectively.
+    //
+    // Section 8.3 of RFC 5155.
+    // 1.  Set SNAME=QNAME.  Clear the flag.
+    //
+    // closerEncloser is the "flag". "name" below is SNAME.
+
+    if (closestEncloser)
+    {
+        *ce = mDNSNULL;
+        *closestEncloser = mDNSNULL;
+    }
+    if (closerEncloser)
+        *closerEncloser = mDNSNULL;
+
+    // If we are looking for a closestEncloser or a covering NSEC3, we don't have
+    // to truncate the name. For the give name, try to find the closest or closer
+    // encloser.
+    if (val != NSEC3CEProof)
+    {
+        labelCount = 0;
+    }
+
+    for (i = 0; i < labelCount + 1; i++)
+    { 
+        int hlen;
+        const mDNSu8 hashName[NSEC3_MAX_HASH_LEN];
+        const domainname *name;
+        const mDNSu8 b32Name[NSEC3_MAX_B32_LEN+1];
+        int b32len;
+
+        name = SkipLeadingLabels(origName, i);
+        if (!NSEC3HashName(name, nsec3, mDNSNULL, 0, hashName, &hlen))
+        {
+            LogMsg("NSEC3Find: NSEC3HashName failed for ##s", name->c);
+            continue;
+        }
+
+        b32len = baseEncode((char *)b32Name, sizeof(b32Name), (mDNSu8 *)hashName, hlen, ENC_BASE32);
+        if (!b32len)
+        {
+            LogMsg("NSEC3Find: baseEncode of name %##s failed", name->c);
+            continue;
+        }
+
+
+        for (cr = ncr->nsec; cr; cr = cr->next)
+        {
+            const domainname *nsecZone;
+            int result, subdomain;
+
+            if (cr->resrec.rrtype != kDNSType_NSEC3)
+                continue;
+
+            nsecZone = SkipLeadingLabels(cr->resrec.name, 1);
+            if (!nsecZone)
+            {
+                LogMsg("NSEC3Find: SkipLeadingLabel failed for %s, current name %##s",
+                    CRDisplayString(m, cr), name->c);
+                continue;
+            }
+
+            // NSEC3 owner names are formed by hashing the owner name and then appending
+            // the zone name to it. If we skip the first label, the rest should be
+            // the zone name. See whether it is the subdomain of the name we are looking
+            // for. 
+            result = DNSSECCanonicalOrder(origName, nsecZone, &subdomain);
+            
+            // The check can't be a strict subdomain check. When NSEC3ClosestEncloser is
+            // passed in, there can be an exact match. If it is a subdomain or an exact
+            // match, we should continue with the proof.
+            if (!(subdomain || !result))
+            {
+                LogMsg("NSEC3Find: NSEC3 %s not a subdomain of %##s, result %d", CRDisplayString(m, cr),
+                    origName->c, result);
+                continue;
+            }
+
+            // 2.1) If there is no NSEC3 RR in the response that matches SNAME
+            // (i.e., an NSEC3 RR whose owner name is the same as the hash of
+            // SNAME, prepended as a single label to the zone name), clear
+            // the flag.
+            //
+            // Note: We don't try to determine the actual zone name. We know that
+            // the labels following the hash (nsecZone) is the ancestor and we don't
+            // know where the zone cut is. Hence, we verify just the hash to be
+            // the same.
+
+            if (val == NSEC3ClosestEncloser || val == NSEC3CEProof)
+            {
+                if (!NSEC3SameName(&cr->resrec.name->c[1], cr->resrec.name->c[0], (const mDNSu8 *)b32Name, b32len))
+                {
+                    int bmaplen;
+                    mDNSu8 *bmap;
+
+                    // For NSEC3ClosestEncloser, we are finding an exact match and
+                    // "type" specific checks should be done by the caller.
+                    if (val != NSEC3ClosestEncloser)
+                    {
+                        // DNAME bit must not be set and NS bit may be set only if SOA bit is set
+                        NSEC3Parse(&cr->resrec, mDNSNULL, mDNSNULL, mDNSNULL, &bmaplen, &bmap);
+                        if (BitmapTypeCheck(bmap, bmaplen, kDNSType_DNAME))
+                        {
+                            LogDNSSEC("NSEC3Find: DNAME bit set in %s, ignoring", CRDisplayString(m, cr));
+                            return mDNSfalse;
+                        }
+                        // This is the closest encloser and should come from the right zone.
+                        if (BitmapTypeCheck(bmap, bmaplen, kDNSType_NS) &&
+                            !BitmapTypeCheck(bmap, bmaplen, kDNSType_SOA))
+                        {
+                            LogDNSSEC("NSEC3Find: NS bit set without SOA bit in %s, ignoring", CRDisplayString(m, cr));
+                            return mDNSfalse;
+                        }
+                    }
+
+                    LogDNSSEC("NSEC3Find: ClosestEncloser %s found for name %##s", CRDisplayString(m, cr), name->c);
+                    if (closestEncloser)
+                    {
+                        *ce = name;
+                        *closestEncloser = cr;
+                    }
+                    if (val == NSEC3ClosestEncloser)
+                        return mDNStrue;
+                    else
+                        break;
+                }
+            }
+
+            if ((val == NSEC3Covers || val == NSEC3CEProof) && !(*closerEncloser))
+            {
+                if (NSEC3CoversName(m, cr, hashName, hlen, b32Name, b32len))
+                {
+                    // 2.2) If there is an NSEC3 RR in the response that covers SNAME, set the flag.
+                    if (closerEncloser)
+                        *closerEncloser = cr;
+                    if (val == NSEC3Covers)
+                        return mDNStrue;
+                    else
+                        break;
+                }
+            }
+        }
+        // 2.3) If there is a matching NSEC3 RR in the response and the flag
+        // was set, then the proof is complete, and SNAME is the closest
+        // encloser.
+        if (val == NSEC3CEProof)
+        {
+            if (*closestEncloser && *closerEncloser)
+            {
+                LogDNSSEC("NSEC3Find: Found closest and closer encloser");
+                return mDNStrue;
+            }
+
+            // 2.4) If there is a matching NSEC3 RR in the response, but the flag
+            // is not set, then the response is bogus.
+            //
+            // Note: We don't have to wait till we finish trying all the names. If the matchName
+            // happens, we found the closest encloser which means we should have found the closer
+            // encloser before.
+
+            if (*closestEncloser && !(*closerEncloser))
+            {
+                LogDNSSEC("NSEC3Find: Found closest, but not closer encloser");
+                return mDNSfalse;
+            }
+        }
+        // 3.  Truncate SNAME by one label from the left, go to step 2.
+    }
+    LogDNSSEC("NSEC3Find: Cannot find name %##s (%s)", origName->c, DNSTypeName(qtype));
+    return mDNSfalse;
+}
+
+mDNSlocal mDNSBool NSEC3ClosestEncloserProof(mDNS *const m, CacheRecord *ncr, domainname *name, CacheRecord **closestEncloser, CacheRecord **closerEncloser,
+	const domainname **ce, mDNSu16 qtype)
+{
+    if (!NSEC3Find(m, NSEC3CEProof, ncr, name, closestEncloser, closerEncloser, ce, qtype))
+    {
+        LogDNSSEC("NSEC3ClosestEncloserProof: ERROR!! Cannot do closest encloser proof");
+        return mDNSfalse;
+    }
+
+    // Note: It is possible that closestEncloser and closerEncloser are the same.
+    if (!closestEncloser || !closerEncloser || !ce)
+    {
+        LogMsg("NSEC3ClosestEncloserProof: ClosestEncloser %p or CloserEncloser %p ce %p, something is NULL", *closestEncloser,
+            *closerEncloser, *ce);
+        return mDNSfalse;
+    }
+
+    // If the name exists, we should not have gotten the name error
+    if (SameDomainName((*ce), name))
+    {
+        LogMsg("NSEC3ClosestEncloserProof: ClosestEncloser %s same as origName %##s", CRDisplayString(m, *closestEncloser),
+            (*ce)->c);
+        return mDNSfalse;
+    }
+    return mDNStrue;
+}
+
+mDNSlocal mDNSBool VerifyNSEC3(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr, CacheRecord *closestEncloser,
+    CacheRecord *closerEncloser, CacheRecord *wildcard, DNSSECVerifierCallback callback)
+{
+    mStatus status;
+    RRVerifier *r;
+
+    // We have three NSEC3s. If any of two are same, we should just prove one of them.
+    // This is just not an optimization; DNSSECNegativeValidationCB does not handle
+    // identical NSEC3s very well.
+
+    if (closestEncloser == closerEncloser)
+        closestEncloser = mDNSNULL;
+    if (closerEncloser == wildcard)
+        closerEncloser = mDNSNULL;
+    if (closestEncloser == wildcard)
+        closestEncloser = mDNSNULL;
+
+    dv->pendingNSEC = mDNSNULL;
+    if (closestEncloser)
+    {
+        r = AllocateRRVerifier(&closestEncloser->resrec, &status);
+        if (!r)
+            return mDNSfalse;
+        r->next = dv->pendingNSEC;
+        dv->pendingNSEC = r;
+    }
+    if (closerEncloser)
+    {
+        r = AllocateRRVerifier(&closerEncloser->resrec, &status);
+        if (!r)
+            return mDNSfalse;
+        r->next = dv->pendingNSEC;
+        dv->pendingNSEC = r;
+    }
+    if (wildcard)
+    {
+        r = AllocateRRVerifier(&wildcard->resrec, &status);
+        if (!r)
+            return mDNSfalse;
+        r->next = dv->pendingNSEC;
+        dv->pendingNSEC = r;
+    }
+    if (!dv->pendingNSEC)
+    {
+        LogMsg("VerifyNSEC3: ERROR!! pending NSEC null");
+        return mDNSfalse;
+    }
+    r = dv->pendingNSEC;
+    dv->pendingNSEC = r->next;
+    r->next = mDNSNULL;
+
+    LogDNSSEC("VerifyNSEC3: Verifying %##s (%s)", r->name.c, DNSTypeName(r->rrtype));
+    if (!dv->pendingNSEC)
+        VerifyNSEC(m, mDNSNULL, r, dv, ncr, mDNSNULL);
+    else
+        VerifyNSEC(m, mDNSNULL, r, dv, ncr, callback);
+    return mDNStrue;
+}
+
+mDNSexport void NSEC3NameErrorProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr)
+{
+    CacheRecord *closerEncloser;
+    CacheRecord *closestEncloser;
+    CacheRecord *wildcard;
+    const domainname *ce = mDNSNULL;
+    domainname wild;
+
+    if (!NSEC3ClosestEncloserProof(m, ncr, &dv->q.qname, &closestEncloser, &closerEncloser, &ce, dv->q.qtype))
+    {
+        goto error;
+    }
+    LogDNSSEC("NSEC3NameErrorProof: ClosestEncloser %s, ce %##s", CRDisplayString(m, closestEncloser), ce->c);
+    LogDNSSEC("NSEC3NameErrorProof: CloserEncloser %s", CRDisplayString(m, closerEncloser));
+
+    // *.closestEncloser should be covered by some nsec3 which would then prove
+    // that the wildcard does not exist
+    wild.c[0] = 1;
+    wild.c[1] = '*';
+    wild.c[2] = 0;
+    if (!AppendDomainName(&wild, ce))
+    {
+        LogMsg("NSEC3NameErrorProof: Can't append domainname to closest encloser name %##s", ce->c);
+        goto error;
+    }
+    if (!NSEC3Find(m, NSEC3Covers, ncr, &wild, mDNSNULL, &wildcard, mDNSNULL, dv->q.qtype))
+    {
+        LogMsg("NSEC3NameErrorProof: Cannot find encloser for wildcard");
+        goto error;
+    }
+    else
+    {
+        LogDNSSEC("NSEC3NameErrorProof: Wildcard %##s covered by %s", wild.c, CRDisplayString(m, wildcard));
+        if (wildcard == closestEncloser)
+        {
+            LogDNSSEC("NSEC3NameErrorProof: ClosestEncloser matching Wildcard %s", CRDisplayString(m, wildcard));
+        }
+    }
+    if (NSEC3OptOut(closerEncloser))
+    {
+        dv->flags |= NSEC3_OPT_OUT;
+    }
+    if (!VerifyNSEC3(m, dv, ncr, closestEncloser, closerEncloser, wildcard, NameErrorNSECCallback))
+        goto error;
+    else
+        return;
+
+error:
+    dv->DVCallback(m, dv, DNSSEC_Bogus);
+}
+
+// Section 8.5, 8.6 of RFC 5155 first paragraph
+mDNSlocal mDNSBool NSEC3NoDataError(mDNS *const m, CacheRecord *ncr, domainname *name, mDNSu16 qtype, CacheRecord **closestEncloser)
+{
+    const domainname *ce = mDNSNULL;
+
+    *closestEncloser = mDNSNULL;
+    // Note: This also covers ENT in which case the bitmap is empty
+    if (NSEC3Find(m, NSEC3ClosestEncloser, ncr, name, closestEncloser, mDNSNULL, &ce, qtype))
+    {
+        int bmaplen;
+        mDNSu8 *bmap;
+        mDNSBool ns, soa;
+
+        NSEC3Parse(&(*closestEncloser)->resrec, mDNSNULL, mDNSNULL, mDNSNULL, &bmaplen, &bmap);
+        if (BitmapTypeCheck(bmap, bmaplen, qtype) || BitmapTypeCheck(bmap, bmaplen, kDNSType_CNAME))
+        {
+            LogMsg("NSEC3NoDataError: qtype %s exists in %s", DNSTypeName(qtype), CRDisplayString(m, *closestEncloser));
+            return mDNSfalse;
+        }
+        ns = BitmapTypeCheck(bmap, bmaplen, kDNSType_NS);
+        soa = BitmapTypeCheck(bmap, bmaplen, kDNSType_SOA);
+        if (qtype != kDNSType_DS)
+        {
+            // For non-DS type questions, we don't want to use the parent side records to
+            // answer it
+            if (ns && !soa)
+            {
+                LogDNSSEC("NSEC3NoDataError: Parent side NSEC %s, can't use for child qname %##s (%s)",
+                    CRDisplayString(m, *closestEncloser), name->c, DNSTypeName(qtype));
+                return mDNSfalse;
+            }
+        }
+        else
+        {
+            if (soa)
+            {
+                LogDNSSEC("NSEC3NoDataError: Child side NSEC %s, can't use for parent qname %##s (%s)",
+                    CRDisplayString(m, *closestEncloser), name->c, DNSTypeName(qtype));
+                return mDNSfalse;
+            }
+        }
+        LogDNSSEC("NSEC3NoDataError: Name -%##s- exists, but qtype %s does not exist in %s", name->c, DNSTypeName(qtype), CRDisplayString(m, *closestEncloser));
+        return mDNStrue;
+    }
+    return mDNSfalse;
+}
+
+mDNSexport void NSEC3NoDataProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr)
+{
+    CacheRecord *closerEncloser = mDNSNULL;
+    CacheRecord *closestEncloser = mDNSNULL;
+    CacheRecord *wildcard = mDNSNULL;
+    const domainname *ce = mDNSNULL;
+    domainname wild;
+
+    // Section 8.5, 8.6 of RFC 5155
+    if (NSEC3NoDataError(m, ncr, &dv->q.qname, dv->q.qtype, &closestEncloser))
+    {
+        goto verify;
+    }
+    // Section 8.6, 8.7: if we can't find the NSEC3 RR, verify the closest encloser proof
+    // for QNAME and the "next closer" should have the opt out
+    if (!NSEC3ClosestEncloserProof(m, ncr, &dv->q.qname, &closestEncloser, &closerEncloser, &ce, dv->q.qtype))
+    {
+        goto error;
+    }
+
+    // Section 8.7: find a matching NSEC3 for *.closestEncloser
+    wild.c[0] = 1;
+    wild.c[1] = '*';
+    wild.c[2] = 0;
+    if (!AppendDomainName(&wild, ce))
+    {
+        LogMsg("NSEC3NameErrorProof: Can't append domainname to closest encloser name %##s", ce->c);
+        goto error;
+    }
+    if (!NSEC3Find(m, NSEC3ClosestEncloser, ncr, &wild, &wildcard, mDNSNULL, &ce, dv->q.qtype))
+    {
+        // Not a wild card case. Section 8.6 second para applies.
+        LogDNSSEC("NSEC3NoDataProof: Cannot find encloser for wildcard, perhaps not a wildcard case");
+        if (!NSEC3OptOut(closerEncloser))
+        {
+            LogDNSSEC("NSEC3DataProof: opt out not set for %##s (%s), bogus", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+            goto error;
+        }
+        LogDNSSEC("NSEC3DataProof: opt out set, proof complete for %##s (%s)", dv->q.qname.c, DNSTypeName(dv->q.qtype));
+        dv->flags |= NSEC3_OPT_OUT;
+    }
+    else
+    {
+        int bmaplen;
+        mDNSu8 *bmap;
+        NSEC3Parse(&wildcard->resrec, mDNSNULL, mDNSNULL, mDNSNULL, &bmaplen, &bmap);
+        if (BitmapTypeCheck(bmap, bmaplen, dv->q.qtype) || BitmapTypeCheck(bmap, bmaplen, kDNSType_CNAME))
+        {
+            LogDNSSEC("NSEC3NoDataProof: qtype %s exists in %s", DNSTypeName(dv->q.qtype), CRDisplayString(m, wildcard));
+            goto error;
+        }
+        if (dv->q.qtype == kDNSType_DS && BitmapTypeCheck(bmap, bmaplen, kDNSType_SOA))
+        {
+            LogDNSSEC("NSEC3NoDataProof: Child side wildcard NSEC3 %s, can't use for parent qname %##s (%s)",
+                CRDisplayString(m, wildcard), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+            goto error;
+        }
+        else if (dv->q.qtype != kDNSType_DS && !BitmapTypeCheck(bmap, bmaplen, kDNSType_SOA) &&
+            BitmapTypeCheck(bmap, bmaplen, kDNSType_NS))
+        {
+            // Don't use the parent side record for this
+            LogDNSSEC("NSEC3NoDataProof: Parent side wildcard NSEC3 %s, can't use for child qname %##s (%s)",
+                CRDisplayString(m, wildcard), dv->q.qname.c, DNSTypeName(dv->q.qtype));
+            goto error;
+        }
+        LogDNSSEC("NSEC3NoDataProof: Wildcard %##s matched by %s", wild.c, CRDisplayString(m, wildcard));
+    }
+verify:
+
+    if (!VerifyNSEC3(m, dv, ncr, closestEncloser, closerEncloser, wildcard, NoDataNSECCallback))
+        goto error;
+    else
+        return;
+error:
+    dv->DVCallback(m, dv, DNSSEC_Bogus);
+}
+
+mDNSexport mDNSBool NSEC3WildcardAnswerProof(mDNS *const m, CacheRecord *ncr, DNSSECVerifier *dv)
+{
+    int skip;
+    const domainname *nc;
+    CacheRecord *closerEncloser;
+
+    (void) m;
+
+    // Find the next closer name and prove that it is covered by the NSEC3
+    skip = CountLabels(&dv->origName) - CountLabels(dv->wildcardName) - 1;
+    if (skip)
+        nc = SkipLeadingLabels(&dv->origName, skip);
+    else
+        nc = &dv->origName;
+
+    LogDNSSEC("NSEC3WildcardAnswerProof: wildcard name %##s", nc->c);
+
+    if (!NSEC3Find(m, NSEC3Covers, ncr, (domainname *)nc, mDNSNULL, &closerEncloser, mDNSNULL, dv->q.qtype))
+    {
+        LogMsg("NSEC3WildcardAnswerProof: Cannot find closer encloser");
+        return mDNSfalse;
+    }
+    if (!closerEncloser)
+    {
+        LogMsg("NSEC3WildcardAnswerProof: closerEncloser NULL");
+        return mDNSfalse;
+    }
+    if (NSEC3OptOut(closerEncloser))
+    {
+        dv->flags |= NSEC3_OPT_OUT;
+    }
+    // NSEC3 Verification is done by the caller
+    return mDNStrue;
+}
+
+mDNSexport CacheRecord *NSEC3RecordIsDelegation(mDNS *const m, domainname *name, mDNSu16 qtype)
+{
+    CacheGroup *cg;
+    CacheRecord *cr;
+    CacheRecord *ncr;
+    mDNSu32 slot, namehash;
+
+    slot = HashSlot(name);
+    namehash = DomainNameHashValue(name);
+
+    cg = CacheGroupForName(m, (const mDNSu32)slot, namehash, name);
+    if (!cg)
+    {
+        LogDNSSEC("NSEC3RecordForName: cg NULL for %##s", name);
+        return mDNSNULL;
+    }
+    for (ncr = cg->members; ncr; ncr = ncr->next)
+    {
+        if (ncr->resrec.RecordType != kDNSRecordTypePacketNegative ||
+            ncr->resrec.rrtype != qtype)
+        {
+            continue;
+        }
+        for (cr = ncr->nsec; cr; cr = cr->next)
+        {
+            int hlen, b32len;
+            const mDNSu8 hashName[NSEC3_MAX_HASH_LEN];
+            const mDNSu8 b32Name[NSEC3_MAX_B32_LEN+1];
+            const RDataBody2 *const rdb = (RDataBody2 *)cr->resrec.rdata->u.data;
+            rdataNSEC3 *nsec3;
+
+            if (cr->resrec.rrtype != kDNSType_NSEC3)
+                continue;
+
+            nsec3 = (rdataNSEC3 *)rdb->data;
+
+            if (!NSEC3HashName(name, nsec3, mDNSNULL, 0, hashName, &hlen))
+            {
+                LogMsg("NSEC3RecordIsDelegation: NSEC3HashName failed for ##s", name->c);
+                return mDNSNULL;
+            }
+
+            b32len = baseEncode((char *)b32Name, sizeof(b32Name), (mDNSu8 *)hashName, hlen, ENC_BASE32);
+            if (!b32len)
+            {
+                LogMsg("NSEC3RecordIsDelegation: baseEncode of name %##s failed", name->c);
+                return mDNSNULL;
+            }
+            // Section 2.3 of RFC 4035 states that:
+            //
+            // Each owner name in the zone that has authoritative data or a delegation point NS RRset MUST
+            // have an NSEC resource record. 
+            //
+            // This applies to NSEC3 record. So, if we have an NSEC3 record matching the question name with the
+            // NS bit set, then this is a delegation.
+            //
+            if (!NSEC3SameName(&cr->resrec.name->c[1], cr->resrec.name->c[0], (const mDNSu8 *)b32Name, b32len))
+            {
+                int bmaplen;
+                mDNSu8 *bmap;
+                
+                LogDNSSEC("NSEC3RecordIsDelegation: CacheRecord %s matches name %##s, b32name %s", CRDisplayString(m, cr), name->c, b32Name);
+                NSEC3Parse(&cr->resrec, mDNSNULL, mDNSNULL, mDNSNULL, &bmaplen, &bmap);
+
+                // See the Insecure Delegation Proof section in dnssec-bis: DS bit and SOA bit
+                // should be absent
+                if (BitmapTypeCheck(bmap, bmaplen, kDNSType_SOA) ||
+                    BitmapTypeCheck(bmap, bmaplen, kDNSType_DS))
+                {
+                    LogDNSSEC("NSEC3RecordIsDelegation: CacheRecord %s has DS or SOA bit set, ignoring", CRDisplayString(m, cr));
+                    return mDNSNULL;
+                }
+                if (BitmapTypeCheck(bmap, bmaplen, kDNSType_NS))
+                    return cr;
+                else
+                    return mDNSNULL;
+            }
+            // If opt-out is not set, then it does not cover any delegations
+            if (!(nsec3->flags & NSEC3_FLAGS_OPTOUT))
+                continue;
+            // Opt-out allows insecure delegations to exist without the NSEC3 RR at the
+            // hashed owner name (see RFC 5155 section 6.0).
+            if (NSEC3CoversName(m, cr, hashName, hlen, b32Name, b32len))
+            {
+                LogDNSSEC("NSEC3RecordIsDelegation: CacheRecord %s covers name %##s with optout", CRDisplayString(m, cr), name->c);
+                return cr;
+            }
+        }
+    }
+    return mDNSNULL;
+}
+
+#else // !DNSSEC_DISABLED
+
+#endif // !DNSSEC_DISABLED
diff --git a/mDNSResponder/mDNSCore/nsec3.h b/mDNSResponder/mDNSCore/nsec3.h
new file mode 100644
index 00000000..ce3b85a3
--- /dev/null
+++ b/mDNSResponder/mDNSCore/nsec3.h
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __NSEC3_H
+#define __NSEC3_H
+
+#include "dnssec.h"
+
+extern mDNSBool NSEC3WildcardAnswerProof(mDNS *const m, CacheRecord *ncr, DNSSECVerifier *dv);
+extern void NSEC3NameErrorProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr);
+extern void NSEC3NoDataProof(mDNS *const m, DNSSECVerifier *dv, CacheRecord *ncr);
+extern CacheRecord *NSEC3RecordIsDelegation(mDNS *const m, domainname *name, mDNSu16 qtype);
+
+#endif // __NSEC3_H
diff --git a/mDNSResponder/mDNSCore/uDNS.c b/mDNSResponder/mDNSCore/uDNS.c
new file mode 100755
index 00000000..be7a5a32
--- /dev/null
+++ b/mDNSResponder/mDNSCore/uDNS.c
@@ -0,0 +1,5995 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+ * To Do:
+ * Elimate all mDNSPlatformMemAllocate/mDNSPlatformMemFree from this code -- the core code
+ * is supposed to be malloc-free so that it runs in constant memory determined at compile-time.
+ * Any dynamic run-time requirements should be handled by the platform layer below or client layer above
+ */
+
+#if APPLE_OSX_mDNSResponder
+#include <TargetConditionals.h>
+#endif
+#include "uDNS.h"
+
+#if (defined(_MSC_VER))
+// Disable "assignment within conditional expression".
+// Other compilers understand the convention that if you place the assignment expression within an extra pair
+// of parentheses, this signals to the compiler that you really intended an assignment and no warning is necessary.
+// The Microsoft compiler doesn't understand this convention, so in the absense of any other way to signal
+// to the compiler that the assignment is intentional, we have to just turn this warning off completely.
+    #pragma warning(disable:4706)
+#endif
+
+// For domain enumeration and automatic browsing
+// This is the user's DNS search list.
+// In each of these domains we search for our special pointer records (lb._dns-sd._udp.<domain>, etc.)
+// to discover recommended domains for domain enumeration (browse, default browse, registration,
+// default registration) and possibly one or more recommended automatic browsing domains.
+mDNSexport SearchListElem *SearchList = mDNSNULL;
+
+// The value can be set to true by the Platform code e.g., MacOSX uses the plist mechanism
+mDNSBool StrictUnicastOrdering = mDNSfalse;
+
+// We keep track of the number of unicast DNS servers and log a message when we exceed 64.
+// Currently the unicast queries maintain a 64 bit map to track the valid DNS servers for that
+// question. Bit position is the index into the DNS server list. This is done so to try all
+// the servers exactly once before giving up. If we could allocate memory in the core, then
+// arbitrary limitation of 64 DNSServers can be removed.
+mDNSu8 NumUnicastDNSServers = 0;
+#define MAX_UNICAST_DNS_SERVERS 64
+
+#define SetNextuDNSEvent(m, rr) { \
+        if ((m)->NextuDNSEvent - ((rr)->LastAPTime + (rr)->ThisAPInterval) >= 0)                                                                              \
+            (m)->NextuDNSEvent = ((rr)->LastAPTime + (rr)->ThisAPInterval);                                                                         \
+}
+
+#ifndef UNICAST_DISABLED
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - General Utility Functions
+#endif
+
+// set retry timestamp for record with exponential backoff
+mDNSlocal void SetRecordRetry(mDNS *const m, AuthRecord *rr, mDNSu32 random)
+{
+    rr->LastAPTime = m->timenow;
+
+    if (rr->expire && rr->refreshCount < MAX_UPDATE_REFRESH_COUNT)
+    {
+        mDNSs32 remaining = rr->expire - m->timenow;
+        rr->refreshCount++;
+        if (remaining > MIN_UPDATE_REFRESH_TIME)
+        {
+            // Refresh at 70% + random (currently it is 0 to 10%)
+            rr->ThisAPInterval =  7 * (remaining/10) + (random ? random : mDNSRandom(remaining/10));
+            // Don't update more often than 5 minutes
+            if (rr->ThisAPInterval < MIN_UPDATE_REFRESH_TIME)
+                rr->ThisAPInterval = MIN_UPDATE_REFRESH_TIME;
+            LogInfo("SetRecordRetry refresh in %d of %d for %s",
+                    rr->ThisAPInterval/mDNSPlatformOneSecond, (rr->expire - m->timenow)/mDNSPlatformOneSecond, ARDisplayString(m, rr));
+        }
+        else
+        {
+            rr->ThisAPInterval = MIN_UPDATE_REFRESH_TIME;
+            LogInfo("SetRecordRetry clamping to min refresh in %d of %d for %s",
+                    rr->ThisAPInterval/mDNSPlatformOneSecond, (rr->expire - m->timenow)/mDNSPlatformOneSecond, ARDisplayString(m, rr));
+        }
+        return;
+    }
+
+    rr->expire = 0;
+
+    rr->ThisAPInterval = rr->ThisAPInterval * QuestionIntervalStep; // Same Retry logic as Unicast Queries
+    if (rr->ThisAPInterval < INIT_RECORD_REG_INTERVAL)
+        rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+    if (rr->ThisAPInterval > MAX_RECORD_REG_INTERVAL)
+        rr->ThisAPInterval = MAX_RECORD_REG_INTERVAL;
+
+    LogInfo("SetRecordRetry retry in %d ms for %s", rr->ThisAPInterval, ARDisplayString(m, rr));
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Name Server List Management
+#endif
+
+mDNSexport DNSServer *mDNS_AddDNSServer(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, const mDNSs32 serviceID, const mDNSAddr *addr,
+                                        const mDNSIPPort port, mDNSu32 scoped, mDNSu32 timeout, mDNSBool cellIntf, mDNSu16 resGroupID, mDNSBool reqA,
+                                        mDNSBool reqAAAA, mDNSBool reqDO)
+{
+    DNSServer **p = &m->DNSServers;
+    DNSServer *tmp = mDNSNULL;
+
+    if ((NumUnicastDNSServers + 1) > MAX_UNICAST_DNS_SERVERS)
+    {
+        LogMsg("mDNS_AddDNSServer: DNS server limit of %d reached, not adding this server", MAX_UNICAST_DNS_SERVERS);
+        return mDNSNULL;
+    }
+
+    if (!d) 
+        d = (const domainname *)"";
+
+    LogInfo("mDNS_AddDNSServer(%d): Adding %#a for %##s, InterfaceID %p, serviceID %u, scoped %d, resGroupID %d req_A is %s req_AAAA is %s cell %s req_DO is %s",
+        NumUnicastDNSServers, addr, d->c, interface, serviceID, scoped, resGroupID, reqA ? "True" : "False", reqAAAA ? "True" : "False",
+        cellIntf ? "True" : "False", reqDO ? "True" : "False");
+
+    mDNS_CheckLock(m);
+
+    while (*p)  // Check if we already have this {interface,address,port,domain} tuple registered + reqA/reqAAAA bits
+    {
+        if ((*p)->scoped == scoped && (*p)->interface == interface && (*p)->serviceID == serviceID && (*p)->teststate != DNSServer_Disabled &&
+            mDNSSameAddress(&(*p)->addr, addr) && mDNSSameIPPort((*p)->port, port) && SameDomainName(&(*p)->domain, d) && 
+            (*p)->req_A == reqA && (*p)->req_AAAA == reqAAAA)
+        {
+            if (!((*p)->flags & DNSServer_FlagDelete)) 
+                debugf("Note: DNS Server %#a:%d for domain %##s (%p) registered more than once", addr, mDNSVal16(port), d->c, interface);
+            tmp = *p;
+            *p = tmp->next;
+            tmp->next = mDNSNULL;
+        }
+        else
+        {
+            p=&(*p)->next;
+        }
+    }
+
+    // NumUnicastDNSServers is the count of active DNS servers i.e., ones that are not marked
+    // with DNSServer_FlagDelete. We should increment it:
+    //
+    // 1) When we add a new DNS server
+    // 2) When we resurrect a old DNS server that is marked with DNSServer_FlagDelete
+    //
+    // Don't increment when we resurrect a DNS server that is not marked with DNSServer_FlagDelete.
+    // We have already accounted for it when it was added for the first time. This case happens when
+    // we add DNS servers with the same address multiple times (mis-configuration).
+
+    if (!tmp || (tmp->flags & DNSServer_FlagDelete))
+        NumUnicastDNSServers++;
+
+
+    if (tmp)
+    {
+        tmp->flags &= ~DNSServer_FlagDelete;
+        *p = tmp; // move to end of list, to ensure ordering from platform layer
+    }
+    else
+    {
+        // allocate, add to list
+        *p = mDNSPlatformMemAllocate(sizeof(**p));
+        if (!*p)
+        {
+            LogMsg("Error: mDNS_AddDNSServer - malloc");
+        }
+        else
+        {
+            (*p)->scoped    = scoped;
+            (*p)->interface = interface;
+            (*p)->serviceID = serviceID;
+            (*p)->addr      = *addr;
+            (*p)->port      = port;
+            (*p)->flags     = DNSServer_FlagNew;
+            (*p)->teststate = /* DNSServer_Untested */ DNSServer_Passed;
+            (*p)->lasttest  = m->timenow - INIT_UCAST_POLL_INTERVAL;
+            (*p)->timeout   = timeout;
+            (*p)->cellIntf  = cellIntf;
+            (*p)->req_A     = reqA;
+            (*p)->req_AAAA  = reqAAAA;
+            (*p)->req_DO    = reqDO;
+            // We start off assuming that the DNS server is not DNSSEC aware and
+            // when we receive the first response to a DNSSEC question, we set
+            // it to true.
+            (*p)->DNSSECAware = mDNSfalse;
+            (*p)->retransDO = 0;
+            AssignDomainName(&(*p)->domain, d);
+            (*p)->next = mDNSNULL;
+        }
+    }
+    (*p)->penaltyTime = 0;
+    // We always update the ID (not just when we allocate a new instance) because we could
+    // be adding a new non-scoped resolver with a new ID and we want all the non-scoped
+    // resolvers belong to the same group.
+    (*p)->resGroupID  = resGroupID;
+    return(*p);
+}
+
+// PenalizeDNSServer is called when the number of queries to the unicast
+// DNS server exceeds MAX_UCAST_UNANSWERED_QUERIES or when we receive an
+// error e.g., SERV_FAIL from DNS server.
+mDNSexport void PenalizeDNSServer(mDNS *const m, DNSQuestion *q, mDNSOpaque16 responseFlags)
+{
+    DNSServer *new;
+    DNSServer *orig = q->qDNSServer;
+
+    mDNS_CheckLock(m);
+
+    LogInfo("PenalizeDNSServer: Penalizing DNS server %#a question for question %p %##s (%s) SuppressUnusable %d",
+            (q->qDNSServer ? &q->qDNSServer->addr : mDNSNULL), q, q->qname.c, DNSTypeName(q->qtype), q->SuppressUnusable);
+
+    // If we get error from any DNS server, remember the error. If all of the servers,
+    // return the error, then return the first error. 
+    if (mDNSOpaque16IsZero(q->responseFlags))
+        q->responseFlags = responseFlags;
+
+    // After we reset the qDNSServer to NULL, we could get more SERV_FAILS that might end up
+    // peanlizing again.
+    if (!q->qDNSServer) goto end;
+
+    // If strict ordering of unicast servers needs to be preserved, we just lookup
+    // the next best match server below
+    //
+    // If strict ordering is not required which is the default behavior, we penalize the server
+    // for DNSSERVER_PENALTY_TIME. We may also use additional logic e.g., don't penalize for PTR
+    // in the future.
+
+    if (!StrictUnicastOrdering)
+    {
+        LogInfo("PenalizeDNSServer: Strict Unicast Ordering is FALSE");
+        // We penalize the server so that new queries don't pick this server for DNSSERVER_PENALTY_TIME
+        // XXX Include other logic here to see if this server should really be penalized
+        //
+        if (q->qtype == kDNSType_PTR)
+        {
+            LogInfo("PenalizeDNSServer: Not Penalizing PTR question");
+        }
+        else
+        {
+            LogInfo("PenalizeDNSServer: Penalizing question type %d", q->qtype);
+            q->qDNSServer->penaltyTime = NonZeroTime(m->timenow + DNSSERVER_PENALTY_TIME);
+        }
+    }
+    else
+    {
+        LogInfo("PenalizeDNSServer: Strict Unicast Ordering is TRUE");
+    }
+
+end:
+    new = GetServerForQuestion(m, q);
+
+    if (new == orig)
+    {
+        if (new)
+        {
+            LogMsg("PenalizeDNSServer: ERROR!! GetServerForQuestion returned the same server %#a:%d", &new->addr,
+                   mDNSVal16(new->port));
+            q->ThisQInterval = 0;   // Inactivate this question so that we dont bombard the network
+        }
+        else
+        {
+            // When we have no more DNS servers, we might end up calling PenalizeDNSServer multiple
+            // times when we receive SERVFAIL from delayed packets in the network e.g., DNS server
+            // is slow in responding and we have sent three queries. When we repeatedly call, it is
+            // okay to receive the same NULL DNS server. Next time we try to send the query, we will
+            // realize and re-initialize the DNS servers.
+            LogInfo("PenalizeDNSServer: GetServerForQuestion returned the same server NULL");
+        }
+    }
+    else
+    {
+        // The new DNSServer is set in DNSServerChangeForQuestion
+        DNSServerChangeForQuestion(m, q, new);
+
+        if (new)
+        {
+            LogInfo("PenalizeDNSServer: Server for %##s (%s) changed to %#a:%d (%##s)",
+                    q->qname.c, DNSTypeName(q->qtype), &q->qDNSServer->addr, mDNSVal16(q->qDNSServer->port), q->qDNSServer->domain.c);
+            // We want to try the next server immediately. As the question may already have backed off, reset
+            // the interval. We do this only the first time when we try all the DNS servers. Once we reached the end of
+            // list and retrying all the servers again e.g., at least one server failed to respond in the previous try, we
+            // use the normal backoff which is done in uDNS_CheckCurrentQuestion when we send the packet out.
+            if (!q->triedAllServersOnce)
+            {
+                q->ThisQInterval = InitialQuestionInterval;
+                q->LastQTime  = m->timenow - q->ThisQInterval;
+                SetNextQueryTime(m, q);
+            }
+        }
+        else
+        {
+            // We don't have any more DNS servers for this question. If some server in the list did not return
+            // any response, we need to keep retrying till we get a response. uDNS_CheckCurrentQuestion handles
+            // this case.
+            //
+            // If all servers responded with a negative response, We need to do two things. First, generate a
+            // negative response so that applications get a reply. We also need to reinitialize the DNS servers
+            // so that when the cache expires, we can restart the query.  We defer this up until we generate
+            // a negative cache response in uDNS_CheckCurrentQuestion.
+            //
+            // Be careful not to touch the ThisQInterval here. For a normal question, when we answer the question
+            // in AnswerCurrentQuestionWithResourceRecord will set ThisQInterval to MaxQuestionInterval and hence
+            // the next query will not happen until cache expiry. If it is a long lived question,
+            // AnswerCurrentQuestionWithResourceRecord will not set it to MaxQuestionInterval. In that case,
+            // we want the normal backoff to work.
+            LogInfo("PenalizeDNSServer: Server for %p, %##s (%s) changed to NULL, Interval %d", q, q->qname.c, DNSTypeName(q->qtype), q->ThisQInterval);
+        }
+        q->unansweredQueries = 0;
+
+    }
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - authorization management
+#endif
+
+mDNSlocal DomainAuthInfo *GetAuthInfoForName_direct(mDNS *m, const domainname *const name)
+{
+    const domainname *n = name;
+    while (n->c[0])
+    {
+        DomainAuthInfo *ptr;
+        for (ptr = m->AuthInfoList; ptr; ptr = ptr->next)
+            if (SameDomainName(&ptr->domain, n))
+            {
+                debugf("GetAuthInfoForName %##s Matched %##s Key name %##s", name->c, ptr->domain.c, ptr->keyname.c);
+                return(ptr);
+            }
+        n = (const domainname *)(n->c + 1 + n->c[0]);
+    }
+    //LogInfo("GetAuthInfoForName none found for %##s", name->c);
+    return mDNSNULL;
+}
+
+// MUST be called with lock held
+mDNSexport DomainAuthInfo *GetAuthInfoForName_internal(mDNS *m, const domainname *const name)
+{
+    DomainAuthInfo **p = &m->AuthInfoList;
+
+    mDNS_CheckLock(m);
+
+    // First purge any dead keys from the list
+    while (*p)
+    {
+        if ((*p)->deltime && m->timenow - (*p)->deltime >= 0 && AutoTunnelUnregistered(*p))
+        {
+            DNSQuestion *q;
+            DomainAuthInfo *info = *p;
+            LogInfo("GetAuthInfoForName_internal deleting expired key %##s %##s", info->domain.c, info->keyname.c);
+            *p = info->next;    // Cut DomainAuthInfo from list *before* scanning our question list updating AuthInfo pointers
+            for (q = m->Questions; q; q=q->next)
+                if (q->AuthInfo == info)
+                {
+                    q->AuthInfo = GetAuthInfoForName_direct(m, &q->qname);
+                    debugf("GetAuthInfoForName_internal updated q->AuthInfo from %##s to %##s for %##s (%s)",
+                           info->domain.c, q->AuthInfo ? q->AuthInfo->domain.c : mDNSNULL, q->qname.c, DNSTypeName(q->qtype));
+                }
+
+            // Probably not essential, but just to be safe, zero out the secret key data
+            // so we don't leave it hanging around in memory
+            // (where it could potentially get exposed via some other bug)
+            mDNSPlatformMemZero(info, sizeof(*info));
+            mDNSPlatformMemFree(info);
+        }
+        else
+            p = &(*p)->next;
+    }
+
+    return(GetAuthInfoForName_direct(m, name));
+}
+
+mDNSexport DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name)
+{
+    DomainAuthInfo *d;
+    mDNS_Lock(m);
+    d = GetAuthInfoForName_internal(m, name);
+    mDNS_Unlock(m);
+    return(d);
+}
+
+// MUST be called with the lock held
+mDNSexport mStatus mDNS_SetSecretForDomain(mDNS *m, DomainAuthInfo *info,
+                                           const domainname *domain, const domainname *keyname, const char *b64keydata, const domainname *hostname, mDNSIPPort *port, mDNSBool autoTunnel)
+{
+    DNSQuestion *q;
+    DomainAuthInfo **p = &m->AuthInfoList;
+    if (!info || !b64keydata) { LogMsg("mDNS_SetSecretForDomain: ERROR: info %p b64keydata %p", info, b64keydata); return(mStatus_BadParamErr); }
+
+    LogInfo("mDNS_SetSecretForDomain: domain %##s key %##s%s", domain->c, keyname->c, autoTunnel ? " AutoTunnel" : "");
+
+    info->AutoTunnel = autoTunnel;
+    AssignDomainName(&info->domain,  domain);
+    AssignDomainName(&info->keyname, keyname);
+    if (hostname)
+        AssignDomainName(&info->hostname, hostname);
+    else
+        info->hostname.c[0] = 0;
+    if (port)
+        info->port = *port;
+    else
+        info->port = zeroIPPort;
+    mDNS_snprintf(info->b64keydata, sizeof(info->b64keydata), "%s", b64keydata);
+
+    if (DNSDigest_ConstructHMACKeyfromBase64(info, b64keydata) < 0)
+    {
+        LogMsg("mDNS_SetSecretForDomain: ERROR: Could not convert shared secret from base64: domain %##s key %##s %s", domain->c, keyname->c, mDNS_LoggingEnabled ? b64keydata : "");
+        return(mStatus_BadParamErr);
+    }
+
+    // Don't clear deltime until after we've ascertained that b64keydata is valid
+    info->deltime = 0;
+
+    while (*p && (*p) != info) p=&(*p)->next;
+    if (*p) {LogInfo("mDNS_SetSecretForDomain: Domain %##s Already in list", (*p)->domain.c); return(mStatus_AlreadyRegistered);}
+
+    // Caution: Only zero AutoTunnelHostRecord.namestorage AFTER we've determined that this is a NEW DomainAuthInfo
+    // being added to the list. Otherwise we risk smashing our AutoTunnel host records that are already active and in use.
+    info->AutoTunnelHostRecord.resrec.RecordType = kDNSRecordTypeUnregistered;
+    info->AutoTunnelHostRecord.namestorage.c[0] = 0;
+    info->AutoTunnelTarget.resrec.RecordType = kDNSRecordTypeUnregistered;
+    info->AutoTunnelDeviceInfo.resrec.RecordType = kDNSRecordTypeUnregistered;
+    info->AutoTunnelService.resrec.RecordType = kDNSRecordTypeUnregistered;
+    info->AutoTunnel6Record.resrec.RecordType = kDNSRecordTypeUnregistered;
+    info->AutoTunnelServiceStarted = mDNSfalse;
+    info->AutoTunnelInnerAddress = zerov6Addr;
+    info->next = mDNSNULL;
+    *p = info;
+
+    // Check to see if adding this new DomainAuthInfo has changed the credentials for any of our questions
+    for (q = m->Questions; q; q=q->next)
+    {
+        DomainAuthInfo *newinfo = GetAuthInfoForQuestion(m, q);
+        if (q->AuthInfo != newinfo)
+        {
+            debugf("mDNS_SetSecretForDomain updating q->AuthInfo from %##s to %##s for %##s (%s)",
+                   q->AuthInfo ? q->AuthInfo->domain.c : mDNSNULL,
+                   newinfo     ? newinfo->domain.c : mDNSNULL, q->qname.c, DNSTypeName(q->qtype));
+            q->AuthInfo = newinfo;
+        }
+    }
+
+    return(mStatus_NoError);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - NAT Traversal
+#endif
+
+// Keep track of when to request/refresh the external address using NAT-PMP or UPnP/IGD,
+// and do so when necessary
+mDNSlocal mStatus uDNS_RequestAddress(mDNS *m)
+{
+    mStatus err = mStatus_NoError;
+    
+    if (!m->NATTraversals)
+    {
+        m->retryGetAddr = NonZeroTime(m->timenow + 0x78000000);
+        LogInfo("uDNS_RequestAddress: Setting retryGetAddr to future");
+    }
+    else if (m->timenow - m->retryGetAddr >= 0)
+    {
+        if (mDNSv4AddrIsRFC1918(&m->Router.ip.v4))
+        {
+            static NATAddrRequest req = {NATMAP_VERS, NATOp_AddrRequest};
+            static mDNSu8* start = (mDNSu8*)&req;
+            mDNSu8* end = start + sizeof(NATAddrRequest);
+            err = mDNSPlatformSendUDP(m, start, end, 0, mDNSNULL, &m->Router, NATPMPPort, mDNSfalse);
+            debugf("uDNS_RequestAddress: Sent NAT-PMP external address request %d", err);
+            
+#ifdef _LEGACY_NAT_TRAVERSAL_
+            if (mDNSIPPortIsZero(m->UPnPRouterPort) || mDNSIPPortIsZero(m->UPnPSOAPPort))
+            {
+                LNT_SendDiscoveryMsg(m);
+                debugf("uDNS_RequestAddress: LNT_SendDiscoveryMsg");
+            }
+            else
+            {
+                mStatus lnterr = LNT_GetExternalAddress(m);
+                if (lnterr)
+                    LogMsg("uDNS_RequestAddress: LNT_GetExternalAddress returned error %d", lnterr);
+                
+                err = err ? err : lnterr; // NAT-PMP error takes precedence
+            }
+#endif // _LEGACY_NAT_TRAVERSAL_
+        }
+
+        // Always update the interval and retry time, so that even if we fail to send the
+        // packet, we won't spin in an infinite loop repeatedly failing to send the packet
+        if (m->retryIntervalGetAddr < NATMAP_INIT_RETRY)
+        {
+            m->retryIntervalGetAddr = NATMAP_INIT_RETRY;
+        }
+        else if (m->retryIntervalGetAddr < NATMAP_MAX_RETRY_INTERVAL / 2)
+        {
+            m->retryIntervalGetAddr *= 2;
+        }
+        else
+        {
+            m->retryIntervalGetAddr = NATMAP_MAX_RETRY_INTERVAL;
+        }
+
+        m->retryGetAddr = NonZeroTime(m->timenow + m->retryIntervalGetAddr);
+    }
+    else
+    {
+        debugf("uDNS_RequestAddress: Not time to send address request");
+    }
+
+    // Always update NextScheduledNATOp, even if we didn't change retryGetAddr, so we'll
+    // be called when we need to send the request(s)
+    if (m->NextScheduledNATOp - m->retryGetAddr > 0)
+        m->NextScheduledNATOp = m->retryGetAddr;
+
+    return err;
+}
+
+mDNSlocal mStatus uDNS_SendNATMsg(mDNS *m, NATTraversalInfo *info, mDNSBool usePCP)
+{
+    mStatus err = mStatus_NoError;
+
+    if (!info)
+    {
+        LogMsg("uDNS_SendNATMsg called unexpectedly with NULL info");
+        return mStatus_BadParamErr;
+    }
+    
+    // send msg if the router's address is private (which means it's non-zero)
+    if (mDNSv4AddrIsRFC1918(&m->Router.ip.v4))
+    {
+        if (!usePCP)
+        {
+            if (!info->sentNATPMP)
+            {
+                if (info->Protocol)
+                {
+                    static NATPortMapRequest NATPortReq;
+                    static const mDNSu8* end = (mDNSu8 *)&NATPortReq + sizeof(NATPortMapRequest);
+                    mDNSu8 *p = (mDNSu8 *)&NATPortReq.NATReq_lease;
+                    
+                    NATPortReq.vers    = NATMAP_VERS;
+                    NATPortReq.opcode  = info->Protocol;
+                    NATPortReq.unused  = zeroID;
+                    NATPortReq.intport = info->IntPort;
+                    NATPortReq.extport = info->RequestedPort;
+                    p[0] = (mDNSu8)((info->NATLease >> 24) &  0xFF);
+                    p[1] = (mDNSu8)((info->NATLease >> 16) &  0xFF);
+                    p[2] = (mDNSu8)((info->NATLease >>  8) &  0xFF);
+                    p[3] = (mDNSu8)( info->NATLease        &  0xFF);
+            
+                    err = mDNSPlatformSendUDP(m, (mDNSu8 *)&NATPortReq, end, 0, mDNSNULL, &m->Router, NATPMPPort, mDNSfalse);
+                    debugf("uDNS_SendNATMsg: Sent NAT-PMP mapping request %d", err);
+                }
+
+                // In case the address request already went out for another NAT-T,
+                // set the NewAddress to the currently known global external address, so
+                // Address-only operations will get the callback immediately
+                info->NewAddress = m->ExtAddress;
+
+                // Remember that we just sent a NAT-PMP packet, so we won't resend one later.
+                // We do this because the NAT-PMP "Unsupported Version" response has no
+                // information about the (PCP) request that triggered it, so we must send
+                // NAT-PMP requests for all operations. Without this, we'll send n PCP
+                // requests for n operations, receive n NAT-PMP "Unsupported Version"
+                // responses, and send n NAT-PMP requests for each of those responses,
+                // resulting in (n + n^2) packets sent. We only want to send 2n packets:
+                // n PCP requests followed by n NAT-PMP requests.
+                info->sentNATPMP = mDNStrue;
+            }
+        }
+        else
+        {
+            PCPMapRequest req;
+            mDNSu8* start = (mDNSu8*)&req;
+            mDNSu8* end = start + sizeof(req);
+            mDNSu8* p = (mDNSu8*)&req.lifetime;
+            
+            req.version = PCP_VERS;
+            req.opCode = PCPOp_Map;
+            req.reserved = zeroID;
+            
+            p[0] = (mDNSu8)((info->NATLease >> 24) &  0xFF);
+            p[1] = (mDNSu8)((info->NATLease >> 16) &  0xFF);
+            p[2] = (mDNSu8)((info->NATLease >>  8) &  0xFF);
+            p[3] = (mDNSu8)( info->NATLease        &  0xFF);
+            
+            mDNSAddrMapIPv4toIPv6(&m->AdvertisedV4.ip.v4, &req.clientAddr);
+            
+            req.nonce[0] = m->PCPNonce[0];
+            req.nonce[1] = m->PCPNonce[1];
+            req.nonce[2] = m->PCPNonce[2];
+            
+            req.protocol = (info->Protocol == NATOp_MapUDP ? PCPProto_UDP : PCPProto_TCP);
+            
+            req.reservedMapOp[0] = 0;
+            req.reservedMapOp[1] = 0;
+            req.reservedMapOp[2] = 0;
+            
+            req.intPort = info->Protocol ? info->IntPort : DiscardPort;
+            req.extPort = info->RequestedPort;
+            
+            // Since we only support IPv4, even if using the all-zeros address, map it, so
+            // the PCP gateway will give us an IPv4 address & not an IPv6 address.
+            mDNSAddrMapIPv4toIPv6(&info->NewAddress, &req.extAddress);
+
+            err = mDNSPlatformSendUDP(m, start, end, 0, mDNSNULL, &m->Router, NATPMPPort, mDNSfalse);
+            debugf("uDNS_SendNATMsg: Sent PCP Mapping request %d", err);
+
+            // Unset the sentNATPMP flag, so that we'll send a NAT-PMP packet if we
+            // receive a NAT-PMP "Unsupported Version" packet. This will result in every
+            // renewal, retransmission, etc. being tried first as PCP, then if a NAT-PMP
+            // "Unsupported Version" response is received, fall-back & send the request
+            // using NAT-PMP.
+            info->sentNATPMP = mDNSfalse;
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+            if (mDNSIPPortIsZero(m->UPnPRouterPort) || mDNSIPPortIsZero(m->UPnPSOAPPort))
+            {
+                LNT_SendDiscoveryMsg(m);
+                debugf("uDNS_SendNATMsg: LNT_SendDiscoveryMsg");
+            }
+            else
+            {
+                mStatus lnterr = LNT_MapPort(m, info);
+                if (lnterr)
+                    LogMsg("uDNS_SendNATMsg: LNT_MapPort returned error %d", lnterr);
+                
+                err = err ? err : lnterr; // PCP error takes precedence
+            }
+#endif // _LEGACY_NAT_TRAVERSAL_
+        }
+    }
+
+    return(err);
+}
+
+mDNSexport void RecreateNATMappings(mDNS *const m, const mDNSu32 waitTicks)
+{
+    mDNSu32 when = NonZeroTime(m->timenow + waitTicks);
+    NATTraversalInfo *n;
+    for (n = m->NATTraversals; n; n=n->next)
+    {
+        n->ExpiryTime    = 0;       // Mark this mapping as expired
+        n->retryInterval = NATMAP_INIT_RETRY;
+        n->retryPortMap  = when;
+        n->lastSuccessfulProtocol = NATTProtocolNone;
+        if (!n->Protocol) n->NewResult = mStatus_NoError;
+#ifdef _LEGACY_NAT_TRAVERSAL_
+        if (n->tcpInfo.sock) { mDNSPlatformTCPCloseConnection(n->tcpInfo.sock); n->tcpInfo.sock = mDNSNULL; }
+#endif // _LEGACY_NAT_TRAVERSAL_
+    }
+
+    m->PCPNonce[0] = mDNSRandom(-1);
+    m->PCPNonce[1] = mDNSRandom(-1);
+    m->PCPNonce[2] = mDNSRandom(-1);
+    m->retryIntervalGetAddr = 0;
+    m->retryGetAddr = when;
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    LNT_ClearState(m);
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+    m->NextScheduledNATOp = m->timenow;     // Need to send packets immediately
+}
+
+mDNSexport void natTraversalHandleAddressReply(mDNS *const m, mDNSu16 err, mDNSv4Addr ExtAddr)
+{
+    static mDNSu16 last_err = 0;
+    NATTraversalInfo *n;
+
+    if (err)
+    {
+        if (err != last_err) LogMsg("Error getting external address %d", err);
+        ExtAddr = zerov4Addr;
+    }
+    else
+    {
+        LogInfo("Received external IP address %.4a from NAT", &ExtAddr);
+        if (mDNSv4AddrIsRFC1918(&ExtAddr))
+            LogMsg("Double NAT (external NAT gateway address %.4a is also a private RFC 1918 address)", &ExtAddr);
+        if (mDNSIPv4AddressIsZero(ExtAddr))
+            err = NATErr_NetFail; // fake error to handle routers that pathologically report success with the zero address
+    }
+
+    // Globally remember the most recently discovered address, so it can be used in each
+    // new NATTraversal structure
+    m->ExtAddress = ExtAddr;
+
+    if (!err) // Success, back-off to maximum interval
+        m->retryIntervalGetAddr = NATMAP_MAX_RETRY_INTERVAL;
+    else if (!last_err) // Failure after success, retry quickly (then back-off exponentially)
+        m->retryIntervalGetAddr = NATMAP_INIT_RETRY;
+    // else back-off normally in case of pathological failures
+
+    m->retryGetAddr = m->timenow + m->retryIntervalGetAddr;
+    if (m->NextScheduledNATOp - m->retryGetAddr > 0)
+        m->NextScheduledNATOp = m->retryGetAddr;
+
+    last_err = err;
+    
+    for (n = m->NATTraversals; n; n=n->next)
+    {
+        // We should change n->NewAddress only when n is one of:
+        // 1) a mapping operation that most recently succeeded using NAT-PMP or UPnP/IGD,
+        //    because such an operation needs the update now. If the lastSuccessfulProtocol
+        //    is currently none, then natTraversalHandlePortMapReplyWithAddress() will be
+        //    called should NAT-PMP or UPnP/IGD succeed in the future.
+        // 2) an address-only operation that did not succeed via PCP, because when such an
+        //    operation succeeds via PCP, it's for the TCP discard port just to learn the
+        //    address. And that address may be different than the external address
+        //    discovered via NAT-PMP or UPnP/IGD. If the lastSuccessfulProtocol
+        //    is currently none, we must update the NewAddress as PCP may not succeed.
+        if (!mDNSSameIPv4Address(n->NewAddress, ExtAddr) &&
+             (n->Protocol ?
+               (n->lastSuccessfulProtocol == NATTProtocolNATPMP || n->lastSuccessfulProtocol == NATTProtocolUPNPIGD) :
+               (n->lastSuccessfulProtocol != NATTProtocolPCP)))
+        {
+            // Needs an update immediately
+            n->NewAddress    = ExtAddr;
+            n->ExpiryTime    = 0;
+            n->retryInterval = NATMAP_INIT_RETRY;
+            n->retryPortMap  = m->timenow;
+#ifdef _LEGACY_NAT_TRAVERSAL_
+            if (n->tcpInfo.sock) { mDNSPlatformTCPCloseConnection(n->tcpInfo.sock); n->tcpInfo.sock = mDNSNULL; }
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+            m->NextScheduledNATOp = m->timenow;     // Need to send packets immediately
+        }
+    }
+}
+
+// Both places that call NATSetNextRenewalTime() update m->NextScheduledNATOp correctly afterwards
+mDNSlocal void NATSetNextRenewalTime(mDNS *const m, NATTraversalInfo *n)
+{
+    n->retryInterval = (n->ExpiryTime - m->timenow)/2;
+    if (n->retryInterval < NATMAP_MIN_RETRY_INTERVAL)   // Min retry interval is 2 seconds
+        n->retryInterval = NATMAP_MIN_RETRY_INTERVAL;
+    n->retryPortMap = m->timenow + n->retryInterval;
+}
+
+mDNSlocal void natTraversalHandlePortMapReplyWithAddress(mDNS *const m, NATTraversalInfo *n, const mDNSInterfaceID InterfaceID, mDNSu16 err, mDNSv4Addr extaddr, mDNSIPPort extport, mDNSu32 lease, NATTProtocol protocol)
+{
+    const char *prot = n->Protocol == 0 ? "Add" : n->Protocol == NATOp_MapUDP ? "UDP" : n->Protocol == NATOp_MapTCP ? "TCP" : "???";
+    (void)prot;
+    n->NewResult = err;
+    if (err || lease == 0 || mDNSIPPortIsZero(extport))
+    {
+        LogInfo("natTraversalHandlePortMapReplyWithAddress: %p Response %s Port %5d External %.4a:%d lease %d error %d",
+                n, prot, mDNSVal16(n->IntPort), &extaddr, mDNSVal16(extport), lease, err);
+        n->retryInterval = NATMAP_MAX_RETRY_INTERVAL;
+        n->retryPortMap = m->timenow + NATMAP_MAX_RETRY_INTERVAL;
+        // No need to set m->NextScheduledNATOp here, since we're only ever extending the m->retryPortMap time
+        if      (err == NATErr_Refused) n->NewResult = mStatus_NATPortMappingDisabled;
+        else if (err > NATErr_None && err <= NATErr_Opcode) n->NewResult = mStatus_NATPortMappingUnsupported;
+    }
+    else
+    {
+        if (lease > 999999999UL / mDNSPlatformOneSecond)
+            lease = 999999999UL / mDNSPlatformOneSecond;
+        n->ExpiryTime = NonZeroTime(m->timenow + lease * mDNSPlatformOneSecond);
+
+        if (!mDNSSameIPv4Address(n->NewAddress, extaddr) || !mDNSSameIPPort(n->RequestedPort, extport))
+            LogInfo("natTraversalHandlePortMapReplyWithAddress: %p %s Response %s Port %5d External %.4a:%d changed to %.4a:%d lease %d",
+                    n,
+                    (n->lastSuccessfulProtocol == NATTProtocolNone    ? "None    " :
+                     n->lastSuccessfulProtocol == NATTProtocolNATPMP  ? "NAT-PMP " :
+                     n->lastSuccessfulProtocol == NATTProtocolUPNPIGD ? "UPnP/IGD" :
+                     n->lastSuccessfulProtocol == NATTProtocolPCP     ? "PCP     " :
+                     /* else */                                         "Unknown " ),
+                    prot, mDNSVal16(n->IntPort), &n->NewAddress, mDNSVal16(n->RequestedPort),
+                    &extaddr, mDNSVal16(extport), lease);
+
+        n->InterfaceID   = InterfaceID;
+        n->NewAddress    = extaddr;
+        if (n->Protocol) n->RequestedPort = extport; // Don't report the (PCP) external port to address-only operations
+        n->lastSuccessfulProtocol = protocol;
+
+        NATSetNextRenewalTime(m, n);            // Got our port mapping; now set timer to renew it at halfway point
+        m->NextScheduledNATOp = m->timenow;     // May need to invoke client callback immediately
+    }
+}
+
+// To be called for NAT-PMP or UPnP/IGD mappings, to use currently discovered (global) address
+mDNSexport void natTraversalHandlePortMapReply(mDNS *const m, NATTraversalInfo *n, const mDNSInterfaceID InterfaceID, mDNSu16 err, mDNSIPPort extport, mDNSu32 lease, NATTProtocol protocol)
+{
+    natTraversalHandlePortMapReplyWithAddress(m, n, InterfaceID, err, m->ExtAddress, extport, lease, protocol);
+}
+
+// Must be called with the mDNS_Lock held
+mDNSexport mStatus mDNS_StartNATOperation_internal(mDNS *const m, NATTraversalInfo *traversal)
+{
+    NATTraversalInfo **n;
+
+    LogInfo("mDNS_StartNATOperation_internal %p Protocol %d IntPort %d RequestedPort %d NATLease %d", traversal,
+            traversal->Protocol, mDNSVal16(traversal->IntPort), mDNSVal16(traversal->RequestedPort), traversal->NATLease);
+
+    // Note: It important that new traversal requests are appended at the *end* of the list, not prepended at the start
+    for (n = &m->NATTraversals; *n; n=&(*n)->next)
+    {
+        if (traversal == *n)
+        {
+            LogMsg("Error! Tried to add a NAT traversal that's already in the active list: request %p Prot %d Int %d TTL %d",
+                   traversal, traversal->Protocol, mDNSVal16(traversal->IntPort), traversal->NATLease);
+            #if ForceAlerts
+            *(long*)0 = 0;
+            #endif
+            return(mStatus_AlreadyRegistered);
+        }
+        if (traversal->Protocol && traversal->Protocol == (*n)->Protocol && mDNSSameIPPort(traversal->IntPort, (*n)->IntPort) &&
+            !mDNSSameIPPort(traversal->IntPort, SSHPort))
+            LogMsg("Warning: Created port mapping request %p Prot %d Int %d TTL %d "
+                   "duplicates existing port mapping request %p Prot %d Int %d TTL %d",
+                   traversal, traversal->Protocol, mDNSVal16(traversal->IntPort), traversal->NATLease,
+                   *n,        (*n)->Protocol, mDNSVal16((*n)->IntPort), (*n)->NATLease);
+    }
+
+    // Initialize necessary fields
+    traversal->next            = mDNSNULL;
+    traversal->ExpiryTime      = 0;
+    traversal->retryInterval   = NATMAP_INIT_RETRY;
+    traversal->retryPortMap    = m->timenow;
+    traversal->NewResult       = mStatus_NoError;
+    traversal->lastSuccessfulProtocol = NATTProtocolNone;
+    traversal->sentNATPMP      = mDNSfalse;
+    traversal->ExternalAddress = onesIPv4Addr;
+    traversal->NewAddress      = zerov4Addr;
+    traversal->ExternalPort    = zeroIPPort;
+    traversal->Lifetime        = 0;
+    traversal->Result          = mStatus_NoError;
+
+    // set default lease if necessary
+    if (!traversal->NATLease) traversal->NATLease = NATMAP_DEFAULT_LEASE;
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    mDNSPlatformMemZero(&traversal->tcpInfo, sizeof(traversal->tcpInfo));
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+    if (!m->NATTraversals)      // If this is our first NAT request, kick off an address request too
+    {
+        m->retryGetAddr         = m->timenow;
+        m->retryIntervalGetAddr = NATMAP_INIT_RETRY;
+    }
+
+    // If this is an address-only operation, initialize to the current global address,
+    // or (in non-PCP environments) we won't know the address until the next external
+    // address request/response.
+    if (!traversal->Protocol)
+    {
+        traversal->NewAddress = m->ExtAddress;
+    }
+
+    m->NextScheduledNATOp = m->timenow; // This will always trigger sending the packet ASAP, and generate client callback if necessary
+
+    *n = traversal;     // Append new NATTraversalInfo to the end of our list
+
+    return(mStatus_NoError);
+}
+
+// Must be called with the mDNS_Lock held
+mDNSexport mStatus mDNS_StopNATOperation_internal(mDNS *m, NATTraversalInfo *traversal)
+{
+    mDNSBool unmap = mDNStrue;
+    NATTraversalInfo *p;
+    NATTraversalInfo **ptr = &m->NATTraversals;
+
+    while (*ptr && *ptr != traversal) ptr=&(*ptr)->next;
+    if (*ptr) *ptr = (*ptr)->next;      // If we found it, cut this NATTraversalInfo struct from our list
+    else
+    {
+        LogMsg("mDNS_StopNATOperation_internal: NATTraversalInfo %p not found in list", traversal);
+        return(mStatus_BadReferenceErr);
+    }
+
+    LogInfo("mDNS_StopNATOperation_internal %p %d %d %d %d", traversal,
+            traversal->Protocol, mDNSVal16(traversal->IntPort), mDNSVal16(traversal->RequestedPort), traversal->NATLease);
+
+    if (m->CurrentNATTraversal == traversal)
+        m->CurrentNATTraversal = m->CurrentNATTraversal->next;
+
+    // If there is a match for the operation being stopped, don't send a deletion request (unmap)
+    for (p = m->NATTraversals; p; p=p->next)
+    {
+        if (traversal->Protocol ?
+            ((traversal->Protocol == p->Protocol && mDNSSameIPPort(traversal->IntPort, p->IntPort)) ||
+             (!p->Protocol && traversal->Protocol == NATOp_MapTCP && mDNSSameIPPort(traversal->IntPort, DiscardPort))) :
+            (!p->Protocol || (p->Protocol == NATOp_MapTCP && mDNSSameIPPort(p->IntPort, DiscardPort))))
+        {
+            LogInfo("Warning: Removed port mapping request %p Prot %d Int %d TTL %d "
+                    "duplicates existing port mapping request %p Prot %d Int %d TTL %d",
+                    traversal, traversal->Protocol, mDNSVal16(traversal->IntPort), traversal->NATLease,
+                            p,         p->Protocol, mDNSVal16(        p->IntPort),         p->NATLease);
+            unmap = mDNSfalse;
+        }
+    }
+
+    if (traversal->ExpiryTime && unmap)
+    {
+        traversal->NATLease = 0;
+        traversal->retryInterval = 0;
+        
+        // In case we most recently sent NAT-PMP, we need to set sentNATPMP to false so
+        // that we'll send a NAT-PMP request to destroy the mapping. We do this because
+        // the NATTraversal struct has already been cut from the list, and the client
+        // layer will destroy the memory upon returning from this function, so we can't
+        // try PCP first and then fall-back to NAT-PMP. That is, if we most recently
+        // created/renewed the mapping using NAT-PMP, we need to destroy it using NAT-PMP
+        // now, because we won't get a chance later.
+        traversal->sentNATPMP = mDNSfalse;
+
+        // Both NAT-PMP & PCP RFCs state that the suggested port in deletion requests
+        // should be zero. And for PCP, the suggested external address should also be
+        // zero, specifically, the all-zeros IPv4-mapped address, since we would only
+        // would have requested an IPv4 address.
+        traversal->RequestedPort = zeroIPPort;
+        traversal->NewAddress = zerov4Addr;
+        
+        uDNS_SendNATMsg(m, traversal, traversal->lastSuccessfulProtocol != NATTProtocolNATPMP);
+    }
+
+    // Even if we DIDN'T make a successful UPnP mapping yet, we might still have a partially-open TCP connection we need to clean up
+    #ifdef _LEGACY_NAT_TRAVERSAL_
+    {
+        mStatus err = LNT_UnmapPort(m, traversal);
+        if (err) LogMsg("Legacy NAT Traversal - unmap request failed with error %d", err);
+    }
+    #endif // _LEGACY_NAT_TRAVERSAL_
+
+    return(mStatus_NoError);
+}
+
+mDNSexport mStatus mDNS_StartNATOperation(mDNS *const m, NATTraversalInfo *traversal)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_StartNATOperation_internal(m, traversal);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+mDNSexport mStatus mDNS_StopNATOperation(mDNS *const m, NATTraversalInfo *traversal)
+{
+    mStatus status;
+    mDNS_Lock(m);
+    status = mDNS_StopNATOperation_internal(m, traversal);
+    mDNS_Unlock(m);
+    return(status);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Long-Lived Queries
+#endif
+
+// Lock must be held -- otherwise m->timenow is undefined
+mDNSlocal void StartLLQPolling(mDNS *const m, DNSQuestion *q)
+{
+    debugf("StartLLQPolling: %##s", q->qname.c);
+    q->state = LLQ_Poll;
+    q->ThisQInterval = INIT_UCAST_POLL_INTERVAL;
+    // We want to send our poll query ASAP, but the "+ 1" is because if we set the time to now,
+    // we risk causing spurious "SendQueries didn't send all its queries" log messages
+    q->LastQTime     = m->timenow - q->ThisQInterval + 1;
+    SetNextQueryTime(m, q);
+#if APPLE_OSX_mDNSResponder
+    UpdateAutoTunnelDomainStatuses(m);
+#endif
+}
+
+mDNSlocal mDNSu8 *putLLQ(DNSMessage *const msg, mDNSu8 *ptr, const DNSQuestion *const question, const LLQOptData *const data)
+{
+    AuthRecord rr;
+    ResourceRecord *opt = &rr.resrec;
+    rdataOPT *optRD;
+
+    //!!!KRS when we implement multiple llqs per message, we'll need to memmove anything past the question section
+    ptr = putQuestion(msg, ptr, msg->data + AbsoluteMaxDNSMessageData, &question->qname, question->qtype, question->qclass);
+    if (!ptr) { LogMsg("ERROR: putLLQ - putQuestion"); return mDNSNULL; }
+
+    // locate OptRR if it exists, set pointer to end
+    // !!!KRS implement me
+
+    // format opt rr (fields not specified are zero-valued)
+    mDNS_SetupResourceRecord(&rr, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    opt->rrclass    = NormalMaxDNSMessageData;
+    opt->rdlength   = sizeof(rdataOPT); // One option in this OPT record
+    opt->rdestimate = sizeof(rdataOPT);
+
+    optRD = &rr.resrec.rdata->u.opt[0];
+    optRD->opt = kDNSOpt_LLQ;
+    optRD->u.llq = *data;
+    ptr = PutResourceRecordTTLJumbo(msg, ptr, &msg->h.numAdditionals, opt, 0);
+    if (!ptr) { LogMsg("ERROR: putLLQ - PutResourceRecordTTLJumbo"); return mDNSNULL; }
+
+    return ptr;
+}
+
+// Normally we'd just request event packets be sent directly to m->LLQNAT.ExternalPort, except...
+// with LLQs over TLS/TCP we're doing a weird thing where instead of requesting packets be sent to ExternalAddress:ExternalPort
+// we're requesting that packets be sent to ExternalPort, but at the source address of our outgoing TCP connection.
+// Normally, after going through the NAT gateway, the source address of our outgoing TCP connection is the same as ExternalAddress,
+// so this is fine, except when the TCP connection ends up going over a VPN tunnel instead.
+// To work around this, if we find that the source address for our TCP connection is not a private address, we tell the Dot Mac
+// LLQ server to send events to us directly at port 5353 on that address, instead of at our mapped external NAT port.
+
+mDNSlocal mDNSu16 GetLLQEventPort(const mDNS *const m, const mDNSAddr *const dst)
+{
+    mDNSAddr src;
+    mDNSPlatformSourceAddrForDest(&src, dst);
+    //LogMsg("GetLLQEventPort: src %#a for dst %#a (%d)", &src, dst, mDNSv4AddrIsRFC1918(&src.ip.v4) ? mDNSVal16(m->LLQNAT.ExternalPort) : 0);
+    return(mDNSv4AddrIsRFC1918(&src.ip.v4) ? mDNSVal16(m->LLQNAT.ExternalPort) : mDNSVal16(MulticastDNSPort));
+}
+
+// Normally called with llq set.
+// May be called with llq NULL, when retransmitting a lost Challenge Response
+mDNSlocal void sendChallengeResponse(mDNS *const m, DNSQuestion *const q, const LLQOptData *llq)
+{
+    mDNSu8 *responsePtr = m->omsg.data;
+    LLQOptData llqBuf;
+
+    if (q->tcp) { LogMsg("sendChallengeResponse: ERROR!!: question %##s (%s) tcp non-NULL", q->qname.c, DNSTypeName(q->qtype)); return; }
+
+    if (PrivateQuery(q)) { LogMsg("sendChallengeResponse: ERROR!!: Private Query %##s (%s)", q->qname.c, DNSTypeName(q->qtype)); return; }
+
+    if (q->ntries++ == kLLQ_MAX_TRIES)
+    {
+        LogMsg("sendChallengeResponse: %d failed attempts for LLQ %##s", kLLQ_MAX_TRIES, q->qname.c);
+        StartLLQPolling(m,q);
+        return;
+    }
+
+    if (!llq)       // Retransmission: need to make a new LLQOptData
+    {
+        llqBuf.vers     = kLLQ_Vers;
+        llqBuf.llqOp    = kLLQOp_Setup;
+        llqBuf.err      = LLQErr_NoError;   // Don't need to tell server UDP notification port when sending over UDP
+        llqBuf.id       = q->id;
+        llqBuf.llqlease = q->ReqLease;
+        llq = &llqBuf;
+    }
+
+    q->LastQTime     = m->timenow;
+    q->ThisQInterval = q->tcp ? 0 : (kLLQ_INIT_RESEND * q->ntries * mDNSPlatformOneSecond);     // If using TCP, don't need to retransmit
+    SetNextQueryTime(m, q);
+
+    // To simulate loss of challenge response packet, uncomment line below
+    //if (q->ntries == 1) return;
+
+    InitializeDNSMessage(&m->omsg.h, q->TargetQID, uQueryFlags);
+    responsePtr = putLLQ(&m->omsg, responsePtr, q, llq);
+    if (responsePtr)
+    {
+        mStatus err = mDNSSendDNSMessage(m, &m->omsg, responsePtr, mDNSInterface_Any, q->LocalSocket, &q->servAddr, q->servPort, mDNSNULL, mDNSNULL, mDNSfalse);
+        if (err) { LogMsg("sendChallengeResponse: mDNSSendDNSMessage%s failed: %d", q->tcp ? " (TCP)" : "", err); }
+    }
+    else StartLLQPolling(m,q);
+}
+
+mDNSlocal void SetLLQTimer(mDNS *const m, DNSQuestion *const q, const LLQOptData *const llq)
+{
+    mDNSs32 lease = (mDNSs32)llq->llqlease * mDNSPlatformOneSecond;
+    q->ReqLease      = llq->llqlease;
+    q->LastQTime     = m->timenow;
+    q->expire        = m->timenow + lease;
+    q->ThisQInterval = lease/2 + mDNSRandom(lease/10);
+    debugf("SetLLQTimer setting %##s (%s) to %d %d", q->qname.c, DNSTypeName(q->qtype), lease/mDNSPlatformOneSecond, q->ThisQInterval/mDNSPlatformOneSecond);
+    SetNextQueryTime(m, q);
+}
+
+mDNSlocal void recvSetupResponse(mDNS *const m, mDNSu8 rcode, DNSQuestion *const q, const LLQOptData *const llq)
+{
+    if (rcode && rcode != kDNSFlag1_RC_NXDomain)
+    { LogMsg("ERROR: recvSetupResponse %##s (%s) - rcode && rcode != kDNSFlag1_RC_NXDomain", q->qname.c, DNSTypeName(q->qtype)); return; }
+
+    if (llq->llqOp != kLLQOp_Setup)
+    { LogMsg("ERROR: recvSetupResponse %##s (%s) - bad op %d", q->qname.c, DNSTypeName(q->qtype), llq->llqOp); return; }
+
+    if (llq->vers != kLLQ_Vers)
+    { LogMsg("ERROR: recvSetupResponse %##s (%s) - bad vers %d", q->qname.c, DNSTypeName(q->qtype), llq->vers); return; }
+
+    if (q->state == LLQ_InitialRequest)
+    {
+        //LogInfo("Got LLQ_InitialRequest");
+
+        if (llq->err) { LogMsg("recvSetupResponse - received llq->err %d from server", llq->err); StartLLQPolling(m,q); return; }
+
+        if (q->ReqLease != llq->llqlease)
+            debugf("recvSetupResponse: requested lease %lu, granted lease %lu", q->ReqLease, llq->llqlease);
+
+        // cache expiration in case we go to sleep before finishing setup
+        q->ReqLease = llq->llqlease;
+        q->expire = m->timenow + ((mDNSs32)llq->llqlease * mDNSPlatformOneSecond);
+
+        // update state
+        q->state  = LLQ_SecondaryRequest;
+        q->id     = llq->id;
+        q->ntries = 0; // first attempt to send response
+        sendChallengeResponse(m, q, llq);
+    }
+    else if (q->state == LLQ_SecondaryRequest)
+    {
+        //LogInfo("Got LLQ_SecondaryRequest");
+
+        // Fix this immediately if not sooner.  Copy the id from the LLQOptData into our DNSQuestion struct.  This is only
+        // an issue for private LLQs, because we skip parts 2 and 3 of the handshake.  This is related to a bigger
+        // problem of the current implementation of TCP LLQ setup: we're not handling state transitions correctly
+        // if the server sends back SERVFULL or STATIC.
+        if (PrivateQuery(q))
+        {
+            LogInfo("Private LLQ_SecondaryRequest; copying id %08X%08X", llq->id.l[0], llq->id.l[1]);
+            q->id = llq->id;
+        }
+
+        if (llq->err) { LogMsg("ERROR: recvSetupResponse %##s (%s) code %d from server", q->qname.c, DNSTypeName(q->qtype), llq->err); StartLLQPolling(m,q); return; }
+        if (!mDNSSameOpaque64(&q->id, &llq->id))
+        { LogMsg("recvSetupResponse - ID changed.  discarding"); return; }     // this can happen rarely (on packet loss + reordering)
+        q->state         = LLQ_Established;
+        q->ntries        = 0;
+        SetLLQTimer(m, q, llq);
+#if APPLE_OSX_mDNSResponder
+        UpdateAutoTunnelDomainStatuses(m);
+#endif
+    }
+}
+
+mDNSexport uDNS_LLQType uDNS_recvLLQResponse(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end,
+                                             const mDNSAddr *const srcaddr, const mDNSIPPort srcport, DNSQuestion **matchQuestion)
+{
+    DNSQuestion pktQ, *q;
+    if (msg->h.numQuestions && getQuestion(msg, msg->data, end, 0, &pktQ))
+    {
+        const rdataOPT *opt = GetLLQOptData(m, msg, end);
+
+        for (q = m->Questions; q; q = q->next)
+        {
+            if (!mDNSOpaque16IsZero(q->TargetQID) && q->LongLived && q->qtype == pktQ.qtype && q->qnamehash == pktQ.qnamehash && SameDomainName(&q->qname, &pktQ.qname))
+            {
+                debugf("uDNS_recvLLQResponse found %##s (%s) %d %#a %#a %X %X %X %X %d",
+                       q->qname.c, DNSTypeName(q->qtype), q->state, srcaddr, &q->servAddr,
+                       opt ? opt->u.llq.id.l[0] : 0, opt ? opt->u.llq.id.l[1] : 0, q->id.l[0], q->id.l[1], opt ? opt->u.llq.llqOp : 0);
+                if (q->state == LLQ_Poll) debugf("uDNS_LLQ_Events: q->state == LLQ_Poll msg->h.id %d q->TargetQID %d", mDNSVal16(msg->h.id), mDNSVal16(q->TargetQID));
+                if (q->state == LLQ_Poll && mDNSSameOpaque16(msg->h.id, q->TargetQID))
+                {
+                    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+
+                    // Don't reset the state to IntialRequest as we may write that to the dynamic store
+                    // and PrefPane might wrongly think that we are "Starting" instead of "Polling". If
+                    // we are in polling state because of PCP/NAT-PMP disabled or DoubleNAT, next LLQNATCallback
+                    // would kick us back to LLQInitialRequest. So, resetting the state here may not be useful.
+                    //
+                    // If we have a good NAT (neither PCP/NAT-PMP disabled nor Double-NAT), then we should not be
+                    // possibly in polling state. To be safe, we want to retry from the start in that case
+                    // as there may not be another LLQNATCallback
+                    //
+                    // NOTE: We can be in polling state if we cannot resolve the SOA record i.e, servAddr is set to
+                    // all ones. In that case, we would set it in LLQ_InitialRequest as it overrides the PCP/NAT-PMP or
+                    // Double-NAT state.
+                    if (!mDNSAddressIsOnes(&q->servAddr) && !mDNSIPPortIsZero(m->LLQNAT.ExternalPort) &&
+                        !m->LLQNAT.Result)
+                    {
+                        debugf("uDNS_recvLLQResponse got poll response; moving to LLQ_InitialRequest for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                        q->state         = LLQ_InitialRequest;
+                    }
+                    q->servPort      = zeroIPPort;      // Clear servPort so that startLLQHandshake will retry the GetZoneData processing
+                    q->ThisQInterval = LLQ_POLL_INTERVAL + mDNSRandom(LLQ_POLL_INTERVAL/10);    // Retry LLQ setup in approx 15 minutes
+                    q->LastQTime     = m->timenow;
+                    SetNextQueryTime(m, q);
+                    *matchQuestion = q;
+                    return uDNS_LLQ_Entire;     // uDNS_LLQ_Entire means flush stale records; assume a large effective TTL
+                }
+                // Note: In LLQ Event packets, the msg->h.id does not match our q->TargetQID, because in that case the msg->h.id nonce is selected by the server
+                else if (opt && q->state == LLQ_Established && opt->u.llq.llqOp == kLLQOp_Event && mDNSSameOpaque64(&opt->u.llq.id, &q->id))
+                {
+                    mDNSu8 *ackEnd;
+                    //debugf("Sending LLQ ack for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                    InitializeDNSMessage(&m->omsg.h, msg->h.id, ResponseFlags);
+                    ackEnd = putLLQ(&m->omsg, m->omsg.data, q, &opt->u.llq);
+                    if (ackEnd) mDNSSendDNSMessage(m, &m->omsg, ackEnd, mDNSInterface_Any, q->LocalSocket, srcaddr, srcport, mDNSNULL, mDNSNULL, mDNSfalse);
+                    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+                    debugf("uDNS_LLQ_Events: q->state == LLQ_Established msg->h.id %d q->TargetQID %d", mDNSVal16(msg->h.id), mDNSVal16(q->TargetQID));
+                    *matchQuestion = q;
+                    return uDNS_LLQ_Events;
+                }
+                if (opt && mDNSSameOpaque16(msg->h.id, q->TargetQID))
+                {
+                    if (q->state == LLQ_Established && opt->u.llq.llqOp == kLLQOp_Refresh && mDNSSameOpaque64(&opt->u.llq.id, &q->id) && msg->h.numAdditionals && !msg->h.numAnswers)
+                    {
+                        if (opt->u.llq.err != LLQErr_NoError) LogMsg("recvRefreshReply: received error %d from server", opt->u.llq.err);
+                        else
+                        {
+                            //LogInfo("Received refresh confirmation ntries %d for %##s (%s)", q->ntries, q->qname.c, DNSTypeName(q->qtype));
+                            // If we're waiting to go to sleep, then this LLQ deletion may have been the thing
+                            // we were waiting for, so schedule another check to see if we can sleep now.
+                            if (opt->u.llq.llqlease == 0 && m->SleepLimit) m->NextScheduledSPRetry = m->timenow;
+                            GrantCacheExtensions(m, q, opt->u.llq.llqlease);
+                            SetLLQTimer(m, q, &opt->u.llq);
+                            q->ntries = 0;
+                        }
+                        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+                        *matchQuestion = q;
+                        return uDNS_LLQ_Ignore;
+                    }
+                    if (q->state < LLQ_Established && mDNSSameAddress(srcaddr, &q->servAddr))
+                    {
+                        LLQ_State oldstate = q->state;
+                        recvSetupResponse(m, msg->h.flags.b[1] & kDNSFlag1_RC_Mask, q, &opt->u.llq);
+                        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+                        // We have a protocol anomaly here in the LLQ definition.
+                        // Both the challenge packet from the server and the ack+answers packet have opt->u.llq.llqOp == kLLQOp_Setup.
+                        // However, we need to treat them differently:
+                        // The challenge packet has no answers in it, and tells us nothing about whether our cache entries
+                        // are still valid, so this packet should not cause us to do anything that messes with our cache.
+                        // The ack+answers packet gives us the whole truth, so we should handle it by updating our cache
+                        // to match the answers in the packet, and only the answers in the packet.
+                        *matchQuestion = q;
+                        return (oldstate == LLQ_SecondaryRequest ? uDNS_LLQ_Entire : uDNS_LLQ_Ignore);
+                    }
+                }
+            }
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+    *matchQuestion = mDNSNULL;
+    return uDNS_LLQ_Not;
+}
+
+// Stub definition of TCPSocket_struct so we can access flags field. (Rest of TCPSocket_struct is platform-dependent.)
+struct TCPSocket_struct { TCPSocketFlags flags; /* ... */ };
+
+// tcpCallback is called to handle events (e.g. connection opening and data reception) on TCP connections for
+// Private DNS operations -- private queries, private LLQs, private record updates and private service updates
+mDNSlocal void tcpCallback(TCPSocket *sock, void *context, mDNSBool ConnectionEstablished, mStatus err)
+{
+    tcpInfo_t *tcpInfo = (tcpInfo_t *)context;
+    mDNSBool closed  = mDNSfalse;
+    mDNS      *m       = tcpInfo->m;
+    DNSQuestion *const q = tcpInfo->question;
+    tcpInfo_t **backpointer =
+        q                 ? &q->tcp :
+        tcpInfo->rr       ? &tcpInfo->rr->tcp : mDNSNULL;
+    if (backpointer && *backpointer != tcpInfo)
+        LogMsg("tcpCallback: %d backpointer %p incorrect tcpInfo %p question %p rr %p",
+               mDNSPlatformTCPGetFD(tcpInfo->sock), *backpointer, tcpInfo, q, tcpInfo->rr);
+
+    if (err) goto exit;
+
+    if (ConnectionEstablished)
+    {
+        mDNSu8    *end = ((mDNSu8*) &tcpInfo->request) + tcpInfo->requestLen;
+        DomainAuthInfo *AuthInfo;
+
+        // Defensive coding for <rdar://problem/5546824> Crash in mDNSResponder at GetAuthInfoForName_internal + 366
+        // Don't know yet what's causing this, but at least we can be cautious and try to avoid crashing if we find our pointers in an unexpected state
+        if (tcpInfo->rr && tcpInfo->rr->resrec.name != &tcpInfo->rr->namestorage)
+            LogMsg("tcpCallback: ERROR: tcpInfo->rr->resrec.name %p != &tcpInfo->rr->namestorage %p",
+                   tcpInfo->rr->resrec.name, &tcpInfo->rr->namestorage);
+        if (tcpInfo->rr  && tcpInfo->rr->resrec.name != &tcpInfo->rr->namestorage) return;
+
+        AuthInfo =  tcpInfo->rr  ? GetAuthInfoForName(m, tcpInfo->rr->resrec.name)         : mDNSNULL;
+
+        // connection is established - send the message
+        if (q && q->LongLived && q->state == LLQ_Established)
+        {
+            // Lease renewal over TCP, resulting from opening a TCP connection in sendLLQRefresh
+            end = ((mDNSu8*) &tcpInfo->request) + tcpInfo->requestLen;
+        }
+        else if (q && q->LongLived && q->state != LLQ_Poll && !mDNSIPPortIsZero(m->LLQNAT.ExternalPort) && !mDNSIPPortIsZero(q->servPort))
+        {
+            // Notes:
+            // If we have a NAT port mapping, ExternalPort is the external port
+            // If we have a routable address so we don't need a port mapping, ExternalPort is the same as our own internal port
+            // If we need a NAT port mapping but can't get one, then ExternalPort is zero
+            LLQOptData llqData;         // set llq rdata
+            llqData.vers  = kLLQ_Vers;
+            llqData.llqOp = kLLQOp_Setup;
+            llqData.err   = GetLLQEventPort(m, &tcpInfo->Addr); // We're using TCP; tell server what UDP port to send notifications to
+            LogInfo("tcpCallback: eventPort %d", llqData.err);
+            llqData.id    = zeroOpaque64;
+            llqData.llqlease = kLLQ_DefLease;
+            InitializeDNSMessage(&tcpInfo->request.h, q->TargetQID, uQueryFlags);
+            end = putLLQ(&tcpInfo->request, tcpInfo->request.data, q, &llqData);
+            if (!end) { LogMsg("ERROR: tcpCallback - putLLQ"); err = mStatus_UnknownErr; goto exit; }
+            AuthInfo = q->AuthInfo;     // Need to add TSIG to this message
+            q->ntries = 0; // Reset ntries so that tcp/tls connection failures don't affect sendChallengeResponse failures
+        }
+        else if (q)
+        {
+            // LLQ Polling mode or non-LLQ uDNS over TCP
+            InitializeDNSMessage(&tcpInfo->request.h, q->TargetQID, (DNSSECQuestion(q) ? DNSSecQFlags : uQueryFlags));
+            end = putQuestion(&tcpInfo->request, tcpInfo->request.data, tcpInfo->request.data + AbsoluteMaxDNSMessageData, &q->qname, q->qtype, q->qclass);
+            if (DNSSECQuestion(q) && q->qDNSServer && !q->qDNSServer->cellIntf)
+            {
+                if (q->ProxyQuestion)
+                    end = DNSProxySetAttributes(q, &tcpInfo->request.h, &tcpInfo->request, end, tcpInfo->request.data + AbsoluteMaxDNSMessageData);
+                else
+                    end = putDNSSECOption(&tcpInfo->request, end, tcpInfo->request.data + AbsoluteMaxDNSMessageData);
+            }
+
+            AuthInfo = q->AuthInfo;     // Need to add TSIG to this message
+        }
+
+        err = mDNSSendDNSMessage(m, &tcpInfo->request, end, mDNSInterface_Any, mDNSNULL, &tcpInfo->Addr, tcpInfo->Port, sock, AuthInfo, mDNSfalse);
+        if (err) { debugf("ERROR: tcpCallback: mDNSSendDNSMessage - %d", err); err = mStatus_UnknownErr; goto exit; }
+
+        // Record time we sent this question
+        if (q)
+        {
+            mDNS_Lock(m);
+            q->LastQTime = m->timenow;
+            if (q->ThisQInterval < (256 * mDNSPlatformOneSecond))   // Now we have a TCP connection open, make sure we wait at least 256 seconds before retrying
+                q->ThisQInterval = (256 * mDNSPlatformOneSecond);
+            SetNextQueryTime(m, q);
+            mDNS_Unlock(m);
+        }
+    }
+    else
+    {
+        long n;
+        if (tcpInfo->nread < 2)         // First read the two-byte length preceeding the DNS message
+        {
+            mDNSu8 *lenptr = (mDNSu8 *)&tcpInfo->replylen;
+            n = mDNSPlatformReadTCP(sock, lenptr + tcpInfo->nread, 2 - tcpInfo->nread, &closed);
+            if (n < 0)
+            {
+                LogMsg("ERROR: tcpCallback - attempt to read message length failed (%d)", n);
+                err = mStatus_ConnFailed;
+                goto exit;
+            }
+            else if (closed)
+            {
+                // It's perfectly fine for this socket to close after the first reply. The server might
+                // be sending gratuitous replies using UDP and doesn't have a need to leave the TCP socket open.
+                // We'll only log this event if we've never received a reply before.
+                // BIND 9 appears to close an idle connection after 30 seconds.
+                if (tcpInfo->numReplies == 0)
+                {
+                    LogMsg("ERROR: socket closed prematurely tcpInfo->nread = %d", tcpInfo->nread);
+                    err = mStatus_ConnFailed;
+                    goto exit;
+                }
+                else
+                {
+                    // Note that we may not be doing the best thing if an error occurs after we've sent a second request
+                    // over this tcp connection.  That is, we only track whether we've received at least one response
+                    // which may have been to a previous request sent over this tcp connection.
+                    if (backpointer) *backpointer = mDNSNULL; // Clear client backpointer FIRST so we don't risk double-disposing our tcpInfo_t
+                    DisposeTCPConn(tcpInfo);
+                    return;
+                }
+            }
+
+            tcpInfo->nread += n;
+            if (tcpInfo->nread < 2) goto exit;
+
+            tcpInfo->replylen = (mDNSu16)((mDNSu16)lenptr[0] << 8 | lenptr[1]);
+            if (tcpInfo->replylen < sizeof(DNSMessageHeader))
+            { LogMsg("ERROR: tcpCallback - length too short (%d bytes)", tcpInfo->replylen); err = mStatus_UnknownErr; goto exit; }
+
+            tcpInfo->reply = mDNSPlatformMemAllocate(tcpInfo->replylen);
+            if (!tcpInfo->reply) { LogMsg("ERROR: tcpCallback - malloc failed"); err = mStatus_NoMemoryErr; goto exit; }
+        }
+
+        n = mDNSPlatformReadTCP(sock, ((char *)tcpInfo->reply) + (tcpInfo->nread - 2), tcpInfo->replylen - (tcpInfo->nread - 2), &closed);
+
+        if (n < 0)
+        {
+            LogMsg("ERROR: tcpCallback - read returned %d", n);
+            err = mStatus_ConnFailed;
+            goto exit;
+        }
+        else if (closed)
+        {
+            if (tcpInfo->numReplies == 0)
+            {
+                LogMsg("ERROR: socket closed prematurely tcpInfo->nread = %d", tcpInfo->nread);
+                err = mStatus_ConnFailed;
+                goto exit;
+            }
+            else
+            {
+                // Note that we may not be doing the best thing if an error occurs after we've sent a second request
+                // over this tcp connection.  That is, we only track whether we've received at least one response
+                // which may have been to a previous request sent over this tcp connection.
+                if (backpointer) *backpointer = mDNSNULL; // Clear client backpointer FIRST so we don't risk double-disposing our tcpInfo_t
+                DisposeTCPConn(tcpInfo);
+                return;
+            }
+        }
+
+        tcpInfo->nread += n;
+
+        if ((tcpInfo->nread - 2) == tcpInfo->replylen)
+        {
+            mDNSBool tls;
+            DNSMessage *reply = tcpInfo->reply;
+            mDNSu8     *end   = (mDNSu8 *)tcpInfo->reply + tcpInfo->replylen;
+            mDNSAddr Addr  = tcpInfo->Addr;
+            mDNSIPPort Port  = tcpInfo->Port;
+            mDNSIPPort srcPort = zeroIPPort;
+            tcpInfo->numReplies++;
+            tcpInfo->reply    = mDNSNULL;   // Detach reply buffer from tcpInfo_t, to make sure client callback can't cause it to be disposed
+            tcpInfo->nread    = 0;
+            tcpInfo->replylen = 0;
+
+            // If we're going to dispose this connection, do it FIRST, before calling client callback
+            // Note: Sleep code depends on us clearing *backpointer here -- it uses the clearing of rr->tcp
+            // as the signal that the DNS deregistration operation with the server has completed, and the machine may now sleep
+            // If we clear the tcp pointer in the question, mDNSCoreReceiveResponse cannot find a matching question. Hence
+            // we store the minimal information i.e., the source port of the connection in the question itself.
+            // Dereference sock before it is disposed in DisposeTCPConn below.
+
+            if (sock->flags & kTCPSocketFlags_UseTLS) tls = mDNStrue;
+            else tls = mDNSfalse;
+
+            if (q && q->tcp) {srcPort = q->tcp->SrcPort; q->tcpSrcPort = srcPort;}
+
+            if (backpointer)
+                if (!q || !q->LongLived || m->SleepState)
+                { *backpointer = mDNSNULL; DisposeTCPConn(tcpInfo); }
+
+            mDNSCoreReceive(m, reply, end, &Addr, Port, tls ? (mDNSAddr *)1 : mDNSNULL, srcPort, 0);
+            // USE CAUTION HERE: Invoking mDNSCoreReceive may have caused the environment to change, including canceling this operation itself
+
+            mDNSPlatformMemFree(reply);
+            return;
+        }
+    }
+
+exit:
+
+    if (err)
+    {
+        // Clear client backpointer FIRST -- that way if one of the callbacks cancels its operation
+        // we won't end up double-disposing our tcpInfo_t
+        if (backpointer) *backpointer = mDNSNULL;
+
+        mDNS_Lock(m);       // Need to grab the lock to get m->timenow
+
+        if (q)
+        {
+            if (q->ThisQInterval == 0)
+            {
+                // We get here when we fail to establish a new TCP/TLS connection that would have been used for a new LLQ request or an LLQ renewal.
+                // Note that ThisQInterval is also zero when sendChallengeResponse resends the LLQ request on an extant TCP/TLS connection.
+                q->LastQTime = m->timenow;
+                if (q->LongLived)
+                {
+                    // We didn't get the chance to send our request packet before the TCP/TLS connection failed.
+                    // We want to retry quickly, but want to back off exponentially in case the server is having issues.
+                    // Since ThisQInterval was 0, we can't just multiply by QuestionIntervalStep, we must track the number
+                    // of TCP/TLS connection failures using ntries.
+                    mDNSu32 count = q->ntries + 1; // want to wait at least 1 second before retrying
+
+                    q->ThisQInterval = InitialQuestionInterval;
+
+                    for (; count; count--)
+                        q->ThisQInterval *= QuestionIntervalStep;
+
+                    if (q->ThisQInterval > LLQ_POLL_INTERVAL)
+                        q->ThisQInterval = LLQ_POLL_INTERVAL;
+                    else
+                        q->ntries++;
+
+                    LogMsg("tcpCallback: stream connection for LLQ %##s (%s) failed %d times, retrying in %d ms", q->qname.c, DNSTypeName(q->qtype), q->ntries, q->ThisQInterval);
+                }
+                else
+                {
+                    q->ThisQInterval = MAX_UCAST_POLL_INTERVAL;
+                    LogMsg("tcpCallback: stream connection for %##s (%s) failed, retrying in %d ms", q->qname.c, DNSTypeName(q->qtype), q->ThisQInterval);
+                }
+                SetNextQueryTime(m, q);
+            }
+            else if (NextQSendTime(q) - m->timenow > (q->LongLived ? LLQ_POLL_INTERVAL : MAX_UCAST_POLL_INTERVAL))
+            {
+                // If we get an error and our next scheduled query for this question is more than the max interval from now,
+                // reset the next query to ensure we wait no longer the maximum interval from now before trying again.
+                q->LastQTime     = m->timenow;
+                q->ThisQInterval = q->LongLived ? LLQ_POLL_INTERVAL : MAX_UCAST_POLL_INTERVAL;
+                SetNextQueryTime(m, q);
+                LogMsg("tcpCallback: stream connection for %##s (%s) failed, retrying in %d ms", q->qname.c, DNSTypeName(q->qtype), q->ThisQInterval);
+            }
+
+            // We're about to dispose of the TCP connection, so we must reset the state to retry over TCP/TLS
+            // because sendChallengeResponse will send the query via UDP if we don't have a tcp pointer.
+            // Resetting to LLQ_InitialRequest will cause uDNS_CheckCurrentQuestion to call startLLQHandshake, which
+            // will attempt to establish a new tcp connection.
+            if (q->LongLived && q->state == LLQ_SecondaryRequest)
+                q->state = LLQ_InitialRequest;
+
+            // ConnFailed may happen if the server sends a TCP reset or TLS fails, in which case we want to retry establishing the LLQ
+            // quickly rather than switching to polling mode.  This case is handled by the above code to set q->ThisQInterval just above.
+            // If the error isn't ConnFailed, then the LLQ is in bad shape, so we switch to polling mode.
+            if (err != mStatus_ConnFailed)
+            {
+                if (q->LongLived && q->state != LLQ_Poll) StartLLQPolling(m, q);
+            }
+        }
+
+        mDNS_Unlock(m);
+
+        DisposeTCPConn(tcpInfo);
+    }
+}
+
+mDNSlocal tcpInfo_t *MakeTCPConn(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end,
+                                 TCPSocketFlags flags, const mDNSAddr *const Addr, const mDNSIPPort Port, domainname *hostname,
+                                 DNSQuestion *const question, AuthRecord *const rr)
+{
+    mStatus err;
+    mDNSIPPort srcport = zeroIPPort;
+    tcpInfo_t *info;
+    mDNSBool useBackgroundTrafficClass;
+
+    useBackgroundTrafficClass = question ? question->UseBackgroundTrafficClass : mDNSfalse;
+
+    if ((flags & kTCPSocketFlags_UseTLS) && (!hostname || !hostname->c[0]))
+    { LogMsg("MakeTCPConn: TLS connection being setup with NULL hostname"); return mDNSNULL; }
+
+    info = (tcpInfo_t *)mDNSPlatformMemAllocate(sizeof(tcpInfo_t));
+    if (!info) { LogMsg("ERROR: MakeTCP - memallocate failed"); return(mDNSNULL); }
+    mDNSPlatformMemZero(info, sizeof(tcpInfo_t));
+
+    info->m          = m;
+    info->sock       = mDNSPlatformTCPSocket(m, flags, &srcport, useBackgroundTrafficClass);
+    info->requestLen = 0;
+    info->question   = question;
+    info->rr         = rr;
+    info->Addr       = *Addr;
+    info->Port       = Port;
+    info->reply      = mDNSNULL;
+    info->replylen   = 0;
+    info->nread      = 0;
+    info->numReplies = 0;
+    info->SrcPort = srcport;
+
+    if (msg)
+    {
+        info->requestLen = (int) (end - ((mDNSu8*)msg));
+        mDNSPlatformMemCopy(&info->request, msg, info->requestLen);
+    }
+
+    if (!info->sock) { LogMsg("MakeTCPConn: unable to create TCP socket"); mDNSPlatformMemFree(info); return(mDNSNULL); }
+    err = mDNSPlatformTCPConnect(info->sock, Addr, Port, hostname, (question ? question->InterfaceID : mDNSNULL), tcpCallback, info);
+
+    // Probably suboptimal here.
+    // Instead of returning mDNSNULL here on failure, we should probably invoke the callback with an error code.
+    // That way clients can put all the error handling and retry/recovery code in one place,
+    // instead of having to handle immediate errors in one place and async errors in another.
+    // Also: "err == mStatus_ConnEstablished" probably never happens.
+
+    // Don't need to log "connection failed" in customer builds -- it happens quite often during sleep, wake, configuration changes, etc.
+    if      (err == mStatus_ConnEstablished) { tcpCallback(info->sock, info, mDNStrue, mStatus_NoError); }
+    else if (err != mStatus_ConnPending    ) { LogInfo("MakeTCPConn: connection failed"); DisposeTCPConn(info); return(mDNSNULL); }
+    return(info);
+}
+
+mDNSexport void DisposeTCPConn(struct tcpInfo_t *tcp)
+{
+    mDNSPlatformTCPCloseConnection(tcp->sock);
+    if (tcp->reply) mDNSPlatformMemFree(tcp->reply);
+    mDNSPlatformMemFree(tcp);
+}
+
+// Lock must be held
+mDNSexport void startLLQHandshake(mDNS *m, DNSQuestion *q)
+{
+    if (m->LLQNAT.clientContext != mDNSNULL) // LLQNAT just started, give it some time
+    {
+        LogInfo("startLLQHandshake: waiting for NAT status for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        q->ThisQInterval = LLQ_POLL_INTERVAL + mDNSRandom(LLQ_POLL_INTERVAL/10);    // Retry in approx 15 minutes
+        q->LastQTime = m->timenow;
+        SetNextQueryTime(m, q);
+        return;
+    }
+
+    // Either we don't have {PCP, NAT-PMP, UPnP/IGD} support (ExternalPort is zero) or behind a Double NAT that may or
+    // may not have {PCP, NAT-PMP, UPnP/IGD} support (NATResult is non-zero)
+    if (mDNSIPPortIsZero(m->LLQNAT.ExternalPort) || m->LLQNAT.Result)
+    {
+        LogInfo("startLLQHandshake: Cannot receive inbound packets; will poll for %##s (%s) External Port %d, NAT Result %d",
+                q->qname.c, DNSTypeName(q->qtype), mDNSVal16(m->LLQNAT.ExternalPort), m->LLQNAT.Result);
+        StartLLQPolling(m, q);
+        return;
+    }
+
+    if (mDNSIPPortIsZero(q->servPort))
+    {
+        debugf("startLLQHandshake: StartGetZoneData for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        q->ThisQInterval = LLQ_POLL_INTERVAL + mDNSRandom(LLQ_POLL_INTERVAL/10);    // Retry in approx 15 minutes
+        q->LastQTime     = m->timenow;
+        SetNextQueryTime(m, q);
+        q->servAddr = zeroAddr;
+        // We know q->servPort is zero because of check above
+        if (q->nta) CancelGetZoneData(m, q->nta);
+        q->nta = StartGetZoneData(m, &q->qname, ZoneServiceLLQ, LLQGotZoneData, q);
+        return;
+    }
+
+    if (PrivateQuery(q))
+    {
+        if (q->tcp) LogInfo("startLLQHandshake: Disposing existing TCP connection for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        if (q->tcp) { DisposeTCPConn(q->tcp); q->tcp = mDNSNULL; }
+        if (!q->nta)
+        {
+            // Normally we lookup the zone data and then call this function. And we never free the zone data
+            // for "PrivateQuery". But sometimes this can happen due to some race conditions. When we
+            // switch networks, we might end up "Polling" the network e.g., we are behind a Double NAT.
+            // When we poll, we free the zone information as we send the query to the server (See
+            // PrivateQueryGotZoneData). The NAT callback (LLQNATCallback) may happen soon after that. If we
+            // are still behind Double NAT, we would have returned early in this function. But we could
+            // have switched to a network with no NATs and we should get the zone data again.
+            LogInfo("startLLQHandshake: nta is NULL for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+            q->nta = StartGetZoneData(m, &q->qname, ZoneServiceLLQ, LLQGotZoneData, q);
+            return;
+        }
+        else if (!q->nta->Host.c[0])
+        {
+            // This should not happen. If it happens, we print a log and MakeTCPConn will fail if it can't find a hostname
+            LogMsg("startLLQHandshake: ERROR!!: nta non NULL for %##s (%s) but HostName %d NULL, LongLived %d", q->qname.c, DNSTypeName(q->qtype), q->nta->Host.c[0], q->LongLived);
+        }
+        q->tcp = MakeTCPConn(m, mDNSNULL, mDNSNULL, kTCPSocketFlags_UseTLS, &q->servAddr, q->servPort, &q->nta->Host, q, mDNSNULL);
+        if (!q->tcp)
+            q->ThisQInterval = mDNSPlatformOneSecond * 5;   // If TCP failed (transient networking glitch) try again in five seconds
+        else
+        {
+            q->state         = LLQ_SecondaryRequest;        // Right now, for private DNS, we skip the four-way LLQ handshake
+            q->ReqLease      = kLLQ_DefLease;
+            q->ThisQInterval = 0;
+        }
+        q->LastQTime     = m->timenow;
+        SetNextQueryTime(m, q);
+    }
+    else
+    {
+        debugf("startLLQHandshake: m->AdvertisedV4 %#a%s Server %#a:%d%s %##s (%s)",
+               &m->AdvertisedV4,                     mDNSv4AddrIsRFC1918(&m->AdvertisedV4.ip.v4) ? " (RFC 1918)" : "",
+               &q->servAddr, mDNSVal16(q->servPort), mDNSAddrIsRFC1918(&q->servAddr)             ? " (RFC 1918)" : "",
+               q->qname.c, DNSTypeName(q->qtype));
+
+        if (q->ntries++ >= kLLQ_MAX_TRIES)
+        {
+            LogMsg("startLLQHandshake: %d failed attempts for LLQ %##s Polling.", kLLQ_MAX_TRIES, q->qname.c);
+            StartLLQPolling(m, q);
+        }
+        else
+        {
+            mDNSu8 *end;
+            LLQOptData llqData;
+
+            // set llq rdata
+            llqData.vers  = kLLQ_Vers;
+            llqData.llqOp = kLLQOp_Setup;
+            llqData.err   = LLQErr_NoError; // Don't need to tell server UDP notification port when sending over UDP
+            llqData.id    = zeroOpaque64;
+            llqData.llqlease = kLLQ_DefLease;
+
+            InitializeDNSMessage(&m->omsg.h, q->TargetQID, uQueryFlags);
+            end = putLLQ(&m->omsg, m->omsg.data, q, &llqData);
+            if (!end) { LogMsg("ERROR: startLLQHandshake - putLLQ"); StartLLQPolling(m,q); return; }
+
+            mDNSSendDNSMessage(m, &m->omsg, end, mDNSInterface_Any, q->LocalSocket, &q->servAddr, q->servPort, mDNSNULL, mDNSNULL, mDNSfalse);
+
+            // update question state
+            q->state         = LLQ_InitialRequest;
+            q->ReqLease      = kLLQ_DefLease;
+            q->ThisQInterval = (kLLQ_INIT_RESEND * mDNSPlatformOneSecond);
+            q->LastQTime     = m->timenow;
+            SetNextQueryTime(m, q);
+        }
+    }
+}
+
+// forward declaration so GetServiceTarget can do reverse lookup if needed
+mDNSlocal void GetStaticHostname(mDNS *m);
+
+mDNSexport const domainname *GetServiceTarget(mDNS *m, AuthRecord *const rr)
+{
+    debugf("GetServiceTarget %##s", rr->resrec.name->c);
+
+    if (!rr->AutoTarget)        // If not automatically tracking this host's current name, just return the existing target
+        return(&rr->resrec.rdata->u.srv.target);
+    else
+    {
+#if APPLE_OSX_mDNSResponder
+        DomainAuthInfo *AuthInfo = GetAuthInfoForName_internal(m, rr->resrec.name);
+        if (AuthInfo && AuthInfo->AutoTunnel)
+        {
+            StartServerTunnel(m, AuthInfo);
+            if (AuthInfo->AutoTunnelHostRecord.namestorage.c[0] == 0) return(mDNSNULL);
+            debugf("GetServiceTarget: Returning %##s", AuthInfo->AutoTunnelHostRecord.namestorage.c);
+            return(&AuthInfo->AutoTunnelHostRecord.namestorage);
+        }
+        else
+#endif // APPLE_OSX_mDNSResponder
+        {
+            const int srvcount = CountLabels(rr->resrec.name);
+            HostnameInfo *besthi = mDNSNULL, *hi;
+            int best = 0;
+            for (hi = m->Hostnames; hi; hi = hi->next)
+                if (hi->arv4.state == regState_Registered || hi->arv4.state == regState_Refresh ||
+                    hi->arv6.state == regState_Registered || hi->arv6.state == regState_Refresh)
+                {
+                    int x, hostcount = CountLabels(&hi->fqdn);
+                    for (x = hostcount < srvcount ? hostcount : srvcount; x > 0 && x > best; x--)
+                        if (SameDomainName(SkipLeadingLabels(rr->resrec.name, srvcount - x), SkipLeadingLabels(&hi->fqdn, hostcount - x)))
+                        { best = x; besthi = hi; }
+                }
+
+            if (besthi) return(&besthi->fqdn);
+        }
+        if (m->StaticHostname.c[0]) return(&m->StaticHostname);
+        else GetStaticHostname(m); // asynchronously do reverse lookup for primary IPv4 address
+        LogInfo("GetServiceTarget: Returning NULL for %s", ARDisplayString(m, rr));
+        return(mDNSNULL);
+    }
+}
+
+mDNSlocal const domainname *PUBLIC_UPDATE_SERVICE_TYPE  = (const domainname*)"\x0B_dns-update"     "\x04_udp";
+mDNSlocal const domainname *PUBLIC_LLQ_SERVICE_TYPE     = (const domainname*)"\x08_dns-llq"        "\x04_udp";
+
+mDNSlocal const domainname *PRIVATE_UPDATE_SERVICE_TYPE = (const domainname*)"\x0F_dns-update-tls" "\x04_tcp";
+mDNSlocal const domainname *PRIVATE_QUERY_SERVICE_TYPE  = (const domainname*)"\x0E_dns-query-tls"  "\x04_tcp";
+mDNSlocal const domainname *PRIVATE_LLQ_SERVICE_TYPE    = (const domainname*)"\x0C_dns-llq-tls"    "\x04_tcp";
+
+#define ZoneDataSRV(X) ( \
+        (X)->ZoneService == ZoneServiceUpdate ? ((X)->ZonePrivate ? PRIVATE_UPDATE_SERVICE_TYPE : PUBLIC_UPDATE_SERVICE_TYPE) : \
+        (X)->ZoneService == ZoneServiceQuery  ? ((X)->ZonePrivate ? PRIVATE_QUERY_SERVICE_TYPE  : (const domainname*)""     ) : \
+        (X)->ZoneService == ZoneServiceLLQ    ? ((X)->ZonePrivate ? PRIVATE_LLQ_SERVICE_TYPE    : PUBLIC_LLQ_SERVICE_TYPE   ) : (const domainname*)"")
+
+// Forward reference: GetZoneData_StartQuery references GetZoneData_QuestionCallback, and
+// GetZoneData_QuestionCallback calls GetZoneData_StartQuery
+mDNSlocal mStatus GetZoneData_StartQuery(mDNS *const m, ZoneData *zd, mDNSu16 qtype);
+
+// GetZoneData_QuestionCallback is called from normal client callback context (core API calls allowed)
+mDNSlocal void GetZoneData_QuestionCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    ZoneData *zd = (ZoneData*)question->QuestionContext;
+
+    debugf("GetZoneData_QuestionCallback: %s %s", AddRecord ? "Add" : "Rmv", RRDisplayString(m, answer));
+
+    if (!AddRecord) return;                                             // Don't care about REMOVE events
+    if (AddRecord == QC_addnocache && answer->rdlength == 0) return;    // Don't care about transient failure indications
+    if (answer->rrtype != question->qtype) return;                      // Don't care about CNAMEs
+
+    if (answer->rrtype == kDNSType_SOA)
+    {
+        debugf("GetZoneData GOT SOA %s", RRDisplayString(m, answer));
+        mDNS_StopQuery(m, question);
+        if (question->ThisQInterval != -1)
+            LogMsg("GetZoneData_QuestionCallback: Question %##s (%s) ThisQInterval %d not -1", question->qname.c, DNSTypeName(question->qtype), question->ThisQInterval);
+        if (answer->rdlength)
+        {
+            AssignDomainName(&zd->ZoneName, answer->name);
+            zd->ZoneClass = answer->rrclass;
+            AssignDomainName(&zd->question.qname, &zd->ZoneName);
+            GetZoneData_StartQuery(m, zd, kDNSType_SRV);
+        }
+        else if (zd->CurrentSOA->c[0])
+        {
+            DomainAuthInfo *AuthInfo = GetAuthInfoForName(m, zd->CurrentSOA);
+            if (AuthInfo && AuthInfo->AutoTunnel)
+            {
+                // To keep the load on the server down, we don't chop down on
+                // SOA lookups for AutoTunnels
+                LogInfo("GetZoneData_QuestionCallback: not chopping labels for %##s", zd->CurrentSOA->c);
+                zd->ZoneDataCallback(m, mStatus_NoSuchNameErr, zd);
+            }
+            else
+            {
+                zd->CurrentSOA = (domainname *)(zd->CurrentSOA->c + zd->CurrentSOA->c[0]+1);
+                AssignDomainName(&zd->question.qname, zd->CurrentSOA);
+                GetZoneData_StartQuery(m, zd, kDNSType_SOA);
+            }
+        }
+        else
+        {
+            LogInfo("GetZoneData recursed to root label of %##s without finding SOA", zd->ChildName.c);
+            zd->ZoneDataCallback(m, mStatus_NoSuchNameErr, zd);
+        }
+    }
+    else if (answer->rrtype == kDNSType_SRV)
+    {
+        debugf("GetZoneData GOT SRV %s", RRDisplayString(m, answer));
+        mDNS_StopQuery(m, question);
+        if (question->ThisQInterval != -1)
+            LogMsg("GetZoneData_QuestionCallback: Question %##s (%s) ThisQInterval %d not -1", question->qname.c, DNSTypeName(question->qtype), question->ThisQInterval);
+// Right now we don't want to fail back to non-encrypted operations
+// If the AuthInfo has the AutoTunnel field set, then we want private or nothing
+// <rdar://problem/5687667> BTMM: Don't fallback to unencrypted operations when SRV lookup fails
+#if 0
+        if (!answer->rdlength && zd->ZonePrivate && zd->ZoneService != ZoneServiceQuery)
+        {
+            zd->ZonePrivate = mDNSfalse;    // Causes ZoneDataSRV() to yield a different SRV name when building the query
+            GetZoneData_StartQuery(m, zd, kDNSType_SRV);        // Try again, non-private this time
+        }
+        else
+#endif
+        {
+            if (answer->rdlength)
+            {
+                AssignDomainName(&zd->Host, &answer->rdata->u.srv.target);
+                zd->Port = answer->rdata->u.srv.port;
+                AssignDomainName(&zd->question.qname, &zd->Host);
+                GetZoneData_StartQuery(m, zd, kDNSType_A);
+            }
+            else
+            {
+                zd->ZonePrivate = mDNSfalse;
+                zd->Host.c[0] = 0;
+                zd->Port = zeroIPPort;
+                zd->Addr = zeroAddr;
+                zd->ZoneDataCallback(m, mStatus_NoError, zd);
+            }
+        }
+    }
+    else if (answer->rrtype == kDNSType_A)
+    {
+        debugf("GetZoneData GOT A %s", RRDisplayString(m, answer));
+        mDNS_StopQuery(m, question);
+        if (question->ThisQInterval != -1)
+            LogMsg("GetZoneData_QuestionCallback: Question %##s (%s) ThisQInterval %d not -1", question->qname.c, DNSTypeName(question->qtype), question->ThisQInterval);
+        zd->Addr.type  = mDNSAddrType_IPv4;
+        zd->Addr.ip.v4 = (answer->rdlength == 4) ? answer->rdata->u.ipv4 : zerov4Addr;
+        // In order to simulate firewalls blocking our outgoing TCP connections, returning immediate ICMP errors or TCP resets,
+        // the code below will make us try to connect to loopback, resulting in an immediate "port unreachable" failure.
+        // This helps us test to make sure we handle this case gracefully
+        // <rdar://problem/5607082> BTMM: mDNSResponder taking 100 percent CPU after upgrading to 10.5.1
+#if 0
+        zd->Addr.ip.v4.b[0] = 127;
+        zd->Addr.ip.v4.b[1] = 0;
+        zd->Addr.ip.v4.b[2] = 0;
+        zd->Addr.ip.v4.b[3] = 1;
+#endif
+        // The caller needs to free the memory when done with zone data
+        zd->ZoneDataCallback(m, mStatus_NoError, zd);
+    }
+}
+
+// GetZoneData_StartQuery is called from normal client context (lock not held, or client callback)
+mDNSlocal mStatus GetZoneData_StartQuery(mDNS *const m, ZoneData *zd, mDNSu16 qtype)
+{
+    if (qtype == kDNSType_SRV)
+    {
+        AssignDomainName(&zd->question.qname, ZoneDataSRV(zd));
+        AppendDomainName(&zd->question.qname, &zd->ZoneName);
+        debugf("lookupDNSPort %##s", zd->question.qname.c);
+    }
+
+    // CancelGetZoneData can get called at any time. We should stop the question if it has not been
+    // stopped already. A value of -1 for ThisQInterval indicates that the question is not active
+    // yet.
+    zd->question.ThisQInterval       = -1;
+    zd->question.InterfaceID         = mDNSInterface_Any;
+    zd->question.flags               = 0;
+    zd->question.Target              = zeroAddr;
+    //zd->question.qname.c[0]        = 0;			// Already set
+    zd->question.qtype               = qtype;
+    zd->question.qclass              = kDNSClass_IN;
+    zd->question.LongLived           = mDNSfalse;
+    zd->question.ExpectUnique        = mDNStrue;
+    zd->question.ForceMCast          = mDNSfalse;
+    zd->question.ReturnIntermed      = mDNStrue;
+    zd->question.SuppressUnusable    = mDNSfalse;
+    zd->question.SearchListIndex     = 0;
+    zd->question.AppendSearchDomains = 0;
+    zd->question.RetryWithSearchDomains = mDNSfalse;
+    zd->question.TimeoutQuestion     = 0;
+    zd->question.WakeOnResolve       = 0;
+    zd->question.UseBackgroundTrafficClass = mDNSfalse;
+    zd->question.ValidationRequired = 0;
+    zd->question.ValidatingResponse = 0;
+    zd->question.ProxyQuestion      = 0;
+    zd->question.qnameOrig           = mDNSNULL;
+    zd->question.AnonInfo            = mDNSNULL;
+    zd->question.pid                 = mDNSPlatformGetPID();
+    zd->question.QuestionCallback    = GetZoneData_QuestionCallback;
+    zd->question.QuestionContext     = zd;
+
+    //LogMsg("GetZoneData_StartQuery %##s (%s) %p", zd->question.qname.c, DNSTypeName(zd->question.qtype), zd->question.Private);
+    return(mDNS_StartQuery(m, &zd->question));
+}
+
+// StartGetZoneData is an internal routine (i.e. must be called with the lock already held)
+mDNSexport ZoneData *StartGetZoneData(mDNS *const m, const domainname *const name, const ZoneService target, ZoneDataCallback callback, void *ZoneDataContext)
+{
+    DomainAuthInfo *AuthInfo = GetAuthInfoForName_internal(m, name);
+    int initialskip = (AuthInfo && AuthInfo->AutoTunnel) ? DomainNameLength(name) - DomainNameLength(&AuthInfo->domain) : 0;
+    ZoneData *zd = (ZoneData*)mDNSPlatformMemAllocate(sizeof(ZoneData));
+    if (!zd) { LogMsg("ERROR: StartGetZoneData - mDNSPlatformMemAllocate failed"); return mDNSNULL; }
+    mDNSPlatformMemZero(zd, sizeof(ZoneData));
+    AssignDomainName(&zd->ChildName, name);
+    zd->ZoneService      = target;
+    zd->CurrentSOA       = (domainname *)(&zd->ChildName.c[initialskip]);
+    zd->ZoneName.c[0]    = 0;
+    zd->ZoneClass        = 0;
+    zd->Host.c[0]        = 0;
+    zd->Port             = zeroIPPort;
+    zd->Addr             = zeroAddr;
+    zd->ZonePrivate      = AuthInfo && AuthInfo->AutoTunnel ? mDNStrue : mDNSfalse;
+    zd->ZoneDataCallback = callback;
+    zd->ZoneDataContext  = ZoneDataContext;
+
+    zd->question.QuestionContext = zd;
+
+    mDNS_DropLockBeforeCallback();      // GetZoneData_StartQuery expects to be called from a normal callback, so we emulate that here
+    if (AuthInfo && AuthInfo->AutoTunnel && !mDNSIPPortIsZero(AuthInfo->port))
+    {
+        LogInfo("StartGetZoneData: Bypassing SOA, SRV query for %##s", AuthInfo->domain.c);
+        // We bypass SOA and SRV queries if we know the hostname and port already from the configuration.
+        // Today this is only true for AutoTunnel. As we bypass, we need to infer a few things:
+        //
+        // 1. Zone name is the same as the AuthInfo domain
+        // 2. ZoneClass is kDNSClass_IN which should be a safe assumption
+        //
+        // If we want to make this bypass mechanism work for non-AutoTunnels also, (1) has to hold
+        // good. Otherwise, it has to be configured also.
+
+        AssignDomainName(&zd->ZoneName, &AuthInfo->domain);
+        zd->ZoneClass = kDNSClass_IN;
+        AssignDomainName(&zd->Host, &AuthInfo->hostname);
+        zd->Port = AuthInfo->port;
+        AssignDomainName(&zd->question.qname, &zd->Host);
+        GetZoneData_StartQuery(m, zd, kDNSType_A);
+    }
+    else
+    {
+        if (AuthInfo && AuthInfo->AutoTunnel) LogInfo("StartGetZoneData: Not Bypassing SOA, SRV query for %##s", AuthInfo->domain.c);
+        AssignDomainName(&zd->question.qname, zd->CurrentSOA);
+        GetZoneData_StartQuery(m, zd, kDNSType_SOA);
+    }
+    mDNS_ReclaimLockAfterCallback();
+
+    return zd;
+}
+
+// Returns if the question is a GetZoneData question. These questions are special in
+// that they are created internally while resolving a private query or LLQs.
+mDNSexport mDNSBool IsGetZoneDataQuestion(DNSQuestion *q)
+{
+    if (q->QuestionCallback == GetZoneData_QuestionCallback) return(mDNStrue);
+    else return(mDNSfalse);
+}
+
+// GetZoneData queries are a special case -- even if we have a key for them, we don't do them privately,
+// because that would result in an infinite loop (i.e. to do a private query we first need to get
+// the _dns-query-tls SRV record for the zone, and we can't do *that* privately because to do so
+// we'd need to already know the _dns-query-tls SRV record.
+// Also, as a general rule, we never do SOA queries privately
+mDNSexport DomainAuthInfo *GetAuthInfoForQuestion(mDNS *m, const DNSQuestion *const q)  // Must be called with lock held
+{
+    if (q->QuestionCallback == GetZoneData_QuestionCallback) return(mDNSNULL);
+    if (q->qtype            == kDNSType_SOA                ) return(mDNSNULL);
+    return(GetAuthInfoForName_internal(m, &q->qname));
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - host name and interface management
+#endif
+
+mDNSlocal void SendRecordRegistration(mDNS *const m, AuthRecord *rr);
+mDNSlocal void SendRecordDeregistration(mDNS *m, AuthRecord *rr);
+mDNSlocal mDNSBool IsRecordMergeable(mDNS *const m, AuthRecord *rr, mDNSs32 time);
+
+// When this function is called, service record is already deregistered. We just
+// have to deregister the PTR and TXT records.
+mDNSlocal void UpdateAllServiceRecords(mDNS *const m, AuthRecord *rr, mDNSBool reg)
+{
+    AuthRecord *r, *srvRR;
+
+    if (rr->resrec.rrtype != kDNSType_SRV) { LogMsg("UpdateAllServiceRecords:ERROR!! ResourceRecord not a service record %s", ARDisplayString(m, rr)); return; }
+
+    if (reg && rr->state == regState_NoTarget) { LogMsg("UpdateAllServiceRecords:ERROR!! SRV record %s in noTarget state during registration", ARDisplayString(m, rr)); return; }
+
+    LogInfo("UpdateAllServiceRecords: ResourceRecord %s", ARDisplayString(m, rr));
+
+    for (r = m->ResourceRecords; r; r=r->next)
+    {
+        if (!AuthRecord_uDNS(r)) continue;
+        srvRR = mDNSNULL;
+        if (r->resrec.rrtype == kDNSType_PTR)
+            srvRR = r->Additional1;
+        else if (r->resrec.rrtype == kDNSType_TXT)
+            srvRR = r->DependentOn;
+        if (srvRR && srvRR->resrec.rrtype != kDNSType_SRV)
+            LogMsg("UpdateAllServiceRecords: ERROR!! Resource record %s wrong, expecting SRV type", ARDisplayString(m, srvRR));
+        if (srvRR == rr)
+        {
+            if (!reg)
+            {
+                LogInfo("UpdateAllServiceRecords: deregistering %s", ARDisplayString(m, r));
+                r->SRVChanged = mDNStrue;
+                r->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+                r->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+                r->state = regState_DeregPending;
+            }
+            else
+            {
+                // Clearing SRVchanged is a safety measure. If our pevious dereg never
+                // came back and we had a target change, we are starting fresh
+                r->SRVChanged = mDNSfalse;
+                // if it is already registered or in the process of registering, then don't
+                // bother re-registering. This happens today for non-BTMM domains where the
+                // TXT and PTR get registered before SRV records because of the delay in
+                // getting the port mapping. There is no point in re-registering the TXT
+                // and PTR records.
+                if ((r->state == regState_Registered) ||
+                    (r->state == regState_Pending && r->nta && !mDNSIPv4AddressIsZero(r->nta->Addr.ip.v4)))
+                    LogInfo("UpdateAllServiceRecords: not registering %s, state %d", ARDisplayString(m, r), r->state);
+                else
+                {
+                    LogInfo("UpdateAllServiceRecords: registering %s, state %d", ARDisplayString(m, r), r->state);
+                    ActivateUnicastRegistration(m, r);
+                }
+            }
+        }
+    }
+}
+
+// Called in normal client context (lock not held)
+// Currently only supports SRV records for nat mapping
+mDNSlocal void CompleteRecordNatMap(mDNS *m, NATTraversalInfo *n)
+{
+    const domainname *target;
+    domainname *srvt;
+    AuthRecord *rr = (AuthRecord *)n->clientContext;
+    debugf("SRVNatMap complete %.4a IntPort %u ExternalPort %u NATLease %u", &n->ExternalAddress, mDNSVal16(n->IntPort), mDNSVal16(n->ExternalPort), n->NATLease);
+
+    if (!rr) { LogMsg("CompleteRecordNatMap called with unknown AuthRecord object"); return; }
+    if (!n->NATLease) { LogMsg("CompleteRecordNatMap No NATLease for %s", ARDisplayString(m, rr)); return; }
+
+    if (rr->resrec.rrtype != kDNSType_SRV) {LogMsg("CompleteRecordNatMap: Not a service record %s", ARDisplayString(m, rr)); return; }
+
+    if (rr->resrec.RecordType == kDNSRecordTypeDeregistering) { LogInfo("CompleteRecordNatMap called for %s, Service deregistering", ARDisplayString(m, rr)); return; }
+
+    if (rr->state == regState_DeregPending) { LogInfo("CompleteRecordNatMap called for %s, record in DeregPending", ARDisplayString(m, rr)); return; }
+
+    // As we free the zone info after registering/deregistering with the server (See hndlRecordUpdateReply),
+    // we need to restart the get zone data and nat mapping request to get the latest mapping result as we can't handle it
+    // at this moment. Restart from the beginning.
+    if (!rr->nta || mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4))
+    {
+        LogInfo("CompleteRecordNatMap called for %s but no zone information!", ARDisplayString(m, rr));
+        // We need to clear out the NATinfo state so that it will result in re-acquiring the mapping
+        // and hence this callback called again.
+        if (rr->NATinfo.clientContext)
+        {
+            mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+            rr->NATinfo.clientContext = mDNSNULL;
+        }
+        rr->state = regState_Pending;
+        rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+        rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+        return;
+    }
+
+    mDNS_Lock(m);
+    // Reevaluate the target always as Target could have changed while
+    // we were getting the port mapping (See UpdateOneSRVRecord)
+    target = GetServiceTarget(m, rr);
+    srvt = GetRRDomainNameTarget(&rr->resrec);
+    if (!target || target->c[0] == 0 || mDNSIPPortIsZero(n->ExternalPort))
+    {
+        if (target && target->c[0])
+            LogInfo("CompleteRecordNatMap - Target %##s for ResourceRecord %##s, ExternalPort %d", target->c, rr->resrec.name->c, mDNSVal16(n->ExternalPort));
+        else
+            LogInfo("CompleteRecordNatMap - no target for %##s, ExternalPort %d", rr->resrec.name->c, mDNSVal16(n->ExternalPort));
+        if (srvt) srvt->c[0] = 0;
+        rr->state = regState_NoTarget;
+        rr->resrec.rdlength = rr->resrec.rdestimate = 0;
+        mDNS_Unlock(m);
+        UpdateAllServiceRecords(m, rr, mDNSfalse);
+        return;
+    }
+    LogInfo("CompleteRecordNatMap - Target %##s for ResourceRecord %##s, ExternalPort %d", target->c, rr->resrec.name->c, mDNSVal16(n->ExternalPort));
+    // This function might get called multiple times during a network transition event. Previosuly, we could
+    // have put the SRV record in NoTarget state above and deregistered all the other records. When this
+    // function gets called again with a non-zero ExternalPort, we need to set the target and register the
+    // other records again.
+    if (srvt && !SameDomainName(srvt, target))
+    {
+        AssignDomainName(srvt, target);
+        SetNewRData(&rr->resrec, mDNSNULL, 0);      // Update rdlength, rdestimate, rdatahash
+    }
+
+    // SRVChanged is set when when the target of the SRV record changes (See UpdateOneSRVRecord).
+    // As a result of the target change, we might register just that SRV Record if it was
+    // previously registered and we have a new target OR deregister SRV (and the associated
+    // PTR/TXT records) if we don't have a target anymore. When we get a response from the server,
+    // SRVChanged state tells that we registered/deregistered because of a target change
+    // and hence handle accordingly e.g., if we deregistered, put the records in NoTarget state OR
+    // if we registered then put it in Registered state.
+    //
+    // Here, we are registering all the records again from the beginning. Treat this as first time
+    // registration rather than a temporary target change.
+    rr->SRVChanged = mDNSfalse;
+
+    // We want IsRecordMergeable to check whether it is a record whose update can be
+    // sent with others. We set the time before we call IsRecordMergeable, so that
+    // it does not fail this record based on time. We are interested in other checks
+    // at this time
+    rr->state = regState_Pending;
+    rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+    rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+    if (IsRecordMergeable(m, rr, m->timenow + MERGE_DELAY_TIME))
+        // Delay the record registration by MERGE_DELAY_TIME so that we can merge them
+        // into one update
+        rr->LastAPTime += MERGE_DELAY_TIME;
+    mDNS_Unlock(m);
+    // We call this always even though it may not be necessary always e.g., normal registration
+    // process where TXT and PTR gets registered followed by the SRV record after it gets
+    // the port mapping. In that case, UpdateAllServiceRecords handles the optimization. The
+    // update of TXT and PTR record is required if we entered noTargetState before as explained
+    // above.
+    UpdateAllServiceRecords(m, rr, mDNStrue);
+}
+
+mDNSlocal void StartRecordNatMap(mDNS *m, AuthRecord *rr)
+{
+    const mDNSu8 *p;
+    mDNSu8 protocol;
+
+    if (rr->resrec.rrtype != kDNSType_SRV)
+    {
+        LogInfo("StartRecordNatMap: Resource Record %##s type %d, not supported", rr->resrec.name->c, rr->resrec.rrtype);
+        return;
+    }
+    p = rr->resrec.name->c;
+    //Assume <Service Instance>.<App Protocol>.<Transport protocol>.<Name>
+    // Skip the first two labels to get to the transport protocol
+    if (p[0]) p += 1 + p[0];
+    if (p[0]) p += 1 + p[0];
+    if      (SameDomainLabel(p, (mDNSu8 *)"\x4" "_tcp")) protocol = NATOp_MapTCP;
+    else if (SameDomainLabel(p, (mDNSu8 *)"\x4" "_udp")) protocol = NATOp_MapUDP;
+    else { LogMsg("StartRecordNatMap: could not determine transport protocol of service %##s", rr->resrec.name->c); return; }
+
+    //LogMsg("StartRecordNatMap: clientContext %p IntPort %d srv.port %d %s",
+    //	rr->NATinfo.clientContext, mDNSVal16(rr->NATinfo.IntPort), mDNSVal16(rr->resrec.rdata->u.srv.port), ARDisplayString(m, rr));
+    if (rr->NATinfo.clientContext) mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+    rr->NATinfo.Protocol       = protocol;
+
+    // Shouldn't be trying to set IntPort here --
+    // BuildUpdateMessage overwrites srs->RR_SRV.resrec.rdata->u.srv.port with external (mapped) port number
+    rr->NATinfo.IntPort        = rr->resrec.rdata->u.srv.port;
+    rr->NATinfo.RequestedPort  = rr->resrec.rdata->u.srv.port;
+    rr->NATinfo.NATLease       = 0;     // Request default lease
+    rr->NATinfo.clientCallback = CompleteRecordNatMap;
+    rr->NATinfo.clientContext  = rr;
+    mDNS_StartNATOperation_internal(m, &rr->NATinfo);
+}
+
+// Unlink an Auth Record from the m->ResourceRecords list.
+// When a resource record enters regState_NoTarget initially, mDNS_Register_internal
+// does not initialize completely e.g., it cannot check for duplicates etc. The resource
+// record is temporarily left in the ResourceRecords list so that we can initialize later
+// when the target is resolvable. Similarly, when host name changes, we enter regState_NoTarget
+// and we do the same.
+
+// This UnlinkResourceRecord routine is very worrying. It bypasses all the normal cleanup performed
+// by mDNS_Deregister_internal and just unceremoniously cuts the record from the active list.
+// This is why re-regsitering this record was producing syslog messages like this:
+// "Error! Tried to add a NAT traversal that's already in the active list"
+// Right now UnlinkResourceRecord is fortunately only called by RegisterAllServiceRecords,
+// which then immediately calls mDNS_Register_internal to re-register the record, which probably
+// masked more serious problems. Any other use of UnlinkResourceRecord is likely to lead to crashes.
+// For now we'll workaround that specific problem by explicitly calling mDNS_StopNATOperation_internal,
+// but long-term we should either stop cancelling the record registration and then re-registering it,
+// or if we really do need to do this for some reason it should be done via the usual
+// mDNS_Deregister_internal path instead of just cutting the record from the list.
+
+mDNSlocal mStatus UnlinkResourceRecord(mDNS *const m, AuthRecord *const rr)
+{
+    AuthRecord **list = &m->ResourceRecords;
+    while (*list && *list != rr) list = &(*list)->next;
+    if (*list)
+    {
+        *list = rr->next;
+        rr->next = mDNSNULL;
+
+        // Temporary workaround to cancel any active NAT mapping operation
+        if (rr->NATinfo.clientContext)
+        {
+            mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+            rr->NATinfo.clientContext = mDNSNULL;
+            if (rr->resrec.rrtype == kDNSType_SRV) rr->resrec.rdata->u.srv.port = rr->NATinfo.IntPort;
+        }
+
+        return(mStatus_NoError);
+    }
+    LogMsg("UnlinkResourceRecord:ERROR!! - no such active record %##s", rr->resrec.name->c);
+    return(mStatus_NoSuchRecord);
+}
+
+// We need to go through mDNS_Register again as we did not complete the
+// full initialization last time e.g., duplicate checks.
+// After we register, we will be in regState_GetZoneData.
+mDNSlocal void RegisterAllServiceRecords(mDNS *const m, AuthRecord *rr)
+{
+    LogInfo("RegisterAllServiceRecords: Service Record %##s", rr->resrec.name->c);
+    // First Register the service record, we do this differently from other records because
+    // when it entered NoTarget state, it did not go through complete initialization
+    rr->SRVChanged = mDNSfalse;
+    UnlinkResourceRecord(m, rr);
+    mDNS_Register_internal(m, rr);
+    // Register the other records
+    UpdateAllServiceRecords(m, rr, mDNStrue);
+}
+
+// Called with lock held
+mDNSlocal void UpdateOneSRVRecord(mDNS *m, AuthRecord *rr)
+{
+    // Target change if:
+    // We have a target and were previously waiting for one, or
+    // We had a target and no longer do, or
+    // The target has changed
+
+    domainname *curtarget = &rr->resrec.rdata->u.srv.target;
+    const domainname *const nt = GetServiceTarget(m, rr);
+    const domainname *const newtarget = nt ? nt : (domainname*)"";
+    mDNSBool TargetChanged = (newtarget->c[0] && rr->state == regState_NoTarget) || !SameDomainName(curtarget, newtarget);
+    mDNSBool HaveZoneData  = rr->nta && !mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4);
+
+    // Nat state change if:
+    // We were behind a NAT, and now we are behind a new NAT, or
+    // We're not behind a NAT but our port was previously mapped to a different external port
+    // We were not behind a NAT and now we are
+
+    mDNSIPPort port        = rr->resrec.rdata->u.srv.port;
+    mDNSBool NowNeedNATMAP = (rr->AutoTarget == Target_AutoHostAndNATMAP && !mDNSIPPortIsZero(port) && mDNSv4AddrIsRFC1918(&m->AdvertisedV4.ip.v4) && rr->nta && !mDNSAddrIsRFC1918(&rr->nta->Addr));
+    mDNSBool WereBehindNAT = (rr->NATinfo.clientContext != mDNSNULL);
+    mDNSBool PortWasMapped = (rr->NATinfo.clientContext && !mDNSSameIPPort(rr->NATinfo.RequestedPort, port));       // I think this is always false -- SC Sept 07
+    mDNSBool NATChanged    = (!WereBehindNAT && NowNeedNATMAP) || (!NowNeedNATMAP && PortWasMapped);
+
+    (void)HaveZoneData; //unused
+
+    LogInfo("UpdateOneSRVRecord: Resource Record %s TargetChanged %d, NewTarget %##s", ARDisplayString(m, rr), TargetChanged, nt->c);
+
+    debugf("UpdateOneSRVRecord: %##s newtarget %##s TargetChanged %d HaveZoneData %d port %d NowNeedNATMAP %d WereBehindNAT %d PortWasMapped %d NATChanged %d",
+           rr->resrec.name->c, newtarget,
+           TargetChanged, HaveZoneData, mDNSVal16(port), NowNeedNATMAP, WereBehindNAT, PortWasMapped, NATChanged);
+
+    mDNS_CheckLock(m);
+
+    if (!TargetChanged && !NATChanged) return;
+
+    // If we are deregistering the record, then ignore any NAT/Target change.
+    if (rr->resrec.RecordType == kDNSRecordTypeDeregistering)
+    {
+        LogInfo("UpdateOneSRVRecord: Deregistering record, Ignoring TargetChanged %d, NATChanged %d for %##s, state %d", TargetChanged, NATChanged,
+                rr->resrec.name->c, rr->state);
+        return;
+    }
+
+    if (newtarget)
+        LogInfo("UpdateOneSRVRecord: TargetChanged %d, NATChanged %d for %##s, state %d, newtarget %##s", TargetChanged, NATChanged, rr->resrec.name->c, rr->state, newtarget->c);
+    else
+        LogInfo("UpdateOneSRVRecord: TargetChanged %d, NATChanged %d for %##s, state %d, null newtarget", TargetChanged, NATChanged, rr->resrec.name->c, rr->state);
+    switch(rr->state)
+    {
+    case regState_NATMap:
+        // In these states, the SRV has either not yet been registered (it will get up-to-date information when it is)
+        // or is in the process of, or has already been, deregistered. This assumes that whenever we transition out
+        // of this state, we need to look at the target again.
+        return;
+
+    case regState_UpdatePending:
+        // We are getting a Target change/NAT change while the SRV record is being updated ?
+        // let us not do anything for now.
+        return;
+
+    case regState_NATError:
+        if (!NATChanged) return;
+    // if nat changed, register if we have a target (below)
+
+    case regState_NoTarget:
+        if (!newtarget->c[0])
+        {
+            LogInfo("UpdateOneSRVRecord: No target yet for Resource Record %s", ARDisplayString(m, rr));
+            return;
+        }
+        RegisterAllServiceRecords(m, rr);
+        return;
+    case regState_DeregPending:
+    // We are in DeregPending either because the service was deregistered from above or we handled
+    // a NAT/Target change before and sent the deregistration below. There are a few race conditions
+    // possible
+    //
+    // 1. We are handling a second NAT/Target change while the first dereg is in progress. It is possible
+    //    that first dereg never made it through because there was no network connectivity e.g., disconnecting
+    //    from network triggers this function due to a target change and later connecting to the network
+    //    retriggers this function but the deregistration never made it through yet. Just fall through.
+    //    If there is a target register otherwise deregister.
+    //
+    // 2. While we sent the dereg during a previous NAT/Target change, uDNS_DeregisterRecord gets
+    //    called as part of service deregistration. When the response comes back, we call
+    //    CompleteDeregistration rather than handle NAT/Target change because the record is in
+    //    kDNSRecordTypeDeregistering state.
+    //
+    // 3. If the upper layer deregisters the service, we check for kDNSRecordTypeDeregistering both
+    //    here in this function to avoid handling NAT/Target change and in hndlRecordUpdateReply to call
+    //    CompleteDeregistration instead of handling NAT/Target change. Hence, we are not concerned
+    //    about that case here.
+    //
+    // We just handle case (1) by falling through
+    case regState_Pending:
+    case regState_Refresh:
+    case regState_Registered:
+        // target or nat changed.  deregister service.  upon completion, we'll look for a new target
+        rr->SRVChanged = mDNStrue;
+        rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+        rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+        if (newtarget->c[0])
+        {
+            LogInfo("UpdateOneSRVRecord: SRV record changed for service %##s, registering with new target %##s",
+                    rr->resrec.name->c, newtarget->c);
+            rr->state = regState_Pending;
+        }
+        else
+        {
+            LogInfo("UpdateOneSRVRecord: SRV record changed for service %##s de-registering", rr->resrec.name->c);
+            rr->state = regState_DeregPending;
+            UpdateAllServiceRecords(m, rr, mDNSfalse);
+        }
+        return;
+    case regState_Unregistered:
+    default: LogMsg("UpdateOneSRVRecord: Unknown state %d for %##s", rr->state, rr->resrec.name->c);
+    }
+}
+
+mDNSexport void UpdateAllSRVRecords(mDNS *m)
+{
+    m->NextSRVUpdate = 0;
+    LogInfo("UpdateAllSRVRecords %d", m->SleepState);
+
+    if (m->CurrentRecord)
+        LogMsg("UpdateAllSRVRecords ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+    m->CurrentRecord = m->ResourceRecords;
+    while (m->CurrentRecord)
+    {
+        AuthRecord *rptr = m->CurrentRecord;
+        m->CurrentRecord = m->CurrentRecord->next;
+        if (AuthRecord_uDNS(rptr) && rptr->resrec.rrtype == kDNSType_SRV)
+            UpdateOneSRVRecord(m, rptr);
+    }
+}
+
+// Forward reference: AdvertiseHostname references HostnameCallback, and HostnameCallback calls AdvertiseHostname
+mDNSlocal void HostnameCallback(mDNS *const m, AuthRecord *const rr, mStatus result);
+
+// Called in normal client context (lock not held)
+mDNSlocal void hostnameGetPublicAddressCallback(mDNS *m, NATTraversalInfo *n)
+{
+    HostnameInfo *h = (HostnameInfo *)n->clientContext;
+
+    if (!h) { LogMsg("RegisterHostnameRecord: registration cancelled"); return; }
+
+    if (!n->Result)
+    {
+        if (mDNSIPv4AddressIsZero(n->ExternalAddress) || mDNSv4AddrIsRFC1918(&n->ExternalAddress)) return;
+
+        if (h->arv4.resrec.RecordType)
+        {
+            if (mDNSSameIPv4Address(h->arv4.resrec.rdata->u.ipv4, n->ExternalAddress)) return;  // If address unchanged, do nothing
+            LogInfo("Updating hostname %p %##s IPv4 from %.4a to %.4a (NAT gateway's external address)",n,
+                    h->arv4.resrec.name->c, &h->arv4.resrec.rdata->u.ipv4, &n->ExternalAddress);
+            mDNS_Deregister(m, &h->arv4);   // mStatus_MemFree callback will re-register with new address
+        }
+        else
+        {
+            LogInfo("Advertising hostname %##s IPv4 %.4a (NAT gateway's external address)", h->arv4.resrec.name->c, &n->ExternalAddress);
+            h->arv4.resrec.RecordType = kDNSRecordTypeKnownUnique;
+            h->arv4.resrec.rdata->u.ipv4 = n->ExternalAddress;
+            mDNS_Register(m, &h->arv4);
+        }
+    }
+}
+
+// register record or begin NAT traversal
+mDNSlocal void AdvertiseHostname(mDNS *m, HostnameInfo *h)
+{
+    if (!mDNSIPv4AddressIsZero(m->AdvertisedV4.ip.v4) && h->arv4.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        mDNS_SetupResourceRecord(&h->arv4, mDNSNULL, mDNSInterface_Any, kDNSType_A, kHostNameTTL, kDNSRecordTypeUnregistered, AuthRecordAny, HostnameCallback, h);
+        AssignDomainName(&h->arv4.namestorage, &h->fqdn);
+        h->arv4.resrec.rdata->u.ipv4 = m->AdvertisedV4.ip.v4;
+        h->arv4.state = regState_Unregistered;
+        if (mDNSv4AddrIsRFC1918(&m->AdvertisedV4.ip.v4))
+        {
+            // If we already have a NAT query active, stop it and restart it to make sure we get another callback
+            if (h->natinfo.clientContext) mDNS_StopNATOperation_internal(m, &h->natinfo);
+            h->natinfo.Protocol         = 0;
+            h->natinfo.IntPort          = zeroIPPort;
+            h->natinfo.RequestedPort    = zeroIPPort;
+            h->natinfo.NATLease         = 0;
+            h->natinfo.clientCallback   = hostnameGetPublicAddressCallback;
+            h->natinfo.clientContext    = h;
+            mDNS_StartNATOperation_internal(m, &h->natinfo);
+        }
+        else
+        {
+            LogInfo("Advertising hostname %##s IPv4 %.4a", h->arv4.resrec.name->c, &m->AdvertisedV4.ip.v4);
+            h->arv4.resrec.RecordType = kDNSRecordTypeKnownUnique;
+            mDNS_Register_internal(m, &h->arv4);
+        }
+    }
+
+    if (!mDNSIPv6AddressIsZero(m->AdvertisedV6.ip.v6) && h->arv6.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        mDNS_SetupResourceRecord(&h->arv6, mDNSNULL, mDNSInterface_Any, kDNSType_AAAA, kHostNameTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, HostnameCallback, h);
+        AssignDomainName(&h->arv6.namestorage, &h->fqdn);
+        h->arv6.resrec.rdata->u.ipv6 = m->AdvertisedV6.ip.v6;
+        h->arv6.state = regState_Unregistered;
+        LogInfo("Advertising hostname %##s IPv6 %.16a", h->arv6.resrec.name->c, &m->AdvertisedV6.ip.v6);
+        mDNS_Register_internal(m, &h->arv6);
+    }
+}
+
+mDNSlocal void HostnameCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    HostnameInfo *hi = (HostnameInfo *)rr->RecordContext;
+
+    if (result == mStatus_MemFree)
+    {
+        if (hi)
+        {
+            // If we're still in the Hostnames list, update to new address
+            HostnameInfo *i;
+            LogInfo("HostnameCallback: Got mStatus_MemFree for %p %p %s", hi, rr, ARDisplayString(m, rr));
+            for (i = m->Hostnames; i; i = i->next)
+                if (rr == &i->arv4 || rr == &i->arv6)
+                { mDNS_Lock(m); AdvertiseHostname(m, i); mDNS_Unlock(m); return; }
+
+            // Else, we're not still in the Hostnames list, so free the memory
+            if (hi->arv4.resrec.RecordType == kDNSRecordTypeUnregistered &&
+                hi->arv6.resrec.RecordType == kDNSRecordTypeUnregistered)
+            {
+                if (hi->natinfo.clientContext) mDNS_StopNATOperation_internal(m, &hi->natinfo);
+                hi->natinfo.clientContext = mDNSNULL;
+                mDNSPlatformMemFree(hi);    // free hi when both v4 and v6 AuthRecs deallocated
+            }
+        }
+        return;
+    }
+
+    if (result)
+    {
+        // don't unlink or free - we can retry when we get a new address/router
+        if (rr->resrec.rrtype == kDNSType_A)
+            LogMsg("HostnameCallback: Error %d for registration of %##s IP %.4a", result, rr->resrec.name->c, &rr->resrec.rdata->u.ipv4);
+        else
+            LogMsg("HostnameCallback: Error %d for registration of %##s IP %.16a", result, rr->resrec.name->c, &rr->resrec.rdata->u.ipv6);
+        if (!hi) { mDNSPlatformMemFree(rr); return; }
+        if (rr->state != regState_Unregistered) LogMsg("Error: HostnameCallback invoked with error code for record not in regState_Unregistered!");
+
+        if (hi->arv4.state == regState_Unregistered &&
+            hi->arv6.state == regState_Unregistered)
+        {
+            // only deliver status if both v4 and v6 fail
+            rr->RecordContext = (void *)hi->StatusContext;
+            if (hi->StatusCallback)
+                hi->StatusCallback(m, rr, result); // client may NOT make API calls here
+            rr->RecordContext = (void *)hi;
+        }
+        return;
+    }
+
+    // register any pending services that require a target
+    mDNS_Lock(m);
+    m->NextSRVUpdate = NonZeroTime(m->timenow);
+    mDNS_Unlock(m);
+
+    // Deliver success to client
+    if (!hi) { LogMsg("HostnameCallback invoked with orphaned address record"); return; }
+    if (rr->resrec.rrtype == kDNSType_A)
+        LogInfo("Registered hostname %##s IP %.4a", rr->resrec.name->c, &rr->resrec.rdata->u.ipv4);
+    else
+        LogInfo("Registered hostname %##s IP %.16a", rr->resrec.name->c, &rr->resrec.rdata->u.ipv6);
+
+    rr->RecordContext = (void *)hi->StatusContext;
+    if (hi->StatusCallback)
+        hi->StatusCallback(m, rr, result); // client may NOT make API calls here
+    rr->RecordContext = (void *)hi;
+}
+
+mDNSlocal void FoundStaticHostname(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    const domainname *pktname = &answer->rdata->u.name;
+    domainname *storedname = &m->StaticHostname;
+    HostnameInfo *h = m->Hostnames;
+
+    (void)question;
+
+    if (answer->rdlength != 0)
+        LogInfo("FoundStaticHostname: question %##s -> answer %##s (%s)", question->qname.c, answer->rdata->u.name.c, AddRecord ? "ADD" : "RMV");
+    else
+        LogInfo("FoundStaticHostname: question %##s -> answer NULL (%s)", question->qname.c, AddRecord ? "ADD" : "RMV");
+
+    if (AddRecord && answer->rdlength != 0 && !SameDomainName(pktname, storedname))
+    {
+        AssignDomainName(storedname, pktname);
+        while (h)
+        {
+            if (h->arv4.state == regState_Pending || h->arv4.state == regState_NATMap || h->arv6.state == regState_Pending)
+            {
+                // if we're in the process of registering a dynamic hostname, delay SRV update so we don't have to reregister services if the dynamic name succeeds
+                m->NextSRVUpdate = NonZeroTime(m->timenow + 5 * mDNSPlatformOneSecond);
+                debugf("FoundStaticHostname: NextSRVUpdate in %d %d", m->NextSRVUpdate - m->timenow, m->timenow);
+                return;
+            }
+            h = h->next;
+        }
+        mDNS_Lock(m);
+        m->NextSRVUpdate = NonZeroTime(m->timenow);
+        mDNS_Unlock(m);
+    }
+    else if (!AddRecord && SameDomainName(pktname, storedname))
+    {
+        mDNS_Lock(m);
+        storedname->c[0] = 0;
+        m->NextSRVUpdate = NonZeroTime(m->timenow);
+        mDNS_Unlock(m);
+    }
+}
+
+// Called with lock held
+mDNSlocal void GetStaticHostname(mDNS *m)
+{
+    char buf[MAX_REVERSE_MAPPING_NAME_V4];
+    DNSQuestion *q = &m->ReverseMap;
+    mDNSu8 *ip = m->AdvertisedV4.ip.v4.b;
+    mStatus err;
+
+    if (m->ReverseMap.ThisQInterval != -1) return; // already running
+    if (mDNSIPv4AddressIsZero(m->AdvertisedV4.ip.v4)) return;
+
+    mDNSPlatformMemZero(q, sizeof(*q));
+    // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+    mDNS_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa.", ip[3], ip[2], ip[1], ip[0]);
+    if (!MakeDomainNameFromDNSNameString(&q->qname, buf)) { LogMsg("Error: GetStaticHostname - bad name %s", buf); return; }
+
+    q->InterfaceID      = mDNSInterface_Any;
+    q->flags            = 0;
+    q->Target           = zeroAddr;
+    q->qtype            = kDNSType_PTR;
+    q->qclass           = kDNSClass_IN;
+    q->LongLived        = mDNSfalse;
+    q->ExpectUnique     = mDNSfalse;
+    q->ForceMCast       = mDNSfalse;
+    q->ReturnIntermed   = mDNStrue;
+    q->SuppressUnusable = mDNSfalse;
+    q->SearchListIndex  = 0;
+    q->AppendSearchDomains = 0;
+    q->RetryWithSearchDomains = mDNSfalse;
+    q->TimeoutQuestion  = 0;
+    q->WakeOnResolve    = 0;
+    q->UseBackgroundTrafficClass = mDNSfalse;
+    q->ValidationRequired = 0;
+    q->ValidatingResponse = 0;
+    q->ProxyQuestion      = 0;
+    q->qnameOrig        = mDNSNULL;
+    q->AnonInfo         = mDNSNULL;
+    q->pid              = mDNSPlatformGetPID();
+    q->QuestionCallback = FoundStaticHostname;
+    q->QuestionContext  = mDNSNULL;
+
+    LogInfo("GetStaticHostname: %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+    err = mDNS_StartQuery_internal(m, q);
+    if (err) LogMsg("Error: GetStaticHostname - StartQuery returned error %d", err);
+}
+
+mDNSexport void mDNS_AddDynDNSHostName(mDNS *m, const domainname *fqdn, mDNSRecordCallback *StatusCallback, const void *StatusContext)
+{
+    HostnameInfo **ptr = &m->Hostnames;
+
+    LogInfo("mDNS_AddDynDNSHostName %##s", fqdn);
+
+    while (*ptr && !SameDomainName(fqdn, &(*ptr)->fqdn)) ptr = &(*ptr)->next;
+    if (*ptr) { LogMsg("DynDNSHostName %##s already in list", fqdn->c); return; }
+
+    // allocate and format new address record
+    *ptr = mDNSPlatformMemAllocate(sizeof(**ptr));
+    if (!*ptr) { LogMsg("ERROR: mDNS_AddDynDNSHostName - malloc"); return; }
+
+    mDNSPlatformMemZero(*ptr, sizeof(**ptr));
+    AssignDomainName(&(*ptr)->fqdn, fqdn);
+    (*ptr)->arv4.state     = regState_Unregistered;
+    (*ptr)->arv6.state     = regState_Unregistered;
+    (*ptr)->StatusCallback = StatusCallback;
+    (*ptr)->StatusContext  = StatusContext;
+
+    AdvertiseHostname(m, *ptr);
+}
+
+mDNSexport void mDNS_RemoveDynDNSHostName(mDNS *m, const domainname *fqdn)
+{
+    HostnameInfo **ptr = &m->Hostnames;
+
+    LogInfo("mDNS_RemoveDynDNSHostName %##s", fqdn);
+
+    while (*ptr && !SameDomainName(fqdn, &(*ptr)->fqdn)) ptr = &(*ptr)->next;
+    if (!*ptr) LogMsg("mDNS_RemoveDynDNSHostName: no such domainname %##s", fqdn->c);
+    else
+    {
+        HostnameInfo *hi = *ptr;
+        // We do it this way because, if we have no active v6 record, the "mDNS_Deregister_internal(m, &hi->arv4);"
+        // below could free the memory, and we have to make sure we don't touch hi fields after that.
+        mDNSBool f4 = hi->arv4.resrec.RecordType != kDNSRecordTypeUnregistered && hi->arv4.state != regState_Unregistered;
+        mDNSBool f6 = hi->arv6.resrec.RecordType != kDNSRecordTypeUnregistered && hi->arv6.state != regState_Unregistered;
+        if (f4) LogInfo("mDNS_RemoveDynDNSHostName removing v4 %##s", fqdn);
+        if (f6) LogInfo("mDNS_RemoveDynDNSHostName removing v6 %##s", fqdn);
+        *ptr = (*ptr)->next; // unlink
+        if (f4) mDNS_Deregister_internal(m, &hi->arv4, mDNS_Dereg_normal);
+        if (f6) mDNS_Deregister_internal(m, &hi->arv6, mDNS_Dereg_normal);
+        // When both deregistrations complete we'll free the memory in the mStatus_MemFree callback
+    }
+    mDNS_CheckLock(m);
+    m->NextSRVUpdate = NonZeroTime(m->timenow);
+}
+
+// Currently called without holding the lock
+// Maybe we should change that?
+mDNSexport void mDNS_SetPrimaryInterfaceInfo(mDNS *m, const mDNSAddr *v4addr, const mDNSAddr *v6addr, const mDNSAddr *router)
+{
+    mDNSBool v4Changed, v6Changed, RouterChanged;
+
+    if (m->mDNS_busy != m->mDNS_reentrancy)
+        LogMsg("mDNS_SetPrimaryInterfaceInfo: mDNS_busy (%ld) != mDNS_reentrancy (%ld)", m->mDNS_busy, m->mDNS_reentrancy);
+
+    if (v4addr && v4addr->type != mDNSAddrType_IPv4) { LogMsg("mDNS_SetPrimaryInterfaceInfo v4 address - incorrect type.  Discarding. %#a", v4addr); return; }
+    if (v6addr && v6addr->type != mDNSAddrType_IPv6) { LogMsg("mDNS_SetPrimaryInterfaceInfo v6 address - incorrect type.  Discarding. %#a", v6addr); return; }
+    if (router && router->type != mDNSAddrType_IPv4) { LogMsg("mDNS_SetPrimaryInterfaceInfo passed non-v4 router.  Discarding. %#a",        router); return; }
+
+    mDNS_Lock(m);
+
+    v4Changed     = !mDNSSameIPv4Address(m->AdvertisedV4.ip.v4, v4addr ? v4addr->ip.v4 : zerov4Addr);
+    v6Changed     = !mDNSSameIPv6Address(m->AdvertisedV6.ip.v6, v6addr ? v6addr->ip.v6 : zerov6Addr);
+    RouterChanged = !mDNSSameIPv4Address(m->Router.ip.v4,       router ? router->ip.v4 : zerov4Addr);
+
+    if (v4addr && (v4Changed || RouterChanged))
+        debugf("mDNS_SetPrimaryInterfaceInfo: address changed from %#a to %#a", &m->AdvertisedV4, v4addr);
+
+    if (v4addr) m->AdvertisedV4 = *v4addr;else m->AdvertisedV4.ip.v4 = zerov4Addr;
+    if (v6addr) m->AdvertisedV6 = *v6addr;else m->AdvertisedV6.ip.v6 = zerov6Addr;
+    if (router) m->Router       = *router;else m->Router.ip.v4 = zerov4Addr;
+    // setting router to zero indicates that nat mappings must be reestablished when router is reset
+
+    if (v4Changed || RouterChanged || v6Changed)
+    {
+        HostnameInfo *i;
+        LogInfo("mDNS_SetPrimaryInterfaceInfo: %s%s%s%#a %#a %#a",
+                v4Changed     ? "v4Changed "     : "",
+                RouterChanged ? "RouterChanged " : "",
+                v6Changed     ? "v6Changed "     : "", v4addr, v6addr, router);
+
+        for (i = m->Hostnames; i; i = i->next)
+        {
+            LogInfo("mDNS_SetPrimaryInterfaceInfo updating host name registrations for %##s", i->fqdn.c);
+
+            if (i->arv4.resrec.RecordType > kDNSRecordTypeDeregistering &&
+                !mDNSSameIPv4Address(i->arv4.resrec.rdata->u.ipv4, m->AdvertisedV4.ip.v4))
+            {
+                LogInfo("mDNS_SetPrimaryInterfaceInfo deregistering %s", ARDisplayString(m, &i->arv4));
+                mDNS_Deregister_internal(m, &i->arv4, mDNS_Dereg_normal);
+            }
+
+            if (i->arv6.resrec.RecordType > kDNSRecordTypeDeregistering &&
+                !mDNSSameIPv6Address(i->arv6.resrec.rdata->u.ipv6, m->AdvertisedV6.ip.v6))
+            {
+                LogInfo("mDNS_SetPrimaryInterfaceInfo deregistering %s", ARDisplayString(m, &i->arv6));
+                mDNS_Deregister_internal(m, &i->arv6, mDNS_Dereg_normal);
+            }
+
+            // AdvertiseHostname will only register new address records.
+            // For records still in the process of deregistering it will ignore them, and let the mStatus_MemFree callback handle them.
+            AdvertiseHostname(m, i);
+        }
+
+        if (v4Changed || RouterChanged)
+        {
+            // If we have a non-zero IPv4 address, we should try immediately to see if we have a NAT gateway
+            // If we have no IPv4 address, we don't want to be in quite such a hurry to report failures to our clients
+            // <rdar://problem/6935929> Sleeping server sometimes briefly disappears over Back to My Mac after it wakes up
+            mDNSu32 waitSeconds = v4addr ? 0 : 5;
+            NATTraversalInfo *n;
+            m->ExtAddress           = zerov4Addr;
+            m->LastNATMapResultCode = NATErr_None;
+
+            RecreateNATMappings(m, mDNSPlatformOneSecond * waitSeconds);
+
+            for (n = m->NATTraversals; n; n=n->next)
+                n->NewAddress = zerov4Addr;
+
+            LogInfo("mDNS_SetPrimaryInterfaceInfo:%s%s: recreating NAT mappings in %d seconds",
+                    v4Changed     ? " v4Changed"     : "",
+                    RouterChanged ? " RouterChanged" : "",
+                    waitSeconds);
+        }
+
+        if (m->ReverseMap.ThisQInterval != -1) mDNS_StopQuery_internal(m, &m->ReverseMap);
+        m->StaticHostname.c[0] = 0;
+
+        m->NextSRVUpdate = NonZeroTime(m->timenow);
+
+#if APPLE_OSX_mDNSResponder
+        if (RouterChanged) uuid_generate(m->asl_uuid);
+        UpdateAutoTunnelDomainStatuses(m);
+#endif
+    }
+
+    mDNS_Unlock(m);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Incoming Message Processing
+#endif
+
+mDNSlocal mStatus ParseTSIGError(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end, const domainname *const displayname)
+{
+    const mDNSu8 *ptr;
+    mStatus err = mStatus_NoError;
+    int i;
+
+    ptr = LocateAdditionals(msg, end);
+    if (!ptr) goto finish;
+
+    for (i = 0; i < msg->h.numAdditionals; i++)
+    {
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, 0, kDNSRecordTypePacketAdd, &m->rec);
+        if (!ptr) goto finish;
+        if (m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && m->rec.r.resrec.rrtype == kDNSType_TSIG)
+        {
+            mDNSu32 macsize;
+            mDNSu8 *rd = m->rec.r.resrec.rdata->u.data;
+            mDNSu8 *rdend = rd + m->rec.r.resrec.rdlength;
+            int alglen = DomainNameLengthLimit(&m->rec.r.resrec.rdata->u.name, rdend);
+            if (alglen > MAX_DOMAIN_NAME) goto finish;
+            rd += alglen;                                       // algorithm name
+            if (rd + 6 > rdend) goto finish;
+            rd += 6;                                            // 48-bit timestamp
+            if (rd + sizeof(mDNSOpaque16) > rdend) goto finish;
+            rd += sizeof(mDNSOpaque16);                         // fudge
+            if (rd + sizeof(mDNSOpaque16) > rdend) goto finish;
+            macsize = mDNSVal16(*(mDNSOpaque16 *)rd);
+            rd += sizeof(mDNSOpaque16);                         // MAC size
+            if (rd + macsize > rdend) goto finish;
+            rd += macsize;
+            if (rd + sizeof(mDNSOpaque16) > rdend) goto finish;
+            rd += sizeof(mDNSOpaque16);                         // orig id
+            if (rd + sizeof(mDNSOpaque16) > rdend) goto finish;
+            err = mDNSVal16(*(mDNSOpaque16 *)rd);               // error code
+
+            if      (err == TSIG_ErrBadSig)  { LogMsg("%##s: bad signature", displayname->c);              err = mStatus_BadSig;     }
+            else if (err == TSIG_ErrBadKey)  { LogMsg("%##s: bad key", displayname->c);                    err = mStatus_BadKey;     }
+            else if (err == TSIG_ErrBadTime) { LogMsg("%##s: bad time", displayname->c);                   err = mStatus_BadTime;    }
+            else if (err)                    { LogMsg("%##s: unknown tsig error %d", displayname->c, err); err = mStatus_UnknownErr; }
+            goto finish;
+        }
+        m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    }
+
+finish:
+    m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+    return err;
+}
+
+mDNSlocal mStatus checkUpdateResult(mDNS *const m, const domainname *const displayname, const mDNSu8 rcode, const DNSMessage *const msg, const mDNSu8 *const end)
+{
+    (void)msg;  // currently unused, needed for TSIG errors
+    if (!rcode) return mStatus_NoError;
+    else if (rcode == kDNSFlag1_RC_YXDomain)
+    {
+        debugf("name in use: %##s", displayname->c);
+        return mStatus_NameConflict;
+    }
+    else if (rcode == kDNSFlag1_RC_Refused)
+    {
+        LogMsg("Update %##s refused", displayname->c);
+        return mStatus_Refused;
+    }
+    else if (rcode == kDNSFlag1_RC_NXRRSet)
+    {
+        LogMsg("Reregister refused (NXRRSET): %##s", displayname->c);
+        return mStatus_NoSuchRecord;
+    }
+    else if (rcode == kDNSFlag1_RC_NotAuth)
+    {
+        // TSIG errors should come with FormErr as per RFC 2845, but BIND 9 sends them with NotAuth so we look here too
+        mStatus tsigerr = ParseTSIGError(m, msg, end, displayname);
+        if (!tsigerr)
+        {
+            LogMsg("Permission denied (NOAUTH): %##s", displayname->c);
+            return mStatus_UnknownErr;
+        }
+        else return tsigerr;
+    }
+    else if (rcode == kDNSFlag1_RC_FormErr)
+    {
+        mStatus tsigerr = ParseTSIGError(m, msg, end, displayname);
+        if (!tsigerr)
+        {
+            LogMsg("Format Error: %##s", displayname->c);
+            return mStatus_UnknownErr;
+        }
+        else return tsigerr;
+    }
+    else
+    {
+        LogMsg("Update %##s failed with rcode %d", displayname->c, rcode);
+        return mStatus_UnknownErr;
+    }
+}
+
+// We add three Additional Records for unicast resource record registrations
+// which is a function of AuthInfo and AutoTunnel properties
+mDNSlocal mDNSu32 RRAdditionalSize(mDNS *const m, DomainAuthInfo *AuthInfo)
+{
+    mDNSu32 leaseSize, hinfoSize, tsigSize;
+    mDNSu32 rr_base_size = 10; // type (2) class (2) TTL (4) rdlength (2)
+
+    // OPT RR : Emptyname(.) + base size + rdataOPT
+    leaseSize = 1 + rr_base_size + sizeof(rdataOPT);
+
+    // HINFO: Resource Record Name + base size + RDATA
+    // HINFO is added only for autotunnels
+    hinfoSize = 0;
+    if (AuthInfo && AuthInfo->AutoTunnel)
+        hinfoSize = (m->hostlabel.c[0] + 1) + DomainNameLength(&AuthInfo->domain) +
+                    rr_base_size + (2 + m->HIHardware.c[0] + m->HISoftware.c[0]);
+
+    //TSIG: Resource Record Name + base size + RDATA
+    // RDATA:
+    //  Algorithm name: hmac-md5.sig-alg.reg.int (8+7+3+3 + 5 bytes for length = 26 bytes)
+    //  Time: 6 bytes
+    //  Fudge: 2 bytes
+    //  Mac Size: 2 bytes
+    //  Mac: 16 bytes
+    //  ID: 2 bytes
+    //  Error: 2 bytes
+    //  Len: 2 bytes
+    //  Total: 58 bytes
+    tsigSize = 0;
+    if (AuthInfo) tsigSize = DomainNameLength(&AuthInfo->keyname) + rr_base_size + 58;
+
+    return (leaseSize + hinfoSize + tsigSize);
+}
+
+//Note: Make sure that RREstimatedSize is updated accordingly if anything that is done here
+//would modify rdlength/rdestimate
+mDNSlocal mDNSu8* BuildUpdateMessage(mDNS *const m, mDNSu8 *ptr, AuthRecord *rr, mDNSu8 *limit)
+{
+    //If this record is deregistering, then just send the deletion record
+    if (rr->state == regState_DeregPending)
+    {
+        rr->expire = 0;     // Indicate that we have no active registration any more
+        ptr = putDeletionRecordWithLimit(&m->omsg, ptr, &rr->resrec, limit);
+        if (!ptr) goto exit;
+        return ptr;
+    }
+
+    // This is a common function to both sending an update in a group or individual
+    // records separately. Hence, we change the state here.
+    if (rr->state == regState_Registered) rr->state = regState_Refresh;
+    if (rr->state != regState_Refresh && rr->state != regState_UpdatePending)
+        rr->state = regState_Pending;
+
+    // For Advisory records like e.g., _services._dns-sd, which is shared, don't send goodbyes as multiple
+    // host might be registering records and deregistering from one does not make sense
+    if (rr->resrec.RecordType != kDNSRecordTypeAdvisory) rr->RequireGoodbye = mDNStrue;
+
+    if ((rr->resrec.rrtype == kDNSType_SRV) && (rr->AutoTarget == Target_AutoHostAndNATMAP) &&
+        !mDNSIPPortIsZero(rr->NATinfo.ExternalPort))
+    {
+        rr->resrec.rdata->u.srv.port = rr->NATinfo.ExternalPort;
+    }
+
+    if (rr->state == regState_UpdatePending)
+    {
+        // delete old RData
+        SetNewRData(&rr->resrec, rr->OrigRData, rr->OrigRDLen);
+        if (!(ptr = putDeletionRecordWithLimit(&m->omsg, ptr, &rr->resrec, limit))) goto exit; // delete old rdata
+
+        // add new RData
+        SetNewRData(&rr->resrec, rr->InFlightRData, rr->InFlightRDLen);
+        if (!(ptr = PutResourceRecordTTLWithLimit(&m->omsg, ptr, &m->omsg.h.mDNS_numUpdates, &rr->resrec, rr->resrec.rroriginalttl, limit))) goto exit;
+    }
+    else
+    {
+        if (rr->resrec.RecordType == kDNSRecordTypeKnownUnique || rr->resrec.RecordType == kDNSRecordTypeVerified)
+        {
+            // KnownUnique : Delete any previous value
+            // For Unicast registrations, we don't verify that it is unique, but set to verified and hence we want to
+            // delete any previous value
+            ptr = putDeleteRRSetWithLimit(&m->omsg, ptr, rr->resrec.name, rr->resrec.rrtype, limit);
+            if (!ptr) goto exit;
+        }
+        else if (rr->resrec.RecordType != kDNSRecordTypeShared)
+        {
+            // For now don't do this, until we have the logic for intelligent grouping of individual records into logical service record sets
+            //ptr = putPrereqNameNotInUse(rr->resrec.name, &m->omsg, ptr, end);
+            if (!ptr) goto exit;
+        }
+
+        ptr = PutResourceRecordTTLWithLimit(&m->omsg, ptr, &m->omsg.h.mDNS_numUpdates, &rr->resrec, rr->resrec.rroriginalttl, limit);
+        if (!ptr) goto exit;
+    }
+
+    return ptr;
+exit:
+    LogMsg("BuildUpdateMessage: Error formatting message for %s", ARDisplayString(m, rr));
+    return mDNSNULL;
+}
+
+// Called with lock held
+mDNSlocal void SendRecordRegistration(mDNS *const m, AuthRecord *rr)
+{
+    mDNSu8 *ptr = m->omsg.data;
+    mStatus err = mStatus_UnknownErr;
+    mDNSu8 *limit;
+    DomainAuthInfo *AuthInfo;
+
+    // For the ability to register large TXT records, we limit the single record registrations
+    // to AbsoluteMaxDNSMessageData
+    limit = ptr + AbsoluteMaxDNSMessageData;
+
+    AuthInfo = GetAuthInfoForName_internal(m, rr->resrec.name);
+    limit -= RRAdditionalSize(m, AuthInfo);
+
+    mDNS_CheckLock(m);
+
+    if (!rr->nta || mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4))
+    {
+        // We never call this function when there is no zone information . Log a message if it ever happens.
+        LogMsg("SendRecordRegistration: No Zone information, should not happen %s", ARDisplayString(m, rr));
+        return;
+    }
+
+    rr->updateid = mDNS_NewMessageID(m);
+    InitializeDNSMessage(&m->omsg.h, rr->updateid, UpdateReqFlags);
+
+    // set zone
+    ptr = putZone(&m->omsg, ptr, limit, rr->zone, mDNSOpaque16fromIntVal(rr->resrec.rrclass));
+    if (!ptr) goto exit;
+
+    if (!(ptr = BuildUpdateMessage(m, ptr, rr, limit))) goto exit;
+
+    if (rr->uselease)
+    {
+        ptr = putUpdateLeaseWithLimit(&m->omsg, ptr, DEFAULT_UPDATE_LEASE, limit);
+        if (!ptr) goto exit;
+    }
+    if (rr->Private)
+    {
+        LogInfo("SendRecordRegistration TCP %p %s", rr->tcp, ARDisplayString(m, rr));
+        if (rr->tcp) LogInfo("SendRecordRegistration: Disposing existing TCP connection for %s", ARDisplayString(m, rr));
+        if (rr->tcp) { DisposeTCPConn(rr->tcp); rr->tcp = mDNSNULL; }
+        if (!rr->nta) { LogMsg("SendRecordRegistration:Private:ERROR!! nta is NULL for %s", ARDisplayString(m, rr)); return; }
+        rr->tcp = MakeTCPConn(m, &m->omsg, ptr, kTCPSocketFlags_UseTLS, &rr->nta->Addr, rr->nta->Port, &rr->nta->Host, mDNSNULL, rr);
+    }
+    else
+    {
+        LogInfo("SendRecordRegistration UDP %s", ARDisplayString(m, rr));
+        if (!rr->nta) { LogMsg("SendRecordRegistration:ERROR!! nta is NULL for %s", ARDisplayString(m, rr)); return; }
+        err = mDNSSendDNSMessage(m, &m->omsg, ptr, mDNSInterface_Any, mDNSNULL, &rr->nta->Addr, rr->nta->Port, mDNSNULL, GetAuthInfoForName_internal(m, rr->resrec.name), mDNSfalse);
+        if (err) debugf("ERROR: SendRecordRegistration - mDNSSendDNSMessage - %d", err);
+    }
+
+    SetRecordRetry(m, rr, 0);
+    return;
+exit:
+    LogMsg("SendRecordRegistration: Error formatting message for %s, disabling further updates", ARDisplayString(m, rr));
+    // Disable this record from future updates
+    rr->state = regState_NoTarget;
+}
+
+// Is the given record "rr" eligible for merging ?
+mDNSlocal mDNSBool IsRecordMergeable(mDNS *const m, AuthRecord *rr, mDNSs32 time)
+{
+    DomainAuthInfo *info;
+    (void) m; //unused
+    // A record is eligible for merge, if the following properties are met.
+    //
+    // 1. uDNS Resource Record
+    // 2. It is time to send them now
+    // 3. It is in proper state
+    // 4. Update zone has been resolved
+    // 5. if DomainAuthInfo exists for the zone, it should not be soon deleted
+    // 6. Zone information is present
+    // 7. Update server is not zero
+    // 8. It has a non-null zone
+    // 9. It uses a lease option
+    // 10. DontMerge is not set
+    //
+    // Following code is implemented as separate "if" statements instead of one "if" statement
+    // is for better debugging purposes e.g., we know exactly what failed if debugging turned on.
+
+    if (!AuthRecord_uDNS(rr)) return mDNSfalse;
+
+    if (rr->LastAPTime + rr->ThisAPInterval - time > 0)
+    { debugf("IsRecordMergeable: Time %d not reached for %s", rr->LastAPTime + rr->ThisAPInterval - m->timenow, ARDisplayString(m, rr)); return mDNSfalse; }
+
+    if (!rr->zone) return mDNSfalse;
+
+    info = GetAuthInfoForName_internal(m, rr->zone);
+
+    if (info && info->deltime && m->timenow - info->deltime >= 0) {debugf("IsRecordMergeable: Domain %##s will be deleted soon", info->domain.c); return mDNSfalse;}
+
+    if (rr->state != regState_DeregPending && rr->state != regState_Pending && rr->state != regState_Registered && rr->state != regState_Refresh && rr->state != regState_UpdatePending)
+    { debugf("IsRecordMergeable: state %d not right  %s", rr->state, ARDisplayString(m, rr)); return mDNSfalse; }
+
+    if (!rr->nta || mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4)) return mDNSfalse;
+
+    if (!rr->uselease) return mDNSfalse;
+
+    if (rr->mState == mergeState_DontMerge) {debugf("IsRecordMergeable Dontmerge true %s", ARDisplayString(m, rr)); return mDNSfalse;}
+    debugf("IsRecordMergeable: Returning true for %s", ARDisplayString(m, rr));
+    return mDNStrue;
+}
+
+// Is the resource record "rr" eligible to merge to with "currentRR" ?
+mDNSlocal mDNSBool AreRecordsMergeable(mDNS *const m, AuthRecord *currentRR, AuthRecord *rr, mDNSs32 time)
+{
+    // A record is eligible to merge with another record as long it is eligible for merge in itself
+    // and it has the same zone information as the other record
+    if (!IsRecordMergeable(m, rr, time)) return mDNSfalse;
+
+    if (!SameDomainName(currentRR->zone, rr->zone))
+    { debugf("AreRecordMergeable zone mismatch current rr Zone %##s, rr zone  %##s", currentRR->zone->c, rr->zone->c); return mDNSfalse; }
+
+    if (!mDNSSameIPv4Address(currentRR->nta->Addr.ip.v4, rr->nta->Addr.ip.v4)) return mDNSfalse;
+
+    if (!mDNSSameIPPort(currentRR->nta->Port, rr->nta->Port)) return mDNSfalse;
+
+    debugf("AreRecordsMergeable: Returning true for %s", ARDisplayString(m, rr));
+    return mDNStrue;
+}
+
+// If we can't build the message successfully because of problems in pre-computing
+// the space, we disable merging for all the current records
+mDNSlocal void RRMergeFailure(mDNS *const m)
+{
+    AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+    {
+        rr->mState = mergeState_DontMerge;
+        rr->SendRNow = mDNSNULL;
+        // Restarting the registration is much simpler than saving and restoring
+        // the exact time
+        ActivateUnicastRegistration(m, rr);
+    }
+}
+
+mDNSlocal void SendGroupRRMessage(mDNS *const m, AuthRecord *anchorRR, mDNSu8 *ptr, DomainAuthInfo *info)
+{
+    mDNSu8 *limit;
+    if (!anchorRR) {debugf("SendGroupRRMessage: Could not merge records"); return;}
+
+    if (info && info->AutoTunnel) limit = m->omsg.data + AbsoluteMaxDNSMessageData;
+    else limit = m->omsg.data + NormalMaxDNSMessageData;
+
+    // This has to go in the additional section and hence need to be done last
+    ptr = putUpdateLeaseWithLimit(&m->omsg, ptr, DEFAULT_UPDATE_LEASE, limit);
+    if (!ptr)
+    {
+        LogMsg("SendGroupRRMessage: ERROR: Could not put lease option, failing the group registration");
+        // if we can't put the lease, we need to undo the merge
+        RRMergeFailure(m);
+        return;
+    }
+    if (anchorRR->Private)
+    {
+        if (anchorRR->tcp) debugf("SendGroupRRMessage: Disposing existing TCP connection for %s", ARDisplayString(m, anchorRR));
+        if (anchorRR->tcp) { DisposeTCPConn(anchorRR->tcp); anchorRR->tcp = mDNSNULL; }
+        if (!anchorRR->nta) { LogMsg("SendGroupRRMessage:ERROR!! nta is NULL for %s", ARDisplayString(m, anchorRR)); return; }
+        anchorRR->tcp = MakeTCPConn(m, &m->omsg, ptr, kTCPSocketFlags_UseTLS, &anchorRR->nta->Addr, anchorRR->nta->Port, &anchorRR->nta->Host, mDNSNULL, anchorRR);
+        if (!anchorRR->tcp) LogInfo("SendGroupRRMessage: Cannot establish TCP connection for %s", ARDisplayString(m, anchorRR));
+        else LogInfo("SendGroupRRMessage: Sent a group update ID: %d start %p, end %p, limit %p", mDNSVal16(m->omsg.h.id), m->omsg.data, ptr, limit);
+    }
+    else
+    {
+        mStatus err = mDNSSendDNSMessage(m, &m->omsg, ptr, mDNSInterface_Any, mDNSNULL, &anchorRR->nta->Addr, anchorRR->nta->Port, mDNSNULL, info, mDNSfalse);
+        if (err) LogInfo("SendGroupRRMessage: Cannot send UDP message for %s", ARDisplayString(m, anchorRR));
+        else LogInfo("SendGroupRRMessage: Sent a group UDP update ID: %d start %p, end %p, limit %p", mDNSVal16(m->omsg.h.id), m->omsg.data, ptr, limit);
+    }
+    return;
+}
+
+// As we always include the zone information and the resource records contain zone name
+// at the end, it will get compressed. Hence, we subtract zoneSize and add two bytes for
+// the compression pointer
+mDNSlocal mDNSu32 RREstimatedSize(AuthRecord *rr, int zoneSize)
+{
+    int rdlength;
+
+    // Note: Estimation of the record size has to mirror the logic in BuildUpdateMessage, otherwise estimation
+    // would be wrong. Currently BuildUpdateMessage calls SetNewRData in UpdatePending case. Hence, we need
+    // to account for that here. Otherwise, we might under estimate the size.
+    if (rr->state == regState_UpdatePending)
+        // old RData that will be deleted
+        // new RData that will be added
+        rdlength = rr->OrigRDLen + rr->InFlightRDLen;
+    else
+        rdlength = rr->resrec.rdestimate;
+
+    if (rr->state == regState_DeregPending)
+    {
+        debugf("RREstimatedSize: ResourceRecord %##s (%s), DomainNameLength %d, zoneSize %d, rdestimate %d",
+               rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), DomainNameLength(rr->resrec.name), zoneSize, rdlength);
+        return DomainNameLength(rr->resrec.name) - zoneSize + 2 + 10 + rdlength;
+    }
+
+    // For SRV, TXT, AAAA etc. that are Unique/Verified, we also send a Deletion Record
+    if (rr->resrec.RecordType == kDNSRecordTypeKnownUnique || rr->resrec.RecordType == kDNSRecordTypeVerified)
+    {
+        // Deletion Record: Resource Record Name + Base size (10) + 0
+        // Record: Resource Record Name (Compressed = 2) + Base size (10) + rdestimate
+
+        debugf("RREstimatedSize: ResourceRecord %##s (%s), DomainNameLength %d, zoneSize %d, rdestimate %d",
+               rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), DomainNameLength(rr->resrec.name), zoneSize, rdlength);
+        return DomainNameLength(rr->resrec.name) - zoneSize + 2 + 10 + 2 + 10 + rdlength;
+    }
+    else
+    {
+        return DomainNameLength(rr->resrec.name) - zoneSize + 2 + 10 + rdlength;
+    }
+}
+
+mDNSlocal AuthRecord *MarkRRForSending(mDNS *const m)
+{
+    AuthRecord *rr;
+    AuthRecord *firstRR = mDNSNULL;
+
+    // Look for records that needs to be sent in the next two seconds (MERGE_DELAY_TIME is set to 1 second).
+    // The logic is as follows.
+    //
+    // 1. Record 1 finishes getting zone data and its registration gets delayed by 1 second
+    // 2. Record 2 comes 0.1 second later, finishes getting its zone data and its registration is also delayed by
+    //    1 second which is now scheduled at 1.1 second
+    //
+    // By looking for 1 second into the future (m->timenow + MERGE_DELAY_TIME below does that) we have merged both
+    // of the above records. Note that we can't look for records too much into the future as this will affect the
+    // retry logic. The first retry is scheduled at 3 seconds. Hence, we should always look smaller than that.
+    // Anything more than one second will affect the first retry to happen sooner.
+    //
+    // Note: As a side effect of looking one second into the future to facilitate merging, the retries happen
+    // one second sooner.
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+    {
+        if (!firstRR)
+        {
+            if (!IsRecordMergeable(m, rr, m->timenow + MERGE_DELAY_TIME)) continue;
+            firstRR = rr;
+        }
+        else if (!AreRecordsMergeable(m, firstRR, rr, m->timenow + MERGE_DELAY_TIME)) continue;
+
+        if (rr->SendRNow) LogMsg("MarkRRForSending: Resourcerecord %s already marked for sending", ARDisplayString(m, rr));
+        rr->SendRNow = uDNSInterfaceMark;
+    }
+
+    // We parsed through all records and found something to send. The services/records might
+    // get registered at different times but we want the refreshes to be all merged and sent
+    // as one update. Hence, we accelerate some of the records so that they will sync up in
+    // the future. Look at the records excluding the ones that we have already sent in the
+    // previous pass. If it half way through its scheduled refresh/retransmit, merge them
+    // into this packet.
+    //
+    // Note that we only look at Registered/Refresh state to keep it simple. As we don't know
+    // whether the current update will fit into one or more packets, merging a resource record
+    // (which is in a different state) that has been scheduled for retransmit would trigger
+    // sending more packets.
+    if (firstRR)
+    {
+        int acc = 0;
+        for (rr = m->ResourceRecords; rr; rr = rr->next)
+        {
+            if ((rr->state != regState_Registered && rr->state != regState_Refresh) ||
+                (rr->SendRNow == uDNSInterfaceMark) ||
+                (!AreRecordsMergeable(m, firstRR, rr, m->timenow + rr->ThisAPInterval/2)))
+                continue;
+            rr->SendRNow = uDNSInterfaceMark;
+            acc++;
+        }
+        if (acc) LogInfo("MarkRRForSending: Accelereated %d records", acc);
+    }
+    return firstRR;
+}
+
+mDNSlocal mDNSBool SendGroupUpdates(mDNS *const m)
+{
+    mDNSOpaque16 msgid;
+    mDNSs32 spaceleft = 0;
+    mDNSs32 zoneSize, rrSize;
+    mDNSu8 *oldnext; // for debugging
+    mDNSu8 *next = m->omsg.data;
+    AuthRecord *rr;
+    AuthRecord *anchorRR = mDNSNULL;
+    int nrecords = 0;
+    AuthRecord *startRR = m->ResourceRecords;
+    mDNSu8 *limit = mDNSNULL;
+    DomainAuthInfo *AuthInfo = mDNSNULL;
+    mDNSBool sentallRecords = mDNStrue;
+
+
+    // We try to fit as many ResourceRecords as possible in AbsoluteNormal/MaxDNSMessageData. Before we start
+    // putting in resource records, we need to reserve space for a few things. Every group/packet should
+    // have the following.
+    //
+    // 1) Needs space for the Zone information (which needs to be at the beginning)
+    // 2) Additional section MUST have space for lease option, HINFO and TSIG option (which needs to
+    //    to be at the end)
+    //
+    // In future we need to reserve space for the pre-requisites which also goes at the beginning.
+    // To accomodate pre-requisites in the future, first we walk the whole list marking records
+    // that can be sent in this packet and computing the space needed for these records.
+    // For TXT and SRV records, we delete the previous record if any by sending the same
+    // resource record with ANY RDATA and zero rdlen. Hence, we need to have space for both of them.
+
+    while (startRR)
+    {
+        AuthInfo = mDNSNULL;
+        anchorRR = mDNSNULL;
+        nrecords = 0;
+        zoneSize = 0;
+        for (rr = startRR; rr; rr = rr->next)
+        {
+            if (rr->SendRNow != uDNSInterfaceMark) continue;
+
+            rr->SendRNow = mDNSNULL;
+
+            if (!anchorRR)
+            {
+                AuthInfo = GetAuthInfoForName_internal(m, rr->zone);
+
+                // Though we allow single record registrations for UDP to be AbsoluteMaxDNSMessageData (See
+                // SendRecordRegistration) to handle large TXT records, to avoid fragmentation we limit UDP
+                // message to NormalMaxDNSMessageData
+                if (AuthInfo && AuthInfo->AutoTunnel) spaceleft = AbsoluteMaxDNSMessageData;
+                else spaceleft = NormalMaxDNSMessageData;
+
+                next = m->omsg.data;
+                spaceleft -= RRAdditionalSize(m, AuthInfo);
+                if (spaceleft <= 0)
+                {
+                    LogMsg("SendGroupUpdates: ERROR!!: spaceleft is zero at the beginning");
+                    RRMergeFailure(m);
+                    return mDNSfalse;
+                }
+                limit = next + spaceleft;
+
+                // Build the initial part of message before putting in the other records
+                msgid = mDNS_NewMessageID(m);
+                InitializeDNSMessage(&m->omsg.h, msgid, UpdateReqFlags);
+
+                // We need zone information at the beginning of the packet. Length: ZNAME, ZTYPE(2), ZCLASS(2)
+                // zone has to be non-NULL for a record to be mergeable, hence it is safe to set/ examine zone
+                //without checking for NULL.
+                zoneSize = DomainNameLength(rr->zone) + 4;
+                spaceleft -= zoneSize;
+                if (spaceleft <= 0)
+                {
+                    LogMsg("SendGroupUpdates: ERROR no space for zone information, disabling merge");
+                    RRMergeFailure(m);
+                    return mDNSfalse;
+                }
+                next = putZone(&m->omsg, next, limit, rr->zone, mDNSOpaque16fromIntVal(rr->resrec.rrclass));
+                if (!next)
+                {
+                    LogMsg("SendGroupUpdates: ERROR! Cannot put zone, disabling merge");
+                    RRMergeFailure(m);
+                    return mDNSfalse;
+                }
+                anchorRR = rr;
+            }
+
+            rrSize = RREstimatedSize(rr, zoneSize - 4);
+
+            if ((spaceleft - rrSize) < 0)
+            {
+                // If we can't fit even a single message, skip it, it will be sent separately
+                // in CheckRecordUpdates
+                if (!nrecords)
+                {
+                    LogInfo("SendGroupUpdates: Skipping message %s, spaceleft %d, rrSize %d", ARDisplayString(m, rr), spaceleft, rrSize);
+                    // Mark this as not sent so that the caller knows about it
+                    rr->SendRNow = uDNSInterfaceMark;
+                    // We need to remove the merge delay so that we can send it immediately
+                    rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+                    rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+                    rr = rr->next;
+                    anchorRR = mDNSNULL;
+                    sentallRecords = mDNSfalse;
+                }
+                else
+                {
+                    LogInfo("SendGroupUpdates:1: Parsed %d records and sending using %s, spaceleft %d, rrSize %d", nrecords, ARDisplayString(m, anchorRR), spaceleft, rrSize);
+                    SendGroupRRMessage(m, anchorRR, next, AuthInfo);
+                }
+                break;      // breaks out of for loop
+            }
+            spaceleft -= rrSize;
+            oldnext = next;
+            LogInfo("SendGroupUpdates: Building a message with resource record %s, next %p, state %d, ttl %d", ARDisplayString(m, rr), next, rr->state, rr->resrec.rroriginalttl);
+            if (!(next = BuildUpdateMessage(m, next, rr, limit)))
+            {
+                // We calculated the space and if we can't fit in, we had some bug in the calculation,
+                // disable merge completely.
+                LogMsg("SendGroupUpdates: ptr NULL while building message with %s", ARDisplayString(m, rr));
+                RRMergeFailure(m);
+                return mDNSfalse;
+            }
+            // If our estimate was higher, adjust to the actual size
+            if ((next - oldnext) > rrSize)
+                LogMsg("SendGroupUpdates: ERROR!! Record size estimation is wrong for %s, Estimate %d, Actual %d, state %d", ARDisplayString(m, rr), rrSize, next - oldnext, rr->state);
+            else { spaceleft += rrSize; spaceleft -= (next - oldnext); }
+
+            nrecords++;
+            // We could have sent an update earlier with this "rr" as anchorRR for which we never got a response.
+            // To preserve ordering, we blow away the previous connection before sending this.
+            if (rr->tcp) { DisposeTCPConn(rr->tcp); rr->tcp = mDNSNULL;}
+            rr->updateid = msgid;
+
+            // By setting the retry time interval here, we will not be looking at these records
+            // again when we return to CheckGroupRecordUpdates.
+            SetRecordRetry(m, rr, 0);
+        }
+        // Either we have parsed all the records or stopped at "rr" above due to lack of space
+        startRR = rr;
+    }
+
+    if (anchorRR)
+    {
+        LogInfo("SendGroupUpdates: Parsed %d records and sending using %s", nrecords, ARDisplayString(m, anchorRR));
+        SendGroupRRMessage(m, anchorRR, next, AuthInfo);
+    }
+    return sentallRecords;
+}
+
+// Merge the record registrations and send them as a group only if they
+// have same DomainAuthInfo and hence the same key to put the TSIG
+mDNSlocal void CheckGroupRecordUpdates(mDNS *const m)
+{
+    AuthRecord *rr, *nextRR;
+    // Keep sending as long as there is at least one record to be sent
+    while (MarkRRForSending(m))
+    {
+        if (!SendGroupUpdates(m))
+        {
+            // if everything that was marked was not sent, send them out individually
+            for (rr = m->ResourceRecords; rr; rr = nextRR)
+            {
+                // SendRecordRegistrtion might delete the rr from list, hence
+                // dereference nextRR before calling the function
+                nextRR = rr->next;
+                if (rr->SendRNow == uDNSInterfaceMark)
+                {
+                    // Any records marked for sending should be eligible to be sent out
+                    // immediately. Just being cautious
+                    if (rr->LastAPTime + rr->ThisAPInterval - m->timenow > 0)
+                    { LogMsg("CheckGroupRecordUpdates: ERROR!! Resourcerecord %s not ready", ARDisplayString(m, rr)); continue; }
+                    rr->SendRNow = mDNSNULL;
+                    SendRecordRegistration(m, rr);
+                }
+            }
+        }
+    }
+
+    debugf("CheckGroupRecordUpdates: No work, returning");
+    return;
+}
+
+mDNSlocal void hndlSRVChanged(mDNS *const m, AuthRecord *rr)
+{
+    // Reevaluate the target always as NAT/Target could have changed while
+    // we were registering/deeregistering
+    domainname *dt;
+    const domainname *target = GetServiceTarget(m, rr);
+    if (!target || target->c[0] == 0)
+    {
+        // we don't have a target, if we just derregistered, then we don't have to do anything
+        if (rr->state == regState_DeregPending)
+        {
+            LogInfo("hndlSRVChanged: SRVChanged, No Target, SRV Deregistered for %##s, state %d", rr->resrec.name->c,
+                    rr->state);
+            rr->SRVChanged = mDNSfalse;
+            dt = GetRRDomainNameTarget(&rr->resrec);
+            if (dt) dt->c[0] = 0;
+            rr->state = regState_NoTarget;  // Wait for the next target change
+            rr->resrec.rdlength = rr->resrec.rdestimate = 0;
+            return;
+        }
+
+        // we don't have a target, if we just registered, we need to deregister
+        if (rr->state == regState_Pending)
+        {
+            LogInfo("hndlSRVChanged: SRVChanged, No Target, Deregistering again %##s, state %d", rr->resrec.name->c, rr->state);
+            rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+            rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+            rr->state = regState_DeregPending;
+            return;
+        }
+        LogInfo("hndlSRVChanged: Not in DeregPending or RegPending state %##s, state %d", rr->resrec.name->c, rr->state);
+    }
+    else
+    {
+        // If we were in registered state and SRV changed to NULL, we deregister and come back here
+        // if we have a target, we need to register again.
+        //
+        // if we just registered check to see if it is same. If it is different just re-register the
+        // SRV and its assoicated records
+        //
+        // UpdateOneSRVRecord takes care of re-registering all service records
+        if ((rr->state == regState_DeregPending) ||
+            (rr->state == regState_Pending && !SameDomainName(target, &rr->resrec.rdata->u.srv.target)))
+        {
+            dt = GetRRDomainNameTarget(&rr->resrec);
+            if (dt) dt->c[0] = 0;
+            rr->state = regState_NoTarget;  // NoTarget will allow us to pick up new target OR nat traversal state
+            rr->resrec.rdlength = rr->resrec.rdestimate = 0;
+            LogInfo("hndlSRVChanged: SRVChanged, Valid Target %##s, Registering all records for %##s, state %d",
+                    target->c, rr->resrec.name->c, rr->state);
+            rr->SRVChanged = mDNSfalse;
+            UpdateOneSRVRecord(m, rr);
+            return;
+        }
+        // Target did not change while this record was registering. Hence, we go to
+        // Registered state - the state we started from.
+        if (rr->state == regState_Pending) rr->state = regState_Registered;
+    }
+
+    rr->SRVChanged = mDNSfalse;
+}
+
+// Called with lock held
+mDNSlocal void hndlRecordUpdateReply(mDNS *m, AuthRecord *rr, mStatus err, mDNSu32 random)
+{
+    mDNSBool InvokeCallback = mDNStrue;
+    mDNSIPPort UpdatePort = zeroIPPort;
+
+    mDNS_CheckLock(m);
+
+    LogInfo("hndlRecordUpdateReply: err %d ID %d state %d %s(%p)", err, mDNSVal16(rr->updateid), rr->state, ARDisplayString(m, rr), rr);
+
+    rr->updateError = err;
+#if APPLE_OSX_mDNSResponder
+    if (err == mStatus_BadSig || err == mStatus_BadKey || err == mStatus_BadTime) UpdateAutoTunnelDomainStatuses(m);
+#endif
+
+    SetRecordRetry(m, rr, random);
+
+    rr->updateid = zeroID;  // Make sure that this is not considered as part of a group anymore
+    // Later when need to send an update, we will get the zone data again. Thus we avoid
+    // using stale information.
+    //
+    // Note: By clearing out the zone info here, it also helps better merging of records
+    // in some cases. For example, when we get out regState_NoTarget state e.g., move out
+    // of Double NAT, we want all the records to be in one update. Some BTMM records like
+    // _autotunnel6 and host records are registered/deregistered when NAT state changes.
+    // As they are re-registered the zone information is cleared out. To merge with other
+    // records that might be possibly going out, clearing out the information here helps
+    // as all of them try to get the zone data.
+    if (rr->nta)
+    {
+        // We always expect the question to be stopped when we get a valid response from the server.
+        // If the zone info tries to change during this time, updateid would be different and hence
+        // this response should not have been accepted.
+        if (rr->nta->question.ThisQInterval != -1)
+            LogMsg("hndlRecordUpdateReply: ResourceRecord %s, zone info question %##s (%s) interval %d not -1",
+                   ARDisplayString(m, rr), rr->nta->question.qname.c, DNSTypeName(rr->nta->question.qtype), rr->nta->question.ThisQInterval);
+        UpdatePort = rr->nta->Port;
+        CancelGetZoneData(m, rr->nta);
+        rr->nta = mDNSNULL;
+    }
+
+    // If we are deregistering the record, then complete the deregistration. Ignore any NAT/SRV change
+    // that could have happened during that time.
+    if (rr->resrec.RecordType == kDNSRecordTypeDeregistering && rr->state == regState_DeregPending)
+    {
+        debugf("hndlRecordUpdateReply: Received reply for deregister record %##s type %d", rr->resrec.name->c, rr->resrec.rrtype);
+        if (err) LogMsg("ERROR: Deregistration of record %##s type %d failed with error %d",
+                        rr->resrec.name->c, rr->resrec.rrtype, err);
+        rr->state = regState_Unregistered;
+        CompleteDeregistration(m, rr);
+        return;
+    }
+
+    // We are returning early without updating the state. When we come back from sleep we will re-register after
+    // re-initializing all the state as though it is a first registration. If the record can't be registered e.g.,
+    // no target, it will be deregistered. Hence, the updating to the right state should not matter when going
+    // to sleep.
+    if (m->SleepState)
+    {
+        // Need to set it to NoTarget state so that RecordReadyForSleep knows that
+        // we are done
+        if (rr->resrec.rrtype == kDNSType_SRV && rr->state == regState_DeregPending)
+            rr->state = regState_NoTarget;
+        return;
+    }
+
+    if (rr->state == regState_UpdatePending)
+    {
+        if (err) LogMsg("Update record failed for %##s (err %d)", rr->resrec.name->c, err);
+        rr->state = regState_Registered;
+        // deallocate old RData
+        if (rr->UpdateCallback) rr->UpdateCallback(m, rr, rr->OrigRData, rr->OrigRDLen);
+        SetNewRData(&rr->resrec, rr->InFlightRData, rr->InFlightRDLen);
+        rr->OrigRData = mDNSNULL;
+        rr->InFlightRData = mDNSNULL;
+    }
+
+    if (rr->SRVChanged)
+    {
+        if (rr->resrec.rrtype == kDNSType_SRV)
+            hndlSRVChanged(m, rr);
+        else
+        {
+            LogInfo("hndlRecordUpdateReply: Deregistered %##s (%s), state %d", rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype), rr->state);
+            rr->SRVChanged = mDNSfalse;
+            if (rr->state != regState_DeregPending) LogMsg("hndlRecordUpdateReply: ResourceRecord %s not in DeregPending state %d", ARDisplayString(m, rr), rr->state);
+            rr->state = regState_NoTarget;  // Wait for the next target change
+        }
+        return;
+    }
+
+    if (rr->state == regState_Pending || rr->state == regState_Refresh)
+    {
+        if (!err)
+        {
+            if (rr->state == regState_Refresh) InvokeCallback = mDNSfalse;
+            rr->state = regState_Registered;
+        }
+        else
+        {
+            // Retry without lease only for non-Private domains
+            LogMsg("hndlRecordUpdateReply: Registration of record %##s type %d failed with error %d", rr->resrec.name->c, rr->resrec.rrtype, err);
+            if (!rr->Private && rr->uselease && err == mStatus_UnknownErr && mDNSSameIPPort(UpdatePort, UnicastDNSPort))
+            {
+                LogMsg("hndlRecordUpdateReply: Will retry update of record %##s without lease option", rr->resrec.name->c);
+                rr->uselease = mDNSfalse;
+                rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+                rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+                SetNextuDNSEvent(m, rr);
+                return;
+            }
+            // Communicate the error to the application in the callback below
+        }
+    }
+
+    if (rr->QueuedRData && rr->state == regState_Registered)
+    {
+        rr->state = regState_UpdatePending;
+        rr->InFlightRData = rr->QueuedRData;
+        rr->InFlightRDLen = rr->QueuedRDLen;
+        rr->OrigRData = rr->resrec.rdata;
+        rr->OrigRDLen = rr->resrec.rdlength;
+        rr->QueuedRData = mDNSNULL;
+        rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+        rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+        SetNextuDNSEvent(m, rr);
+        return;
+    }
+
+    // Don't invoke the callback on error as this may not be useful to the client.
+    // The client may potentially delete the resource record on error which we normally
+    // delete during deregistration
+    if (!err && InvokeCallback && rr->RecordCallback)
+    {
+        LogInfo("hndlRecordUpdateReply: Calling record callback on %##s", rr->resrec.name->c);
+        mDNS_DropLockBeforeCallback();
+        rr->RecordCallback(m, rr, err);
+        mDNS_ReclaimLockAfterCallback();
+    }
+    // CAUTION: MUST NOT do anything more with rr after calling rr->Callback(), because the client's callback function
+    // is allowed to do anything, including starting/stopping queries, registering/deregistering records, etc.
+}
+
+mDNSlocal void uDNS_ReceiveNATPMPPacket(mDNS *m, const mDNSInterfaceID InterfaceID, mDNSu8 *pkt, mDNSu16 len)
+{
+    NATTraversalInfo *ptr;
+    NATAddrReply     *AddrReply    = (NATAddrReply    *)pkt;
+    NATPortMapReply  *PortMapReply = (NATPortMapReply *)pkt;
+    mDNSu32 nat_elapsed, our_elapsed;
+
+    // Minimum NAT-PMP packet is vers (1) opcode (1) + err (2) = 4 bytes
+    if (len < 4) { LogMsg("NAT-PMP message too short (%d bytes)", len); return; }
+    
+    // Read multi-byte error value (field is identical in a NATPortMapReply)
+    AddrReply->err = (mDNSu16) ((mDNSu16)pkt[2] << 8 | pkt[3]);
+    
+    if (AddrReply->err == NATErr_Vers)
+    {
+        NATTraversalInfo *n;        
+        LogInfo("NAT-PMP version unsupported message received");
+        for (n = m->NATTraversals; n; n=n->next)
+        {
+            // Send a NAT-PMP request for this operation as needed
+            // and update the state variables
+            uDNS_SendNATMsg(m, n, mDNSfalse);
+        }
+        
+        m->NextScheduledNATOp = m->timenow;
+
+        return;
+    }
+
+    // The minimum reasonable NAT-PMP packet length is vers (1) + opcode (1) + err (2) + upseconds (4) = 8 bytes
+    // If it's not at least this long, bail before we byte-swap the upseconds field & overrun our buffer.
+    // The retry timer will ensure we converge to correctness.
+    if (len < 8)
+    {
+        LogMsg("NAT-PMP message too short (%d bytes) 0x%X 0x%X", len, AddrReply->opcode, AddrReply->err);
+        return;
+    }
+    
+    // Read multi-byte upseconds value (field is identical in a NATPortMapReply)
+    AddrReply->upseconds = (mDNSs32) ((mDNSs32)pkt[4] << 24 | (mDNSs32)pkt[5] << 16 | (mDNSs32)pkt[6] << 8 | pkt[7]);
+
+    nat_elapsed = AddrReply->upseconds - m->LastNATupseconds;
+    our_elapsed = (m->timenow - m->LastNATReplyLocalTime) / mDNSPlatformOneSecond;
+    debugf("uDNS_ReceiveNATPMPPacket %X upseconds %u nat_elapsed %d our_elapsed %d", AddrReply->opcode, AddrReply->upseconds, nat_elapsed, our_elapsed);
+
+    // We compute a conservative estimate of how much the NAT gateways's clock should have advanced
+    // 1. We subtract 12.5% from our own measured elapsed time, to allow for NAT gateways that have an inacurate clock that runs slowly
+    // 2. We add a two-second safety margin to allow for rounding errors: e.g.
+    //    -- if NAT gateway sends a packet at t=2.000 seconds, then one at t=7.999, that's approximately 6 real seconds,
+    //       but based on the values in the packet (2,7) the apparent difference according to the packet is only 5 seconds
+    //    -- if we're slow handling packets and/or we have coarse clock granularity,
+    //       we could receive the t=2 packet at our t=1.999 seconds, which we round down to 1
+    //       and the t=7.999 packet at our t=8.000 seconds, which we record as 8,
+    //       giving an apparent local time difference of 7 seconds
+    //    The two-second safety margin coves this possible calculation discrepancy
+    if (AddrReply->upseconds < m->LastNATupseconds || nat_elapsed + 2 < our_elapsed - our_elapsed/8)
+    { LogMsg("NAT-PMP epoch time check failed: assuming NAT gateway %#a rebooted", &m->Router); RecreateNATMappings(m, 0); }
+
+    m->LastNATupseconds      = AddrReply->upseconds;
+    m->LastNATReplyLocalTime = m->timenow;
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    LNT_ClearState(m);
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+    if (AddrReply->opcode == NATOp_AddrResponse)
+    {
+#if APPLE_OSX_mDNSResponder
+        static char msgbuf[16];
+        mDNS_snprintf(msgbuf, sizeof(msgbuf), "%d", AddrReply->err);
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.natpmp.AddressRequest", AddrReply->err ? "failure" : "success", msgbuf, "");
+#endif
+        if (!AddrReply->err && len < sizeof(NATAddrReply)) { LogMsg("NAT-PMP AddrResponse message too short (%d bytes)", len); return; }
+        natTraversalHandleAddressReply(m, AddrReply->err, AddrReply->ExtAddr);
+    }
+    else if (AddrReply->opcode == NATOp_MapUDPResponse || AddrReply->opcode == NATOp_MapTCPResponse)
+    {
+        mDNSu8 Protocol = AddrReply->opcode & 0x7F;
+#if APPLE_OSX_mDNSResponder
+        static char msgbuf[16];
+        mDNS_snprintf(msgbuf, sizeof(msgbuf), "%s - %d", AddrReply->opcode == NATOp_MapUDPResponse ? "UDP" : "TCP", PortMapReply->err);
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.natpmp.PortMapRequest", PortMapReply->err ? "failure" : "success", msgbuf, "");
+#endif
+        if (!PortMapReply->err)
+        {
+            if (len < sizeof(NATPortMapReply)) { LogMsg("NAT-PMP PortMapReply message too short (%d bytes)", len); return; }
+            PortMapReply->NATRep_lease = (mDNSu32) ((mDNSu32)pkt[12] << 24 | (mDNSu32)pkt[13] << 16 | (mDNSu32)pkt[14] << 8 | pkt[15]);
+        }
+
+        // Since some NAT-PMP server implementations don't return the requested internal port in
+        // the reply, we can't associate this reply with a particular NATTraversalInfo structure.
+        // We globally keep track of the most recent error code for mappings.
+        m->LastNATMapResultCode = PortMapReply->err;
+
+        for (ptr = m->NATTraversals; ptr; ptr=ptr->next)
+            if (ptr->Protocol == Protocol && mDNSSameIPPort(ptr->IntPort, PortMapReply->intport))
+                natTraversalHandlePortMapReply(m, ptr, InterfaceID, PortMapReply->err, PortMapReply->extport, PortMapReply->NATRep_lease, NATTProtocolNATPMP);
+    }
+    else { LogMsg("Received NAT-PMP response with unknown opcode 0x%X", AddrReply->opcode); return; }
+
+    // Don't need an SSDP socket if we get a NAT-PMP packet
+    if (m->SSDPSocket) { debugf("uDNS_ReceiveNATPMPPacket destroying SSDPSocket %p", &m->SSDPSocket); mDNSPlatformUDPClose(m->SSDPSocket); m->SSDPSocket = mDNSNULL; }
+}
+
+mDNSlocal void uDNS_ReceivePCPPacket(mDNS *m, const mDNSInterfaceID InterfaceID, mDNSu8 *pkt, mDNSu16 len)
+{
+    NATTraversalInfo *ptr;
+    PCPMapReply *reply = (PCPMapReply*)pkt;
+    mDNSu32 client_delta, server_delta;
+    mDNSBool checkEpochValidity = m->LastNATupseconds != 0;
+    mDNSu8 strippedOpCode;
+    mDNSv4Addr mappedAddress = zerov4Addr;
+    mDNSu8 protocol = 0;
+    mDNSIPPort intport = zeroIPPort;
+    mDNSIPPort extport = zeroIPPort;
+    
+    // Minimum PCP packet is 24 bytes
+    if (len < 24)
+    {
+        LogMsg("uDNS_ReceivePCPPacket: message too short (%d bytes)", len);
+        return;
+    }
+    
+    strippedOpCode = reply->opCode & 0x7f;
+    
+    if ((reply->opCode & 0x80) == 0x00 || (strippedOpCode != PCPOp_Announce && strippedOpCode != PCPOp_Map))
+    {
+        LogMsg("uDNS_ReceivePCPPacket: unhandled opCode %u", reply->opCode);
+        return;
+    }
+
+    // Read multi-byte values
+    reply->lifetime = (mDNSs32)((mDNSs32)pkt[4] << 24 | (mDNSs32)pkt[5] << 16 | (mDNSs32)pkt[ 6] << 8 | pkt[ 7]);
+    reply->epoch    = (mDNSs32)((mDNSs32)pkt[8] << 24 | (mDNSs32)pkt[9] << 16 | (mDNSs32)pkt[10] << 8 | pkt[11]);
+
+    client_delta = (m->timenow - m->LastNATReplyLocalTime) / mDNSPlatformOneSecond;
+    server_delta = reply->epoch - m->LastNATupseconds;
+    debugf("uDNS_ReceivePCPPacket: %X %X upseconds %u client_delta %d server_delta %d", reply->opCode, reply->result, reply->epoch, client_delta, server_delta);
+
+    // If seconds since the epoch is 0, use 1 so we'll check epoch validity next time
+    m->LastNATupseconds      = reply->epoch ? reply->epoch : 1;
+    m->LastNATReplyLocalTime = m->timenow;
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+    LNT_ClearState(m);
+#endif // _LEGACY_NAT_TRAVERSAL_
+
+    // Don't need an SSDP socket if we get a PCP packet
+    if (m->SSDPSocket) { debugf("uDNS_ReceivePCPPacket: destroying SSDPSocket %p", &m->SSDPSocket); mDNSPlatformUDPClose(m->SSDPSocket); m->SSDPSocket = mDNSNULL; }
+
+    if (checkEpochValidity && (client_delta + 2 < server_delta - server_delta / 16 || server_delta + 2 < client_delta - client_delta / 16))
+    {
+        // If this is an ANNOUNCE packet, wait a random interval up to 5 seconds
+        // otherwise, refresh immediately
+        mDNSu32 waitTicks = strippedOpCode ? 0 : mDNSRandom(PCP_WAITSECS_AFTER_EPOCH_INVALID * mDNSPlatformOneSecond);
+        LogMsg("uDNS_ReceivePCPPacket: Epoch invalid, %#a likely rebooted, waiting %u ticks", &m->Router, waitTicks);
+        RecreateNATMappings(m, waitTicks);
+        // we can ignore the rest of this packet, as new requests are about to go out
+        return;
+    }
+
+    if (strippedOpCode == PCPOp_Announce)
+        return;
+    
+    // We globally keep track of the most recent error code for mappings.
+    // This seems bad to do with PCP, but best not change it now.
+    m->LastNATMapResultCode = reply->result;
+    
+    if (!reply->result)
+    {
+        if (len < sizeof(PCPMapReply))
+        {
+            LogMsg("uDNS_ReceivePCPPacket: mapping response too short (%d bytes)", len);
+            return;
+        }
+        
+        // Check the nonce
+        if (reply->nonce[0] != m->PCPNonce[0] || reply->nonce[1] != m->PCPNonce[1] || reply->nonce[2] != m->PCPNonce[2])
+        {
+            LogMsg("uDNS_ReceivePCPPacket: invalid nonce, ignoring. received { %x %x %x } expected { %x %x %x }",
+                   reply->nonce[0], reply->nonce[1], reply->nonce[2],
+                    m->PCPNonce[0],  m->PCPNonce[1],  m->PCPNonce[2]);
+            return;
+        }
+
+        // Get the values
+        protocol = reply->protocol;
+        intport = reply->intPort;
+        extport = reply->extPort;
+
+        // Get the external address, which should be mapped, since we only support IPv4
+        if (!mDNSAddrIPv4FromMappedIPv6(&reply->extAddress, &mappedAddress))
+        {
+            LogMsg("uDNS_ReceivePCPPacket: unexpected external address: %.16a", &reply->extAddress);
+            reply->result = NATErr_NetFail;
+            // fall through to report the error
+        }
+        else if (mDNSIPv4AddressIsZero(mappedAddress))
+        {
+            // If this is the deletion case, we will have sent the zero IPv4-mapped address
+            // in our request, and the server should reflect it in the response, so we
+            // should not log about receiving a zero address. And in this case, we no
+            // longer have a NATTraversal to report errors back to, so it's ok to set the
+            // result here.
+            // In other cases, a zero address is an error, and we will have a NATTraversal
+            // to report back to, so set an error and fall through to report it.
+            // CheckNATMappings will log the error.
+            reply->result = NATErr_NetFail;
+        }
+    }
+    else
+    {
+        LogInfo("uDNS_ReceivePCPPacket: error received from server. opcode %X result %X lifetime %X epoch %X",
+                reply->opCode, reply->result, reply->lifetime, reply->epoch);
+        
+        // If the packet is long enough, get the protocol & intport for matching to report
+        // the error
+        if (len >= sizeof(PCPMapReply))
+        {
+            protocol = reply->protocol;
+            intport = reply->intPort;
+        }
+    }
+
+    for (ptr = m->NATTraversals; ptr; ptr=ptr->next)
+    {
+        mDNSu8 ptrProtocol = ((ptr->Protocol & NATOp_MapTCP) == NATOp_MapTCP ? PCPProto_TCP : PCPProto_UDP);
+        if ((protocol == ptrProtocol && mDNSSameIPPort(ptr->IntPort, intport)) ||
+            (!ptr->Protocol && protocol == PCPProto_TCP && mDNSSameIPPort(DiscardPort, intport)))
+        {
+            natTraversalHandlePortMapReplyWithAddress(m, ptr, InterfaceID, reply->result ? NATErr_NetFail : NATErr_None, mappedAddress, extport, reply->lifetime, NATTProtocolPCP);
+        }
+    }
+}
+
+mDNSexport void uDNS_ReceiveNATPacket(mDNS *m, const mDNSInterfaceID InterfaceID, mDNSu8 *pkt, mDNSu16 len)
+{
+    if (len == 0)
+        LogMsg("uDNS_ReceiveNATPacket: zero length packet");
+    else if (pkt[0] == PCP_VERS)
+        uDNS_ReceivePCPPacket(m, InterfaceID, pkt, len);
+    else if (pkt[0] == NATMAP_VERS)
+        uDNS_ReceiveNATPMPPacket(m, InterfaceID, pkt, len);
+    else
+        LogMsg("uDNS_ReceiveNATPacket: packet with version %u (expected %u or %u)", pkt[0], PCP_VERS, NATMAP_VERS);
+}
+
+// <rdar://problem/3925163> Shorten DNS-SD queries to avoid NAT bugs
+// <rdar://problem/4288449> Add check to avoid crashing NAT gateways that have buggy DNS relay code
+//
+// We know of bugs in home NAT gateways that cause them to crash if they receive certain DNS queries.
+// The DNS queries that make them crash are perfectly legal DNS queries, but even if they weren't,
+// the gateway shouldn't crash -- in today's world of viruses and network attacks, software has to
+// be written assuming that a malicious attacker could send them any packet, properly-formed or not.
+// Still, we don't want to be crashing people's home gateways, so we go out of our way to avoid
+// the queries that crash them.
+//
+// Some examples:
+//
+// 1. Any query where the name ends in ".in-addr.arpa." and the text before this is 32 or more bytes.
+//    The query type does not need to be PTR -- the gateway will crash for any query type.
+//    e.g. "ping long-name-crashes-the-buggy-router.in-addr.arpa" will crash one of these.
+//
+// 2. Any query that results in a large response with the TC bit set.
+//
+// 3. Any PTR query that doesn't begin with four decimal numbers.
+//    These gateways appear to assume that the only possible PTR query is a reverse-mapping query
+//    (e.g. "1.0.168.192.in-addr.arpa") and if they ever get a PTR query where the first four
+//    labels are not all decimal numbers in the range 0-255, they handle that by crashing.
+//    These gateways also ignore the remainder of the name following the four decimal numbers
+//    -- whether or not it actually says in-addr.arpa, they just make up an answer anyway.
+//
+// The challenge therefore is to craft a query that will discern whether the DNS server
+// is one of these buggy ones, without crashing it. Furthermore we don't want our test
+// queries making it all the way to the root name servers, putting extra load on those
+// name servers and giving Apple a bad reputation. To this end we send this query:
+//     dig -t ptr 1.0.0.127.dnsbugtest.1.0.0.127.in-addr.arpa.
+//
+// The text preceding the ".in-addr.arpa." is under 32 bytes, so it won't cause crash (1).
+// It will not yield a large response with the TC bit set, so it won't cause crash (2).
+// It starts with four decimal numbers, so it won't cause crash (3).
+// The name falls within the "1.0.0.127.in-addr.arpa." domain, the reverse-mapping name for the local
+// loopback address, and therefore the query will black-hole at the first properly-configured DNS server
+// it reaches, making it highly unlikely that this query will make it all the way to the root.
+//
+// Finally, the correct response to this query is NXDOMAIN or a similar error, but the
+// gateways that ignore the remainder of the name following the four decimal numbers
+// give themselves away by actually returning a result for this nonsense query.
+
+mDNSlocal const domainname *DNSRelayTestQuestion = (const domainname*)
+                                                   "\x1" "1" "\x1" "0" "\x1" "0" "\x3" "127" "\xa" "dnsbugtest"
+                                                   "\x1" "1" "\x1" "0" "\x1" "0" "\x3" "127" "\x7" "in-addr" "\x4" "arpa";
+
+// See comments above for DNSRelayTestQuestion
+// If this is the kind of query that has the risk of crashing buggy DNS servers, we do a test question first
+mDNSlocal mDNSBool NoTestQuery(DNSQuestion *q)
+{
+    int i;
+    mDNSu8 *p = q->qname.c;
+    if (q->AuthInfo) return(mDNStrue);      // Don't need a test query for private queries sent directly to authoritative server over TLS/TCP
+    if (q->qtype != kDNSType_PTR) return(mDNStrue);     // Don't need a test query for any non-PTR queries
+    for (i=0; i<4; i++)     // If qname does not begin with num.num.num.num, can't skip the test query
+    {
+        if (p[0] < 1 || p[0] > 3) return(mDNSfalse);
+        if (              p[1] < '0' || p[1] > '9' ) return(mDNSfalse);
+        if (p[0] >= 2 && (p[2] < '0' || p[2] > '9')) return(mDNSfalse);
+        if (p[0] >= 3 && (p[3] < '0' || p[3] > '9')) return(mDNSfalse);
+        p += 1 + p[0];
+    }
+    // If remainder of qname is ".in-addr.arpa.", this is a vanilla reverse-mapping query and
+    // we can safely do it without needing a test query first, otherwise we need the test query.
+    return(SameDomainName((domainname*)p, (const domainname*)"\x7" "in-addr" "\x4" "arpa"));
+}
+
+// Returns mDNStrue if response was handled
+mDNSlocal mDNSBool uDNS_ReceiveTestQuestionResponse(mDNS *const m, DNSMessage *const msg, const mDNSu8 *const end,
+                                                    const mDNSAddr *const srcaddr, const mDNSIPPort srcport)
+{
+    const mDNSu8 *ptr = msg->data;
+    DNSQuestion pktq;
+    DNSServer *s;
+    mDNSu32 result = 0;
+
+    // 1. Find out if this is an answer to one of our test questions
+    if (msg->h.numQuestions != 1) return(mDNSfalse);
+    ptr = getQuestion(msg, ptr, end, mDNSInterface_Any, &pktq);
+    if (!ptr) return(mDNSfalse);
+    if (pktq.qtype != kDNSType_PTR || pktq.qclass != kDNSClass_IN) return(mDNSfalse);
+    if (!SameDomainName(&pktq.qname, DNSRelayTestQuestion)) return(mDNSfalse);
+
+    // 2. If the DNS relay gave us a positive response, then it's got buggy firmware
+    // else, if the DNS relay gave us an error or no-answer response, it passed our test
+    if ((msg->h.flags.b[1] & kDNSFlag1_RC_Mask) == kDNSFlag1_RC_NoErr && msg->h.numAnswers > 0)
+        result = DNSServer_Failed;
+    else
+        result = DNSServer_Passed;
+
+    // 3. Find occurrences of this server in our list, and mark them appropriately
+    for (s = m->DNSServers; s; s = s->next)
+    {
+        mDNSBool matchaddr = (s->teststate != result && mDNSSameAddress(srcaddr, &s->addr) && mDNSSameIPPort(srcport, s->port));
+        mDNSBool matchid   = (s->teststate == DNSServer_Untested && mDNSSameOpaque16(msg->h.id, s->testid));
+        if (matchaddr || matchid)
+        {
+            DNSQuestion *q;
+            s->teststate = result;
+            if (result == DNSServer_Passed)
+            {
+                LogInfo("DNS Server %#a:%d (%#a:%d) %d passed%s",
+                        &s->addr, mDNSVal16(s->port), srcaddr, mDNSVal16(srcport), mDNSVal16(s->testid),
+                        matchaddr ? "" : " NOTE: Reply did not come from address to which query was sent");
+            }
+            else
+            {
+                LogMsg("NOTE: Wide-Area Service Discovery disabled to avoid crashing defective DNS relay %#a:%d (%#a:%d) %d%s",
+                       &s->addr, mDNSVal16(s->port), srcaddr, mDNSVal16(srcport), mDNSVal16(s->testid),
+                       matchaddr ? "" : " NOTE: Reply did not come from address to which query was sent");
+            }
+
+            // If this server has just changed state from DNSServer_Untested to DNSServer_Passed, then retrigger any waiting questions.
+            // We use the NoTestQuery() test so that we only retrigger questions that were actually blocked waiting for this test to complete.
+            if (result == DNSServer_Passed)     // Unblock any questions that were waiting for this result
+                for (q = m->Questions; q; q=q->next)
+                    if (q->qDNSServer == s && !NoTestQuery(q))
+                    {
+                        q->ThisQInterval = INIT_UCAST_POLL_INTERVAL / QuestionIntervalStep;
+                        q->unansweredQueries = 0;
+                        q->LastQTime = m->timenow - q->ThisQInterval;
+                        m->NextScheduledQuery = m->timenow;
+                    }
+        }
+    }
+
+    return(mDNStrue); // Return mDNStrue to tell uDNS_ReceiveMsg it doesn't need to process this packet further
+}
+
+// Called from mDNSCoreReceive with the lock held
+mDNSexport void uDNS_ReceiveMsg(mDNS *const m, DNSMessage *const msg, const mDNSu8 *const end, const mDNSAddr *const srcaddr, const mDNSIPPort srcport)
+{
+    DNSQuestion *qptr;
+    mStatus err = mStatus_NoError;
+
+    mDNSu8 StdR    = kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery;
+    mDNSu8 UpdateR = kDNSFlag0_QR_Response | kDNSFlag0_OP_Update;
+    mDNSu8 QR_OP   = (mDNSu8)(msg->h.flags.b[0] & kDNSFlag0_QROP_Mask);
+    mDNSu8 rcode   = (mDNSu8)(msg->h.flags.b[1] & kDNSFlag1_RC_Mask);
+
+    (void)srcport; // Unused
+
+    debugf("uDNS_ReceiveMsg from %#-15a with "
+           "%2d Question%s %2d Answer%s %2d Authorit%s %2d Additional%s %d bytes",
+           srcaddr,
+           msg->h.numQuestions,   msg->h.numQuestions   == 1 ? ", "   : "s,",
+           msg->h.numAnswers,     msg->h.numAnswers     == 1 ? ", "   : "s,",
+           msg->h.numAuthorities, msg->h.numAuthorities == 1 ? "y,  " : "ies,",
+           msg->h.numAdditionals, msg->h.numAdditionals == 1 ? ""     : "s", end - msg->data);
+
+    if (QR_OP == StdR)
+    {
+        //if (srcaddr && recvLLQResponse(m, msg, end, srcaddr, srcport)) return;
+        if (uDNS_ReceiveTestQuestionResponse(m, msg, end, srcaddr, srcport)) return;
+        for (qptr = m->Questions; qptr; qptr = qptr->next)
+            if (msg->h.flags.b[0] & kDNSFlag0_TC && mDNSSameOpaque16(qptr->TargetQID, msg->h.id) && m->timenow - qptr->LastQTime < RESPONSE_WINDOW)
+            {
+                if (!srcaddr) LogMsg("uDNS_ReceiveMsg: TCP DNS response had TC bit set: ignoring");
+                else
+                {
+                    // Don't reuse TCP connections. We might have failed over to a different DNS server
+                    // while the first TCP connection is in progress. We need a new TCP connection to the
+                    // new DNS server. So, always try to establish a new connection.
+                    if (qptr->tcp) { DisposeTCPConn(qptr->tcp); qptr->tcp = mDNSNULL; }
+                    qptr->tcp = MakeTCPConn(m, mDNSNULL, mDNSNULL, kTCPSocketFlags_Zero, srcaddr, srcport, mDNSNULL, qptr, mDNSNULL);
+                }
+            }
+    }
+
+    if (QR_OP == UpdateR)
+    {
+        mDNSu32 lease = GetPktLease(m, msg, end);
+        mDNSs32 expire = m->timenow + (mDNSs32)lease * mDNSPlatformOneSecond;
+        mDNSu32 random = mDNSRandom((mDNSs32)lease * mDNSPlatformOneSecond/10);
+
+        //rcode = kDNSFlag1_RC_ServFail;	// Simulate server failure (rcode 2)
+
+        // Walk through all the records that matches the messageID. There could be multiple
+        // records if we had sent them in a group
+        if (m->CurrentRecord)
+            LogMsg("uDNS_ReceiveMsg ERROR m->CurrentRecord already set %s", ARDisplayString(m, m->CurrentRecord));
+        m->CurrentRecord = m->ResourceRecords;
+        while (m->CurrentRecord)
+        {
+            AuthRecord *rptr = m->CurrentRecord;
+            m->CurrentRecord = m->CurrentRecord->next;
+            if (AuthRecord_uDNS(rptr) && mDNSSameOpaque16(rptr->updateid, msg->h.id))
+            {
+                err = checkUpdateResult(m, rptr->resrec.name, rcode, msg, end);
+                if (!err && rptr->uselease && lease)
+                    if (rptr->expire - expire >= 0 || rptr->state != regState_UpdatePending)
+                    {
+                        rptr->expire = expire;
+                        rptr->refreshCount = 0;
+                    }
+                // We pass the random value to make sure that if we update multiple
+                // records, they all get the same random value
+                hndlRecordUpdateReply(m, rptr, err, random);
+            }
+        }
+    }
+    debugf("Received unexpected response: ID %d matches no active records", mDNSVal16(msg->h.id));
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Query Routines
+#endif
+
+mDNSexport void sendLLQRefresh(mDNS *m, DNSQuestion *q)
+{
+    mDNSu8 *end;
+    LLQOptData llq;
+    mDNSu8 *limit = m->omsg.data + AbsoluteMaxDNSMessageData;
+
+    if (q->ReqLease)
+        if ((q->state == LLQ_Established && q->ntries >= kLLQ_MAX_TRIES) || q->expire - m->timenow < 0)
+        {
+            LogMsg("Unable to refresh LLQ %##s (%s) - will retry in %d seconds", q->qname.c, DNSTypeName(q->qtype), LLQ_POLL_INTERVAL / mDNSPlatformOneSecond);
+            StartLLQPolling(m,q);
+            return;
+        }
+
+    llq.vers     = kLLQ_Vers;
+    llq.llqOp    = kLLQOp_Refresh;
+    llq.err      = q->tcp ? GetLLQEventPort(m, &q->servAddr) : LLQErr_NoError;  // If using TCP tell server what UDP port to send notifications to
+    llq.id       = q->id;
+    llq.llqlease = q->ReqLease;
+
+    InitializeDNSMessage(&m->omsg.h, q->TargetQID, uQueryFlags);
+    end = putLLQ(&m->omsg, m->omsg.data, q, &llq);
+    if (!end) { LogMsg("sendLLQRefresh: putLLQ failed %##s (%s)", q->qname.c, DNSTypeName(q->qtype)); return; }
+
+    // Note that we (conditionally) add HINFO and TSIG here, since the question might be going away,
+    // so we may not be able to reference it (most importantly it's AuthInfo) when we actually send the message
+    end = putHINFO(m, &m->omsg, end, q->AuthInfo, limit);
+    if (!end) { LogMsg("sendLLQRefresh: putHINFO failed %##s (%s)", q->qname.c, DNSTypeName(q->qtype)); return; }
+
+    if (PrivateQuery(q))
+    {
+        DNSDigest_SignMessageHostByteOrder(&m->omsg, &end, q->AuthInfo);
+        if (!end) { LogMsg("sendLLQRefresh: DNSDigest_SignMessage failed %##s (%s)", q->qname.c, DNSTypeName(q->qtype)); return; }
+    }
+
+    if (PrivateQuery(q) && !q->tcp)
+    {
+        LogInfo("sendLLQRefresh setting up new TLS session %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        if (!q->nta)
+        {
+            // Note: If a question is in LLQ_Established state, we never free the zone data for the
+            // question (PrivateQuery). If we free, we reset the state to something other than LLQ_Established.
+            // This function is called only if the query is in LLQ_Established state and hence nta should
+            // never be NULL. In spite of that, we have seen q->nta being NULL in the field. Just refetch the
+            // zone data in that case.
+            q->nta = StartGetZoneData(m, &q->qname, ZoneServiceLLQ, LLQGotZoneData, q);
+            return;
+            // ThisQInterval is not adjusted when we return from here which means that we will get called back
+            // again immediately. As q->servAddr and q->servPort are still valid and the nta->Host is initialized
+            // without any additional discovery for PrivateQuery, things work. 
+        }
+        q->tcp = MakeTCPConn(m, &m->omsg, end, kTCPSocketFlags_UseTLS, &q->servAddr, q->servPort, &q->nta->Host, q, mDNSNULL);
+    }
+    else
+    {
+        mStatus err;
+
+        // if AuthInfo and AuthInfo->AutoTunnel is set, we use the TCP socket but don't need to pass the AuthInfo as
+        // we already protected the message above.
+        LogInfo("sendLLQRefresh: using existing %s session %##s (%s)", PrivateQuery(q) ? "TLS" : "UDP",
+                q->qname.c, DNSTypeName(q->qtype));
+
+        err = mDNSSendDNSMessage(m, &m->omsg, end, mDNSInterface_Any, q->LocalSocket, &q->servAddr, q->servPort, q->tcp ? q->tcp->sock : mDNSNULL, mDNSNULL, mDNSfalse);
+        if (err)
+        {
+            LogMsg("sendLLQRefresh: mDNSSendDNSMessage%s failed: %d", q->tcp ? " (TCP)" : "", err);
+            if (q->tcp) { DisposeTCPConn(q->tcp); q->tcp = mDNSNULL; }
+        }
+    }
+
+    q->ntries++;
+
+    debugf("sendLLQRefresh ntries %d %##s (%s)", q->ntries, q->qname.c, DNSTypeName(q->qtype));
+
+    q->LastQTime = m->timenow;
+    SetNextQueryTime(m, q);
+}
+
+mDNSexport void LLQGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneInfo)
+{
+    DNSQuestion *q = (DNSQuestion *)zoneInfo->ZoneDataContext;
+
+    mDNS_Lock(m);
+
+    // If we get here it means that the GetZoneData operation has completed.
+    // We hold on to the zone data if it is AutoTunnel as we use the hostname
+    // in zoneInfo during the TLS connection setup.
+    q->servAddr = zeroAddr;
+    q->servPort = zeroIPPort;
+
+    if (!err && zoneInfo && !mDNSIPPortIsZero(zoneInfo->Port) && !mDNSAddressIsZero(&zoneInfo->Addr) && zoneInfo->Host.c[0])
+    {
+        q->servAddr = zoneInfo->Addr;
+        q->servPort = zoneInfo->Port;
+        if (!PrivateQuery(q))
+        {
+            // We don't need the zone data as we use it only for the Host information which we
+            // don't need if we are not going to use TLS connections.
+            if (q->nta)
+            {
+                if (q->nta != zoneInfo) LogMsg("LLQGotZoneData: nta (%p) != zoneInfo (%p)  %##s (%s)", q->nta, zoneInfo, q->qname.c, DNSTypeName(q->qtype));
+                CancelGetZoneData(m, q->nta);
+                q->nta = mDNSNULL;
+            }
+        }
+        q->ntries = 0;
+        debugf("LLQGotZoneData %#a:%d", &q->servAddr, mDNSVal16(q->servPort));
+        startLLQHandshake(m, q);
+    }
+    else
+    {
+        if (q->nta)
+        {
+            if (q->nta != zoneInfo) LogMsg("LLQGotZoneData: nta (%p) != zoneInfo (%p)  %##s (%s)", q->nta, zoneInfo, q->qname.c, DNSTypeName(q->qtype));
+            CancelGetZoneData(m, q->nta);
+            q->nta = mDNSNULL;
+        }
+        StartLLQPolling(m,q);
+        if (err == mStatus_NoSuchNameErr)
+        {
+            // this actually failed, so mark it by setting address to all ones
+            q->servAddr.type = mDNSAddrType_IPv4;
+            q->servAddr.ip.v4 = onesIPv4Addr;
+        }
+    }
+
+    mDNS_Unlock(m);
+}
+
+// Called in normal callback context (i.e. mDNS_busy and mDNS_reentrancy are both 1)
+mDNSlocal void PrivateQueryGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneInfo)
+{
+    DNSQuestion *q = (DNSQuestion *) zoneInfo->ZoneDataContext;
+
+    LogInfo("PrivateQueryGotZoneData %##s (%s) err %d Zone %##s Private %d", q->qname.c, DNSTypeName(q->qtype), err, zoneInfo->ZoneName.c, zoneInfo->ZonePrivate);
+
+    if (q->nta != zoneInfo) LogMsg("PrivateQueryGotZoneData:ERROR!!: nta (%p) != zoneInfo (%p)  %##s (%s)", q->nta, zoneInfo, q->qname.c, DNSTypeName(q->qtype));
+
+    if (err || !zoneInfo || mDNSAddressIsZero(&zoneInfo->Addr) || mDNSIPPortIsZero(zoneInfo->Port) || !zoneInfo->Host.c[0])
+    {
+        LogInfo("PrivateQueryGotZoneData: ERROR!! %##s (%s) invoked with error code %d %p %#a:%d",
+                q->qname.c, DNSTypeName(q->qtype), err, zoneInfo,
+                zoneInfo ? &zoneInfo->Addr : mDNSNULL,
+                zoneInfo ? mDNSVal16(zoneInfo->Port) : 0);
+        CancelGetZoneData(m, q->nta);
+        q->nta = mDNSNULL;
+        return;
+    }
+
+    if (!zoneInfo->ZonePrivate)
+    {
+        debugf("Private port lookup failed -- retrying without TLS -- %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        q->AuthInfo      = mDNSNULL;        // Clear AuthInfo so we try again non-private
+        q->ThisQInterval = InitialQuestionInterval;
+        q->LastQTime     = m->timenow - q->ThisQInterval;
+        CancelGetZoneData(m, q->nta);
+        q->nta = mDNSNULL;
+        mDNS_Lock(m);
+        SetNextQueryTime(m, q);
+        mDNS_Unlock(m);
+        return;
+        // Next call to uDNS_CheckCurrentQuestion() will do this as a non-private query
+    }
+
+    if (!PrivateQuery(q))
+    {
+        LogMsg("PrivateQueryGotZoneData: ERROR!! Not a private query %##s (%s) AuthInfo %p", q->qname.c, DNSTypeName(q->qtype), q->AuthInfo);
+        CancelGetZoneData(m, q->nta);
+        q->nta = mDNSNULL;
+        return;
+    }
+
+    q->TargetQID = mDNS_NewMessageID(m);
+    if (q->tcp) { DisposeTCPConn(q->tcp); q->tcp = mDNSNULL; }
+    if (!q->nta) { LogMsg("PrivateQueryGotZoneData:ERROR!! nta is NULL for %##s (%s)", q->qname.c, DNSTypeName(q->qtype)); return; }
+    q->tcp = MakeTCPConn(m, mDNSNULL, mDNSNULL, kTCPSocketFlags_UseTLS, &zoneInfo->Addr, zoneInfo->Port, &q->nta->Host, q, mDNSNULL);
+    if (q->nta) { CancelGetZoneData(m, q->nta); q->nta = mDNSNULL; }
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Dynamic Updates
+#endif
+
+// Called in normal callback context (i.e. mDNS_busy and mDNS_reentrancy are both 1)
+mDNSexport void RecordRegistrationGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneData)
+{
+    AuthRecord *newRR = (AuthRecord*)zoneData->ZoneDataContext;
+    AuthRecord *ptr;
+    int c1, c2;
+
+    if (newRR->nta != zoneData)
+        LogMsg("RecordRegistrationGotZoneData: nta (%p) != zoneData (%p)  %##s (%s)", newRR->nta, zoneData, newRR->resrec.name->c, DNSTypeName(newRR->resrec.rrtype));
+
+    if (m->mDNS_busy != m->mDNS_reentrancy)
+        LogMsg("RecordRegistrationGotZoneData: mDNS_busy (%ld) != mDNS_reentrancy (%ld)", m->mDNS_busy, m->mDNS_reentrancy);
+
+    // make sure record is still in list (!!!)
+    for (ptr = m->ResourceRecords; ptr; ptr = ptr->next) if (ptr == newRR) break;
+    if (!ptr)
+    {
+        LogMsg("RecordRegistrationGotZoneData - RR no longer in list.  Discarding.");
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    // check error/result
+    if (err)
+    {
+        if (err != mStatus_NoSuchNameErr) LogMsg("RecordRegistrationGotZoneData: error %d", err);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    if (!zoneData) { LogMsg("ERROR: RecordRegistrationGotZoneData invoked with NULL result and no error"); return; }
+
+    if (newRR->resrec.rrclass != zoneData->ZoneClass)
+    {
+        LogMsg("ERROR: New resource record's class (%d) does not match zone class (%d)", newRR->resrec.rrclass, zoneData->ZoneClass);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    // Don't try to do updates to the root name server.
+    // We might be tempted also to block updates to any single-label name server (e.g. com, edu, net, etc.) but some
+    // organizations use their own private pseudo-TLD, like ".home", etc, and we don't want to block that.
+    if (zoneData->ZoneName.c[0] == 0)
+    {
+        LogInfo("RecordRegistrationGotZoneData: No name server found claiming responsibility for \"%##s\"!", newRR->resrec.name->c);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    // Store discovered zone data
+    c1 = CountLabels(newRR->resrec.name);
+    c2 = CountLabels(&zoneData->ZoneName);
+    if (c2 > c1)
+    {
+        LogMsg("RecordRegistrationGotZoneData: Zone \"%##s\" is longer than \"%##s\"", zoneData->ZoneName.c, newRR->resrec.name->c);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+    newRR->zone = SkipLeadingLabels(newRR->resrec.name, c1-c2);
+    if (!SameDomainName(newRR->zone, &zoneData->ZoneName))
+    {
+        LogMsg("RecordRegistrationGotZoneData: Zone \"%##s\" does not match \"%##s\" for \"%##s\"", newRR->zone->c, zoneData->ZoneName.c, newRR->resrec.name->c);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    if (mDNSIPPortIsZero(zoneData->Port) || mDNSAddressIsZero(&zoneData->Addr) || !zoneData->Host.c[0])
+    {
+        LogInfo("RecordRegistrationGotZoneData: No _dns-update._udp service found for \"%##s\"!", newRR->resrec.name->c);
+        CancelGetZoneData(m, newRR->nta);
+        newRR->nta = mDNSNULL;
+        return;
+    }
+
+    newRR->Private      = zoneData->ZonePrivate;
+    debugf("RecordRegistrationGotZoneData: Set zone information for %##s %##s to %#a:%d",
+           newRR->resrec.name->c, zoneData->ZoneName.c, &zoneData->Addr, mDNSVal16(zoneData->Port));
+
+    // If we are deregistering, uDNS_DeregisterRecord will do that as it has the zone data now.
+    if (newRR->state == regState_DeregPending)
+    {
+        mDNS_Lock(m);
+        uDNS_DeregisterRecord(m, newRR);
+        mDNS_Unlock(m);
+        return;
+    }
+
+    if (newRR->resrec.rrtype == kDNSType_SRV)
+    {
+        const domainname *target;
+        // Reevaluate the target always as NAT/Target could have changed while
+        // we were fetching zone data.
+        mDNS_Lock(m);
+        target = GetServiceTarget(m, newRR);
+        mDNS_Unlock(m);
+        if (!target || target->c[0] == 0)
+        {
+            domainname *t = GetRRDomainNameTarget(&newRR->resrec);
+            LogInfo("RecordRegistrationGotZoneData - no target for %##s", newRR->resrec.name->c);
+            if (t) t->c[0] = 0;
+            newRR->resrec.rdlength = newRR->resrec.rdestimate = 0;
+            newRR->state = regState_NoTarget;
+            CancelGetZoneData(m, newRR->nta);
+            newRR->nta = mDNSNULL;
+            return;
+        }
+    }
+    // If we have non-zero service port (always?)
+    // and a private address, and update server is non-private
+    // and this service is AutoTarget
+    // then initiate a NAT mapping request. On completion it will do SendRecordRegistration() for us
+    if (newRR->resrec.rrtype == kDNSType_SRV && !mDNSIPPortIsZero(newRR->resrec.rdata->u.srv.port) &&
+        mDNSv4AddrIsRFC1918(&m->AdvertisedV4.ip.v4) && newRR->nta && !mDNSAddrIsRFC1918(&newRR->nta->Addr) &&
+        newRR->AutoTarget == Target_AutoHostAndNATMAP)
+    {
+        DomainAuthInfo *AuthInfo;
+        AuthInfo = GetAuthInfoForName(m, newRR->resrec.name);
+        if (AuthInfo && AuthInfo->AutoTunnel)
+        {
+            domainname *t = GetRRDomainNameTarget(&newRR->resrec);
+            LogMsg("RecordRegistrationGotZoneData: ERROR!! AutoTunnel has Target_AutoHostAndNATMAP for %s", ARDisplayString(m, newRR));
+            if (t) t->c[0] = 0;
+            newRR->resrec.rdlength = newRR->resrec.rdestimate = 0;
+            newRR->state = regState_NoTarget;
+            CancelGetZoneData(m, newRR->nta);
+            newRR->nta = mDNSNULL;
+            return;
+        }
+        // During network transitions, we are called multiple times in different states. Setup NAT
+        // state just once for this record.
+        if (!newRR->NATinfo.clientContext)
+        {
+            LogInfo("RecordRegistrationGotZoneData StartRecordNatMap %s", ARDisplayString(m, newRR));
+            newRR->state = regState_NATMap;
+            StartRecordNatMap(m, newRR);
+            return;
+        }
+        else LogInfo("RecordRegistrationGotZoneData: StartRecordNatMap for %s, state %d, context %p", ARDisplayString(m, newRR), newRR->state, newRR->NATinfo.clientContext);
+    }
+    mDNS_Lock(m);
+    // We want IsRecordMergeable to check whether it is a record whose update can be
+    // sent with others. We set the time before we call IsRecordMergeable, so that
+    // it does not fail this record based on time. We are interested in other checks
+    // at this time. If a previous update resulted in error, then don't reset the
+    // interval. Preserve the back-off so that we don't keep retrying aggressively.
+    if (newRR->updateError == mStatus_NoError)
+    {
+        newRR->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+        newRR->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+    }
+    if (IsRecordMergeable(m, newRR, m->timenow + MERGE_DELAY_TIME))
+    {
+        // Delay the record registration by MERGE_DELAY_TIME so that we can merge them
+        // into one update
+        LogInfo("RecordRegistrationGotZoneData: Delayed registration for %s", ARDisplayString(m, newRR));
+        newRR->LastAPTime += MERGE_DELAY_TIME;
+    }
+    mDNS_Unlock(m);
+}
+
+mDNSlocal void SendRecordDeregistration(mDNS *m, AuthRecord *rr)
+{
+    mDNSu8 *ptr = m->omsg.data;
+    mDNSu8 *limit;
+    DomainAuthInfo *AuthInfo;
+
+    mDNS_CheckLock(m);
+
+    if (!rr->nta || mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4))
+    {
+        LogMsg("SendRecordDeRegistration: No zone info for Resource record %s RecordType %d", ARDisplayString(m, rr), rr->resrec.RecordType);
+        return;
+    }
+
+    limit = ptr + AbsoluteMaxDNSMessageData;
+    AuthInfo = GetAuthInfoForName_internal(m, rr->resrec.name);
+    limit -= RRAdditionalSize(m, AuthInfo);
+
+    rr->updateid = mDNS_NewMessageID(m);
+    InitializeDNSMessage(&m->omsg.h, rr->updateid, UpdateReqFlags);
+
+    // set zone
+    ptr = putZone(&m->omsg, ptr, limit, rr->zone, mDNSOpaque16fromIntVal(rr->resrec.rrclass));
+    if (!ptr) goto exit;
+
+    ptr = BuildUpdateMessage(m, ptr, rr, limit);
+
+    if (!ptr) goto exit;
+
+    if (rr->Private)
+    {
+        LogInfo("SendRecordDeregistration TCP %p %s", rr->tcp, ARDisplayString(m, rr));
+        if (rr->tcp) LogInfo("SendRecordDeregistration: Disposing existing TCP connection for %s", ARDisplayString(m, rr));
+        if (rr->tcp) { DisposeTCPConn(rr->tcp); rr->tcp = mDNSNULL; }
+        if (!rr->nta) { LogMsg("SendRecordDeregistration:Private:ERROR!! nta is NULL for %s", ARDisplayString(m, rr)); return; }
+        rr->tcp = MakeTCPConn(m, &m->omsg, ptr, kTCPSocketFlags_UseTLS, &rr->nta->Addr, rr->nta->Port, &rr->nta->Host, mDNSNULL, rr);
+    }
+    else
+    {
+        mStatus err;
+        LogInfo("SendRecordDeregistration UDP %s", ARDisplayString(m, rr));
+        if (!rr->nta) { LogMsg("SendRecordDeregistration:ERROR!! nta is NULL for %s", ARDisplayString(m, rr)); return; }
+        err = mDNSSendDNSMessage(m, &m->omsg, ptr, mDNSInterface_Any, mDNSNULL, &rr->nta->Addr, rr->nta->Port, mDNSNULL, GetAuthInfoForName_internal(m, rr->resrec.name), mDNSfalse);
+        if (err) debugf("ERROR: SendRecordDeregistration - mDNSSendDNSMessage - %d", err);
+        //if (rr->state == regState_DeregPending) CompleteDeregistration(m, rr);		// Don't touch rr after this
+    }
+    SetRecordRetry(m, rr, 0);
+    return;
+exit:
+    LogMsg("SendRecordDeregistration: Error formatting message for %s", ARDisplayString(m, rr));
+}
+
+mDNSexport mStatus uDNS_DeregisterRecord(mDNS *const m, AuthRecord *const rr)
+{
+    DomainAuthInfo *info;
+
+    LogInfo("uDNS_DeregisterRecord: Resource Record %s, state %d", ARDisplayString(m, rr), rr->state);
+
+    switch (rr->state)
+    {
+    case regState_Refresh:
+    case regState_Pending:
+    case regState_UpdatePending:
+    case regState_Registered: break;
+    case regState_DeregPending: break;
+
+    case regState_NATError:
+    case regState_NATMap:
+    // A record could be in NoTarget to start with if the corresponding SRV record could not find a target.
+    // It is also possible to reenter the NoTarget state when we move to a network with a NAT that has
+    // no {PCP, NAT-PMP, UPnP/IGD} support. In that case before we entered NoTarget, we already deregistered with
+    // the server.
+    case regState_NoTarget:
+    case regState_Unregistered:
+    case regState_Zero:
+    default:
+        LogInfo("uDNS_DeregisterRecord: State %d for %##s type %s", rr->state, rr->resrec.name->c, DNSTypeName(rr->resrec.rrtype));
+        // This function may be called during sleep when there are no sleep proxy servers
+        if (rr->resrec.RecordType == kDNSRecordTypeDeregistering) CompleteDeregistration(m, rr);
+        return mStatus_NoError;
+    }
+
+    // if unsent rdata is queued, free it.
+    //
+    // The data may be queued in QueuedRData or InFlightRData.
+    //
+    // 1) If the record is in Registered state, we store it in InFlightRData and copy the same in "rdata"
+    //   *just* before sending the update to the server. Till we get the response, InFlightRData and "rdata"
+    //   in the resource record are same. We don't want to free in that case. It will be freed when "rdata"
+    //   is freed. If they are not same, the update has not been sent and we should free it here.
+    //
+    // 2) If the record is in UpdatePending state, we queue the update in QueuedRData. When the previous update
+    //   comes back from the server, we copy it from QueuedRData to InFlightRData and repeat (1). This implies
+    //   that QueuedRData can never be same as "rdata" in the resource record. As long as we have something
+    //   left in QueuedRData, we should free it here.
+
+    if (rr->InFlightRData && rr->UpdateCallback)
+    {
+        if (rr->InFlightRData != rr->resrec.rdata)
+        {
+            LogInfo("uDNS_DeregisterRecord: Freeing InFlightRData for %s", ARDisplayString(m, rr));
+            rr->UpdateCallback(m, rr, rr->InFlightRData, rr->InFlightRDLen);
+            rr->InFlightRData = mDNSNULL;
+        }
+        else
+            LogInfo("uDNS_DeregisterRecord: InFlightRData same as rdata for %s", ARDisplayString(m, rr));
+    }
+
+    if (rr->QueuedRData && rr->UpdateCallback)
+    {
+        if (rr->QueuedRData == rr->resrec.rdata)
+            LogMsg("uDNS_DeregisterRecord: ERROR!! QueuedRData same as rdata for %s", ARDisplayString(m, rr));
+        else
+        {
+            LogInfo("uDNS_DeregisterRecord: Freeing QueuedRData for %s", ARDisplayString(m, rr));
+            rr->UpdateCallback(m, rr, rr->QueuedRData, rr->QueuedRDLen);
+            rr->QueuedRData = mDNSNULL;
+        }
+    }
+
+    // If a current group registration is pending, we can't send this deregisration till that registration
+    // has reached the server i.e., the ordering is important. Previously, if we did not send this
+    // registration in a group, then the previous connection will be torn down as part of sending the
+    // deregistration. If we send this in a group, we need to locate the resource record that was used
+    // to send this registration and terminate that connection. This means all the updates on that might
+    // be lost (assuming the response is not waiting for us at the socket) and the retry will send the
+    // update again sometime in the near future.
+    //
+    // NOTE: SSL handshake failures normally free the TCP connection immediately. Hence, you may not
+    // find the TCP below there. This case can happen only when tcp is trying to actively retransmit
+    // the request or SSL negotiation taking time i.e resource record is actively trying to get the
+    // message to the server. During that time a deregister has to happen.
+
+    if (!mDNSOpaque16IsZero(rr->updateid))
+    {
+        AuthRecord *anchorRR;
+        mDNSBool found = mDNSfalse;
+        for (anchorRR = m->ResourceRecords; anchorRR; anchorRR = anchorRR->next)
+        {
+            if (AuthRecord_uDNS(rr) && mDNSSameOpaque16(anchorRR->updateid, rr->updateid) && anchorRR->tcp)
+            {
+                LogInfo("uDNS_DeregisterRecord: Found Anchor RR %s terminated", ARDisplayString(m, anchorRR));
+                if (found)
+                    LogMsg("uDNS_DeregisterRecord: ERROR: Another anchorRR %s found", ARDisplayString(m, anchorRR));
+                DisposeTCPConn(anchorRR->tcp);
+                anchorRR->tcp = mDNSNULL;
+                found = mDNStrue;
+            }
+        }
+        if (!found) LogInfo("uDNSDeregisterRecord: Cannot find the anchor Resource Record for %s, not an error", ARDisplayString(m, rr));
+    }
+
+    // Retry logic for deregistration should be no different from sending registration the first time.
+    // Currently ThisAPInterval most likely is set to the refresh interval
+    rr->state          = regState_DeregPending;
+    rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+    rr->LastAPTime     = m->timenow - INIT_RECORD_REG_INTERVAL;
+    info = GetAuthInfoForName_internal(m, rr->resrec.name);
+    if (IsRecordMergeable(m, rr, m->timenow + MERGE_DELAY_TIME))
+    {
+        // Delay the record deregistration by MERGE_DELAY_TIME so that we can merge them
+        // into one update. If the domain is being deleted, delay by 2 * MERGE_DELAY_TIME
+        // so that we can merge all the AutoTunnel records and the service records in
+        // one update (they get deregistered a little apart)
+        if (info && info->deltime) rr->LastAPTime += (2 * MERGE_DELAY_TIME);
+        else rr->LastAPTime += MERGE_DELAY_TIME;
+    }
+    // IsRecordMergeable could have returned false for several reasons e.g., DontMerge is set or
+    // no zone information. Most likely it is the latter, CheckRecordUpdates will fetch the zone
+    // data when it encounters this record.
+
+    if (m->NextuDNSEvent - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
+        m->NextuDNSEvent = (rr->LastAPTime + rr->ThisAPInterval);
+
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus uDNS_UpdateRecord(mDNS *m, AuthRecord *rr)
+{
+    LogInfo("uDNS_UpdateRecord: Resource Record %##s, state %d", rr->resrec.name->c, rr->state);
+    switch(rr->state)
+    {
+    case regState_DeregPending:
+    case regState_Unregistered:
+        // not actively registered
+        goto unreg_error;
+
+    case regState_NATMap:
+    case regState_NoTarget:
+        // change rdata directly since it hasn't been sent yet
+        if (rr->UpdateCallback) rr->UpdateCallback(m, rr, rr->resrec.rdata, rr->resrec.rdlength);
+        SetNewRData(&rr->resrec, rr->NewRData, rr->newrdlength);
+        rr->NewRData = mDNSNULL;
+        return mStatus_NoError;
+
+    case regState_Pending:
+    case regState_Refresh:
+    case regState_UpdatePending:
+        // registration in-flight. queue rdata and return
+        if (rr->QueuedRData && rr->UpdateCallback)
+            // if unsent rdata is already queued, free it before we replace it
+            rr->UpdateCallback(m, rr, rr->QueuedRData, rr->QueuedRDLen);
+        rr->QueuedRData = rr->NewRData;
+        rr->QueuedRDLen = rr->newrdlength;
+        rr->NewRData = mDNSNULL;
+        return mStatus_NoError;
+
+    case regState_Registered:
+        rr->OrigRData = rr->resrec.rdata;
+        rr->OrigRDLen = rr->resrec.rdlength;
+        rr->InFlightRData = rr->NewRData;
+        rr->InFlightRDLen = rr->newrdlength;
+        rr->NewRData = mDNSNULL;
+        rr->state = regState_UpdatePending;
+        rr->ThisAPInterval = INIT_RECORD_REG_INTERVAL;
+        rr->LastAPTime = m->timenow - INIT_RECORD_REG_INTERVAL;
+        SetNextuDNSEvent(m, rr);
+        return mStatus_NoError;
+
+    case regState_NATError:
+        LogMsg("ERROR: uDNS_UpdateRecord called for record %##s with bad state regState_NATError", rr->resrec.name->c);
+        return mStatus_UnknownErr;      // states for service records only
+
+    default: LogMsg("uDNS_UpdateRecord: Unknown state %d for %##s", rr->state, rr->resrec.name->c);
+    }
+
+unreg_error:
+    LogMsg("uDNS_UpdateRecord: Requested update of record %##s type %d, in erroneous state %d",
+           rr->resrec.name->c, rr->resrec.rrtype, rr->state);
+    return mStatus_Invalid;
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Periodic Execution Routines
+#endif
+
+mDNSlocal void handle_unanswered_query(mDNS *const m)
+{
+    DNSQuestion *q = m->CurrentQuestion;
+
+    if (q->unansweredQueries >= MAX_DNSSEC_UNANSWERED_QUERIES && DNSSECOptionalQuestion(q))
+    {
+        // If we are not receiving any responses for DNSSEC question, it could be due to
+        // a broken middlebox or a DNS server that does not understand the EDNS0/DOK option that
+        // silently drops the packets. Also as per RFC 5625 there are certain buggy DNS Proxies
+        // that are known to drop these pkts. To handle this, we turn off sending the EDNS0/DOK
+        // option if we have not received any responses indicating that the server or
+        // the middlebox is DNSSEC aware. If we receive at least one response to a DNSSEC
+        // question, we don't turn off validation. Also, we wait for MAX_DNSSEC_RETRANSMISSIONS
+        // before turning off validation to accomodate packet loss.
+        // 
+        // Note: req_DO affects only DNSSEC_VALIDATION_SECURE_OPTIONAL questions;
+        // DNSSEC_VALIDATION_SECURE questions ignores req_DO.
+
+        if (q->qDNSServer && !q->qDNSServer->DNSSECAware && q->qDNSServer->req_DO)
+        {
+            q->qDNSServer->retransDO++;
+            if (q->qDNSServer->retransDO == MAX_DNSSEC_RETRANSMISSIONS)
+            {
+                LogInfo("handle_unanswered_query: setting req_DO false for %#a", &q->qDNSServer->addr);
+                q->qDNSServer->req_DO = mDNSfalse;
+            }
+        }
+
+        if (!q->qDNSServer->req_DO)
+        {
+            q->ValidationState     = DNSSECValNotRequired; 
+            q->ValidationRequired  = DNSSEC_VALIDATION_NONE;
+        
+            if (q->ProxyQuestion)
+                q->ProxyDNSSECOK = mDNSfalse;
+            LogInfo("handle_unanswered_query: unanswered query for %##s (%s), so turned off validation for %#a", 
+                q->qname.c, DNSTypeName(q->qtype), &q->qDNSServer->addr);
+        }
+    }
+}
+
+// The question to be checked is not passed in as an explicit parameter;
+// instead it is implicit that the question to be checked is m->CurrentQuestion.
+mDNSexport void uDNS_CheckCurrentQuestion(mDNS *const m)
+{
+    DNSQuestion *q = m->CurrentQuestion;
+    if (m->timenow - NextQSendTime(q) < 0) return;
+
+    if (q->LongLived)
+    {
+        switch (q->state)
+        {
+        case LLQ_InitialRequest:   startLLQHandshake(m, q); break;
+        case LLQ_SecondaryRequest:
+            // For PrivateQueries, we need to start the handshake again as we don't do the Challenge/Response step
+            if (PrivateQuery(q))
+                startLLQHandshake(m, q);
+            else
+                sendChallengeResponse(m, q, mDNSNULL);
+            break;
+        case LLQ_Established:      sendLLQRefresh(m, q); break;
+        case LLQ_Poll:             break;       // Do nothing (handled below)
+        }
+    }
+
+    handle_unanswered_query(m);  
+    // We repeat the check above (rather than just making this the "else" case) because startLLQHandshake can change q->state to LLQ_Poll
+    if (!(q->LongLived && q->state != LLQ_Poll))
+    {
+        if (q->unansweredQueries >= MAX_UCAST_UNANSWERED_QUERIES)
+        {
+            DNSServer *orig = q->qDNSServer;
+            if (orig)
+                LogInfo("uDNS_CheckCurrentQuestion: Sent %d unanswered queries for %##s (%s) to %#a:%d (%##s)",
+                        q->unansweredQueries, q->qname.c, DNSTypeName(q->qtype), &orig->addr, mDNSVal16(orig->port), orig->domain.c);
+
+            PenalizeDNSServer(m, q, zeroID);
+            q->noServerResponse = 1;
+        }
+        // There are two cases here.
+        //
+        // 1. We have only one DNS server for this question. It is not responding even after we sent MAX_UCAST_UNANSWERED_QUERIES.
+        //    In that case, we need to keep retrying till we get a response. But we need to backoff as we retry. We set
+        //    noServerResponse in the block above and below we do not touch the question interval. When we come here, we
+        //    already waited for the response. We need to send another query right at this moment. We do that below by
+        //    reinitializing dns servers and reissuing the query.
+        //
+        // 2. We have more than one DNS server. If at least one server did not respond, we would have set noServerResponse
+        //    either now (the last server in the list) or before (non-last server in the list). In either case, if we have
+        //    reached the end of DNS server list, we need to try again from the beginning. Ideally we should try just the
+        //    servers that did not respond, but for simplicity we try all the servers. Once we reached the end of list, we
+        //    set triedAllServersOnce so that we don't try all the servers aggressively. See PenalizeDNSServer.
+        if (!q->qDNSServer && q->noServerResponse)
+        {
+            DNSServer *new;
+            DNSQuestion *qptr;
+            q->triedAllServersOnce = 1;
+            // Re-initialize all DNS servers for this question. If we have a DNSServer, DNSServerChangeForQuestion will
+            // handle all the work including setting the new DNS server.
+            SetValidDNSServers(m, q);
+            new = GetServerForQuestion(m, q);
+            if (new)
+            {
+                LogInfo("uDNS_checkCurrentQuestion: Retrying question %p %##s (%s) DNS Server %#a:%d ThisQInterval %d",
+                        q, q->qname.c, DNSTypeName(q->qtype), new ? &new->addr : mDNSNULL, mDNSVal16(new ? new->port : zeroIPPort), q->ThisQInterval);
+                DNSServerChangeForQuestion(m, q, new);
+            }
+            for (qptr = q->next ; qptr; qptr = qptr->next)
+                if (qptr->DuplicateOf == q) { qptr->validDNSServers = q->validDNSServers; qptr->qDNSServer = q->qDNSServer; }
+        }
+        if (q->qDNSServer && q->qDNSServer->teststate != DNSServer_Disabled)
+        {
+            mDNSu8 *end = m->omsg.data;
+            mStatus err = mStatus_NoError;
+            mDNSBool private = mDNSfalse;
+
+            InitializeDNSMessage(&m->omsg.h, q->TargetQID, (DNSSECQuestion(q) ? DNSSecQFlags : uQueryFlags));
+
+            if (q->qDNSServer->teststate != DNSServer_Untested || NoTestQuery(q))
+            {
+                end = putQuestion(&m->omsg, m->omsg.data, m->omsg.data + AbsoluteMaxDNSMessageData, &q->qname, q->qtype, q->qclass);
+                if (DNSSECQuestion(q) && !q->qDNSServer->cellIntf)
+                {
+                    if (q->ProxyQuestion)
+                        end = DNSProxySetAttributes(q, &m->omsg.h, &m->omsg, end, m->omsg.data + AbsoluteMaxDNSMessageData);
+                    else
+                        end = putDNSSECOption(&m->omsg, end, m->omsg.data + AbsoluteMaxDNSMessageData);
+                }
+                private = PrivateQuery(q);
+            }
+            else if (m->timenow - q->qDNSServer->lasttest >= INIT_UCAST_POLL_INTERVAL)  // Make sure at least three seconds has elapsed since last test query
+            {
+                LogInfo("Sending DNS test query to %#a:%d", &q->qDNSServer->addr, mDNSVal16(q->qDNSServer->port));
+                q->ThisQInterval = INIT_UCAST_POLL_INTERVAL / QuestionIntervalStep;
+                q->qDNSServer->lasttest = m->timenow;
+                end = putQuestion(&m->omsg, m->omsg.data, m->omsg.data + AbsoluteMaxDNSMessageData, DNSRelayTestQuestion, kDNSType_PTR, kDNSClass_IN);
+                q->qDNSServer->testid = m->omsg.h.id;
+            }
+
+            if (end > m->omsg.data && (q->qDNSServer->teststate != DNSServer_Failed || NoTestQuery(q)))
+            {
+                //LogMsg("uDNS_CheckCurrentQuestion %p %d %p %##s (%s)", q, NextQSendTime(q) - m->timenow, private, q->qname.c, DNSTypeName(q->qtype));
+                if (private)
+                {
+                    if (q->nta) CancelGetZoneData(m, q->nta);
+                    q->nta = StartGetZoneData(m, &q->qname, q->LongLived ? ZoneServiceLLQ : ZoneServiceQuery, PrivateQueryGotZoneData, q);
+                    if (q->state == LLQ_Poll) q->ThisQInterval = (LLQ_POLL_INTERVAL + mDNSRandom(LLQ_POLL_INTERVAL/10)) / QuestionIntervalStep;
+                }
+                else
+                {
+                    debugf("uDNS_CheckCurrentQuestion sending %p %##s (%s) %#a:%d UnansweredQueries %d",
+                           q, q->qname.c, DNSTypeName(q->qtype),
+                           q->qDNSServer ? &q->qDNSServer->addr : mDNSNULL, mDNSVal16(q->qDNSServer ? q->qDNSServer->port : zeroIPPort), q->unansweredQueries);
+                    if (!q->LocalSocket)
+                    {
+                        q->LocalSocket = mDNSPlatformUDPSocket(m, zeroIPPort);
+                        if (q->LocalSocket)
+                            mDNSPlatformSetDelegatePID(q->LocalSocket, &q->qDNSServer->addr, q);
+                    }
+                    if (!q->LocalSocket) err = mStatus_NoMemoryErr; // If failed to make socket (should be very rare), we'll try again next time
+                    else err = mDNSSendDNSMessage(m, &m->omsg, end, q->qDNSServer->interface, q->LocalSocket, &q->qDNSServer->addr, q->qDNSServer->port, mDNSNULL, mDNSNULL, q->UseBackgroundTrafficClass);
+                }
+            }
+
+            if (err != mStatus_TransientErr)   // if it is not a transient error backoff and DO NOT flood queries unnecessarily
+            {
+                q->ThisQInterval = q->ThisQInterval * QuestionIntervalStep; // Only increase interval if send succeeded
+                q->unansweredQueries++;
+                if (q->ThisQInterval > MAX_UCAST_POLL_INTERVAL)
+                    q->ThisQInterval = MAX_UCAST_POLL_INTERVAL;
+                if (private && q->state != LLQ_Poll)
+                {
+                    // We don't want to retransmit too soon. Hence, we always schedule our first
+                    // retransmisson at 3 seconds rather than one second
+                    if (q->ThisQInterval < (3 * mDNSPlatformOneSecond))
+                        q->ThisQInterval = q->ThisQInterval * QuestionIntervalStep;
+                    if (q->ThisQInterval > LLQ_POLL_INTERVAL)
+                        q->ThisQInterval = LLQ_POLL_INTERVAL;
+                    LogInfo("uDNS_CheckCurrentQuestion: private non polling question for %##s (%s) will be retried in %d ms", q->qname.c, DNSTypeName(q->qtype), q->ThisQInterval);
+                }
+                if (q->qDNSServer->cellIntf)
+                {
+                    // We don't want to retransmit too soon. Schedule our first retransmisson at
+                    // MIN_UCAST_RETRANS_TIMEOUT seconds.
+                    if (q->ThisQInterval < MIN_UCAST_RETRANS_TIMEOUT)
+                        q->ThisQInterval = MIN_UCAST_RETRANS_TIMEOUT;
+                }
+                debugf("uDNS_CheckCurrentQuestion: Increased ThisQInterval to %d for %##s (%s), cell %d", q->ThisQInterval, q->qname.c, DNSTypeName(q->qtype), q->qDNSServer->cellIntf);
+            }
+            q->LastQTime = m->timenow;
+            SetNextQueryTime(m, q);
+        }
+        else
+        {
+            // If we have no server for this query, or the only server is a disabled one, then we deliver
+            // a transient failure indication to the client. This is important for things like iPhone
+            // where we want to return timely feedback to the user when no network is available.
+            // After calling MakeNegativeCacheRecord() we store the resulting record in the
+            // cache so that it will be visible to other clients asking the same question.
+            // (When we have a group of identical questions, only the active representative of the group gets
+            // passed to uDNS_CheckCurrentQuestion -- we only want one set of query packets hitting the wire --
+            // but we want *all* of the questions to get answer callbacks.)
+            CacheRecord *rr;
+            const mDNSu32 slot = HashSlot(&q->qname);
+            CacheGroup *const cg = CacheGroupForName(m, slot, q->qnamehash, &q->qname);
+
+            if (!q->qDNSServer)
+            {
+                if (!mDNSOpaque64IsZero(&q->validDNSServers))
+                    LogMsg("uDNS_CheckCurrentQuestion: ERROR!!: valid DNSServer bits not zero 0x%x, 0x%x for question %##s (%s)",
+                           q->validDNSServers.l[1], q->validDNSServers.l[0], q->qname.c, DNSTypeName(q->qtype));
+                // If we reached the end of list while picking DNS servers, then we don't want to deactivate the
+                // question. Try after 60 seconds. We find this by looking for valid DNSServers for this question,
+                // if we find any, then we must have tried them before we came here. This avoids maintaining
+                // another state variable to see if we had valid DNS servers for this question.
+                SetValidDNSServers(m, q);
+                if (mDNSOpaque64IsZero(&q->validDNSServers))
+                {
+                    LogInfo("uDNS_CheckCurrentQuestion: no DNS server for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                    q->ThisQInterval = 0;
+                }
+                else
+                {
+                    DNSQuestion *qptr;
+                    // Pretend that we sent this question. As this is an ActiveQuestion, the NextScheduledQuery should
+                    // be set properly. Also, we need to properly backoff in cases where we don't set the question to
+                    // MaxQuestionInterval when we answer the question e.g., LongLived, we need to keep backing off
+                    q->ThisQInterval = q->ThisQInterval * QuestionIntervalStep;
+                    q->LastQTime = m->timenow;
+                    SetNextQueryTime(m, q);
+                    // Pick a new DNS server now. Otherwise, when the cache is 80% of its expiry, we will try
+                    // to send a query and come back to the same place here and log the above message.
+                    q->qDNSServer = GetServerForQuestion(m, q);
+                    for (qptr = q->next ; qptr; qptr = qptr->next)
+                        if (qptr->DuplicateOf == q) { qptr->validDNSServers = q->validDNSServers; qptr->qDNSServer = q->qDNSServer; }
+                    LogInfo("uDNS_checkCurrentQuestion: Tried all DNS servers, retry question %p SuppressUnusable %d %##s (%s) with DNS Server %#a:%d after 60 seconds, ThisQInterval %d",
+                            q, q->SuppressUnusable, q->qname.c, DNSTypeName(q->qtype),
+                            q->qDNSServer ? &q->qDNSServer->addr : mDNSNULL, mDNSVal16(q->qDNSServer ? q->qDNSServer->port : zeroIPPort), q->ThisQInterval);
+                }
+            }
+            else
+            {
+                q->ThisQInterval = 0;
+                LogMsg("uDNS_CheckCurrentQuestion DNS server %#a:%d for %##s is disabled", &q->qDNSServer->addr, mDNSVal16(q->qDNSServer->port), q->qname.c);
+            }
+
+            if (cg)
+            {
+                for (rr = cg->members; rr; rr=rr->next)
+                {
+                    if (SameNameRecordAnswersQuestion(&rr->resrec, q))
+                    {
+                        LogInfo("uDNS_CheckCurrentQuestion: Purged resourcerecord %s", CRDisplayString(m, rr)); 
+                        mDNS_PurgeCacheResourceRecord(m, rr);
+                    }
+                }
+            }
+            // For some of the WAB queries that we generate form within the mDNSResponder, most of the home routers
+            // don't understand and return ServFail/NXDomain. In those cases, we don't want to try too often. We try
+            // every fifteen minutes in that case
+            MakeNegativeCacheRecord(m, &m->rec.r, &q->qname, q->qnamehash, q->qtype, q->qclass, (DomainEnumQuery(&q->qname) ? 60 * 15 : 60), mDNSInterface_Any, q->qDNSServer);
+            q->unansweredQueries = 0;
+            if (!mDNSOpaque16IsZero(q->responseFlags))
+                m->rec.r.responseFlags = q->responseFlags;
+            // We're already using the m->CurrentQuestion pointer, so CacheRecordAdd can't use it to walk the question list.
+            // To solve this problem we set rr->DelayDelivery to a nonzero value (which happens to be 'now') so that we
+            // momentarily defer generating answer callbacks until mDNS_Execute time.
+            CreateNewCacheEntry(m, slot, cg, NonZeroTime(m->timenow), mDNStrue, mDNSNULL);
+            ScheduleNextCacheCheckTime(m, slot, NonZeroTime(m->timenow));
+            m->rec.r.responseFlags = zeroID;
+            m->rec.r.resrec.RecordType = 0;     // Clear RecordType to show we're not still using it
+            // MUST NOT touch m->CurrentQuestion (or q) after this -- client callback could have deleted it
+        }
+    }
+}
+
+mDNSexport void CheckNATMappings(mDNS *m)
+{
+    mStatus err = mStatus_NoError;
+    mDNSBool rfc1918 = mDNSv4AddrIsRFC1918(&m->AdvertisedV4.ip.v4);
+    mDNSBool HaveRoutable = !rfc1918 && !mDNSIPv4AddressIsZero(m->AdvertisedV4.ip.v4);
+    m->NextScheduledNATOp = m->timenow + 0x3FFFFFFF;
+
+    if (HaveRoutable) m->ExtAddress = m->AdvertisedV4.ip.v4;
+
+    if (m->NATTraversals && rfc1918)            // Do we need to open a socket to receive multicast announcements from router?
+    {
+        if (m->NATMcastRecvskt == mDNSNULL)     // If we are behind a NAT and the socket hasn't been opened yet, open it
+        {
+            // we need to log a message if we can't get our socket, but only the first time (after success)
+            static mDNSBool needLog = mDNStrue;
+            m->NATMcastRecvskt = mDNSPlatformUDPSocket(m, NATPMPAnnouncementPort);
+            if (!m->NATMcastRecvskt)
+            {
+                if (needLog)
+                {
+                    LogMsg("CheckNATMappings: Failed to allocate port 5350 UDP multicast socket for PCP & NAT-PMP announcements");
+                    needLog = mDNSfalse;
+                }
+            }
+            else
+                needLog = mDNStrue;
+        }
+    }
+    else                                        // else, we don't want to listen for announcements, so close them if they're open
+    {
+        if (m->NATMcastRecvskt) { mDNSPlatformUDPClose(m->NATMcastRecvskt); m->NATMcastRecvskt = mDNSNULL; }
+        if (m->SSDPSocket)      { debugf("CheckNATMappings destroying SSDPSocket %p", &m->SSDPSocket); mDNSPlatformUDPClose(m->SSDPSocket); m->SSDPSocket = mDNSNULL; }
+    }
+
+    uDNS_RequestAddress(m);
+
+    if (m->CurrentNATTraversal) LogMsg("WARNING m->CurrentNATTraversal already in use");
+    m->CurrentNATTraversal = m->NATTraversals;
+
+    while (m->CurrentNATTraversal)
+    {
+        NATTraversalInfo *cur = m->CurrentNATTraversal;
+        mDNSv4Addr EffectiveAddress = HaveRoutable ? m->AdvertisedV4.ip.v4 : cur->NewAddress;
+        m->CurrentNATTraversal = m->CurrentNATTraversal->next;
+
+        if (HaveRoutable)       // If not RFC 1918 address, our own address and port are effectively our external address and port
+        {
+            cur->ExpiryTime = 0;
+            cur->NewResult  = mStatus_NoError;
+        }
+        else // Check if it's time to send port mapping packet(s)
+        {
+            if (m->timenow - cur->retryPortMap >= 0) // Time to send a mapping request for this packet
+            {
+                if (cur->ExpiryTime && cur->ExpiryTime - m->timenow < 0)    // Mapping has expired
+                {
+                    cur->ExpiryTime    = 0;
+                    cur->retryInterval = NATMAP_INIT_RETRY;
+                }
+
+                err = uDNS_SendNATMsg(m, cur, mDNStrue); // Will also do UPnP discovery for us, if necessary
+
+                if (cur->ExpiryTime)                        // If have active mapping then set next renewal time halfway to expiry
+                    NATSetNextRenewalTime(m, cur);
+                else                                        // else no mapping; use exponential backoff sequence
+                {
+                    if      (cur->retryInterval < NATMAP_INIT_RETRY            ) cur->retryInterval = NATMAP_INIT_RETRY;
+                    else if (cur->retryInterval < NATMAP_MAX_RETRY_INTERVAL / 2) cur->retryInterval *= 2;
+                    else cur->retryInterval = NATMAP_MAX_RETRY_INTERVAL;
+                    cur->retryPortMap = m->timenow + cur->retryInterval;
+                }
+            }
+
+            if (m->NextScheduledNATOp - cur->retryPortMap > 0)
+            {
+                m->NextScheduledNATOp = cur->retryPortMap;
+            }
+        }
+
+        // Notify the client if necessary. We invoke the callback if:
+        // (1) We have an effective address,
+        //     or we've tried and failed a couple of times to discover it
+        // AND
+        // (2) the client requested the address only,
+        //     or the client won't need a mapping because we have a routable address,
+        //     or the client has an expiry time and therefore a successful mapping,
+        //     or we've tried and failed a couple of times (see "Time line" below)
+        // AND
+        // (3) we have new data to give the client that's changed since the last callback
+        //
+        // Time line is: Send, Wait 500ms, Send, Wait 1sec, Send, Wait 2sec, Send
+        // At this point we've sent three requests without an answer, we've just sent our fourth request,
+        // retryInterval is now 4 seconds, which is greater than NATMAP_INIT_RETRY * 8 (2 seconds),
+        // so we return an error result to the caller.
+        if (!mDNSIPv4AddressIsZero(EffectiveAddress) || cur->retryInterval > NATMAP_INIT_RETRY * 8)
+        {
+            const mStatus EffectiveResult = cur->NewResult ? cur->NewResult : mDNSv4AddrIsRFC1918(&EffectiveAddress) ? mStatus_DoubleNAT : mStatus_NoError;
+            const mDNSIPPort ExternalPort = HaveRoutable ? cur->IntPort :
+                                            !mDNSIPv4AddressIsZero(EffectiveAddress) && cur->ExpiryTime ? cur->RequestedPort : zeroIPPort;
+                                            
+            if (!cur->Protocol || HaveRoutable || cur->ExpiryTime || cur->retryInterval > NATMAP_INIT_RETRY * 8)
+            {
+                if (!mDNSSameIPv4Address(cur->ExternalAddress, EffectiveAddress) ||
+                    !mDNSSameIPPort     (cur->ExternalPort,       ExternalPort)    ||
+                    cur->Result != EffectiveResult)
+                {
+                    //LogMsg("NAT callback %d %d %d", cur->Protocol, cur->ExpiryTime, cur->retryInterval);
+                    if (cur->Protocol && mDNSIPPortIsZero(ExternalPort) && !mDNSIPv4AddressIsZero(m->Router.ip.v4))
+                    {
+                        if (!EffectiveResult)
+                            LogInfo("CheckNATMapping: Failed to obtain NAT port mapping %p from router %#a external address %.4a internal port %5d interval %d error %d",
+                                    cur, &m->Router, &EffectiveAddress, mDNSVal16(cur->IntPort), cur->retryInterval, EffectiveResult);
+                        else
+                            LogMsg("CheckNATMapping: Failed to obtain NAT port mapping %p from router %#a external address %.4a internal port %5d interval %d error %d",
+                                   cur, &m->Router, &EffectiveAddress, mDNSVal16(cur->IntPort), cur->retryInterval, EffectiveResult);
+                    }
+
+                    cur->ExternalAddress = EffectiveAddress;
+                    cur->ExternalPort    = ExternalPort;
+                    cur->Lifetime        = cur->ExpiryTime && !mDNSIPPortIsZero(ExternalPort) ?
+                                           (cur->ExpiryTime - m->timenow + mDNSPlatformOneSecond/2) / mDNSPlatformOneSecond : 0;
+                    cur->Result          = EffectiveResult;
+                    mDNS_DropLockBeforeCallback();      // Allow client to legally make mDNS API calls from the callback
+                    if (cur->clientCallback)
+                        cur->clientCallback(m, cur);
+                    mDNS_ReclaimLockAfterCallback();    // Decrement mDNS_reentrancy to block mDNS API calls again
+                    // MUST NOT touch cur after invoking the callback
+                }
+            }
+        }
+    }
+}
+
+mDNSlocal mDNSs32 CheckRecordUpdates(mDNS *m)
+{
+    AuthRecord *rr;
+    mDNSs32 nextevent = m->timenow + 0x3FFFFFFF;
+
+    CheckGroupRecordUpdates(m);
+
+    for (rr = m->ResourceRecords; rr; rr = rr->next)
+    {
+        if (!AuthRecord_uDNS(rr)) continue;
+        if (rr->state == regState_NoTarget) {debugf("CheckRecordUpdates: Record %##s in NoTarget", rr->resrec.name->c); continue;}
+        // While we are waiting for the port mapping, we have nothing to do. The port mapping callback
+        // will take care of this
+        if (rr->state == regState_NATMap) {debugf("CheckRecordUpdates: Record %##s in NATMap", rr->resrec.name->c); continue;}
+        if (rr->state == regState_Pending || rr->state == regState_DeregPending || rr->state == regState_UpdatePending ||
+            rr->state == regState_Refresh || rr->state == regState_Registered)
+        {
+            if (rr->LastAPTime + rr->ThisAPInterval - m->timenow <= 0)
+            {
+                if (rr->tcp) { DisposeTCPConn(rr->tcp); rr->tcp = mDNSNULL; }
+                if (!rr->nta || mDNSIPv4AddressIsZero(rr->nta->Addr.ip.v4))
+                {
+                    // Zero out the updateid so that if we have a pending response from the server, it won't
+                    // be accepted as a valid response. If we accept the response, we might free the new "nta"
+                    if (rr->nta) { rr->updateid = zeroID; CancelGetZoneData(m, rr->nta); }
+                    rr->nta = StartGetZoneData(m, rr->resrec.name, ZoneServiceUpdate, RecordRegistrationGotZoneData, rr);
+
+                    // We have just started the GetZoneData. We need to wait for it to finish. SetRecordRetry here
+                    // schedules the update timer to fire in the future.
+                    //
+                    // There are three cases.
+                    //
+                    // 1) When the updates are sent the first time, the first retry is intended to be at three seconds
+                    //    in the future. But by calling SetRecordRetry here we set it to nine seconds. But it does not
+                    //    matter because when the answer comes back, RecordRegistrationGotZoneData resets the interval
+                    //    back to INIT_RECORD_REG_INTERVAL. This also gives enough time for the query.
+                    //
+                    // 2) In the case of update errors (updateError), this causes further backoff as
+                    //    RecordRegistrationGotZoneData does not reset the timer. This is intentional as in the case of
+                    //    errors, we don't want to update aggressively.
+                    //
+                    // 3) We might be refreshing the update. This is very similar to case (1). RecordRegistrationGotZoneData
+                    //    resets it back to INIT_RECORD_REG_INTERVAL.
+                    //
+                    SetRecordRetry(m, rr, 0);
+                }
+                else if (rr->state == regState_DeregPending) SendRecordDeregistration(m, rr);
+                else SendRecordRegistration(m, rr);
+            }
+        }
+        if (nextevent - (rr->LastAPTime + rr->ThisAPInterval) > 0)
+            nextevent = (rr->LastAPTime + rr->ThisAPInterval);
+    }
+    return nextevent;
+}
+
+mDNSexport void uDNS_Tasks(mDNS *const m)
+{
+    mDNSs32 nexte;
+    DNSServer *d;
+
+    m->NextuDNSEvent = m->timenow + 0x3FFFFFFF;
+
+    nexte = CheckRecordUpdates(m);
+    if (m->NextuDNSEvent - nexte > 0)
+        m->NextuDNSEvent = nexte;
+
+    for (d = m->DNSServers; d; d=d->next)
+        if (d->penaltyTime)
+        {
+            if (m->timenow - d->penaltyTime >= 0)
+            {
+                LogInfo("DNS server %#a:%d out of penalty box", &d->addr, mDNSVal16(d->port));
+                d->penaltyTime = 0;
+            }
+            else
+            if (m->NextuDNSEvent - d->penaltyTime > 0)
+                m->NextuDNSEvent = d->penaltyTime;
+        }
+
+    if (m->CurrentQuestion)
+        LogMsg("uDNS_Tasks ERROR m->CurrentQuestion already set: %##s (%s)", m->CurrentQuestion->qname.c, DNSTypeName(m->CurrentQuestion->qtype));
+    m->CurrentQuestion = m->Questions;
+    while (m->CurrentQuestion && m->CurrentQuestion != m->NewQuestions)
+    {
+        DNSQuestion *const q = m->CurrentQuestion;
+        if (ActiveQuestion(q) && !mDNSOpaque16IsZero(q->TargetQID))
+        {
+            uDNS_CheckCurrentQuestion(m);
+            if (q == m->CurrentQuestion)
+                if (m->NextuDNSEvent - NextQSendTime(q) > 0)
+                    m->NextuDNSEvent = NextQSendTime(q);
+        }
+        // If m->CurrentQuestion wasn't modified out from under us, advance it now
+        // We can't do this at the start of the loop because uDNS_CheckCurrentQuestion()
+        // depends on having m->CurrentQuestion point to the right question
+        if (m->CurrentQuestion == q)
+            m->CurrentQuestion = q->next;
+    }
+    m->CurrentQuestion = mDNSNULL;
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Startup, Shutdown, and Sleep
+#endif
+
+mDNSexport void SleepRecordRegistrations(mDNS *m)
+{
+    AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (AuthRecord_uDNS(rr))
+        {
+            // Zero out the updateid so that if we have a pending response from the server, it won't
+            // be accepted as a valid response.
+            if (rr->nta) { rr->updateid = zeroID; CancelGetZoneData(m, rr->nta); rr->nta = mDNSNULL; }
+
+            if (rr->NATinfo.clientContext)
+            {
+                mDNS_StopNATOperation_internal(m, &rr->NATinfo);
+                rr->NATinfo.clientContext = mDNSNULL;
+            }
+            // We are waiting to update the resource record. The original data of the record is
+            // in OrigRData and the updated value is in InFlightRData. Free the old and the new
+            // one will be registered when we come back.
+            if (rr->state == regState_UpdatePending)
+            {
+                // act as if the update succeeded, since we're about to delete the name anyway
+                rr->state = regState_Registered;
+                // deallocate old RData
+                if (rr->UpdateCallback) rr->UpdateCallback(m, rr, rr->OrigRData, rr->OrigRDLen);
+                SetNewRData(&rr->resrec, rr->InFlightRData, rr->InFlightRDLen);
+                rr->OrigRData = mDNSNULL;
+                rr->InFlightRData = mDNSNULL;
+            }
+
+            // If we have not begun the registration process i.e., never sent a registration packet,
+            // then uDNS_DeregisterRecord will not send a deregistration
+            uDNS_DeregisterRecord(m, rr);
+
+            // When we wake, we call ActivateUnicastRegistration which starts at StartGetZoneData
+        }
+    }
+}
+
+mDNSexport void mDNS_AddSearchDomain(const domainname *const domain, mDNSInterfaceID InterfaceID)
+{
+    SearchListElem **p;
+    SearchListElem *tmp = mDNSNULL;
+
+    // Check to see if we already have this domain in our list
+    for (p = &SearchList; *p; p = &(*p)->next)
+        if (((*p)->InterfaceID == InterfaceID) && SameDomainName(&(*p)->domain, domain))
+        {
+            // If domain is already in list, and marked for deletion, unmark the delete
+            // Be careful not to touch the other flags that may be present
+            LogInfo("mDNS_AddSearchDomain already in list %##s", domain->c);
+            if ((*p)->flag & SLE_DELETE) (*p)->flag &= ~SLE_DELETE;
+            tmp = *p;
+            *p = tmp->next;
+            tmp->next = mDNSNULL;
+            break;
+        }
+
+
+    // move to end of list so that we maintain the same order
+    while (*p) p = &(*p)->next;
+
+    if (tmp) *p = tmp;
+    else
+    {
+        // if domain not in list, add to list, mark as add (1)
+        *p = mDNSPlatformMemAllocate(sizeof(SearchListElem));
+        if (!*p) { LogMsg("ERROR: mDNS_AddSearchDomain - malloc"); return; }
+        mDNSPlatformMemZero(*p, sizeof(SearchListElem));
+        AssignDomainName(&(*p)->domain, domain);
+        (*p)->next = mDNSNULL;
+        (*p)->InterfaceID = InterfaceID;
+        LogInfo("mDNS_AddSearchDomain created new %##s, InterfaceID %p", domain->c, InterfaceID);
+    }
+}
+
+mDNSlocal void FreeARElemCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;    // unused
+    if (result == mStatus_MemFree) mDNSPlatformMemFree(rr->RecordContext);
+}
+
+mDNSlocal void FoundDomain(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    SearchListElem *slElem = question->QuestionContext;
+    mStatus err;
+    const char *name;
+
+    if (answer->rrtype != kDNSType_PTR) return;
+    if (answer->RecordType == kDNSRecordTypePacketNegative) return;
+    if (answer->InterfaceID == mDNSInterface_LocalOnly) return;
+
+    if      (question == &slElem->BrowseQ) name = mDNS_DomainTypeNames[mDNS_DomainTypeBrowse];
+    else if (question == &slElem->DefBrowseQ) name = mDNS_DomainTypeNames[mDNS_DomainTypeBrowseDefault];
+    else if (question == &slElem->AutomaticBrowseQ) name = mDNS_DomainTypeNames[mDNS_DomainTypeBrowseAutomatic];
+    else if (question == &slElem->RegisterQ) name = mDNS_DomainTypeNames[mDNS_DomainTypeRegistration];
+    else if (question == &slElem->DefRegisterQ) name = mDNS_DomainTypeNames[mDNS_DomainTypeRegistrationDefault];
+    else { LogMsg("FoundDomain - unknown question"); return; }
+
+    LogInfo("FoundDomain: %p %s %s Q %##s A %s", answer->InterfaceID, AddRecord ? "Add" : "Rmv", name, question->qname.c, RRDisplayString(m, answer));
+
+    if (AddRecord)
+    {
+        ARListElem *arElem = mDNSPlatformMemAllocate(sizeof(ARListElem));
+        if (!arElem) { LogMsg("ERROR: FoundDomain out of memory"); return; }
+        mDNS_SetupResourceRecord(&arElem->ar, mDNSNULL, mDNSInterface_LocalOnly, kDNSType_PTR, 7200, kDNSRecordTypeShared, AuthRecordLocalOnly, FreeARElemCallback, arElem);
+        MakeDomainNameFromDNSNameString(&arElem->ar.namestorage, name);
+        AppendDNSNameString            (&arElem->ar.namestorage, "local");
+        AssignDomainName(&arElem->ar.resrec.rdata->u.name, &answer->rdata->u.name);
+        LogInfo("FoundDomain: Registering %s", ARDisplayString(m, &arElem->ar));
+        err = mDNS_Register(m, &arElem->ar);
+        if (err) { LogMsg("ERROR: FoundDomain - mDNS_Register returned %d", err); mDNSPlatformMemFree(arElem); return; }
+        arElem->next = slElem->AuthRecs;
+        slElem->AuthRecs = arElem;
+    }
+    else
+    {
+        ARListElem **ptr = &slElem->AuthRecs;
+        while (*ptr)
+        {
+            if (SameDomainName(&(*ptr)->ar.resrec.rdata->u.name, &answer->rdata->u.name))
+            {
+                ARListElem *dereg = *ptr;
+                *ptr = (*ptr)->next;
+                LogInfo("FoundDomain: Deregistering %s", ARDisplayString(m, &dereg->ar));
+                err = mDNS_Deregister(m, &dereg->ar);
+                if (err) LogMsg("ERROR: FoundDomain - mDNS_Deregister returned %d", err);
+                // Memory will be freed in the FreeARElemCallback
+            }
+            else
+                ptr = &(*ptr)->next;
+        }
+    }
+}
+
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+mDNSexport void udns_validatelists(void *const v)
+{
+    mDNS *const m = v;
+
+    NATTraversalInfo *n;
+    for (n = m->NATTraversals; n; n=n->next)
+        if (n->next == (NATTraversalInfo *)~0 || n->clientCallback == (NATTraversalClientCallback) ~0)
+            LogMemCorruption("m->NATTraversals: %p is garbage", n);
+
+    DNSServer *d;
+    for (d = m->DNSServers; d; d=d->next)
+        if (d->next == (DNSServer *)~0 || d->teststate > DNSServer_Disabled)
+            LogMemCorruption("m->DNSServers: %p is garbage (%d)", d, d->teststate);
+
+    DomainAuthInfo *info;
+    for (info = m->AuthInfoList; info; info = info->next)
+        if (info->next == (DomainAuthInfo *)~0)
+            LogMemCorruption("m->AuthInfoList: %p is garbage", info);
+
+    HostnameInfo *hi;
+    for (hi = m->Hostnames; hi; hi = hi->next)
+        if (hi->next == (HostnameInfo *)~0 || hi->StatusCallback == (mDNSRecordCallback*)~0)
+            LogMemCorruption("m->Hostnames: %p is garbage", n);
+
+    SearchListElem *ptr;
+    for (ptr = SearchList; ptr; ptr = ptr->next)
+        if (ptr->next == (SearchListElem *)~0 || ptr->AuthRecs == (void*)~0)
+            LogMemCorruption("SearchList: %p is garbage (%X)", ptr, ptr->AuthRecs);
+}
+#endif
+
+// This should probably move to the UDS daemon -- the concept of legacy clients and automatic registration / automatic browsing
+// is really a UDS API issue, not something intrinsic to uDNS
+
+mDNSlocal void uDNS_DeleteWABQueries(mDNS *const m, SearchListElem *ptr, int delete)
+{
+    const char *name1 = mDNSNULL;
+    const char *name2 = mDNSNULL;
+    ARListElem **arList = &ptr->AuthRecs;
+    domainname namestorage1, namestorage2;
+    mStatus err;
+
+    // "delete" parameter indicates the type of query.
+    switch (delete)
+    {
+    case UDNS_WAB_BROWSE_QUERY:
+        mDNS_StopGetDomains(m, &ptr->BrowseQ);
+        mDNS_StopGetDomains(m, &ptr->DefBrowseQ);
+        name1 = mDNS_DomainTypeNames[mDNS_DomainTypeBrowse];
+        name2 = mDNS_DomainTypeNames[mDNS_DomainTypeBrowseDefault];
+        break;
+    case UDNS_WAB_LBROWSE_QUERY:
+        mDNS_StopGetDomains(m, &ptr->AutomaticBrowseQ);
+        name1 = mDNS_DomainTypeNames[mDNS_DomainTypeBrowseAutomatic];
+        break;
+    case UDNS_WAB_REG_QUERY:
+        mDNS_StopGetDomains(m, &ptr->RegisterQ);
+        mDNS_StopGetDomains(m, &ptr->DefRegisterQ);
+        name1 = mDNS_DomainTypeNames[mDNS_DomainTypeRegistration];
+        name2 = mDNS_DomainTypeNames[mDNS_DomainTypeRegistrationDefault];
+        break;
+    default:
+        LogMsg("uDNS_DeleteWABQueries: ERROR!! returning from default");
+        return;
+    }
+    // When we get the results to the domain enumeration queries, we add a LocalOnly
+    // entry. For example, if we issue a domain enumeration query for b._dns-sd._udp.xxxx.com,
+    // and when we get a response, we add a LocalOnly entry b._dns-sd._udp.local whose RDATA
+    // points to what we got in the response. Locate the appropriate LocalOnly entries and delete
+    // them.
+    if (name1)
+    {
+        MakeDomainNameFromDNSNameString(&namestorage1, name1);
+        AppendDNSNameString(&namestorage1, "local");
+    }
+    if (name2)
+    {
+        MakeDomainNameFromDNSNameString(&namestorage2, name2);
+        AppendDNSNameString(&namestorage2, "local");
+    }
+    while (*arList)
+    {
+        ARListElem *dereg = *arList;
+        if ((name1 && SameDomainName(&dereg->ar.namestorage, &namestorage1)) ||
+            (name2 && SameDomainName(&dereg->ar.namestorage, &namestorage2)))
+        {
+            LogInfo("uDNS_DeleteWABQueries: Deregistering PTR %##s -> %##s", dereg->ar.resrec.name->c, dereg->ar.resrec.rdata->u.name.c);
+            *arList = dereg->next;
+            err = mDNS_Deregister(m, &dereg->ar);
+            if (err) LogMsg("uDNS_DeleteWABQueries:: ERROR!! mDNS_Deregister returned %d", err);
+            // Memory will be freed in the FreeARElemCallback
+        }
+        else
+        {
+            LogInfo("uDNS_DeleteWABQueries: Skipping PTR %##s -> %##s", dereg->ar.resrec.name->c, dereg->ar.resrec.rdata->u.name.c);
+            arList = &(*arList)->next;
+        }
+    }
+}
+
+mDNSexport void uDNS_SetupWABQueries(mDNS *const m)
+{
+    SearchListElem **p = &SearchList, *ptr;
+    mStatus err;
+    int action = 0;
+
+    // step 1: mark each element for removal
+    for (ptr = SearchList; ptr; ptr = ptr->next)
+        ptr->flag |= SLE_DELETE;
+
+    // Make sure we have the search domains from the platform layer so that if we start the WAB
+    // queries below, we have the latest information.
+    mDNS_Lock(m);
+    if (!mDNSPlatformSetDNSConfig(m, mDNSfalse, mDNStrue, mDNSNULL, mDNSNULL, mDNSNULL, mDNSfalse))
+    {
+        // If the configuration did not change, clear the flag so that we don't free the searchlist.
+        // We still have to start the domain enumeration queries as we may not have started them
+        // before.
+        for (ptr = SearchList; ptr; ptr = ptr->next)
+            ptr->flag &= ~SLE_DELETE;
+        LogInfo("uDNS_SetupWABQueries: No config change");
+    }
+    mDNS_Unlock(m);
+
+    if (m->WABBrowseQueriesCount)
+        action |= UDNS_WAB_BROWSE_QUERY;
+    if (m->WABLBrowseQueriesCount)
+        action |= UDNS_WAB_LBROWSE_QUERY;
+    if (m->WABRegQueriesCount)
+        action |= UDNS_WAB_REG_QUERY;
+
+
+    // delete elems marked for removal, do queries for elems marked add
+    while (*p)
+    {
+        ptr = *p;
+        LogInfo("uDNS_SetupWABQueries:action 0x%x: Flags 0x%x,  AuthRecs %p, InterfaceID %p %##s", action, ptr->flag, ptr->AuthRecs, ptr->InterfaceID, ptr->domain.c);
+        // If SLE_DELETE is set, stop all the queries, deregister all the records and free the memory.
+        // Otherwise, check to see what the "action" requires. If a particular action bit is not set and
+        // we have started the corresponding queries as indicated by the "flags", stop those queries and
+        // deregister the records corresponding to them.
+        if ((ptr->flag & SLE_DELETE) ||
+            (!(action & UDNS_WAB_BROWSE_QUERY) && (ptr->flag & SLE_WAB_BROWSE_QUERY_STARTED)) ||
+            (!(action & UDNS_WAB_LBROWSE_QUERY) && (ptr->flag & SLE_WAB_LBROWSE_QUERY_STARTED)) ||
+            (!(action & UDNS_WAB_REG_QUERY) && (ptr->flag & SLE_WAB_REG_QUERY_STARTED)))
+        {
+            if (ptr->flag & SLE_DELETE)
+            {
+                ARListElem *arList = ptr->AuthRecs;
+                ptr->AuthRecs = mDNSNULL;
+                *p = ptr->next;
+
+                // If the user has "local" in their DNS searchlist, we ignore that for the purposes of domain enumeration queries
+                // We suppressed the domain enumeration for scoped search domains below. When we enable that
+                // enable this.
+                if ((ptr->flag & SLE_WAB_BROWSE_QUERY_STARTED) &&
+                    !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+                {
+                    LogInfo("uDNS_SetupWABQueries: DELETE  Browse for domain  %##s", ptr->domain.c);
+                    mDNS_StopGetDomains(m, &ptr->BrowseQ);
+                    mDNS_StopGetDomains(m, &ptr->DefBrowseQ);
+                }
+                if ((ptr->flag & SLE_WAB_LBROWSE_QUERY_STARTED) &&
+                    !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+                {
+                    LogInfo("uDNS_SetupWABQueries: DELETE  Legacy Browse for domain  %##s", ptr->domain.c);
+                    mDNS_StopGetDomains(m, &ptr->AutomaticBrowseQ);
+                }
+                if ((ptr->flag & SLE_WAB_REG_QUERY_STARTED) &&
+                    !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+                {
+                    LogInfo("uDNS_SetupWABQueries: DELETE  Registration for domain  %##s", ptr->domain.c);
+                    mDNS_StopGetDomains(m, &ptr->RegisterQ);
+                    mDNS_StopGetDomains(m, &ptr->DefRegisterQ);
+                }
+
+                mDNSPlatformMemFree(ptr);
+
+                // deregister records generated from answers to the query
+                while (arList)
+                {
+                    ARListElem *dereg = arList;
+                    arList = arList->next;
+                    LogInfo("uDNS_SetupWABQueries: DELETE Deregistering PTR %##s -> %##s", dereg->ar.resrec.name->c, dereg->ar.resrec.rdata->u.name.c);
+                    err = mDNS_Deregister(m, &dereg->ar);
+                    if (err) LogMsg("uDNS_SetupWABQueries:: ERROR!! mDNS_Deregister returned %d", err);
+                    // Memory will be freed in the FreeARElemCallback
+                }
+                continue;
+            }
+
+            // If the user has "local" in their DNS searchlist, we ignore that for the purposes of domain enumeration queries
+            // We suppressed the domain enumeration for scoped search domains below. When we enable that
+            // enable this.
+            if (!(action & UDNS_WAB_BROWSE_QUERY) && (ptr->flag & SLE_WAB_BROWSE_QUERY_STARTED) &&
+                !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                LogInfo("uDNS_SetupWABQueries: Deleting Browse for domain  %##s", ptr->domain.c);
+                ptr->flag &= ~SLE_WAB_BROWSE_QUERY_STARTED;
+                uDNS_DeleteWABQueries(m, ptr, UDNS_WAB_BROWSE_QUERY);
+            }
+
+            if (!(action & UDNS_WAB_LBROWSE_QUERY) && (ptr->flag & SLE_WAB_LBROWSE_QUERY_STARTED) &&
+                !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                LogInfo("uDNS_SetupWABQueries: Deleting Legacy Browse for domain  %##s", ptr->domain.c);
+                ptr->flag &= ~SLE_WAB_LBROWSE_QUERY_STARTED;
+                uDNS_DeleteWABQueries(m, ptr, UDNS_WAB_LBROWSE_QUERY);
+            }
+
+            if (!(action & UDNS_WAB_REG_QUERY) && (ptr->flag & SLE_WAB_REG_QUERY_STARTED) &&
+                !SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                LogInfo("uDNS_SetupWABQueries: Deleting Registration for domain  %##s", ptr->domain.c);
+                ptr->flag &= ~SLE_WAB_REG_QUERY_STARTED;
+                uDNS_DeleteWABQueries(m, ptr, UDNS_WAB_REG_QUERY);
+            }
+
+            // Fall through to handle the ADDs
+        }
+
+        if ((action & UDNS_WAB_BROWSE_QUERY) && !(ptr->flag & SLE_WAB_BROWSE_QUERY_STARTED))
+        {
+            // If the user has "local" in their DNS searchlist, we ignore that for the purposes of domain enumeration queries.
+            // Also, suppress the domain enumeration for scoped search domains for now until there is a need.
+            if (!SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                mStatus err1, err2;
+                err1 = mDNS_GetDomains(m, &ptr->BrowseQ,          mDNS_DomainTypeBrowse,              &ptr->domain, ptr->InterfaceID, FoundDomain, ptr);
+                if (err1)
+                {
+                    LogMsg("uDNS_SetupWABQueries: GetDomains for domain %##s returned error(s):\n"
+                           "%d (mDNS_DomainTypeBrowse)\n", ptr->domain.c, err1);
+                }
+                else
+                {
+                    LogInfo("uDNS_SetupWABQueries: Starting Browse for domain %##s", ptr->domain.c);
+                }
+                err2 = mDNS_GetDomains(m, &ptr->DefBrowseQ,       mDNS_DomainTypeBrowseDefault,       &ptr->domain, ptr->InterfaceID, FoundDomain, ptr);
+                if (err2)
+                {
+                    LogMsg("uDNS_SetupWABQueries: GetDomains for domain %##s returned error(s):\n"
+                           "%d (mDNS_DomainTypeBrowseDefault)\n", ptr->domain.c, err2);
+                }
+                else
+                {
+                    LogInfo("uDNS_SetupWABQueries: Starting Default Browse for domain %##s", ptr->domain.c);
+                }
+                // For simplicity, we mark a single bit for denoting that both the browse queries have started.
+                // It is not clear as to why one would fail to start and the other would succeed in starting up.
+                // If that happens, we will try to stop both the queries and one of them won't be in the list and
+                // it is not a hard error.
+                if (!err1 || !err2)
+                {
+                    ptr->flag |= SLE_WAB_BROWSE_QUERY_STARTED;
+                }
+            }
+        }
+        if ((action & UDNS_WAB_LBROWSE_QUERY) && !(ptr->flag & SLE_WAB_LBROWSE_QUERY_STARTED))
+        {
+            // If the user has "local" in their DNS searchlist, we ignore that for the purposes of domain enumeration queries.
+            // Also, suppress the domain enumeration for scoped search domains for now until there is a need.
+            if (!SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                mStatus err1;
+                err1 = mDNS_GetDomains(m, &ptr->AutomaticBrowseQ, mDNS_DomainTypeBrowseAutomatic,     &ptr->domain, ptr->InterfaceID, FoundDomain, ptr);
+                if (err1)
+                {
+                    LogMsg("uDNS_SetupWABQueries: GetDomains for domain %##s returned error(s):\n"
+                           "%d (mDNS_DomainTypeBrowseAutomatic)\n",
+                           ptr->domain.c, err1);
+                }
+                else
+                {
+                    ptr->flag |= SLE_WAB_LBROWSE_QUERY_STARTED;
+                    LogInfo("uDNS_SetupWABQueries: Starting Legacy Browse for domain %##s", ptr->domain.c);
+                }
+            }
+        }
+        if ((action & UDNS_WAB_REG_QUERY) && !(ptr->flag & SLE_WAB_REG_QUERY_STARTED))
+        {
+            // If the user has "local" in their DNS searchlist, we ignore that for the purposes of domain enumeration queries.
+            // Also, suppress the domain enumeration for scoped search domains for now until there is a need.
+            if (!SameDomainName(&ptr->domain, &localdomain) && (ptr->InterfaceID == mDNSInterface_Any))
+            {
+                mStatus err1, err2;
+                err1 = mDNS_GetDomains(m, &ptr->RegisterQ,        mDNS_DomainTypeRegistration,        &ptr->domain, ptr->InterfaceID, FoundDomain, ptr);
+                if (err1)
+                {
+                    LogMsg("uDNS_SetupWABQueries: GetDomains for domain %##s returned error(s):\n"
+                           "%d (mDNS_DomainTypeRegistration)\n", ptr->domain.c, err1);
+                }
+                else
+                {
+                    LogInfo("uDNS_SetupWABQueries: Starting Registration for domain %##s", ptr->domain.c);
+                }
+                err2 = mDNS_GetDomains(m, &ptr->DefRegisterQ,     mDNS_DomainTypeRegistrationDefault, &ptr->domain, ptr->InterfaceID, FoundDomain, ptr);
+                if (err2)
+                {
+                    LogMsg("uDNS_SetupWABQueries: GetDomains for domain %##s returned error(s):\n"
+                           "%d (mDNS_DomainTypeRegistrationDefault)", ptr->domain.c, err2);
+                }
+                else
+                {
+                    LogInfo("uDNS_SetupWABQueries: Starting Default Registration for domain %##s", ptr->domain.c);
+                }
+                if (!err1 || !err2)
+                {
+                    ptr->flag |= SLE_WAB_REG_QUERY_STARTED;
+                }
+            }
+        }
+
+        p = &ptr->next;
+    }
+}
+
+// mDNS_StartWABQueries is called once per API invocation where normally
+// one of the bits is set.
+mDNSexport void uDNS_StartWABQueries(mDNS *const m, int queryType)
+{
+    if (queryType & UDNS_WAB_BROWSE_QUERY)
+    {
+        m->WABBrowseQueriesCount++;
+        LogInfo("uDNS_StartWABQueries: Browse query count %d", m->WABBrowseQueriesCount);
+    }
+    if (queryType & UDNS_WAB_LBROWSE_QUERY)
+    {
+        m->WABLBrowseQueriesCount++;
+        LogInfo("uDNS_StartWABQueries: Legacy Browse query count %d", m->WABLBrowseQueriesCount);
+    }
+    if (queryType & UDNS_WAB_REG_QUERY)
+    {
+        m->WABRegQueriesCount++;
+        LogInfo("uDNS_StartWABQueries: Reg query count %d", m->WABRegQueriesCount);
+    }
+    uDNS_SetupWABQueries(m);
+}
+
+// mDNS_StopWABQueries is called once per API invocation where normally
+// one of the bits is set.
+mDNSexport void uDNS_StopWABQueries(mDNS *const m, int queryType)
+{
+    if (queryType & UDNS_WAB_BROWSE_QUERY)
+    {
+        m->WABBrowseQueriesCount--;
+        LogInfo("uDNS_StopWABQueries: Browse query count %d", m->WABBrowseQueriesCount);
+    }
+    if (queryType & UDNS_WAB_LBROWSE_QUERY)
+    {
+        m->WABLBrowseQueriesCount--;
+        LogInfo("uDNS_StopWABQueries: Legacy Browse query count %d", m->WABLBrowseQueriesCount);
+    }
+    if (queryType & UDNS_WAB_REG_QUERY)
+    {
+        m->WABRegQueriesCount--;
+        LogInfo("uDNS_StopWABQueries: Reg query count %d", m->WABRegQueriesCount);
+    }
+    uDNS_SetupWABQueries(m);
+}
+
+mDNSexport domainname  *uDNS_GetNextSearchDomain(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSs8 *searchIndex, mDNSBool ignoreDotLocal)
+{
+    SearchListElem *p = SearchList;
+    int count = *searchIndex;
+    (void) m; // unused
+
+    if (count < 0) { LogMsg("uDNS_GetNextSearchDomain: count %d less than zero", count); return mDNSNULL; }
+
+    // Skip the  domains that we already looked at before. Guard against "p"
+    // being NULL. When search domains change we may not set the SearchListIndex
+    // of the question to zero immediately e.g., domain enumeration query calls
+    // uDNS_SetupWABQueries which reads in the new search domain but does not
+    // restart the questions immediately. Questions are restarted as part of
+    // network change and hence temporarily SearchListIndex may be out of range.
+
+    for (; count && p; count--)
+        p = p->next;
+
+    while (p)
+    {
+        int labels = CountLabels(&p->domain);
+        if (labels > 0)
+        {
+            const domainname *d = SkipLeadingLabels(&p->domain, labels - 1);
+            if (SameDomainLabel(d->c, (const mDNSu8 *)"\x4" "arpa"))
+            {
+                LogInfo("uDNS_GetNextSearchDomain: skipping search domain %##s, InterfaceID %p", p->domain.c, p->InterfaceID);
+                (*searchIndex)++;
+                p = p->next;
+                continue;
+            }
+            if (ignoreDotLocal && SameDomainLabel(d->c, (const mDNSu8 *)"\x5" "local"))
+            {
+                LogInfo("uDNS_GetNextSearchDomain: skipping local domain %##s, InterfaceID %p", p->domain.c, p->InterfaceID);
+                (*searchIndex)++;
+                p = p->next;
+                continue;
+            }
+        }
+        // Point to the next one in the list which we will look at next time.
+        (*searchIndex)++;
+        // When we are appending search domains in a ActiveDirectory domain, the question's InterfaceID
+        // set to mDNSInterface_Unicast. Match the unscoped entries in that case.
+        if (((InterfaceID == mDNSInterface_Unicast) && (p->InterfaceID == mDNSInterface_Any)) ||
+            p->InterfaceID == InterfaceID)
+        {
+            LogInfo("uDNS_GetNextSearchDomain returning domain %##s, InterfaceID %p", p->domain.c, p->InterfaceID);
+            return &p->domain;
+        }
+        LogInfo("uDNS_GetNextSearchDomain skipping domain %##s, InterfaceID %p", p->domain.c, p->InterfaceID);
+        p = p->next;
+    }
+    return mDNSNULL;
+}
+
+mDNSlocal void FlushAddressCacheRecords(mDNS *const m)
+{
+    mDNSu32 slot;
+    CacheGroup *cg;
+    CacheRecord *cr;
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if (cr->resrec.InterfaceID) continue;
+
+        // If a resource record can answer A or AAAA, they need to be flushed so that we will
+        // deliver an ADD or RMV
+        if (RRTypeAnswersQuestionType(&cr->resrec, kDNSType_A) ||
+            RRTypeAnswersQuestionType(&cr->resrec, kDNSType_AAAA))
+        {
+            LogInfo("FlushAddressCacheRecords: Purging Resourcerecord %s", CRDisplayString(m, cr));
+            mDNS_PurgeCacheResourceRecord(m, cr);
+        }
+    }
+}
+
+// Retry questions which has seach domains appended
+mDNSexport void RetrySearchDomainQuestions(mDNS *const m)
+{
+    DNSQuestion *q;
+    mDNSBool found = mDNSfalse;
+
+    // Check to see if there are any questions which needs search domains to be applied.
+    // If there is none, search domains can't possibly affect them.
+    for (q = m->Questions; q; q = q->next)
+    {
+        if (q->AppendSearchDomains)
+        {
+            found = mDNStrue;
+            break;
+        }
+    }
+    if (!found)
+    {
+        LogInfo("RetrySearchDomainQuestions: Questions with AppendSearchDomain not found");
+        return;
+    }
+    LogInfo("RetrySearchDomainQuestions: Question with AppendSearchDomain found %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+    // Purge all the A/AAAA cache records and restart the queries. mDNSCoreRestartAddressQueries
+    // does this. When we restart the question,  we first want to try the new search domains rather
+    // than use the entries that is already in the cache. When we appended search domains, we might
+    // have created cache entries which is no longer valid as there are new search domains now
+    mDNSCoreRestartAddressQueries(m, mDNStrue, FlushAddressCacheRecords, mDNSNULL, mDNSNULL);
+}
+
+// Construction of Default Browse domain list (i.e. when clients pass NULL) is as follows:
+// 1) query for b._dns-sd._udp.local on LocalOnly interface
+//    (.local manually generated via explicit callback)
+// 2) for each search domain (from prefs pane), query for b._dns-sd._udp.<searchdomain>.
+// 3) for each result from (2), register LocalOnly PTR record b._dns-sd._udp.local. -> <result>
+// 4) result above should generate a callback from question in (1).  result added to global list
+// 5) global list delivered to client via GetSearchDomainList()
+// 6) client calls to enumerate domains now go over LocalOnly interface
+//    (!!!KRS may add outgoing interface in addition)
+
+struct CompileTimeAssertionChecks_uDNS
+{
+    // Check our structures are reasonable sizes. Including overly-large buffers, or embedding
+    // other overly-large structures instead of having a pointer to them, can inadvertently
+    // cause structure sizes (and therefore memory usage) to balloon unreasonably.
+    char sizecheck_tcpInfo_t     [(sizeof(tcpInfo_t)      <=  9056) ? 1 : -1];
+    char sizecheck_SearchListElem[(sizeof(SearchListElem) <=  5000) ? 1 : -1];
+};
+
+#else // !UNICAST_DISABLED
+
+mDNSexport const domainname *GetServiceTarget(mDNS *m, AuthRecord *const rr)
+{
+	(void) m;
+	(void) rr;
+
+	return mDNSNULL;
+}
+
+mDNSexport DomainAuthInfo *GetAuthInfoForName_internal(mDNS *m, const domainname *const name)
+{
+	(void) m;
+	(void) name;
+
+	return mDNSNULL;
+}
+
+mDNSexport DomainAuthInfo *GetAuthInfoForQuestion(mDNS *m, const DNSQuestion *const q)
+{
+	(void) m;
+	(void) q;
+
+	return mDNSNULL;
+}
+
+mDNSexport void startLLQHandshake(mDNS *m, DNSQuestion *q)
+{
+	(void) m;
+	(void) q;
+}
+
+mDNSexport void DisposeTCPConn(struct tcpInfo_t *tcp)
+{
+	(void) tcp;
+}
+
+mDNSexport mStatus mDNS_StartNATOperation_internal(mDNS *m, NATTraversalInfo *traversal)
+{
+	(void) m;
+	(void) traversal;
+
+	return mStatus_UnsupportedErr;
+}
+
+mDNSexport mStatus mDNS_StopNATOperation_internal(mDNS *m, NATTraversalInfo *traversal)
+{
+	(void) m;
+	(void) traversal;
+
+	return mStatus_UnsupportedErr;
+}
+
+mDNSexport void sendLLQRefresh(mDNS *m, DNSQuestion *q)
+{
+	(void) m;
+	(void) q;
+}
+
+mDNSexport ZoneData *StartGetZoneData(mDNS *const m, const domainname *const name, const ZoneService target, ZoneDataCallback callback, void *ZoneDataContext)
+{
+	(void) m;
+	(void) name;
+	(void) target;
+	(void) callback;
+	(void) ZoneDataContext;
+
+	return mDNSNULL;
+}
+
+mDNSexport void RecordRegistrationGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneData)
+{
+	(void) m;
+	(void) err;
+	(void) zoneData;
+}
+
+mDNSexport uDNS_LLQType uDNS_recvLLQResponse(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end,
+                                             const mDNSAddr *const srcaddr, const mDNSIPPort srcport, DNSQuestion **matchQuestion)
+{
+	(void) m;
+	(void) msg;
+	(void) end;
+	(void) srcaddr;
+	(void) srcport;
+	(void) matchQuestion;
+
+	return uDNS_LLQ_Not;
+}
+
+mDNSexport void PenalizeDNSServer(mDNS *const m, DNSQuestion *q, mDNSOpaque16 responseFlags)
+{
+	(void) m;
+	(void) q;
+	(void) responseFlags;
+}
+
+mDNSexport void mDNS_AddSearchDomain(const domainname *const domain, mDNSInterfaceID InterfaceID)
+{
+    (void) domain;
+    (void) InterfaceID;
+}
+
+mDNSexport void RetrySearchDomainQuestions(mDNS *const m)
+{
+    (void) m;
+}
+
+mDNSexport mStatus mDNS_SetSecretForDomain(mDNS *m, DomainAuthInfo *info, const domainname *domain, const domainname *keyname, const char *b64keydata, const domainname *hostname, mDNSIPPort *port, mDNSBool autoTunnel)
+{
+    (void) m;
+    (void) info;
+    (void) domain;
+    (void) keyname;
+    (void) b64keydata;
+    (void) hostname;
+    (void) port;
+    (void) autoTunnel;
+    
+    return mStatus_UnsupportedErr;
+}
+
+mDNSexport domainname  *uDNS_GetNextSearchDomain(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSs8 *searchIndex, mDNSBool ignoreDotLocal)
+{
+    (void) m;
+    (void) InterfaceID;
+    (void) searchIndex;
+    (void) ignoreDotLocal;
+    
+    return mDNSNULL;
+}
+
+mDNSexport DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name)
+{
+    (void) m;
+    (void) name;
+    
+    return mDNSNULL;
+}
+
+mDNSexport mStatus mDNS_StartNATOperation(mDNS *const m, NATTraversalInfo *traversal)
+{
+    (void) m;
+    (void) traversal;
+    
+    return mStatus_UnsupportedErr;
+}
+
+mDNSexport mStatus mDNS_StopNATOperation(mDNS *const m, NATTraversalInfo *traversal)
+{
+    (void) m;
+    (void) traversal;
+    
+    return mStatus_UnsupportedErr;
+}
+
+mDNSexport DNSServer *mDNS_AddDNSServer(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, const mDNSs32 serviceID, const mDNSAddr *addr,
+                                        const mDNSIPPort port, mDNSu32 scoped, mDNSu32 timeout, mDNSBool cellIntf, mDNSu16 resGroupID, mDNSBool reqA,
+                                        mDNSBool reqAAAA, mDNSBool reqDO)
+{
+    (void) m;
+    (void) d;
+    (void) interface;
+    (void) serviceID;
+    (void) addr;
+    (void) port;
+    (void) scoped;
+    (void) timeout;
+    (void) cellIntf;
+    (void) resGroupID;
+    (void) reqA;
+    (void) reqAAAA;
+    (void) reqDO;
+    
+    return mDNSNULL;
+}
+
+mDNSexport void uDNS_SetupWABQueries(mDNS *const m)
+{
+    (void) m;
+}
+
+mDNSexport void uDNS_StartWABQueries(mDNS *const m, int queryType)
+{
+    (void) m;
+    (void) queryType;
+}
+
+mDNSexport void uDNS_StopWABQueries(mDNS *const m, int queryType)
+{
+    (void) m;
+    (void) queryType;
+}
+
+mDNSexport void mDNS_AddDynDNSHostName(mDNS *m, const domainname *fqdn, mDNSRecordCallback *StatusCallback, const void *StatusContext)
+{
+    (void) m;
+    (void) fqdn;
+    (void) StatusCallback;
+    (void) StatusContext;
+}
+mDNSexport void mDNS_SetPrimaryInterfaceInfo(mDNS *m, const mDNSAddr *v4addr, const mDNSAddr *v6addr, const mDNSAddr *router)
+{
+    (void) m;
+    (void) v4addr;
+    (void) v6addr;
+    (void) router;
+}
+
+mDNSexport void mDNS_RemoveDynDNSHostName(mDNS *m, const domainname *fqdn)
+{
+    (void) m;
+    (void) fqdn;
+}
+
+mDNSexport void RecreateNATMappings(mDNS *const m, const mDNSu32 waitTicks)
+{
+    (void) m;
+    (void) waitTicks;
+}
+
+mDNSexport mDNSBool IsGetZoneDataQuestion(DNSQuestion *q)
+{
+    (void)q;
+    
+    return mDNSfalse;
+}
+
+#endif // !UNICAST_DISABLED
diff --git a/mDNSResponder/mDNSCore/uDNS.h b/mDNSResponder/mDNSCore/uDNS.h
new file mode 100755
index 00000000..eca8b701
--- /dev/null
+++ b/mDNSResponder/mDNSCore/uDNS.h
@@ -0,0 +1,151 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __UDNS_H_
+#define __UDNS_H_
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define RESTART_GOODBYE_DELAY    (6 * mDNSPlatformOneSecond) // delay after restarting LLQ before nuking previous known answers (avoids flutter if we restart before we have networking up)
+#define INIT_UCAST_POLL_INTERVAL (3 * mDNSPlatformOneSecond) // this interval is used after send failures on network transitions
+                                                             // which typically heal quickly, so we start agressively and exponentially back off
+#define MAX_UCAST_POLL_INTERVAL (60 * 60 * mDNSPlatformOneSecond)
+//#define MAX_UCAST_POLL_INTERVAL (1 * 60 * mDNSPlatformOneSecond)
+#define LLQ_POLL_INTERVAL       (15 * 60 * mDNSPlatformOneSecond) // Polling interval for zones w/ an advertised LLQ port (ie not static zones) if LLQ fails due to NAT, etc.
+#define RESPONSE_WINDOW (60 * mDNSPlatformOneSecond)         // require server responses within one minute of request
+#define MAX_DNSSEC_UNANSWERED_QUERIES 1                      // number of unanswered queries from any one uDNS server before turning off DNSSEC Validation
+#define MAX_UCAST_UNANSWERED_QUERIES 2                       // number of unanswered queries from any one uDNS server before trying another server
+#define DNSSERVER_PENALTY_TIME (60 * mDNSPlatformOneSecond)  // number of seconds for which new questions don't pick this server
+
+// On some interfaces, we want to delay the first retransmission to a minimum of 2 seconds
+// rather than the default (1 second).
+#define MIN_UCAST_RETRANS_TIMEOUT (2 * mDNSPlatformOneSecond)
+
+#define DEFAULT_UPDATE_LEASE 7200
+
+#define QuestionIntervalStep 3
+#define QuestionIntervalStep2 (QuestionIntervalStep*QuestionIntervalStep)
+#define QuestionIntervalStep3 (QuestionIntervalStep*QuestionIntervalStep*QuestionIntervalStep)
+#define InitialQuestionInterval ((mDNSPlatformOneSecond + QuestionIntervalStep-1) / QuestionIntervalStep)
+#define MaxQuestionInterval         (3600 * mDNSPlatformOneSecond)
+
+// just move to MaxQuestionInterval once over this threshold
+#define QuestionIntervalThreshold   (QuestionIntervalStep3 * mDNSPlatformOneSecond)
+
+// For Unicast record registrations, we initialize the interval to 1 second. When we send any query for
+// the record registration e.g., GetZoneData, we always back off by QuestionIntervalStep
+// so that the first retry does not happen until 3 seconds which should be enough for TCP/TLS to be done.
+#define INIT_RECORD_REG_INTERVAL (1 * mDNSPlatformOneSecond)
+#define MAX_RECORD_REG_INTERVAL (15 * 60 * mDNSPlatformOneSecond)
+#define MERGE_DELAY_TIME    (1 * mDNSPlatformOneSecond)
+
+// If we are refreshing, we do it at least 5 times with a min update frequency of
+// 5 minutes
+#define MAX_UPDATE_REFRESH_COUNT    5
+#define MIN_UPDATE_REFRESH_TIME     (5 * 60 * mDNSPlatformOneSecond)
+
+// For questions that use kDNSServiceFlagsTimeout and we don't have a matching resolver e.g., no dns servers,
+// then use the default value of 30 seconds
+#define DEFAULT_UDNS_TIMEOUT    30 // in seconds
+
+// For questions that are validating responses (q->ValidatingResponse == 1), use 10 seconds
+// which accomodates two DNS servers and two queries per DNS server.
+#define DEFAULT_UDNSSEC_TIMEOUT    10 // in seconds
+
+// If we are sending queries with EDNS0/DO option and we have no indications that the server
+// is DNSSEC aware and we have already reached MAX_DNSSEC_RETRANSMISSIONS, we disable
+// validation (for optional case only) for any questions that uses this server
+#define MAX_DNSSEC_RETRANSMISSIONS 3
+
+// Entry points into unicast-specific routines
+
+extern void LLQGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneInfo);
+extern void startLLQHandshake(mDNS *m, DNSQuestion *q);
+extern void sendLLQRefresh(mDNS *m, DNSQuestion *q);
+
+extern void SleepRecordRegistrations(mDNS *m);
+
+// uDNS_UpdateRecord
+// following fields must be set, and the update validated, upon entry.
+// rr->NewRData
+// rr->newrdlength
+// rr->UpdateCallback
+
+extern mStatus uDNS_UpdateRecord(mDNS *m, AuthRecord *rr);
+
+extern void SetNextQueryTime(mDNS *const m, const DNSQuestion *const q);
+extern mStatus mDNS_Register_internal(mDNS *const m, AuthRecord *const rr);
+extern mStatus mDNS_Deregister_internal(mDNS *const m, AuthRecord *const rr, mDNS_Dereg_type drt);
+extern mStatus mDNS_StartQuery_internal(mDNS *const m, DNSQuestion *const question);
+extern mStatus mDNS_StopQuery_internal(mDNS *const m, DNSQuestion *const question);
+extern mStatus mDNS_StartNATOperation_internal(mDNS *const m, NATTraversalInfo *traversal);
+
+extern void RecordRegistrationGotZoneData(mDNS *const m, mStatus err, const ZoneData *zoneData);
+extern mStatus uDNS_DeregisterRecord(mDNS *const m, AuthRecord *const rr);
+extern const domainname *GetServiceTarget(mDNS *m, AuthRecord *const rr);
+extern void uDNS_CheckCurrentQuestion(mDNS *const m);
+
+// integer fields of msg header must be in HOST byte order before calling this routine
+extern void uDNS_ReceiveMsg(mDNS *const m, DNSMessage *const msg, const mDNSu8 *const end,
+                            const mDNSAddr *const srcaddr, const mDNSIPPort srcport);
+
+extern void uDNS_Tasks(mDNS *const m);
+extern void UpdateAllSRVRecords(mDNS *m);
+extern void CheckNATMappings(mDNS *m);
+
+extern mStatus         uDNS_SetupDNSConfig(mDNS *const m);
+
+// uDNS_SetupWABQueries reads search domains from the platform layer and starts the Wide Area Bonjour
+// (WAB) domain enumeration queries if necessary.
+
+#define UDNS_WAB_BROWSE_QUERY    0x00000001 // Browse queries (b, db)
+#define UDNS_WAB_LBROWSE_QUERY   0x00000002 // Browse queries (lb)
+#define UDNS_WAB_REG_QUERY       0x00000004 // Registration queries (r and dr)
+
+extern void uDNS_SetupWABQueries(mDNS *const m);
+extern void uDNS_StartWABQueries(mDNS *const m, int queryType);
+extern void uDNS_StopWABQueries(mDNS *const m, int queryType);
+extern domainname      *uDNS_GetNextSearchDomain(mDNS *const m, mDNSInterfaceID InterfaceID, mDNSs8 *searchIndex, mDNSBool ignoreDotLocal);
+
+typedef enum
+{
+    uDNS_LLQ_Not = 0,   // Normal uDNS answer: Flush any stale records from cache, and respect record TTL
+    uDNS_LLQ_Ignore,    // LLQ initial challenge packet: ignore -- has no useful records for us
+    uDNS_LLQ_Entire,    // LLQ initial set of answers: Flush any stale records from cache, but assume TTL is 2 x LLQ refresh interval
+    uDNS_LLQ_Events     // LLQ event packet: don't flush cache; assume TTL is 2 x LLQ refresh interval
+} uDNS_LLQType;
+
+extern uDNS_LLQType    uDNS_recvLLQResponse(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end, const mDNSAddr *const srcaddr, const mDNSIPPort srcport, DNSQuestion **matchQuestion);
+extern DomainAuthInfo *GetAuthInfoForName_internal(mDNS *m, const domainname *const name);
+extern DomainAuthInfo *GetAuthInfoForQuestion(mDNS *m, const DNSQuestion *const q);
+extern void DisposeTCPConn(struct tcpInfo_t *tcp);
+
+// NAT traversal
+extern void uDNS_ReceiveNATPacket(mDNS *m, const mDNSInterfaceID InterfaceID, mDNSu8 *pkt, mDNSu16 len); // Called for each received PCP or NAT-PMP packet
+extern void natTraversalHandleAddressReply(mDNS *const m, mDNSu16 err, mDNSv4Addr ExtAddr);
+extern void natTraversalHandlePortMapReply(mDNS *const m, NATTraversalInfo *n, const mDNSInterfaceID InterfaceID, mDNSu16 err, mDNSIPPort extport, mDNSu32 lease, NATTProtocol protocol);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif // __UDNS_H_
diff --git a/mDNSResponder/mDNSMacOS9/CarbonResource.r b/mDNSResponder/mDNSMacOS9/CarbonResource.r
new file mode 100644
index 00000000..3bd7fa64
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/CarbonResource.r
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+data 'carb' (0) { };
diff --git a/mDNSResponder/mDNSMacOS9/Mac OS Test Responder.c b/mDNSResponder/mDNSMacOS9/Mac OS Test Responder.c
new file mode 100644
index 00000000..eff6a5f4
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/Mac OS Test Responder.c
@@ -0,0 +1,227 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>						// For printf()
+#include <string.h>			// For strlen() etc.
+
+#include <Events.h>						// For WaitNextEvent()
+#include <SIOUX.h>						// For SIOUXHandleOneEvent()
+
+#include "mDNSEmbeddedAPI.h"			// Defines the interface to the client layer above
+
+#include "mDNSMacOS9.h"					// Defines the specific types needed to run mDNS on this platform
+
+// These don't have to be globals, but their memory does need to remain valid for as
+// long as the search is going on. They are declared as globals here for simplicity.
+static mDNS m;
+static mDNS_PlatformSupport p;
+static ServiceRecordSet p1, p2, afp, http, njp;
+static AuthRecord browsedomain1, browsedomain2;
+
+// This sample code just calls mDNS_RenameAndReregisterService to automatically pick a new
+// unique name for the service. For a device such as a printer, this may be appropriate.
+// For a device with a user interface, and a screen, and a keyboard, the appropriate
+// response may be to prompt the user and ask them to choose a new name for the service.
+mDNSlocal void Callback(mDNS *const m, ServiceRecordSet *const sr, mStatus result)
+	{
+	switch (result)
+		{
+		case mStatus_NoError:      debugf("Callback: %##s Name Registered",   sr->RR_SRV.resrec.name->c); break;
+		case mStatus_NameConflict: debugf("Callback: %##s Name Conflict",     sr->RR_SRV.resrec.name->c); break;
+		case mStatus_MemFree:      debugf("Callback: %##s Memory Free",       sr->RR_SRV.resrec.name->c); break;
+		default:                   debugf("Callback: %##s Unknown Result %d", sr->RR_SRV.resrec.name->c, result); break;
+		}
+
+	if (result == mStatus_NameConflict) mDNS_RenameAndReregisterService(m, sr, mDNSNULL);
+	}
+
+// RegisterService() is a simple wrapper function which takes C string
+// parameters, converts them to domainname parameters, and calls mDNS_RegisterService()
+mDNSlocal void RegisterService(mDNS *m, ServiceRecordSet *recordset,
+	UInt16 PortAsNumber, const char txtinfo[],
+	const domainlabel *const n, const char type[], const char domain[])
+	{
+	domainname t;
+	domainname d;
+	char buffer[MAX_ESCAPED_DOMAIN_NAME];
+	UInt8 txtbuffer[512];
+
+	MakeDomainNameFromDNSNameString(&t, type);
+	MakeDomainNameFromDNSNameString(&d, domain);
+	
+	if (txtinfo)
+		{
+		strncpy((char*)txtbuffer+1, txtinfo, sizeof(txtbuffer)-1);
+		txtbuffer[0] = (UInt8)strlen(txtinfo);
+		}
+	else
+		txtbuffer[0] = 0;
+
+	mDNS_RegisterService(m, recordset,
+		n, &t, &d,									// Name, type, domain
+		mDNSNULL, mDNSOpaque16fromIntVal(PortAsNumber),
+		txtbuffer, (mDNSu16)(1+txtbuffer[0]),		// TXT data, length
+		mDNSNULL, 0,								// Subtypes (none)
+		mDNSInterface_Any,							// Interface ID
+		Callback, mDNSNULL);						// Callback and context
+
+	ConvertDomainNameToCString(recordset->RR_SRV.resrec.name, buffer);
+	printf("Made Service Records for %s\n", buffer);
+	}
+
+// RegisterFakeServiceForTesting() simulates the effect of services being registered on
+// dynamically-allocated port numbers. No real service exists on that port -- this is just for testing.
+mDNSlocal void RegisterFakeServiceForTesting(mDNS *m, ServiceRecordSet *recordset, const char txtinfo[],
+	const char name[], const char type[], const char domain[])
+	{
+	static UInt16 NextPort = 0xF000;
+	domainlabel n;
+	MakeDomainLabelFromLiteralString(&n, name);
+	RegisterService(m, recordset, NextPort++, txtinfo, &n, type, domain);
+	}
+
+// CreateProxyRegistrationForRealService() checks to see if the given port is currently
+// in use, and if so, advertises the specified service as present on that port.
+// This is useful for advertising existing real services (Personal Web Sharing, Personal
+// File Sharing, etc.) that currently don't register with mDNS Service Discovery themselves.
+mDNSlocal OSStatus CreateProxyRegistrationForRealService(mDNS *m, UInt16 PortAsNumber, const char txtinfo[],
+	const char *servicetype, ServiceRecordSet *recordset)
+	{
+	InetAddress ia;
+	TBind bindReq;
+	OSStatus err;
+	TEndpointInfo endpointinfo;
+	EndpointRef ep = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, &endpointinfo, &err);
+	if (!ep || err) { printf("OTOpenEndpoint (CreateProxyRegistrationForRealService) failed %d", err); return(err); }
+
+	ia.fAddressType = AF_INET;
+	ia.fPort        = mDNSOpaque16fromIntVal(PortAsNumber).NotAnInteger;
+	ia.fHost        = 0;
+	bindReq.addr.maxlen = sizeof(ia);
+	bindReq.addr.len    = sizeof(ia);
+	bindReq.addr.buf    = (UInt8*)&ia;
+	bindReq.qlen        = 0;
+	err = OTBind(ep, &bindReq, NULL);
+
+	if (err == kOTBadAddressErr)
+		RegisterService(m, recordset, PortAsNumber, txtinfo, &m->nicelabel, servicetype, "local.");
+	else if (err)
+		debugf("OTBind failed %d", err);
+
+	OTCloseProvider(ep);
+	return(noErr);
+	}
+
+// Done once on startup, and then again every time our address changes
+mDNSlocal OSStatus mDNSResponderTestSetup(mDNS *m)
+	{
+	char buffer[MAX_ESCAPED_DOMAIN_NAME];
+	mDNSv4Addr ip = m->HostInterfaces->ip.ip.v4;
+	
+	ConvertDomainNameToCString(&m->MulticastHostname, buffer);
+	printf("Name %s\n", buffer);
+	printf("IP   %d.%d.%d.%d\n", ip.b[0], ip.b[1], ip.b[2], ip.b[3]);
+
+	printf("\n");
+	printf("Registering Service Records\n");
+	// Create example printer discovery records
+	//static ServiceRecordSet p1, p2;
+
+#define SRSET 0
+#if SRSET==0
+	RegisterFakeServiceForTesting(m, &p1, "path=/index.html", "Web Server One", "_http._tcp.", "local.");
+	RegisterFakeServiceForTesting(m, &p2, "path=/path.html",  "Web Server Two", "_http._tcp.", "local.");
+#elif SRSET==1
+	RegisterFakeServiceForTesting(m, &p1, "rn=lpq1", "Epson Stylus 900N", "_printer._tcp.", "local.");
+	RegisterFakeServiceForTesting(m, &p2, "rn=lpq2", "HP LaserJet",       "_printer._tcp.", "local.");
+#else
+	RegisterFakeServiceForTesting(m, &p1, "rn=lpq3", "My Printer",        "_printer._tcp.", "local.");
+	RegisterFakeServiceForTesting(m, &p2, "lrn=pq4", "My Other Printer",  "_printer._tcp.", "local.");
+#endif
+
+	// If AFP Server is running, register a record for it
+	CreateProxyRegistrationForRealService(m, 548, "", "_afpovertcp._tcp.", &afp);
+
+	// If Web Server is running, register a record for it
+	CreateProxyRegistrationForRealService(m, 80, "", "_http._tcp.", &http);
+
+	// And pretend we always have an NJP server running on port 80 too
+	//RegisterService(m, &njp, 80, "NJP/", &m->nicelabel, "_njp._tcp.", "local.");
+
+	// Advertise that apple.com. is available for browsing
+	mDNS_AdvertiseDomains(m, &browsedomain1, mDNS_DomainTypeBrowse, mDNSInterface_Any, "apple.com.");
+	mDNS_AdvertiseDomains(m, &browsedomain2, mDNS_DomainTypeBrowse, mDNSInterface_Any, "IL 2\\4th Floor.apple.com.");
+
+	return(kOTNoError);
+	}
+
+// YieldSomeTime() just cooperatively yields some time to other processes running on classic Mac OS
+mDNSlocal Boolean YieldSomeTime(UInt32 milliseconds)
+	{
+	extern Boolean SIOUXQuitting;
+	EventRecord e;
+	WaitNextEvent(everyEvent, &e, milliseconds / 17, NULL);
+	SIOUXHandleOneEvent(&e);
+	return(SIOUXQuitting);
+	}
+
+int main()
+	{
+	mStatus err;
+	Boolean DoneSetup = false;
+
+	SIOUXSettings.asktosaveonclose = false;
+	SIOUXSettings.userwindowtitle = "\pMulticast DNS Responder";
+
+	printf("Multicast DNS Responder\n\n");
+	printf("This software reports errors using MacsBug breaks,\n");
+	printf("so if you don't have MacsBug installed your Mac may crash.\n\n");
+	printf("******************************************************************************\n");
+
+	err = InitOpenTransport();
+	if (err) { debugf("InitOpenTransport failed %d", err); return(err); }
+
+	err = mDNS_Init(&m, &p, mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
+		mDNS_Init_AdvertiseLocalAddresses, mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+	if (err) return(err);
+
+	while (!YieldSomeTime(35))
+		{
+#if MDNS_ONLYSYSTEMTASK
+		// For debugging, use "#define MDNS_ONLYSYSTEMTASK 1" and call mDNSPlatformIdle() periodically.
+		// For shipping code, don't define MDNS_ONLYSYSTEMTASK, and you don't need to call mDNSPlatformIdle()
+		extern void mDNSPlatformIdle(mDNS *const m);
+		mDNSPlatformIdle(&m);	// Only needed for debugging version
+#endif
+		if (m.mDNSPlatformStatus == mStatus_NoError && !DoneSetup)
+			{
+			DoneSetup = true;
+			printf("\nListening for mDNS queries...\n");
+			mDNSResponderTestSetup(&m);
+			}
+		}
+	
+	if (p1.RR_SRV.resrec.RecordType  ) mDNS_DeregisterService(&m, &p1);
+	if (p2.RR_SRV.resrec.RecordType  ) mDNS_DeregisterService(&m, &p2);
+	if (afp.RR_SRV.resrec.RecordType ) mDNS_DeregisterService(&m, &afp);
+	if (http.RR_SRV.resrec.RecordType) mDNS_DeregisterService(&m, &http);
+	if (njp.RR_SRV.resrec.RecordType ) mDNS_DeregisterService(&m, &njp);
+
+	mDNS_Close(&m);
+	
+	return(0);
+	}
diff --git a/mDNSResponder/mDNSMacOS9/Mac OS Test Searcher.c b/mDNSResponder/mDNSMacOS9/Mac OS Test Searcher.c
new file mode 100644
index 00000000..1de64631
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/Mac OS Test Searcher.c
@@ -0,0 +1,243 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>						// For printf()
+#include <Events.h>						// For WaitNextEvent()
+#include <SIOUX.h>						// For SIOUXHandleOneEvent()
+
+#include "mDNSEmbeddedAPI.h"			// Defines the interface to the client layer above
+#include "mDNSMacOS9.h"					// Defines the specific types needed to run mDNS on this platform
+
+typedef struct
+	{
+	OTLIFO serviceinfolist;
+	Boolean headerPrinted;
+	Boolean lostRecords;
+	} SearcherServices;
+
+typedef struct { ServiceInfo i; mDNSBool add; mDNSBool dom; OTLink link; } linkedServiceInfo;
+
+// These don't have to be globals, but their memory does need to remain valid for as
+// long as the search is going on. They are declared as globals here for simplicity.
+#define RR_CACHE_SIZE 1000
+static CacheEntity rrcachestorage[RR_CACHE_SIZE];
+static mDNS mDNSStorage;
+static mDNS_PlatformSupport PlatformSupportStorage;
+static SearcherServices services;
+static DNSQuestion browsequestion, domainquestion;
+
+// PrintServiceInfo prints the service information to standard out
+// A real application might want to do something else with the information
+static void PrintServiceInfo(SearcherServices *services)
+	{
+	OTLink *link = OTReverseList(OTLIFOStealList(&services->serviceinfolist));
+	
+	while (link)
+		{
+		linkedServiceInfo *ls = OTGetLinkObject(link, linkedServiceInfo, link);
+		ServiceInfo *s = &ls->i;
+
+		if (!services->headerPrinted)
+			{
+			printf("%-55s Type             Domain         IP Address       Port Info\n", "Name");
+			services->headerPrinted = true;
+			}
+
+		if (ls->dom)
+			{
+			char c_dom[MAX_ESCAPED_DOMAIN_NAME];
+			ConvertDomainNameToCString(&s->name, c_dom);
+			if (ls->add) printf("%-55s available for browsing\n", c_dom);
+			else         printf("%-55s no longer available for browsing\n", c_dom);
+			}
+		else
+			{
+			domainlabel name;
+			domainname type, domain;
+			char c_name[MAX_DOMAIN_LABEL+1], c_type[MAX_ESCAPED_DOMAIN_NAME], c_dom[MAX_ESCAPED_DOMAIN_NAME], c_ip[20];
+			DeconstructServiceName(&s->name, &name, &type, &domain);
+			ConvertDomainLabelToCString_unescaped(&name, c_name);
+			ConvertDomainNameToCString(&type, c_type);
+			ConvertDomainNameToCString(&domain, c_dom);
+			sprintf(c_ip, "%d.%d.%d.%d", s->ip.ip.v4.b[0], s->ip.ip.v4.b[1], s->ip.ip.v4.b[2], s->ip.ip.v4.b[3]);
+
+			printf("%-55s %-16s %-14s ", c_name, c_type, c_dom);
+			if (ls->add) printf("%-15s %5d %#s\n", c_ip, mDNSVal16(s->port), s->TXTinfo);
+			else         printf("Removed\n");
+			}
+
+		link = link->fNext;
+		OTFreeMem(ls);
+		}
+	}
+
+// When the name, address, port, and txtinfo for a service is found, FoundInstanceInfo()
+// enqueues a record for PrintServiceInfo() to print.
+// Note, a browsing application would *not* normally need to get all this information --
+// all it needs is the name, to display to the user.
+// Finding out the address, port, and txtinfo should be deferred to the time that the user
+// actually needs to contact the service to use it.
+static void FoundInstanceInfo(mDNS *const m, ServiceInfoQuery *query)
+	{
+	SearcherServices *services = (SearcherServices *)query->ServiceInfoQueryContext;
+	linkedServiceInfo *info = (linkedServiceInfo *)(query->info);
+	if (query->info->ip.type == mDNSAddrType_IPv4)
+		{
+		mDNS_StopResolveService(m, query);		// For this test code, one answer is sufficient
+		OTLIFOEnqueue(&services->serviceinfolist, &info->link);
+		OTFreeMem(query);
+		}
+	}
+
+// When a new named instance of a service is found, FoundInstance() is called.
+// In this sample code we turn around and immediately issue a query to resolve that service name to
+// find its address, port, and txtinfo, but a normal browing application would just display the name.
+static void FoundInstance(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+	{
+	#pragma unused (question)
+	SearcherServices *services = (SearcherServices *)question->QuestionContext;
+	linkedServiceInfo *info;
+
+	debugf("FoundInstance %##s PTR %##s", answer->name->c, answer->rdata->u.name.c);
+
+	if (answer->rrtype != kDNSType_PTR) return;
+	if (!services) { debugf("FoundInstance: services is NULL"); return; }
+	
+	info = (linkedServiceInfo *)OTAllocMem(sizeof(linkedServiceInfo));
+	if (!info) { services->lostRecords = true; return; }
+	
+	info->i.name          = answer->rdata->u.name;
+	info->i.InterfaceID   = answer->InterfaceID;
+	info->i.ip.type		  = mDNSAddrType_IPv4;
+	info->i.ip.ip.v4      = zerov4Addr;
+	info->i.port          = zeroIPPort;
+	info->add             = AddRecord;
+	info->dom             = mDNSfalse;
+	
+	if (!AddRecord)	// If TTL == 0 we're deleting a service,
+		OTLIFOEnqueue(&services->serviceinfolist, &info->link);
+	else								// else we're adding a new service
+		{
+		ServiceInfoQuery *q = (ServiceInfoQuery *)OTAllocMem(sizeof(ServiceInfoQuery));
+		if (!q) { OTFreeMem(info); services->lostRecords = true; return; }
+		mDNS_StartResolveService(m, q, &info->i, FoundInstanceInfo, services);
+		}
+	}
+
+static void FoundDomain(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+	{
+	#pragma unused (m)
+	#pragma unused (question)
+	SearcherServices *services = (SearcherServices *)question->QuestionContext;
+	linkedServiceInfo *info;
+
+	debugf("FoundDomain %##s PTR %##s", answer->name->c, answer->rdata->u.name.c);
+
+	if (answer->rrtype != kDNSType_PTR) return;
+	if (!services) { debugf("FoundDomain: services is NULL"); return; }
+	
+	info = (linkedServiceInfo *)OTAllocMem(sizeof(linkedServiceInfo));
+	if (!info) { services->lostRecords = true; return; }
+	
+	info->i.name          = answer->rdata->u.name;
+	info->i.InterfaceID   = answer->InterfaceID;
+	info->i.ip.type		  = mDNSAddrType_IPv4;
+	info->i.ip.ip.v4      = zerov4Addr;
+	info->i.port          = zeroIPPort;
+	info->add             = AddRecord;
+	info->dom             = mDNStrue;
+		
+	OTLIFOEnqueue(&services->serviceinfolist, &info->link);
+	}
+
+// YieldSomeTime() just cooperatively yields some time to other processes running on classic Mac OS
+static Boolean YieldSomeTime(UInt32 milliseconds)
+	{
+	extern Boolean SIOUXQuitting;
+	EventRecord e;
+	WaitNextEvent(everyEvent, &e, milliseconds / 17, NULL);
+	SIOUXHandleOneEvent(&e);
+	return(SIOUXQuitting);
+	}
+
+int main()
+	{
+	mStatus err;
+	Boolean DoneSetup = false;
+	void *tempmem;
+
+	SIOUXSettings.asktosaveonclose = false;
+	SIOUXSettings.userwindowtitle  = "\pMulticast DNS Searcher";
+	SIOUXSettings.rows             = 40;
+	SIOUXSettings.columns          = 132;
+
+	printf("Multicast DNS Searcher\n\n");
+	printf("This software reports errors using MacsBug breaks,\n");
+	printf("so if you don't have MacsBug installed your Mac may crash.\n\n");
+	printf("******************************************************************************\n");
+
+	err = InitOpenTransport();
+	if (err) { debugf("InitOpenTransport failed %d", err); return(err); }
+
+	err = mDNS_Init(&mDNSStorage, &PlatformSupportStorage, rrcachestorage, RR_CACHE_SIZE,
+		mDNS_Init_DontAdvertiseLocalAddresses, mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+	if (err) return(err);
+
+	// Make sure OT has a large enough memory pool for us to draw from at OTNotifier (interrupt) time
+	tempmem = OTAllocMem(0x10000);
+	if (tempmem) OTFreeMem(tempmem);
+	else printf("**** Warning: OTAllocMem couldn't pre-allocate 64K for us.\n");
+
+	services.serviceinfolist.fHead = NULL;
+	services.headerPrinted         = false;
+	services.lostRecords           = false;
+
+	while (!YieldSomeTime(35))
+		{
+#if MDNS_ONLYSYSTEMTASK
+		// For debugging, use "#define MDNS_ONLYSYSTEMTASK 1" and call mDNSPlatformIdle() periodically.
+		// For shipping code, don't define MDNS_ONLYSYSTEMTASK, and you don't need to call mDNSPlatformIdle()
+		extern void mDNSPlatformIdle(mDNS *const m);
+		mDNSPlatformIdle(&mDNSStorage);	// Only needed for debugging version
+#endif
+		if (mDNSStorage.mDNSPlatformStatus == mStatus_NoError && !DoneSetup)
+			{
+			domainname srvtype, srvdom;
+			DoneSetup = true;
+			printf("\nSending mDNS service lookup queries and waiting for responses...\n\n");
+			MakeDomainNameFromDNSNameString(&srvtype, "_http._tcp.");
+			MakeDomainNameFromDNSNameString(&srvdom, "local.");
+			err = mDNS_StartBrowse(&mDNSStorage, &browsequestion, &srvtype, &srvdom, mDNSInterface_Any, mDNSfalse, FoundInstance, &services);
+			if (err) break;
+			err = mDNS_GetDomains(&mDNSStorage, &domainquestion, mDNS_DomainTypeBrowse, NULL, mDNSInterface_Any, FoundDomain, &services);
+			if (err) break;
+			}
+
+		if (services.serviceinfolist.fHead)
+			PrintServiceInfo(&services);
+
+		if (services.lostRecords)
+			{
+			services.lostRecords = false;
+			printf("**** Warning: Out of memory: Records have been missed.\n");
+			}
+		}
+
+	mDNS_StopBrowse(&mDNSStorage, &browsequestion);
+	mDNS_Close(&mDNSStorage);
+	return(0);
+	}
diff --git a/mDNSResponder/mDNSMacOS9/README.txt b/mDNSResponder/mDNSMacOS9/README.txt
new file mode 100644
index 00000000..c30c423a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/README.txt
@@ -0,0 +1,48 @@
+This directory contains support files for running mDNS on Mac OS 9
+(and Carbon).
+
+mDNS.mcp is a CodeWarrior 8 project file.
+
+mDNSMacOS9.c and mDNSMacOS9.h are the Platform Support files that go below
+mDNS Core.
+
+"Mac OS Test Responder.c" and "Mac OS Test Searcher.c" build an example
+standalone (embedded) mDNS Responder and Searcher, respectively.
+
+"mDNSLibrary.c" builds a CFM Shared Library that goes in the Extensions Folder
+
+The CFM Shared Library inplements the same "/usr/include/dns_sd.h" API
+that exists on OS X, Windows, Linux, etc., one exception:
+
+ - You don't need to call DNSServiceRefSockFD() to get a file descriptor,
+   and add that file descriptor to your select loop (or equivalent),
+   wait for data,
+   and then call DNSServiceProcessResult() every time data arrives.
+
+   On OS 9, your callback functions are called "by magic" without having
+   to do any of this. Of course no magic comes without a price, and
+   the magic being used here is an OT Notifier function. Your callback
+   functions are called directly from the OT Notifier function that
+   received the UDP packet from the wire, which is fast and efficient,
+   but it does mean that you're being called at OT Notifier time -- so
+   no QuickDraw calls. If you need to allocate memory in your callback
+   function, use OTAllocMem(), not NewPtr() or NewHandle(). Typically
+   what you'll do in your callback function is just update your program's
+   data structures, and leave screen updating and UI to some foreground
+   code.
+
+"Searcher.c" and "Responder.c" build sample applications that link with
+this CFM Shared Library in the Extensions Folder. You'll see that if
+you try to run them without first putting the "Multicast DNS & DNS-SD"
+library in the Extensions Folder and restarting, they will report an
+error message.
+
+"Searcher.c" builds a sample application that browses for HTTP servers.
+
+"Responder.c" builds a sample application that advertises some test
+services. By default it advertises a couple of (nonexistent) HTTP servers
+called "Web Server One" and "Web Server Two". In addition, if it finds that
+TCP port 548 is occupied, then it concludes that personal file sharing is
+running, and advertises the existence of an AFP server. Similarly, if it
+finds that TCP port 80 is occupied, then it concludes that personal Web
+sharing is running, advertises the existence of an HTTP server.
diff --git a/mDNSResponder/mDNSMacOS9/Responder.c b/mDNSResponder/mDNSMacOS9/Responder.c
new file mode 100644
index 00000000..78851a62
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/Responder.c
@@ -0,0 +1,183 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>                      // For printf()
+#include <string.h>                     // For strcpy()
+
+#include <Events.h>                     // For WaitNextEvent()
+
+#include <OpenTransport.h>
+#include <OpenTptInternet.h>
+
+#include <SIOUX.h>                      // For SIOUXHandleOneEvent()
+
+#include "dns_sd.h"
+
+typedef union { UInt8 b[2]; UInt16 NotAnInteger; } mDNSOpaque16;
+static UInt16 mDNSVal16(mDNSOpaque16 x) { return((UInt16)(x.b[0]<<8 | x.b[1])); }
+static mDNSOpaque16 mDNSOpaque16fromIntVal(UInt16 v)
+{ mDNSOpaque16 x; x.b[0] = (UInt8)(v >> 8); x.b[1] = (UInt8)(v & 0xFF); return(x); }
+
+typedef struct RegisteredService_struct RegisteredService;
+struct RegisteredService_struct
+{
+    RegisteredService *next;
+    DNSServiceRef sdRef;
+    Boolean gotresult;
+    DNSServiceErrorType errorCode;
+    char namestr[64];
+    char typestr[kDNSServiceMaxDomainName];
+    char domstr [kDNSServiceMaxDomainName];
+};
+
+static RegisteredService p1, p2, afp, http, njp;
+static RegisteredService *services = NULL, **nextservice = &services;
+
+static void RegCallback(DNSServiceRef sdRef, DNSServiceFlags flags, DNSServiceErrorType errorCode,
+                        const char *name, const char *regtype, const char *domain, void *context)
+{
+    RegisteredService *rs = (RegisteredService *)context;
+    (void)sdRef;    // Unused
+    (void)flags;    // Unused
+    rs->gotresult = true;
+    rs->errorCode = errorCode;
+    strcpy(rs->namestr, name);
+    strcpy(rs->typestr, regtype);
+    strcpy(rs->domstr,  domain);
+}
+
+static DNSServiceErrorType RegisterService(RegisteredService *rs, mDNSOpaque16 OpaquePort,
+                                           const char name[], const char type[], const char domain[], const char txtinfo[])
+{
+    DNSServiceErrorType err;
+    unsigned char txtbuffer[257];
+    strncpy((char*)txtbuffer+1, txtinfo, 255);
+    txtbuffer[256] = 0;
+    txtbuffer[0] = (unsigned char)strlen((char*)txtbuffer);
+    rs->gotresult = 0;
+    rs->errorCode = kDNSServiceErr_NoError;
+    err = DNSServiceRegister(&rs->sdRef, /* kDNSServiceFlagsAutoRename*/ 0, 0,
+                             name, type, domain, NULL, OpaquePort.NotAnInteger, (unsigned short)(1+txtbuffer[0]), txtbuffer, RegCallback, rs);
+    if (err)
+        printf("RegisterService(%s %s %s) failed %d\n", name, type, domain, err);
+    else
+    { *nextservice = rs; nextservice = &rs->next; }
+    return(err);
+}
+
+// RegisterFakeServiceForTesting() simulates the effect of services being registered on
+// dynamically-allocated port numbers. No real service exists on that port -- this is just for testing.
+static DNSServiceErrorType RegisterFakeServiceForTesting(RegisteredService *rs,
+                                                         const char name[], const char type[], const char domain[], const char txtinfo[])
+{
+    static UInt16 NextPort = 0xF000;
+    return RegisterService(rs, mDNSOpaque16fromIntVal(NextPort++), name, type, domain, txtinfo);
+}
+
+// CreateProxyRegistrationForRealService() checks to see if the given port is currently
+// in use, and if so, advertises the specified service as present on that port.
+// This is useful for advertising existing real services (Personal Web Sharing, Personal
+// File Sharing, etc.) that currently don't register with mDNS Service Discovery themselves.
+static DNSServiceErrorType CreateProxyRegistrationForRealService(RegisteredService *rs,
+                                                                 const char *servicetype, UInt16 PortAsNumber, const char txtinfo[])
+{
+    mDNSOpaque16 OpaquePort = mDNSOpaque16fromIntVal(PortAsNumber);
+    InetAddress ia;
+    TBind bindReq;
+    OSStatus err;
+    TEndpointInfo endpointinfo;
+    EndpointRef ep = OTOpenEndpoint(OTCreateConfiguration(kTCPName), 0, &endpointinfo, &err);
+    if (!ep || err) { printf("OTOpenEndpoint (CreateProxyRegistrationForRealService) failed %d", err); return(err); }
+
+    ia.fAddressType = AF_INET;
+    ia.fPort        = OpaquePort.NotAnInteger;
+    ia.fHost        = 0;
+    bindReq.addr.maxlen = sizeof(ia);
+    bindReq.addr.len    = sizeof(ia);
+    bindReq.addr.buf    = (UInt8*)&ia;
+    bindReq.qlen        = 0;
+    err = OTBind(ep, &bindReq, NULL);
+
+    if (err == kOTBadAddressErr)
+        err = RegisterService(rs, OpaquePort, "", servicetype, "local.", txtinfo);
+    else if (err)
+        printf("OTBind failed %d", err);
+
+    OTCloseProvider(ep);
+    return(err);
+}
+
+// YieldSomeTime() just cooperatively yields some time to other processes running on classic Mac OS
+static Boolean YieldSomeTime(UInt32 milliseconds)
+{
+    extern Boolean SIOUXQuitting;
+    EventRecord e;
+    WaitNextEvent(everyEvent, &e, milliseconds / 17, NULL);
+    SIOUXHandleOneEvent(&e);
+    return(SIOUXQuitting);
+}
+
+int main()
+{
+    OSStatus err;
+    RegisteredService *s;
+
+    SIOUXSettings.asktosaveonclose = false;
+    SIOUXSettings.userwindowtitle = "\pMulticast DNS Responder";
+
+    printf("Multicast DNS Responder\n\n");
+    printf("This software reports errors using MacsBug breaks,\n");
+    printf("so if you don't have MacsBug installed your Mac may crash.\n\n");
+    printf("******************************************************************************\n\n");
+
+    err = InitOpenTransport();
+    if (err) { printf("InitOpenTransport failed %d", err); return(err); }
+
+    printf("Advertising Services...\n");
+
+#define SRSET 0
+#if SRSET==0
+    RegisterFakeServiceForTesting(&p1, "Web Server One", "_http._tcp.", "local.", "path=/index.html");
+    RegisterFakeServiceForTesting(&p2, "Web Server Two", "_http._tcp.", "local.", "path=/path.html");
+#elif SRSET==1
+    RegisterFakeServiceForTesting(&p1, "Epson Stylus 900N", "_printer._tcp.", "local.", "rn=lpq1");
+    RegisterFakeServiceForTesting(&p2, "HP LaserJet",       "_printer._tcp.", "local.", "rn=lpq2");
+#else
+    RegisterFakeServiceForTesting(&p1, "My Printer",        "_printer._tcp.", "local.", "rn=lpq3");
+    RegisterFakeServiceForTesting(&p2, "My Other Printer",  "_printer._tcp.", "local.", "lrn=pq4");
+#endif
+
+    // If AFP Server is running, register a record for it
+    CreateProxyRegistrationForRealService(&afp, "_afpovertcp._tcp.", 548, "");
+
+    // If Web Server is running, register a record for it
+    CreateProxyRegistrationForRealService(&http, "_http._tcp.",       80, "path=/index.html");
+
+    while (!YieldSomeTime(35))
+        for (s = services; s; s = s->next)
+            if (s->gotresult)
+            {
+                printf("%s %s %s registered\n", s->namestr, s->typestr, s->domstr);
+                s->gotresult = false;
+            }
+
+    for (s = services; s; s = s->next)
+        if (s->sdRef) DNSServiceRefDeallocate(s->sdRef);
+
+    CloseOpenTransport();
+    return(0);
+}
diff --git a/mDNSResponder/mDNSMacOS9/Searcher.c b/mDNSResponder/mDNSMacOS9/Searcher.c
new file mode 100644
index 00000000..a1096839
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/Searcher.c
@@ -0,0 +1,240 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>                      // For printf()
+#include <string.h>                     // For strcpy()
+
+#include <Events.h>                     // For WaitNextEvent()
+#include <CodeFragments.h>              // For SIOkUnresolvedCFragSymbolAddress
+
+#include <SIOUX.h>                      // For SIOUXHandleOneEvent()
+
+#include <OpenTransport.h>
+#include <OpenTptInternet.h>
+
+#include "dns_sd.h"
+
+#define ns_c_in 1
+#define ns_t_a 1
+
+typedef union { UInt8 b[2]; UInt16 NotAnInteger; } mDNSOpaque16;
+static UInt16 mDNSVal16(mDNSOpaque16 x) { return((UInt16)(x.b[0]<<8 | x.b[1])); }
+static mDNSOpaque16 mDNSOpaque16fromIntVal(UInt16 v)
+{ mDNSOpaque16 x; x.b[0] = (UInt8)(v >> 8); x.b[1] = (UInt8)(v & 0xFF); return(x); }
+
+typedef struct
+{
+    OTLIFO serviceinfolist;
+    Boolean headerPrinted;
+    Boolean lostRecords;
+} SearcherServices;
+
+typedef struct
+{
+    SearcherServices *services;
+    char name[kDNSServiceMaxDomainName];
+    char type[kDNSServiceMaxDomainName];
+    char domn[kDNSServiceMaxDomainName];
+    char host[kDNSServiceMaxDomainName];
+    char text[kDNSServiceMaxDomainName];
+    InetHost address;
+    mDNSOpaque16 notAnIntPort;
+    DNSServiceRef sdRef;
+    Boolean add;
+    Boolean dom;
+    OTLink link;
+} linkedServiceInfo;
+
+static SearcherServices services;
+
+// PrintServiceInfo prints the service information to standard out
+// A real application might want to do something else with the information
+static void PrintServiceInfo(SearcherServices *services)
+{
+    OTLink *link = OTReverseList(OTLIFOStealList(&services->serviceinfolist));
+
+    while (link)
+    {
+        linkedServiceInfo *s = OTGetLinkObject(link, linkedServiceInfo, link);
+
+        if (!services->headerPrinted)
+        {
+            printf("%-55s Type             Domain         Target Host     IP Address      Port Info\n", "Name");
+            services->headerPrinted = true;
+        }
+
+        if (s->dom)
+        {
+            if (s->add) printf("%-55s available for browsing\n", s->domn);
+            else printf("%-55s no longer available for browsing\n", s->domn);
+        }
+        else
+        {
+            char ip[16];
+            unsigned char *p = (unsigned char *)&s->address;
+            sprintf(ip, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
+            printf("%-55s %-16s %-14s ", s->name, s->type, s->domn);
+            if (s->add) printf("%-15s %-15s %5d %s\n", s->host, ip, mDNSVal16(s->notAnIntPort), s->text);
+            else printf("Removed\n");
+        }
+
+        link = link->fNext;
+        OTFreeMem(s);
+    }
+}
+
+static void FoundInstanceAddress(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode,
+                                 const char *fullname, uint16_t rrtype, uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
+{
+    linkedServiceInfo *info = (linkedServiceInfo *)context;
+    SearcherServices *services = info->services;
+    (void)sdRef;            // Unused
+    (void)interfaceIndex;   // Unused
+    (void)fullname;         // Unused
+    (void)ttl;              // Unused
+    if (errorCode == kDNSServiceErr_NoError)
+        if (flags & kDNSServiceFlagsAdd)
+            if (rrclass == ns_c_in && rrtype == ns_t_a && rdlen == sizeof(info->address))
+            {
+                memcpy(&info->address, rdata, sizeof(info->address));
+                DNSServiceRefDeallocate(info->sdRef);
+                OTLIFOEnqueue(&services->serviceinfolist, &info->link);
+            }
+}
+
+static void FoundInstanceInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+                              DNSServiceErrorType errorCode, const char *fullname, const char *hosttarget, uint16_t notAnIntPort,
+                              uint16_t txtLen, const unsigned char *txtRecord, void *context)
+{
+    linkedServiceInfo *info = (linkedServiceInfo *)context;
+    SearcherServices *services = info->services;
+    (void)sdRef;            // Unused
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+    (void)errorCode;        // Unused
+    (void)fullname;         // Unused
+    strcpy(info->host, hosttarget);
+    if (txtLen == 0) info->text[0] = 0;
+    else
+    {
+        strncpy(info->text, (char *)txtRecord+1, txtRecord[0]);
+        info->text[txtRecord[0]] = 0;
+    }
+    info->notAnIntPort.NotAnInteger = notAnIntPort;
+    DNSServiceRefDeallocate(info->sdRef);
+    DNSServiceQueryRecord(&info->sdRef, 0, 0, info->host, ns_t_a, ns_c_in, FoundInstanceAddress, info);
+}
+
+// When a new named instance of a service is found, FoundInstance() is called.
+// In this sample code we turn around and immediately to a DNSServiceResolve() to resolve that service name
+// to find its target host, port, and txtinfo, but a normal browing application would just display the name.
+// Resolving every single thing you find can be quite hard on the network, so you shouldn't do this
+// in a real application. Defer resolving until the client has picked which instance from the
+// long list of services is the one they want to use, and then resolve only that one.
+static void FoundInstance(DNSServiceRef client, DNSServiceFlags flags, uint32_t interface, DNSServiceErrorType errorCode,
+                          const char *replyName, const char *replyType, const char *replyDomain, void *context)
+{
+#pragma unused(client, interface, errorCode)
+    SearcherServices *services = (SearcherServices *)context;
+    linkedServiceInfo *info;
+
+    if (!services) { DebugStr("\pFoundInstance: services is NULL"); return; }
+
+    info = (linkedServiceInfo *)OTAllocMem(sizeof(linkedServiceInfo));
+    if (!info) { services->lostRecords = true; return; }
+
+    info->services = services;
+    strcpy(info->name, replyName);
+    strcpy(info->type, replyType);
+    strcpy(info->domn, replyDomain);
+    info->text[0] = 0;
+    info->add = (flags & kDNSServiceFlagsAdd) ? true : false;
+    info->dom = false;
+
+    if (!info->add) // If TTL == 0 we're deleting a service,
+        OTLIFOEnqueue(&services->serviceinfolist, &info->link);
+    else                                // else we're adding a new service
+        DNSServiceResolve(&info->sdRef, 0, 0, info->name, info->type, info->domn, FoundInstanceInfo, info);
+}
+
+// YieldSomeTime() just cooperatively yields some time to other processes running on classic Mac OS
+static Boolean YieldSomeTime(UInt32 milliseconds)
+{
+    extern Boolean SIOUXQuitting;
+    EventRecord e;
+    WaitNextEvent(everyEvent, &e, milliseconds / 17, NULL);
+    SIOUXHandleOneEvent(&e);
+    return(SIOUXQuitting);
+}
+
+int main()
+{
+    OSStatus err;
+    void *tempmem;
+    DNSServiceRef sdRef;
+    DNSServiceErrorType dse;
+
+    SIOUXSettings.asktosaveonclose = false;
+    SIOUXSettings.userwindowtitle  = "\pMulticast DNS Searcher";
+    SIOUXSettings.rows             = 40;
+    SIOUXSettings.columns          = 160;
+
+    printf("DNS-SD Search Client\n\n");
+    printf("This software reports errors using MacsBug breaks,\n");
+    printf("so if you don't have MacsBug installed your Mac may crash.\n\n");
+    printf("******************************************************************************\n\n");
+
+    if (DNSServiceBrowse == (void*)kUnresolvedCFragSymbolAddress)
+    {
+        printf("Before you can use mDNS/DNS-SD clients, you need to place the \n");
+        printf("\"Multicast DNS & DNS-SD\" Extension in the Extensions Folder and restart\n");
+        return(-1);
+    }
+
+    err = InitOpenTransport();
+    if (err) { printf("InitOpenTransport failed %d", err); return(err); }
+
+    // Make sure OT has a large enough memory pool for us to draw from at OTNotifier (interrupt) time
+    tempmem = OTAllocMem(0x10000);
+    if (tempmem) OTFreeMem(tempmem);
+    else printf("**** Warning: OTAllocMem couldn't pre-allocate 64K for us.\n");
+
+    services.serviceinfolist.fHead = NULL;
+    services.headerPrinted         = false;
+    services.lostRecords           = false;
+
+    printf("Sending mDNS service lookup queries and waiting for responses...\n\n");
+    dse = DNSServiceBrowse(&sdRef, 0, 0, "_http._tcp", "", FoundInstance, &services);
+    if (dse == kDNSServiceErr_NoError)
+    {
+        while (!YieldSomeTime(35))
+        {
+            if (services.serviceinfolist.fHead)
+                PrintServiceInfo(&services);
+
+            if (services.lostRecords)
+            {
+                services.lostRecords = false;
+                printf("**** Warning: Out of memory: Records have been missed.\n");
+            }
+        }
+    }
+
+    DNSServiceRefDeallocate(sdRef);
+    CloseOpenTransport();
+    return(0);
+}
diff --git a/mDNSResponder/mDNSMacOS9/ShowInitIcon.c b/mDNSResponder/mDNSMacOS9/ShowInitIcon.c
new file mode 100755
index 00000000..15d02216
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/ShowInitIcon.c
@@ -0,0 +1,160 @@
+// ShowInitIcon - version 1.0.1, May 30th, 1995
+// This code is intended to let INIT writers easily display an icon at startup time.
+// View in Geneva 9pt, 4-space tabs
+
+// Written by: Peter N Lewis <peter@mail.peter.com.au>, Jim Walker <JWWalker@aol.com>
+// and François Pottier <pottier@dmi.ens.fr>, with thanks to previous ShowINIT authors.
+// Send comments and bug reports to François Pottier.
+
+// This version features:
+// - Short and readable code.
+// - Correctly wraps around when more than one row of icons has been displayed.
+// - works with System 6
+// - Built with Universal Headers & CodeWarrior. Should work with other headers/compilers.
+
+#include <Memory.h>
+#include <Resources.h>
+#include <Icons.h>
+#include <OSUtils.h>
+#include "ShowInitIcon.h"
+
+// You should set SystemSixOrLater in your headers to avoid including glue for SysEnvirons.
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Set this flag to 1 if you want to compile this file into a stand-alone resource (see note below).
+// Set it to 0 if you want to include this source file into your INIT project.
+
+#if 0
+#define ShowInitIcon main
+#endif
+
+// ---------------------------------------------------------------------------------------------------------------------
+// The ShowINIT mechanism works by having each INIT read/write data from these globals.
+// The MPW C compiler doesn't accept variables declared at an absolute address, so I use these macros instead.
+// Only one macro is defined per variable; there is no need to define a Set and a Get accessor like in <LowMem.h>.
+
+#define LMVCheckSum     (*(unsigned short*) 0x928)
+#define LMVCoord        (*(         short*) 0x92A)
+#define LMHCoord        (*(         short*) 0x92C)
+#define LMHCheckSum     (*(unsigned short*) 0x92E)
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Prototypes for the subroutines. The main routine comes first; this is necessary to make THINK C's "Custom Header" option work.
+
+static unsigned short CheckSum (short x);
+static void ComputeIconRect (Rect* iconRect, Rect* screenBounds);
+static void AdvanceIconPosition (Rect* iconRect);
+static void DrawBWIcon (short iconID, Rect *iconRect);
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Main routine.
+
+typedef struct {
+    QDGlobals qd;                                           // Storage for the QuickDraw globals
+    long qdGlobalsPtr;                                          // A5 points to this place; it will contain a pointer to qd
+} QDStorage;
+
+pascal void ShowInitIcon (short iconFamilyID, Boolean advance)
+{
+    long oldA5;                                             // Original value of register A5
+    QDStorage qds;                                              // Fake QD globals
+    CGrafPort colorPort;
+    GrafPort bwPort;
+    Rect destRect;
+    SysEnvRec environment;                                  // Machine configuration.
+
+    oldA5 = SetA5((long) &qds.qdGlobalsPtr);                        // Tell A5 to point to the end of the fake QD Globals
+    InitGraf(&qds.qd.thePort);                              // Initialize the fake QD Globals
+
+    SysEnvirons(curSysEnvVers, &environment);                   // Find out what kind of machine this is
+
+    ComputeIconRect(&destRect, &qds.qd.screenBits.bounds);          // Compute where the icon should be drawn
+
+    if (environment.systemVersion >= 0x0700 && environment.hasColorQD) {
+        OpenCPort(&colorPort);
+        PlotIconID(&destRect, atNone, ttNone, iconFamilyID);
+        CloseCPort(&colorPort);
+    }
+    else {
+        OpenPort(&bwPort);
+        DrawBWIcon(iconFamilyID, &destRect);
+        ClosePort(&bwPort);
+    }
+
+    if (advance)
+        AdvanceIconPosition (&destRect);
+
+    SetA5(oldA5);                                           // Restore A5 to its previous value
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+// A checksum is used to make sure that the data in there was left by another ShowINIT-aware INIT.
+
+static unsigned short CheckSum (short x)
+{
+    return (unsigned short)(((x << 1) | (x >> 15)) ^ 0x1021);
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+// ComputeIconRect computes where the icon should be displayed.
+
+static void ComputeIconRect (Rect* iconRect, Rect* screenBounds)
+{
+    if (CheckSum(LMHCoord) != LMHCheckSum)                  // If we are first, we need to initialize the shared data.
+        LMHCoord = 8;
+    if (CheckSum(LMVCoord) != LMVCheckSum)
+        LMVCoord = (short)(screenBounds->bottom - 40);
+
+    if (LMHCoord + 34 > screenBounds->right) {                  // Check whether we must wrap
+        iconRect->left = 8;
+        iconRect->top = (short)(LMVCoord - 40);
+    }
+    else {
+        iconRect->left = LMHCoord;
+        iconRect->top = LMVCoord;
+    }
+    iconRect->right  = (short)(iconRect->left + 32);
+    iconRect->bottom = (short)(iconRect->top  + 32);
+}
+
+// AdvanceIconPosition updates the shared global variables so that the next extension will draw its icon beside ours.
+
+static void AdvanceIconPosition (Rect* iconRect)
+{
+    LMHCoord = (short)(iconRect->left + 40);                    // Update the shared data
+    LMVCoord = iconRect->top;
+    LMHCheckSum = CheckSum(LMHCoord);
+    LMVCheckSum = CheckSum(LMVCoord);
+}
+
+// DrawBWIcon draws the 'ICN#' member of the icon family. It works under System 6.
+
+static void DrawBWIcon (short iconID, Rect *iconRect)
+{
+    Handle icon;
+    BitMap source, destination;
+    GrafPtr port;
+
+    icon = Get1Resource('ICN#', iconID);
+    if (icon != NULL) {
+        HLock(icon);
+        // Prepare the source and destination bitmaps.
+        source.baseAddr = *icon + 128;                      // Mask address.
+        source.rowBytes = 4;
+        SetRect(&source.bounds, 0, 0, 32, 32);
+        GetPort(&port);
+        destination = port->portBits;
+        // Transfer the mask.
+        CopyBits(&source, &destination, &source.bounds, iconRect, srcBic, nil);
+        // Then the icon.
+        source.baseAddr = *icon;
+        CopyBits(&source, &destination, &source.bounds, iconRect, srcOr, nil);
+    }
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Notes
+
+// Checking for PlotIconID:
+// We (PNL) now check for system 7 and colour QD, and use colour graf ports and PlotIconID only if both are true
+// Otherwise we use B&W grafport and draw using PlotBWIcon.
diff --git a/mDNSResponder/mDNSMacOS9/ShowInitIcon.h b/mDNSResponder/mDNSMacOS9/ShowInitIcon.h
new file mode 100755
index 00000000..cbf680c0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/ShowInitIcon.h
@@ -0,0 +1,20 @@
+#ifndef __ShowInitIcon__
+#define __ShowInitIcon__
+
+#include <Types.h>
+
+// Usage: pass the ID of your icon family (ICN#/icl4/icl8) to have it drawn in the right spot.
+// If 'advance' is true, the next INIT icon will be drawn to the right of your icon. If it is false, the next INIT icon will overwrite
+// yours. You can use it to create animation effects by calling ShowInitIcon several times with 'advance' set to false.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+pascal void ShowInitIcon (short iconFamilyID, Boolean advance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ShowInitIcon__ */
diff --git a/mDNSResponder/mDNSMacOS9/SubTypeTester.c b/mDNSResponder/mDNSMacOS9/SubTypeTester.c
new file mode 100644
index 00000000..4845dfb0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/SubTypeTester.c
@@ -0,0 +1,217 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>                      // For printf()
+#include <string.h>                     // For strlen() etc.
+
+#include <Events.h>                     // For WaitNextEvent()
+#include <SIOUX.h>                      // For SIOUXHandleOneEvent()
+
+#include "mDNSEmbeddedAPI.h"            // Defines the interface to the client layer above
+
+#include "mDNSMacOS9.h"                 // Defines the specific types needed to run mDNS on this platform
+
+// These don't have to be globals, but their memory does need to remain valid for as
+// long as the search is going on. They are declared as globals here for simplicity.
+static mDNS m;
+static mDNS_PlatformSupport p;
+static ServiceRecordSet p1, p2;
+static AuthRecord availRec1, availRec2;
+static Boolean availRec2Active;
+
+// This sample code just calls mDNS_RenameAndReregisterService to automatically pick a new
+// unique name for the service. For a device such as a printer, this may be appropriate.
+// For a device with a user interface, and a screen, and a keyboard, the appropriate
+// response may be to prompt the user and ask them to choose a new name for the service.
+mDNSlocal void Callback(mDNS *const m, ServiceRecordSet *const sr, mStatus result)
+{
+    switch (result)
+    {
+    case mStatus_NoError:      debugf("Callback: %##s Name Registered",   sr->RR_SRV.resrec.name.c); break;
+    case mStatus_NameConflict: debugf("Callback: %##s Name Conflict",     sr->RR_SRV.resrec.name.c); break;
+    case mStatus_MemFree:      debugf("Callback: %##s Memory Free",       sr->RR_SRV.resrec.name.c); break;
+    default:                   debugf("Callback: %##s Unknown Result %d", sr->RR_SRV.resrec.name.c, result); break;
+    }
+
+    if (result == mStatus_NameConflict) mDNS_RenameAndReregisterService(m, sr, mDNSNULL);
+}
+
+// RegisterService() is a simple wrapper function which takes C string
+// parameters, converts them to domainname parameters, and calls mDNS_RegisterService()
+mDNSlocal void RegisterService(mDNS *m, ServiceRecordSet *recordset,
+                               UInt16 PortAsNumber, const char txtinfo[],
+                               const domainlabel *const n, const char type[], const char domain[])
+{
+    domainname t;
+    domainname d;
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+    UInt8 txtbuffer[512];
+
+    MakeDomainNameFromDNSNameString(&t, type);
+    MakeDomainNameFromDNSNameString(&d, domain);
+
+    if (txtinfo)
+    {
+        strncpy((char*)txtbuffer+1, txtinfo, sizeof(txtbuffer)-1);
+        txtbuffer[0] = (UInt8)strlen(txtinfo);
+    }
+    else
+        txtbuffer[0] = 0;
+
+    mDNS_RegisterService(m, recordset,
+                         n, &t, &d,                 // Name, type, domain
+                         mDNSNULL, mDNSOpaque16fromIntVal(PortAsNumber),
+                         txtbuffer, (mDNSu16)(1+txtbuffer[0]), // TXT data, length
+                         mDNSNULL, 0,               // Subtypes (none)
+                         mDNSInterface_Any,         // Interface ID
+                         Callback, mDNSNULL, 0);    // Callback, context, flags
+
+    ConvertDomainNameToCString(recordset->RR_SRV.resrec.name, buffer);
+    printf("Made Service Records for %s\n", buffer);
+}
+
+// RegisterFakeServiceForTesting() simulates the effect of services being registered on
+// dynamically-allocated port numbers. No real service exists on that port -- this is just for testing.
+mDNSlocal void RegisterFakeServiceForTesting(mDNS *m, ServiceRecordSet *recordset, const char txtinfo[],
+                                             const char name[], const char type[], const char domain[])
+{
+    static UInt16 NextPort = 0xF000;
+    domainlabel n;
+    MakeDomainLabelFromLiteralString(&n, name);
+    RegisterService(m, recordset, NextPort++, txtinfo, &n, type, domain);
+}
+
+// Done once on startup, and then again every time our address changes
+mDNSlocal OSStatus mDNSResponderTestSetup(mDNS *m)
+{
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+    mDNSv4Addr ip = m->HostInterfaces->ip.ip.v4;
+
+    ConvertDomainNameToCString(&m->MulticastHostname, buffer);
+    printf("Name %s\n", buffer);
+    printf("IP   %d.%d.%d.%d\n", ip.b[0], ip.b[1], ip.b[2], ip.b[3]);
+
+    printf("\n");
+    printf("Registering Service Records\n");
+    // Create example printer discovery records
+    //static ServiceRecordSet p1, p2;
+
+    RegisterFakeServiceForTesting(m, &p1, "", "One", "_raop._tcp.", "local.");
+    RegisterFakeServiceForTesting(m, &p2, "", "Two", "_raop._tcp.", "local.");
+
+    return(kOTNoError);
+}
+
+mDNSlocal void AvailCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    Boolean *b = (Boolean *)rr->RecordContext;
+    (void)m; // Unused
+    // Signal that our record is now free for re-use
+    if (result == mStatus_MemFree) *b = false;
+}
+
+mDNSlocal OSStatus mDNSResponderSetAvail(mDNS *m, AuthRecord *rr, ServiceRecordSet *sr)
+{
+    // 1. Initialize required fields of AuthRecord
+    // 2. Set name of subtype PTR record to our special subtype name denoting "available" instances
+    // 3. Set target of subtype PTR record to point to our SRV record (exactly the same as the main service PTR record)
+    // 4. And register it
+    mDNS_SetupResourceRecord(rr, mDNSNULL, mDNSInterface_Any, kDNSType_PTR, 2*3600, kDNSRecordTypeShared, AvailCallback, &availRec2Active);
+    MakeDomainNameFromDNSNameString(rr->resrec.name, "a._sub._raop._tcp.local.");
+    AssignDomainName(&rr->resrec.rdata->u.name, sr->RR_SRV.resrec.name);
+    return(mDNS_Register(m, rr));
+}
+
+// YieldSomeTime() just cooperatively yields some time to other processes running on classic Mac OS
+mDNSlocal Boolean YieldSomeTime(UInt32 milliseconds)
+{
+    extern Boolean SIOUXQuitting;
+    EventRecord e;
+    WaitNextEvent(everyEvent, &e, milliseconds / 17, NULL);
+    SIOUXHandleOneEvent(&e);
+    return(SIOUXQuitting);
+}
+
+int main()
+{
+    mStatus err;
+    Boolean DoneSetup = false;
+    mDNSs32 nextAvail, nextBusy;
+
+    SIOUXSettings.asktosaveonclose = false;
+    SIOUXSettings.userwindowtitle = "\pMulticast DNS Responder";
+
+    printf("Multicast DNS Responder\n\n");
+    printf("This software reports errors using MacsBug breaks,\n");
+    printf("so if you don't have MacsBug installed your Mac may crash.\n\n");
+    printf("******************************************************************************\n");
+
+    err = InitOpenTransport();
+    if (err) { debugf("InitOpenTransport failed %d", err); return(err); }
+
+    err = mDNS_Init(&m, &p, mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
+                    mDNS_Init_AdvertiseLocalAddresses, mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (err) return(err);
+
+    while (!YieldSomeTime(35))
+    {
+#if MDNS_ONLYSYSTEMTASK
+        // For debugging, use "#define MDNS_ONLYSYSTEMTASK 1" and call mDNSPlatformIdle() periodically.
+        // For shipping code, don't define MDNS_ONLYSYSTEMTASK, and you don't need to call mDNSPlatformIdle()
+        extern void mDNSPlatformIdle(mDNS *const m);
+        mDNSPlatformIdle(&m);   // Only needed for debugging version
+#endif
+        if (m.mDNSPlatformStatus == mStatus_NoError && !DoneSetup)
+        {
+            DoneSetup = true;
+            printf("\nListening for mDNS queries...\n");
+            mDNSResponderTestSetup(&m);
+            mDNSResponderSetAvail(&m, &availRec1, &p1);
+            availRec2Active = false;
+            nextAvail = mDNS_TimeNow(&m) + mDNSPlatformOneSecond * 10;
+            nextBusy  = mDNS_TimeNow(&m) + mDNSPlatformOneSecond * 15;
+        }
+
+        if (DoneSetup)
+        {
+            // We check availRec2.RecordType because we don't want to re-register this record
+            // if the previous mDNS_Deregister() has not yet completed
+            if (mDNS_TimeNow(&m) - nextAvail > 0 && !availRec2Active)
+            {
+                printf("Setting Two now available\n");
+                availRec2Active = true;
+                mDNSResponderSetAvail(&m, &availRec2, &p2);
+                nextAvail = nextBusy + mDNSPlatformOneSecond * 10;
+            }
+            else if (mDNS_TimeNow(&m) - nextBusy > 0)
+            {
+                printf("Setting Two now busy\n");
+                mDNS_Deregister(&m, &availRec2);
+                nextBusy = nextAvail + mDNSPlatformOneSecond * 5;
+            }
+        }
+    }
+
+    if (p1.RR_SRV.resrec.RecordType) mDNS_DeregisterService(&m, &p1);
+    if (p2.RR_SRV.resrec.RecordType) mDNS_DeregisterService(&m, &p2);
+    if (availRec1.resrec.RecordType) mDNS_Deregister(&m, &availRec1);
+    if (availRec2Active) mDNS_Deregister(&m, &availRec2);
+
+    mDNS_Close(&m);
+
+    return(0);
+}
diff --git a/mDNSResponder/mDNSMacOS9/mDNS.mcp b/mDNSResponder/mDNSMacOS9/mDNS.mcp
new file mode 100644
index 00000000..24cdedd7
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNS.mcp
diff --git a/mDNSResponder/mDNSMacOS9/mDNSLibrary.c b/mDNSResponder/mDNSMacOS9/mDNSLibrary.c
new file mode 100644
index 00000000..6328395c
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSLibrary.c
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Define the required CFM Shared Library entry and exit points
+#include <CodeFragments.h>
+#include "mDNSEmbeddedAPI.h"            // Defines the interface to the client layer above
+#include "mDNSMacOS9.h"                 // Defines the specific types needed to run mDNS on this platform
+
+mDNS mDNSStorage;
+static mDNS_PlatformSupport PlatformSupportStorage;
+// Start off with a default cache of 16K (about 100 records)
+#define RR_CACHE_SIZE ((16*1024) / sizeof(CacheRecord))
+static CacheEntity rrcachestorage[RR_CACHE_SIZE];
+
+mDNSlocal void mDNS_StatusCallback(mDNS *const m, mStatus result)
+{
+    if (result == mStatus_GrowCache)
+    {
+        // Allocate another chunk of cache storage
+        CacheEntity *storage = OTAllocMem(sizeof(CacheEntity) * RR_CACHE_SIZE);
+        if (storage) mDNS_GrowCache(m, storage, RR_CACHE_SIZE);
+    }
+}
+
+extern pascal OSErr mDNS_CFMInit(const CFragInitBlock *theInitBlock);
+pascal OSErr mDNS_CFMInit(const CFragInitBlock *theInitBlock)
+{
+    extern pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    __initialize(theInitBlock); // MUST do this first!
+    {
+        mStatus err;
+        THz oldZone = GetZone();
+        SetZone(SystemZone());
+        LogMsg("mDNS/DNS-SD with Macsbug breaks -- do not ship this version to customers");
+        err = mDNS_Init(&mDNSStorage, &PlatformSupportStorage, rrcachestorage, RR_CACHE_SIZE,
+                        mDNS_Init_AdvertiseLocalAddresses, mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
+        SetZone(oldZone);
+        return((OSErr)err);
+    }
+}
+
+extern void mDNS_CFMTerm(void);
+void mDNS_CFMTerm(void)
+{
+    extern pascal void __terminate(void);
+    LogMsg("mDNS_CFMTerm");
+    mDNS_Close(&mDNSStorage);
+    __terminate();
+}
diff --git a/mDNSResponder/mDNSMacOS9/mDNSLibraryLoader.c b/mDNSResponder/mDNSMacOS9/mDNSLibraryLoader.c
new file mode 100644
index 00000000..584ff9e2
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSLibraryLoader.c
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <Resources.h>
+#include <CodeFragments.h>
+#include "ShowInitIcon.h"
+
+extern pascal OSErr FragRegisterFileLibs(ConstFSSpecPtr fss, Boolean unregister);
+
+extern void main(void)
+{
+    OSStatus err;
+    FCBPBRec fcbPB;
+    FSSpec fss;
+
+    // 1. Show our "icon march" icon
+    ShowInitIcon(128, true);
+
+    // 2. Find our FSSpec
+    fss.name[0] = 0;
+    fcbPB.ioNamePtr = fss.name;
+    fcbPB.ioVRefNum = 0;
+    fcbPB.ioRefNum = (short)CurResFile();
+    fcbPB.ioFCBIndx = 0;
+    err = PBGetFCBInfoSync(&fcbPB);
+
+    // 3. Tell CFM that we're a CFM library container file
+    fss.vRefNum = fcbPB.ioFCBVRefNum;
+    fss.parID = fcbPB.ioFCBParID;
+    if (err == noErr) err = FragRegisterFileLibs(&fss, false);
+
+    // 4. Now that CFM knows we're a library container, tell it to go and get our library
+    if (err == noErr)
+    {
+        CFragConnectionID c;
+        Ptr m;
+        Str255 e;
+        THz oldZone = GetZone();
+        SetZone(SystemZone());
+        err = GetSharedLibrary("\pDarwin;mDNS", kPowerPCCFragArch, kLoadCFrag, &c, &m, e);
+        SetZone(oldZone);
+    }
+}
+
+// There's no CFM stub library for the FragRegisterFileLibs() call, so we'll make our own
+#if __ide_target("FragRegisterFileLibsStub")
+#pragma export on
+pascal OSErr FragRegisterFileLibs(ConstFSSpecPtr fss, Boolean unregister)
+{
+    (void)fss;          // Unused
+    (void)unregister;   // Unused
+    return(0);
+}
+#endif
diff --git a/mDNSResponder/mDNSMacOS9/mDNSLibraryResources.r b/mDNSResponder/mDNSMacOS9/mDNSLibraryResources.r
new file mode 100644
index 00000000..e3a200a0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSLibraryResources.r
@@ -0,0 +1,197 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __TYPES.R__
+#include "Types.r"
+#endif
+
+/* Format is :
+ * Two-char BCD major version (0-99)
+ * One-char BCD minor version, One-char BCD bugfix version (0-9, 0-9)
+ * development/alpha/beta/final
+ * One-byte non-final build number (0-255)
+ * Version numbers can therefore range from 0.0.0 to 99.9.9,
+ * with a following build stage and build number (e.g. 2.0.1 beta 219)
+ */
+
+resource 'vers' (1, purgeable)
+	{
+	0x01, 0x00, alpha, 130, verUS,
+	"1.0a130",
+	"Multicast DNS & DNS Service Discovery 1.0a130"
+	};
+
+resource 'vers' (2, purgeable)
+	{
+   0x01, 0x00, alpha, 130, verUS,
+   "1.0a130",
+   "developer.apple.com/darwin/projects/bonjour/"
+	};
+
+/* We need to load OT, so make sure the system heap has enough space for it */
+type 'sysz' { longint; };
+resource 'sysz' (0, purgeable) { 2500000 };
+
+resource 'BNDL' (128, purgeable, protected) {
+	'mDNS',
+	0,
+	{	/* array TypeArray: 2 elements */
+		/* [1] */
+		'FREF',
+		{	/* array IDArray: 1 elements */
+			/* [1] */
+			0, 128
+		},
+		/* [2] */
+		'ICN#',
+		{	/* array IDArray: 1 elements */
+			/* [1] */
+			0, 128
+		}
+	}
+};
+
+resource 'FREF' (128, purgeable, protected) {
+	'INIT',
+	0,
+	""
+};
+
+resource 'icl8' (128, purgeable, protected) {
+	$"FDFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FD00 0000"
+	$"FF00 0000 0000 0000 0000 0000 0000 0000"
+	$"0000 0000 0000 0000 0000 00F6 FF00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FF00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FD00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F62B 07F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 3A16 402B F7F6 F6F6"
+	$"F6F6 F656 F9F9 F956 2BF6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 2B08 4116 4008 F8FA 2BF6"
+	$"F6F7 FAFA FA81 FAFA FAF7 F6F9 FE00 0000"
+	$"FF00 F9F6 F62B F92B 163A 172B F881 FAF6"
+	$"2BF8 F6F6 2BF7 8181 FA81 F6F9 FE00 FD00"
+	$"FF00 FFF9 F6F9 F9F8 2B2C 2BF6 F6F6 F8FA"
+	$"2BF6 F6F6 F6F6 F781 F956 F8F9 FEFD FFFD"
+	$"FFFF 00FE F5FA FA81 F7F6 F6F6 F6F6 F656"
+	$"56F6 F6F6 F6F6 F62B 2B2B F6F9 FEFF 00FF"
+	$"0000 00FF F5FA FAFA F6F6 F6F6 F6F6 2BF6"
+	$"F7F8 F6F6 F6F6 F607 3A16 39F9 FF00 F9FF"
+	$"0000 00FF 00FA 81FA F6F6 F6F6 F62B 2BF6"
+	$"F6F8 F6F6 F6F6 F633 1C3B 1CF6 F6F6 F9FF"
+	$"0000 00FE 0056 81FA F6F6 F6F6 F6F8 F6F6"
+	$"F6F6 F8F6 F6F6 F62C 163A 3AF6 F6F6 F9FF"
+	$"0000 00FE 00F6 8181 2BF6 F6F6 F72B F6F6"
+	$"F6F6 F62B F6F6 2B2B 2C32 F6F6 F6F6 F9FF"
+	$"0000 00FE 00F6 2BFA 81F6 F6F6 F9F6 F6F6"
+	$"F6F6 F62B F6F7 FA81 F8F6 F6F6 F6F6 F9FF"
+	$"0000 00FE 00F6 F6F6 F7F9 F72B F9F6 F6F6"
+	$"F62B F756 F9FA F9F7 F6F6 F6F6 F6F6 F9FF"
+	$"0000 00FE 00F6 F6F6 F6F6 F6F9 F82B 2BF7"
+	$"F7F7 F72B F8F6 F6F6 F6F6 F6F6 F6F6 F9FF"
+	$"0000 00FE 00F6 F6F6 F6F6 F681 2BF6 F6F6"
+	$"F6F6 F6F6 F7F6 F6F6 F6F6 F6F6 F6F6 F9FF"
+	$"0000 00FE 00F6 F6F6 F6F6 2B81 F7F6 F6F6"
+	$"F6F6 F6F6 562B F6F6 F6F6 F6F6 F9F6 F9FF"
+	$"0000 00FE 00F6 F6F6 F6F6 F7FB F7F6 F6F6"
+	$"F6F6 F6F6 FAF7 F6F6 F6F6 F6F9 FEF9 F9FF"
+	$"FFFF 00FE 00F6 F6F6 F6F6 F7F7 2BF6 F6F6"
+	$"F6F6 F6F8 81F7 F6F6 F6F6 F6F9 FEFF F9FF"
+	$"FF00 FF00 00F6 F6F6 F6F6 F60E 3A16 32F6"
+	$"F6F6 56FA 812B F6F6 F6F6 F6F9 FEFD FFFD"
+	$"FF00 0000 F6F6 F6F6 F6F6 F640 1640 16F6"
+	$"F9F9 FA81 F9F6 F6F6 F6F6 F6F9 FE00 FD00"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F633 173A 332B"
+	$"FAFA 8181 2BF6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 3232 F6F9"
+	$"8181 FA2B F6F6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 2BF8"
+	$"F82B F6F6 F6F6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FE00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FD00 0000"
+	$"FF00 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6"
+	$"F6F6 F6F6 F6F6 F6F6 F6F6 F6F9 FF00 0000"
+	$"FFF6 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FF00 0000"
+	$"FDFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FD"
+};
+
+data 'mDNS' (0, "Owner resource") {
+	$"0644 6172 7769 6E"                                  /* .Darwin */
+};
+
+resource 'ICN#' (128) {
+	{	/* array: 2 elements */
+		/* [1] */
+		$"FFFF FFF8 8000 0008 8000 0008 8000 0008"
+		$"8000 0008 80E0 0408 81FC 3F88 83FE 7FC8"
+		$"87FF EFEA A7E3 83EF D781 81ED 1F02 C1E9"
+		$"1706 61F1 1704 21E1 178C 33C1 13C8 1781"
+		$"10F8 FF01 101F F801 1018 0801 1038 0C01"
+		$"1038 0C09 D03C 1C0D A01E 7C0F 801F F80A"
+		$"801F F808 800F F008 8003 C008 8000 0008"
+		$"8000 0008 8000 0008 8000 0008 FFFF FFF8",
+		/* [2] */
+		$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
+		$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
+		$"FFFF FFFA FFFF FFFF DFFF FFFF 1FFF FFFF"
+		$"1FFF FFFF 1FFF FFFF 1FFF FFFF 1FFF FFFF"
+		$"1FFF FFFF 1FFF FFFF 1FFF FFFF 1FFF FFFF"
+		$"1FFF FFFF DFFF FFFF FFFF FFFF FFFF FFFA"
+		$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
+		$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
+	}
+};
+
+resource 'ics#' (128, purgeable) {
+	{	/* array: 2 elements */
+		/* [1] */
+		$"FFFE 8002 8002 8C02 DE73 D19B 5299 5451"
+		$"4C61 47C1 C443 C483 8702 8302 8002 FFFE",
+		/* [2] */
+		$"FFFE FFFE FFFE FFFE FFFF FFFF 7FFF 7FFF"
+		$"7FFF 7FFF FFFF FFFF FFFE FFFE FFFE FFFE"
+	}
+};
+
+resource 'ics8' (128) {
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+	$"FFF6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 FD00"
+	$"FFF6 F6F6 32F6 F6F6 F6F6 F7F7 F6F6 FF00"
+	$"FFF6 F632 2233 81F6 2B56 81AC FBF6 FF00"
+	$"FFFE FAF9 2CF6 2BFA 2BF6 F6F8 FAF8 FEFF"
+	$"FFFD FCFA F6F6 F62B F8F6 F6F6 3333 FEFF"
+	$"00FE 81F9 F6F6 2BF6 F62B F6F6 4040 F6FF"
+	$"00FF 2BFB 2BF6 F7F6 F62B F6F9 32F6 F6FF"
+	$"00FE F6F6 F7F8 F7F6 2BF8 56F8 F6F6 F6FF"
+	$"00FE F6F6 F6FA F6F6 F6F6 F7F6 F6F6 F6FF"
+	$"FFFE F6F6 F6FA 2BF6 F6F6 FAF6 F6F6 FEFF"
+	$"FFFE F6F6 F632 3AF6 2BF9 81F6 F6F6 FEFF"
+	$"FFF6 F6F6 F632 4632 FCAC F7F6 F6F6 FE00"
+	$"FFF6 F6F6 F6F6 F6F8 562B F6F6 F6F6 FE00"
+	$"FFF6 F6F6 F6F6 F6F6 F6F6 F6F6 F6F6 FE00"
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF"
+};
+
diff --git a/mDNSResponder/mDNSMacOS9/mDNSMacOS9.c b/mDNSResponder/mDNSMacOS9/mDNSMacOS9.c
new file mode 100644
index 00000000..24b03f22
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSMacOS9.c
@@ -0,0 +1,687 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdarg.h>                     // For va_list support
+
+#include <LowMem.h>                     // For LMGetCurApName()
+#include <TextUtils.h>                  // For smSystemScript
+#include <UnicodeConverter.h>           // For ConvertFromPStringToUnicode()
+
+#include "mDNSEmbeddedAPI.h"                // Defines the interface provided to the client layer above
+
+#include "mDNSMacOS9.h"                 // Defines the specific types needed to run mDNS on this platform
+
+// ***************************************************************************
+// Constants
+
+static const TSetBooleanOption kReusePortOption =
+{ kOTBooleanOptionSize,          INET_IP, IP_REUSEPORT,      0, true };
+
+// IP_RCVDSTADDR with TSetByteOption/kOTOneByteOptionSize works on OS 9, OS X Classic, and OS 9 Carbon,
+// but gives error #-3151 (kOTBadOptionErr) on OS X Carbon.
+// If we instead use TSetBooleanOption/kOTBooleanOptionSize then OTOptionManagement on OS X Carbon
+// no longer returns -3151 but it still doesn't actually work -- no destination addresses
+// are delivered by OTRcvUData. I think it's just a bug in OS X Carbon.
+static const TSetByteOption kRcvDestAddrOption =
+{ kOTOneByteOptionSize,          INET_IP, IP_RCVDSTADDR,     0, true };
+//static const TSetBooleanOption kRcvDestAddrOption =
+//	{ kOTBooleanOptionSize,          INET_IP, IP_RCVDSTADDR,     0, true };
+
+static const TSetByteOption kSetUnicastTTLOption =
+{ kOTOneByteOptionSize,          INET_IP, IP_TTL,            0, 255 };
+
+static const TSetByteOption kSetMulticastTTLOption =
+{ kOTOneByteOptionSize,          INET_IP, IP_MULTICAST_TTL,  0, 255 };
+
+static const TIPAddMulticastOption kAddLinkMulticastOption  =
+{ sizeof(TIPAddMulticastOption), INET_IP, IP_ADD_MEMBERSHIP, 0, { 224,  0,  0,251 }, { 0,0,0,0 } };
+
+//static const TIPAddMulticastOption kAddAdminMulticastOption =
+//	{ sizeof(TIPAddMulticastOption), INET_IP, IP_ADD_MEMBERSHIP, 0, { 239,255,255,251 }, { 0,0,0,0 } };
+
+// Bind endpoint to port number. Don't specify any specific IP address --
+// we want to receive unicasts on all interfaces, as well as multicasts.
+typedef struct { OTAddressType fAddressType; mDNSIPPort fPort; mDNSv4Addr fHost; UInt8 fUnused[8]; } mDNSInetAddress;
+//static const mDNSInetAddress mDNSPortInetAddress = { AF_INET, { 0,0 }, { 0,0,0,0 } };	// For testing legacy client support
+#define MulticastDNSPortAsNumber 5353
+static const mDNSInetAddress mDNSPortInetAddress = { AF_INET, { MulticastDNSPortAsNumber >> 8, MulticastDNSPortAsNumber & 0xFF }, { 0,0,0,0 } };
+static const TBind mDNSbindReq = { sizeof(mDNSPortInetAddress), sizeof(mDNSPortInetAddress), (UInt8*)&mDNSPortInetAddress, 0 };
+
+static const TNetbuf zeroTNetbuf = { 0 };
+
+// ***************************************************************************
+// Functions
+
+mDNSlocal void SafeDebugStr(unsigned char *buffer)
+{
+    int i;
+    // Don't want semicolons in MacsBug messages -- they signify commands to execute
+    for (i=1; i<= buffer[0]; i++) if (buffer[i] == ';') buffer[i] = '.';
+    DebugStr(buffer);
+}
+
+#if MDNS_DEBUGMSGS
+mDNSexport void debugf_(const char *format, ...)
+{
+    unsigned char buffer[256];
+    va_list ptr;
+    va_start(ptr,format);
+    buffer[0] = (unsigned char)mDNS_vsnprintf((char*)buffer+1, 255, format, ptr);
+    va_end(ptr);
+#if MDNS_ONLYSYSTEMTASK
+    buffer[1+buffer[0]] = 0;
+    fprintf(stderr, "%s\n", buffer+1);
+    fflush(stderr);
+#else
+    SafeDebugStr(buffer);
+#endif
+}
+#endif
+
+#if MDNS_BUILDINGSHAREDLIBRARY >= 2
+// When building the non-debug version of the Extension, intended to go on end-user systems, we don't want
+// MacsBug breaks for *anything*, not even for the serious LogMsg messages that on OS X would be written to syslog
+mDNSexport void LogMsg(const char *format, ...) { (void)format; }
+#else
+mDNSexport void LogMsg(const char *format, ...)
+{
+    unsigned char buffer[256];
+    va_list ptr;
+    va_start(ptr,format);
+    buffer[0] = (unsigned char)mDNS_vsnprintf((char*)buffer+1, 255, format, ptr);
+    va_end(ptr);
+#if MDNS_ONLYSYSTEMTASK
+    buffer[1+buffer[0]] = 0;
+    fprintf(stderr, "%s\n", buffer+1);
+    fflush(stderr);
+#else
+    SafeDebugStr(buffer);
+#endif
+}
+#endif
+
+mDNSexport mStatus mDNSPlatformSendUDP(const mDNS *const m, const void *const msg, const mDNSu8 *const end,
+                                       mDNSInterfaceID InterfaceID, const mDNSAddr *dst, mDNSIPPort dstPort)
+{
+    // Note: If we did multi-homing, we'd have to use the InterfaceID parameter to specify from which interface to send this response
+    #pragma unused(InterfaceID)
+
+    InetAddress InetDest;
+    TUnitData senddata;
+
+    if (dst->type != mDNSAddrType_IPv4) return(mStatus_NoError);
+
+    InetDest.fAddressType = AF_INET;
+    InetDest.fPort        = dstPort.NotAnInteger;
+    InetDest.fHost        = dst->ip.v4.NotAnInteger;
+
+    senddata.addr.maxlen = sizeof(InetDest);
+    senddata.addr.len    = sizeof(InetDest);
+    senddata.addr.buf    = (UInt8*)&InetDest;
+    senddata.opt          = zeroTNetbuf;
+    senddata.udata.maxlen = (UInt32)((UInt8*)end - (UInt8*)msg);
+    senddata.udata.len    = (UInt32)((UInt8*)end - (UInt8*)msg);
+    senddata.udata.buf    = (UInt8*)msg;
+
+    return(OTSndUData(m->p->ep, &senddata));
+}
+
+mDNSlocal OSStatus readpacket(mDNS *m)
+{
+    mDNSAddr senderaddr, destaddr;
+    mDNSInterfaceID interface;
+    mDNSIPPort senderport;
+    InetAddress sender;
+    char options[256];
+    DNSMessage packet;
+    TUnitData recvdata;
+    OTFlags flags = 0;
+    OSStatus err;
+
+    recvdata.addr.maxlen = sizeof(sender);
+    recvdata.addr.len    = 0;
+    recvdata.addr.buf    = (UInt8*)&sender;
+    recvdata.opt.maxlen = sizeof(options);
+    recvdata.opt.len    = 0;
+    recvdata.opt.buf    = (UInt8*)&options;
+    recvdata.udata.maxlen = sizeof(packet);
+    recvdata.udata.len    = 0;
+    recvdata.udata.buf    = (UInt8*)&packet;
+
+    err = OTRcvUData(m->p->ep, &recvdata, &flags);
+    if (err && err != kOTNoDataErr) debugf("OTRcvUData error %d", err);
+
+    if (err) return(err);
+
+    senderaddr.type = mDNSAddrType_IPv4;
+    senderaddr.ip.v4.NotAnInteger = sender.fHost;
+    senderport.NotAnInteger = sender.fPort;
+
+    destaddr.type = mDNSAddrType_IPv4;
+    destaddr.ip.v4  = zerov4Addr;
+
+    #if OTCARBONAPPLICATION
+    // IP_RCVDSTADDR is known to fail on OS X Carbon, so we'll just assume the packet was probably multicast
+    destaddr.ip.v4  = AllDNSLinkGroup_v4.ip.v4;
+    #endif
+
+    if (recvdata.opt.len)
+    {
+        TOption *c = nil;
+        while (1)
+        {
+            err = OTNextOption(recvdata.opt.buf, recvdata.opt.len, &c);
+            if (err || !c) break;
+            if (c->level == INET_IP && c->name == IP_RCVDSTADDR && c->len - kOTOptionHeaderSize == sizeof(destaddr.ip.v4))
+                mDNSPlatformMemCopy(&destaddr.ip.v4, c->value, sizeof(destaddr.ip.v4));
+        }
+    }
+
+    interface = m->HostInterfaces->InterfaceID;
+
+    if      (flags & T_MORE) debugf("ERROR: OTRcvUData() buffer too small (T_MORE set)");
+    else if (recvdata.addr.len < sizeof(InetAddress)) debugf("ERROR: recvdata.addr.len (%d) too short", recvdata.addr.len);
+    else mDNSCoreReceive(m, &packet, recvdata.udata.buf + recvdata.udata.len, &senderaddr, senderport, &destaddr, MulticastDNSPort, interface);
+
+    return(err);
+}
+
+mDNSexport TCPSocket *mDNSPlatformTCPSocket(mDNS * const m, TCPSocketFlags flags, mDNSIPPort * port)
+{
+    (void)m;            // Unused
+    (void)flags;        // Unused
+    (void)port;         // Unused
+    return NULL;
+}
+
+mDNSexport TCPSocket *mDNSPlatformTCPAccept(TCPSocketFlags flags, int sd)
+{
+    (void)flags;        // Unused
+    (void)sd;           // Unused
+    return NULL;
+}
+
+mDNSexport int mDNSPlatformTCPGetFD(TCPSocket *sock)
+{
+    (void)sock;         // Unused
+    return -1;
+}
+
+mDNSexport mStatus mDNSPlatformTCPConnect(TCPSocket *sock, const mDNSAddr * dst, mDNSOpaque16 dstport, mDNSInterfaceID InterfaceID,
+                                          TCPConnectionCallback callback, void * context)
+{
+    (void)sock;         // Unused
+    (void)dst;          // Unused
+    (void)dstport;      // Unused
+    (void)InterfaceID;  // Unused
+    (void)callback;     // Unused
+    (void)context;      // Unused
+    return(mStatus_UnsupportedErr);
+}
+
+mDNSexport void mDNSPlatformTCPCloseConnection(TCPSocket *sd)
+{
+    (void)sd;           // Unused
+}
+
+mDNSexport long mDNSPlatformReadTCP(TCPSocket *sock, void *buf, unsigned long buflen, mDNSBool *closed)
+{
+    (void)sock;         // Unused
+    (void)buf;          // Unused
+    (void)buflen;       // Unused
+    (void)closed;       // Unused
+    return(0);
+}
+
+mDNSexport long mDNSPlatformWriteTCP(TCPSocket *sock, const char *msg, unsigned long len)
+{
+    (void)sock;         // Unused
+    (void)msg;          // Unused
+    (void)len;          // Unused
+    return(0);
+}
+
+mDNSexport UDPSocket *mDNSPlatformUDPSocket(mDNS * const m, mDNSIPPort port)
+{
+    (void)m;            // Unused
+    (void)port;         // Unused
+    return NULL;
+}
+
+mDNSexport void           mDNSPlatformUDPClose(UDPSocket *sock)
+{
+    (void)sock;         // Unused
+}
+
+mDNSlocal void mDNSOptionManagement(mDNS *const m)
+{
+    OSStatus err;
+
+    // Make sure the length in the TNetbuf agrees with the length in the TOptionHeader
+    m->p->optReq.opt.len    = m->p->optBlock.h.len;
+    m->p->optReq.opt.maxlen = m->p->optBlock.h.len;
+    if (m->p->optReq.opt.maxlen < 4)
+        m->p->optReq.opt.maxlen = 4;
+
+    err = OTOptionManagement(m->p->ep, &m->p->optReq, NULL);
+    if (err) LogMsg("OTOptionManagement failed %d", err);
+}
+
+mDNSlocal void mDNSinitComplete(mDNS *const m, mStatus result)
+{
+    m->mDNSPlatformStatus = result;
+    mDNSCoreInitComplete(m, mStatus_NoError);
+}
+
+mDNSlocal pascal void mDNSNotifier(void *contextPtr, OTEventCode code, OTResult result, void *cookie)
+{
+    mDNS *const m = (mDNS *const)contextPtr;
+    if (!m) debugf("mDNSNotifier FATAL ERROR! No context");
+    switch (code)
+    {
+    case T_OPENCOMPLETE:
+    {
+        OSStatus err;
+        InetInterfaceInfo interfaceinfo;
+        if (result) { LogMsg("T_OPENCOMPLETE failed %d", result); mDNSinitComplete(m, result); return; }
+        //debugf("T_OPENCOMPLETE");
+        m->p->ep = (EndpointRef)cookie;
+        //debugf("OTInetGetInterfaceInfo");
+        // (In future may want to loop over all interfaces instead of just using kDefaultInetInterface)
+        err = OTInetGetInterfaceInfo(&interfaceinfo, kDefaultInetInterface);
+        if (err) { LogMsg("OTInetGetInterfaceInfo failed %d", err); mDNSinitComplete(m, err); return; }
+
+        // Make our basic standard host resource records (address, PTR, etc.)
+        m->p->interface.InterfaceID             = (mDNSInterfaceID)&m->p->interface;
+        m->p->interface.ip.type               = mDNSAddrType_IPv4;
+        m->p->interface.ip.ip.v4.NotAnInteger = interfaceinfo.fAddress;
+        m->p->interface.mask.type               = mDNSAddrType_IPv4;
+        m->p->interface.mask.ip.v4.NotAnInteger = interfaceinfo.fNetmask;
+        m->p->interface.ifname[0]               = 0;
+        m->p->interface.Advertise               = m->AdvertiseLocalAddresses;
+        m->p->interface.McastTxRx               = mDNStrue;
+    }
+
+    case T_OPTMGMTCOMPLETE:
+    case T_BINDCOMPLETE:
+        // IP_RCVDSTADDR is known to fail on OS X Carbon, so we don't want to abort for that error
+        // (see comment above at the definition of kRcvDestAddrOption)
+            #if OTCARBONAPPLICATION
+        if (result && m->p->mOTstate == mOT_RcvDestAddr)
+            LogMsg("Carbon IP_RCVDSTADDR option failed %d; continuing anyway", result);
+        else
+            #endif
+        if (result) { LogMsg("T_OPTMGMTCOMPLETE/T_BINDCOMPLETE %d failed %d", m->p->mOTstate, result); mDNSinitComplete(m, result); return; }
+        //LogMsg("T_OPTMGMTCOMPLETE/T_BINDCOMPLETE %d", m->p->mOTstate);
+        switch (++m->p->mOTstate)
+        {
+        case mOT_ReusePort:     m->p->optBlock.b = kReusePortOption;         mDNSOptionManagement(m); break;
+        case mOT_RcvDestAddr:   m->p->optBlock.i = kRcvDestAddrOption;       mDNSOptionManagement(m); break;
+        case mOT_SetUTTL:       m->p->optBlock.i = kSetUnicastTTLOption;     mDNSOptionManagement(m); break;
+        case mOT_SetMTTL:       m->p->optBlock.i = kSetMulticastTTLOption;   mDNSOptionManagement(m); break;
+        case mOT_LLScope:       m->p->optBlock.m = kAddLinkMulticastOption;  mDNSOptionManagement(m); break;
+//				case mOT_AdminScope:	m->p->optBlock.m = kAddAdminMulticastOption; mDNSOptionManagement(m); break;
+        case mOT_Bind:          OTBind(m->p->ep, (TBind*)&mDNSbindReq, NULL); break;
+        case mOT_Ready:         mDNSinitComplete(m, mStatus_NoError);
+            // Can't do mDNS_RegisterInterface until *after* mDNSinitComplete has set m->mDNSPlatformStatus to mStatus_NoError
+            mDNS_RegisterInterface(m, &m->p->interface, mDNSfalse);
+            break;
+        default:                LogMsg("Unexpected m->p->mOTstate %d", m->p->mOTstate-1);
+        }
+        break;
+
+    case T_DATA:
+        //debugf("T_DATA");
+        while (readpacket(m) == kOTNoError) continue;       // Read packets until we run out
+        break;
+
+    case kOTProviderWillClose: LogMsg("kOTProviderWillClose"); break;
+    case kOTProviderIsClosed:           // Machine is going to sleep, shutting down, or reconfiguring IP
+        LogMsg("kOTProviderIsClosed");
+        if (m->p->mOTstate == mOT_Ready)
+        {
+            m->p->mOTstate = mOT_Closed;
+            mDNS_DeregisterInterface(m, &m->p->interface, mDNSfalse);
+        }
+        if (m->p->ep) { OTCloseProvider(m->p->ep); m->p->ep = NULL; }
+        break;                          // Do we need to do anything?
+
+    default: debugf("mDNSNotifier: Unexpected OTEventCode %X", code);
+        break;
+    }
+}
+
+#if MDNS_ONLYSYSTEMTASK
+
+static Boolean ONLYSYSTEMTASKevent;
+static void       *ONLYSYSTEMTASKcontextPtr;
+static OTEventCode ONLYSYSTEMTASKcode;
+static OTResult ONLYSYSTEMTASKresult;
+static void       *ONLYSYSTEMTASKcookie;
+
+mDNSlocal pascal void CallmDNSNotifier(void *contextPtr, OTEventCode code, OTResult result, void *cookie)
+{
+    ONLYSYSTEMTASKcontextPtr = contextPtr;
+    ONLYSYSTEMTASKcode       = code;
+    ONLYSYSTEMTASKresult     = result;
+    ONLYSYSTEMTASKcookie     = cookie;
+}
+
+#else
+
+mDNSlocal pascal void CallmDNSNotifier(void *contextPtr, OTEventCode code, OTResult result, void *cookie)
+{
+    mDNS *const m = (mDNS *const)contextPtr;
+    if (!m) debugf("mDNSNotifier FATAL ERROR! No context");
+    if (m->p->nesting) LogMsg("CallmDNSNotifier ERROR! OTEnterNotifier is supposed to suppress notifier callbacks");
+    mDNSNotifier(contextPtr, code, result, cookie);
+}
+
+#endif
+
+static OTNotifyUPP CallmDNSNotifierUPP;
+
+mDNSlocal OSStatus mDNSOpenEndpoint(const mDNS *const m)
+{
+    OSStatus err;
+    // m->optReq is pre-set to point to the shared m->optBlock
+    // m->optBlock is filled in by each OTOptionManagement call
+    m->p->optReq.opt.maxlen = sizeof(m->p->optBlock);
+    m->p->optReq.opt.len    = sizeof(m->p->optBlock);
+    m->p->optReq.opt.buf    = (UInt8*)&m->p->optBlock;
+    m->p->optReq.flags      = T_NEGOTIATE;
+
+    // Open an endpoint and start answering queries
+    //printf("Opening endpoint now...\n");
+    m->p->ep = NULL;
+    m->p->mOTstate = mOT_Start;
+    err = OTAsyncOpenEndpoint(OTCreateConfiguration(kUDPName), 0, NULL, CallmDNSNotifierUPP, (void*)m);
+    if (err) { LogMsg("ERROR: OTAsyncOpenEndpoint(UDP) failed with error <%d>", err); return(err); }
+    return(kOTNoError);
+}
+
+// Define these here because they're not in older versions of OpenTransport.h
+enum
+{
+    xOTStackIsLoading   = 0x27000001,   /* Sent before Open Transport attempts to load the TCP/IP protocol stack.*/
+    xOTStackWasLoaded   = 0x27000002,   /* Sent after the TCP/IP stack has been successfully loaded.*/
+    xOTStackIsUnloading = 0x27000003    /* Sent before Open Transport unloads the TCP/IP stack.*/
+};
+
+static mDNS *ClientNotifierContext;
+
+mDNSlocal pascal void ClientNotifier(void *contextPtr, OTEventCode code, OTResult result, void *cookie)
+{
+    mDNS *const m = ClientNotifierContext;
+
+    #pragma unused(contextPtr) // Usually zero (except one in the 'xOTStackIsLoading' case)
+    #pragma unused(cookie) // Usually 'ipv4' (except for kOTPortNetworkChange)
+    #pragma unused(result) // Usually zero
+
+    switch (code)
+    {
+    case xOTStackIsLoading:     break;
+    case xOTStackWasLoaded:     if (m->p->mOTstate == mOT_Closed)
+        {
+            LogMsg("kOTStackWasLoaded: Re-opening endpoint");
+            if (m->p->ep)
+                LogMsg("kOTStackWasLoaded: ERROR: m->p->ep already set");
+            m->mDNSPlatformStatus = mStatus_Waiting;
+            m->p->mOTstate = mOT_Reset;
+                                        #if !MDNS_ONLYSYSTEMTASK
+            mDNSOpenEndpoint(m);
+                                        #endif
+        }
+        else
+            LogMsg("kOTStackWasLoaded (no action)");
+        break;
+    case xOTStackIsUnloading:   break;
+    case kOTPortNetworkChange:  break;
+    default: debugf("ClientNotifier unknown code %X, %X, %d", contextPtr, code, result); break;
+    }
+}
+
+#if TARGET_API_MAC_CARBON
+
+mDNSlocal void GetUserSpecifiedComputerName(domainlabel *const namelabel)
+{
+    CFStringRef cfs = CSCopyMachineName();
+    CFStringGetPascalString(cfs, namelabel->c, sizeof(*namelabel), kCFStringEncodingUTF8);
+    CFRelease(cfs);
+}
+
+#else
+
+mDNSlocal OSStatus ConvertStringHandleToUTF8(const StringHandle machineName, UInt8 *const utf8, ByteCount maxlen)
+{
+    OSStatus status;
+    TextEncoding utf8TextEncoding, SystemTextEncoding;
+    UnicodeMapping theMapping;
+    TextToUnicodeInfo textToUnicodeInfo;
+    ByteCount unicodelen = 0;
+
+    if (maxlen > 255) maxlen = 255; // Can't put more than 255 in a Pascal String
+
+    utf8TextEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kTextEncodingDefaultVariant, kUnicodeUTF8Format);
+    UpgradeScriptInfoToTextEncoding(smSystemScript, kTextLanguageDontCare, kTextRegionDontCare, NULL, &SystemTextEncoding);
+    theMapping.unicodeEncoding = utf8TextEncoding;
+    theMapping.otherEncoding   = SystemTextEncoding;
+    theMapping.mappingVersion  = kUnicodeUseLatestMapping;
+    status = CreateTextToUnicodeInfo(&theMapping, &textToUnicodeInfo);
+    if (status == noErr)
+    {
+        status = ConvertFromPStringToUnicode(textToUnicodeInfo, *machineName, maxlen, &unicodelen, (UniCharArrayPtr)&(utf8[1]));
+        DisposeTextToUnicodeInfo(&textToUnicodeInfo);
+    }
+    utf8[0] = (UInt8)unicodelen;
+    return(status);
+}
+
+mDNSlocal void GetUserSpecifiedComputerName(domainlabel *const namelabel)
+{
+    StringHandle machineName = GetString(-16413);   // Get machine name set in file sharing
+    if (machineName)
+    {
+        char machineNameState = HGetState((Handle)machineName);
+        HLock((Handle)machineName);
+        ConvertStringHandleToUTF8(machineName, namelabel->c, MAX_DOMAIN_LABEL);
+        HSetState((Handle)machineName, machineNameState);
+    }
+}
+
+#endif
+
+static pascal void mDNSTimerTask(void *arg)
+{
+#if MDNS_ONLYSYSTEMTASK
+#pragma unused(arg)
+    ONLYSYSTEMTASKevent = true;
+#else
+    mDNS *const m = (mDNS *const)arg;
+    if (!m->p->ep) LogMsg("mDNSTimerTask NO endpoint");
+    if (m->mDNS_busy) LogMsg("mDNS_busy");
+    if (m->p->nesting) LogMsg("mDNSTimerTask ERROR! OTEnterNotifier is supposed to suppress timer callbacks too");
+
+    // If our timer fires at a time when we have no endpoint, ignore it --
+    // once we reopen our endpoint and get our T_BINDCOMPLETE message we'll call
+    // mDNS_RegisterInterface(), which does a lock/unlock, which retriggers the timer.
+    // Likewise, if m->mDNS_busy or m->p->nesting, we'll catch this on the unlock
+    if (m->p->ep && m->mDNS_busy == 0 && m->p->nesting == 0) mDNS_Execute(m);
+#endif
+}
+
+#if TEST_SLEEP
+long sleep, wake, mode;
+#endif
+
+mDNSexport mStatus mDNSPlatformInit (mDNS *const m)
+{
+    OSStatus err = InitOpenTransport();
+
+    ClientNotifierContext = m;
+    // Note: OTRegisterAsClient returns kOTNotSupportedErr when running as Carbon code on OS X
+    // -- but that's okay, we don't need a ClientNotifier when running as Carbon code on OS X
+    OTRegisterAsClient(NULL, NewOTNotifyUPP(ClientNotifier));
+
+    m->p->OTTimerTask = OTCreateTimerTask(NewOTProcessUPP(mDNSTimerTask), m);
+    m->p->nesting     = 0;
+
+#if TEST_SLEEP
+    sleep = TickCount() + 600;
+    wake = TickCount() + 1200;
+    mode = 0;
+#endif
+
+    // Set up the nice label
+    m->nicelabel.c[0] = 0;
+    GetUserSpecifiedComputerName(&m->nicelabel);
+//	m->nicelabel = *(domainlabel*)"\pStu";	// For conflict testing
+    if (m->nicelabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->nicelabel, "Macintosh");
+
+    // Set up the RFC 1034-compliant label
+    m->hostlabel.c[0] = 0;
+    ConvertUTF8PstringToRFC1034HostLabel(m->nicelabel.c, &m->hostlabel);
+    if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Macintosh");
+
+    mDNS_SetFQDN(m);
+
+    // When it's finished mDNSOpenEndpoint asynchronously calls mDNSinitComplete() and then mDNS_RegisterInterface()
+    CallmDNSNotifierUPP = NewOTNotifyUPP(CallmDNSNotifier);
+    err = mDNSOpenEndpoint(m);
+    if (err)
+    {
+        LogMsg("mDNSOpenEndpoint failed %d", err);
+        if (m->p->OTTimerTask) OTDestroyTimerTask(m->p->OTTimerTask);
+        OTUnregisterAsClient();
+        CloseOpenTransport();
+    }
+    return(err);
+}
+
+extern void mDNSPlatformClose (mDNS *const m)
+{
+    if (m->p->mOTstate == mOT_Ready)
+    {
+        m->p->mOTstate = mOT_Closed;
+        mDNS_DeregisterInterface(m, &m->p->interface, mDNSfalse);
+    }
+    if (m->p->ep)          { OTCloseProvider   (m->p->ep);          m->p->ep          = NULL; }
+    if (m->p->OTTimerTask) { OTDestroyTimerTask(m->p->OTTimerTask); m->p->OTTimerTask = 0;    }
+
+    OTUnregisterAsClient();
+    CloseOpenTransport();
+}
+
+#if MDNS_ONLYSYSTEMTASK
+extern void mDNSPlatformIdle(mDNS *const m);
+mDNSexport void mDNSPlatformIdle(mDNS *const m)
+{
+    while (ONLYSYSTEMTASKcontextPtr)
+    {
+        void *contextPtr = ONLYSYSTEMTASKcontextPtr;
+        ONLYSYSTEMTASKcontextPtr = NULL;
+        mDNSNotifier(contextPtr, ONLYSYSTEMTASKcode, ONLYSYSTEMTASKresult, ONLYSYSTEMTASKcookie);
+    }
+    if (ONLYSYSTEMTASKevent)
+    {
+        ONLYSYSTEMTASKevent = false;
+        mDNS_Execute(m);
+    }
+
+    if (m->p->mOTstate == mOT_Reset)
+    {
+        printf("\n");
+        printf("******************************************************************************\n");
+        printf("\n");
+        printf("Reopening endpoint\n");
+        mDNSOpenEndpoint(m);
+        m->ResourceRecords = NULL;
+    }
+
+#if TEST_SLEEP
+    switch (mode)
+    {
+    case 0: if ((long)TickCount() - sleep >= 0) { mDNSCoreMachineSleep(m, 1); mode++; }
+        break;
+    case 1: if ((long)TickCount() - wake >= 0) { mDNSCoreMachineSleep(m, 0); mode++; }
+        break;
+    }
+#endif
+}
+#endif
+
+mDNSexport void    mDNSPlatformLock(const mDNS *const m)
+{
+    if (!m) { DebugStr("\pmDNSPlatformLock m NULL!"); return; }
+    if (!m->p) { DebugStr("\pmDNSPlatformLock m->p NULL!"); return; }
+
+    // If we try to call OTEnterNotifier and fail because we're already running at
+    // Notifier context, then make sure we don't do the matching OTLeaveNotifier() on exit.
+    // If we haven't even opened our endpoint yet, then just increment m->p->nesting for the same reason
+    if (m->p->mOTstate == mOT_Ready && !m->p->ep) DebugStr("\pmDNSPlatformLock: m->p->mOTstate == mOT_Ready && !m->p->ep");
+    if (!m->p->ep || m->p->nesting || OTEnterNotifier(m->p->ep) == false) m->p->nesting++;
+}
+
+mDNSlocal void ScheduleNextTimerCallback(const mDNS *const m)
+{
+    if (m->mDNSPlatformStatus == mStatus_NoError)
+    {
+        SInt32 interval = m->NextScheduledEvent - mDNS_TimeNow_NoLock(m);
+        if      (interval < 1) interval = 1;
+        else if (interval > 0x70000000 / 1000) interval = 0x70000000 / mDNSPlatformOneSecond;
+        else interval = (interval * 1000 + mDNSPlatformOneSecond-1)/ mDNSPlatformOneSecond;
+        OTScheduleTimerTask(m->p->OTTimerTask, (OTTimeout)interval);
+    }
+}
+
+mDNSexport void    mDNSPlatformUnlock(const mDNS *const m)
+{
+    if (!m) { DebugStr("\pmDNSPlatformUnlock m NULL!"); return; }
+    if (!m->p) { DebugStr("\pmDNSPlatformUnlock m->p NULL!"); return; }
+
+    if (m->p->ep && m->mDNS_busy == 0) ScheduleNextTimerCallback(m);
+
+    if (m->p->nesting) m->p->nesting--;
+    else OTLeaveNotifier(m->p->ep);
+}
+
+mDNSexport void     mDNSPlatformStrCopy(      void *dst, const void *src)             { OTStrCopy((char*)dst, (char*)src); }
+mDNSexport UInt32   mDNSPlatformStrLen (                 const void *src)             { return(OTStrLength((char*)src)); }
+mDNSexport void     mDNSPlatformMemCopy(      void *dst, const void *src, UInt32 len) { OTMemcpy(dst, src, len); }
+mDNSexport mDNSBool mDNSPlatformMemSame(const void *dst, const void *src, UInt32 len) { return(OTMemcmp(dst, src, len)); }
+mDNSexport void     mDNSPlatformMemZero(      void *dst,                  UInt32 len) { OTMemzero(dst, len); }
+mDNSexport void *   mDNSPlatformMemAllocate(mDNSu32 len)                              { return(OTAllocMem(len)); }
+mDNSexport void     mDNSPlatformMemFree(void *mem)                                    { OTFreeMem(mem); }
+mDNSexport mDNSu32  mDNSPlatformRandomSeed(void)                                      { return(TickCount()); }
+mDNSexport mStatus  mDNSPlatformTimeInit(void)                                        { return(mStatus_NoError); }
+mDNSexport SInt32   mDNSPlatformRawTime()                                             { return((SInt32)TickCount()); }
+mDNSexport SInt32 mDNSPlatformOneSecond = 60;
+
+mDNSexport mDNSs32  mDNSPlatformUTC(void)
+{
+    // Classic Mac OS since Midnight, 1st Jan 1904
+    // Standard Unix counts from 1970
+    // This value adjusts for the 66 years and 17 leap-days difference
+    mDNSu32 SecsSince1904;
+    MachineLocation ThisLocation;
+    #define TIME_ADJUST (((1970 - 1904) * 365 + 17) * 24 * 60 * 60)
+    #define ThisLocationGMTdelta ((ThisLocation.u.gmtDelta << 8) >> 8)
+    GetDateTime(&SecsSince1904);
+    ReadLocation(&ThisLocation);
+    return((mDNSs32)(SecsSince1904 - ThisLocationGMTdelta - TIME_ADJUST));
+}
diff --git a/mDNSResponder/mDNSMacOS9/mDNSMacOS9.h b/mDNSResponder/mDNSMacOS9/mDNSMacOS9.h
new file mode 100755
index 00000000..496c07f7
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSMacOS9.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// Classic Mac (Open Transport) structures
+
+//#include <Files.h>	// OpenTransport.h requires this
+#include <OpenTransport.h>
+#include <OpenTptInternet.h>
+#include <OpenTptClient.h>
+
+typedef enum
+{
+    mOT_Closed = 0,     // We got kOTProviderIsClosed message
+    mOT_Reset,          // We got xOTStackWasLoaded message
+    mOT_Start,          // We've called OTAsyncOpenEndpoint
+    mOT_ReusePort,      // Have just done kReusePortOption
+    mOT_RcvDestAddr,    // Have just done kRcvDestAddrOption
+    mOT_SetUTTL,        // Have just done kSetUnicastTTLOption
+    mOT_SetMTTL,        // Have just done kSetMulticastTTLOption
+    mOT_LLScope,        // Have just done kAddLinkMulticastOption
+//	mOT_AdminScope,		// Have just done kAddAdminMulticastOption
+    mOT_Bind,           // We've just called OTBind
+    mOT_Ready           // Got T_BINDCOMPLETE; Interface is registered and active
+} mOT_State;
+
+typedef struct { TOptionHeader h; mDNSv4Addr multicastGroupAddress; mDNSv4Addr InterfaceAddress; } TIPAddMulticastOption;
+typedef struct { TOptionHeader h; UInt8 val; } TSetByteOption;
+typedef struct { TOptionHeader h; UInt32 flag; } TSetBooleanOption;
+
+// TOptionBlock is a union of various types.
+// What they all have in common is that they all start with a TOptionHeader.
+typedef union  { TOptionHeader h; TIPAddMulticastOption m; TSetByteOption i; TSetBooleanOption b; } TOptionBlock;
+
+struct mDNS_PlatformSupport_struct
+{
+    EndpointRef ep;
+    UInt32 mOTstate;                // mOT_State enum
+    TOptionBlock optBlock;
+    TOptMgmt optReq;
+    long OTTimerTask;
+    UInt32 nesting;
+    NetworkInterfaceInfo interface;
+};
diff --git a/mDNSResponder/mDNSMacOS9/mDNSPrefix.h b/mDNSResponder/mDNSMacOS9/mDNSPrefix.h
new file mode 100644
index 00000000..cf6cec8a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOS9/mDNSPrefix.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Global definitions that apply to all source files
+//
+// Symbols that are defined here are available within all source files.
+// This is the equivalent of using using "-d SYMBOL=VALUE" in a Makefile
+// in command-line build environments.
+
+// For normal DeferredTask time execution, set MDNS_ONLYSYSTEMTASK to 0
+// For easier debugging, set MDNS_ONLYSYSTEMTASK to 1, and OT Notifier executions
+// will be deferred until SystemTask time. (This option is available only for building
+// the standalone application samples that have their own event loop -- don't try
+// to build the System Extension with MDNS_ONLYSYSTEMTASK set because it won't work.)
+
+#if   __ide_target("Standalone TestResponder")           || __ide_target("Standalone TestSearcher")           || __ide_target("Standalone SubTypeTester")
+#define TARGET_API_MAC_CARBON 1
+#define OTCARBONAPPLICATION 1
+#define MDNS_ONLYSYSTEMTASK 0
+#define MDNS_DEBUGMSGS 0
+
+#elif __ide_target("Standalone TestResponder (Debug)")   || __ide_target("Standalone TestSearcher (Debug)")
+#define TARGET_API_MAC_CARBON 1
+#define OTCARBONAPPLICATION 1
+#define MDNS_ONLYSYSTEMTASK 1
+#define MDNS_DEBUGMSGS 1
+
+#elif __ide_target("Standalone TestResponder (Classic)") || __ide_target("Standalone TestSearcher (Classic)")
+#define MDNS_ONLYSYSTEMTASK 0
+#define MDNS_DEBUGMSGS 0
+
+#elif __ide_target("CFM Library for Extensions Folder")
+#define MDNS_BUILDINGSHAREDLIBRARY 2
+
+#elif __ide_target("CFM Library for Extensions (Debug)")
+#define MDNS_DEBUGMSGS 0
+#define MDNS_BUILDINGSHAREDLIBRARY 1
+
+#elif __ide_target("CFM Stub for clients to link against")
+#define MDNS_BUILDINGSTUBLIBRARY 1
+
+#else
+#error Options for this target not found in prefix file
+#endif
+
+// dnssd_clientlib.c assumes malloc() and free(), so we #define them here to be the OT equivalents
+#if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
+#define malloc(x) OTAllocMem(x)
+#define free(x) OTFreeMem(x)
+#endif
diff --git a/mDNSResponder/mDNSMacOSX/BonjourEvents-Info.plist b/mDNSResponder/mDNSMacOSX/BonjourEvents-Info.plist
new file mode 100644
index 00000000..473d4143
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/BonjourEvents-Info.plist
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>CFPlugInFactories</key>
+	<dict>
+		<key>FB86416D-6164-2070-726F-70735C216EC0</key>
+		<string>UserEventAgentFactory</string>
+	</dict>
+	<key>CFPlugInTypes</key>
+	<dict>
+		<key>FC86416D-6164-2070-726F-70735C216EC0</key>
+		<array>
+			<string>FB86416D-6164-2070-726F-70735C216EC0</string>
+		</array>
+	</dict>
+	<key>CFPlugInUnloadFunction</key>
+	<string></string>
+	<key>LimitLoadToSessionType</key>
+	<array>
+		<string>System</string>
+		<string>Aqua</string>
+	</array>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/BonjourEvents.c b/mDNSResponder/mDNSMacOSX/BonjourEvents.c
new file mode 100644
index 00000000..b9308189
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/BonjourEvents.c
@@ -0,0 +1,991 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2010 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFXPCBridge.h>
+#include "dns_sd.h"
+#include <UserEventAgentInterface.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <asl.h>
+#include <xpc/xpc.h>
+
+
+#pragma mark -
+#pragma mark Types
+#pragma mark -
+static const char*          sPluginIdentifier       = "com.apple.bonjour.events";
+
+// PLIST Keys
+static const CFStringRef sServiceNameKey         = CFSTR("ServiceName");
+static const CFStringRef sServiceTypeKey         = CFSTR("ServiceType");
+static const CFStringRef sServiceDomainKey       = CFSTR("ServiceDomain");
+
+static const CFStringRef sOnServiceAddKey        = CFSTR("OnServiceAdd");
+static const CFStringRef sOnServiceRemoveKey     = CFSTR("OnServiceRemove");
+
+static const CFStringRef sLaunchdTokenKey        = CFSTR("LaunchdToken");
+static const CFStringRef sLaunchdDictKey         = CFSTR("LaunchdDict");
+
+
+/************************************************
+* Launch Event Dictionary (input from launchd)
+* Passed To: ManageEventsCallback
+*-----------------------------------------------
+* Typing in this dictionary is not enforced
+* above us. So this may not be true. Type check
+* all input before using it.
+*-----------------------------------------------
+* sServiceNameKey		- CFString (Optional)
+* sServiceTypeKey		- CFString
+* sServiceDomainKey	- CFString
+*
+* One or more of the following.
+*-----------------------------------
+* sOnServiceAddKey			- CFBoolean
+* sOnServiceRemoveKey		- CFBoolean
+* sWhileServiceExistsKey	- CFBoolean
+************************************************/
+
+/************************************************
+* Browser Dictionary
+*-----------------------------------------------
+* sServiceDomainKey - CFString
+* sServiceTypeKey   - CFString
+************************************************/
+
+/************************************************
+* Event Dictionary
+*-----------------------------------------------
+* sServiceNameKey	 - CFString (Optional)
+* sLaunchdTokenKey	 - CFNumber
+************************************************/
+
+typedef struct {
+    UserEventAgentInterfaceStruct*      _UserEventAgentInterface;
+    CFUUIDRef _factoryID;
+    UInt32 _refCount;
+
+    void*                               _pluginContext;
+
+    CFMutableDictionaryRef _tokenToBrowserMap;                  // Maps a token to a browser that can be used to scan the remaining dictionaries.
+    CFMutableDictionaryRef _browsers;                           // A Dictionary of Browser Dictionaries where the resposible browser is the key.
+    CFMutableDictionaryRef _onAddEvents;                        // A Dictionary of Event Dictionaries that describe events to trigger on a service appearing.
+    CFMutableDictionaryRef _onRemoveEvents;                     // A Dictionary of Event Dictionaries that describe events to trigger on a service disappearing.
+} BonjourUserEventsPlugin;
+
+typedef struct {
+    CFIndex refCount;
+    DNSServiceRef browserRef;
+} NetBrowserInfo;
+
+#pragma mark -
+#pragma mark Prototypes
+#pragma mark -
+// COM Stuff
+static HRESULT  QueryInterface(void *myInstance, REFIID iid, LPVOID *ppv);
+static ULONG    AddRef(void* instance);
+static ULONG    Release(void* instance);
+
+static BonjourUserEventsPlugin* Alloc(CFUUIDRef factoryID);
+static void Dealloc(BonjourUserEventsPlugin* plugin);
+
+void * UserEventAgentFactory(CFAllocatorRef allocator, CFUUIDRef typeID);
+
+// Plugin Management
+static void Install(void* instance);
+static void ManageEventsCallback(
+    UserEventAgentLaunchdAction action,
+    CFNumberRef token,
+    CFTypeRef eventMatchDict,
+    void                      * vContext);
+
+
+// Plugin Guts
+void AddEventToPlugin(BonjourUserEventsPlugin* plugin, CFNumberRef launchdToken, CFDictionaryRef eventParameters);
+void RemoveEventFromPlugin(BonjourUserEventsPlugin* plugin, CFNumberRef launchToken);
+
+NetBrowserInfo* CreateBrowser(BonjourUserEventsPlugin* plugin, CFStringRef type, CFStringRef domain);
+NetBrowserInfo* BrowserForSDRef(BonjourUserEventsPlugin* plugin, DNSServiceRef sdRef);
+void AddEventDictionary(CFDictionaryRef eventDict, CFMutableDictionaryRef allEventsDictionary, NetBrowserInfo* key);
+void RemoveEventFromArray(CFMutableArrayRef array, CFNumberRef launchdToken);
+
+// Net Service Browser Stuff
+void ServiceBrowserCallback (DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char* serviceName, const char* regtype, const char* replyDomain, void* context);
+void HandleTemporaryEventsForService(BonjourUserEventsPlugin* plugin, NetBrowserInfo* browser, CFStringRef serviceName, CFMutableDictionaryRef eventsDictionary);
+
+// Convence Stuff
+const char* CStringFromCFString(CFStringRef string);
+
+// NetBrowserInfo "Object"
+NetBrowserInfo* NetBrowserInfoCreate(CFStringRef serviceType, CFStringRef domain, void* context);
+const void* NetBrowserInfoRetain(CFAllocatorRef allocator, const void* info);
+void NetBrowserInfoRelease(CFAllocatorRef allocator, const void* info);
+Boolean NetBrowserInfoEqual(const void *value1, const void *value2);
+CFHashCode  NetBrowserInfoHash(const void *value);
+CFStringRef NetBrowserInfoCopyDescription(const void *value);
+
+static const CFDictionaryKeyCallBacks kNetBrowserInfoDictionaryKeyCallbacks = {
+    0,
+    NetBrowserInfoRetain,
+    NetBrowserInfoRelease,
+    NetBrowserInfoCopyDescription,
+    NetBrowserInfoEqual,
+    NetBrowserInfoHash
+};
+
+static const CFDictionaryValueCallBacks kNetBrowserInfoDictionaryValueCallbacks = {
+    0,
+    NetBrowserInfoRetain,
+    NetBrowserInfoRelease,
+    NetBrowserInfoCopyDescription,
+    NetBrowserInfoEqual
+};
+
+// COM type definition goop.
+static UserEventAgentInterfaceStruct UserEventAgentInterfaceFtbl = {
+    NULL,                   // Required padding for COM
+    QueryInterface,         // Query Interface
+    AddRef,                 // AddRef()
+    Release,                // Release()
+    Install                 // Install
+};
+
+#pragma mark -
+#pragma mark COM Management
+#pragma mark -
+
+/*****************************************************************************
+*****************************************************************************/
+static HRESULT QueryInterface(void *myInstance, REFIID iid, LPVOID *ppv)
+{
+    CFUUIDRef interfaceID = CFUUIDCreateFromUUIDBytes(NULL, iid);
+
+    // Test the requested ID against the valid interfaces.
+    if(CFEqual(interfaceID, kUserEventAgentInterfaceID))
+    {
+        ((BonjourUserEventsPlugin *) myInstance)->_UserEventAgentInterface->AddRef(myInstance);
+        *ppv = myInstance;
+        CFRelease(interfaceID);
+        return S_OK;
+    }
+    else if(CFEqual(interfaceID, IUnknownUUID))
+    {
+        ((BonjourUserEventsPlugin *) myInstance)->_UserEventAgentInterface->AddRef(myInstance);
+        *ppv = myInstance;
+        CFRelease(interfaceID);
+        return S_OK;
+    }
+    else //  Requested interface unknown, bail with error.
+    {
+        *ppv = NULL;
+        CFRelease(interfaceID);
+        return E_NOINTERFACE;
+    }
+}
+
+/*****************************************************************************
+*****************************************************************************/
+static ULONG AddRef(void* instance)
+{
+    BonjourUserEventsPlugin* plugin = (BonjourUserEventsPlugin*)instance;
+    return ++plugin->_refCount;
+}
+
+/*****************************************************************************
+*****************************************************************************/
+static ULONG Release(void* instance)
+{
+    BonjourUserEventsPlugin* plugin = (BonjourUserEventsPlugin*)instance;
+
+    if (plugin->_refCount != 0)
+        --plugin->_refCount;
+
+    if (plugin->_refCount == 0)
+    {
+        Dealloc(instance);
+        return 0;
+    }
+
+    return plugin->_refCount;
+}
+
+/*****************************************************************************
+* Alloc
+* -
+* Functionas as both +[alloc] and -[init] for the plugin. Add any
+* initalization of member variables here.
+*****************************************************************************/
+static BonjourUserEventsPlugin* Alloc(CFUUIDRef factoryID)
+{
+    BonjourUserEventsPlugin* plugin = malloc(sizeof(BonjourUserEventsPlugin));
+
+    plugin->_UserEventAgentInterface = &UserEventAgentInterfaceFtbl;
+    plugin->_pluginContext = NULL;
+
+    if (factoryID)
+    {
+        plugin->_factoryID = (CFUUIDRef)CFRetain(factoryID);
+        CFPlugInAddInstanceForFactory(factoryID);
+    }
+
+    plugin->_refCount = 1;
+    plugin->_tokenToBrowserMap = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kNetBrowserInfoDictionaryValueCallbacks);
+    plugin->_browsers = CFDictionaryCreateMutable(NULL, 0, &kNetBrowserInfoDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+    plugin->_onAddEvents = CFDictionaryCreateMutable(NULL, 0, &kNetBrowserInfoDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+    plugin->_onRemoveEvents = CFDictionaryCreateMutable(NULL, 0, &kNetBrowserInfoDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+
+    return plugin;
+}
+
+/*****************************************************************************
+* Dealloc
+* -
+* Much like Obj-C dealloc this method is responsible for releasing any object
+* this plugin is holding. Unlike ObjC, you call directly free() instead of
+* [super dalloc].
+*****************************************************************************/
+static void Dealloc(BonjourUserEventsPlugin* plugin)
+{
+    CFUUIDRef factoryID = plugin->_factoryID;
+
+    if (factoryID)
+    {
+        CFPlugInRemoveInstanceForFactory(factoryID);
+        CFRelease(factoryID);
+    }
+
+    if (plugin->_tokenToBrowserMap)
+        CFRelease(plugin->_tokenToBrowserMap);
+
+    if (plugin->_browsers)
+        CFRelease(plugin->_browsers);
+
+    if (plugin->_onAddEvents)
+        CFRelease(plugin->_onAddEvents);
+
+    if (plugin->_onRemoveEvents)
+        CFRelease(plugin->_onRemoveEvents);
+
+    free(plugin);
+}
+
+/*******************************************************************************
+*******************************************************************************/
+void * UserEventAgentFactory(CFAllocatorRef allocator, CFUUIDRef typeID)
+{
+    (void)allocator;
+    BonjourUserEventsPlugin * result = NULL;
+
+    if (typeID && CFEqual(typeID, kUserEventAgentTypeID)) {
+        result = Alloc(kUserEventAgentFactoryID);
+    }
+
+    return (void *)result;
+}
+
+#pragma mark -
+#pragma mark Plugin Management
+#pragma mark -
+/*****************************************************************************
+* Install
+* -
+* This is invoked once when the plugin is loaded to do initial setup and
+* allow us to register with launchd. If UserEventAgent crashes, the plugin
+* will need to be reloaded, and hence this will get invoked again.
+*****************************************************************************/
+static void Install(void *instance)
+{
+    BonjourUserEventsPlugin* plugin = (BonjourUserEventsPlugin*)instance;
+
+    plugin->_pluginContext = UserEventAgentRegisterForLaunchEvents(sPluginIdentifier, &ManageEventsCallback, plugin);
+
+    if (!plugin->_pluginContext)
+    {
+        fprintf(stderr, "%s:%s failed to register for launch events.\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+}
+
+/*****************************************************************************
+* ManageEventsCallback
+* -
+* This is invoked when launchd loads a event dictionary and needs to inform
+* us what a daemon / agent is looking for.
+*****************************************************************************/
+static void ManageEventsCallback(UserEventAgentLaunchdAction action, CFNumberRef token, CFTypeRef eventMatchDict, void* vContext)
+{
+    if (action == kUserEventAgentLaunchdAdd)
+    {
+        if (!eventMatchDict)
+        {
+            fprintf(stderr, "%s:%s empty dictionary\n", sPluginIdentifier, __FUNCTION__);
+            return;
+        }
+        if (CFGetTypeID(eventMatchDict) != CFDictionaryGetTypeID())
+        {
+            fprintf(stderr, "%s:%s given non-dict for event dictionary, action %d\n", sPluginIdentifier, __FUNCTION__, action);
+            return;
+        }
+        // Launchd wants us to add a launch event for this token and matching dictionary.
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s calling AddEventToPlugin", sPluginIdentifier, __FUNCTION__);
+        AddEventToPlugin((BonjourUserEventsPlugin*)vContext, token, (CFDictionaryRef)eventMatchDict);
+    }
+    else if (action == kUserEventAgentLaunchdRemove)
+    {
+        // Launchd wants us to remove the event hook we setup for this token / matching dictionary.
+        // Note: eventMatchDict can be NULL for Remove.
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s calling RemoveEventToPlugin", sPluginIdentifier, __FUNCTION__);
+        RemoveEventFromPlugin((BonjourUserEventsPlugin*)vContext, token);
+    }
+    else
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s unknown callback event\n", sPluginIdentifier, __FUNCTION__);
+    }
+}
+
+
+#pragma mark -
+#pragma mark Plugin Guts
+#pragma mark -
+
+/*****************************************************************************
+* AddEventToPlugin
+* -
+* This method is invoked when launchd wishes the plugin to setup a launch
+* event matching the parameters in the dictionary.
+*****************************************************************************/
+void AddEventToPlugin(BonjourUserEventsPlugin* plugin, CFNumberRef launchdToken, CFDictionaryRef eventParameters)
+{
+    CFStringRef domain = CFDictionaryGetValue(eventParameters, sServiceDomainKey);
+    CFStringRef type = CFDictionaryGetValue(eventParameters, sServiceTypeKey);
+    CFStringRef name = CFDictionaryGetValue(eventParameters, sServiceNameKey);
+    CFBooleanRef cfOnAdd = CFDictionaryGetValue(eventParameters, sOnServiceAddKey);
+    CFBooleanRef cfOnRemove = CFDictionaryGetValue(eventParameters, sOnServiceRemoveKey);
+
+    Boolean onAdd = false;
+    Boolean onRemove = false;
+
+    if (cfOnAdd && CFGetTypeID(cfOnAdd) == CFBooleanGetTypeID() && CFBooleanGetValue(cfOnAdd))
+        onAdd = true;
+
+    if (cfOnRemove && CFGetTypeID(cfOnRemove) == CFBooleanGetTypeID() && CFBooleanGetValue(cfOnRemove))
+        onRemove = true;
+
+    // A type is required. If none is specified, BAIL
+    if (!type || CFGetTypeID(type) != CFStringGetTypeID())
+    {
+        fprintf(stderr, "%s:%s: a LaunchEvent is missing a service type.\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    // If we aren't suppose to launch on services appearing or disappearing, this service does nothing. Ignore.
+    if (!onAdd && !onRemove)
+    {
+        fprintf(stderr, "%s:%s a LaunchEvent is missing both onAdd and onRemove events\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    // If no domain is specified, assume local.
+    if (!domain)
+    {
+        domain = CFSTR("local");
+    }
+    else if (CFGetTypeID(domain) != CFStringGetTypeID() ) // If the domain is not a string, fail
+    {
+        fprintf(stderr, "%s:%s a LaunchEvent has a domain that is not a string.\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    // If we have a name filter, but it's not a string. This event is broken, bail.
+    if (name && CFGetTypeID(name) != CFStringGetTypeID())
+    {
+        fprintf(stderr, "%s:%s a LaunchEvent has a domain that is not a string.\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    // Get us a browser
+    NetBrowserInfo* browser = CreateBrowser(plugin, type, domain);
+
+    if (!browser)
+    {
+        fprintf(stderr, "%s:%s cannot create browser\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    // Create Event Dictionary
+    CFMutableDictionaryRef eventDictionary = CFDictionaryCreateMutable(NULL, 4, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+    // We store both the Token and the Dictionary. UserEventAgentSetLaunchEventState needs
+    // the token and UserEventAgentSetFireEvent needs both the token and the dictionary
+    CFDictionarySetValue(eventDictionary, sLaunchdTokenKey, launchdToken);
+    CFDictionarySetValue(eventDictionary, sLaunchdDictKey, eventParameters);
+
+    if (name)
+        CFDictionarySetValue(eventDictionary, sServiceNameKey, name);
+
+    // Add to the correct dictionary.
+    if (onAdd)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Adding browser to AddEvents", sPluginIdentifier, __FUNCTION__);
+        AddEventDictionary(eventDictionary, plugin->_onAddEvents, browser);
+    }
+
+    if (onRemove)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Adding browser to RemoveEvents", sPluginIdentifier, __FUNCTION__);
+        AddEventDictionary(eventDictionary, plugin->_onRemoveEvents, browser);
+    }
+
+    // Add Token Mapping
+    CFDictionarySetValue(plugin->_tokenToBrowserMap, launchdToken, browser);
+
+    // Release Memory
+    CFRelease(eventDictionary);
+}
+
+/*****************************************************************************
+* RemoveEventFromPlugin
+* -
+* This method is invoked when launchd wishes the plugin to setup a launch
+* event matching the parameters in the dictionary.
+*****************************************************************************/
+void RemoveEventFromPlugin(BonjourUserEventsPlugin* plugin, CFNumberRef launchdToken)
+{
+    NetBrowserInfo* browser = (NetBrowserInfo*)CFDictionaryGetValue(plugin->_tokenToBrowserMap, launchdToken);
+    Boolean othersUsingBrowser = false;
+
+    if (!browser)
+    {
+        long long value = 0;
+        CFNumberGetValue(launchdToken, kCFNumberLongLongType, &value);
+        fprintf(stderr, "%s:%s Launchd asked us to remove a token we did not register! ==Token:%lld== \n", sPluginIdentifier, __FUNCTION__, value);
+        return;
+    }
+
+    CFMutableArrayRef onAddEvents = (CFMutableArrayRef)CFDictionaryGetValue(plugin->_onAddEvents, browser);
+    CFMutableArrayRef onRemoveEvents = (CFMutableArrayRef)CFDictionaryGetValue(plugin->_onRemoveEvents, browser);
+
+    if (onAddEvents)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Calling RemoveEventFromArray for OnAddEvents", sPluginIdentifier, __FUNCTION__);
+        RemoveEventFromArray(onAddEvents, launchdToken);
+
+        // Is the array now empty, clean up
+        if (CFArrayGetCount(onAddEvents) == 0)
+        {
+            asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Removing the browser from AddEvents", sPluginIdentifier, __FUNCTION__);
+            CFDictionaryRemoveValue(plugin->_onAddEvents, browser);
+        }
+    }
+
+    if (onRemoveEvents)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Calling RemoveEventFromArray for OnRemoveEvents", sPluginIdentifier, __FUNCTION__);
+        RemoveEventFromArray(onRemoveEvents, launchdToken);
+
+        // Is the array now empty, clean up
+        if (CFArrayGetCount(onRemoveEvents) == 0)
+        {
+            asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Removing the browser from RemoveEvents", sPluginIdentifier, __FUNCTION__);
+            CFDictionaryRemoveValue(plugin->_onRemoveEvents, browser);
+        }
+    }
+
+    // Remove ourselves from the token dictionary.
+    CFDictionaryRemoveValue(plugin->_tokenToBrowserMap, launchdToken);
+
+    // Check to see if anyone else is using this browser.
+    CFIndex i;
+    CFIndex count = CFDictionaryGetCount(plugin->_tokenToBrowserMap);
+    NetBrowserInfo** browsers = malloc(count * sizeof(NetBrowserInfo*));
+
+    // Fetch the values of the token dictionary
+    CFDictionaryGetKeysAndValues(plugin->_tokenToBrowserMap, NULL, (const void**)browsers);
+
+    for (i = 0; i < count; ++i)
+    {
+        if (NetBrowserInfoEqual(browsers[i], browser))
+        {
+            othersUsingBrowser = true;
+            break;
+        }
+    }
+
+    // If no one else is useing our browser, clean up!
+    if (!othersUsingBrowser)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Removing browser %p from _browsers", sPluginIdentifier, __FUNCTION__, browser);
+        CFDictionaryRemoveValue(plugin->_browsers, browser); // This triggers release and dealloc of the browser
+    }
+    else
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Decrementing browsers %p count", sPluginIdentifier, __FUNCTION__, browser);
+        // Decrement my reference count (it was incremented when it was added to _browsers in CreateBrowser)
+        NetBrowserInfoRelease(NULL, browser);
+    }
+
+    free(browsers);
+}
+
+
+/*****************************************************************************
+* CreateBrowser
+* -
+* This method returns a NetBrowserInfo that is looking for a type of
+* service in a domain. If no browser exists, it will create one and return it.
+*****************************************************************************/
+NetBrowserInfo* CreateBrowser(BonjourUserEventsPlugin* plugin, CFStringRef type, CFStringRef domain)
+{
+    CFIndex i;
+    CFIndex count = CFDictionaryGetCount(plugin->_browsers);
+    NetBrowserInfo* browser = NULL;
+    CFDictionaryRef* dicts = malloc(count * sizeof(CFDictionaryRef));
+    NetBrowserInfo** browsers = malloc(count * sizeof(NetBrowserInfo*));
+
+    // Fetch the values of the browser dictionary
+    CFDictionaryGetKeysAndValues(plugin->_browsers, (const void**)browsers, (const void**)dicts);
+
+
+    // Loop thru the browsers list and see if we can find a matching one.
+    for (i = 0; i < count; ++i)
+    {
+        CFDictionaryRef browserDict = dicts[i];
+
+        CFStringRef browserType = CFDictionaryGetValue(browserDict, sServiceTypeKey);
+        CFStringRef browserDomain = CFDictionaryGetValue(browserDict, sServiceDomainKey);
+
+        // If we have a matching browser, break
+        if ((CFStringCompare(browserType, type, kCFCompareCaseInsensitive) == kCFCompareEqualTo) &&
+            (CFStringCompare(browserDomain, domain, kCFCompareCaseInsensitive) == kCFCompareEqualTo))
+        {
+            asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: found a duplicate browser\n", sPluginIdentifier, __FUNCTION__);
+            browser = browsers[i];
+            NetBrowserInfoRetain(NULL, browser);
+            break;
+        }
+    }
+
+    // No match found, lets create one!
+    if (!browser)
+    {
+
+        browser = NetBrowserInfoCreate(type, domain, plugin);
+
+        if (!browser)
+        {
+            fprintf(stderr, "%s:%s failed to search for %s.%s", sPluginIdentifier, __FUNCTION__, CStringFromCFString(type), CStringFromCFString(domain));
+            free(dicts);
+            free(browsers);
+            return NULL;
+        }
+
+        // Service browser created, lets add this to ourselves to the dictionary.
+        CFMutableDictionaryRef browserDict = CFDictionaryCreateMutable(NULL, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+        CFDictionarySetValue(browserDict, sServiceTypeKey, type);
+        CFDictionarySetValue(browserDict, sServiceDomainKey, domain);
+
+        // Add the dictionary to the browsers dictionary.
+        CFDictionarySetValue(plugin->_browsers, browser, browserDict);
+
+        NetBrowserInfoRelease(NULL, browser);
+
+        // Release Memory
+        CFRelease(browserDict);
+    }
+
+    free(dicts);
+    free(browsers);
+
+    return browser;
+}
+
+/*****************************************************************************
+* BrowserForSDRef
+* -
+* This method returns a NetBrowserInfo that matches the calling SDRef passed
+* in via the callback.
+*****************************************************************************/
+NetBrowserInfo* BrowserForSDRef(BonjourUserEventsPlugin* plugin, DNSServiceRef sdRef)
+{
+    CFIndex i;
+    CFIndex count = CFDictionaryGetCount(plugin->_browsers);
+    NetBrowserInfo* browser = NULL;
+    NetBrowserInfo** browsers = malloc(count * sizeof(NetBrowserInfo*));
+
+    // Fetch the values of the browser dictionary
+    CFDictionaryGetKeysAndValues(plugin->_browsers, (const void**)browsers, NULL);
+
+    // Loop thru the browsers list and see if we can find a matching one.
+    for (i = 0; i < count; ++i)
+    {
+        NetBrowserInfo* currentBrowser = browsers[i];
+
+        if (currentBrowser->browserRef == sdRef)
+        {
+            browser = currentBrowser;
+            break;
+        }
+    }
+
+
+    free(browsers);
+
+    return browser;
+}
+
+/*****************************************************************************
+* AddEventDictionary
+* -
+* Adds a event to a browser's event dictionary
+*****************************************************************************/
+
+void AddEventDictionary(CFDictionaryRef eventDict, CFMutableDictionaryRef allEventsDictionary, NetBrowserInfo* key)
+{
+    CFMutableArrayRef eventsForBrowser = (CFMutableArrayRef)CFDictionaryGetValue(allEventsDictionary, key);
+
+    if (!eventsForBrowser) // We have no events for this browser yet, lets add him.
+    {
+        eventsForBrowser = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+        CFDictionarySetValue(allEventsDictionary, key, eventsForBrowser);
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s creating a new array", sPluginIdentifier, __FUNCTION__);
+    }
+    else
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s Incrementing refcount", sPluginIdentifier, __FUNCTION__);
+        CFRetain(eventsForBrowser);
+    }
+
+    CFArrayAppendValue(eventsForBrowser, eventDict);
+    CFRelease(eventsForBrowser);
+}
+
+/*****************************************************************************
+* RemoveEventFromArray
+* -
+* Searches a Array of Event Dictionaries to find one with a matching launchd
+* token and remove it.
+*****************************************************************************/
+
+void RemoveEventFromArray(CFMutableArrayRef array, CFNumberRef launchdToken)
+{
+    CFIndex i;
+    CFIndex count = CFArrayGetCount(array);
+
+    // Loop thru looking for us.
+    for (i = 0; i < count; )
+    {
+        CFDictionaryRef eventDict = CFArrayGetValueAtIndex(array, i);
+        CFNumberRef token = CFDictionaryGetValue(eventDict, sLaunchdTokenKey);
+
+        if (CFEqual(token, launchdToken)) // This is the same event?
+        {
+            asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s found token", sPluginIdentifier, __FUNCTION__);
+            CFArrayRemoveValueAtIndex(array, i);    // Remove the event,
+            break; // The token should only exist once, so it makes no sense to continue.
+        }
+        else
+        {
+            ++i; // If it's not us, advance.
+        }
+    }
+    if (i == count) asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s did not find token", sPluginIdentifier, __FUNCTION__);
+}
+
+#pragma mark -
+#pragma mark Net Service Browser Stuff
+#pragma mark -
+
+/*****************************************************************************
+* ServiceBrowserCallback
+* -
+* This method is the heart of the plugin. It's the runloop callback annoucing
+* the appearence and disappearance of network services.
+*****************************************************************************/
+
+void ServiceBrowserCallback (DNSServiceRef sdRef,
+                             DNSServiceFlags flags,
+                             uint32_t interfaceIndex,
+                             DNSServiceErrorType errorCode,
+                             const char*                serviceName,
+                             const char*                regtype,
+                             const char*                replyDomain,
+                             void*                      context )
+{
+    (void)interfaceIndex;
+    (void)regtype;
+    (void)replyDomain;
+    BonjourUserEventsPlugin* plugin = (BonjourUserEventsPlugin*)context;
+    NetBrowserInfo* browser = BrowserForSDRef(plugin, sdRef);
+
+    if (!browser) // Missing browser?
+    {
+        fprintf(stderr, "%s:%s ServiceBrowserCallback: missing browser\n", sPluginIdentifier, __FUNCTION__);
+        return;
+    }
+
+    if (errorCode != kDNSServiceErr_NoError)
+    {
+        fprintf(stderr, "%s:%s ServiceBrowserCallback: errcode set %d\n", sPluginIdentifier, __FUNCTION__, errorCode);
+        return;
+    }
+
+    CFStringRef cfServiceName = CFStringCreateWithCString(NULL, serviceName, kCFStringEncodingUTF8);
+
+    if (flags & kDNSServiceFlagsAdd)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s calling HandleTemporaryEventsForService Add\n", sPluginIdentifier, __FUNCTION__);
+        HandleTemporaryEventsForService(plugin, browser, cfServiceName, plugin->_onAddEvents);
+    }
+    else
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s calling HandleTemporaryEventsForService Remove\n", sPluginIdentifier, __FUNCTION__);
+        HandleTemporaryEventsForService(plugin, browser, cfServiceName, plugin->_onRemoveEvents);
+    }
+
+    CFRelease(cfServiceName);
+}
+
+/*****************************************************************************
+* HandleTemporaryEventsForService
+* -
+* This method handles the firing of one shot events. Aka. Events that are
+* signaled when a service appears / disappears. They have a temporarly
+* signaled state.
+*****************************************************************************/
+void HandleTemporaryEventsForService(BonjourUserEventsPlugin* plugin, NetBrowserInfo* browser, CFStringRef serviceName, CFMutableDictionaryRef eventsDictionary)
+{
+    CFArrayRef events = (CFArrayRef)CFDictionaryGetValue(eventsDictionary, browser); // Get events for the browser we passed in.
+    CFIndex i;
+    CFIndex count;
+
+    if (!events)  // Somehow we have a orphan browser...
+        return;
+
+    count = CFArrayGetCount(events);
+
+    // Go thru the events and run filters, notifity if they pass.
+    for (i = 0; i < count; ++i)
+    {
+        CFDictionaryRef eventDict = (CFDictionaryRef)CFArrayGetValueAtIndex(events, i);
+        CFStringRef eventServiceName = (CFStringRef)CFDictionaryGetValue(eventDict, sServiceNameKey);
+        CFNumberRef token = (CFNumberRef) CFDictionaryGetValue(eventDict, sLaunchdTokenKey);
+        CFDictionaryRef dict = (CFDictionaryRef) CFDictionaryGetValue(eventDict, sLaunchdDictKey);
+
+        // Currently we only filter on service name, that makes this as simple as...
+        if (!eventServiceName || CFEqual(serviceName, eventServiceName))
+        {
+            uint64_t tokenUint64;
+            // Signal Event: This is edge trigger. When the action has been taken, it will not
+            // be remembered anymore.
+
+            asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s HandleTemporaryEventsForService signal\n", sPluginIdentifier, __FUNCTION__);
+            CFNumberGetValue(token, kCFNumberLongLongType, &tokenUint64);
+
+            xpc_object_t jobRequest = _CFXPCCreateXPCObjectFromCFObject(dict);
+
+            UserEventAgentFireEvent(plugin->_pluginContext, tokenUint64, jobRequest);
+            xpc_release(jobRequest);
+        }
+    }
+}
+
+#pragma mark -
+#pragma mark Convenience
+#pragma mark -
+
+/*****************************************************************************
+* CStringFromCFString
+* -
+* Silly convenence function for dealing with non-critical CFSTR -> cStr
+* conversions.
+*****************************************************************************/
+
+const char* CStringFromCFString(CFStringRef string)
+{
+    const char* defaultString = "??????";
+    const char* cstring;
+
+    if (!string)
+        return defaultString;
+
+    cstring = CFStringGetCStringPtr(string, kCFStringEncodingUTF8);
+
+    return (cstring) ? cstring : defaultString;
+
+}
+
+#pragma mark -
+#pragma mark NetBrowserInfo "Object"
+#pragma mark -
+/*****************************************************************************
+* NetBrowserInfoCreate
+* -
+* The method creates a NetBrowserInfo Object and initalizes it.
+*****************************************************************************/
+NetBrowserInfo* NetBrowserInfoCreate(CFStringRef serviceType, CFStringRef domain, void* context)
+{
+    NetBrowserInfo* outObj = NULL;
+    DNSServiceRef browserRef = NULL;
+    char* cServiceType = NULL;
+    char* cDomain = NULL;
+    Boolean success = true;
+
+    CFIndex serviceSize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(serviceType), kCFStringEncodingUTF8);
+    cServiceType = calloc(serviceSize, 1);
+    success = CFStringGetCString(serviceType, cServiceType, serviceSize, kCFStringEncodingUTF8);
+
+
+    if (domain)
+    {
+        CFIndex domainSize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(domain), kCFStringEncodingUTF8);
+        if (domainSize)
+        {
+            cDomain = calloc(domainSize, 1);
+            success = success && CFStringGetCString(domain, cDomain, domainSize, kCFStringEncodingUTF8);
+        }
+    }
+
+    if (!success)
+    {
+        fprintf(stderr, "%s:%s LaunchEvent has badly encoded service type or domain.\n", sPluginIdentifier, __FUNCTION__);
+        free(cServiceType);
+
+        if (cDomain)
+            free(cDomain);
+
+        return NULL;
+    }
+
+    DNSServiceErrorType err = DNSServiceBrowse(&browserRef, 0, 0, cServiceType, cDomain, ServiceBrowserCallback, context);
+
+    if (err != kDNSServiceErr_NoError)
+    {
+        fprintf(stderr, "%s:%s Failed to create browser for %s, %s\n", sPluginIdentifier, __FUNCTION__, cServiceType, cDomain);
+        free(cServiceType);
+
+        if (cDomain)
+            free(cDomain);
+
+        return NULL;
+    }
+
+    DNSServiceSetDispatchQueue(browserRef, dispatch_get_main_queue());
+
+
+    outObj = malloc(sizeof(NetBrowserInfo));
+
+    outObj->refCount = 1;
+    outObj->browserRef = browserRef;
+
+    asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: created new object %p", sPluginIdentifier, __FUNCTION__, outObj);
+
+    free(cServiceType);
+
+    if (cDomain)
+        free(cDomain);
+
+    return outObj;
+}
+
+/*****************************************************************************
+* NetBrowserInfoRetain
+* -
+* The method retains a NetBrowserInfo object.
+*****************************************************************************/
+const void* NetBrowserInfoRetain(CFAllocatorRef allocator, const void* info)
+{
+    (void)allocator;
+    NetBrowserInfo* obj = (NetBrowserInfo*)info;
+
+    if (!obj)
+        return NULL;
+
+    ++obj->refCount;
+    asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Incremented ref count on %p, count %d", sPluginIdentifier, __FUNCTION__, obj->browserRef, (int)obj->refCount);
+
+    return obj;
+}
+
+/*****************************************************************************
+* NetBrowserInfoRelease
+* -
+* The method releases a NetBrowserInfo object.
+*****************************************************************************/
+void NetBrowserInfoRelease(CFAllocatorRef allocator, const void* info)
+{
+    (void)allocator;
+    NetBrowserInfo* obj = (NetBrowserInfo*)info;
+
+    if (!obj)
+        return;
+
+    if (obj->refCount == 1)
+    {
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: DNSServiceRefDeallocate %p", sPluginIdentifier, __FUNCTION__, obj->browserRef);
+        DNSServiceRefDeallocate(obj->browserRef);
+        free(obj);
+    }
+    else
+    {
+        --obj->refCount;
+        asl_log(NULL, NULL, ASL_LEVEL_INFO, "%s:%s: Decremented ref count on %p, count %d", sPluginIdentifier, __FUNCTION__, obj->browserRef, (int)obj->refCount);
+    }
+
+}
+
+/*****************************************************************************
+* NetBrowserInfoEqual
+* -
+* The method is used to compare two NetBrowserInfo objects for equality.
+*****************************************************************************/
+Boolean NetBrowserInfoEqual(const void *value1, const void *value2)
+{
+    NetBrowserInfo* obj1 = (NetBrowserInfo*)value1;
+    NetBrowserInfo* obj2 = (NetBrowserInfo*)value2;
+
+    if (obj1->browserRef == obj2->browserRef)
+        return true;
+
+    return false;
+}
+
+/*****************************************************************************
+* NetBrowserInfoHash
+* -
+* The method is used to make a hash for the object. We can cheat and use the
+* browser pointer.
+*****************************************************************************/
+CFHashCode  NetBrowserInfoHash(const void *value)
+{
+    return (CFHashCode)((NetBrowserInfo*)value)->browserRef;
+}
+
+
+/*****************************************************************************
+* NetBrowserInfoCopyDescription
+* -
+* Make CF happy.
+*****************************************************************************/
+CFStringRef NetBrowserInfoCopyDescription(const void *value)
+{
+    (void)value;
+    return CFStringCreateWithCString(NULL, "NetBrowserInfo: No useful description", kCFStringEncodingUTF8);
+}
+
diff --git a/mDNSResponder/mDNSMacOSX/CUPolicy.c b/mDNSResponder/mDNSMacOSX/CUPolicy.c
new file mode 100644
index 00000000..434e65cd
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/CUPolicy.c
@@ -0,0 +1,91 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mDNSMacOSX.h"
+#include <network/config.h>
+
+#if TARGET_OS_IPHONE
+
+mDNSexport void CUPInit(mDNS *const m)
+{
+    
+    m->p->handle = cellular_usage_policy_create_client();
+    if (!m->p->handle)
+    {
+        LogMsg("CUPInit: cellular_usage_policy_create_client failed");
+    }
+}
+
+mDNSexport mDNSBool mDNSPlatformAllowPID(mDNS *const m, DNSQuestion *q)
+{
+    // Currently the policy applies only for DNS requests sent over cellular interface
+    if (m->p->handle && q->qDNSServer && q->qDNSServer->cellIntf)
+    {
+        mDNSBool allowed;
+        if (q->pid)
+        {
+            allowed = (mDNSBool) cellular_usage_policy_is_data_allowed_for_pid(m->p->handle, q->pid);
+            if (!allowed)
+            {
+                xpc_object_t pidx = xpc_uint64_create(q->pid);
+                if (pidx)
+                {
+                    network_config_cellular_blocked_notify(pidx, NULL, NULL);
+                    LogInfo("mDNSPlaformAllowPID: Notified PID(%d) for %##s (%s)", q->pid, q->qname.c, DNSTypeName(q->qtype));
+                    xpc_release(pidx);
+                }
+            }
+        }
+        else
+        {
+            allowed = (mDNSBool) cellular_usage_policy_is_data_allowed_for_uuid(m->p->handle, q->uuid);
+            if (!allowed)
+            {
+                xpc_object_t uuidx = xpc_uuid_create(q->uuid);
+                if (uuidx)
+                {
+                    network_config_cellular_blocked_notify(NULL, uuidx, NULL);
+                    LogInfo("mDNSPlaformAllowPID: Notified UUID for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+                    xpc_release(uuidx);
+                }
+            }
+        }
+        return allowed;
+    }
+    else
+    {
+        return mDNStrue;
+    }
+}
+
+#else // TARGET_OS_IPHONE
+
+mDNSexport void CUPInit(mDNS *const m)
+{
+    (void)m; //unused
+}
+
+mDNSexport mDNSBool mDNSPlatformAllowPID(mDNS *const m, DNSQuestion *q)
+{
+    (void)m;    //unused
+    (void)q;    //unused
+    //LogMsg("mDNSPlatformAllowPID: %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+    return mDNStrue;
+}
+
+#endif // TARGET_OS_IPHONE
+
diff --git a/mDNSResponder/mDNSMacOSX/CryptoSupport.c b/mDNSResponder/mDNSMacOSX/CryptoSupport.c
new file mode 100644
index 00000000..408b3a22
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/CryptoSupport.c
@@ -0,0 +1,738 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// CryptoSupport.c
+// Supporting routines for DNSSEC crypto
+// ***************************************************************************
+
+#include "mDNSEmbeddedAPI.h"
+#include <CommonCrypto/CommonDigest.h>  // For Hash algorithms SHA1 etc.
+#include <dispatch/dispatch.h>          // For Base32/Base64 encoding/decoding
+#include <dispatch/private.h>          // dispatch_data_create_with_transform
+#include "CryptoAlg.h"
+#include "CryptoSupport.h"
+#include "dnssec.h"
+#include "DNSSECSupport.h"
+
+#if TARGET_OS_IPHONE
+#include "SecRSAKey.h"                  // For RSA_SHA1 etc. verification
+#else
+#include <Security/Security.h>
+#endif
+
+#if !TARGET_OS_IPHONE
+mDNSlocal SecKeyRef SecKeyCreateRSAPublicKey_OSX(unsigned char *asn1, int length);
+#endif
+
+typedef struct
+{
+    dispatch_data_t encData;
+    dispatch_data_t encMap;
+    dispatch_data_t encNULL;
+}encContext;
+
+mDNSlocal mStatus enc_create(AlgContext *ctx)
+{
+    encContext *ptr;
+
+    switch (ctx->alg)
+    {
+    case ENC_BASE32:
+    case ENC_BASE64:
+        ptr = (encContext *)mDNSPlatformMemAllocate(sizeof(encContext));
+        if (!ptr) return mStatus_NoMemoryErr;
+        break;
+    default:
+        LogMsg("enc_create: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    ptr->encData = NULL;
+    ptr->encMap = NULL;
+    // The encoded data is not NULL terminated. So, we concatenate a null byte later when we encode and map
+    // the real data.
+    ptr->encNULL = dispatch_data_create("", 1, dispatch_get_global_queue(0, 0), ^{});
+    if (!ptr->encNULL)
+    {
+        mDNSPlatformMemFree(ptr);
+        return mStatus_NoMemoryErr;
+    }
+    ctx->context = ptr;
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus enc_destroy(AlgContext *ctx)
+{
+    encContext *ptr = (encContext *)ctx->context;
+    if (ptr->encData) dispatch_release(ptr->encData);
+    if (ptr->encMap) dispatch_release(ptr->encMap);
+    if (ptr->encNULL) dispatch_release(ptr->encNULL);
+    mDNSPlatformMemFree(ptr);
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus enc_add(AlgContext *ctx, const void *data, mDNSu32 len)
+{
+    switch (ctx->alg)
+    {
+    case ENC_BASE32:
+    case ENC_BASE64:
+    {
+        encContext *ptr = (encContext *)ctx->context;
+        dispatch_data_t src_data = dispatch_data_create(data, len, dispatch_get_global_queue(0, 0), ^{});
+        if (!src_data)
+        {
+            LogMsg("enc_add: dispatch_data_create src failed");
+            return mStatus_BadParamErr;
+        }
+        dispatch_data_t dest_data = dispatch_data_create_with_transform(src_data, DISPATCH_DATA_FORMAT_TYPE_NONE,
+                                                                        (ctx->alg == ENC_BASE32 ? DISPATCH_DATA_FORMAT_TYPE_BASE32HEX : DISPATCH_DATA_FORMAT_TYPE_BASE64));
+        dispatch_release(src_data);
+        if (!dest_data)
+        {
+            LogMsg("enc_add: dispatch_data_create dst failed");
+            return mStatus_BadParamErr;
+        }
+        ptr->encData = dest_data;
+
+        return mStatus_NoError;
+    }
+    default:
+        LogMsg("enc_add: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+}
+
+mDNSlocal mDNSu8* enc_encode(AlgContext *ctx)
+{
+    const void *result = NULL;
+
+    switch (ctx->alg)
+    {
+    case ENC_BASE32:
+    case ENC_BASE64:
+    {
+        encContext *ptr = (encContext *)ctx->context;
+        size_t size;
+        dispatch_data_t dest_data = ptr->encData;
+        dispatch_data_t data = dispatch_data_create_concat(dest_data, ptr->encNULL);
+
+        if (!data)
+        {
+            LogMsg("enc_encode: cannot concatenate");
+            return NULL;
+        }
+
+        dispatch_data_t map = dispatch_data_create_map(data, &result, &size);
+        if (!map)
+        {
+            LogMsg("enc_encode: cannot create map %d", ctx->alg);
+            return NULL;
+        }
+        dispatch_release(dest_data);
+        ptr->encData = data;
+        ptr->encMap = map;
+
+        return (mDNSu8 *)result;
+    }
+    default:
+        LogMsg("enc_encode: Unsupported algorithm %d", ctx->alg);
+        return mDNSNULL;
+    }
+}
+
+mDNSlocal mStatus sha_create(AlgContext *ctx)
+{
+    mDNSu8 *ptr;
+    switch (ctx->alg)
+    {
+    case SHA1_DIGEST_TYPE:
+        ptr = mDNSPlatformMemAllocate(sizeof(CC_SHA1_CTX));
+        if (!ptr) return mStatus_NoMemoryErr;
+        CC_SHA1_Init((CC_SHA1_CTX *)ptr);
+        break;
+    case SHA256_DIGEST_TYPE:
+        ptr = mDNSPlatformMemAllocate(sizeof(CC_SHA256_CTX));
+        if (!ptr) return mStatus_NoMemoryErr;
+        CC_SHA256_Init((CC_SHA256_CTX *)ptr);
+        break;
+    default:
+        LogMsg("sha_create: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    ctx->context = ptr;
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus sha_destroy(AlgContext *ctx)
+{
+    mDNSPlatformMemFree(ctx->context);
+    return mStatus_NoError;
+}
+
+mDNSlocal mDNSu32 sha_len(AlgContext *ctx)
+{
+    switch (ctx->alg)
+    {
+    case SHA1_DIGEST_TYPE:
+        return CC_SHA1_DIGEST_LENGTH;
+    case SHA256_DIGEST_TYPE:
+        return CC_SHA256_DIGEST_LENGTH;
+    default:
+        LogMsg("sha_len: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+}
+
+mDNSlocal mStatus sha_add(AlgContext *ctx, const void *data, mDNSu32 len)
+{
+    switch (ctx->alg)
+    {
+    case SHA1_DIGEST_TYPE:
+        CC_SHA1_Update((CC_SHA1_CTX *)ctx->context, data, len);
+        break;
+    case SHA256_DIGEST_TYPE:
+        CC_SHA256_Update((CC_SHA256_CTX *)ctx->context, data, len);
+        break;
+    default:
+        LogMsg("sha_add: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus sha_verify(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *digestIn, mDNSu32 dlen)
+{
+    mDNSu8 digest[CC_SHA512_DIGEST_LENGTH];
+    mDNSu32 digestLen;
+
+    (void) key;   //unused
+    (void)keylen; //unused
+    switch (ctx->alg)
+    {
+    case SHA1_DIGEST_TYPE:
+        digestLen = CC_SHA1_DIGEST_LENGTH;
+        CC_SHA1_Final(digest, (CC_SHA1_CTX *)ctx->context);
+        break;
+    case SHA256_DIGEST_TYPE:
+        digestLen = CC_SHA256_DIGEST_LENGTH;
+        CC_SHA256_Final(digest, (CC_SHA256_CTX *)ctx->context);
+        break;
+    default:
+        LogMsg("sha_verify: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    if (dlen != digestLen)
+    {
+        LogMsg("sha_verify(Alg %d): digest len mismatch len %u, expected %u", ctx->alg, (unsigned int)dlen, (unsigned int)digestLen);
+        return mStatus_BadParamErr;
+    }
+    if (!memcmp(digest, digestIn, digestLen))
+        return mStatus_NoError;
+    else
+        return mStatus_NoAuth;
+}
+
+mDNSlocal mStatus sha_final(AlgContext *ctx, void *digestOut, mDNSu32 dlen)
+{
+    mDNSu8 digest[CC_SHA512_DIGEST_LENGTH];
+    mDNSu32 digestLen;
+
+    switch (ctx->alg)
+    {
+    case SHA1_DIGEST_TYPE:
+        digestLen = CC_SHA1_DIGEST_LENGTH;
+        CC_SHA1_Final(digest, (CC_SHA1_CTX *)ctx->context);
+        break;
+    case SHA256_DIGEST_TYPE:
+        digestLen = CC_SHA256_DIGEST_LENGTH;
+        CC_SHA256_Final(digest, (CC_SHA256_CTX *)ctx->context);
+        break;
+    default:
+        LogMsg("sha_final: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    if (dlen != digestLen)
+    {
+        LogMsg("sha_final(Alg %d): digest len mismatch len %u, expected %u", ctx->alg, (unsigned int)dlen, (unsigned int)digestLen);
+        return mStatus_BadParamErr;
+    }
+    memcpy(digestOut, digest, digestLen);
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus rsa_sha_create(AlgContext *ctx)
+{
+    mDNSu8 *ptr;
+    switch (ctx->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        ptr = mDNSPlatformMemAllocate(sizeof(CC_SHA1_CTX));
+        if (!ptr) return mStatus_NoMemoryErr;
+        CC_SHA1_Init((CC_SHA1_CTX *)ptr);
+        break;
+    case CRYPTO_RSA_SHA256:
+        ptr = mDNSPlatformMemAllocate(sizeof(CC_SHA256_CTX));
+        if (!ptr) return mStatus_NoMemoryErr;
+        CC_SHA256_Init((CC_SHA256_CTX *)ptr);
+        break;
+    case CRYPTO_RSA_SHA512:
+        ptr = mDNSPlatformMemAllocate(sizeof(CC_SHA512_CTX));
+        if (!ptr) return mStatus_NoMemoryErr;
+        CC_SHA512_Init((CC_SHA512_CTX *)ptr);
+        break;
+    default:
+        LogMsg("rsa_sha_create: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    ctx->context = ptr;
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus rsa_sha_destroy(AlgContext *ctx)
+{
+    mDNSPlatformMemFree(ctx->context);
+    return mStatus_NoError;
+}
+
+mDNSlocal mDNSu32 rsa_sha_len(AlgContext *ctx)
+{
+    switch (ctx->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        return CC_SHA1_DIGEST_LENGTH;
+    case CRYPTO_RSA_SHA256:
+        return CC_SHA256_DIGEST_LENGTH;
+    case CRYPTO_RSA_SHA512:
+        return CC_SHA512_DIGEST_LENGTH;
+    default:
+        LogMsg("rsa_sha_len: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+}
+
+mDNSlocal mStatus rsa_sha_add(AlgContext *ctx, const void *data, mDNSu32 len)
+{
+    switch (ctx->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        CC_SHA1_Update((CC_SHA1_CTX *)ctx->context, data, len);
+        break;
+    case CRYPTO_RSA_SHA256:
+        CC_SHA256_Update((CC_SHA256_CTX *)ctx->context, data, len);
+        break;
+    case CRYPTO_RSA_SHA512:
+        CC_SHA512_Update((CC_SHA512_CTX *)ctx->context, data, len);
+        break;
+    default:
+        LogMsg("rsa_sha_add: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    return mStatus_NoError;
+}
+
+mDNSlocal SecKeyRef rfc3110_import(const mDNSu8 *data, const mDNSu32 len)
+{
+    static const int max_key_bytes = 4096 / 8;                // max DNSSEC supported modulus is 4096 bits
+    static const int max_exp_bytes = 3;                       // DNSSEC supports 1 or 3 bytes for exponent
+    static const int asn1_cmd_bytes = 3;                      // since there is an ASN1 SEQ and two INTs
+    //static const int asn1_max_len_bytes = asn1_cmd_bytes * 3; // capped at 3 due to max payload size
+    static const int asn1_max_len_bytes = 3 * 3; // capped at 3 due to max payload size
+    unsigned char asn1[max_key_bytes + 1 + max_exp_bytes + asn1_cmd_bytes + asn1_max_len_bytes]; // +1 is for leading 0 for non negative asn1 number
+    const mDNSu8 *modulus;
+    unsigned int modulus_length;
+    unsigned int exp_length;
+    mDNSu32 index = 0;
+    mDNSu32 asn1_length = 0;
+    unsigned int i;
+
+    // Validate Input
+    if (!data)
+        return NULL;
+
+    // we have to have at least 1 byte for the length
+    if (len < 1)
+        return NULL;
+
+    // Parse Modulus and Exponent
+    exp_length = data[0];
+
+    // we have to have at least len byte + size of exponent
+    if (len < 1+exp_length)
+        return NULL;
+
+    // -1 is for the exp_length byte
+    modulus_length = len - 1 - exp_length;
+
+    // rfc3110 limits modulus to 4096 bits
+    if (modulus_length > 512)
+        return NULL;
+
+    if (modulus_length < 1)
+        return NULL;
+
+    // add 1 to modulus length for pre-ceding 0 t make ASN1 value non-negative
+    ++modulus_length;
+
+    // 1 is to skip exp_length byte
+    modulus = &data[1+exp_length];
+
+    // 2 bytes for commands since first doesn't count
+    // 2 bytes for min 1 byte length field
+    asn1_length = modulus_length + exp_length + 2 + 2;
+
+    // account for modulus length causing INT length field to grow
+    if (modulus_length > 0xFF)
+        asn1_length += 2;
+    else if (modulus_length >= 128)
+        ++asn1_length;
+
+    // Construct ASN1 formatted public key
+    // Write ASN1 SEQ byte
+    asn1[index++] = 0x30;
+
+    // Write ASN1 length for SEQ
+    if (asn1_length < 128)
+    {
+        asn1[index++] = asn1_length & 0xFF;
+    }
+    else
+    {
+        asn1[index++] = (0x80 | ((asn1_length & 0xFF00) ? 2 : 1));
+        if (asn1_length & 0xFF00)
+            asn1[index++] = (asn1_length & 0xFF00) >> 8;
+        asn1[index++] = asn1_length & 0xFF;
+    }
+
+    // Write ASN1 INT for modulus
+    asn1[index++] = 0x02;
+    // Write ASN1 length for INT
+    if (modulus_length < 128)
+    {
+        asn1[index++] = asn1_length & 0xFF;
+    }
+    else
+    {
+        asn1[index++] = 0x80 | ((modulus_length & 0xFF00) ? 2 : 1);
+        if (modulus_length & 0xFF00)
+            asn1[index++] = (modulus_length & 0xFF00) >> 8;
+        asn1[index++] = modulus_length & 0xFF;
+    }
+
+    // Write preceding 0 so our integer isn't negative
+    asn1[index++] = 0x00;
+    // Write actual modulus (-1 for preceding 0)
+    memcpy(&asn1[index], (void *)modulus, modulus_length-1);
+    index += modulus_length-1;
+
+    // Write ASN1 INT for exponent
+    asn1[index++] = 0x02;
+    // Write ASN1 length for INT
+    asn1[index++] = exp_length & 0xFF;
+    // Write exponent bytes
+    for (i = 1; i <= exp_length; i++)
+        asn1[index++] = data[i];
+
+#if TARGET_OS_IPHONE
+    // index contains bytes written, use it for length
+    return (SecKeyCreateRSAPublicKey(NULL, asn1, index, kSecKeyEncodingPkcs1));
+#else
+    return (SecKeyCreateRSAPublicKey_OSX(asn1, index));
+#endif
+}
+
+#if TARGET_OS_IPHONE
+mDNSlocal mStatus rsa_sha_verify(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *signature, mDNSu32 siglen)
+{
+    SecKeyRef keyref;
+    OSStatus result;
+    mDNSu8 digest[CC_SHA512_DIGEST_LENGTH];
+    int digestlen;
+    int cryptoAlg;
+
+    switch (ctx->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        cryptoAlg = kSecPaddingPKCS1SHA1;
+        digestlen = CC_SHA1_DIGEST_LENGTH;
+        CC_SHA1_Final(digest, (CC_SHA1_CTX *)ctx->context);
+        break;
+    case CRYPTO_RSA_SHA256:
+        cryptoAlg = kSecPaddingPKCS1SHA256;
+        digestlen = CC_SHA256_DIGEST_LENGTH;
+        CC_SHA256_Final(digest, (CC_SHA256_CTX *)ctx->context);
+        break;
+    case CRYPTO_RSA_SHA512:
+        cryptoAlg = kSecPaddingPKCS1SHA512;
+        digestlen = CC_SHA512_DIGEST_LENGTH;
+        CC_SHA512_Final(digest, (CC_SHA512_CTX *)ctx->context);
+        break;
+    default:
+        LogMsg("rsa_sha_verify: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+
+    keyref = rfc3110_import(key, keylen);
+    if (!keyref)
+    {
+        LogMsg("rsa_sha_verify: Error decoding rfc3110 key data");
+        return mStatus_NoMemoryErr;
+    }
+    result = SecKeyRawVerify(keyref, cryptoAlg, digest, digestlen, signature, siglen);
+    CFRelease(keyref);
+    if (result != noErr)
+    {
+        LogMsg("rsa_sha_verify: Failed for alg %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    else
+    {
+        LogInfo("rsa_sha_verify: Passed for alg %d", ctx->alg);
+        return mStatus_NoError;
+    }
+}
+#else // TARGET_OS_IPHONE
+
+mDNSlocal SecKeyRef SecKeyCreateRSAPublicKey_OSX(unsigned char *asn1, int length)
+{
+    SecKeyRef result = NULL;
+    
+    SecExternalFormat extFormat = kSecFormatBSAFE;
+    SecExternalItemType itemType = kSecItemTypePublicKey;
+    CFArrayRef outArray = NULL;
+
+    CFDataRef keyData = CFDataCreate(NULL, asn1, length);
+    if (!keyData)
+        return NULL;
+
+    OSStatus err =  SecItemImport(keyData, NULL, &extFormat, &itemType, 0, NULL, NULL, &outArray);
+    
+    CFRelease(keyData);
+    if (noErr != err || outArray == NULL)
+    {
+        if (outArray)
+            CFRelease(outArray);
+        return NULL;
+    }
+    
+    result = (SecKeyRef)CFArrayGetValueAtIndex(outArray, 0);
+    if (result == NULL)
+    {
+        CFRelease(outArray);
+        return NULL;
+    }
+    
+    CFRetain(result);
+    CFRelease(outArray);
+    return result;
+}
+
+mDNSlocal Boolean VerifyData(SecKeyRef key, CFStringRef digestStr, mDNSu8 *digest, int dlen, int digestlenAttr, mDNSu8 *sig, int siglen, CFStringRef digest_type)
+{
+    CFErrorRef error;
+    Boolean ret;
+    
+    CFDataRef signature = CFDataCreate(NULL, sig, siglen);
+    if (!signature)
+        return false;
+    
+    SecTransformRef verifyXForm = SecVerifyTransformCreate(key, signature, &error);
+    CFRelease(signature);
+    if (verifyXForm == NULL)
+    {
+        return false;
+    }
+    
+    // tell the transform what type of data it is geting
+    if (!SecTransformSetAttribute(verifyXForm, kSecInputIsAttributeName, digest_type, &error))
+    {
+        LogMsg("VerifyData: SecTransformSetAttribute digest_type");
+        goto err;
+    }
+    
+    if (!SecTransformSetAttribute(verifyXForm, kSecDigestTypeAttribute, digestStr, &error))
+    {
+        LogMsg("VerifyData: SecTransformSetAttribute digestStr");
+        goto err;
+    }
+    
+    CFNumberRef digestLengthRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberCFIndexType, &digestlenAttr);
+    if (digestLengthRef == NULL)
+    {
+        LogMsg("VerifyData: CFNumberCreate failed");
+        goto err;
+    }
+    
+    ret = SecTransformSetAttribute(verifyXForm, kSecDigestLengthAttribute, digestLengthRef, &error);
+    CFRelease(digestLengthRef);
+    if (!ret)
+    {
+        LogMsg("VerifyData: SecTransformSetAttribute digestLengthRef");
+        goto err;
+    }
+    
+    CFDataRef dataToSign = CFDataCreate(NULL, digest, dlen);
+    if (dataToSign ==  NULL)
+    {
+        LogMsg("VerifyData: CFDataCreate failed");
+        goto err;
+    }
+
+    ret = SecTransformSetAttribute(verifyXForm, kSecTransformInputAttributeName, dataToSign, &error);
+    CFRelease(dataToSign);
+    if (!ret)
+    {
+        LogMsg("VerifyData: SecTransformSetAttribute TransformAttributeName");
+        goto err;
+    }
+    
+    CFBooleanRef boolRef = SecTransformExecute(verifyXForm, &error);
+    CFRelease(verifyXForm);
+
+    if (error != NULL)
+    {
+        CFStringRef errStr = CFErrorCopyDescription(error);
+        char errorbuf[128];
+        errorbuf[0] = 0;
+        if (errStr != NULL)
+        {
+            if (!CFStringGetCString(errStr, errorbuf, sizeof(errorbuf), kCFStringEncodingUTF8))
+            {
+                LogMsg("VerifyData: CFStringGetCString failed");
+            }
+        }
+        LogMsg("VerifyData: SecTransformExecute failed with %s", errorbuf);
+        return false;
+    }
+    return CFEqual(boolRef, kCFBooleanTrue);    
+err:
+    CFRelease(verifyXForm);
+    return false;
+}
+
+mDNSlocal mStatus rsa_sha_verify(AlgContext *ctx, mDNSu8 *key, mDNSu32 keylen, mDNSu8 *signature, mDNSu32 siglen)
+{
+    SecKeyRef keyref;
+    mDNSu8 digest[CC_SHA512_DIGEST_LENGTH];
+    int digestlen;
+    int digestlenAttr;
+    CFStringRef digestStr;
+    mDNSBool ret;
+
+    switch (ctx->alg)
+    {
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        digestStr = kSecDigestSHA1;
+        digestlen = CC_SHA1_DIGEST_LENGTH;
+        digestlenAttr = 0;
+        CC_SHA1_Final(digest, (CC_SHA1_CTX *)ctx->context);
+        break;
+    case CRYPTO_RSA_SHA256:
+        digestStr = kSecDigestSHA2;
+        digestlen = CC_SHA256_DIGEST_LENGTH;
+        digestlenAttr = 256;
+        CC_SHA256_Final(digest, (CC_SHA256_CTX *)ctx->context);
+        break;
+    case CRYPTO_RSA_SHA512:
+        digestStr = kSecDigestSHA2;
+        digestlen = CC_SHA512_DIGEST_LENGTH;
+        digestlenAttr = 512;
+        CC_SHA512_Final(digest, (CC_SHA512_CTX *)ctx->context);
+        break;
+    default:
+        LogMsg("rsa_sha_verify: Unsupported algorithm %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+
+    keyref = rfc3110_import(key, keylen);
+    if (!keyref)
+    {
+        LogMsg("rsa_sha_verify: Error decoding rfc3110 key data");
+        return mStatus_NoMemoryErr;
+    }
+    ret = VerifyData(keyref, digestStr, digest, digestlen, digestlenAttr, signature, siglen, kSecInputIsDigest);
+    CFRelease(keyref);
+    if (!ret)
+    {
+        LogMsg("rsa_sha_verify: Failed for alg %d", ctx->alg);
+        return mStatus_BadParamErr;
+    }
+    else
+    {
+        LogInfo("rsa_sha_verify: Passed for alg %d", ctx->alg);
+        return mStatus_NoError;
+    }
+}
+#endif // TARGET_OS_IPHONE
+
+AlgFuncs sha_funcs = {sha_create, sha_destroy, sha_len, sha_add, sha_verify, mDNSNULL, sha_final};
+AlgFuncs rsa_sha_funcs = {rsa_sha_create, rsa_sha_destroy, rsa_sha_len, rsa_sha_add, rsa_sha_verify, mDNSNULL, mDNSNULL};
+AlgFuncs enc_funcs = {enc_create, enc_destroy, mDNSNULL, enc_add, mDNSNULL, enc_encode, mDNSNULL};
+
+#ifndef DNSSEC_DISABLED
+
+mDNSexport mStatus DNSSECCryptoInit(mDNS *const m)
+{
+    mStatus result;
+
+    result = DigestAlgInit(SHA1_DIGEST_TYPE, &sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = DigestAlgInit(SHA256_DIGEST_TYPE, &sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = CryptoAlgInit(CRYPTO_RSA_SHA1, &rsa_sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = CryptoAlgInit(CRYPTO_RSA_NSEC3_SHA1, &rsa_sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = CryptoAlgInit(CRYPTO_RSA_SHA256, &rsa_sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = CryptoAlgInit(CRYPTO_RSA_SHA512, &rsa_sha_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = EncAlgInit(ENC_BASE32, &enc_funcs);
+    if (result != mStatus_NoError)
+        return result;
+    result = EncAlgInit(ENC_BASE64, &enc_funcs);
+    if (result != mStatus_NoError)
+        return result;
+
+    result = DNSSECPlatformInit(m);
+
+    return result;
+}
+
+#else // !DNSSEC_DISABLED
+
+mDNSexport mStatus DNSSECCryptoInit(mDNS *const m)
+{
+    (void) m;
+    
+    return mStatus_NoError;
+}
+
+#endif // !DNSSEC_DISABLED
+
+
diff --git a/mDNSResponder/mDNSMacOSX/CryptoSupport.h b/mDNSResponder/mDNSMacOSX/CryptoSupport.h
new file mode 100644
index 00000000..9c0fd079
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/CryptoSupport.h
@@ -0,0 +1,22 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __CRYPTO_SUPPORT_H
+#define __CRYPTO_SUPPORT_H
+
+extern mStatus DNSSECCryptoInit(mDNS *const m);
+
+#endif // __CRYPTO_SUPPORT_H
diff --git a/mDNSResponder/mDNSMacOSX/DNSProxySupport.c b/mDNSResponder/mDNSMacOSX/DNSProxySupport.c
new file mode 100644
index 00000000..042bbc80
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSProxySupport.c
@@ -0,0 +1,543 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "mDNSEmbeddedAPI.h"
+#include "mDNSMacOSX.h"
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/event.h>
+
+#define ValidSocket(s) ((s) >= 0)
+
+// Global to store the 4 DNS Proxy Listeners (UDPv4/6, TCPv4/6)
+static int dp_listener[4];
+
+#define NUM_PROXY_TCP_CONNS 100
+
+typedef struct
+{
+    TCPSocket   sock;
+    DNSMessage  *reply;
+    mDNSu16     replyLen;
+    mDNSu32     nread;
+} ProxyTCPInfo_t;
+
+// returns -1 for failures including the other end closing the socket
+// returns 0 if successful in reading data, but still not read the data fully
+// returns 1 if successful in reading all the data
+mDNSlocal int ProxyTCPRead(ProxyTCPInfo_t *tcpInfo)
+{
+    long n;
+    mDNSBool closed; 
+
+    if (tcpInfo->nread < 2)         // First read the two-byte length preceeding the DNS message
+    {
+        mDNSu8 *lenptr = (mDNSu8 *)&tcpInfo->replyLen;
+        n = mDNSPlatformReadTCP(&tcpInfo->sock, lenptr + tcpInfo->nread, 2 - tcpInfo->nread, &closed);
+        if (n < 0 || closed)
+        {
+            LogMsg("ProxyTCPRead: attempt to read message length failed");
+            return -1;
+        }
+
+        tcpInfo->nread += n;
+        if (tcpInfo->nread < 2)
+        {
+            LogMsg("ProxyTCPRead: nread %d, n %d", tcpInfo->nread, n);
+            return 0;
+        }
+
+        tcpInfo->replyLen = (mDNSu16)((mDNSu16)lenptr[0] << 8 | lenptr[1]);
+        if (tcpInfo->replyLen < sizeof(DNSMessageHeader))
+        {
+            LogMsg("ProxyTCPRead: Message length too short (%d bytes)", tcpInfo->replyLen);
+            return -1;
+        }
+
+        tcpInfo->reply = mallocL("ProxyTCPInfo", tcpInfo->replyLen);
+        if (!tcpInfo->reply)
+        {
+            LogMsg("ProxyTCPRead: Memory failure");
+            return -1;
+        }
+    }
+
+    n = mDNSPlatformReadTCP(&tcpInfo->sock, ((char *)tcpInfo->reply) + (tcpInfo->nread - 2), tcpInfo->replyLen - (tcpInfo->nread - 2), &closed);
+
+    if (n < 0 || closed)
+    {
+        LogMsg("ProxyTCPRead: read failure n %d, closed %d", n, closed);
+        return -1;
+    }
+    tcpInfo->nread += n;
+    if ((tcpInfo->nread - 2) != tcpInfo->replyLen)
+        return 0;
+    else 
+        return 1;
+}
+
+mDNSlocal void ProxyTCPSocketCallBack(int s1, short filter, void *context)
+{
+    int ret;
+    struct sockaddr_storage from;
+    struct sockaddr_storage to;
+    mDNSAddr senderAddr, destAddr;
+    mDNSIPPort senderPort;
+    ProxyTCPInfo_t *ti = (ProxyTCPInfo_t *)context;
+    TCPSocket *sock = &ti->sock;
+    KQSocketSet *kq = &sock->ss;
+
+    (void) filter;
+
+    ret = ProxyTCPRead(ti);
+    if (ret == -1)
+    {
+        mDNSPlatformDisposeProxyContext(ti);
+        return; 
+    }
+    else if (!ret)
+    {
+        debugf("ProxyTCPReceive: Not yet read completely Actual length %d, Read length %d", ti->replyLen, ti->nread);
+        return;
+    }
+    // We read all the data and hence not interested in read events anymore
+    KQueueSet(s1, EV_DELETE, EVFILT_READ, sock->kqEntry);
+
+    mDNSPlatformMemZero(&to, sizeof(to));
+    mDNSPlatformMemZero(&from, sizeof(from));
+    socklen_t len = sizeof(to);
+    ret = getsockname(s1, (struct sockaddr*) &to, &len);
+    if (ret < 0)
+    {
+        LogMsg("ProxyTCPReceive: getsockname(fd=%d) errno %d", s1, errno);
+        mDNSPlatformDisposeProxyContext(ti);
+        return;
+    }
+    ret = getpeername(s1, (struct sockaddr*) &from, &len);
+    if (ret < 0)
+    {
+        LogMsg("ProxyTCPReceive: getpeername(fd=%d) errno %d", s1, errno);
+        mDNSPlatformDisposeProxyContext(ti);
+        return;
+    }
+
+    if (from.ss_family == AF_INET)
+    {
+        struct sockaddr_in *s = (struct sockaddr_in*)&from;
+
+        senderAddr.type = mDNSAddrType_IPv4;
+        senderAddr.ip.v4.NotAnInteger = s->sin_addr.s_addr;
+        senderPort.NotAnInteger = s->sin_port;
+
+        s = (struct sockaddr_in *)&to;
+        destAddr.type = mDNSAddrType_IPv4;
+        destAddr.ip.v4.NotAnInteger = s->sin_addr.s_addr;
+
+        LogInfo("ProxyTCPReceive received IPv4 packet(len %d) from %#-15a to %#-15a on skt %d %s", ti->replyLen, &senderAddr, &destAddr, s1, NULL);
+    }
+    else if (from.ss_family == AF_INET6)
+    {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&from;
+        senderAddr.type = mDNSAddrType_IPv6;
+        senderAddr.ip.v6 = *(mDNSv6Addr*)&sin6->sin6_addr;
+        senderPort.NotAnInteger = sin6->sin6_port;
+
+        sin6 = (struct sockaddr_in6 *)&to;
+        destAddr.type = mDNSAddrType_IPv6;
+        destAddr.ip.v6 = *(mDNSv6Addr*)&sin6->sin6_addr;
+
+        LogInfo("ProxyTCPReceive received IPv6 packet(len %d) from %#-15a to %#-15a on skt %d %s", ti->replyLen, &senderAddr, &destAddr, s1, NULL);
+    }
+    else
+    {
+        LogMsg("ProxyTCPReceive from is unknown address family %d", from.ss_family);
+        mDNSPlatformDisposeProxyContext(ti);
+        return;
+    }
+
+    // We pass sock for the TCPSocket and the "ti" for context as that's what we want to free at the end.
+    // In the UDP case, there is just a single socket and nothing to free. Hence, the context (last argument)
+    // would be NULL.
+    kq->m->p->TCPProxyCallback(kq->m, sock, ti->reply, (mDNSu8 *)ti->reply + ti->replyLen, &senderAddr, senderPort, &destAddr,
+        UnicastDNSPort, 0, ti);
+}
+
+mDNSlocal void ProxyTCPAccept(int s1, short filter, void *context)
+{
+    int newfd;
+    struct sockaddr_storage ss;
+    socklen_t sslen = sizeof(ss);
+    const int on = 1;
+    KQSocketSet *listenSet = (KQSocketSet *)context;
+
+    (void) filter;
+
+    while ((newfd = accept(s1, (struct sockaddr *)&ss, &sslen)) != -1)
+    {
+        int err;
+        int *s;
+        KQueueEntry *k;
+        KQSocketSet *kq;
+
+        // Even though we just need a single KQueueEntry, for simplicity we re-use
+        // the KQSocketSet
+        ProxyTCPInfo_t *ti = mallocL("ProxyTCPContext", sizeof(ProxyTCPInfo_t));
+        if (!ti)
+        {
+            LogMsg("ProxyTCPAccept: cannot allocate TCPSocket");
+            close(newfd);
+            return;
+        }
+        mDNSPlatformMemZero(ti, sizeof(ProxyTCPInfo_t));
+        TCPSocket *sock = &ti->sock;
+
+        kq = &sock->ss;
+        kq->sktv4 = -1;
+        kq->sktv6 = -1;
+        kq->m = listenSet->m;
+
+        fcntl(newfd, F_SETFL, fcntl(newfd, F_GETFL, 0) | O_NONBLOCK); // set non-blocking
+        if (ss.ss_family == AF_INET)
+        {
+            s =  &kq->sktv4;
+            k =  &kq->kqsv4;
+            // Receive interface identifiers
+            err = setsockopt(newfd, IPPROTO_IP, IP_RECVIF, &on, sizeof(on));
+            if (err)
+            {
+                LogMsg("ProxyTCPAccept: IP_RECVIF %d errno %d (%s)", newfd, errno, strerror(errno));
+                mDNSPlatformDisposeProxyContext(ti);
+                return;
+            }
+        }
+        else
+        {
+            s =  &kq->sktv6;
+            k =  &kq->kqsv6;
+            // We want to receive destination addresses and receive interface identifiers
+            err = setsockopt(newfd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
+            if (err)
+            {
+                LogMsg("ProxyTCPAccept: IP_RECVPKTINFO %d errno %d (%s)", newfd, errno, strerror(errno));
+                mDNSPlatformDisposeProxyContext(ti);
+                return;
+            }
+        }
+        *s = newfd;
+        // mDNSPlatformReadTCP/WriteTCP (unlike the UDP counterpart) does not provide the destination address
+        // from which we can infer the destination address family. Hence we need to remember that here.
+        // Instead of remembering the address family, we remember the right fd.
+        sock->fd = newfd;
+        sock->kqEntry = k;
+
+        k->KQcallback = ProxyTCPSocketCallBack;
+        k->KQcontext  = ti;
+        k->KQtask     = "TCP Proxy packet reception";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+        k->readSource = mDNSNULL;
+        k->writeSource = mDNSNULL;
+        k->fdClosed = mDNSfalse;
+#endif
+        KQueueSet(*s, EV_ADD, EVFILT_READ, k);
+    }
+}
+
+mDNSlocal mStatus SetupUDPProxySocket(mDNS *const m, int skt, KQSocketSet *cp, u_short sa_family, mDNSBool useBackgroundTrafficClass)
+{
+    int         *s        = (sa_family == AF_INET) ? &cp->sktv4 : &cp->sktv6;
+    KQueueEntry *k        = (sa_family == AF_INET) ? &cp->kqsv4 : &cp->kqsv6;
+    const int on = 1;
+    mDNSIPPort port;
+    mStatus err = mStatus_NoError;
+
+    cp->m = m;
+    port = cp->port;
+    cp->closeFlag = mDNSNULL;
+
+    // set default traffic class
+    // setTrafficClass(skt, mDNSfalse);
+    (void) useBackgroundTrafficClass;
+
+    if (sa_family == AF_INET)
+    {
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
+        if (err < 0)
+        {
+            LogMsg("SetupUDPProxySocket: IP_RECVDSTADDR %d errno %d (%s)", skt, errno, strerror(errno));
+            return err;
+        }
+
+        // We want to receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVIF, &on, sizeof(on));
+        if (err < 0)
+        {
+            LogMsg("SetupUDPProxySocket: IP_RECVIF %d errno %d (%s)", skt, errno, strerror(errno));
+            return err;
+        }
+    }
+    else if (sa_family == AF_INET6)
+    {
+        // We want to receive destination addresses and receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
+        if (err < 0)
+        {
+            LogMsg("SetupUDPProxySocket: IPV6_RECVPKTINFO %d errno %d (%s)", skt, errno, strerror(errno));
+            return err;
+        }
+
+        // We want to receive packet hop count value so we can check it
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on));
+        if (err < 0)
+        {
+            LogMsg("SetupUDPProxySocket: IPV6_RECVHOPLIMIT %d errno %d (%s)", skt, errno, strerror(errno));
+            return err;
+        }
+    }
+    else
+    {
+        LogMsg("SetupUDPProxySocket: wrong family %d", sa_family);
+        return -1;
+    }
+
+    if (fcntl(skt, F_SETFL, fcntl(skt, F_GETFL, 0) | O_NONBLOCK) < 0)
+    {
+        LogMsg("SetupUDPProxySocket: fnctl failed %d", errno);
+        return -1;
+    }
+
+    *s = skt;
+    //k->KQcallback = ProxyUDPSocketCallBack;
+    k->KQcallback  = myKQSocketCallBack;
+    k->KQcontext   = cp;
+    k->KQtask      = "UDP Proxy packet reception";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    k->readSource  = mDNSNULL;
+    k->writeSource = mDNSNULL;
+    k->fdClosed    = mDNSfalse;
+#endif
+
+    KQueueSet(*s, EV_ADD, EVFILT_READ, k);
+
+    return(err);
+}
+
+mDNSlocal mStatus SetupTCPProxySocket(mDNS *const m, int skt, KQSocketSet *cp, u_short sa_family, mDNSBool useBackgroundTrafficClass)
+{
+    int         *s        = (sa_family == AF_INET) ? &cp->sktv4 : &cp->sktv6;
+    KQueueEntry *k        = (sa_family == AF_INET) ? &cp->kqsv4 : &cp->kqsv6;
+    mDNSIPPort port;
+    mStatus err;
+
+    cp->m = m;
+    port = cp->port;
+    // XXX may not be used by the TCP codepath 
+    cp->closeFlag = mDNSNULL;
+
+    // for TCP sockets, the traffic class is set once and not changed
+    // setTrafficClass(skt, useBackgroundTrafficClass);
+    (void) useBackgroundTrafficClass;
+
+    // All the socket setup has already been done 
+    err = listen(skt, NUM_PROXY_TCP_CONNS);
+    if (err)
+    {
+        LogMsg("SetupTCPProxySocket: listen %d errno %d (%s)", skt, errno, strerror(errno));
+        return err;
+    }
+    fcntl(skt, F_SETFL, fcntl(skt, F_GETFL, 0) | O_NONBLOCK); // set non-blocking
+    
+    *s = skt;
+    k->KQcallback  = ProxyTCPAccept;
+    k->KQcontext   = cp;
+    k->KQtask      = "TCP Accept";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    k->readSource  = mDNSNULL;
+    k->writeSource = mDNSNULL;
+    k->fdClosed    = mDNSfalse;
+#endif
+    KQueueSet(*s, EV_ADD, EVFILT_READ, k);
+    return mStatus_NoError;
+}
+
+mDNSlocal void BindDPSocket(int fd, int sa_family)
+{
+    int err;
+    const int on = 1;
+
+    if (sa_family == AF_INET)
+    {
+        struct sockaddr_in addr;
+
+        err = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on));
+        if (err < 0) 
+            LogMsg("BindDPSocket: setsockopt SO_REUSEPORT failed for V4 %d errno %d (%s)", fd, errno, strerror(errno));
+
+        memset(&addr, 0, sizeof(addr));
+        addr.sin_family = AF_INET;
+        addr.sin_port = htons(53);
+
+        err = bind(fd, (struct sockaddr*) &addr, sizeof(addr));
+        if (err)
+        {
+            LogMsg("BindDPSocket: bind %d errno %d (%s)", fd, errno, strerror(errno));
+            return;
+        }
+    }
+    else
+    {
+        struct sockaddr_in6 addr6;
+
+        // We want to receive only IPv6 packets. Without this option we get IPv4 packets too,
+        // with mapped addresses of the form 0:0:0:0:0:FFFF:xxxx:xxxx, where xxxx:xxxx is the IPv4 address
+        err = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+        if (err < 0)
+        {
+            LogMsg("DPFBindSocket: setsockopt IPV6_V6ONLY %d errno %d (%s)", fd, errno, strerror(errno));
+            return;
+        }
+        err = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on));
+        if (err < 0)
+            LogMsg("BindDPSocket: setsockopt SO_REUSEPORT failed for V6 %d errno %d (%s)", fd, errno, strerror(errno));
+
+        memset(&addr6, 0, sizeof(addr6));
+        addr6.sin6_family = AF_INET6;
+        addr6.sin6_port = htons(53);
+
+        err = bind(fd, (struct sockaddr*) &addr6, sizeof(addr6));
+        if (err)
+        {
+            LogMsg("BindDPSocket: bind6 %d errno %d (%s)", fd, errno, strerror(errno));
+            return;
+        }
+    }
+}
+
+// Setup DNS Proxy Skts in main kevent loop and set the skt options
+mDNSlocal void SetupDNSProxySkts(mDNS *const m, int fd[4])
+{
+    int i;
+    mStatus err;
+    KQSocketSet *udpSS;
+    KQSocketSet *tcpSS;
+
+    udpSS       = &m->p->UDPProxy.ss;
+    tcpSS       = &m->p->TCPProxy.ss;
+    udpSS->port = UnicastDNSPort;
+    tcpSS->port = UnicastDNSPort;
+
+    LogMsg("SetupDNSProxySkts: %d, %d, %d, %d", fd[0], fd[1], fd[2], fd[3]);
+
+    // myKQSocketCallBack checks for proxy and calls the m->p->ProxyCallback instead of mDNSCoreReceive
+    udpSS->proxy = mDNStrue;
+    err = SetupUDPProxySocket(m, fd[0], udpSS, AF_INET, mDNSfalse);
+    if (err)
+        LogMsg("SetupDNSProxySkts: ERROR!! UDPv4 Socket");
+
+    err = SetupUDPProxySocket(m, fd[1], udpSS, AF_INET6, mDNSfalse);
+    if (err)
+        LogMsg("SetupDNSProxySkts: ERROR!! UDPv6 Socket");
+
+    err = SetupTCPProxySocket(m, fd[2], tcpSS, AF_INET, mDNSfalse);
+    if (err)
+        LogMsg("SetupDNSProxySkts: ERROR!! TCPv4 Socket");
+
+    err = SetupTCPProxySocket(m, fd[3], tcpSS, AF_INET6, mDNSfalse);
+    if (err)
+        LogMsg("SetupDNSProxySkts: ERROR!! TCPv6 Socket");
+
+    for (i = 0; i < 4; i++)
+        dp_listener[i] = fd[i];   
+} 
+
+// Create and bind the DNS Proxy Skts for use
+mDNSexport void mDNSPlatformInitDNSProxySkts(mDNS *const m, ProxyCallback UDPCallback, ProxyCallback TCPCallback)
+{
+    int dpskt[4];
+    
+    dpskt[0] = socket(AF_INET,  SOCK_DGRAM,  IPPROTO_UDP);
+    dpskt[1] = socket(AF_INET6, SOCK_DGRAM,  IPPROTO_UDP);
+    dpskt[2] = socket(AF_INET,  SOCK_STREAM, IPPROTO_TCP);
+    dpskt[3] = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+
+    // Close all DNS Proxy skts in case any of them are invalid
+    if (!ValidSocket(dpskt[0]) || !ValidSocket(dpskt[1]) ||
+        !ValidSocket(dpskt[2]) || !ValidSocket(dpskt[3]))
+    {   
+        if (ValidSocket(dpskt[0]))
+            close(dpskt[0]);
+        if (ValidSocket(dpskt[1]))
+            close(dpskt[1]);
+        if (ValidSocket(dpskt[2]))
+            close(dpskt[2]);
+        if (ValidSocket(dpskt[3]))
+            close(dpskt[3]);
+    }
+
+    BindDPSocket(dpskt[0], AF_INET);
+    BindDPSocket(dpskt[1], AF_INET6);
+    BindDPSocket(dpskt[2], AF_INET);
+    BindDPSocket(dpskt[3], AF_INET6);
+
+    LogInfo("mDNSPlatformInitDNSProxySkts: Opened Listener Sockets for DNS Proxy : %d, %d, %d, %d", 
+             dpskt[0], dpskt[1], dpskt[2], dpskt[3]);
+
+    m->p->UDPProxyCallback = UDPCallback;
+    m->p->TCPProxyCallback = TCPCallback;
+
+    SetupDNSProxySkts(m, dpskt);
+}
+
+mDNSexport void mDNSPlatformCloseDNSProxySkts(mDNS *const m)
+{
+    (void) m;
+    int i;
+    for (i = 0; i < 4; i++)
+        close(dp_listener[i]);
+    LogInfo("mDNSPlatformCloseDNSProxySkts: Closing DNS Proxy Listener Sockets");  
+}
+
+mDNSexport void mDNSPlatformDisposeProxyContext(void *context)
+{
+    ProxyTCPInfo_t *ti;
+    TCPSocket *sock;
+    KQSocketSet *kq;
+
+    if (!context)
+        return;
+
+    ti = (ProxyTCPInfo_t *)context;
+    sock = &ti->sock;
+
+    kq = &sock->ss;
+    if (kq->sktv4 != -1)
+    {
+        shutdown(kq->sktv4, 2);
+        mDNSPlatformCloseFD(&kq->kqsv4, kq->sktv4);
+    }
+    if (kq->sktv6 != -1)
+    {
+        shutdown(kq->sktv6, 2);
+        mDNSPlatformCloseFD(&kq->kqsv6, kq->sktv6);
+    }
+    if (kq->closeFlag)
+        *kq->closeFlag = 1;
+
+    if (ti->reply)
+        freeL("ProxyTCPInfoLen", ti->reply);
+    freeL("ProxyTCPContext", ti);
+}
+
diff --git a/mDNSResponder/mDNSMacOSX/DNSSECSupport.c b/mDNSResponder/mDNSMacOSX/DNSSECSupport.c
new file mode 100644
index 00000000..e1255c4d
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSSECSupport.c
@@ -0,0 +1,645 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// DNSSECSupport.c: Platform specific support for DNSSEC like fetching root
+// trust anchor and dnssec probes etc.
+// ***************************************************************************
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"                  // For mDNS_Lock, mDNS_Random
+#include "dnssec.h"
+#include "DNSSECSupport.h"
+
+#include <CommonCrypto/CommonDigest.h>  // For Hash algorithms SHA1 etc.
+
+// Following are needed for fetching the root trust anchor dynamically
+#include <CoreFoundation/CoreFoundation.h>
+#include <libxml2/libxml/parser.h>
+#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlmemory.h>
+#include <notify.h>
+
+// 30 days
+#define ROOT_TA_UPDATE_INTERVAL  (30 * 24 * 3600)   // seconds
+
+// After 100 days, the test anchors are not valid. Just an arbitrary number
+// to configure validUntil. 
+#define TEST_TA_EXPIRE_INTERVAL  (100 * 24 * 4600)
+
+// When we can't fetch the root TA due to network errors etc., we start off a timer
+// to fire at 60 seconds and then keep doubling it till we fetch it
+#define InitialTAFetchInterval 60
+
+#if !TARGET_OS_IPHONE
+DNSQuestion DNSSECProbeQuestion;
+#endif
+
+mDNSlocal int RegisterNotification(mDNS *const m, unsigned int interval);
+
+mDNSlocal void LinkTrustAnchor(mDNS *const m, TrustAnchor *ta)
+{
+    int length = 0;
+    int i;
+    mDNSu8 *p;
+    TrustAnchor **t = &m->TrustAnchors;
+    char buffer[256];
+
+    while (*t)
+        t = &((*t)->next);
+    *t = ta;
+
+    buffer[0] = 0;
+    p = ta->rds.digest;
+    for (i = 0; i < ta->digestLen; i++)
+    {
+        length += mDNS_snprintf(buffer+length, sizeof(buffer)-1-length, "%x", p[i]);
+    }
+    LogInfo("LinkTrustAnchor: Zone %##s, keytag %d, alg %d, digestType %d, digestLen %d, digest %s", ta->zone.c, ta->rds.keyTag,
+        ta->rds.alg, ta->rds.digestType, ta->digestLen, buffer);
+}
+
+mDNSlocal void DelTrustAnchor(mDNS *const m, const domainname *zone)
+{
+    TrustAnchor **ta = &m->TrustAnchors;
+    TrustAnchor *tmp;
+
+    while (*ta && !SameDomainName(&(*ta)->zone, zone))
+        ta = &(*ta)->next;
+
+    // First time, we won't find the TrustAnchor in the list as it has
+    // not been added.
+    if (!(*ta))
+        return;
+
+    tmp = *ta;
+    *ta = (*ta)->next;                  // Cut this record from the list
+    tmp->next = mDNSNULL;
+    if (tmp->rds.digest)
+        mDNSPlatformMemFree(tmp->rds.digest);
+    mDNSPlatformMemFree(tmp);
+}
+
+mDNSlocal void AddTrustAnchor(mDNS *const m, const domainname *zone, mDNSu16 keytag, mDNSu8 alg, mDNSu8 digestType, int diglen,
+    mDNSu8 *digest)
+{
+    TrustAnchor *ta, *tmp;
+    mDNSu32 t = (mDNSu32) time(NULL); 
+
+    // Check for duplicates
+    tmp = m->TrustAnchors;
+    while (tmp)
+    {
+        if (SameDomainName(zone, &tmp->zone) && tmp->rds.keyTag == keytag && tmp->rds.alg == alg && tmp->rds.digestType == digestType &&
+            !memcmp(tmp->rds.digest, digest, diglen))
+        {
+            LogMsg("AddTrustAnchors: Found a duplicate");
+            return;
+        }
+        tmp = tmp->next;
+    }
+
+    ta = (TrustAnchor *)mDNSPlatformMemAllocate(sizeof(TrustAnchor));
+    if (!ta)
+    {
+        LogMsg("AddTrustAnchor: malloc failure ta");
+        return;
+    }
+    ta->rds.keyTag = keytag;
+    ta->rds.alg = alg;
+    ta->rds.digestType = digestType;
+    ta->rds.digest = digest;
+    ta->digestLen = diglen;
+    ta->validFrom = t;
+    ta->validUntil = t + TEST_TA_EXPIRE_INTERVAL;
+    AssignDomainName(&ta->zone, zone);
+    ta->next = mDNSNULL;
+
+    LinkTrustAnchor(m, ta);
+}
+
+#define HexVal(X) ( ((X) >= '0' && (X) <= '9') ? ((X) - '0'     ) :   \
+                    ((X) >= 'A' && (X) <= 'F') ? ((X) - 'A' + 10) :   \
+                    ((X) >= 'a' && (X) <= 'f') ? ((X) - 'a' + 10) : -1)
+
+mDNSlocal mDNSu8 *ConvertDigest(char *digest, int digestType, int *diglen)
+{
+    int i, j;
+    mDNSu8 *dig;
+
+    switch (digestType)
+    {
+    case SHA1_DIGEST_TYPE:
+        *diglen = CC_SHA1_DIGEST_LENGTH;
+        break;
+    case SHA256_DIGEST_TYPE:
+        *diglen = CC_SHA256_DIGEST_LENGTH;
+        break;
+    default:
+        LogMsg("ConvertDigest: digest type %d not supported", digestType);
+        return mDNSNULL;
+    }
+    dig = mDNSPlatformMemAllocate(*diglen);
+    if (!dig)
+    {
+        LogMsg("ConvertDigest: malloc failure");
+        return mDNSNULL;
+    }
+
+    for (j=0,i=0; i<*diglen*2; i+=2)
+    {
+        int l, h;
+        l = HexVal(digest[i]);
+        h = HexVal(digest[i+1]);
+        if (l<0 || h<0) { LogMsg("ConvertDigest: Cannot convert digest"); return NULL;}
+        dig[j++] = (mDNSu8)((l << 4) | h);
+    }
+    return dig;
+}
+
+// All the children are in a linked list
+//
+// <TrustAnchor> has two children: <Zone> and <KeyDigest>
+// <KeyDigest> has four children <KeyTag> <Algorithm> <DigestType> <Digest>
+//
+// Returns false if failed to parse the element i.e., malformed xml document.
+// Validity of the actual values itself is done outside the function.
+mDNSlocal mDNSBool ParseElementChildren(xmlDocPtr tadoc, xmlNode *node, TrustAnchor *ta)
+{
+    xmlNode *cur_node;
+    xmlChar *val1, *val2, *val;
+    char *invalid = NULL;
+
+    val = val1 = val2 = NULL;
+
+    for (cur_node = node; cur_node; cur_node = cur_node->next)
+    {
+        invalid = NULL;
+        val1 = val2 = NULL;
+        
+        val = xmlNodeListGetString(tadoc, cur_node->xmlChildrenNode, 1);
+        if (!val)
+        {
+           LogInfo("ParseElementChildren: NULL value for %s", cur_node->name);
+           continue; 
+        }
+        if (!xmlStrcmp(cur_node->name, (const xmlChar *)"Zone"))
+        {
+            // MaeDomainNameFromDNSNameString does not work for "."
+            if (!xmlStrcmp(val, (const xmlChar *)"."))
+            {
+                ta->zone.c[0] = 0;
+            }
+            else if (!MakeDomainNameFromDNSNameString(&ta->zone, (char *)val))
+            {
+                LogMsg("ParseElementChildren: Cannot parse Zone %s", val);
+                goto error;
+            }
+            else
+            {
+                LogInfo("ParseElementChildren: Element %s, value %##s", cur_node->name, ta->zone.c);
+            }
+        }
+        else if (!xmlStrcmp(cur_node->name, (const xmlChar *)"KeyTag"))
+        {
+            ta->rds.keyTag = strtol((const char *)val, &invalid, 10);
+            if (*invalid != '\0')
+            {
+                LogMsg("ParseElementChildren: KeyTag invalid character %d", *invalid);
+                goto error;
+            }
+            else
+            {
+                LogInfo("ParseElementChildren: Element %s, value %d", cur_node->name, ta->rds.keyTag);
+            }
+        }
+        else if (!xmlStrcmp(cur_node->name, (const xmlChar *)"Algorithm"))
+        {
+            ta->rds.alg = strtol((const char *)val, &invalid, 10);
+            if (*invalid != '\0')
+            {
+                LogMsg("ParseElementChildren: Algorithm invalid character %c", *invalid);
+                goto error;
+            }
+            else
+            {
+                LogInfo("ParseElementChildren: Element %s, value %d", cur_node->name, ta->rds.alg);
+            }
+        }
+        else if (!xmlStrcmp(cur_node->name, (const xmlChar *)"DigestType"))
+        {
+            ta->rds.digestType = strtol((const char *)val, &invalid, 10);
+            if (*invalid != '\0')
+            {
+                LogMsg("ParseElementChildren: Algorithm invalid character %c", *invalid);
+                goto error;
+            }
+            else
+            {
+                LogInfo("ParseElementChildren: Element %s, value %d", cur_node->name, ta->rds.digestType);
+            }
+        }
+        else if (!xmlStrcmp(cur_node->name, (const xmlChar *)"Digest"))
+        {
+            int diglen;
+            mDNSu8 *dig = ConvertDigest((char *)val, ta->rds.digestType, &diglen);
+            if (dig)
+            { 
+                LogInfo("ParseElementChildren: Element %s, digest %s", cur_node->name, val);
+                ta->digestLen = diglen;
+                ta->rds.digest = dig;
+            }
+            else
+            {
+                LogMsg("ParseElementChildren: Element %s, NULL digest", cur_node->name);
+                goto error;
+            }
+        }
+        else if (!xmlStrcmp(cur_node->name, (const xmlChar *)"KeyDigest"))
+        {
+            struct tm tm;
+            val1 = xmlGetProp(cur_node, (const xmlChar *)"validFrom");
+            if (val1)
+            {
+                char *s = strptime((const char *)val1, "%Y-%m-%dT%H:%M:%S", &tm);
+                if (!s)
+                {
+                    LogMsg("ParseElementChildren: Parsing ValidFrom failed %s", val1);
+                    goto error;
+                }
+                else
+                {
+                    ta->validFrom = (mDNSu32)timegm(&tm);
+                }
+            }
+            val2 = xmlGetProp(cur_node, (const xmlChar *)"validUntil");
+            if (val2)
+            {
+                char *s = strptime((const char *)val2, "%Y-%m-%dT%H:%M:%S", &tm);
+                if (!s)
+                {
+                    LogMsg("ParseElementChildren: Parsing ValidFrom failed %s", val2);
+                    goto error;
+                }
+                else
+                {
+                    ta->validUntil = (mDNSu32)timegm(&tm);
+                }
+            }
+            else
+            {
+                // If there is no validUntil, set it to the next probing interval
+                mDNSu32 t = (mDNSu32) time(NULL); 
+                ta->validUntil = t + ROOT_TA_UPDATE_INTERVAL;
+            }
+            LogInfo("ParseElementChildren: ValidFrom time %u, validUntil %u", (unsigned)ta->validFrom, (unsigned)ta->validUntil);
+        }
+        if (val1)
+            xmlFree(val1);
+        if (val2)
+            xmlFree(val2);
+        if (val)
+            xmlFree(val);
+    }
+    return mDNStrue;
+error:
+    if (val1)
+        xmlFree(val1);
+    if (val2)
+        xmlFree(val2);
+    if (val)
+        xmlFree(val);
+    return mDNSfalse;
+}
+
+mDNSlocal mDNSBool ValidateTrustAnchor(TrustAnchor *ta)
+{
+    time_t currTime = time(NULL);
+
+    // Currently only support trust anchor for root.
+    if (!SameDomainName(&ta->zone, (const domainname *)"\000"))
+    {
+        LogInfo("ParseElementChildren: Zone %##s not root", ta->zone.c);
+        return mDNSfalse;
+    }
+
+    switch (ta->rds.digestType)
+    {
+    case SHA1_DIGEST_TYPE:
+        if (ta->digestLen != CC_SHA1_DIGEST_LENGTH) 
+        {
+            LogMsg("ValidateTrustAnchor: Invalid digest len %d for SHA1", ta->digestLen);
+            return mDNSfalse;
+        }
+        break;
+    case SHA256_DIGEST_TYPE:
+        if (ta->digestLen != CC_SHA256_DIGEST_LENGTH) 
+        {
+            LogMsg("ValidateTrustAnchor: Invalid digest len %d for SHA256", ta->digestLen);
+            return mDNSfalse;
+        }
+        break;
+    default:
+        LogMsg("ValidateTrustAnchor: digest type %d not supported", ta->rds.digestType);
+        return mDNSfalse;
+    }
+    if (!ta->rds.digest)
+    {
+        LogMsg("ValidateTrustAnchor: digest NULL for %d", ta->rds.digestType);
+        return mDNSfalse;
+    }
+    switch (ta->rds.alg)
+    {
+    case CRYPTO_RSA_SHA512:
+    case CRYPTO_RSA_SHA256:
+    case CRYPTO_RSA_NSEC3_SHA1:
+    case CRYPTO_RSA_SHA1:
+        break;
+    default:
+        LogMsg("ValidateTrustAnchor: Algorithm %d not supported", ta->rds.alg);
+        return mDNSfalse;
+    }
+    
+    if (DNS_SERIAL_LT(currTime, ta->validFrom))
+    {
+        LogMsg("ValidateTrustAnchor: Invalid ValidFrom time %u, currtime %u", (unsigned)ta->validFrom, (unsigned)currTime);
+        return mDNSfalse;
+    }
+    if (DNS_SERIAL_LT(ta->validUntil, currTime))
+    {
+        LogMsg("ValidateTrustAnchor: Invalid ValidUntil time %u, currtime %u", (unsigned)ta->validUntil, (unsigned)currTime);
+        return mDNSfalse;
+    }
+    return mDNStrue;
+}
+
+mDNSlocal mDNSBool ParseElement(xmlDocPtr tadoc, xmlNode * a_node, TrustAnchor *ta)
+{
+    xmlNode *cur_node = NULL;
+
+    for (cur_node = a_node; cur_node; cur_node = cur_node->next)
+    {
+        if (cur_node->type == XML_ELEMENT_NODE)
+        {
+            // There could be multiple KeyDigests per TrustAnchor. We keep parsing till we
+            // reach the last one or we encounter an error in parsing the document.
+            if (!xmlStrcmp(cur_node->name, (const xmlChar *)"KeyDigest"))
+            {
+                if (ta->rds.digest)
+                    mDNSPlatformMemFree(ta->rds.digest);
+                ta->rds.digestType = 0;
+                ta->digestLen = 0;
+            }
+            if (!ParseElementChildren(tadoc, cur_node->children, ta))
+                return mDNSfalse;
+            if (!ParseElement(tadoc, cur_node->children, ta))
+                return mDNSfalse;
+        }
+    }
+    return mDNStrue;
+}
+
+mDNSlocal void TAComplete(mDNS *const m, void *context)
+{
+    TrustAnchor *ta = (TrustAnchor *)context;
+
+    DelTrustAnchor(m, &ta->zone);
+    LinkTrustAnchor(m, ta);
+}
+
+mDNSlocal void FetchRootTA(mDNS *const m)
+{
+    CFStringRef urlString = CFSTR("https://data.iana.org/root-anchors/root-anchors.xml");
+    CFDataRef xmlData;
+    CFStringRef fileRef = NULL;
+    const char *xmlFileName = NULL;
+    char buf[512];
+    CFURLRef url = NULL;
+    static unsigned int RootTAFetchInterval = InitialTAFetchInterval;
+
+    (void) m;
+
+    TrustAnchor *ta = (TrustAnchor *)mDNSPlatformMemAllocate(sizeof(TrustAnchor));
+    if (!ta)
+    {
+        LogMsg("FetchRootTA: TrustAnchor alloc failed");
+        return;
+    }
+    memset(ta, 0, sizeof(TrustAnchor));
+
+    url = CFURLCreateWithString(NULL, urlString, NULL);
+    if (!url)
+    {
+        LogMsg("FetchRootTA: CFURLCreateWithString error");
+        mDNSPlatformMemFree(ta);
+        return;
+    }
+
+    // If we can't fetch the XML file e.g., network problems, trigger a timer. All other failures
+    // should hardly happen in practice for which schedule the normal interval to refetch the TA.
+    if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url, &xmlData, NULL, NULL, NULL))
+    {
+        LogInfo("FetchRootTA: CFURLCreateDataAndPropertiesFromResource error");
+        CFRelease(url);
+        mDNSPlatformMemFree(ta);
+        RegisterNotification(m, RootTAFetchInterval);
+        RootTAFetchInterval *= 2 + 1;
+        return;
+    }
+
+    // get the name of the last component from the url, libxml will use it if
+    // it has to report an error
+    fileRef = CFURLCopyLastPathComponent(url);
+    if (fileRef)
+    {
+        xmlFileName = CFStringGetCStringPtr(fileRef, kCFStringEncodingUTF8);
+        if (!xmlFileName)
+        {
+            if (!CFStringGetCString(fileRef, buf, sizeof(buf), kCFStringEncodingUTF8) )
+                strlcpy(buf, "nofile.xml", sizeof(buf));
+            xmlFileName = (const char *)buf;
+        }
+    }
+
+    // Parse the XML and get the CFXMLTree.
+    xmlDocPtr tadoc = xmlReadMemory((const char*)CFDataGetBytePtr(xmlData),
+        (int)CFDataGetLength(xmlData), xmlFileName, NULL, 0);        
+
+    CFRelease(fileRef);
+    CFRelease(url);
+    CFRelease(xmlData);
+
+    if (!tadoc)
+    {
+        LogMsg("FetchRootTA: xmlReadMemory failed");
+        goto done;
+    }
+
+    xmlNodePtr root = xmlDocGetRootElement(tadoc);
+    if (!root)
+    {
+        LogMsg("FetchRootTA: Cannot get root element");
+        goto done;
+    }
+
+    if (ParseElement(tadoc, root, ta) && ValidateTrustAnchor(ta))
+    {
+        // Do the actual addition of TA on the main queue.
+        mDNSPlatformDispatchAsync(m, ta, TAComplete);
+    }
+    else
+    {
+        if (ta->rds.digest)
+            mDNSPlatformMemFree(ta->rds.digest);
+        mDNSPlatformMemFree(ta);
+    }
+done:
+    if (tadoc)
+        xmlFreeDoc(tadoc);
+    RegisterNotification(m, ROOT_TA_UPDATE_INTERVAL);
+    RootTAFetchInterval = InitialTAFetchInterval;
+    return;
+}
+
+
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_IPHONE
+mDNSlocal void DNSSECProbeCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    if (!AddRecord)
+        return;
+
+    mDNS_Lock(m);
+    if ((m->timenow - question->StopTime) >= 0)
+    {
+        mDNS_Unlock(m);
+        LogDNSSEC("DNSSECProbeCallback: Question %##s (%s) timed out", question->qname.c, DNSTypeName(question->qtype));
+        mDNS_StopQuery(m, question);
+        return;
+    }
+    mDNS_Unlock(m);
+
+    // Wait till we get the DNSSEC results. If we get a negative response e.g., no DNS servers, the
+    // question will be restarted by the core and we should have the DNSSEC results eventually.
+    if (AddRecord != QC_dnssec)
+    {
+        LogDNSSEC("DNSSECProbeCallback: Question %##s (%s)", question->qname.c, DNSTypeName(question->qtype), RRDisplayString(m, answer));
+        return;
+    }
+
+    LogDNSSEC("DNSSECProbeCallback: Question %##s (%s), DNSSEC status %s", question->qname.c, DNSTypeName(question->qtype),
+            DNSSECStatusName(question->ValidationStatus));
+
+    mDNS_StopQuery(m, question);
+}
+
+// Send a DNSSEC probe just for the sake of collecting DNSSEC statistics.
+mDNSexport void DNSSECProbe(mDNS *const m)
+{
+    mDNSu32 rand;
+
+    if (DNSSECProbeQuestion.ThisQInterval != -1)
+        return;
+    
+    rand = mDNSRandom(0x3FFFFFFF) % 100;
+    // Probe 5% of the time
+    if (rand > 5)
+        return;
+    
+    mDNS_DropLockBeforeCallback();
+    InitializeQuestion(m, &DNSSECProbeQuestion, mDNSInterface_Any, (const domainname *)"\003com", kDNSType_DS, DNSSECProbeCallback, mDNSNULL);
+    DNSSECProbeQuestion.ValidatingResponse = 0;
+    DNSSECProbeQuestion.ValidationRequired = DNSSEC_VALIDATION_SECURE;
+
+    BumpDNSSECStats(m, kStatsActionIncrement, kStatsTypeProbe, 1);
+    mDNS_StartQuery(m, &DNSSECProbeQuestion);
+    mDNS_ReclaimLockAfterCallback(); 
+}
+#endif // APPLE_OSX_mDNSResponder && !TARGET_OS_IPHONE
+
+// For now we fetch the root trust anchor and update the local copy
+mDNSexport void UpdateTrustAnchors(mDNS *const m)
+{
+    // Register for a notification to fire immediately which in turn will update
+    // the trust anchor
+    if (RegisterNotification(m, 1))
+    {
+        LogMsg("UpdateTrustAnchors: ERROR!! failed to register for notification");
+    }
+}
+
+mDNSlocal int RegisterNotification(mDNS *const m, unsigned int interval)
+{
+    int len = strlen("com.apple.system.notify.service.timer:+") + 21; // 21 bytes to accomodate the interval
+    char buffer[len];
+    unsigned int blen;
+    int status;
+
+    // Starting "interval" second from now (+ below indicates relative) register for a notification
+    blen = mDNS_snprintf(buffer, sizeof(buffer), "com.apple.system.notify.service.timer:+%us", interval);
+    if (blen >= sizeof(buffer))
+    {
+        LogMsg("RegisterNotification: Buffer too small blen %d, buffer size %d", blen, sizeof(buffer));
+        return -1;
+    } 
+    LogInfo("RegisterNotification: buffer %s", buffer);
+    if (m->notifyToken)
+    {
+        notify_cancel(m->notifyToken);
+        m->notifyToken = 0;
+    }
+    status = notify_register_dispatch(buffer, &m->notifyToken,
+                dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+                ^(int t) { (void) t; FetchRootTA(m); });
+
+    if (status != NOTIFY_STATUS_OK)
+    {
+        LogMsg("RegisterNotification: notify_register_dispatch failed");
+        return -1;
+    }
+    return 0;
+}
+
+mDNSexport mStatus DNSSECPlatformInit(mDNS *const m)
+{
+    int diglen;
+
+    m->TrustAnchors = mDNSNULL;
+    m->notifyToken  = 0;
+
+    // Add a couple of trust anchors for testing purposes.
+    mDNSlocal const domainname *testZone  = (const domainname*)"\007example";
+
+    char *digest = "F122E47B5B7D2B6A5CC0A21EADA11D96BB9CC927";
+    mDNSu8 *dig = ConvertDigest(digest, 1, &diglen);
+    AddTrustAnchor(m, testZone, 23044, 5, 1, diglen, dig);
+
+    char *digest1 = "D795AE5E1AFB200C6139474199B70EAD3F3484553FD97BE5A43704B8A4791F21";
+    dig = ConvertDigest(digest1, 2, &diglen);
+    AddTrustAnchor(m, testZone, 23044, 5, 2, diglen, dig);
+
+    // Add the TA for root zone manually here. We will dynamically fetch the root TA and
+    // update it shortly. If that fails e.g., disconnected from the network, we still
+    // have something to work with.
+    char *digest2 = "49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5";
+    dig = ConvertDigest(digest2, 2, &diglen);
+    AddTrustAnchor(m, (const domainname *)"\000", 19036, 8, 2, diglen, dig);
+
+#if !TARGET_OS_IPHONE
+    DNSSECProbeQuestion.ThisQInterval = -1;
+#endif
+    return mStatus_NoError;
+}
diff --git a/mDNSResponder/mDNSMacOSX/DNSSECSupport.h b/mDNSResponder/mDNSMacOSX/DNSSECSupport.h
new file mode 100644
index 00000000..2310fc2a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSSECSupport.h
@@ -0,0 +1,24 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DNSSEC_SUPPORT_H
+#define __DNSSEC_SUPPORT_H
+
+extern mStatus DNSSECPlatformInit(mDNS *const m);
+extern void UpdateTrustAnchors(mDNS *const m);
+
+#endif // __DNSSEC_SUPPORT_H
diff --git a/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.c b/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.c
new file mode 100644
index 00000000..717efca2
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.c
@@ -0,0 +1,674 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Suppress "warning: 'DNSServiceDiscoveryMachPort' is deprecated" messages -- we already know this code is building the deprecated API
+// Since we compile with all warnings treated as errors, we have to turn off the warnings here or the project won't compile
+#include <AvailabilityMacros.h>
+#undef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED
+#define AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED
+#undef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3
+#define AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3
+
+#include "../mDNSMacOSX/DNSServiceDiscovery.h"
+#include "DNSServiceDiscoveryDefines.h"
+#include "DNSServiceDiscoveryReplyServer.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <servers/bootstrap.h>
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <pthread.h>
+
+#include <netinet/in.h>
+
+extern boolean_t DNSServiceDiscoveryReply_server(
+    mach_msg_header_t *InHeadP,
+    mach_msg_header_t *OutHeadP);
+
+extern
+kern_return_t DNSServiceBrowserCreate_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    DNSCString regtype,
+    DNSCString domain
+);
+
+extern
+kern_return_t DNSServiceDomainEnumerationCreate_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    int registrationDomains
+);
+
+extern
+kern_return_t DNSServiceRegistrationCreate_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    DNSCString name,
+    DNSCString regtype,
+    DNSCString domain,
+    IPPort port,
+    DNSCString txtRecord
+);
+
+extern
+kern_return_t DNSServiceResolverResolve_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    DNSCString name,
+    DNSCString regtype,
+    DNSCString domain
+);
+
+extern
+kern_return_t DNSServiceRegistrationAddRecord_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    int type,
+    record_data_t data,
+    mach_msg_type_number_t record_dataCnt,
+    uint32_t ttl,
+    natural_t *reference
+);
+
+extern
+int DNSServiceRegistrationUpdateRecord_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    natural_t reference,
+    record_data_t data,
+    mach_msg_type_number_t record_dataCnt,
+    uint32_t ttl
+);
+
+extern
+kern_return_t DNSServiceRegistrationRemoveRecord_rpc
+(
+    mach_port_t server,
+    mach_port_t client,
+    natural_t reference
+);
+
+struct a_requests {
+    struct a_requests       *next;
+    mach_port_t client_port;
+    union {
+        DNSServiceBrowserReply browserCallback;
+        DNSServiceDomainEnumerationReply enumCallback;
+        DNSServiceRegistrationReply regCallback;
+        DNSServiceResolverReply resolveCallback;
+    } callout;
+    void                    *context;
+};
+
+static struct a_requests    *a_requests = NULL;
+static pthread_mutex_t a_requests_lock = PTHREAD_MUTEX_INITIALIZER;
+
+typedef struct _dns_service_discovery_t {
+    mach_port_t port;
+} dns_service_discovery_t;
+
+static mach_port_t DNSServiceDiscoveryLookupServer(void)
+{
+    static mach_port_t sndPort  = MACH_PORT_NULL;
+    kern_return_t result;
+
+    if (sndPort != MACH_PORT_NULL) {
+        return sndPort;
+    }
+
+    result = bootstrap_look_up(bootstrap_port, DNS_SERVICE_DISCOVERY_SERVER, &sndPort);
+    if (result != KERN_SUCCESS) {
+        printf("%s(): {%s:%d} bootstrap_look_up() failed: $%x\n", __FUNCTION__, __FILE__, __LINE__, (int) result);
+        sndPort = MACH_PORT_NULL;
+    }
+
+
+    return sndPort;
+}
+
+static void _increaseQueueLengthOnPort(mach_port_t port)
+{
+    mach_port_limits_t qlimits;
+    kern_return_t result;
+
+    qlimits.mpl_qlimit = 16;
+    result = mach_port_set_attributes(mach_task_self(), port, MACH_PORT_LIMITS_INFO, (mach_port_info_t)&qlimits, MACH_PORT_LIMITS_INFO_COUNT);
+
+    if (result != KERN_SUCCESS) {
+        printf("%s(): {%s:%d} mach_port_set_attributes() failed: $%x %s\n", __FUNCTION__, __FILE__, __LINE__, (int) result, mach_error_string(result));
+    }
+}
+
+dns_service_discovery_ref DNSServiceBrowserCreate (const char *regtype, const char *domain, DNSServiceBrowserReply callBack,void *context)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result;
+    dns_service_discovery_ref return_t;
+    struct a_requests   *request;
+
+    if (!serverPort) {
+        return NULL;
+    }
+
+    result = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &clientPort);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port receive creation failed, %s\n", mach_error_string(result));
+        return NULL;
+    }
+    result = mach_port_insert_right(mach_task_self(), clientPort, clientPort, MACH_MSG_TYPE_MAKE_SEND);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port send creation failed, %s\n", mach_error_string(result));
+        mach_port_destroy(mach_task_self(), clientPort);
+        return NULL;
+    }
+    _increaseQueueLengthOnPort(clientPort);
+
+    return_t = malloc(sizeof(dns_service_discovery_t));
+    return_t->port = clientPort;
+
+    request = malloc(sizeof(struct a_requests));
+    request->client_port = clientPort;
+    request->context = context;
+    request->callout.browserCallback = callBack;
+
+    result = DNSServiceBrowserCreate_rpc(serverPort, clientPort, (char *)regtype, (char *)domain);
+
+    if (result != KERN_SUCCESS) {
+        printf("There was an error creating a browser, %s\n", mach_error_string(result));
+        free(request);
+        return NULL;
+    }
+
+    pthread_mutex_lock(&a_requests_lock);
+    request->next = a_requests;
+    a_requests = request;
+    pthread_mutex_unlock(&a_requests_lock);
+
+    return return_t;
+}
+
+/* Service Enumeration */
+
+dns_service_discovery_ref DNSServiceDomainEnumerationCreate (int registrationDomains, DNSServiceDomainEnumerationReply callBack, void *context)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result;
+    dns_service_discovery_ref return_t;
+    struct a_requests   *request;
+
+    if (!serverPort) {
+        return NULL;
+    }
+
+    result = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &clientPort);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port receive creation failed, %s\n", mach_error_string(result));
+        return NULL;
+    }
+    result = mach_port_insert_right(mach_task_self(), clientPort, clientPort, MACH_MSG_TYPE_MAKE_SEND);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port send creation failed, %s\n", mach_error_string(result));
+        mach_port_destroy(mach_task_self(), clientPort);
+        return NULL;
+    }
+    _increaseQueueLengthOnPort(clientPort);
+
+    return_t = malloc(sizeof(dns_service_discovery_t));
+    return_t->port = clientPort;
+
+    request = malloc(sizeof(struct a_requests));
+    request->client_port = clientPort;
+    request->context = context;
+    request->callout.enumCallback = callBack;
+
+    result = DNSServiceDomainEnumerationCreate_rpc(serverPort, clientPort, registrationDomains);
+
+    if (result != KERN_SUCCESS) {
+        printf("There was an error creating an enumerator, %s\n", mach_error_string(result));
+        free(request);
+        return NULL;
+    }
+
+    pthread_mutex_lock(&a_requests_lock);
+    request->next = a_requests;
+    a_requests = request;
+    pthread_mutex_unlock(&a_requests_lock);
+
+    return return_t;
+}
+
+
+/* Service Registration */
+
+dns_service_discovery_ref DNSServiceRegistrationCreate
+    (const char *name, const char *regtype, const char *domain, uint16_t port, const char *txtRecord, DNSServiceRegistrationReply callBack, void *context)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result;
+    dns_service_discovery_ref return_t;
+    struct a_requests   *request;
+    IPPort IpPort;
+    char *portptr = (char *)&port;
+
+    if (!serverPort) {
+        return NULL;
+    }
+
+    if (!txtRecord) {
+        txtRecord = "";
+    }
+
+    result = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &clientPort);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port receive creation failed, %s\n", mach_error_string(result));
+        return NULL;
+    }
+    result = mach_port_insert_right(mach_task_self(), clientPort, clientPort, MACH_MSG_TYPE_MAKE_SEND);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port send creation failed, %s\n", mach_error_string(result));
+        mach_port_destroy(mach_task_self(), clientPort);
+        return NULL;
+    }
+    _increaseQueueLengthOnPort(clientPort);
+
+    return_t = malloc(sizeof(dns_service_discovery_t));
+    return_t->port = clientPort;
+
+    request = malloc(sizeof(struct a_requests));
+    request->client_port = clientPort;
+    request->context = context;
+    request->callout.regCallback = callBack;
+
+    // older versions of this code passed the port via mach IPC as an int.
+    // we continue to pass it as 4 bytes to maintain binary compatibility,
+    // but now ensure that the network byte order is preserved by using a struct
+    IpPort.bytes[0] = 0;
+    IpPort.bytes[1] = 0;
+    IpPort.bytes[2] = portptr[0];
+    IpPort.bytes[3] = portptr[1];
+
+    result = DNSServiceRegistrationCreate_rpc(serverPort, clientPort, (char *)name, (char *)regtype, (char *)domain, IpPort, (char *)txtRecord);
+
+    if (result != KERN_SUCCESS) {
+        printf("There was an error creating a resolve, %s\n", mach_error_string(result));
+        free(request);
+        return NULL;
+    }
+
+    pthread_mutex_lock(&a_requests_lock);
+    request->next = a_requests;
+    a_requests = request;
+    pthread_mutex_unlock(&a_requests_lock);
+
+    return return_t;
+}
+
+/* Resolver requests */
+
+dns_service_discovery_ref DNSServiceResolverResolve(const char *name, const char *regtype, const char *domain, DNSServiceResolverReply callBack, void *context)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result;
+    dns_service_discovery_ref return_t;
+    struct a_requests   *request;
+
+    if (!serverPort) {
+        return NULL;
+    }
+
+    result = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &clientPort);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port receive creation failed, %s\n", mach_error_string(result));
+        return NULL;
+    }
+    result = mach_port_insert_right(mach_task_self(), clientPort, clientPort, MACH_MSG_TYPE_MAKE_SEND);
+    if (result != KERN_SUCCESS) {
+        printf("Mach port send creation failed, %s\n", mach_error_string(result));
+        mach_port_destroy(mach_task_self(), clientPort);
+        return NULL;
+    }
+    _increaseQueueLengthOnPort(clientPort);
+
+    return_t = malloc(sizeof(dns_service_discovery_t));
+    return_t->port = clientPort;
+
+    request = malloc(sizeof(struct a_requests));
+    request->client_port = clientPort;
+    request->context = context;
+    request->callout.resolveCallback = callBack;
+
+    DNSServiceResolverResolve_rpc(serverPort, clientPort, (char *)name, (char *)regtype, (char *)domain);
+
+    pthread_mutex_lock(&a_requests_lock);
+    request->next = a_requests;
+    a_requests = request;
+    pthread_mutex_unlock(&a_requests_lock);
+
+    return return_t;
+}
+
+DNSRecordReference DNSServiceRegistrationAddRecord(dns_service_discovery_ref ref, uint16_t rrtype, uint16_t rdlen, const char *rdata, uint32_t ttl)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    natural_t reference = 0;
+    kern_return_t result = KERN_SUCCESS;
+
+    if (!serverPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    clientPort = DNSServiceDiscoveryMachPort(ref);
+
+    if (!clientPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    result = DNSServiceRegistrationAddRecord_rpc(serverPort, clientPort, rrtype, (record_data_t)rdata, rdlen, ttl, &reference);
+
+    if (result != KERN_SUCCESS) {
+        printf("The result of the registration was not successful.  Error %d, result %s\n", result, mach_error_string(result));
+    }
+
+    return reference;
+}
+
+DNSServiceRegistrationReplyErrorType DNSServiceRegistrationUpdateRecord(dns_service_discovery_ref ref, DNSRecordReference reference, uint16_t rdlen, const char *rdata, uint32_t ttl)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result = KERN_SUCCESS;
+
+    if (!serverPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    clientPort = DNSServiceDiscoveryMachPort(ref);
+
+    if (!clientPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    result = DNSServiceRegistrationUpdateRecord_rpc(serverPort, clientPort, (natural_t)reference, (record_data_t)rdata, rdlen, ttl);
+    if (result != KERN_SUCCESS) {
+        printf("The result of the registration was not successful.  Error %d, result %s\n", result, mach_error_string(result));
+        return result;
+    }
+
+    return kDNSServiceDiscoveryNoError;
+}
+
+
+DNSServiceRegistrationReplyErrorType DNSServiceRegistrationRemoveRecord(dns_service_discovery_ref ref, DNSRecordReference reference)
+{
+    mach_port_t serverPort = DNSServiceDiscoveryLookupServer();
+    mach_port_t clientPort;
+    kern_return_t result = KERN_SUCCESS;
+
+    if (!serverPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    clientPort = DNSServiceDiscoveryMachPort(ref);
+
+    if (!clientPort) {
+        return kDNSServiceDiscoveryUnknownErr;
+    }
+
+    result = DNSServiceRegistrationRemoveRecord_rpc(serverPort, clientPort, (natural_t)reference);
+
+    if (result != KERN_SUCCESS) {
+        printf("The result of the registration was not successful.  Error %d, result %s\n", result, mach_error_string(result));
+        return result;
+    }
+
+    return kDNSServiceDiscoveryNoError;
+}
+
+void DNSServiceDiscovery_handleReply(void *replyMsg)
+{
+    unsigned long result = 0xFFFFFFFF;
+    mach_msg_header_t *     msgSendBufPtr;
+    mach_msg_header_t *     receivedMessage;
+    unsigned msgSendBufLength;
+
+    msgSendBufLength = internal_DNSServiceDiscoveryReply_subsystem.maxsize;
+    msgSendBufPtr = (mach_msg_header_t *) malloc(msgSendBufLength);
+
+
+    receivedMessage = ( mach_msg_header_t * ) replyMsg;
+
+    // Call DNSServiceDiscoveryReply_server to change mig-generated message into a
+    // genuine mach message. It will then cause the callback to get called.
+    result = DNSServiceDiscoveryReply_server ( receivedMessage, msgSendBufPtr );
+    ( void ) mach_msg_send ( msgSendBufPtr );
+    free(msgSendBufPtr);
+}
+
+mach_port_t DNSServiceDiscoveryMachPort(dns_service_discovery_ref dnsServiceDiscovery)
+{
+    return dnsServiceDiscovery->port;
+}
+
+void DNSServiceDiscoveryDeallocate(dns_service_discovery_ref dnsServiceDiscovery)
+{
+    struct a_requests   *request0, *request;
+    mach_port_t reply = dnsServiceDiscovery->port;
+
+    if (dnsServiceDiscovery->port) {
+        pthread_mutex_lock(&a_requests_lock);
+        request0 = NULL;
+        request  = a_requests;
+        while (request) {
+            if (request->client_port == reply) {
+                /* request info found, remove from list */
+                if (request0) {
+                    request0->next = request->next;
+                } else {
+                    a_requests = request->next;
+                }
+                break;
+            } else {
+                /* not info for this request, skip to next */
+                request0 = request;
+                request  = request->next;
+            }
+
+        }
+        pthread_mutex_unlock(&a_requests_lock);
+
+        free(request);
+
+        mach_port_destroy(mach_task_self(), dnsServiceDiscovery->port);
+
+        free(dnsServiceDiscovery);
+    }
+    return;
+}
+
+// reply functions, calls the users setup callbacks with function pointers
+
+kern_return_t internal_DNSServiceDomainEnumerationReply_rpc
+(
+    mach_port_t reply,
+    int resultType,
+    DNSCString replyDomain,
+    int flags
+)
+{
+    struct a_requests   *request;
+    void *requestContext = NULL;
+    DNSServiceDomainEnumerationReply callback = NULL;
+
+    pthread_mutex_lock(&a_requests_lock);
+    request  = a_requests;
+    while (request) {
+        if (request->client_port == reply) {
+            break;
+        }
+        request = request->next;
+    }
+
+    if (request != NULL) {
+        callback = (*request->callout.enumCallback);
+        requestContext = request->context;
+    }
+    pthread_mutex_unlock(&a_requests_lock);
+
+    if (request != NULL) {
+        (callback)(resultType, replyDomain, flags, requestContext);
+    }
+
+    return KERN_SUCCESS;
+
+}
+
+kern_return_t internal_DNSServiceBrowserReply_rpc
+(
+    mach_port_t reply,
+    int resultType,
+    DNSCString replyName,
+    DNSCString replyType,
+    DNSCString replyDomain,
+    int flags
+)
+{
+    struct a_requests   *request;
+    void *requestContext = NULL;
+    DNSServiceBrowserReply callback = NULL;
+
+    pthread_mutex_lock(&a_requests_lock);
+    request  = a_requests;
+    while (request) {
+        if (request->client_port == reply) {
+            break;
+        }
+        request = request->next;
+    }
+    if (request != NULL) {
+        callback = (*request->callout.browserCallback);
+        requestContext = request->context;
+    }
+
+    pthread_mutex_unlock(&a_requests_lock);
+
+    if (request != NULL) {
+        (callback)(resultType, replyName, replyType, replyDomain, flags, requestContext);
+    }
+
+    return KERN_SUCCESS;
+}
+
+
+kern_return_t internal_DNSServiceRegistrationReply_rpc
+(
+    mach_port_t reply,
+    int resultType
+)
+{
+    struct a_requests   *request;
+    void *requestContext = NULL;
+    DNSServiceRegistrationReply callback = NULL;
+
+    pthread_mutex_lock(&a_requests_lock);
+    request  = a_requests;
+    while (request) {
+        if (request->client_port == reply) {
+            break;
+        }
+        request = request->next;
+    }
+    if (request != NULL) {
+        callback = (*request->callout.regCallback);
+        requestContext = request->context;
+    }
+
+    pthread_mutex_unlock(&a_requests_lock);
+    if (request != NULL) {
+        (callback)(resultType, requestContext);
+    }
+    return KERN_SUCCESS;
+}
+
+
+kern_return_t internal_DNSServiceResolverReply_rpc
+(
+    mach_port_t reply,
+    sockaddr_t interface,
+    sockaddr_t address,
+    DNSCString txtRecord,
+    int flags
+)
+{
+    struct sockaddr  *interface_storage = NULL;
+    struct sockaddr  *address_storage = NULL;
+    struct a_requests   *request;
+    void *requestContext = NULL;
+    DNSServiceResolverReply callback = NULL;
+
+    if (interface) {
+        int len = ((struct sockaddr *)interface)->sa_len;
+        interface_storage = (struct sockaddr *)malloc(len);
+        memcpy(interface_storage, interface, len);
+    }
+
+    if (address) {
+        int len = ((struct sockaddr *)address)->sa_len;
+        address_storage = (struct sockaddr *)malloc(len);
+        memcpy(address_storage, address, len);
+    }
+
+    pthread_mutex_lock(&a_requests_lock);
+    request  = a_requests;
+    while (request) {
+        if (request->client_port == reply) {
+            break;
+        }
+        request = request->next;
+    }
+
+    if (request != NULL) {
+        callback = (*request->callout.resolveCallback);
+        requestContext = request->context;
+    }
+    pthread_mutex_unlock(&a_requests_lock);
+
+    if (request != NULL) {
+        (callback)(interface_storage, address_storage, txtRecord, flags, requestContext);
+    }
+
+    if (interface) {
+        free(interface_storage);
+    }
+    if (address) {
+        free(address_storage);
+    }
+
+    return KERN_SUCCESS;
+}
diff --git a/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.h b/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.h
new file mode 100644
index 00000000..ae736477
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSServiceDiscovery.h
@@ -0,0 +1,314 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*!	@header		DNS Service Discovery (Deprecated Mach-based API)
+ *
+ * @discussion	This section describes the functions, callbacks, and data structures that
+ *				make up the DNS Service Discovery API.
+ *
+ *				The DNS Service Discovery API is part of Bonjour, Apple's implementation of
+ *				zero-configuration networking (ZEROCONF).
+ *
+ *				Bonjour allows you to register a network service, such as a
+ *				printer or file server, so that it can be found by name or browsed
+ *				for by service type and domain. Using Bonjour, applications can
+ *				discover what services are available on the network, along with
+ *				all necessary access information-such as name, IP address, and port
+ *				number-for a given service.
+ *
+ *				In effect, Bonjour combines the functions of a local DNS server
+ *				and AppleTalk. Bonjour allows applications to provide user-friendly printer
+ *				and server browsing, among other things, over standard IP networks.
+ *				This behavior is a result of combining protocols such as multicast and DNS
+ *				to add new functionality to the network (such as multicast DNS).
+ *
+ *				Bonjour gives applications easy access to services over local IP
+ *				networks without requiring the service or the application to support
+ *				an AppleTalk or a Netbeui stack, and without requiring a DNS server
+ *				for the local network.
+ *
+ *				Note that this API was deprecated in Mac OS X 10.3, and replaced
+ *				by the portable cross-platform /usr/include/dns_sd.h API.
+ */
+
+#ifndef __DNS_SERVICE_DISCOVERY_H
+#define __DNS_SERVICE_DISCOVERY_H
+
+#include <mach/mach_types.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/cdefs.h>
+
+#include <netinet/in.h>
+
+#include <AvailabilityMacros.h>
+
+__BEGIN_DECLS
+
+/* Opaque internal data type */
+typedef struct _dns_service_discovery_t * dns_service_discovery_ref;
+
+/* possible reply flags values */
+
+enum {
+    kDNSServiceDiscoveryNoFlags         = 0,
+    kDNSServiceDiscoveryMoreRepliesImmediately  = 1 << 0,
+};
+
+
+/* possible error code values */
+typedef enum
+{
+    kDNSServiceDiscoveryWaiting     = 1,
+    kDNSServiceDiscoveryNoError     = 0,
+    // mDNS Error codes are in the range
+    // FFFE FF00 (-65792) to FFFE FFFF (-65537)
+    kDNSServiceDiscoveryUnknownErr        = -65537,       // 0xFFFE FFFF
+    kDNSServiceDiscoveryNoSuchNameErr     = -65538,
+    kDNSServiceDiscoveryNoMemoryErr       = -65539,
+    kDNSServiceDiscoveryBadParamErr       = -65540,
+    kDNSServiceDiscoveryBadReferenceErr   = -65541,
+    kDNSServiceDiscoveryBadStateErr       = -65542,
+    kDNSServiceDiscoveryBadFlagsErr       = -65543,
+    kDNSServiceDiscoveryUnsupportedErr    = -65544,
+    kDNSServiceDiscoveryNotInitializedErr = -65545,
+    kDNSServiceDiscoveryNoCache           = -65546,
+    kDNSServiceDiscoveryAlreadyRegistered = -65547,
+    kDNSServiceDiscoveryNameConflict      = -65548,
+    kDNSServiceDiscoveryInvalid           = -65549,
+    kDNSServiceDiscoveryMemFree           = -65792        // 0xFFFE FF00
+} DNSServiceRegistrationReplyErrorType;
+
+typedef uint32_t DNSRecordReference;
+
+
+/*!
+   @function DNSServiceResolver_handleReply
+   @discussion This function should be called with the Mach message sent
+   to the port returned by the call to DNSServiceResolverResolve.
+   The reply message will be interpreted and will result in a
+   call to the specified callout function.
+   @param replyMsg The Mach message.
+ */
+void DNSServiceDiscovery_handleReply(void *replyMsg);
+
+/* Service Registration */
+
+typedef void (*DNSServiceRegistrationReply)(
+    DNSServiceRegistrationReplyErrorType errorCode,
+    void                                        *context
+    );
+
+/*!
+   @function DNSServiceRegistrationCreate
+    @discussion Register a named service with DNS Service Discovery
+    @param name The name of this service instance (e.g. "Steve's Printer")
+    @param regtype The service type (e.g. "_printer._tcp." -- see
+        RFC 2782 (DNS SRV) and <http://www.iana.org/assignments/port-numbers>)
+    @param domain The domain in which to register the service (e.g. "apple.com.")
+    @param port The local port on which this service is being offered (in network byte order)
+    @param txtRecord Optional protocol-specific additional information
+    @param callBack The DNSServiceRegistrationReply function to be called
+    @param context A user specified context which will be passed to the callout function.
+    @result A dns_registration_t
+ */
+dns_service_discovery_ref DNSServiceRegistrationCreate
+(
+    const char      *name,
+    const char      *regtype,
+    const char      *domain,
+    uint16_t port,
+    const char      *txtRecord,
+    DNSServiceRegistrationReply callBack,
+    void        *context
+) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/***************************************************************************/
+/*   DNS Domain Enumeration   */
+
+typedef enum
+{
+    DNSServiceDomainEnumerationReplyAddDomain,          // Domain found
+    DNSServiceDomainEnumerationReplyAddDomainDefault,       // Domain found (and should be selected by default)
+    DNSServiceDomainEnumerationReplyRemoveDomain,           // Domain has been removed from network
+} DNSServiceDomainEnumerationReplyResultType;
+
+typedef enum
+{
+    DNSServiceDiscoverReplyFlagsFinished,
+    DNSServiceDiscoverReplyFlagsMoreComing,
+} DNSServiceDiscoveryReplyFlags;
+
+typedef void (*DNSServiceDomainEnumerationReply)(
+    DNSServiceDomainEnumerationReplyResultType resultType,              // One of DNSServiceDomainEnumerationReplyResultType
+    const char                          *replyDomain,
+    DNSServiceDiscoveryReplyFlags flags,                // DNS Service Discovery reply flags information
+    void                                *context
+    );
+
+/*!
+    @function DNSServiceDomainEnumerationCreate
+    @discussion Asynchronously create a DNS Domain Enumerator
+    @param registrationDomains A boolean indicating whether you are looking
+        for recommended registration domains
+        (e.g. equivalent to the AppleTalk zone list in the AppleTalk Control Panel)
+        or recommended browsing domains
+        (e.g. equivalent to the AppleTalk zone list in the Chooser).
+    @param callBack The function to be called when domains are found or removed
+    @param context A user specified context which will be passed to the callout function.
+    @result A dns_registration_t
+ */
+dns_service_discovery_ref DNSServiceDomainEnumerationCreate
+(
+    int registrationDomains,
+    DNSServiceDomainEnumerationReply callBack,
+    void        *context
+) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/***************************************************************************/
+/*   DNS Service Browser   */
+
+typedef enum
+{
+    DNSServiceBrowserReplyAddInstance,  // Instance of service found
+    DNSServiceBrowserReplyRemoveInstance    // Instance has been removed from network
+} DNSServiceBrowserReplyResultType;
+
+typedef void (*DNSServiceBrowserReply)(
+    DNSServiceBrowserReplyResultType resultType,                // One of DNSServiceBrowserReplyResultType
+    const char      *replyName,
+    const char      *replyType,
+    const char      *replyDomain,
+    DNSServiceDiscoveryReplyFlags flags,                        // DNS Service Discovery reply flags information
+    void            *context
+    );
+
+/*!
+    @function DNSServiceBrowserCreate
+    @discussion Asynchronously create a DNS Service browser
+    @param regtype The type of service
+    @param domain The domain in which to find the service
+    @param callBack The function to be called when service instances are found or removed
+    @param context A user specified context which will be passed to the callout function.
+    @result A dns_registration_t
+ */
+dns_service_discovery_ref DNSServiceBrowserCreate
+(
+    const char      *regtype,
+    const char      *domain,
+    DNSServiceBrowserReply callBack,
+    void        *context
+) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/***************************************************************************/
+/* Resolver requests */
+
+typedef void (*DNSServiceResolverReply)(
+    struct sockaddr     *interface,     // Needed for scoped addresses like link-local
+    struct sockaddr     *address,
+    const char          *txtRecord,
+    DNSServiceDiscoveryReplyFlags flags,                        // DNS Service Discovery reply flags information
+    void                *context
+    );
+
+/*!
+   @function DNSServiceResolverResolve
+    @discussion Resolved a named instance of a service to its address, port, and
+        (optionally) other demultiplexing information contained in the TXT record.
+    @param name The name of the service instance
+    @param regtype The type of service
+    @param domain The domain in which to find the service
+    @param callBack The DNSServiceResolverReply function to be called when the specified
+        address has been resolved.
+    @param context A user specified context which will be passed to the callout function.
+    @result A dns_registration_t
+ */
+
+dns_service_discovery_ref DNSServiceResolverResolve
+(
+    const char      *name,
+    const char      *regtype,
+    const char      *domain,
+    DNSServiceResolverReply callBack,
+    void        *context
+) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/***************************************************************************/
+/* Mach port accessor and deallocation */
+
+/*!
+    @function DNSServiceDiscoveryMachPort
+    @discussion Returns the mach port for a dns_service_discovery_ref
+    @param registration A dns_service_discovery_ref as returned from DNSServiceRegistrationCreate
+    @result A mach reply port which will be sent messages as appropriate.
+        These messages should be passed to the DNSServiceDiscovery_handleReply
+        function.  A NULL value indicates that no address was
+        specified or some other error occurred which prevented the
+        resolution from being started.
+ */
+mach_port_t DNSServiceDiscoveryMachPort(dns_service_discovery_ref dnsServiceDiscovery) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/*!
+    @function DNSServiceDiscoveryDeallocate
+    @discussion Deallocates the DNS Service Discovery type / closes the connection to the server
+    @param dnsServiceDiscovery A dns_service_discovery_ref as returned from a creation or enumeration call
+    @result void
+ */
+void DNSServiceDiscoveryDeallocate(dns_service_discovery_ref dnsServiceDiscovery) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/***************************************************************************/
+/* Registration updating */
+
+
+/*!
+    @function DNSServiceRegistrationAddRecord
+    @discussion Request that the mDNS Responder add the DNS Record of a specific type
+    @param dnsServiceDiscovery A dns_service_discovery_ref as returned from a DNSServiceRegistrationCreate call
+    @param rrtype A standard DNS Resource Record Type, from http://www.iana.org/assignments/dns-parameters
+    @param rdlen Length of the data
+    @param rdata Opaque binary Resource Record data, up to 64 kB.
+    @param ttl time to live for the added record.
+    @result DNSRecordReference An opaque reference that can be passed to the update and remove record calls.  If an error occurs, this value will be zero or negative
+ */
+DNSRecordReference DNSServiceRegistrationAddRecord(dns_service_discovery_ref dnsServiceDiscovery, uint16_t rrtype, uint16_t rdlen, const char *rdata, uint32_t ttl) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/*!
+    @function DNSServiceRegistrationUpdateRecord
+    @discussion Request that the mDNS Responder add the DNS Record of a specific type
+    @param dnsServiceDiscovery A dns_service_discovery_ref as returned from a DNSServiceRegistrationCreate call
+    @param dnsRecordReference A dnsRecordReference as returned from a DNSServiceRegistrationAddRecord call
+    @param rdlen Length of the data
+    @param rdata Opaque binary Resource Record data, up to 64 kB.
+    @param ttl time to live for the updated record.
+    @result DNSServiceRegistrationReplyErrorType If an error occurs, this value will be non zero
+ */
+DNSServiceRegistrationReplyErrorType DNSServiceRegistrationUpdateRecord(dns_service_discovery_ref ref, DNSRecordReference reference, uint16_t rdlen, const char *rdata, uint32_t ttl) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+/*!
+    @function DNSServiceRegistrationRemoveRecord
+    @discussion Request that the mDNS Responder remove the DNS Record(s) of a specific type
+    @param dnsServiceDiscovery A dns_service_discovery_ref as returned from a DNSServiceRegistrationCreate call
+    @param dnsRecordReference A dnsRecordReference as returned from a DNSServiceRegistrationAddRecord call
+    @result DNSServiceRegistrationReplyErrorType If an error occurs, this value will be non zero
+ */
+DNSServiceRegistrationReplyErrorType DNSServiceRegistrationRemoveRecord(dns_service_discovery_ref ref, DNSRecordReference reference) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3;
+
+
+__END_DECLS
+
+#endif  /* __DNS_SERVICE_DISCOVERY_H */
diff --git a/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryDefines.h b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryDefines.h
new file mode 100644
index 00000000..cfad0a41
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryDefines.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DNS_SERVICE_DISCOVERY_DEFINES_H
+#define __DNS_SERVICE_DISCOVERY_DEFINES_H
+
+#include <mach/mach_types.h>
+
+#define DNS_SERVICE_DISCOVERY_SERVER "com.apple.mDNSResponder"
+
+typedef char DNSCString[1024];
+typedef char sockaddr_t[128];
+
+typedef const char * record_data_t;
+typedef struct { char bytes[4]; } IPPort;
+
+#endif  /* __DNS_SERVICE_DISCOVERY_DEFINES_H */
diff --git a/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryReply.defs b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryReply.defs
new file mode 100644
index 00000000..b918bee4
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryReply.defs
@@ -0,0 +1,60 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+subsystem
+	DNSServiceDiscoveryReply 7250;
+
+ServerPrefix internal_;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+import "DNSServiceDiscoveryDefines.h";
+
+type DNSCString = c_string[*:1024];
+type sockaddr_t = array[128] of char;
+
+simpleroutine DNSServiceDomainEnumerationReply_rpc(
+				reply: mach_port_t;
+                        in	resultType: int;
+                        in	replyDomain: DNSCString;
+                        in 	flags: int;
+				SendTime 	to: natural_t);
+
+simpleroutine DNSServiceBrowserReply_rpc(
+				reply: mach_port_t;
+                        in	resultType: int;
+                        in	replyName: DNSCString;
+                        in	replyType: DNSCString;
+                        in	replyDomain: DNSCString;
+                        in 	flags: int;
+				SendTime 	to: natural_t);
+
+                        
+simpleroutine DNSServiceRegistrationReply_rpc(
+				reply: mach_port_t;
+                        in	resultType: int;
+				SendTime 	to: natural_t);
+
+
+simpleroutine DNSServiceResolverReply_rpc(
+				reply: mach_port_t;
+                        in	interface: sockaddr_t;
+                        in	address: sockaddr_t;
+                        in	txtRecord: DNSCString;
+                        in 	flags: int;
+				SendTime 	to: natural_t);
diff --git a/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryRequest.defs b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryRequest.defs
new file mode 100644
index 00000000..ad06bdb5
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/DNSServiceDiscoveryRequest.defs
@@ -0,0 +1,80 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+subsystem
+	DNSServiceDiscoveryRequest 7200;
+
+ServerPrefix provide_;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+import "DNSServiceDiscoveryDefines.h";
+
+type DNSCString = c_string[*:1024];
+type record_data = ^ array [] of MACH_MSG_TYPE_BYTE
+				ctype: record_data_t;
+type IPPort = struct[4] of char ctype:IPPort;				
+
+simpleroutine DNSServiceBrowserCreate_rpc(
+				server: mach_port_t;
+                        in	client: mach_port_t;
+						in	regtype: DNSCString;
+						in	domain: DNSCString);
+                                                
+
+simpleroutine DNSServiceDomainEnumerationCreate_rpc(
+				server: mach_port_t;
+                        in	client: mach_port_t;
+						in	registrationDomains: int);
+
+simpleroutine DNSServiceRegistrationCreate_rpc(
+				server: mach_port_t;
+                        in	client: mach_port_t;
+                        in	name: DNSCString;
+                        in	regtype: DNSCString;
+                        in	domain: DNSCString;
+                        in	port: IPPort;
+                        in	txtRecord: DNSCString);
+
+                        
+simpleroutine DNSServiceResolverResolve_rpc(
+				server: mach_port_t;
+                        in	client: mach_port_t;
+                        in	name: DNSCString;
+                        in	regtype: DNSCString;
+                        in	domain: DNSCString);
+
+routine DNSServiceRegistrationAddRecord_rpc(
+				server: mach_port_t;
+						in client: mach_port_t;
+						in record_type: int;
+						in record_data: record_data;
+						in ttl: uint32_t;
+						out record_reference: natural_t);
+
+simpleroutine DNSServiceRegistrationUpdateRecord_rpc(
+				server: mach_port_t;
+						in client: mach_port_t;
+                                                in record_reference: natural_t;
+						in record_data: record_data;
+						in ttl: uint32_t);
+
+simpleroutine DNSServiceRegistrationRemoveRecord_rpc(
+				server: mach_port_t;
+						in client: mach_port_t;
+						in record_reference: natural_t);
diff --git a/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.helper.plist b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.helper.plist
new file mode 100644
index 00000000..895287c7
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.helper.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>com.apple.mDNSResponderHelper</string>
+	<key>OnDemand</key>
+	<false/>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/sbin/mDNSResponderHelper</string>
+		<string>-t</string>
+		<string>0</string>
+	</array>
+	<key>ServiceIPC</key>
+	<false/>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.plist b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.plist
new file mode 100644
index 00000000..e91b7751
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo-Tiger.plist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>com.apple.mDNSResponder</string>
+	<key>OnDemand</key>
+	<false/>
+	<key>ProgramArguments</key>
+	<array>
+			<string>/usr/sbin/mDNSResponder</string>
+			<string>-launchdaemon</string>
+	</array>
+	<key>ServiceIPC</key>
+	<false/>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.dnsextd.plist b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.dnsextd.plist
new file mode 100644
index 00000000..e31b391f
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.dnsextd.plist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Disabled</key>
+	<true/>
+	<key>Label</key>
+	<string>com.apple.dnsextd</string>
+	<key>OnDemand</key>
+	<false/>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/sbin/dnsextd</string>
+		<string>-launchd</string>
+	</array>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.helper.plist b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.helper.plist
new file mode 100644
index 00000000..a21868c7
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.helper.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.apple.mDNSResponderHelper</string>
+  <key>OnDemand</key>
+  <true/>
+  <key>ProgramArguments</key>
+  <array>
+    <string>/usr/sbin/mDNSResponderHelper</string>
+  </array>
+  <key>MachServices</key>
+  <dict>
+    <key>com.apple.mDNSResponderHelper</key>
+    <true/>
+  </dict>
+  <key>EnableTransactions</key>
+  <true/>
+  <key>BeginTransactionAtShutdown</key>
+  <true/>
+  <key>POSIXSpawnType</key>
+  <string>Interactive</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.plist b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.plist
new file mode 100644
index 00000000..ba99d15d
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LaunchDaemonInfo.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>com.apple.mDNSResponder</string>
+	<key>OnDemand</key>
+	<false/>
+	<key>InitGroups</key>
+	<false/>
+	<key>UserName</key>
+	<string>_mdnsresponder</string>
+	<key>GroupName</key>
+	<string>_mdnsresponder</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/sbin/mDNSResponder</string>
+	</array>
+	<key>MachServices</key>
+	<dict>
+		<key>com.apple.mDNSResponder</key>
+		<true/>
+               <key>com.apple.mDNSResponder.dnsproxy</key>
+               <true/>
+	</dict>
+	<key>Sockets</key>
+	<dict>
+		<key>Listeners</key>
+		<dict>
+			<key>SockFamily</key>
+			<string>Unix</string>
+			<key>SockPathName</key>
+			<string>/var/run/mDNSResponder</string>
+			<key>SockPathMode</key>
+			<integer>438</integer>
+		</dict>
+	</dict>
+	<key>EnableTransactions</key>
+	<true/>
+	<key>BeginTransactionAtShutdown</key>
+	<true/>
+	<key>POSIXSpawnType</key>
+	<string>Interactive</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/LegacyNATTraversal.c b/mDNSResponder/mDNSMacOSX/LegacyNATTraversal.c
new file mode 100644
index 00000000..e7cd65f0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/LegacyNATTraversal.c
@@ -0,0 +1,933 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef _LEGACY_NAT_TRAVERSAL_
+
+#include "stdlib.h"         // For strtol()
+#include "string.h"         // For strlcpy(), For strncpy(), strncasecmp()
+#include "assert.h"         // For assert()
+
+#if defined( WIN32 )
+#   include <winsock2.h>
+#   include <ws2tcpip.h>
+#   define strcasecmp   _stricmp
+#   define strncasecmp  _strnicmp
+#   define mDNSASLLog( UUID, SUBDOMAIN, RESULT, SIGNATURE, FORMAT, ... ) ;
+
+static int
+inet_pton( int family, const char * addr, void * dst )
+{
+    struct sockaddr_storage ss;
+    int sslen = sizeof( ss );
+
+    ZeroMemory( &ss, sizeof( ss ) );
+    ss.ss_family = (ADDRESS_FAMILY)family;
+
+    if ( WSAStringToAddressA( (LPSTR)addr, family, NULL, ( struct sockaddr* ) &ss, &sslen ) == 0 )
+    {
+        if ( family == AF_INET ) { memcpy( dst, &( ( struct sockaddr_in* ) &ss)->sin_addr, sizeof( IN_ADDR ) ); return 1; }
+        else if ( family == AF_INET6 ) { memcpy( dst, &( ( struct sockaddr_in6* ) &ss)->sin6_addr, sizeof( IN6_ADDR ) ); return 1; }
+        else return 0;
+    }
+    else return 0;
+}
+#else
+#   include <arpa/inet.h>       // For inet_pton()
+#endif
+
+#include "mDNSEmbeddedAPI.h"
+#include "uDNS.h"           // For natTraversalHandleAddressReply() etc.
+
+// used to format SOAP port mapping arguments
+typedef struct Property_struct
+{
+    char *name;
+    char *type;
+    char *value;
+} Property;
+
+// All of the text parsing in this file is intentionally transparent so that we know exactly
+// what's being done to the text, with an eye towards preventing security problems.
+
+// This is an evolving list of useful acronyms to know. Please add to it at will.
+// ST      Service Type
+// NT      Notification Type
+// USN     Unique Service Name
+// UDN     Unique Device Name
+// UUID    Universally Unique Identifier
+// URN/urn Universal Resource Name
+
+// Forward declaration because of circular reference:
+// SendPortMapRequest -> SendSOAPMsgControlAction -> MakeTCPConnection -> tcpConnectionCallback -> handleLNTPortMappingResponse
+// In the event of a port conflict, handleLNTPortMappingResponse then increments tcpInfo->retries and calls back to SendPortMapRequest to try again
+mDNSlocal mStatus SendPortMapRequest(mDNS *m, NATTraversalInfo *n);
+
+#define RequestedPortNum(n) (mDNSVal16(mDNSIPPortIsZero((n)->RequestedPort) ? (n)->IntPort : (n)->RequestedPort) + (mDNSu16)(n)->tcpInfo.retries)
+
+// Note that this function assumes src is already NULL terminated
+mDNSlocal void AllocAndCopy(mDNSu8 **const dst, const mDNSu8 *const src)
+{
+    if (src == mDNSNULL) return;
+    if ((*dst = mDNSPlatformMemAllocate((mDNSu32)strlen((char*)src) + 1)) == mDNSNULL)
+    { LogMsg("AllocAndCopy: can't allocate string"); return; }
+    strcpy((char*)*dst, (char*)src);
+}
+
+// This function does a simple parse of an HTTP URL that may include a hostname, port, and path
+// If found in the URL, addressAndPort and path out params will point to newly allocated space (and will leak if they were previously pointing at allocated space)
+mDNSlocal mStatus ParseHttpUrl(const mDNSu8 *ptr, const mDNSu8 *const end, mDNSu8 **const addressAndPort, mDNSIPPort *const port, mDNSu8 **const path)
+{
+    // if the data begins with "http://", we assume there is a hostname and possibly a port number
+    if (end - ptr >= 7 && strncasecmp((char*)ptr, "http://", 7) == 0)
+    {
+        int i;
+        const mDNSu8 *stop = end;
+        const mDNSu8 *addrPtr = mDNSNULL;
+
+        ptr += 7; //skip over "http://"
+        if (ptr >= end) { LogInfo("ParseHttpUrl: past end of buffer parsing host:port"); return mStatus_BadParamErr; }
+
+        // find the end of the host:port
+        addrPtr = ptr;
+        for (i = 0; addrPtr && addrPtr != end; i++, addrPtr++) if (*addrPtr == '/') break;
+
+        // allocate the buffer (len i+1 so we have space to terminate the string)
+        if ((*addressAndPort = mDNSPlatformMemAllocate(i+1)) == mDNSNULL)
+        { LogMsg("ParseHttpUrl: can't allocate address string"); return mStatus_NoMemoryErr; }
+        strncpy((char*)*addressAndPort, (char*)ptr, i);
+        (*addressAndPort)[i] = '\0';
+
+        // find the port number in the string, by looking backwards for the ':'
+        stop = ptr;    // can't go back farther than the original start
+        ptr = addrPtr; // move ptr to the path part
+
+        for (addrPtr--; addrPtr>stop; addrPtr--)
+        {
+            if (*addrPtr == ':')
+            {
+                addrPtr++; // skip over ':'
+                *port = mDNSOpaque16fromIntVal((mDNSu16)strtol((char*)addrPtr, mDNSNULL, 10)); // store it properly converted
+                break;
+            }
+        }
+    }
+
+    // ptr should now point to the first character we haven't yet processed
+    // everything that remains is the path
+    if (path && ptr < end)
+    {
+        if ((*path = mDNSPlatformMemAllocate((mDNSu32)(end - ptr) + 1)) == mDNSNULL)
+        { LogMsg("ParseHttpUrl: can't mDNSPlatformMemAllocate path"); return mStatus_NoMemoryErr; }
+        strncpy((char*)*path, (char*)ptr, end - ptr);
+        (*path)[end - ptr] = '\0';
+    }
+
+    return mStatus_NoError;
+}
+
+enum
+{
+    HTTPCode_NeedMoreData = -1, // No code found in stream
+    HTTPCode_Other        = -2, // Valid code other than those below found in stream
+    HTTPCode_Bad          = -3,
+    HTTPCode_200          = 200,
+    HTTPCode_404          = 404,
+    HTTPCode_500          = 500,
+};
+
+mDNSlocal mDNSs16 ParseHTTPResponseCode(const mDNSu8 **const data, const mDNSu8 *const end)
+{
+    const mDNSu8 *ptr = *data;
+    const mDNSu8 *code;
+
+    if (end - ptr < 5) return HTTPCode_NeedMoreData;
+    if (strncasecmp((char*)ptr, "HTTP/", 5) != 0) return HTTPCode_Bad;
+    ptr += 5;
+    // should we care about the HTTP protocol version?
+
+    // look for first space, which must come before first LF
+    while (ptr && ptr != end)
+    {
+        if (*ptr == '\n') return HTTPCode_Bad;
+        if (*ptr == ' ') break;
+        ptr++;
+    }
+    if (ptr == end) return HTTPCode_NeedMoreData;
+    ptr++;
+
+    if (end - ptr < 3) return HTTPCode_NeedMoreData;
+
+    code = ptr;
+    ptr += 3;
+    while (ptr && ptr != end)
+    {
+        if (*ptr == '\n') break;
+        ptr++;
+    }
+    if (ptr == end) return HTTPCode_NeedMoreData;
+    *data = ++ptr;
+
+    if (memcmp((char*)code, "200", 3) == 0) return HTTPCode_200;
+    if (memcmp((char*)code, "404", 3) == 0) return HTTPCode_404;
+    if (memcmp((char*)code, "500", 3) == 0) return HTTPCode_500;
+
+    LogInfo("ParseHTTPResponseCode found unexpected result code: %c%c%c", code[0], code[1], code[2]);
+    return HTTPCode_Other;
+}
+
+// This function parses the xml body of the device description response from the router. Basically, we look to
+// make sure this is a response referencing a service we care about (WANIPConnection or WANPPPConnection),
+// look for the "controlURL" header immediately following, and copy the addressing and URL info we need
+mDNSlocal void handleLNTDeviceDescriptionResponse(tcpLNTInfo *tcpInfo)
+{
+    mDNS    *m    = tcpInfo->m;
+    const mDNSu8 *ptr  = tcpInfo->Reply;
+    const mDNSu8 *end  = tcpInfo->Reply + tcpInfo->nread;
+    const mDNSu8 *stop;
+    mDNSs16 http_result;
+
+    if (!mDNSIPPortIsZero(m->UPnPSOAPPort)) return; // already have the info we need
+
+    http_result = ParseHTTPResponseCode(&ptr, end); // Note: modifies ptr
+    if (http_result == HTTPCode_404) LNT_ClearState(m);
+    if (http_result != HTTPCode_200)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.DeviceDescription", "noop", "HTTP Result", "HTTP code: %d", http_result);
+        return;
+    }
+
+    // Always reset our flag to use WANIPConnection.  We'll use WANPPPConnection if we find it and don't find WANIPConnection.
+    m->UPnPWANPPPConnection = mDNSfalse;
+
+    // find either service we care about
+    while (ptr && ptr < end)
+    {
+        if ((*ptr & 0xDF) == 'W' && (strncasecmp((char*)ptr, "WANIPConnection:1", 17) == 0)) break;
+        ptr++;
+    }
+    if (ptr == end)
+    {
+        ptr = tcpInfo->Reply;
+        while (ptr && ptr < end)
+        {
+            if ((*ptr & 0xDF) == 'W' && (strncasecmp((char*)ptr, "WANPPPConnection:1", 18) == 0))
+            {
+                m->UPnPWANPPPConnection = mDNStrue;
+                break;
+            }
+            ptr++;
+        }
+    }
+    if (ptr == mDNSNULL || ptr == end) { LogInfo("handleLNTDeviceDescriptionResponse: didn't find WANIPConnection:1 or WANPPPConnection:1 string"); return; }
+
+    // find "controlURL", starting from where we left off
+    while (ptr && ptr < end)
+    {
+        if ((*ptr & 0xDF) == 'C' && (strncasecmp((char*)ptr, "controlURL", 10) == 0)) break;            // find the first 'c'; is this controlURL? if not, keep looking
+        ptr++;
+    }
+    if (ptr == mDNSNULL || ptr == end) { LogInfo("handleLNTDeviceDescriptionResponse: didn't find controlURL string"); return; }
+    ptr += 11;                          // skip over "controlURL>"
+    if (ptr >= end) { LogInfo("handleLNTDeviceDescriptionResponse: past end of buffer and no body!"); return; } // check ptr again in case we skipped over the end of the buffer
+
+    // find the end of the controlURL element
+    for (stop = ptr; stop < end; stop++) { if (*stop == '<') { end = stop; break; } }
+
+    // fill in default port
+    m->UPnPSOAPPort = m->UPnPRouterPort;
+
+    // free string pointers and set to NULL
+    if (m->UPnPSOAPAddressString != mDNSNULL)
+    {
+        mDNSPlatformMemFree(m->UPnPSOAPAddressString);
+        m->UPnPSOAPAddressString = mDNSNULL;
+    }
+    if (m->UPnPSOAPURL != mDNSNULL)
+    {
+        mDNSPlatformMemFree(m->UPnPSOAPURL);
+        m->UPnPSOAPURL = mDNSNULL;
+    }
+
+    if (ParseHttpUrl(ptr, end, &m->UPnPSOAPAddressString, &m->UPnPSOAPPort, &m->UPnPSOAPURL) != mStatus_NoError) return;
+    // the SOAPURL should look something like "/uuid:0013-108c-4b3f0000f3dc"
+
+    if (m->UPnPSOAPAddressString == mDNSNULL)
+    {
+        ptr = tcpInfo->Reply;
+        while (ptr && ptr < end)
+        {
+            if ((*ptr & 0xDF) == 'U' && (strncasecmp((char*)ptr, "URLBase", 7) == 0)) break;
+            ptr++;
+        }
+
+        if (ptr < end)      // found URLBase
+        {
+            LogInfo("handleLNTDeviceDescriptionResponse: found URLBase");
+            ptr += 8; // skip over "URLBase>"
+            // find the end of the URLBase element
+            for (stop = ptr; stop < end; stop++) { if (*stop == '<') { end = stop; break; } }
+            if (ParseHttpUrl(ptr, end, &m->UPnPSOAPAddressString, &m->UPnPSOAPPort, mDNSNULL) != mStatus_NoError)
+            {
+                LogInfo("handleLNTDeviceDescriptionResponse: failed to parse URLBase");
+            }
+        }
+
+        // if all else fails, use the router address string
+        if (m->UPnPSOAPAddressString == mDNSNULL) AllocAndCopy(&m->UPnPSOAPAddressString, m->UPnPRouterAddressString);
+    }
+    if (m->UPnPSOAPAddressString == mDNSNULL) LogMsg("handleLNTDeviceDescriptionResponse: UPnPSOAPAddressString is NULL");
+    else LogInfo("handleLNTDeviceDescriptionResponse: SOAP address string [%s]", m->UPnPSOAPAddressString);
+
+    if (m->UPnPSOAPURL == mDNSNULL) AllocAndCopy(&m->UPnPSOAPURL, m->UPnPRouterURL);
+    if (m->UPnPSOAPURL == mDNSNULL) LogMsg("handleLNTDeviceDescriptionResponse: UPnPSOAPURL is NULL");
+    else LogInfo("handleLNTDeviceDescriptionResponse: SOAP URL [%s]", m->UPnPSOAPURL);
+}
+
+mDNSlocal void handleLNTGetExternalAddressResponse(tcpLNTInfo *tcpInfo)
+{
+    mDNS       *m = tcpInfo->m;
+    mDNSu16 err = NATErr_None;
+    mDNSv4Addr ExtAddr;
+    const mDNSu8 *ptr = tcpInfo->Reply;
+    const mDNSu8 *end = tcpInfo->Reply + tcpInfo->nread;
+    mDNSu8       *addrend;
+    static char tagname[20] = { 'N','e','w','E','x','t','e','r','n','a','l','I','P','A','d','d','r','e','s','s' };
+    // Array NOT including a terminating nul
+
+//	LogInfo("handleLNTGetExternalAddressResponse: %s", ptr);
+
+    mDNSs16 http_result = ParseHTTPResponseCode(&ptr, end); // Note: modifies ptr
+    if (http_result == HTTPCode_404) LNT_ClearState(m);
+    if (http_result != HTTPCode_200)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.AddressRequest", "noop", "HTTP Result", "HTTP code: %d", http_result);
+        return;
+    }
+
+    while (ptr < end && strncasecmp((char*)ptr, tagname, sizeof(tagname))) ptr++;
+    ptr += sizeof(tagname);                     // Skip over "NewExternalIPAddress"
+    while (ptr < end && *ptr != '>') ptr++;
+    ptr += 1;                                   // Skip over ">"
+
+    // Find the end of the address and terminate the string so inet_pton() can convert it
+    // (Might be better to copy this to a local string here -- this is overwriting tcpInfo->Reply in-place
+    addrend = (mDNSu8*)ptr;
+    while (addrend < end && (mDNSIsDigit(*addrend) || *addrend == '.')) addrend++;
+    if (addrend >= end) return;
+    *addrend = 0;
+
+    if (inet_pton(AF_INET, (char*)ptr, &ExtAddr) <= 0)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.AddressRequest", "noop", "inet_pton", "");
+        LogMsg("handleLNTGetExternalAddressResponse: Router returned bad address %s", ptr);
+        err = NATErr_NetFail;
+        ExtAddr = zerov4Addr;
+    }
+    if (!err) LogInfo("handleLNTGetExternalAddressResponse: External IP address is %.4a", &ExtAddr);
+
+    natTraversalHandleAddressReply(m, err, ExtAddr);
+}
+
+mDNSlocal void handleLNTPortMappingResponse(tcpLNTInfo *tcpInfo)
+{
+    mDNS             *m         = tcpInfo->m;
+    mDNSIPPort extport   = zeroIPPort;
+    const mDNSu8     *ptr       = tcpInfo->Reply;
+    const mDNSu8     *const end = tcpInfo->Reply + tcpInfo->nread;
+    NATTraversalInfo *natInfo;
+    mDNSs16 http_result;
+
+    for (natInfo = m->NATTraversals; natInfo; natInfo=natInfo->next) { if (natInfo == tcpInfo->parentNATInfo) break;}
+
+    if (!natInfo) { LogInfo("handleLNTPortMappingResponse: can't find matching tcpInfo in NATTraversals!"); return; }
+
+    http_result = ParseHTTPResponseCode(&ptr, end); // Note: modifies ptr
+    if (http_result == HTTPCode_200)
+    {
+        LogInfo("handleLNTPortMappingResponse: got a valid response, sending reply to natTraversalHandlePortMapReply(internal %d external %d retries %d)",
+                mDNSVal16(natInfo->IntPort), RequestedPortNum(natInfo), tcpInfo->retries);
+
+        // Make sure to compute extport *before* we zero tcpInfo->retries
+        extport = mDNSOpaque16fromIntVal(RequestedPortNum(natInfo));
+        tcpInfo->retries = 0;
+        natTraversalHandlePortMapReply(m, natInfo, m->UPnPInterfaceID, mStatus_NoError, extport, NATMAP_DEFAULT_LEASE, NATTProtocolUPNPIGD);
+    }
+    else if (http_result == HTTPCode_500)
+    {
+        while (ptr && ptr != end)
+        {
+            if (((*ptr & 0xDF) == 'C' && end - ptr >= 8 && strncasecmp((char*)ptr, "Conflict", 8) == 0) ||
+                (*ptr == '>' && end - ptr >= 15 && strncasecmp((char*)ptr, ">718</errorCode", 15) == 0))
+            {
+                if (tcpInfo->retries < 100)
+                {
+                    tcpInfo->retries++; SendPortMapRequest(tcpInfo->m, natInfo);
+                    mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.PortMapRequest", "noop", "Conflict", "Retry %d", tcpInfo->retries);
+                }
+                else
+                {
+                    LogMsg("handleLNTPortMappingResponse too many conflict retries %d %d", mDNSVal16(natInfo->IntPort), mDNSVal16(natInfo->RequestedPort));
+                    mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.PortMapRequest", "noop", "Conflict - too many retries", "Retries: %d", tcpInfo->retries);
+                    natTraversalHandlePortMapReply(m, natInfo, m->UPnPInterfaceID, NATErr_Res, zeroIPPort, 0, NATTProtocolUPNPIGD);
+                }
+                return;
+            }
+            ptr++;
+        }
+    }
+    else if (http_result == HTTPCode_Bad) LogMsg("handleLNTPortMappingResponse got data that was not a valid HTTP response");
+    else if (http_result == HTTPCode_Other) LogMsg("handleLNTPortMappingResponse got unexpected response code");
+    else if (http_result == HTTPCode_404) LNT_ClearState(m);
+    if (http_result != HTTPCode_200 && http_result != HTTPCode_500)
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.PortMapRequest", "noop", "HTTP Result", "HTTP code: %d", http_result);
+}
+
+mDNSlocal void DisposeInfoFromUnmapList(mDNS *m, tcpLNTInfo *tcpInfo)
+{
+    tcpLNTInfo **ptr = &m->tcpInfoUnmapList;
+    while (*ptr && *ptr != tcpInfo) ptr = &(*ptr)->next;
+    if (*ptr) { *ptr = (*ptr)->next; mDNSPlatformMemFree(tcpInfo); }    // If we found it, cut it from our list and free the memory
+}
+
+mDNSlocal void tcpConnectionCallback(TCPSocket *sock, void *context, mDNSBool ConnectionEstablished, mStatus err)
+{
+    mStatus status  = mStatus_NoError;
+    tcpLNTInfo *tcpInfo = (tcpLNTInfo *)context;
+    mDNSBool closed  = mDNSfalse;
+    long n       = 0;
+    long nsent   = 0;
+    static int LNTERRORcount = 0;
+
+    if (tcpInfo == mDNSNULL) { LogInfo("tcpConnectionCallback: no tcpInfo context"); status = mStatus_Invalid; goto exit; }
+    
+    if (tcpInfo->sock != sock)
+    {
+        LogMsg("tcpConnectionCallback: WARNING- tcpInfo->sock(%p) != sock(%p) !!! Printing tcpInfo struct", tcpInfo->sock, sock);
+        LogMsg("tcpConnectionCallback: tcpInfo->Address:Port [%#a:%d] tcpInfo->op[%d] tcpInfo->retries[%d] tcpInfo->Request[%s] tcpInfo->Reply[%s]", 
+                &tcpInfo->Address, mDNSVal16(tcpInfo->Port), tcpInfo->op, tcpInfo->retries, tcpInfo->Request, tcpInfo->Reply);  
+    }
+        
+    // The handlers below expect to be called with the lock held
+    mDNS_Lock(tcpInfo->m);
+
+    if (err) { LogInfo("tcpConnectionCallback: received error"); goto exit; }
+
+    if (ConnectionEstablished)      // connection is established - send the message
+    {
+        LogInfo("tcpConnectionCallback: connection established, sending message");
+        nsent = mDNSPlatformWriteTCP(sock, (char*)tcpInfo->Request, tcpInfo->requestLen);
+        if (nsent != (long)tcpInfo->requestLen) { LogMsg("tcpConnectionCallback: error writing"); status = mStatus_UnknownErr; goto exit; }
+    }
+    else
+    {
+        n = mDNSPlatformReadTCP(sock, (char*)tcpInfo->Reply + tcpInfo->nread, tcpInfo->replyLen - tcpInfo->nread, &closed);
+        LogInfo("tcpConnectionCallback: mDNSPlatformReadTCP read %d bytes", n);
+
+        if      (n < 0)  { LogInfo("tcpConnectionCallback - read returned %d", n);                           status = mStatus_ConnFailed; goto exit; }
+        else if (closed) { LogInfo("tcpConnectionCallback: socket closed by remote end %d", tcpInfo->nread); status = mStatus_ConnFailed; goto exit; }
+
+        tcpInfo->nread += n;
+        LogInfo("tcpConnectionCallback tcpInfo->nread %d", tcpInfo->nread);
+        if (tcpInfo->nread > LNT_MAXBUFSIZE)
+        {
+            LogInfo("result truncated...");
+            tcpInfo->nread = LNT_MAXBUFSIZE;
+        }
+
+        switch (tcpInfo->op)
+        {
+        case LNTDiscoveryOp:     handleLNTDeviceDescriptionResponse (tcpInfo); break;
+        case LNTExternalAddrOp:  handleLNTGetExternalAddressResponse(tcpInfo); break;
+        case LNTPortMapOp:       handleLNTPortMappingResponse       (tcpInfo); break;
+        case LNTPortMapDeleteOp: status = mStatus_ConfigChanged;               break;
+        default: LogMsg("tcpConnectionCallback: bad tcp operation! %d", tcpInfo->op); status = mStatus_Invalid; break;
+        }
+    }
+exit:
+    if (err || status)
+    {
+        mDNS   *m = tcpInfo->m;
+        if ((++LNTERRORcount % 1000) == 0)
+        {   
+            LogMsg("ERROR: tcpconnectioncallback -> got error status %d times", LNTERRORcount);
+            assert(LNTERRORcount < 1000);
+            // Recovery Mechanism to bail mDNSResponder out of trouble: It has been seen that we can get into 
+            // this loop: [tcpKQSocketCallback()--> doTcpSocketCallback()-->tcpconnectionCallback()-->mDNSASLLog()],
+            // if mDNSPlatformTCPCloseConnection() does not close the TCPSocket. Instead of calling mDNSASLLog()
+            // repeatedly and logging the same error msg causing 100% CPU usage, we 
+            // crash mDNSResponder using assert() and restart fresh. See advantages below:
+            // 1.Better User Experience 
+            // 2.CrashLogs frequency can be monitored 
+            // 3.StackTrace can be used for more info 
+        }   
+
+        switch (tcpInfo->op)
+        {
+        case LNTDiscoveryOp:     if (m->UPnPSOAPAddressString == mDNSNULL)
+                mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.DeviceDescription", "failure", "SOAP Address", "");
+            if (m->UPnPSOAPURL == mDNSNULL)
+                mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.DeviceDescription", "failure", "SOAP path", "");
+            if (m->UPnPSOAPAddressString && m->UPnPSOAPURL)
+                mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.DeviceDescription", "success", "success", "");
+            break;
+        case LNTExternalAddrOp:  mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.AddressRequest",
+                                            mDNSIPv4AddressIsZero(m->ExtAddress) ? "failure" : "success",
+                                            mDNSIPv4AddressIsZero(m->ExtAddress) ? "failure" : "success", "");
+            break;
+        case LNTPortMapOp:       if (tcpInfo->parentNATInfo)
+                mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.PortMapRequest", (tcpInfo->parentNATInfo->Result) ? "failure" : "success",
+                           (tcpInfo->parentNATInfo->Result) ? "failure" : "success", "Result: %d", tcpInfo->parentNATInfo->Result);
+            break;
+        case LNTPortMapDeleteOp: break;
+        default:                 break;
+        }
+
+        mDNSPlatformTCPCloseConnection(sock);
+        tcpInfo->sock = mDNSNULL;
+        if (tcpInfo->Request) { mDNSPlatformMemFree(tcpInfo->Request); tcpInfo->Request = mDNSNULL; }
+        if (tcpInfo->Reply  ) { mDNSPlatformMemFree(tcpInfo->Reply);   tcpInfo->Reply   = mDNSNULL; }
+    }
+    else
+    {
+        LNTERRORcount = 0;  // clear LNTERRORcount
+    }
+
+    if (tcpInfo) mDNS_Unlock(tcpInfo->m);
+
+    if (status == mStatus_ConfigChanged) DisposeInfoFromUnmapList(tcpInfo->m, tcpInfo);
+}
+
+mDNSlocal mStatus MakeTCPConnection(mDNS *const m, tcpLNTInfo *info, const mDNSAddr *const Addr, const mDNSIPPort Port, LNTOp_t op)
+{
+    mStatus err = mStatus_NoError;
+    mDNSIPPort srcport = zeroIPPort;
+
+    if (mDNSIPv4AddressIsZero(Addr->ip.v4) || mDNSIPPortIsZero(Port))
+    { LogMsg("LNT MakeTCPConnection: bad address/port %#a:%d", Addr, mDNSVal16(Port)); return(mStatus_Invalid); }
+    info->m         = m;
+    info->Address   = *Addr;
+    info->Port      = Port;
+    info->op        = op;
+    info->nread     = 0;
+    info->replyLen  = LNT_MAXBUFSIZE;
+    if      (info->Reply != mDNSNULL) mDNSPlatformMemZero(info->Reply, LNT_MAXBUFSIZE);   // reuse previously allocated buffer
+    else if ((info->Reply = mDNSPlatformMemAllocate(LNT_MAXBUFSIZE)) == mDNSNULL) { LogInfo("can't allocate reply buffer"); return (mStatus_NoMemoryErr); }
+
+    if (info->sock) { LogInfo("MakeTCPConnection: closing previous open connection"); mDNSPlatformTCPCloseConnection(info->sock); info->sock = mDNSNULL; }
+    info->sock = mDNSPlatformTCPSocket(m, kTCPSocketFlags_Zero, &srcport, mDNSfalse);
+    if (!info->sock) { LogMsg("LNT MakeTCPConnection: unable to create TCP socket"); mDNSPlatformMemFree(info->Reply); info->Reply = mDNSNULL; return(mStatus_NoMemoryErr); }
+    LogInfo("MakeTCPConnection: connecting to %#a:%d", &info->Address, mDNSVal16(info->Port));
+    err = mDNSPlatformTCPConnect(info->sock, Addr, Port, mDNSNULL, 0, tcpConnectionCallback, info);
+
+    if      (err == mStatus_ConnPending) err = mStatus_NoError;
+    else if (err == mStatus_ConnEstablished)
+    {
+        mDNS_DropLockBeforeCallback();
+        tcpConnectionCallback(info->sock, info, mDNStrue, mStatus_NoError);
+        mDNS_ReclaimLockAfterCallback();
+        err = mStatus_NoError;
+    }
+    else
+    {
+        // Don't need to log this in customer builds -- it happens quite often during sleep, wake, configuration changes, etc.
+        LogInfo("LNT MakeTCPConnection: connection failed");
+        mDNSPlatformTCPCloseConnection(info->sock); // Dispose the socket we created with mDNSPlatformTCPSocket() above
+        info->sock = mDNSNULL;
+        mDNSPlatformMemFree(info->Reply);
+        info->Reply = mDNSNULL;
+    }
+    return(err);
+}
+
+mDNSlocal unsigned int AddSOAPArguments(char *const buf, const unsigned int maxlen, const int numArgs, const Property *const a)
+{
+    static const char f1[] = "<%s>%s</%s>";
+    static const char f2[] = "<%s xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"%s\">%s</%s>";
+    int i, len = 0;
+    *buf = 0;
+    for (i = 0; i < numArgs; i++)
+    {
+        if (a[i].type) len += mDNS_snprintf(buf + len, maxlen - len, f2, a[i].name, a[i].type, a[i].value, a[i].name);
+        else len += mDNS_snprintf(buf + len, maxlen - len, f1, a[i].name,            a[i].value, a[i].name);
+    }
+    return(len);
+}
+
+mDNSlocal mStatus SendSOAPMsgControlAction(mDNS *m, tcpLNTInfo *info, const char *const Action, const int numArgs, const Property *const Arguments, const LNTOp_t op)
+{
+    // SOAP message header format -
+    //  - control URL
+    //  - action (string)
+    //  - router's host/port ("host:port")
+    //  - content-length
+    static const char header[] =
+        "POST %s HTTP/1.1\r\n"
+        "Content-Type: text/xml; charset=\"utf-8\"\r\n"
+        "SOAPAction: \"urn:schemas-upnp-org:service:WAN%sConnection:1#%s\"\r\n"
+        "User-Agent: Mozilla/4.0 (compatible; UPnP/1.0; Windows 9x)\r\n"
+        "Host: %s\r\n"
+        "Content-Length: %d\r\n"
+        "Connection: close\r\n"
+        "Pragma: no-cache\r\n"
+        "\r\n"
+        "%s\r\n";
+
+    static const char body1[] =
+        "<?xml version=\"1.0\"?>\r\n"
+        "<SOAP-ENV:Envelope"
+        " xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\""
+        " SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+        "<SOAP-ENV:Body>"
+        "<m:%s xmlns:m=\"urn:schemas-upnp-org:service:WAN%sConnection:1\">";
+
+    static const char body2[] =
+        "</m:%s>"
+        "</SOAP-ENV:Body>"
+        "</SOAP-ENV:Envelope>\r\n";
+
+    mStatus err;
+    char   *body = (char*)&m->omsg;         // Typically requires 1110-1122 bytes; m->omsg is 8952 bytes, which is plenty
+    int bodyLen;
+
+    if (mDNSIPPortIsZero(m->UPnPSOAPPort) || m->UPnPSOAPURL == mDNSNULL || m->UPnPSOAPAddressString == mDNSNULL)    // if no SOAP URL or address exists get out here
+    { LogInfo("SendSOAPMsgControlAction: no SOAP port, URL or address string"); return mStatus_Invalid; }
+
+    // Create body
+    bodyLen  = mDNS_snprintf   (body,           sizeof(m->omsg),           body1,   Action,   m->UPnPWANPPPConnection ? "PPP" : "IP");
+    bodyLen += AddSOAPArguments(body + bodyLen, sizeof(m->omsg) - bodyLen, numArgs, Arguments);
+    bodyLen += mDNS_snprintf   (body + bodyLen, sizeof(m->omsg) - bodyLen, body2,   Action);
+
+    // Create info->Request; the header needs to contain the bodyLen in the "Content-Length" field
+    if (!info->Request) info->Request = mDNSPlatformMemAllocate(LNT_MAXBUFSIZE);
+    if (!info->Request) { LogMsg("SendSOAPMsgControlAction: Can't allocate info->Request"); return mStatus_NoMemoryErr; }
+    info->requestLen = mDNS_snprintf((char*)info->Request, LNT_MAXBUFSIZE, header, m->UPnPSOAPURL, m->UPnPWANPPPConnection ? "PPP" : "IP", Action, m->UPnPSOAPAddressString, bodyLen, body);
+
+    err = MakeTCPConnection(m, info, &m->Router, m->UPnPSOAPPort, op);
+    if (err) { mDNSPlatformMemFree(info->Request); info->Request = mDNSNULL; }
+    return err;
+}
+
+// Build port mapping request with new port (up to max) and send it
+mDNSlocal mStatus SendPortMapRequest(mDNS *m, NATTraversalInfo *n)
+{
+    char externalPort[6];
+    char internalPort[6];
+    char localIPAddrString[30];
+    char publicPortString[40];
+    Property propArgs[8];
+    mDNSu16 ReqPortNum = RequestedPortNum(n);
+    NATTraversalInfo *n2 = m->NATTraversals;
+
+    // Scan our m->NATTraversals list to make sure the external port we're requesting is locally unique.
+    // UPnP gateways will report conflicts if different devices request the same external port, but if two
+    // clients on the same device request the same external port the second one just stomps over the first.
+    // One way this can happen is like this:
+    // 1. Client A binds local port 80
+    // 2. Client A requests external port 80 -> internal port 80
+    // 3. UPnP NAT gateway refuses external port 80 (some other client already has it)
+    // 4. Client A tries again, and successfully gets external port 80 -> internal port 81
+    // 5. Client B on same machine tries to bind local port 80, and fails
+    // 6. Client B tries again, and successfully binds local port 81
+    // 7. Client B now requests external port 81 -> internal port 81
+    // 8. UPnP NAT gateway allows this, stomping over Client A's existing mapping
+
+    while (n2)
+    {
+        if (n2 == n || RequestedPortNum(n2) != ReqPortNum) n2=n2->next;
+        else
+        {
+            if (n->tcpInfo.retries < 100)
+            {
+                n->tcpInfo.retries++;
+                ReqPortNum = RequestedPortNum(n);   // Pick a new port number
+                n2 = m->NATTraversals;              // And re-scan the list looking for conflicts
+            }
+            else
+            {
+                natTraversalHandlePortMapReply(m, n, m->UPnPInterfaceID, NATErr_Res, zeroIPPort, 0, NATTProtocolUPNPIGD);
+                return mStatus_NoError;
+            }
+        }
+    }
+
+    // create strings to use in the message
+    mDNS_snprintf(externalPort,      sizeof(externalPort),      "%u",   ReqPortNum);
+    mDNS_snprintf(internalPort,      sizeof(internalPort),      "%u",   mDNSVal16(n->IntPort));
+    mDNS_snprintf(publicPortString,  sizeof(publicPortString),  "iC%u", ReqPortNum);
+    mDNS_snprintf(localIPAddrString, sizeof(localIPAddrString), "%u.%u.%u.%u",
+                  m->AdvertisedV4.ip.v4.b[0], m->AdvertisedV4.ip.v4.b[1], m->AdvertisedV4.ip.v4.b[2], m->AdvertisedV4.ip.v4.b[3]);
+
+    // build the message
+    mDNSPlatformMemZero(propArgs, sizeof(propArgs));
+    propArgs[0].name  = "NewRemoteHost";
+    propArgs[0].type  = "string";
+    propArgs[0].value = "";
+    propArgs[1].name  = "NewExternalPort";
+    propArgs[1].type  = "ui2";
+    propArgs[1].value = externalPort;
+    propArgs[2].name  = "NewProtocol";
+    propArgs[2].type  = "string";
+    propArgs[2].value = (n->Protocol == NATOp_MapUDP) ? "UDP" : "TCP";
+    propArgs[3].name  = "NewInternalPort";
+    propArgs[3].type  = "ui2";
+    propArgs[3].value = internalPort;
+    propArgs[4].name  = "NewInternalClient";
+    propArgs[4].type  = "string";
+    propArgs[4].value = localIPAddrString;
+    propArgs[5].name  = "NewEnabled";
+    propArgs[5].type  = "boolean";
+    propArgs[5].value = "1";
+    propArgs[6].name  = "NewPortMappingDescription";
+    propArgs[6].type  = "string";
+    propArgs[6].value = publicPortString;
+    propArgs[7].name  = "NewLeaseDuration";
+    propArgs[7].type  = "ui4";
+    propArgs[7].value = "0";
+
+    LogInfo("SendPortMapRequest: internal %u external %u", mDNSVal16(n->IntPort), ReqPortNum);
+    return SendSOAPMsgControlAction(m, &n->tcpInfo, "AddPortMapping", 8, propArgs, LNTPortMapOp);
+}
+
+mDNSexport mStatus LNT_MapPort(mDNS *m, NATTraversalInfo *const n)
+{
+    LogInfo("LNT_MapPort");
+    if (n->tcpInfo.sock) return(mStatus_NoError);   // If we already have a connection up don't make another request for the same thing
+    n->tcpInfo.parentNATInfo = n;
+    n->tcpInfo.retries       = 0;
+    return SendPortMapRequest(m, n);
+}
+
+mDNSexport mStatus LNT_UnmapPort(mDNS *m, NATTraversalInfo *const n)
+{
+    char externalPort[10];
+    Property propArgs[3];
+    tcpLNTInfo  *info;
+    tcpLNTInfo  **infoPtr = &m->tcpInfoUnmapList;
+    mStatus err;
+
+    // If no NAT gateway to talk to, no need to do all this work for nothing
+    if (mDNSIPPortIsZero(m->UPnPSOAPPort) || !m->UPnPSOAPURL || !m->UPnPSOAPAddressString) return mStatus_NoError;
+
+    mDNS_snprintf(externalPort, sizeof(externalPort), "%u", mDNSVal16(mDNSIPPortIsZero(n->RequestedPort) ? n->IntPort : n->RequestedPort));
+
+    mDNSPlatformMemZero(propArgs, sizeof(propArgs));
+    propArgs[0].name  = "NewRemoteHost";
+    propArgs[0].type  = "string";
+    propArgs[0].value = "";
+    propArgs[1].name  = "NewExternalPort";
+    propArgs[1].type  = "ui2";
+    propArgs[1].value = externalPort;
+    propArgs[2].name  = "NewProtocol";
+    propArgs[2].type  = "string";
+    propArgs[2].value = (n->Protocol == NATOp_MapUDP) ? "UDP" : "TCP";
+
+    n->tcpInfo.parentNATInfo = n;
+
+    // clean up previous port mapping requests and allocations
+    if (n->tcpInfo.sock) LogInfo("LNT_UnmapPort: closing previous open connection");
+    if (n->tcpInfo.sock   ) { mDNSPlatformTCPCloseConnection(n->tcpInfo.sock); n->tcpInfo.sock    = mDNSNULL; }
+    if (n->tcpInfo.Request) { mDNSPlatformMemFree(n->tcpInfo.Request);         n->tcpInfo.Request = mDNSNULL; }
+    if (n->tcpInfo.Reply  ) { mDNSPlatformMemFree(n->tcpInfo.Reply);           n->tcpInfo.Reply   = mDNSNULL; }
+
+    // make a copy of the tcpInfo that we can clean up later (the one passed in will be destroyed by the client as soon as this returns)
+    if ((info = mDNSPlatformMemAllocate(sizeof(tcpLNTInfo))) == mDNSNULL)
+    { LogInfo("LNT_UnmapPort: can't allocate tcpInfo"); return(mStatus_NoMemoryErr); }
+    *info = n->tcpInfo;
+
+    while (*infoPtr) infoPtr = &(*infoPtr)->next;   // find the end of the list
+    *infoPtr = info;    // append
+
+    err = SendSOAPMsgControlAction(m, info, "DeletePortMapping", 3, propArgs, LNTPortMapDeleteOp);
+    if (err) DisposeInfoFromUnmapList(m, info);
+    return err;
+}
+
+mDNSexport mStatus LNT_GetExternalAddress(mDNS *m)
+{
+    return SendSOAPMsgControlAction(m, &m->tcpAddrInfo, "GetExternalIPAddress", 0, mDNSNULL, LNTExternalAddrOp);
+}
+
+mDNSlocal mStatus GetDeviceDescription(mDNS *m, tcpLNTInfo *info)
+{
+    // Device description format -
+    //  - device description URL
+    //  - host/port
+    static const char szSSDPMsgDescribeDeviceFMT[] =
+        "GET %s HTTP/1.1\r\n"
+        "Accept: text/xml, application/xml\r\n"
+        "User-Agent: Mozilla/4.0 (compatible; UPnP/1.0; Windows NT/5.1)\r\n"
+        "Host: %s\r\n"
+        "Connection: close\r\n"
+        "\r\n";
+
+    if (!mDNSIPPortIsZero(m->UPnPSOAPPort)) return mStatus_NoError; // already have the info we need
+
+    if (m->UPnPRouterURL == mDNSNULL || m->UPnPRouterAddressString == mDNSNULL) { LogInfo("GetDeviceDescription: no router URL or address string!"); return (mStatus_Invalid); }
+
+    // build message
+    if      (info->Request != mDNSNULL) mDNSPlatformMemZero(info->Request, LNT_MAXBUFSIZE); // reuse previously allocated buffer
+    else if ((info->Request = mDNSPlatformMemAllocate(LNT_MAXBUFSIZE)) == mDNSNULL) { LogInfo("can't allocate send buffer for discovery"); return (mStatus_NoMemoryErr); }
+    info->requestLen = mDNS_snprintf((char*)info->Request, LNT_MAXBUFSIZE, szSSDPMsgDescribeDeviceFMT, m->UPnPRouterURL, m->UPnPRouterAddressString);
+    LogInfo("Describe Device: [%s]", info->Request);
+    return MakeTCPConnection(m, info, &m->Router, m->UPnPRouterPort, LNTDiscoveryOp);
+}
+
+// This function parses the response to our SSDP discovery message. Basically, we look to make sure this is a response
+// referencing a service we care about (WANIPConnection or WANPPPConnection), then look for the "Location:" header and copy the addressing and
+// URL info we need.
+mDNSexport void LNT_ConfigureRouterInfo(mDNS *m, const mDNSInterfaceID InterfaceID, const mDNSu8 *const data, const mDNSu16 len)
+{
+    const mDNSu8 *ptr = data;
+    const mDNSu8 *end = data + len;
+    const mDNSu8 *stop = ptr;
+
+    if (!mDNSIPPortIsZero(m->UPnPRouterPort)) return; // already have the info we need
+
+    // The formatting of the HTTP header is not always the same when it comes to the placement of
+    // the service and location strings, so we just look for each of them from the beginning for every response
+
+    // figure out if this is a message from a service we care about
+    while (ptr && ptr != end)
+    {
+        if ((*ptr & 0xDF) == 'W' && (strncasecmp((char*)ptr, "WANIPConnection:1", 17) == 0)) break;
+        ptr++;
+    }
+    if (ptr == end)
+    {
+        ptr = data;
+        while (ptr && ptr != end)
+        {
+            if ((*ptr & 0xDF) == 'W' && (strncasecmp((char*)ptr, "WANPPPConnection:1", 18) == 0)) break;
+            ptr++;
+        }
+    }
+    if (ptr == mDNSNULL || ptr == end) return;  // not a message we care about
+
+    // find "Location:", starting from the beginning
+    ptr = data;
+    while (ptr && ptr != end)
+    {
+        if ((*ptr & 0xDF) == 'L' && (strncasecmp((char*)ptr, "Location:", 9) == 0)) break;          // find the first 'L'; is this Location? if not, keep looking
+        ptr++;
+    }
+    if (ptr == mDNSNULL || ptr == end)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.ssdp", "failure", "Location", "");
+        return; // not a message we care about
+    }
+    ptr += 9; //Skip over 'Location:'
+    while (*ptr == ' ' && ptr < end) ptr++; // skip over spaces
+    if (ptr >= end) return;
+
+    // find the end of the line
+    for (stop = ptr; stop != end; stop++) { if (*stop == '\r') { end = stop; break; } }
+
+    // fill in default port
+    m->UPnPRouterPort = mDNSOpaque16fromIntVal(80);
+
+    // free string pointers and set to NULL
+    if (m->UPnPRouterAddressString != mDNSNULL)
+    {
+        mDNSPlatformMemFree(m->UPnPRouterAddressString);
+        m->UPnPRouterAddressString = mDNSNULL;
+    }
+    if (m->UPnPRouterURL != mDNSNULL)
+    {
+        mDNSPlatformMemFree(m->UPnPRouterURL);
+        m->UPnPRouterURL = mDNSNULL;
+    }
+
+    // the Router URL should look something like "/dyndev/uuid:0013-108c-4b3f0000f3dc"
+    if (ParseHttpUrl(ptr, end, &m->UPnPRouterAddressString, &m->UPnPRouterPort, &m->UPnPRouterURL) != mStatus_NoError)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.ssdp", "failure", "Parse URL", "");
+        return;
+    }
+
+    m->UPnPInterfaceID = InterfaceID;
+
+    if (m->UPnPRouterAddressString == mDNSNULL)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.ssdp", "failure", "Router address", "");
+        LogMsg("LNT_ConfigureRouterInfo: UPnPRouterAddressString is NULL");
+    }
+    else LogInfo("LNT_ConfigureRouterInfo: Router address string [%s]", m->UPnPRouterAddressString);
+
+    if (m->UPnPRouterURL == mDNSNULL)
+    {
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.ssdp", "failure", "Router path", "");
+        LogMsg("LNT_ConfigureRouterInfo: UPnPRouterURL is NULL");
+    }
+    else LogInfo("LNT_ConfigureRouterInfo: Router URL [%s]", m->UPnPRouterURL);
+
+    LogInfo("LNT_ConfigureRouterInfo: Router port %d", mDNSVal16(m->UPnPRouterPort));
+    LogInfo("LNT_ConfigureRouterInfo: Router interface %d", m->UPnPInterfaceID);
+
+    // Don't need the SSDP socket anymore
+    if (m->SSDPSocket) { debugf("LNT_ConfigureRouterInfo destroying SSDPSocket %p", &m->SSDPSocket); mDNSPlatformUDPClose(m->SSDPSocket); m->SSDPSocket = mDNSNULL; }
+
+    mDNSASLLog((uuid_t *)&m->asl_uuid, "natt.legacy.ssdp", "success", "success", "");
+    // now send message to get the device description
+    GetDeviceDescription(m, &m->tcpDeviceInfo);
+}
+
+mDNSexport void LNT_SendDiscoveryMsg(mDNS *m)
+{
+    static const char msg[] =
+        "M-SEARCH * HTTP/1.1\r\n"
+        "Host:239.255.255.250:1900\r\n"
+        "ST:urn:schemas-upnp-org:service:WAN%sConnection:1\r\n"
+        "Man:\"ssdp:discover\"\r\n"
+        "MX:3\r\n\r\n";
+    static const mDNSAddr multicastDest = { mDNSAddrType_IPv4, { { { 239, 255, 255, 250 } } } };
+
+    mDNSu8 *buf = (mDNSu8*)&m->omsg; //m->omsg is 8952 bytes, which is plenty
+    unsigned int bufLen;
+
+    if (!mDNSIPPortIsZero(m->UPnPRouterPort))
+    {
+        if (m->SSDPSocket) { debugf("LNT_SendDiscoveryMsg destroying SSDPSocket %p", &m->SSDPSocket); mDNSPlatformUDPClose(m->SSDPSocket); m->SSDPSocket = mDNSNULL; }
+        if (mDNSIPPortIsZero(m->UPnPSOAPPort) && !m->tcpDeviceInfo.sock) GetDeviceDescription(m, &m->tcpDeviceInfo);
+        return;
+    }
+
+    // Always query for WANIPConnection in the first SSDP packet
+    if (m->retryIntervalGetAddr <= NATMAP_INIT_RETRY) m->SSDPWANPPPConnection = mDNSfalse;
+
+    // Create message
+    bufLen = mDNS_snprintf((char*)buf, sizeof(m->omsg), msg, m->SSDPWANPPPConnection ? "PPP" : "IP");
+
+    debugf("LNT_SendDiscoveryMsg Router %.4a Current External Address %.4a", &m->Router.ip.v4, &m->ExtAddress);
+
+    if (!mDNSIPv4AddressIsZero(m->Router.ip.v4))
+    {
+        if (!m->SSDPSocket) { m->SSDPSocket = mDNSPlatformUDPSocket(m, zeroIPPort); debugf("LNT_SendDiscoveryMsg created SSDPSocket %p", &m->SSDPSocket); }
+        mDNSPlatformSendUDP(m, buf, buf + bufLen, 0, m->SSDPSocket, &m->Router,     SSDPPort, mDNSfalse);
+        mDNSPlatformSendUDP(m, buf, buf + bufLen, 0, m->SSDPSocket, &multicastDest, SSDPPort, mDNSfalse);
+    }
+
+    m->SSDPWANPPPConnection = !m->SSDPWANPPPConnection;
+}
+
+mDNSexport void LNT_ClearState(mDNS *const m)
+{
+    if (m->tcpAddrInfo.sock)   { mDNSPlatformTCPCloseConnection(m->tcpAddrInfo.sock);   m->tcpAddrInfo.sock   = mDNSNULL; }
+    if (m->tcpDeviceInfo.sock) { mDNSPlatformTCPCloseConnection(m->tcpDeviceInfo.sock); m->tcpDeviceInfo.sock = mDNSNULL; }
+    m->UPnPSOAPPort = m->UPnPRouterPort = zeroIPPort;   // Reset UPnP ports
+}
+
+#endif /* _LEGACY_NAT_TRAVERSAL_ */
diff --git a/mDNSResponder/mDNSMacOSX/P2PPacketFilter.c b/mDNSResponder/mDNSMacOSX/P2PPacketFilter.c
new file mode 100644
index 00000000..1ab8a02f
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/P2PPacketFilter.c
@@ -0,0 +1,298 @@
+/*
+ *
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <net/if.h>
+#include <System/net/pfvar.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <AssertMacros.h>
+#include "P2PPacketFilter.h"
+
+#define AIRDROP_ANCHOR_PATH "com.apple/200.AirDrop"
+#define MDNS_ANCHOR_NAME    "Bonjour"
+#define MDNS_ANCHOR_PATH    AIRDROP_ANCHOR_PATH "/" MDNS_ANCHOR_NAME
+
+#define PF_DEV_PATH "/dev/pf"
+#define BONJOUR_PORT 5353
+
+static int openPFDevice( int * outFD )
+{
+    int err;
+    int fd = open( PF_DEV_PATH, O_RDWR );
+
+    if( fd >= 0 )
+    {
+        err = 0;
+        *outFD = fd;
+    }
+    else
+    {
+        err = errno;
+    }
+
+    return err;
+}
+
+static int getTicket( int devFD, u_int32_t * outTicket, char * anchorPath )
+{
+    struct pfioc_trans_e trans_e;
+
+    trans_e.rs_num = PF_RULESET_FILTER;
+    strlcpy( trans_e.anchor, anchorPath, sizeof( trans_e.anchor ) );
+
+    struct pfioc_trans trans;
+
+    trans.size = 1;
+    trans.esize = sizeof( trans_e );
+    trans.array = &trans_e;
+
+    int result, ioctlError;
+
+    ioctlError = ioctl( devFD, DIOCXBEGIN, &trans );
+    if( ioctlError )
+    {
+        result = errno;
+    }
+    else
+    {
+        result = 0;
+        *outTicket = trans_e.ticket;
+    }
+
+    return result;
+}
+
+static int commitChange( int devFD, u_int32_t ticket, char * anchorPath )
+{
+    struct pfioc_trans_e trans_e;
+
+    trans_e.rs_num = PF_RULESET_FILTER;
+    strlcpy( trans_e.anchor, anchorPath, sizeof( trans_e.anchor ) );
+    trans_e.ticket = ticket;
+
+    struct pfioc_trans trans;
+
+    trans.size = 1;
+    trans.esize = sizeof( trans_e );
+    trans.array = &trans_e;
+
+    int result, ioctlError;
+
+    ioctlError = ioctl( devFD, DIOCXCOMMIT, &trans );
+    if( ioctlError )
+        result = errno;
+    else
+        result = 0;
+
+    return result;
+}
+
+static int getPoolTicket( int devFD, u_int32_t * outPoolTicket )
+{
+    struct pfioc_pooladdr pp;
+
+    int result, ioctlError;
+
+    ioctlError = ioctl( devFD, DIOCBEGINADDRS, &pp );
+    if( ioctlError )
+    {
+        result = errno;
+    }
+    else
+    {
+        result = 0;
+        *outPoolTicket = pp.ticket;
+    }
+
+    return result;
+}
+
+static int addRule( int devFD, struct pfioc_rule * pr )
+{
+    int result, ioctlResult;
+
+    ioctlResult = ioctl( devFD, DIOCADDRULE, pr );
+    if( ioctlResult )
+        result = errno;
+    else
+        result = 0;
+
+    return result;
+}
+
+static void initRuleHeader( struct pfioc_rule * pr,
+                            u_int32_t ticket,
+                            u_int32_t poolTicket,
+                            char * anchorPath )
+{
+    pr->action = PF_CHANGE_NONE;
+    pr->ticket = ticket;
+    pr->pool_ticket = poolTicket;
+    strlcpy( pr->anchor, anchorPath, sizeof( pr->anchor ) );
+}
+
+// allow inbound traffice on the Bonjour port (5353)
+static void initBonjourRule( struct pfioc_rule * pr,
+                             const char * interfaceName,
+                             u_int32_t ticket,
+                             u_int32_t poolTicket,
+                             char * anchorPath )
+{
+    memset( pr, 0, sizeof( *pr ) );
+
+    // Header
+    initRuleHeader( pr, ticket, poolTicket, anchorPath );
+
+    // Rule
+    pr->rule.dst.xport.range.port[0] = htons( BONJOUR_PORT );
+    pr->rule.dst.xport.range.op = PF_OP_EQ;
+
+    strlcpy( pr->rule.ifname, interfaceName, sizeof( pr->rule.ifname ) );
+
+    pr->rule.action = PF_PASS;
+    pr->rule.direction = PF_IN;
+    pr->rule.keep_state = 1;
+    pr->rule.af = AF_INET6;
+    pr->rule.proto = IPPROTO_UDP;
+    pr->rule.extfilter = PF_EXTFILTER_APD;
+}
+
+// allow outbound TCP connections and return traffic for those connections
+static void initOutboundTCPRule( struct pfioc_rule * pr,
+                                 const char * interfaceName,
+                                 u_int32_t ticket,
+                                 u_int32_t poolTicket,
+                                 char * anchorPath )
+{
+    memset( pr, 0, sizeof( *pr ) );
+
+    // Header
+    initRuleHeader( pr, ticket, poolTicket, anchorPath );
+
+    // Rule
+    strlcpy( pr->rule.ifname, interfaceName, sizeof( pr->rule.ifname ) );
+
+    pr->rule.action = PF_PASS;
+    pr->rule.direction = PF_OUT;
+    pr->rule.keep_state = 1;
+    pr->rule.proto = IPPROTO_TCP;
+}
+
+// allow inbound traffic on the specified port and protocol
+static void initPortRule( struct pfioc_rule * pr,
+                          const char * interfaceName,
+                          u_int32_t ticket,
+                          u_int32_t poolTicket,
+                          char * anchorPath,
+                          u_int16_t port,
+                          u_int16_t protocol )
+{
+    memset( pr, 0, sizeof( *pr ) );
+
+    // Header
+    initRuleHeader( pr, ticket, poolTicket, anchorPath );
+
+    // Rule
+    // mDNSResponder passes the port in Network Byte Order, so htons(port) is not required
+    pr->rule.dst.xport.range.port[0] = port;
+    pr->rule.dst.xport.range.op = PF_OP_EQ;
+
+    strlcpy( pr->rule.ifname, interfaceName, sizeof( pr->rule.ifname ) );
+
+    pr->rule.action = PF_PASS;
+    pr->rule.direction = PF_IN;
+    pr->rule.keep_state = 1;
+    pr->rule.af = AF_INET6;
+    pr->rule.proto = protocol;
+    pr->rule.extfilter = PF_EXTFILTER_APD;
+}
+
+// allow inbound traffic on the Bonjour port (5353) and the specified port and protocol sets
+int P2PPacketFilterAddBonjourRuleSet(const char * interfaceName, u_int32_t count, pfArray_t portArray, pfArray_t protocolArray )
+{
+    int result;
+    u_int32_t i, ticket, poolTicket;
+    int devFD = -1;
+    char * anchorPath = MDNS_ANCHOR_PATH;
+
+    result = openPFDevice( &devFD );
+    require( result == 0, exit );
+
+    result = getTicket( devFD, &ticket, anchorPath );
+    require( result == 0, exit );
+
+    result = getPoolTicket( devFD, &poolTicket );
+    require( result == 0, exit );
+
+    struct pfioc_rule pr;
+
+    // allow inbound Bonjour traffice to port 5353
+    initBonjourRule( &pr, interfaceName, ticket, poolTicket, anchorPath);
+
+    result = addRule( devFD, &pr );
+    require( result == 0, exit );
+
+    // open inbound port for each service
+    for (i = 0; i < count; i++) {
+        initPortRule( &pr, interfaceName, ticket, poolTicket, anchorPath, portArray[i], protocolArray[i] );
+        result = addRule( devFD, &pr );
+        require( result == 0, exit );
+    }
+
+    // allow outbound TCP connections and return traffic for those connections
+    initOutboundTCPRule( &pr, interfaceName, ticket, poolTicket, anchorPath);
+
+    result = addRule( devFD, &pr );
+    require( result == 0, exit );
+
+    result = commitChange( devFD, ticket, anchorPath );
+    require( result == 0, exit );
+
+exit:
+
+    if( devFD >= 0 )
+        close( devFD );
+
+    return result;
+}
+
+int P2PPacketFilterClearBonjourRules()
+{
+    int result;
+    int pfDev = -1;
+    u_int32_t ticket;
+    char * anchorPath = MDNS_ANCHOR_PATH;
+
+    result = openPFDevice( &pfDev );
+    require( result == 0, exit );
+
+    result = getTicket( pfDev, &ticket, anchorPath );
+    require( result == 0, exit );
+
+    result = commitChange( pfDev, ticket, anchorPath );
+
+exit:
+
+    if( pfDev >= 0 )
+        close( pfDev );
+
+    return result;
+}
+
diff --git a/mDNSResponder/mDNSMacOSX/P2PPacketFilter.h b/mDNSResponder/mDNSMacOSX/P2PPacketFilter.h
new file mode 100644
index 00000000..9c196577
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/P2PPacketFilter.h
@@ -0,0 +1,31 @@
+/*
+ *
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _P2P_PACKET_FILTER_H_
+#define _P2P_PACKET_FILTER_H_
+
+#include "helpermsg-types.h"
+
+enum {
+    PF_SET_RULES,
+    PF_CLEAR_RULES
+};
+
+int P2PPacketFilterAddBonjourRuleSet(const char * interfaceName, u_int32_t count, pfArray_t portArray, pfArray_t protocolArray );
+int P2PPacketFilterClearBonjourRules(void);
+
+#endif /* _P2P_PACKET_FILTER_H_ */
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_idle.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_idle.tiff
new file mode 100644
index 00000000..b78b0c2a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_idle.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_pressed.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_pressed.tiff
new file mode 100644
index 00000000..b842e20c
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/add_pressed.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/failure.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/failure.tiff
new file mode 100644
index 00000000..89a10dfe
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/failure.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/inprogress.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/inprogress.tiff
new file mode 100644
index 00000000..340bb335
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/inprogress.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_disabled.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_disabled.tiff
new file mode 100644
index 00000000..70d3dd9c
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_disabled.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_idle.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_idle.tiff
new file mode 100644
index 00000000..dacc97c3
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_idle.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_pressed.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_pressed.tiff
new file mode 100644
index 00000000..de3f8779
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/remove_pressed.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/success.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/success.tiff
new file mode 100644
index 00000000..21702a9a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Artwork/success.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.icns b/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.icns
new file mode 100644
index 00000000..5ba4674e
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.icns
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.tiff b/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.tiff
new file mode 100644
index 00000000..55cb212c
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/BonjourPref.tiff
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.c b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.c
new file mode 100644
index 00000000..a2ab5464
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.c
@@ -0,0 +1,180 @@
+/*
+    File: ConfigurationAuthority.c
+
+    Abstract: Interface to system security framework that manages access
+    to protected resources like system configuration preferences.
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "ConfigurationAuthority.h"
+#include "ConfigurationRights.h"
+
+#include <AssertMacros.h>
+
+
+static AuthorizationRef gAuthRef = 0;
+
+static AuthorizationItem gAuthorizations[] = {   { UPDATE_SC_RIGHT, 0, NULL, 0 },
+                                                 { EDIT_SYS_KEYCHAIN_RIGHT, 0, NULL, 0 }};
+static AuthorizationRights gAuthSet = { sizeof gAuthorizations / sizeof gAuthorizations[0], gAuthorizations };
+
+static CFDictionaryRef  CreateRightsDict( CFStringRef prompt)
+/* Create a CFDictionary decribing an auth right. See /etc/authorization for examples. */
+/* Specifies that the right requires admin authentication, which persists for 5 minutes. */
+{
+    CFMutableDictionaryRef dict = NULL, tmpDict;
+    CFMutableArrayRef mechanisms;
+    CFNumberRef timeout;
+    int val;
+
+    tmpDict = CFDictionaryCreateMutable( (CFAllocatorRef) NULL, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    require( tmpDict != NULL, MakeDictFailed);
+
+    CFDictionaryAddValue(tmpDict, CFSTR("class"), CFSTR("user"));
+    CFDictionaryAddValue(tmpDict, CFSTR("comment"), prompt);
+    CFDictionaryAddValue(tmpDict, CFSTR("group"), CFSTR("admin"));
+
+    mechanisms = CFArrayCreateMutable((CFAllocatorRef) NULL, 1, &kCFTypeArrayCallBacks);
+    require( mechanisms != NULL, MakeArrayFailed);
+    CFArrayAppendValue( mechanisms, CFSTR("builtin:authenticate"));
+    CFDictionaryAddValue( tmpDict, CFSTR("mechanisms"), mechanisms);
+
+    val = 300;  // seconds
+    timeout = CFNumberCreate((CFAllocatorRef) NULL, kCFNumberIntType, &val);
+    require( timeout != NULL, MakeIntFailed);
+    CFDictionaryAddValue( tmpDict, CFSTR("timeout"), timeout);
+    CFDictionaryAddValue( tmpDict, CFSTR("shared"), kCFBooleanTrue);
+
+    dict = tmpDict;
+    tmpDict = NULL;
+
+    CFRelease( timeout);
+MakeIntFailed:
+    CFRelease( mechanisms);
+MakeArrayFailed:
+    if ( tmpDict)
+        CFRelease( tmpDict);
+MakeDictFailed:
+    return dict;
+}
+
+OSStatus InitConfigAuthority(void)
+/* Initialize the authorization record-keeping */
+{
+    OSStatus err;
+    CFDictionaryRef dict;
+    CFStringRef rightInfo;
+
+    err = AuthorizationCreate((AuthorizationRights*) NULL, (AuthorizationEnvironment*) NULL,
+                              (AuthorizationFlags) 0, &gAuthRef);
+    require_noerr( err, NewAuthFailed);
+
+    err = AuthorizationRightGet( UPDATE_SC_RIGHT, (CFDictionaryRef*) NULL);
+    if (err == errAuthorizationDenied)
+    {
+        rightInfo = CFCopyLocalizedString(CFSTR("Authentication required to set Dynamic DNS preferences."),
+                                          CFSTR("Describes operation that requires user authorization"));
+        require_action( rightInfo != NULL, GetStrFailed, err=coreFoundationUnknownErr;);
+        dict = CreateRightsDict(rightInfo);
+        require_action( dict != NULL, GetStrFailed, err=coreFoundationUnknownErr;);
+
+        err = AuthorizationRightSet(gAuthRef, UPDATE_SC_RIGHT, dict, (CFStringRef) NULL,
+                                    (CFBundleRef) NULL, (CFStringRef) NULL);
+        CFRelease(rightInfo);
+        CFRelease(dict);
+    }
+    require_noerr( err, AuthSetFailed);
+
+    err = AuthorizationRightGet( EDIT_SYS_KEYCHAIN_RIGHT, (CFDictionaryRef*) NULL);
+    if (err == errAuthorizationDenied)
+    {
+        rightInfo = CFCopyLocalizedString( CFSTR("Authentication required to edit System Keychain."),
+                                           CFSTR("Describes operation that requires user authorization"));
+        require_action( rightInfo != NULL, GetStrFailed, err=coreFoundationUnknownErr;);
+        dict = CreateRightsDict( rightInfo);
+        require_action( dict != NULL, GetStrFailed, err=coreFoundationUnknownErr;);
+
+        err = AuthorizationRightSet(gAuthRef, EDIT_SYS_KEYCHAIN_RIGHT, dict, (CFStringRef) NULL,
+                                    (CFBundleRef) NULL, (CFStringRef) NULL);
+        CFRelease( rightInfo);
+        CFRelease( dict);
+    }
+    require_noerr( err, AuthSetFailed);
+
+AuthSetFailed:
+GetStrFailed:
+NewAuthFailed:
+    return err;
+}
+
+OSStatus    AttemptAcquireAuthority( Boolean allowUI)
+/* Try to get permission for privileged ops, either implicitly or by asking the user for */
+/* authority to perform operations (if necessary) */
+{
+    AuthorizationFlags allowFlag = allowUI ? kAuthorizationFlagInteractionAllowed : 0;
+    OSStatus err;
+
+    err = AuthorizationCopyRights( gAuthRef, &gAuthSet, (AuthorizationEnvironment*) NULL,
+                                   kAuthorizationFlagExtendRights | kAuthorizationFlagPreAuthorize |
+                                   allowFlag,
+                                   (AuthorizationRights**) NULL);
+    return err;
+}
+
+OSStatus ReleaseAuthority(void)
+/* Discard authority to perform operations */
+{
+    (void) AuthorizationFree( gAuthRef, kAuthorizationFlagDefaults);
+    gAuthRef = 0;
+    return AuthorizationCreate( (AuthorizationRights*) NULL, (AuthorizationEnvironment*) NULL,
+                                (AuthorizationFlags) 0, &gAuthRef);
+}
+
+Boolean CurrentlyAuthorized(void)
+{
+    OSStatus err = AttemptAcquireAuthority(true);
+    return err == noErr;
+}
+
+
+OSStatus ExternalizeAuthority(AuthorizationExternalForm *pAuth)
+/* Package up current authorizations for transfer to another process */
+{
+    return AuthorizationMakeExternalForm(gAuthRef, pAuth);
+}
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.h b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.h
new file mode 100644
index 00000000..49da93d0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationAuthority.h
@@ -0,0 +1,52 @@
+/*
+    File: ConfigurationAuthority.h
+
+    Abstract: Interface to system security framework that manages access
+    to protected resources like system configuration preferences.
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <CoreServices/CoreServices.h>
+#include <Security/Security.h>
+
+OSStatus InitConfigAuthority(void);
+Boolean  CurrentlyAuthorized(void);
+OSStatus AttemptAcquireAuthority(Boolean allowUI);
+OSStatus ReleaseAuthority(void);
+OSStatus ExternalizeAuthority(AuthorizationExternalForm *pAuth);
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationRights.h b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationRights.h
new file mode 100644
index 00000000..44379c67
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/ConfigurationRights.h
@@ -0,0 +1,49 @@
+/*
+    File: ConfigurationRights.h
+
+    Abstract: Defines the rights we need, namely, (i) the right to write to
+    the system configuration settings for Dynamic DNS and Wide-Area DNS-SD,
+    and (ii) the right to write to the system keychain to store Dynamic DNS
+    shared secrets used to perform authorized updates to DDNS servers.
+    Right now these are both actually the same right: "system.preferences"
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define UPDATE_SC_RIGHT          "system.preferences"
+#define EDIT_SYS_KEYCHAIN_RIGHT  "system.preferences"
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.h b/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.h
new file mode 100644
index 00000000..f0586591
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.h
@@ -0,0 +1,170 @@
+/*
+    File: DNSServiceDiscoveryPref.h
+
+    Abstract: System Preference Pane for Dynamic DNS and Wide-Area DNS Service Discovery
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <PreferencePanes/PreferencePanes.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <SecurityInterface/SFAuthorizationView.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <dns_sd.h>
+
+typedef struct MyDNSServiceState {
+    DNSServiceRef service;
+    CFRunLoopSourceRef source;
+    CFSocketRef socket;
+} MyDNSServiceState;
+
+
+@interface DNSServiceDiscoveryPref : NSPreferencePane
+{
+    IBOutlet NSTextField         *hostName;
+    IBOutlet NSTextField         *sharedSecretName;
+    IBOutlet NSSecureTextField   *sharedSecretValue;
+    IBOutlet NSComboBox          *browseDomainsComboBox;
+    IBOutlet NSComboBox          *regDomainsComboBox;
+    IBOutlet NSButton            *wideAreaCheckBox;
+    IBOutlet NSButton            *hostNameSharedSecretButton;
+    IBOutlet NSButton            *registrationSharedSecretButton;
+    IBOutlet NSButton            *applyButton;
+    IBOutlet NSButton            *revertButton;
+    IBOutlet NSWindow            *sharedSecretWindow;
+    IBOutlet NSWindow            *addBrowseDomainWindow;
+    IBOutlet NSButton            *addBrowseDomainButton;
+    IBOutlet NSButton            *removeBrowseDomainButton;
+    IBOutlet NSButton            *browseOKButton;
+    IBOutlet NSButton            *browseCancelButton;
+    IBOutlet NSButton            *secretOKButton;
+    IBOutlet NSButton            *secretCancelButton;
+    IBOutlet NSImageView         *statusImageView;
+    IBOutlet NSTabView           *tabView;
+    IBOutlet NSTableView         *browseDomainList;
+    IBOutlet SFAuthorizationView *comboAuthButton;
+
+    NSWindow       *mainWindow;
+    NSString       *currentHostName;
+    NSString       *currentRegDomain;
+    NSArray        *currentBrowseDomainsArray;
+    NSMutableArray *browseDomainsArray;
+    NSMutableArray *defaultBrowseDomainsArray;
+    NSString       *defaultRegDomain;
+
+    NSString       *hostNameSharedSecretName;
+    NSString       *hostNameSharedSecretValue;
+    NSString       *regSharedSecretName;
+    NSString       *regSharedSecretValue;
+    BOOL currentWideAreaState;
+    BOOL prefsNeedUpdating;
+    BOOL toolInstalled;
+    BOOL browseDomainListEnabled;
+    BOOL justStartedEditing;
+    NSImage        *successImage;
+    NSImage        *inprogressImage;
+    NSImage        *failureImage;
+
+    MyDNSServiceState regQuery;
+    MyDNSServiceState browseQuery;
+    NSMutableArray    *browseDataSource;
+    NSMutableArray    *registrationDataSource;
+}
+
+-(IBAction)applyClicked : (id)sender;
+-(IBAction)enableBrowseDomainClicked : (id)sender;
+-(IBAction)addBrowseDomainClicked : (id)sender;
+-(IBAction)removeBrowseDomainClicked : (id)sender;
+-(IBAction)revertClicked : (id)sender;
+-(IBAction)changeButtonPressed : (id)sender;
+-(IBAction)closeMyCustomSheet : (id)sender;
+-(IBAction)comboAction : (id)sender;
+-(IBAction)wideAreaCheckBoxChanged : (id)sender;
+
+
+-(NSMutableArray *)browseDataSource;
+-(NSMutableArray *)registrationDataSource;
+-(NSComboBox *)browseDomainsComboBox;
+-(NSComboBox *)regDomainsComboBox;
+-(NSString *)currentRegDomain;
+-(NSMutableArray *)defaultBrowseDomainsArray;
+-(NSArray *)currentBrowseDomainsArray;
+-(NSString *)currentHostName;
+-(NSString *)defaultRegDomain;
+-(void)setDefaultRegDomain : (NSString *)domain;
+
+
+
+-(void)enableApplyButton;
+-(void)disableApplyButton;
+-(void)applyCurrentState;
+-(void)setBrowseDomainsComboBox;
+-(void)setupInitialValues;
+-(void)startDomainBrowsing;
+-(void)toggleWideAreaBonjour : (BOOL)state;
+-(void)updateApplyButtonState;
+-(void)enableControls;
+-(void)disableControls;
+-(void)validateTextFields;
+-(void)readPreferences;
+-(void)savePreferences;
+-(void)restorePreferences;
+-(void)watchForPreferenceChanges;
+-(void)updateStatusImageView;
+
+
+-(NSString *)sharedSecretKeyName : (NSString * )domain;
+-(NSString *)domainForHostName : (NSString *)hostNameString;
+-(int)statusForHostName : (NSString * )domain;
+-(NSData *)dataForDomainArray : (NSArray *)domainArray;
+-(NSData *)dataForDomain : (NSString *)domainName isEnabled : (BOOL)enabled;
+-(NSData *)dataForSharedSecret : (NSString *)secret domain : (NSString *)domainName key : (NSString *)keyName;
+-(BOOL)domainAlreadyInList : (NSString *)domainString;
+-(NSString *)trimCharactersFromDomain : (NSString *)domain;
+
+
+// Delegate methods
+-(void)authorizationViewDidAuthorize : (SFAuthorizationView *)view;
+-(void)authorizationViewDidDeauthorize : (SFAuthorizationView *)view;
+-(void)mainViewDidLoad;
+-(int)numberOfItemsInComboBox : (NSComboBox *)aComboBox;
+-(id)comboBox : (NSComboBox *)aComboBox objectValueForItemAtIndex : (int)index;
+-(void)controlTextDidChange : (NSNotification *) notification;
+
+@end
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.m b/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.m
new file mode 100644
index 00000000..063bc724
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/DNSServiceDiscoveryPref.m
@@ -0,0 +1,1194 @@
+/*
+    File: DNSServiceDiscoveryPref.m
+
+    Abstract: System Preference Pane for Dynamic DNS and Wide-Area DNS Service Discovery
+
+    Copyright: (c) Copyright 2005-2011 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "DNSServiceDiscoveryPref.h"
+#import "ConfigurationAuthority.h"
+#import "PrivilegedOperations.h"
+#import <unistd.h>
+
+#include "../../Clients/ClientCommon.h"
+
+#ifndef NSINTEGER_DEFINED
+#define NSInteger int
+#endif
+
+@implementation DNSServiceDiscoveryPref
+
+static NSInteger
+MyArrayCompareFunction(id val1, id val2, void *context)
+{
+	(void)context; // Unused
+    return CFStringCompare((CFStringRef)val1, (CFStringRef)val2, kCFCompareCaseInsensitive);
+}
+
+static NSInteger
+MyDomainArrayCompareFunction(id val1, id val2, void *context)
+{
+	(void)context; // Unused
+	NSString *domain1 = [val1 objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+	NSString *domain2 = [val2 objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+    return CFStringCompare((CFStringRef)domain1, (CFStringRef)domain2, kCFCompareCaseInsensitive);
+}
+
+
+static void NetworkChanged(SCDynamicStoreRef store, CFArrayRef changedKeys, void *context)
+{
+	(void)store; // Unused
+	(void)changedKeys; // Unused
+    DNSServiceDiscoveryPref * me = (DNSServiceDiscoveryPref *)context;
+    assert(me != NULL);
+    
+    [me setupInitialValues];
+}
+
+
+static void ServiceDomainEnumReply( DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode, const char *replyDomain, void *context, DNSServiceFlags enumType)
+{    
+	(void)sdRef; // Unused
+	(void)interfaceIndex; // Unused
+	(void)errorCode; // Unused
+    if (strcmp(replyDomain, "local.") == 0) return;  // local domain is not interesting
+
+	DNSServiceDiscoveryPref * me = (DNSServiceDiscoveryPref *)context;
+ 	BOOL moreComing = (BOOL)(flags & kDNSServiceFlagsMoreComing);
+    NSMutableArray * domainArray;
+    NSMutableArray * defaultBrowseDomainsArray = nil;
+    NSComboBox * domainComboBox;
+    NSString * domainString;
+    NSString * currentDomain = nil;
+	char decodedDomainString[kDNSServiceMaxDomainName] = "\0";
+    char nextLabel[256] = "\0";
+    char * buffer = (char *)replyDomain;
+    
+	while (*buffer) {
+        buffer = (char *)GetNextLabel(buffer, nextLabel);
+        strcat(decodedDomainString, nextLabel);
+        strcat(decodedDomainString, ".");
+    }
+    
+    // Remove trailing dot from domain name.
+    decodedDomainString[strlen(decodedDomainString)-1] = '\0';
+    
+    domainString = [[[NSString alloc] initWithUTF8String:(const char *)decodedDomainString] autorelease];
+
+    if (enumType & kDNSServiceFlagsRegistrationDomains) {
+        domainArray    = [me registrationDataSource];
+        domainComboBox = [me regDomainsComboBox];
+        currentDomain  = [me currentRegDomain];
+    } else { 
+        domainArray    = [me browseDataSource];
+        domainComboBox = [me browseDomainsComboBox];
+        defaultBrowseDomainsArray = [me defaultBrowseDomainsArray];
+    }
+    
+	if (flags & kDNSServiceFlagsAdd) {
+		[domainArray removeObject:domainString];  // How can I check if an object is in the array?
+		[domainArray addObject:domainString];
+        if ((flags & kDNSServiceFlagsDefault) && (enumType & kDNSServiceFlagsRegistrationDomains)) {
+			[me setDefaultRegDomain:domainString];
+			if ([[domainComboBox stringValue] length] == 0) [domainComboBox setStringValue:domainString];
+		} else if ((flags & kDNSServiceFlagsDefault) && !(enumType & kDNSServiceFlagsRegistrationDomains)) {
+			[defaultBrowseDomainsArray removeObject:domainString];
+			[defaultBrowseDomainsArray addObject:domainString];
+		}
+	}
+    
+    if (moreComing == NO) {
+        [domainArray sortUsingFunction:MyArrayCompareFunction context:nil];
+        [domainComboBox reloadData];
+    }    
+}
+
+
+static void
+browseDomainReply(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode, const char *replyDomain, void *context)
+{
+    ServiceDomainEnumReply(sdRef, flags, interfaceIndex, errorCode, replyDomain, context, kDNSServiceFlagsBrowseDomains);
+}
+
+
+static void
+registrationDomainReply(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode, const char *replyDomain, void *context)
+{
+    ServiceDomainEnumReply(sdRef, flags, interfaceIndex, errorCode, replyDomain, context, kDNSServiceFlagsRegistrationDomains);
+}
+
+
+
+static void
+MyDNSServiceCleanUp(MyDNSServiceState * query)
+{
+    /* Remove the CFRunLoopSource from the current run loop. */
+    CFRunLoopRemoveSource(CFRunLoopGetCurrent(), query->source, kCFRunLoopCommonModes);
+    CFRelease(query->source);
+    
+    /* Invalidate the CFSocket. */
+    CFSocketInvalidate(query->socket);
+    CFRelease(query->socket);
+    
+    /* Workaround that gives time to CFSocket's select thread so it can remove the socket from its FD set
+    before we close the socket by calling DNSServiceRefDeallocate. <rdar://problem/3585273> */
+    usleep(1000);
+    
+    /* Terminate the connection with the mDNSResponder daemon, which cancels the query. */
+    DNSServiceRefDeallocate(query->service);
+}
+
+
+
+static void
+MySocketReadCallback(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void * data, void * info)
+{
+    #pragma unused(s)
+    #pragma unused(type)
+    #pragma unused(address)
+    #pragma unused(data)
+    
+    DNSServiceErrorType err;
+ 
+    MyDNSServiceState * query = (MyDNSServiceState *)info;  // context passed in to CFSocketCreateWithNative().
+    assert(query != NULL);
+    
+    /* Read a reply from the mDNSResponder.  */
+    err= DNSServiceProcessResult(query->service);
+    if (err != kDNSServiceErr_NoError) {
+        fprintf(stderr, "DNSServiceProcessResult returned %d\n", err);
+        
+        /* Terminate the query operation and release the CFRunLoopSource and CFSocket. */
+        MyDNSServiceCleanUp(query);
+    }
+}
+
+
+
+static void
+MyDNSServiceAddServiceToRunLoop(MyDNSServiceState * query)
+{
+    CFSocketNativeHandle sock;
+    CFOptionFlags        sockFlags;
+    CFSocketContext      context = { 0, query, NULL, NULL, NULL };  // Use MyDNSServiceState as context data.
+    
+    /* Access the underlying Unix domain socket to communicate with the mDNSResponder daemon. */
+    sock = DNSServiceRefSockFD(query->service);
+    assert(sock != -1);
+    
+    /* Create a CFSocket using the Unix domain socket. */
+    query->socket = CFSocketCreateWithNative(NULL, sock, kCFSocketReadCallBack, MySocketReadCallback, &context);
+    assert(query->socket != NULL);
+    
+    /* Prevent CFSocketInvalidate from closing DNSServiceRef's socket. */
+    sockFlags = CFSocketGetSocketFlags(query->socket);
+    CFSocketSetSocketFlags(query->socket, sockFlags & (~kCFSocketCloseOnInvalidate));
+    
+    /* Create a CFRunLoopSource from the CFSocket. */
+    query->source = CFSocketCreateRunLoopSource(NULL, query->socket, 0);
+    assert(query->source != NULL);
+
+    /* Add the CFRunLoopSource to the current run loop. */
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), query->source, kCFRunLoopCommonModes);
+}
+
+
+
+-(void)updateStatusImageView
+{
+    int value = [self statusForHostName:currentHostName];
+    if      (value == 0) [statusImageView setImage:successImage];
+    else if (value >  0) [statusImageView setImage:inprogressImage];
+    else                 [statusImageView setImage:failureImage];
+}
+
+
+- (void)watchForPreferenceChanges
+{
+	SCDynamicStoreContext context = { 0, self, NULL, NULL, NULL };
+	SCDynamicStoreRef     store   = SCDynamicStoreCreate(NULL, CFSTR("watchForPreferenceChanges"), NetworkChanged, &context);
+	CFMutableArrayRef     keys    = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+    CFRunLoopSourceRef    rls;
+	
+	assert(store != NULL);
+	assert(keys != NULL);
+    
+	CFArrayAppendValue(keys, SC_DYNDNS_STATE_KEY);
+	CFArrayAppendValue(keys, SC_DYNDNS_SETUP_KEY);
+
+	(void)SCDynamicStoreSetNotificationKeys(store, keys, NULL);
+
+	rls = SCDynamicStoreCreateRunLoopSource(NULL, store, 0);
+    assert(rls != NULL);
+    
+	CFRunLoopAddSource(CFRunLoopGetCurrent(), rls, kCFRunLoopCommonModes);
+
+    CFRelease(keys);
+	CFRelease(store);
+}
+
+
+-(int)statusForHostName:(NSString * )domain
+{
+	SCDynamicStoreRef store       = SCDynamicStoreCreate(NULL, CFSTR("statusForHostName"), NULL, NULL);
+    NSString     *lowercaseDomain = [domain lowercaseString];
+    int status = 1;
+    
+    assert(store != NULL);
+        
+    NSDictionary *dynamicDNS = (NSDictionary *)SCDynamicStoreCopyValue(store, SC_DYNDNS_STATE_KEY);
+    if (dynamicDNS) {
+        NSDictionary *hostNames = [dynamicDNS objectForKey:(NSString *)SC_DYNDNS_HOSTNAMES_KEY];
+        NSDictionary *infoDict  = [hostNames objectForKey:lowercaseDomain];
+        if (infoDict) status = [[infoDict objectForKey:(NSString*)SC_DYNDNS_STATUS_KEY] intValue];
+        CFRelease(dynamicDNS);
+	}
+    CFRelease(store);
+
+    return status;
+}
+
+
+- (void)startDomainBrowsing
+{
+    DNSServiceFlags flags;
+    OSStatus err = noErr;
+    
+    flags = kDNSServiceFlagsRegistrationDomains;
+    err = DNSServiceEnumerateDomains(&regQuery.service, flags, 0, registrationDomainReply, (void *)self);
+    if (err == kDNSServiceErr_NoError) MyDNSServiceAddServiceToRunLoop(&regQuery);
+
+    flags = kDNSServiceFlagsBrowseDomains;
+    err = DNSServiceEnumerateDomains(&browseQuery.service, flags, 0, browseDomainReply, (void *)self);
+    if (err == kDNSServiceErr_NoError) MyDNSServiceAddServiceToRunLoop(&browseQuery);
+}
+
+
+-(void)readPreferences
+{
+	NSDictionary *origDict;
+    NSArray      *regDomainArray;
+    NSArray      *hostArray;
+
+    if (currentRegDomain)          [currentRegDomain release];
+    if (currentBrowseDomainsArray) [currentBrowseDomainsArray release];
+    if (currentHostName)           [currentHostName release];
+
+	SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("com.apple.preference.bonjour"), NULL, NULL);
+	origDict = (NSDictionary *)SCDynamicStoreCopyValue(store, SC_DYNDNS_SETUP_KEY);
+
+	regDomainArray = [origDict objectForKey:(NSString *)SC_DYNDNS_REGDOMAINS_KEY];
+	if (regDomainArray && [regDomainArray count] > 0) {
+		currentRegDomain = [[[regDomainArray objectAtIndex:0] objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY] copy];
+		currentWideAreaState = [[[regDomainArray objectAtIndex:0] objectForKey:(NSString *)SC_DYNDNS_ENABLED_KEY] intValue];
+    } else {
+		currentRegDomain = [[NSString alloc] initWithString:@""];
+		currentWideAreaState = NO;
+	}
+
+	currentBrowseDomainsArray = [[origDict objectForKey:(NSString *)SC_DYNDNS_BROWSEDOMAINS_KEY] retain];
+
+    hostArray = [origDict objectForKey:(NSString *)SC_DYNDNS_HOSTNAMES_KEY];
+	if (hostArray && [hostArray count] > 0) {
+		currentHostName = [[[hostArray objectAtIndex:0] objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY] copy];
+	} else {
+		currentHostName = [[NSString alloc] initWithString:@""];
+    }
+
+    [origDict release];
+    CFRelease(store);
+}
+
+
+- (void)tableViewSelectionDidChange:(NSNotification *)notification
+{
+	[removeBrowseDomainButton setEnabled:[[notification object] numberOfSelectedRows]];
+}
+
+
+- (void)setBrowseDomainsComboBox
+{
+	NSString * domain = nil;
+	
+	if ([defaultBrowseDomainsArray count] > 0) {
+		NSEnumerator * arrayEnumerator = [defaultBrowseDomainsArray objectEnumerator];
+		while ((domain = [arrayEnumerator nextObject]) != NULL) {
+			if ([self domainAlreadyInList:domain] == NO) break;
+		}
+	}
+	if (domain) [browseDomainsComboBox setStringValue:domain];
+	else        [browseDomainsComboBox setStringValue:@""];
+}
+
+
+- (IBAction)addBrowseDomainClicked:(id)sender
+{
+	[self setBrowseDomainsComboBox];
+
+	[NSApp beginSheet:addBrowseDomainWindow modalForWindow:mainWindow modalDelegate:self
+		didEndSelector:@selector(addBrowseDomainSheetDidEnd:returnCode:contextInfo:) contextInfo:sender];
+
+	[browseDomainList deselectAll:sender];
+	[self updateApplyButtonState];
+}
+
+
+- (IBAction)removeBrowseDomainClicked:(id)sender
+{
+	(void)sender; // Unused
+	int selectedBrowseDomain = [browseDomainList selectedRow];
+	[browseDomainsArray removeObjectAtIndex:selectedBrowseDomain];
+	[browseDomainList reloadData];
+	[self updateApplyButtonState];
+}
+
+
+- (IBAction)enableBrowseDomainClicked:(id)sender
+{
+	NSTableView *tableView = sender;
+    NSMutableDictionary *browseDomainDict;
+	int value;
+	
+	browseDomainDict = [[browseDomainsArray objectAtIndex:[tableView clickedRow]] mutableCopy];
+	value = [[browseDomainDict objectForKey:(NSString *)SC_DYNDNS_ENABLED_KEY] intValue];
+	[browseDomainDict setObject:[[[NSNumber alloc] initWithInt:(!value)] autorelease] forKey:(NSString *)SC_DYNDNS_ENABLED_KEY];
+	[browseDomainsArray replaceObjectAtIndex:[tableView clickedRow] withObject:browseDomainDict];
+	[tableView reloadData];
+	[self updateApplyButtonState];
+}
+
+
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
+{
+	(void)tableView; // Unused
+	int numberOfRows = 0;
+		
+	if (browseDomainsArray) {
+		numberOfRows = [browseDomainsArray count];
+	}
+	return numberOfRows;
+}
+
+
+- (void)tabView:(NSTabView *)xtabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+{
+	(void)xtabView; // Unused
+	(void)tabViewItem; // Unused
+	[browseDomainList deselectAll:self];
+	[mainWindow makeFirstResponder:nil];
+}
+ 
+
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+	(void)tableView; // Unused
+	NSDictionary *browseDomainDict;
+	id           value = nil;
+		
+	if (browseDomainsArray) {
+		browseDomainDict = [browseDomainsArray objectAtIndex:row];
+		if (browseDomainDict) {
+			if ([[tableColumn identifier] isEqualTo:(NSString *)SC_DYNDNS_ENABLED_KEY]) {
+				value = [browseDomainDict objectForKey:(NSString *)SC_DYNDNS_ENABLED_KEY];
+			} else if ([[tableColumn identifier] isEqualTo:(NSString *)SC_DYNDNS_DOMAIN_KEY]) {
+				value = [browseDomainDict objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+			}
+		}
+	}
+	return value;
+}
+
+
+- (void)setupInitialValues
+{    
+    [self readPreferences];
+    
+    if (currentHostName) {
+		[hostName setStringValue:currentHostName];
+		[self updateStatusImageView];
+	}
+	
+	if (browseDomainsArray) {
+		[browseDomainsArray release];
+		browseDomainsArray = nil;
+	}
+	
+	if (currentBrowseDomainsArray) {
+		browseDomainsArray = [currentBrowseDomainsArray mutableCopy];
+		if (browseDomainsArray) {
+			[browseDomainsArray sortUsingFunction:MyDomainArrayCompareFunction context:nil];
+			if ([browseDomainsArray isEqualToArray:currentBrowseDomainsArray] == NO) {
+				OSStatus err = WriteBrowseDomain((CFDataRef)[self dataForDomainArray:browseDomainsArray]);
+				if (err != noErr) NSLog(@"WriteBrowseDomain returned %d\n", (int32_t)err);
+				[currentBrowseDomainsArray release];
+				currentBrowseDomainsArray = [browseDomainsArray copy];
+			}
+		}
+	} else {
+		browseDomainsArray = nil;
+	}
+	[browseDomainList reloadData];
+	
+    if (currentRegDomain && ([currentRegDomain length] > 0)) {
+        [regDomainsComboBox setStringValue:currentRegDomain];
+        [registrationDataSource removeObject:currentRegDomain];
+        [registrationDataSource addObject:currentRegDomain];
+        [registrationDataSource sortUsingFunction:MyArrayCompareFunction context:nil];
+        [regDomainsComboBox reloadData];
+    }
+    
+    if (currentWideAreaState) {
+        [self toggleWideAreaBonjour:YES];
+    } else {
+        [self toggleWideAreaBonjour:NO];
+    }
+
+    if (hostNameSharedSecretValue) {
+        [hostNameSharedSecretValue release];
+        hostNameSharedSecretValue = nil;
+    }
+    
+    if (regSharedSecretValue) {
+        [regSharedSecretValue release];
+        regSharedSecretValue = nil;
+    }
+    
+    [self updateApplyButtonState];
+    [mainWindow makeFirstResponder:nil];
+	[browseDomainList deselectAll:self];
+	[removeBrowseDomainButton setEnabled:NO];
+}
+
+
+
+- (void)awakeFromNib
+{        
+    OSStatus err;
+    
+    prefsNeedUpdating         = NO;
+    toolInstalled             = NO;
+	browseDomainListEnabled   = NO;
+	defaultRegDomain          = nil;
+    currentRegDomain          = nil;
+	currentBrowseDomainsArray = nil;
+    currentHostName           = nil;
+    hostNameSharedSecretValue = nil;
+    regSharedSecretValue      = nil;
+	browseDomainsArray        = nil;
+    justStartedEditing        = YES;
+    currentWideAreaState      = NO;
+	NSString *successPath     = [[NSBundle bundleForClass:[self class]] pathForResource:@"success"    ofType:@"tiff"];
+	NSString *inprogressPath  = [[NSBundle bundleForClass:[self class]] pathForResource:@"inprogress" ofType:@"tiff"];
+	NSString *failurePath     = [[NSBundle bundleForClass:[self class]] pathForResource:@"failure"    ofType:@"tiff"];
+
+    registrationDataSource    = [[NSMutableArray alloc] init];
+    browseDataSource          = [[NSMutableArray alloc] init];
+	defaultBrowseDomainsArray = [[NSMutableArray alloc] init];
+	successImage              = [[NSImage alloc] initWithContentsOfFile:successPath];
+	inprogressImage           = [[NSImage alloc] initWithContentsOfFile:inprogressPath];
+	failureImage              = [[NSImage alloc] initWithContentsOfFile:failurePath];
+
+    [tabView selectFirstTabViewItem:self];
+    [self setupInitialValues];
+    [self startDomainBrowsing];
+    [self watchForPreferenceChanges];
+	
+    InitConfigAuthority();
+    err = EnsureToolInstalled();
+    if (err == noErr) toolInstalled = YES;
+    else { long int tmp = err; fprintf(stderr, "EnsureToolInstalled returned %ld\n", tmp); }
+    
+}
+
+
+- (IBAction)closeMyCustomSheet:(id)sender
+{
+    BOOL result = [sender isEqualTo:browseOKButton] || [sender isEqualTo:secretOKButton];
+
+    if (result) [NSApp endSheet:[sender window] returnCode:NSOKButton];
+    else        [NSApp endSheet:[sender window] returnCode:NSCancelButton];
+}
+
+
+- (void)sharedSecretSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    NSButton * button = (NSButton *)contextInfo;
+    [sheet orderOut:self];
+    [self enableControls];
+    
+    if (returnCode == NSOKButton) {
+        if ([button isEqualTo:hostNameSharedSecretButton]) {
+            hostNameSharedSecretName = [[NSString alloc] initWithString:[sharedSecretName stringValue]];
+            hostNameSharedSecretValue = [[NSString alloc] initWithString:[sharedSecretValue stringValue]];
+        } else {
+            regSharedSecretName = [[NSString alloc] initWithString:[sharedSecretName stringValue]];
+            regSharedSecretValue = [[NSString alloc] initWithString:[sharedSecretValue stringValue]];
+        }
+        [self updateApplyButtonState];
+    }
+    [sharedSecretValue setStringValue:@""];
+}
+
+
+- (BOOL)domainAlreadyInList:(NSString *)domainString
+{
+	if (browseDomainsArray) {
+		NSDictionary *domainDict;
+		NSString     *domainName;
+		NSEnumerator *arrayEnumerator = [browseDomainsArray objectEnumerator];
+		while ((domainDict = [arrayEnumerator nextObject]) != NULL) {
+			domainName = [domainDict objectForKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+			if ([domainString caseInsensitiveCompare:domainName] == NSOrderedSame) return YES;
+		}
+	}
+	return NO;
+}
+
+
+- (NSString *)trimCharactersFromDomain:(NSString *)domain
+{
+	NSMutableCharacterSet * trimSet = [[[NSCharacterSet whitespaceCharacterSet] mutableCopy] autorelease];
+	[trimSet formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]];
+	return [domain stringByTrimmingCharactersInSet:trimSet];	
+}
+
+
+- (void)addBrowseDomainSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+	(void)contextInfo; // Unused
+    [sheet orderOut:self];
+    [self enableControls];
+    
+    if (returnCode == NSOKButton) {
+		NSString * newBrowseDomainString = [self trimCharactersFromDomain:[browseDomainsComboBox stringValue]];
+		NSMutableDictionary *newBrowseDomainDict;
+		
+		if (browseDomainsArray == nil) browseDomainsArray = [[NSMutableArray alloc] initWithCapacity:0];
+		if ([self domainAlreadyInList:newBrowseDomainString] == NO) {
+			newBrowseDomainDict = [[[NSMutableDictionary alloc] initWithCapacity:2] autorelease];
+
+			[newBrowseDomainDict setObject:newBrowseDomainString forKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+			[newBrowseDomainDict setObject:[[[NSNumber alloc] initWithBool:YES] autorelease] forKey:(NSString *)SC_DYNDNS_ENABLED_KEY];
+			
+			[browseDomainsArray addObject:newBrowseDomainDict];
+			[browseDomainsArray sortUsingFunction:MyDomainArrayCompareFunction context:nil];
+			[browseDomainList reloadData];
+			[self updateApplyButtonState];
+		}
+    }
+}
+
+
+-(void)validateTextFields
+{
+    [hostName validateEditing];
+    [browseDomainsComboBox validateEditing];
+    [regDomainsComboBox validateEditing];    
+}
+
+
+- (IBAction)changeButtonPressed:(id)sender
+{
+    NSString * keyName;
+    
+    [self disableControls];
+    [self validateTextFields];
+    [mainWindow makeFirstResponder:nil];
+	[browseDomainList deselectAll:sender];
+
+    if ([sender isEqualTo:hostNameSharedSecretButton]) {		
+        if (hostNameSharedSecretValue) {
+			[sharedSecretValue setStringValue:hostNameSharedSecretValue];
+        } else if ((keyName = [self sharedSecretKeyName:[hostName stringValue]]) != NULL) {
+			[sharedSecretName setStringValue:keyName];
+            [sharedSecretValue setStringValue:@"****************"];
+		} else {
+			[sharedSecretName setStringValue:[hostName stringValue]];
+            [sharedSecretValue setStringValue:@""];
+        }
+
+    } else {        
+        if (regSharedSecretValue) {
+			[sharedSecretValue setStringValue:regSharedSecretValue];
+        } else if ((keyName = [self sharedSecretKeyName:[regDomainsComboBox stringValue]]) != NULL) {
+			[sharedSecretName setStringValue:keyName];
+            [sharedSecretValue setStringValue:@"****************"];
+		} else {
+			[sharedSecretName setStringValue:[regDomainsComboBox stringValue]];
+            [sharedSecretValue setStringValue:@""];
+        }
+    }
+    
+    [sharedSecretWindow resignFirstResponder];
+
+    if ([[sharedSecretName stringValue] length] > 0) [sharedSecretWindow makeFirstResponder:sharedSecretValue];
+    else                                             [sharedSecretWindow makeFirstResponder:sharedSecretName];
+    
+    [NSApp beginSheet:sharedSecretWindow modalForWindow:mainWindow modalDelegate:self
+            didEndSelector:@selector(sharedSecretSheetDidEnd:returnCode:contextInfo:) contextInfo:sender];
+}
+
+
+- (IBAction)wideAreaCheckBoxChanged:(id)sender
+{    
+    [self toggleWideAreaBonjour:[sender state]];
+    [self updateApplyButtonState];
+    [mainWindow makeFirstResponder:nil];
+}
+
+
+- (void)updateApplyButtonState
+{
+    NSString *hostNameString  = [hostName stringValue];
+    NSString *regDomainString = [regDomainsComboBox stringValue];
+    
+    NSComparisonResult hostNameResult  = [hostNameString    compare:currentHostName];
+    NSComparisonResult regDomainResult = [regDomainString  compare:currentRegDomain];
+
+    if ((currentHostName && (hostNameResult != NSOrderedSame)) ||
+        (currentRegDomain && (regDomainResult != NSOrderedSame) && ([wideAreaCheckBox state])) ||
+        (currentHostName == nil && ([hostNameString length]) > 0) ||
+        (currentRegDomain == nil && ([regDomainString length]) > 0) ||
+        (currentWideAreaState  != [wideAreaCheckBox state]) ||
+        (hostNameSharedSecretValue != nil) ||
+        (regSharedSecretValue != nil) ||
+		(browseDomainsArray && [browseDomainsArray isEqualToArray:currentBrowseDomainsArray] == NO))
+    {
+        [self enableApplyButton];
+    } else {
+        [self disableApplyButton];
+    }
+}
+
+
+
+- (void)controlTextDidChange:(NSNotification *)notification
+{
+	(void)notification; // Unused
+    [self updateApplyButtonState];
+}
+
+
+
+- (IBAction)comboAction:(id)sender
+{
+	(void)sender; // Unused
+    [self updateApplyButtonState];
+}
+
+
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)ind
+{
+    NSString *domain = nil;
+    if      ([aComboBox isEqualTo:browseDomainsComboBox]) domain = [browseDataSource objectAtIndex:ind];
+    else if ([aComboBox isEqualTo:regDomainsComboBox])    domain = [registrationDataSource objectAtIndex:ind];
+    return domain;
+}
+
+
+
+- (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
+{
+    int count = 0;
+    if      ([aComboBox isEqualTo:browseDomainsComboBox]) count = [browseDataSource count];
+    else if ([aComboBox isEqualTo:regDomainsComboBox])    count = [registrationDataSource count];
+    return count;
+}
+
+
+- (NSMutableArray *)browseDataSource
+{
+    return browseDataSource;
+}
+
+
+- (NSMutableArray *)registrationDataSource
+{
+    return registrationDataSource;
+}
+
+
+- (NSComboBox *)browseDomainsComboBox
+{
+    return browseDomainsComboBox;
+}
+
+
+- (NSComboBox *)regDomainsComboBox
+{
+    return regDomainsComboBox;
+}
+
+
+- (NSString *)currentRegDomain
+{
+    return currentRegDomain;
+}
+
+
+- (NSMutableArray *)defaultBrowseDomainsArray
+{
+    return defaultBrowseDomainsArray;
+}
+
+
+- (NSArray *)currentBrowseDomainsArray
+{
+    return currentBrowseDomainsArray;
+}
+
+
+- (NSString *)currentHostName
+{
+    return currentHostName;
+}
+
+
+- (NSString *)defaultRegDomain
+{
+	return defaultRegDomain;
+}
+
+
+- (void)setDefaultRegDomain:(NSString *)domain
+{
+	[defaultRegDomain release];
+	defaultRegDomain = domain;
+	[defaultRegDomain retain];
+}
+
+
+- (void)didSelect
+{
+    [super didSelect];
+    mainWindow = [[self mainView] window];
+}
+
+
+- (void)mainViewDidLoad
+{	
+    [comboAuthButton setString:"system.preferences"];
+    [comboAuthButton setDelegate:self];
+    [comboAuthButton updateStatus:nil];
+    [comboAuthButton setAutoupdate:YES];
+}
+
+
+
+- (IBAction)applyClicked:(id)sender
+{
+	(void)sender; // Unused
+    [self applyCurrentState];
+}
+
+
+- (void)applyCurrentState
+{
+    [self validateTextFields];
+
+    if (toolInstalled == YES) {
+        [self savePreferences];
+        [self disableApplyButton];
+        [mainWindow makeFirstResponder:nil];
+    }
+}
+
+
+- (void)enableApplyButton
+{
+    [applyButton setEnabled:YES];
+    [revertButton setEnabled:YES];
+    prefsNeedUpdating = YES;
+}
+
+
+- (void)disableApplyButton
+{
+    [applyButton setEnabled:NO];
+    [revertButton setEnabled:NO];
+    prefsNeedUpdating = NO;
+}
+
+
+- (void)toggleWideAreaBonjour:(BOOL)state
+{
+	[wideAreaCheckBox setState:state];
+	[regDomainsComboBox setEnabled:state];
+	[registrationSharedSecretButton setEnabled:state];
+}
+
+
+- (IBAction)revertClicked:(id)sender
+{
+    [self restorePreferences];
+	[browseDomainList deselectAll:sender];
+    [mainWindow makeFirstResponder:nil];
+}
+
+
+- (void)restorePreferences
+{
+    [self setupInitialValues];
+}
+
+
+- (void)savePanelWillClose:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+	(void)sheet; // Unused
+    DNSServiceDiscoveryPref * me = (DNSServiceDiscoveryPref *)contextInfo;
+    
+    if (returnCode == NSAlertDefaultReturn) {
+        [me applyCurrentState];
+    } else if (returnCode == NSAlertAlternateReturn ) {
+        [me restorePreferences];
+    }
+    
+    [me enableControls];
+    [me replyToShouldUnselect:(returnCode != NSAlertOtherReturn)];
+}
+
+
+-(SecKeychainItemRef)copyKeychainItemforDomain:(NSString *)domain
+{
+    const char * serviceName = [domain UTF8String];
+    UInt32 type              = 'ddns';
+	UInt32 typeLength        = sizeof(type);
+
+	SecKeychainAttribute attrs[] = { { kSecServiceItemAttr, strlen(serviceName),   (char *)serviceName },
+                                     { kSecTypeItemAttr,             typeLength, (UInt32 *)&type       } };
+    
+	SecKeychainAttributeList attributes = { sizeof(attrs) / sizeof(attrs[0]), attrs };
+    SecKeychainSearchRef searchRef;
+    SecKeychainItemRef itemRef = NULL;
+    OSStatus err;
+    
+    err = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, &attributes, &searchRef);
+	if (err == noErr) {
+		err = SecKeychainSearchCopyNext(searchRef, &itemRef);
+		if (err != noErr) itemRef = NULL;
+	}
+	return itemRef;
+}
+
+
+-(NSString *)sharedSecretKeyName:(NSString * )domain
+{
+	SecKeychainItemRef itemRef = NULL;
+	NSString *keyName = nil;
+	OSStatus err;
+	    
+	err = SecKeychainSetPreferenceDomain(kSecPreferencesDomainSystem);
+	assert(err == noErr);
+
+	itemRef = [self copyKeychainItemforDomain:[domain lowercaseString]];
+    if (itemRef) {
+        UInt32 tags[1];
+        SecKeychainAttributeInfo attrInfo;
+        SecKeychainAttributeList *attrList = NULL;
+        SecKeychainAttribute attribute;
+		unsigned int i;
+		
+        tags[0] = kSecAccountItemAttr;
+        attrInfo.count = 1;
+        attrInfo.tag = tags;
+        attrInfo.format = NULL;
+					
+        err = SecKeychainItemCopyAttributesAndData(itemRef,  &attrInfo, NULL, &attrList, NULL, NULL);
+        if (err == noErr) {
+            for (i = 0; i < attrList->count; i++) {
+                attribute = attrList->attr[i];
+                if (attribute.tag == kSecAccountItemAttr) {
+                    keyName = [[NSString alloc] initWithBytes:attribute.data length:attribute.length encoding:NSUTF8StringEncoding];
+                    break;
+                }
+            }
+            if (attrList) (void)SecKeychainItemFreeAttributesAndData(attrList, NULL);
+        }
+		CFRelease(itemRef);
+	}
+    return keyName;
+}
+
+
+-(NSString *)domainForHostName:(NSString *)hostNameString
+{
+    NSString * domainName = nil;
+    char text[64];
+    char * ptr = NULL;
+    
+    ptr = (char *)[hostNameString UTF8String];
+    if (ptr) {
+        ptr = (char *)GetNextLabel(ptr, text);
+        domainName = [[NSString alloc] initWithUTF8String:(const char *)ptr];             
+    }
+    return ([domainName autorelease]);
+}
+
+
+- (NSData *)dataForDomain:(NSString *)domainName isEnabled:(BOOL)enabled
+{
+	NSMutableArray      *domainsArray; 
+	NSMutableDictionary *domainDict = nil;
+	
+	if (domainName && [domainName length] > 0) {
+		domainDict= [[[NSMutableDictionary alloc] initWithCapacity:2] autorelease];
+		[domainDict setObject:domainName forKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+		[domainDict setObject:[[[NSNumber alloc] initWithBool:enabled] autorelease] forKey:(NSString *)SC_DYNDNS_ENABLED_KEY];
+	}
+	domainsArray = [[[NSMutableArray alloc] initWithCapacity:1] autorelease];
+	if (domainDict) [domainsArray addObject:domainDict];
+	return [NSArchiver archivedDataWithRootObject:domainsArray];
+}
+
+
+- (NSData *)dataForDomainArray:(NSArray *)domainArray
+{
+	return [NSArchiver archivedDataWithRootObject:domainArray];
+}
+
+
+- (NSData *)dataForSharedSecret:(NSString *)secret domain:(NSString *)domainName key:(NSString *)keyName
+{
+	NSMutableDictionary *sharedSecretDict = [[[NSMutableDictionary alloc] initWithCapacity:3] autorelease];
+	[sharedSecretDict setObject:secret forKey:(NSString *)SC_DYNDNS_SECRET_KEY];
+	[sharedSecretDict setObject:[domainName lowercaseString] forKey:(NSString *)SC_DYNDNS_DOMAIN_KEY];
+	[sharedSecretDict setObject:keyName forKey:(NSString *)SC_DYNDNS_KEYNAME_KEY];
+	return [NSArchiver archivedDataWithRootObject:sharedSecretDict];
+}
+
+
+-(void)savePreferences
+{
+    NSString      *hostNameString               = [hostName stringValue];
+    NSString      *browseDomainString           = [browseDomainsComboBox stringValue];
+    NSString      *regDomainString              = [regDomainsComboBox stringValue];
+    NSString      *tempHostNameSharedSecretName = hostNameSharedSecretName;
+    NSString      *tempRegSharedSecretName      = regSharedSecretName;
+	NSData        *browseDomainData             = nil;
+    BOOL          regSecretWasSet               = NO;
+    BOOL          hostSecretWasSet              = NO;
+    OSStatus      err                           = noErr;
+
+	hostNameString                = [self trimCharactersFromDomain:hostNameString];
+	browseDomainString            = [self trimCharactersFromDomain:browseDomainString];
+	regDomainString               = [self trimCharactersFromDomain:regDomainString];
+	tempHostNameSharedSecretName  = [self trimCharactersFromDomain:tempHostNameSharedSecretName];
+	tempRegSharedSecretName       = [self trimCharactersFromDomain:tempRegSharedSecretName];
+	
+	[hostName setStringValue:hostNameString];
+	[regDomainsComboBox setStringValue:regDomainString];
+    
+    // Convert Shared Secret account names to lowercase.
+    tempHostNameSharedSecretName = [tempHostNameSharedSecretName lowercaseString];
+    tempRegSharedSecretName      = [tempRegSharedSecretName lowercaseString];
+    
+    // Save hostname shared secret.
+    if ([hostNameSharedSecretName length] > 0 && ([hostNameSharedSecretValue length] > 0)) {
+		SetKeyForDomain((CFDataRef)[self dataForSharedSecret:hostNameSharedSecretValue domain:hostNameString key:tempHostNameSharedSecretName]);
+        [hostNameSharedSecretValue release];
+        hostNameSharedSecretValue = nil;
+        hostSecretWasSet = YES;
+    }
+    
+    // Save registration domain shared secret.
+    if (([regSharedSecretName length] > 0) && ([regSharedSecretValue length] > 0)) {
+		SetKeyForDomain((CFDataRef)[self dataForSharedSecret:regSharedSecretValue domain:regDomainString key:tempRegSharedSecretName]);
+        [regSharedSecretValue release];
+        regSharedSecretValue = nil;
+        regSecretWasSet = YES;
+    }
+
+    // Save hostname.
+    if ((currentHostName == NULL) || [currentHostName compare:hostNameString] != NSOrderedSame) {
+		err = WriteHostname((CFDataRef)[self dataForDomain:hostNameString isEnabled:YES]);
+		if (err != noErr) NSLog(@"WriteHostname returned %d\n", (int32_t)err);
+        currentHostName = [hostNameString copy];
+    } else if (hostSecretWasSet) {
+		WriteHostname((CFDataRef)[self dataForDomain:@"" isEnabled:NO]);
+		usleep(200000);  // Temporary hack
+        if ([currentHostName length] > 0) WriteHostname((CFDataRef)[self dataForDomain:(NSString *)currentHostName isEnabled:YES]);
+    }
+    
+    // Save browse domain.
+	if (browseDomainsArray && [browseDomainsArray isEqualToArray:currentBrowseDomainsArray] == NO) {
+		browseDomainData = [self dataForDomainArray:browseDomainsArray];
+		err = WriteBrowseDomain((CFDataRef)browseDomainData);
+		if (err != noErr) NSLog(@"WriteBrowseDomain returned %d\n", (int32_t)err);
+		currentBrowseDomainsArray = [browseDomainsArray copy];
+    }
+	
+    // Save registration domain.
+    if ((currentRegDomain == NULL) || ([currentRegDomain compare:regDomainString] != NSOrderedSame) || (currentWideAreaState != [wideAreaCheckBox state])) {
+
+		err = WriteRegistrationDomain((CFDataRef)[self dataForDomain:regDomainString isEnabled:[wideAreaCheckBox state]]);
+		if (err != noErr) NSLog(@"WriteRegistrationDomain returned %d\n", (int32_t)err);
+        
+		if (currentRegDomain) CFRelease(currentRegDomain);
+        currentRegDomain = [regDomainString copy];
+
+        if ([currentRegDomain length] > 0) {
+			currentWideAreaState = [wideAreaCheckBox state];
+            [registrationDataSource removeObject:regDomainString];
+            [registrationDataSource addObject:currentRegDomain];
+            [registrationDataSource sortUsingFunction:MyArrayCompareFunction context:nil];
+            [regDomainsComboBox reloadData];
+        } else {
+			currentWideAreaState = NO;
+			[self toggleWideAreaBonjour:NO];
+            if (defaultRegDomain != nil) [regDomainsComboBox setStringValue:defaultRegDomain];
+		}
+    } else if (regSecretWasSet) {
+        WriteRegistrationDomain((CFDataRef)[self dataForDomain:@"" isEnabled:NO]);
+		usleep(200000);  // Temporary hack
+        if ([currentRegDomain length] > 0) WriteRegistrationDomain((CFDataRef)[self dataForDomain:currentRegDomain isEnabled:currentWideAreaState]);
+    }
+}   
+
+
+- (NSPreferencePaneUnselectReply)shouldUnselect
+{
+#if 1
+    if (prefsNeedUpdating == YES) {
+    
+        [self disableControls];
+        
+        NSBeginAlertSheet(
+                    @"Apply Configuration Changes?",
+                    @"Apply",
+                    @"Don't Apply",
+                    @"Cancel",
+                    mainWindow,
+                    self,
+                    @selector( savePanelWillClose:returnCode:contextInfo: ),
+                    NULL,
+                    (void *) self, // sender,
+                    @"" );
+        return NSUnselectLater;
+    }
+#endif
+    
+    return NSUnselectNow;
+}
+
+
+-(void)disableControls
+{
+    [hostName setEnabled:NO];
+    [hostNameSharedSecretButton setEnabled:NO];
+    [browseDomainsComboBox setEnabled:NO];
+    [applyButton setEnabled:NO];
+    [revertButton setEnabled:NO];
+    [wideAreaCheckBox setEnabled:NO];
+    [regDomainsComboBox setEnabled:NO];
+    [registrationSharedSecretButton setEnabled:NO];
+    [statusImageView setEnabled:NO];
+	
+	browseDomainListEnabled = NO;
+	[browseDomainList deselectAll:self];
+	[browseDomainList setEnabled:NO];
+	
+	[addBrowseDomainButton setEnabled:NO];
+	[removeBrowseDomainButton setEnabled:NO];
+}
+
+
+- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row
+{
+	(void)row; // Unused
+	(void)tableView; // Unused
+	return browseDomainListEnabled;
+}
+
+
+-(void)enableControls
+{
+    [hostName setEnabled:YES];
+    [hostNameSharedSecretButton setEnabled:YES];
+    [browseDomainsComboBox setEnabled:YES];
+    [wideAreaCheckBox setEnabled:YES];
+    [registrationSharedSecretButton setEnabled:YES];
+    [self toggleWideAreaBonjour:[wideAreaCheckBox state]];
+    [statusImageView setEnabled:YES];
+	[addBrowseDomainButton setEnabled:YES];
+
+	[browseDomainList setEnabled:YES];
+	[browseDomainList deselectAll:self];
+	browseDomainListEnabled = YES;
+
+	[removeBrowseDomainButton setEnabled:[browseDomainList numberOfSelectedRows]];
+	[applyButton setEnabled:prefsNeedUpdating];
+	[revertButton setEnabled:prefsNeedUpdating];
+}
+
+
+- (void)authorizationViewDidAuthorize:(SFAuthorizationView *)view
+{
+	(void)view; // Unused
+    [self enableControls];
+}
+
+
+- (void)authorizationViewDidDeauthorize:(SFAuthorizationView *)view
+{    
+	(void)view; // Unused
+    [self disableControls];
+}
+
+@end
+
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) #s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// NOT static -- otherwise the compiler may optimize it out
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS[] = "@(#) Bonjour Preference Pane " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = VersionString_SCCS + 5;
+asm(".desc ___crashreporter_info__, 0x10");
+#endif
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/classes.nib b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/classes.nib
new file mode 100644
index 00000000..58c1f3e5
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/classes.nib
@@ -0,0 +1,59 @@
+{
+    IBClasses = (
+        {
+            ACTIONS = {
+                addBrowseDomainClicked = id; 
+                applyClicked = id; 
+                changeButtonPressed = id; 
+                closeMyCustomSheet = id; 
+                comboAction = id; 
+                enableBrowseDomainClicked = id; 
+                removeBrowseDomainClicked = id; 
+                revertClicked = id; 
+                wideAreaCheckBoxChanged = id; 
+            }; 
+            CLASS = DNSServiceDiscoveryPref; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                addBrowseDomainButton = NSButton; 
+                addBrowseDomainWindow = NSWindow; 
+                applyButton = NSButton; 
+                browseCancelButton = NSButton; 
+                browseDomainList = NSTableView; 
+                browseDomainsComboBox = NSComboBox; 
+                browseOKButton = NSButton; 
+                comboAuthButton = SFAuthorizationView; 
+                hostName = NSTextField; 
+                hostNameSharedSecretButton = NSButton; 
+                regDomainsComboBox = NSComboBox; 
+                registrationSharedSecretButton = NSButton; 
+                removeBrowseDomainButton = NSButton; 
+                revertButton = NSButton; 
+                secretCancelButton = NSButton; 
+                secretOKButton = NSButton; 
+                sharedSecretName = NSTextField; 
+                sharedSecretValue = NSSecureTextField; 
+                sharedSecretWindow = NSWindow; 
+                statusImageView = NSImageView; 
+                tabView = NSTabView; 
+                wideAreaCheckBox = NSButton; 
+            }; 
+            SUPERCLASS = NSPreferencePane; 
+        }, 
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            CLASS = NSPreferencePane; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "_firstKeyView" = id; 
+                "_initialKeyView" = id; 
+                "_lastKeyView" = id; 
+                "_window" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
+        {CLASS = SFAuthorizationView; LANGUAGE = ObjC; SUPERCLASS = NSView; }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/info.nib b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/info.nib
new file mode 100644
index 00000000..e8dbd926
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/info.nib
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>32 63 547 281 0 0 1024 746 </string>
+	<key>IBFramework Version</key>
+	<string>439.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>255</integer>
+		<integer>333</integer>
+		<integer>12</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8F23</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/keyedobjects.nib b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/keyedobjects.nib
new file mode 100644
index 00000000..eec01ee4
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib/keyedobjects.nib
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/InfoPlist.strings b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/InfoPlist.strings
new file mode 100644
index 00000000..e2dfa991
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/English.lproj/InfoPlist.strings
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/Info-PreferencePane.plist b/mDNSResponder/mDNSMacOSX/PreferencePane/Info-PreferencePane.plist
new file mode 100644
index 00000000..e5cdb9f2
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/Info-PreferencePane.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Bonjour</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>BonjourPref</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.preference.bonjour</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>DNSServiceDiscoveryPref</string>
+	<key>NSPrefPaneIconFile</key>
+	<string>BonjourPref.tiff</string>
+	<key>NSPrefPaneIconLabel</key>
+	<string>Bonjour</string>
+	<key>NSPrincipalClass</key>
+	<string>DNSServiceDiscoveryPref</string>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.c b/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.c
new file mode 100644
index 00000000..4c0ffa0e
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.c
@@ -0,0 +1,230 @@
+/*
+    File: PrivilegedOperations.c
+
+    Abstract: Interface to "ddnswriteconfig" setuid root tool.
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "PrivilegedOperations.h"
+#include "ConfigurationAuthority.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <SystemConfiguration/SystemConfiguration.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <AssertMacros.h>
+#include <Security/Security.h>
+
+Boolean gToolApproved = false;
+
+static pid_t    execTool(const char *args[])
+// fork/exec and return new pid
+{
+    pid_t child;
+
+    child = vfork();
+    if (child == 0)
+    {
+        execv(args[0], (char *const *)args);
+        printf("exec of %s failed; errno = %d\n", args[0], errno);
+        _exit(-1);      // exec failed
+    }
+    else
+        return child;
+}
+
+OSStatus EnsureToolInstalled(void)
+// Make sure that the tool is installed in the right place, with the right privs, and the right version.
+{
+    CFURLRef bundleURL;
+    pid_t toolPID;
+    int status;
+    OSStatus err = noErr;
+    const char      *args[] = { kToolPath, "0", "V", NULL };
+    char toolSourcePath[PATH_MAX] = {};
+    char toolInstallerPath[PATH_MAX] = {};
+
+    if (gToolApproved)
+        return noErr;
+
+    // Check version of installed tool
+    toolPID = execTool(args);
+    if (toolPID > 0)
+    {
+        waitpid(toolPID, &status, 0);
+        if (WIFEXITED(status) && WEXITSTATUS(status) == PRIV_OP_TOOL_VERS)
+            return noErr;
+    }
+
+    // Locate our in-bundle copy of privop tool
+    bundleURL = CFBundleCopyBundleURL(CFBundleGetBundleWithIdentifier(CFSTR("com.apple.preference.bonjour")) );
+    if (bundleURL != NULL)
+    {
+        CFURLGetFileSystemRepresentation(bundleURL, false, (UInt8*) toolSourcePath, sizeof toolSourcePath);
+        if (strlcat(toolSourcePath,    "/Contents/Resources/" kToolName,      sizeof toolSourcePath   ) >= sizeof toolSourcePath   ) return(-1);
+        CFURLGetFileSystemRepresentation(bundleURL, false, (UInt8*) toolInstallerPath, sizeof toolInstallerPath);
+        if (strlcat(toolInstallerPath, "/Contents/Resources/" kToolInstaller, sizeof toolInstallerPath) >= sizeof toolInstallerPath) return(-1);
+    }
+    else
+        return coreFoundationUnknownErr;
+
+    // Obtain authorization and run in-bundle copy as root to install it
+    {
+        AuthorizationItem aewpRight = { kAuthorizationRightExecute, strlen(toolInstallerPath), toolInstallerPath, 0 };
+        AuthorizationItemSet rights = { 1, &aewpRight };
+        AuthorizationRef authRef;
+
+        err = AuthorizationCreate(&rights, (AuthorizationEnvironment*) NULL,
+                                  kAuthorizationFlagInteractionAllowed | kAuthorizationFlagExtendRights |
+                                  kAuthorizationFlagPreAuthorize, &authRef);
+        if (err == noErr)
+        {
+            char *installerargs[] = { toolSourcePath, NULL };
+            err = AuthorizationExecuteWithPrivileges(authRef, toolInstallerPath, 0, installerargs, (FILE**) NULL);
+            if (err == noErr) {
+                int pid = wait(&status);
+                if (pid > 0 && WIFEXITED(status)) {
+                    err = WEXITSTATUS(status);
+                    if (err == noErr) {
+                        gToolApproved = true;
+                    }
+                } else {
+                    err = -1;
+                }
+            }
+            (void) AuthorizationFree(authRef, kAuthorizationFlagDefaults);
+        }
+    }
+
+    return err;
+}
+
+
+static OSStatus ExecWithCmdAndParam(const char *subCmd, CFDataRef paramData)
+// Execute our privop tool with the supplied subCmd and parameter
+{
+    OSStatus err = noErr;
+    int commFD, dataLen;
+    u_int32_t len;
+    pid_t child;
+    char fileNum[16];
+    UInt8                   *buff;
+    const char              *args[] = { kToolPath, NULL, "A", NULL, NULL };
+    AuthorizationExternalForm authExt;
+
+    err = ExternalizeAuthority(&authExt);
+    require_noerr(err, AuthFailed);
+
+    dataLen = CFDataGetLength(paramData);
+    buff = (UInt8*) malloc(dataLen * sizeof(UInt8));
+    require_action(buff != NULL, AllocBuffFailed, err=memFullErr;);
+    {
+        CFRange all = { 0, dataLen };
+        CFDataGetBytes(paramData, all, buff);
+    }
+
+    commFD = fileno(tmpfile());
+    sprintf(fileNum, "%d", commFD);
+    args[1] = fileNum;
+    args[3] = subCmd;
+
+    // write authority to pipe
+    len = 0;    // tag, unused
+    write(commFD, &len, sizeof len);
+    len = sizeof authExt;   // len
+    write(commFD, &len, sizeof len);
+    write(commFD, &authExt, len);
+
+    // write parameter to pipe
+    len = 0;    // tag, unused
+    write(commFD, &len, sizeof len);
+    len = dataLen;  // len
+    write(commFD, &len, sizeof len);
+    write(commFD, buff, len);
+
+    child = execTool(args);
+    if (child > 0) {
+        int status;
+        waitpid(child, &status, 0);
+        if (WIFEXITED(status))
+            err = WEXITSTATUS(status);
+        //fprintf(stderr, "child exited; status = %d (%ld)\n", status, err);
+    }
+
+    close(commFD);
+
+    free(buff);
+AllocBuffFailed:
+AuthFailed:
+    return err;
+}
+
+OSStatus
+WriteBrowseDomain(CFDataRef domainArrayData)
+{
+    if (!CurrentlyAuthorized())
+        return authFailErr;
+    return ExecWithCmdAndParam("Wb", domainArrayData);
+}
+
+OSStatus
+WriteRegistrationDomain(CFDataRef domainArrayData)
+{
+    if (!CurrentlyAuthorized())
+        return authFailErr;
+    return ExecWithCmdAndParam("Wd", domainArrayData);
+}
+
+OSStatus
+WriteHostname(CFDataRef domainArrayData)
+{
+    if (!CurrentlyAuthorized())
+        return authFailErr;
+    return ExecWithCmdAndParam("Wh", domainArrayData);
+}
+
+OSStatus
+SetKeyForDomain(CFDataRef secretData)
+{
+    if (!CurrentlyAuthorized())
+        return authFailErr;
+    return ExecWithCmdAndParam("Wk", secretData);
+}
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.h b/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.h
new file mode 100644
index 00000000..91a60daf
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/PrivilegedOperations.h
@@ -0,0 +1,70 @@
+/*
+    File: PrivilegedOperations.h
+
+    Abstract: Interface to "ddnswriteconfig" setuid root tool.
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+#define PRIV_OP_TOOL_VERS   4
+
+#define kToolName      "ddnswriteconfig"
+#define kToolPath      "/Library/Application Support/Bonjour/" kToolName
+#define kToolInstaller "installtool"
+
+#define SC_DYNDNS_SETUP_KEY         CFSTR("Setup:/Network/DynamicDNS")
+#define SC_DYNDNS_STATE_KEY         CFSTR("State:/Network/DynamicDNS")
+#define SC_DYNDNS_REGDOMAINS_KEY    CFSTR("RegistrationDomains")
+#define SC_DYNDNS_BROWSEDOMAINS_KEY CFSTR("BrowseDomains")
+#define SC_DYNDNS_HOSTNAMES_KEY     CFSTR("HostNames")
+#define SC_DYNDNS_DOMAIN_KEY        CFSTR("Domain")
+#define SC_DYNDNS_KEYNAME_KEY       CFSTR("KeyName")
+#define SC_DYNDNS_SECRET_KEY        CFSTR("Secret")
+#define SC_DYNDNS_ENABLED_KEY       CFSTR("Enabled")
+#define SC_DYNDNS_STATUS_KEY        CFSTR("Status")
+#define DYNDNS_KEYCHAIN_DESCRIPTION "Dynamic DNS Key"
+
+
+OSStatus EnsureToolInstalled(void);
+OSStatus WriteRegistrationDomain(CFDataRef domainArrayData);
+OSStatus WriteBrowseDomain(CFDataRef domainArrayData);
+OSStatus WriteHostname(CFDataRef domainArrayData);
+OSStatus SetKeyForDomain(CFDataRef secretData);
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/ddnswriteconfig.m b/mDNSResponder/mDNSMacOSX/PreferencePane/ddnswriteconfig.m
new file mode 100644
index 00000000..437879bc
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/ddnswriteconfig.m
@@ -0,0 +1,442 @@
+/*
+    File: ddnswriteconfig.m
+
+    Abstract: Setuid root tool invoked by Preference Pane to perform
+    privileged accesses to system configuration preferences and the system keychain.
+    Invoked by PrivilegedOperations.c.
+
+    Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+
+    Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+    ("Apple") in consideration of your agreement to the following terms, and your
+    use, installation, modification or redistribution of this Apple software
+    constitutes acceptance of these terms.  If you do not agree with these terms,
+    please do not use, install, modify or redistribute this Apple software.
+
+    In consideration of your agreement to abide by the following terms, and subject
+    to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+    copyrights in this original Apple software (the "Apple Software"), to use,
+    reproduce, modify and redistribute the Apple Software, with or without
+    modifications, in source and/or binary forms; provided that if you redistribute
+    the Apple Software in its entirety and without modifications, you must retain
+    this notice and the following text and disclaimers in all such redistributions of
+    the Apple Software.  Neither the name, trademarks, service marks or logos of
+    Apple Computer, Inc. may be used to endorse or promote products derived from the
+    Apple Software without specific prior written permission from Apple.  Except as
+    expressly stated in this notice, no other rights or licenses, express or implied,
+    are granted by Apple herein, including but not limited to any patent rights that
+    may be infringed by your derivative works or by other works in which the Apple
+    Software may be incorporated.
+
+    The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+    WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+    WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+    COMBINATION WITH YOUR PRODUCTS.
+
+    IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+    GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+    OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+    (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#import "PrivilegedOperations.h"
+#import "ConfigurationRights.h"
+
+#import <stdio.h>
+#import <stdint.h>
+#import <stdlib.h>
+#import <unistd.h>
+#import <fcntl.h>
+#import <errno.h>
+#import <sys/types.h>
+#import <sys/stat.h>
+#import <sys/mman.h>
+#import <mach-o/dyld.h>
+#import <dns_sd.h>
+#import <AssertMacros.h>
+#import <Security/Security.h>
+#import <CoreServices/CoreServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+#import <Foundation/Foundation.h>
+
+
+static AuthorizationRef	gAuthRef = 0;
+
+static OSStatus
+WriteArrayToDynDNS(CFStringRef arrayKey, CFArrayRef domainArray)
+{
+    SCPreferencesRef	    store;
+	OSStatus				err = noErr;
+	CFDictionaryRef			origDict;
+	CFMutableDictionaryRef	dict = NULL;
+	Boolean					result;
+	CFStringRef				scKey = CFSTR("/System/Network/DynamicDNS");
+	
+
+	// Add domain to the array member ("arrayKey") of the DynamicDNS dictionary
+	// Will replace duplicate, at head of list
+	// At this point, we only support a single-item list
+	store = SCPreferencesCreate(NULL, CFSTR("com.apple.preference.bonjour"), NULL);
+	require_action(store != NULL, SysConfigErr, err=paramErr;);
+	require_action(true == SCPreferencesLock( store, true), LockFailed, err=coreFoundationUnknownErr;);
+
+	origDict = SCPreferencesPathGetValue(store, scKey);
+	if (origDict) {
+		dict = CFDictionaryCreateMutableCopy(NULL, 0, origDict);
+	}
+    
+	if (!dict) {
+		dict = CFDictionaryCreateMutable(NULL, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+	}
+	require_action( dict != NULL, NoDict, err=memFullErr;);
+
+	if (CFArrayGetCount(domainArray) > 0) {
+		CFDictionarySetValue(dict, arrayKey, domainArray);
+	} else {
+		CFDictionaryRemoveValue(dict, arrayKey);
+	}
+	
+	result = SCPreferencesPathSetValue(store, scKey, dict);
+	require_action(result, SCError, err=kernelPrivilegeErr;);
+
+	result = SCPreferencesCommitChanges(store);
+	require_action(result, SCError, err=kernelPrivilegeErr;);
+	result = SCPreferencesApplyChanges(store);
+	require_action(result, SCError, err=kernelPrivilegeErr;);
+
+SCError:
+	CFRelease(dict);
+NoDict:
+	SCPreferencesUnlock(store);
+LockFailed:
+	CFRelease(store);
+SysConfigErr:
+	return err;
+}
+
+
+static int
+readTaggedBlock(int fd, u_int32_t *pTag, u_int32_t *pLen, char **ppBuff)
+// Read tag, block len and block data from stream and return. Dealloc *ppBuff via free().
+{
+	ssize_t		num;
+	u_int32_t	tag, len;		// Don't use ssize_t because that's different on 32- vs. 64-bit
+	int			result = 0;
+
+	num = read(fd, &tag, sizeof tag);
+	require_action(num == sizeof tag, GetTagFailed, result = -1;);
+	num = read(fd, &len, sizeof len);
+	require_action(num == sizeof len, GetLenFailed, result = -1;);
+
+	*ppBuff = (char*) malloc( len);
+	require_action(*ppBuff != NULL, AllocFailed, result = -1;);
+
+	num = read(fd, *ppBuff, len);
+	if (num == (ssize_t)len) {
+		*pTag = tag;
+		*pLen = len;
+	} else {
+		free(*ppBuff);
+		result = -1;
+	}
+
+AllocFailed:
+GetLenFailed:
+GetTagFailed:
+	return result;
+}
+
+
+
+static int
+SetAuthInfo( int fd)
+{
+	int				result = 0;
+	u_int32_t		tag, len;
+	char			*p;
+
+	result = readTaggedBlock( fd, &tag, &len, &p);
+	require( result == 0, ReadParamsFailed);
+	require( len == sizeof(AuthorizationExternalForm), ReadParamsFailed);
+	require( len == kAuthorizationExternalFormLength, ReadParamsFailed);
+
+	if (gAuthRef != 0) {
+		(void) AuthorizationFree(gAuthRef, kAuthorizationFlagDefaults);
+		gAuthRef = 0;
+	}
+
+	result = AuthorizationCreateFromExternalForm((AuthorizationExternalForm*) p, &gAuthRef);
+
+	free( p);
+ReadParamsFailed:
+	return result;
+}
+
+
+static int
+HandleWriteDomain(int fd, int domainType)
+{
+	CFArrayRef      domainArray;
+	CFDataRef       domainData;
+	int				result = 0;
+	u_int32_t		tag, len;
+	char			*p;
+
+	AuthorizationItem	scAuth = { UPDATE_SC_RIGHT, 0, NULL, 0 };
+	AuthorizationRights	authSet = { 1, &scAuth };
+
+	if (noErr != (result = AuthorizationCopyRights(gAuthRef, &authSet, NULL, (AuthorizationFlags)0, NULL)))
+		return result;
+
+	result = readTaggedBlock(fd, &tag, &len, &p);
+	require(result == 0, ReadParamsFailed);
+
+	domainData = CFDataCreate(NULL, (UInt8 *)p, len);
+	domainArray = (CFArrayRef)[NSUnarchiver unarchiveObjectWithData:(NSData *)domainData];
+	
+    if (domainType) {
+        result = WriteArrayToDynDNS(SC_DYNDNS_REGDOMAINS_KEY, domainArray);
+    } else {
+        result = WriteArrayToDynDNS(SC_DYNDNS_BROWSEDOMAINS_KEY, domainArray);
+    }
+
+ReadParamsFailed:
+	return result;
+}
+
+
+static int
+HandleWriteHostname(int fd)
+{
+	CFArrayRef      domainArray;
+	CFDataRef       domainData;
+	int				result = 0;
+	u_int32_t		tag, len;
+	char			*p;
+
+	AuthorizationItem	scAuth = { UPDATE_SC_RIGHT, 0, NULL, 0 };
+	AuthorizationRights	authSet = { 1, &scAuth };
+
+	if (noErr != (result = AuthorizationCopyRights(gAuthRef, &authSet, NULL, (AuthorizationFlags) 0, NULL)))
+		return result;
+
+	result = readTaggedBlock(fd, &tag, &len, &p);
+	require(result == 0, ReadParamsFailed);
+
+	domainData = CFDataCreate(NULL, (const UInt8 *)p, len);
+	domainArray = (CFArrayRef)[NSUnarchiver unarchiveObjectWithData:(NSData *)domainData];
+	result = WriteArrayToDynDNS(SC_DYNDNS_HOSTNAMES_KEY, domainArray);
+	
+ReadParamsFailed:
+	return result;
+}
+
+
+static SecAccessRef
+MyMakeUidAccess(uid_t uid)
+{
+	// make the "uid/gid" ACL subject
+	// this is a CSSM_LIST_ELEMENT chain
+	CSSM_ACL_PROCESS_SUBJECT_SELECTOR selector = {
+		CSSM_ACL_PROCESS_SELECTOR_CURRENT_VERSION,	// selector version
+		CSSM_ACL_MATCH_UID,	// set mask: match uids (only)
+		uid,				// uid to match
+		0					// gid (not matched here)
+	};
+	CSSM_LIST_ELEMENT subject2 = { NULL, 0, 0, {{0,0,0}} };
+	subject2.Element.Word.Data = (UInt8 *)&selector;
+	subject2.Element.Word.Length = sizeof(selector);
+	CSSM_LIST_ELEMENT subject1 = { &subject2, CSSM_ACL_SUBJECT_TYPE_PROCESS, CSSM_LIST_ELEMENT_WORDID, {{0,0,0}} };
+
+
+	// rights granted (replace with individual list if desired)
+	CSSM_ACL_AUTHORIZATION_TAG rights[] = {
+		CSSM_ACL_AUTHORIZATION_ANY	// everything
+	};
+	// owner component (right to change ACL)
+	CSSM_ACL_OWNER_PROTOTYPE owner = {
+		// TypedSubject
+		{ CSSM_LIST_TYPE_UNKNOWN, &subject1, &subject2 },
+		// Delegate
+		false
+	};
+	// ACL entries (any number, just one here)
+	CSSM_ACL_ENTRY_INFO acls =
+		{
+		// CSSM_ACL_ENTRY_PROTOTYPE
+			{
+			{ CSSM_LIST_TYPE_UNKNOWN, &subject1, &subject2 }, // TypedSubject
+			false,	// Delegate
+			{ sizeof(rights) / sizeof(rights[0]), rights }, // Authorization rights for this entry
+			{ { 0, 0 }, { 0, 0 } }, // CSSM_ACL_VALIDITY_PERIOD
+			"" // CSSM_STRING EntryTag
+			},
+		// CSSM_ACL_HANDLE
+		0
+		};
+
+	SecAccessRef a = NULL;
+	(void) SecAccessCreateFromOwnerAndACL(&owner, 1, &acls, &a);
+	return a;
+}
+
+
+static OSStatus
+MyAddDynamicDNSPassword(SecKeychainRef keychain, SecAccessRef a, UInt32 serviceNameLength, const char *serviceName,
+    UInt32 accountNameLength, const char *accountName, UInt32 passwordLength, const void *passwordData)
+{
+	char * description       = DYNDNS_KEYCHAIN_DESCRIPTION;
+	UInt32 descriptionLength = strlen(DYNDNS_KEYCHAIN_DESCRIPTION);
+	UInt32 type              = 'ddns';
+	UInt32 creator           = 'ddns';
+	UInt32 typeLength        = sizeof(type);
+	UInt32 creatorLength     = sizeof(creator);
+    OSStatus err;
+	
+	// set up attribute vector (each attribute consists of {tag, length, pointer})
+	SecKeychainAttribute attrs[] = { { kSecLabelItemAttr,       serviceNameLength,   (char *)serviceName },
+                                     { kSecAccountItemAttr,     accountNameLength,   (char *)accountName },
+                                     { kSecServiceItemAttr,     serviceNameLength,   (char *)serviceName },
+                                     { kSecDescriptionItemAttr, descriptionLength,   (char *)description },
+                                     { kSecTypeItemAttr,               typeLength, (UInt32 *)&type       },
+                                     { kSecCreatorItemAttr,         creatorLength, (UInt32 *)&creator    } };
+	SecKeychainAttributeList attributes = { sizeof(attrs) / sizeof(attrs[0]), attrs };
+
+	err = SecKeychainItemCreateFromContent(kSecGenericPasswordItemClass, &attributes, passwordLength, passwordData, keychain, a, NULL);
+    return err;
+}
+
+
+static int
+SetKeychainEntry(int fd)
+// Create a new entry in system keychain, or replace existing
+{
+	CFDataRef           secretData;
+	CFDictionaryRef     secretDictionary;
+	CFStringRef         keyNameString;
+	CFStringRef         domainString;
+	CFStringRef         secretString;
+	SecKeychainItemRef	item = NULL;
+	int					result = 0;
+	u_int32_t			tag, len;
+	char				*p;
+	char                keyname[kDNSServiceMaxDomainName];
+	char                domain[kDNSServiceMaxDomainName];
+	char                secret[kDNSServiceMaxDomainName];
+
+	AuthorizationItem	kcAuth = { EDIT_SYS_KEYCHAIN_RIGHT, 0, NULL, 0 };
+	AuthorizationRights	authSet = { 1, &kcAuth };
+
+	if (noErr != (result = AuthorizationCopyRights(gAuthRef, &authSet, NULL, (AuthorizationFlags)0, NULL)))
+		return result;
+
+	result = readTaggedBlock(fd, &tag, &len, &p);
+	require_noerr(result, ReadParamsFailed);
+
+	secretData = CFDataCreate(NULL, (UInt8 *)p, len);
+	secretDictionary = (CFDictionaryRef)[NSUnarchiver unarchiveObjectWithData:(NSData *)secretData];
+
+	keyNameString = (CFStringRef)CFDictionaryGetValue(secretDictionary, SC_DYNDNS_KEYNAME_KEY);
+	assert(keyNameString != NULL);
+	
+	domainString  = (CFStringRef)CFDictionaryGetValue(secretDictionary, SC_DYNDNS_DOMAIN_KEY);
+	assert(domainString != NULL);
+	
+	secretString  = (CFStringRef)CFDictionaryGetValue(secretDictionary, SC_DYNDNS_SECRET_KEY);
+	assert(secretString != NULL);
+			
+	CFStringGetCString(keyNameString, keyname, kDNSServiceMaxDomainName, kCFStringEncodingUTF8);
+	CFStringGetCString(domainString,   domain, kDNSServiceMaxDomainName, kCFStringEncodingUTF8);
+	CFStringGetCString(secretString,   secret, kDNSServiceMaxDomainName, kCFStringEncodingUTF8);
+
+	result = SecKeychainSetPreferenceDomain(kSecPreferencesDomainSystem);
+	if (result == noErr) {
+		result = SecKeychainFindGenericPassword(NULL, strlen(domain), domain, 0, NULL, 0, NULL, &item);
+		if (result == noErr) {
+			result = SecKeychainItemDelete(item);
+			if (result != noErr) fprintf(stderr, "SecKeychainItemDelete returned %d\n", result);
+		}
+			 
+		result = MyAddDynamicDNSPassword(NULL, MyMakeUidAccess(0), strlen(domain), domain, strlen(keyname)+1, keyname, strlen(secret)+1, secret);
+		if (result != noErr) fprintf(stderr, "MyAddDynamicDNSPassword returned %d\n", result);
+		if (item) CFRelease(item);
+	}
+
+ReadParamsFailed:
+	return result;
+}
+
+
+int	main( int argc, char **argv)
+/* argv[0] is the exec path; argv[1] is a fd for input data; argv[2]... are operation codes.
+   The tool supports the following operations:
+	V		-- exit with status PRIV_OP_TOOL_VERS
+	A		-- read AuthInfo from input pipe
+	Wd		-- write registration domain to dynamic store
+	Wb		-- write browse domain to dynamic store
+	Wh		-- write hostname to dynamic store
+	Wk		-- write keychain entry for given account name
+*/
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	int	commFD = -1, iArg, result = 0;
+
+	if ( 0 != seteuid( 0))
+		return -1;
+
+	if ( argc == 3 && 0 == strcmp( argv[2], "V"))
+		return PRIV_OP_TOOL_VERS;
+
+	if ( argc > 1)
+	{
+		commFD = strtol( argv[1], NULL, 0);
+		lseek( commFD, 0, SEEK_SET);
+	}
+	for ( iArg = 2; iArg < argc && result == 0; iArg++)
+	{
+		if ( 0 == strcmp( "A", argv[ iArg]))	// get auth info
+		{
+			result = SetAuthInfo( commFD);
+		}
+		else if ( 0 == strcmp( "Wd", argv[ iArg]))	// Write registration domain
+		{
+			result = HandleWriteDomain( commFD, 1);
+		}
+        else if ( 0 == strcmp( "Wb", argv[ iArg]))	// Write browse domain
+		{
+			result = HandleWriteDomain( commFD, 0);
+		}
+		else if ( 0 == strcmp( "Wh", argv[ iArg]))	// Write hostname
+		{
+			result = HandleWriteHostname( commFD);
+		}
+		else if ( 0 == strcmp( "Wk", argv[ iArg]))	// Write keychain entry
+		{
+			result = SetKeychainEntry( commFD);
+		}
+	}
+	[pool release];
+	return result;
+}
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) #s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// NOT static -- otherwise the compiler may optimize it out
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS[] = "@(#) ddnswriteconfig " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = VersionString_SCCS + 5;
+asm(".desc ___crashreporter_info__, 0x10");
+#endif
diff --git a/mDNSResponder/mDNSMacOSX/PreferencePane/installtool b/mDNSResponder/mDNSMacOSX/PreferencePane/installtool
new file mode 100755
index 00000000..ce341c87
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/PreferencePane/installtool
@@ -0,0 +1,94 @@
+#!/usr/bin/perl
+# Emacs settings: -*- tab-width: 4 -*-
+#
+# File: installtool
+# 
+# Abstract: Copy "ddnswriteconfig" to Application Support and make it setuid root.
+# 
+# Copyright: (c) Copyright 2005 Apple Computer, Inc. All rights reserved.
+# 
+# Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+# ("Apple") in consideration of your agreement to the following terms, and your
+# use, installation, modification or redistribution of this Apple software
+# constitutes acceptance of these terms.  If you do not agree with these terms,
+# please do not use, install, modify or redistribute this Apple software.
+# 
+# In consideration of your agreement to abide by the following terms, and subject
+# to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+# copyrights in this original Apple software (the "Apple Software"), to use,
+# reproduce, modify and redistribute the Apple Software, with or without
+# modifications, in source and/or binary forms; provided that if you redistribute
+# the Apple Software in its entirety and without modifications, you must retain
+# this notice and the following text and disclaimers in all such redistributions of
+# the Apple Software.  Neither the name, trademarks, service marks or logos of
+# Apple Computer, Inc. may be used to endorse or promote products derived from the
+# Apple Software without specific prior written permission from Apple.  Except as
+# expressly stated in this notice, no other rights or licenses, express or implied,
+# are granted by Apple herein, including but not limited to any patent rights that
+# may be infringed by your derivative works or by other works in which the Apple
+# Software may be incorporated.
+# 
+# The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+# WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+# WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+# COMBINATION WITH YOUR PRODUCTS.
+# 
+# IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+# OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+# (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Create the Bonjour subdirectory.
+# Copy ARGV[0] to $dest and set owner and suid permissions.
+#
+# This script will be run as root by the AEWP trampoline.
+#
+
+use File::Temp qw/ :mktemp /;
+
+$dest_dir = "/Library/Application Support/Bonjour";
+$dest = $dest_dir . "/ddnswriteconfig";
+
+$template = ".XXXXXX";
+
+# Perl seems to think this code is running setuid root, so it applies its security checks.
+# See <http://www.monster-submit.com/resources/docs/pod/perlsec.html>.
+# In fact this is NOT a setuid script. It is a normal unprivileged user-level script --
+# but it is run as root when properly authorized by a user with an admin password,
+# via the AuthorizationExecuteWithPrivileges() call.
+# We therefore have to do this trick pattern match to 'untaint' the source file specified in $ARGV[0].
+if ($ARGV[0] =~ /^(.+)$/) { $src = $1; }
+
+# Also clear $ENV{PATH} so we don't get "Insecure $ENV{PATH}" fatal errors
+$ENV{PATH} = "";
+
+if (! -d $dest_dir) {
+   $dest_tmp_dir = mkdtemp ($dest_dir . $template);
+   (chown 0, 80, $dest_tmp_dir) or cleanup_dir();
+   (chmod 0755, $dest_tmp_dir) or cleanup_dir();
+   (rename $dest_tmp_dir, $dest_dir) or cleanup_dir();
+}
+
+$dest_tmp = mktemp ($dest . $template);
+
+if ($src ne '') {
+   system ('/bin/cp', '-f', $src, $dest_tmp) and cleanup();
+   (chown 0, 80, $dest_tmp) or cleanup();
+   (chmod 04555, $dest_tmp) or cleanup();
+   (rename $dest_tmp, $dest) or cleanup();
+}
+exit (0);
+
+sub cleanup {
+   unlink $dest_tmp;
+   exit (1);
+}
+
+sub cleanup_dir {
+   unlink $dest_tmp_dir;
+   exit (1);
+}
diff --git a/mDNSResponder/mDNSMacOSX/Private/dns_services.c b/mDNSResponder/mDNSMacOSX/Private/dns_services.c
new file mode 100644
index 00000000..d0e9e6ca
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/Private/dns_services.c
@@ -0,0 +1,212 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ * PRIVATE DNSX CLIENT LIBRARY --FOR Apple Platforms ONLY OSX/iOS--
+ * Resides in /usr/lib/libdns_services.dylib
+ */
+
+#include "dns_services.h"
+#include "dns_xpc.h"
+#include <xpc/xpc.h>
+#include <Block.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+
+//*************************************************************************************************************
+// Globals
+
+#define connection_t xpc_connection_t
+
+struct _DNSXConnRef_t
+{
+    connection_t      conn_ref;      // xpc_connection between client and daemon
+    dispatch_queue_t  lib_q;         // internal queue created in library itself   
+    void              *AppCallBack;  // Callback function ptr for Client
+    dispatch_queue_t  client_q;      // Queue specified by client for scheduling its Callback
+};
+
+//*************************************************************************************************************
+// Utility Functions
+
+static bool LogDebugEnabled()
+{
+    return false;
+}
+
+static void LogDebug(const char *prefix, xpc_object_t o)
+{
+    if (!LogDebugEnabled()) 
+        return;
+    
+    char *desc = xpc_copy_description(o);
+    syslog(LOG_INFO, "%s: %s", prefix, desc); 
+    free(desc);
+}
+
+//**************************************************************************************************************
+
+void DNSXRefDeAlloc(DNSXConnRef connRef)
+{
+    if (!connRef)
+    {
+        syslog(LOG_WARNING, "dns_services: DNSXRefDeAlloc called with NULL DNSXConnRef");
+        return;
+    }
+
+    // Schedule this work on the internal library queue
+    dispatch_sync(connRef->lib_q, ^{
+
+        xpc_release(connRef->conn_ref);
+        connRef->AppCallBack = NULL;
+        dispatch_release(connRef->client_q);
+
+    });
+
+    dispatch_release(connRef->lib_q);
+    free(connRef);
+
+    syslog(LOG_INFO, "dns_services: DNSXRefDeAlloc successfully DeAllocated connRef");
+
+}
+
+// Sends the Msg(Dictionary) to the Server
+static DNSXErrorType SendMsgToServer(DNSXConnRef *connRef, xpc_object_t msg, bool old_conn)
+{
+    DNSXErrorType errx = kDNSX_NoError;
+
+    LogDebug("dns_services: SendMsgToServer", msg);
+    
+    xpc_connection_set_event_handler((*connRef)->conn_ref, ^(xpc_object_t recv_msg)
+    {
+        xpc_type_t type = xpc_get_type(recv_msg);
+
+        if (type == XPC_TYPE_DICTIONARY)
+        {
+            LogDebug("dns_services: SendMsgToServer SUCCESS CALLBACK FROM SERVER", recv_msg);
+            syslog(LOG_INFO, "dns_services: Successfully Sent Msg to the Daemon");
+            uint64_t daemon_status = xpc_dictionary_get_uint64(recv_msg, kDNSDaemonReply);
+ 
+            // Schedule the AppCallBacks on the Client Specified Queue
+            switch (daemon_status)
+            {   
+                case kDNSDaemonEngaged:
+                        dispatch_async((*connRef)->client_q, ^{  
+                                        ((DNSXEnableProxyReply)(*connRef)->AppCallBack)((*connRef), kDNSX_Engaged);
+                                        }); 
+                                        break;
+                case kDNSMsgReceived:
+                        dispatch_async((*connRef)->client_q, ^{
+                                        ((DNSXEnableProxyReply)(*connRef)->AppCallBack)((*connRef), kDNSX_NoError);
+                                        }); 
+                                        break;
+                default:
+                        dispatch_async((*connRef)->client_q, ^{
+                                        ((DNSXEnableProxyReply)(*connRef)->AppCallBack)((*connRef), kDNSX_UnknownErr);
+                                        }); 
+                                        break;
+            }   
+
+        }
+        else
+        {
+            LogDebug("dns_services: SendMsgToServer UNEXPECTED CALLBACK FROM SERVER", recv_msg);
+            syslog(LOG_WARNING, "dns_services: Connection failed since NO privileges to access service OR Daemon NOT Running");
+            dispatch_async((*connRef)->client_q, ^{
+                            ((DNSXEnableProxyReply)(*connRef)->AppCallBack)((*connRef), kDNSX_DaemonNotRunning);
+                            });
+        }
+    });
+    
+    // To prevent Over-Resume of a connection
+    if (!old_conn)
+        xpc_connection_resume((*connRef)->conn_ref);
+    xpc_connection_send_message((*connRef)->conn_ref, msg);
+    if (!errx)
+        syslog(LOG_INFO, "dns_services: SendMSgToServer sent Msg Dict successfully to Daemon");
+    return errx;
+}
+
+// Creates a new DNSX Connection Reference(DNSXConnRef).
+// If DNSXConnRef exists, you may want to use that depending on the use case
+static DNSXErrorType InitConnection(DNSXConnRef *connRef, const char *servname, dispatch_queue_t clientq, void *AppCallBack)
+{
+    if (!connRef)
+    {
+        syslog(LOG_WARNING, "dns_services: InitConnection() called with NULL DNSXConnRef");
+        return kDNSX_BadParam;   
+    }
+
+    *connRef = malloc(sizeof(struct _DNSXConnRef_t));
+    if (!(*connRef))
+    {
+        syslog(LOG_WARNING, "dns_services: InitConnection() No memory to allocate");
+        return kDNSX_NoMem;
+    }
+
+    // Initialize the DNSXConnRef  
+    dispatch_retain(clientq);
+    (*connRef)->client_q     = clientq;
+    (*connRef)->AppCallBack  = AppCallBack;    
+    (*connRef)->lib_q        = dispatch_queue_create("com.apple.mDNSResponder.libdns_services.q", NULL); 
+    (*connRef)->conn_ref     = xpc_connection_create_mach_service(servname, (*connRef)->lib_q, XPC_CONNECTION_MACH_SERVICE_PRIVILEGED);
+
+    syslog(LOG_INFO, "dns_services: InitConnection() successfully create a new DNSXConnRef");
+    return kDNSX_NoError;
+}
+
+DNSXErrorType DNSXEnableProxy(DNSXConnRef *connRef, DNSProxyParameters proxyparam, IfIndex inIfindexArr[MaxInputIf], 
+                               IfIndex outIfindex, dispatch_queue_t clientq, DNSXEnableProxyReply callBack)
+{
+
+    DNSXErrorType errx = kDNSX_NoError;
+    bool old_conn = false;    
+
+    // Sanity Checks
+    if (!connRef || !callBack || !clientq)
+    {
+        syslog(LOG_WARNING, "dns_services: DNSXEnableProxy called with NULL DNSXConnRef OR Callback OR ClientQ parameter");
+        return kDNSX_BadParam;
+    }   
+
+    // If no connRef, get it from InitConnection()
+    if (!*connRef)
+    {
+        errx = InitConnection(connRef, kDNSProxyService, clientq, callBack);
+        if (errx) // On error InitConnection() leaves *connRef set to NULL
+        {
+            syslog(LOG_WARNING, "dns_services: Since InitConnection() returned %d error returning w/o sending msg", errx);
+            return errx;
+        }
+    }
+    else // Client already has a valid connRef
+    {
+        old_conn = true;
+    }
+
+    // Create Dictionary To Send
+    xpc_object_t dict = xpc_dictionary_create(NULL, NULL, 0); 
+    if (!dict)
+    {
+        syslog(LOG_WARNING, "dns_services: DNSXEnableProxy could not create the Msg Dict To Send!");
+        DNSXRefDeAlloc(*connRef);
+        return kDNSX_DictError;
+    }
+
+    xpc_dictionary_set_uint64(dict, kDNSProxyParameters, proxyparam);
+
+    xpc_dictionary_set_uint64(dict, kDNSInIfindex0,      inIfindexArr[0]);
+    xpc_dictionary_set_uint64(dict, kDNSInIfindex1,      inIfindexArr[1]);
+    xpc_dictionary_set_uint64(dict, kDNSInIfindex2,      inIfindexArr[2]); 
+    xpc_dictionary_set_uint64(dict, kDNSInIfindex3,      inIfindexArr[3]);
+    xpc_dictionary_set_uint64(dict, kDNSInIfindex4,      inIfindexArr[4]);
+
+    xpc_dictionary_set_uint64(dict, kDNSOutIfindex,      outIfindex);
+ 
+    errx = SendMsgToServer(connRef, dict, old_conn);
+    xpc_release(dict);
+
+    return errx; 
+}
+
diff --git a/mDNSResponder/mDNSMacOSX/Private/dns_services.h b/mDNSResponder/mDNSMacOSX/Private/dns_services.h
new file mode 100644
index 00000000..7b74e10d
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/Private/dns_services.h
@@ -0,0 +1,124 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ *
+ * @header      Interface to DNSX SPI
+ *
+ * @discussion  Describes the functions and data structures
+ *              that make up the DNSX SPI
+ */
+
+#ifndef _DNS_SERVICES_H
+#define _DNS_SERVICES_H
+
+#include <dispatch/dispatch.h>
+
+// DNSXConnRef: Opaque internal data type
+typedef struct _DNSXConnRef_t *DNSXConnRef;
+
+typedef enum
+{
+    kDNSX_NoError                   =  0,
+    kDNSX_UnknownErr                = -65537,   /* 0xFFFE FFFF */
+    kDNSX_NoMem                     = -65539,
+    kDNSX_BadParam                  = -65540,
+    kDNSX_DaemonNotRunning          = -65563,   /* Background daemon not running */
+    kDNSX_DictError                 = -65565,   /* Dictionary Error */
+    kDNSX_Engaged                   = -65566,   /* DNS Proxy is in use by another client */
+    kDNSX_Timeout                   = -65568    
+} DNSXErrorType;
+
+// A max of 5 input interfaces can be processed at one time
+#define MaxInputIf 5
+#define IfIndex uint64_t
+#define kDNSIfindexAny 0
+
+// Enable DNS Proxy with an appropriate parameter defined below
+typedef enum
+{
+    kDNSProxyEnable = 1
+    // Other values reserved for future use
+} DNSProxyParameters;
+
+/*********************************************************************************************
+*
+*  Enable DNS Proxy Functionality
+*
+*********************************************************************************************/
+
+/* DNSXEnableProxy : Turns ON the DNS Proxy (Details below)
+ *
+ * DNSXEnableProxyReply() parameters:
+ *
+ * connRef:                  The DNSXConnRef initialized by DNSXEnableProxy().
+ *
+ * errCode:                  Will be kDNSX_NoError on success, otherwise will indicate the 
+ *                           failure that occurred.  Other parameters are undefined if 
+ *                           errCode is nonzero.
+ *
+ */
+
+typedef void (*DNSXEnableProxyReply)
+(
+    DNSXConnRef           connRef,
+    DNSXErrorType         errCode 
+);
+
+/* DNSXEnableProxy
+ * 
+ * Enables the DNS Proxy functionality which will remain ON until the client terminates explictly (or exits/crashes).
+ * Client can turn it OFF by passing the returned DNSXConnRef to DNSXRefDeAlloc()
+ * 
+ * DNSXEnableProxy() Parameters:
+ *
+ * connRef:                   A pointer to DNSXConnRef that is initialized to NULL when called for the first  
+ *                            time. If the call succeeds it will be initialized to a non-NULL value.
+ *                            Client terminates the DNS Proxy by passing this DNSXConnRef to DNSXRefDeAlloc().
+ *
+ * proxyparam:                Enable DNS Proxy functionality with parameters that are described in
+ *                            DNSProxyParameters above.
+ *
+ * inIfindexArr[MaxInputIf]:  List of input interfaces from which the DNS queries will be accepted and
+ *                            forwarded to the output interface specified below. The daemon processes
+ *                            MaxInputIf entries in the list. For eg. if one has less than MaxInputIfs
+ *                            values, just initialize the other values to be 0. Note: This field needs to
+ *                            be initialized by the client.
+ *
+ * outIfindex:                Output interface on which the query will be forwarded.
+ *                            Passing kDNSIfindexAny causes DNS Queries to be sent on the primary interface.
+ *
+ * clientq:                   Queue the client wants to schedule the callBack on (Note: Must not be NULL)
+ *
+ * callBack:                  CallBack function for the client that indicates success or failure.
+ *                            Note: callback may be invoked more than once, For eg. if enabling DNS Proxy
+ *                            first succeeds and the daemon possibly crashes sometime later. 
+ *
+ * return value:              Returns kDNSX_NoError when no error otherwise returns an error code indicating
+ *                            the error that occurred. Note: A return value of kDNSX_NoError does not mean 
+ *                            that DNS Proxy was successfully enabled. The callBack may asynchronously
+ *                            return an error (such as kDNSX_DaemonNotRunning/ kDNSX_Engaged)
+ *
+ */
+
+DNSXErrorType DNSXEnableProxy
+(
+    DNSXConnRef              *connRef,
+    DNSProxyParameters       proxyparam,
+    IfIndex                  inIfindexArr[MaxInputIf],
+    IfIndex                  outIfindex,
+    dispatch_queue_t         clientq,
+    DNSXEnableProxyReply     callBack
+);
+
+/* DNSXRefDeAlloc()
+ *
+ * Terminate a connection with the daemon and free memory associated with the DNSXConnRef.
+ * Used to Disable DNS Proxy on that connection.
+ *
+ * connRef:        A DNSXConnRef initialized by any of the DNSX*() calls.
+ *
+ */
+void DNSXRefDeAlloc(DNSXConnRef connRef);
+
+#endif  /* _DNS_SERVICES_H */
diff --git a/mDNSResponder/mDNSMacOSX/Private/dns_xpc.h b/mDNSResponder/mDNSMacOSX/Private/dns_xpc.h
new file mode 100644
index 00000000..10ae01fa
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/Private/dns_xpc.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ * Defines the common interface between mDNSResponder and the Private ClientLibrary(libdnsprivate.dylib)
+ * Uses XPC as the IPC Mechanism
+ *
+ */
+
+#ifndef DNS_XPC_H
+#define DNS_XPC_H
+
+#define kDNSProxyService "com.apple.mDNSResponder.dnsproxy"
+
+#define kDNSProxyParameters     "DNSProxyParameters"
+
+#define kDNSInIfindex0          "InputArrayInterfaceIndex[0]"
+#define kDNSInIfindex1          "InputArrayInterfaceIndex[1]"
+#define kDNSInIfindex2          "InputArrayInterfaceIndex[2]"
+#define kDNSInIfindex3          "InputArrayInterfaceIndex[3]"
+#define kDNSInIfindex4          "InputArrayInterfaceIndex[4]"
+
+#define kDNSOutIfindex          "OutputInterfaceIndex"
+
+#define kDNSDaemonReply         "DaemonReplyStatusToClient"
+
+typedef enum
+{
+    kDNSMsgReceived       =  0,
+    kDNSDaemonEngaged 
+} DaemonReplyStatusCodes;
+
+#endif // DNS_XPC_H
diff --git a/mDNSResponder/mDNSMacOSX/Private/xpc_services.c b/mDNSResponder/mDNSMacOSX/Private/xpc_services.c
new file mode 100644
index 00000000..7a0e29fb
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/Private/xpc_services.c
@@ -0,0 +1,255 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ * xpc_services.c
+ * mDNSResponder 
+ *
+ * XPC as an IPC mechanism to communicate with Clients. Open only to Apple OSX/iOS clients
+ */
+
+#include "xpc_services.h"
+#include "dns_xpc.h"
+
+#ifndef UNICAST_DISABLED
+
+#include "dnsproxy.h"        // DNSProxyInit/ProxyUDPCallback/ProxyTCPCallback
+#include "mDNSMacOSX.h"      // KQueueLock/KQueueUnlock
+#include <xpc/xpc.h>
+#include <xpc/private.h>     // xpc_connection_copy_entitlement_value 
+
+// ***************************************************************************
+// Globals
+extern mDNS mDNSStorage;
+static int dps_client_pid; // To track current active client using DNS Proxy Service
+static dispatch_queue_t dps_queue = NULL;
+// ***************************************************************************
+
+// prints current XPC Server State
+mDNSexport void xpcserver_info(mDNS *const m)
+{
+
+    LogMsg("----- Active XPC Clients -----");
+    if (dps_client_pid)
+       LogMsg("DNSProxy->Client[%d]: InputIntfs[%d, %d, %d, %d, %d] Output[%d]", dps_client_pid, m->dp_ipintf[0],
+                m->dp_ipintf[1], m->dp_ipintf[2], m->dp_ipintf[3], m->dp_ipintf[4], m->dp_opintf); 
+}
+
+
+mDNSlocal void ActivateDNSProxy(mDNSu32 IpIfArr[MaxIp], mDNSu32 OpIf, mDNSBool proxy_off)
+{
+
+    LogInfo("ActivateDNSProxy: InterfaceIndex List by Client: Input[%d, %d, %d, %d, %d] Output[%d] ", IpIfArr[0], IpIfArr[1],
+             IpIfArr[2], IpIfArr[3], IpIfArr[4], OpIf);
+ 
+    KQueueLock(&mDNSStorage); 
+    DNSProxyInit(&mDNSStorage, IpIfArr, OpIf);
+    if (proxy_off) // Open skts only if proxy was OFF else we may end up opening extra skts
+        mDNSPlatformInitDNSProxySkts(&mDNSStorage, ProxyUDPCallback, ProxyTCPCallback);
+    KQueueUnlock(&mDNSStorage, "DNSProxy Activated");
+}
+
+mDNSlocal void handle_dps_terminate()
+{
+
+    LogInfo("handle_dps_terminate: Client PID[%d] terminated connection or crashed. Proceed to terminate DNSProxy", dps_client_pid);
+    // Clear the Client's PID, so that we can now accept new DPS requests
+    dps_client_pid = 0;
+
+    KQueueLock(&mDNSStorage);
+    mDNSPlatformCloseDNSProxySkts(&mDNSStorage);
+    // TBD: Close TCP Sockets
+    DNSProxyTerminate(&mDNSStorage);
+    KQueueUnlock(&mDNSStorage, "DNSProxy Deactivated");
+}
+
+mDNSlocal void handle_dps_request(xpc_object_t req)
+{
+    int dps_tmp_client;
+    mDNSBool proxy_off = mDNSfalse;
+    xpc_connection_t remote_conn = xpc_dictionary_get_remote_connection(req);
+    dps_tmp_client = (int) xpc_connection_get_pid(remote_conn);
+
+    LogInfo("handle_dps_request: Handler for DNS Proxy Requests");
+
+    if (dps_client_pid <= 0)
+    {
+        LogInfo("handle_dps_request: DNSProxy is not engaged (New Client)");
+        // No Active Client, save new Client's PID (also indicates DNS Proxy was OFF)
+        dps_client_pid = dps_tmp_client;
+        proxy_off = mDNStrue;        
+    }
+    else
+    {
+        // We already have an active DNS Proxy Client and until that client does not terminate the connection
+        // or crashes, a new client cannot change/override the current DNS Proxy settings.
+        if (dps_client_pid != dps_tmp_client)
+        {
+            LogMsg("handle_dps_request: A Client is already using DNS Proxy and your request cannot be handled at this time");
+            // Return Engaged Status to the client
+            xpc_object_t reply = xpc_dictionary_create(NULL, NULL, 0); 
+            if (reply)
+            {   
+                xpc_dictionary_set_uint64(reply, kDNSDaemonReply, kDNSDaemonEngaged);
+                xpc_connection_send_message(remote_conn, reply);
+                xpc_release(reply);  
+            }   
+            else
+            {   
+                LogMsg("handle_dps_request: Reply Dictionary could not be created");
+                return;
+            }
+            // We do not really need to terminate the connection with the client
+            // as it may try again later which is fine
+            return;   
+        }
+    }
+    
+    // Return Success Status to the client
+    xpc_object_t response = xpc_dictionary_create(NULL, NULL, 0); 
+    if (response)
+    {
+        xpc_dictionary_set_uint64(response, kDNSDaemonReply, kDNSMsgReceived);
+        xpc_connection_send_message(remote_conn, response);
+        xpc_release(response);  
+    }
+    else
+    { 
+        LogMsg("handle_dps_request: Response Dictionary could not be created");
+        return;
+    }
+
+    // Proceed to get DNS Proxy Settings from the Client
+    if (xpc_dictionary_get_uint64(req, kDNSProxyParameters))
+    {
+        mDNSu32 inIf[MaxIp], outIf;
+        
+        inIf[0]   = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSInIfindex0);
+        inIf[1]   = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSInIfindex1);
+        inIf[2]   = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSInIfindex2);
+        inIf[3]   = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSInIfindex3);
+        inIf[4]   = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSInIfindex4);
+        outIf     = (mDNSu32)xpc_dictionary_get_uint64(req, kDNSOutIfindex);
+        
+        ActivateDNSProxy(inIf, outIf, proxy_off);
+    }
+    
+}
+
+// Verify Client's Entitlement
+mDNSlocal mDNSBool IsEntitled(xpc_connection_t conn, const char *password)
+{
+    mDNSBool entitled = mDNSfalse;
+    xpc_object_t ent = xpc_connection_copy_entitlement_value(conn, password);
+
+    if (ent)
+    {
+        if (xpc_get_type(ent) == XPC_TYPE_BOOL && xpc_bool_get_value(ent))
+        {
+            entitled = mDNStrue;
+        }
+        xpc_release(ent);
+    }
+    else
+    {
+        LogMsg("IsEntitled: Client Entitlement is NULL");
+    }
+    
+    return entitled;
+}
+
+mDNSlocal void accept_dps_client(xpc_connection_t conn)
+{
+    uid_t euid;
+    euid = xpc_connection_get_euid(conn);
+
+    if (euid != 0 || !IsEntitled(conn, kDNSProxyService))
+    {   
+        LogMsg("accept_dps_client: DNSProxyService Client Pid[%d] is missing Entitlement or is not root!", (int) xpc_connection_get_pid(conn));
+        xpc_connection_cancel(conn);
+        return; 
+    }
+
+    xpc_retain(conn);
+    xpc_connection_set_target_queue(conn, dps_queue);
+    xpc_connection_set_event_handler(conn, ^(xpc_object_t req_msg)
+        {
+            xpc_type_t type = xpc_get_type(req_msg);
+
+            if (type == XPC_TYPE_DICTIONARY)
+            {
+                handle_dps_request(req_msg);
+            }
+            // We hit the case below only if Client Terminated DPS Connection OR Crashed
+            else
+            {
+                LogInfo("accept_dps_client: DPS Client %p teared down the connection or Crashed", (void *) conn);
+                // Only the Client that has activated DPS should be able to terminate it
+                if (((int)xpc_connection_get_pid(conn)) == dps_client_pid)
+                    handle_dps_terminate(); 
+                xpc_release(conn);
+            }
+        });
+    xpc_connection_resume(conn);
+                
+}
+
+mDNSlocal void init_dnsproxy_service(void)
+{
+    
+    xpc_connection_t dps_listener = xpc_connection_create_mach_service(kDNSProxyService, NULL, XPC_CONNECTION_MACH_SERVICE_LISTENER);
+    if (!dps_listener || xpc_get_type(dps_listener) != XPC_TYPE_CONNECTION)
+    {
+        LogMsg("init_dnsproxy_service: Error Creating XPC Listener for DNSProxyService !!");
+        return;
+    }
+    
+    dps_queue = dispatch_queue_create("com.apple.mDNSResponder.dnsproxyservice_queue", NULL);
+
+    xpc_connection_set_event_handler(dps_listener, ^(xpc_object_t eventmsg)
+        {
+            xpc_type_t type = xpc_get_type(eventmsg);
+
+            if (type == XPC_TYPE_CONNECTION)
+            {
+                LogInfo("init_dnsproxy_service: New DNSProxyService Client %p", eventmsg);
+                accept_dps_client(eventmsg);
+            }
+            // Ideally, we would never hit the cases below
+            else if (type == XPC_TYPE_ERROR)
+            {
+                LogMsg("init_dnsproxy_service: XPCError: %s", xpc_dictionary_get_string(eventmsg, XPC_ERROR_KEY_DESCRIPTION));
+                return;
+            }
+            else
+            {
+                LogMsg("init_dnsproxy_service: Unknown EventMsg type");
+                return;
+            }
+        });
+    xpc_connection_resume(dps_listener);
+
+}
+
+mDNSexport void xpc_server_init()
+{
+    // Add XPC Services here
+    init_dnsproxy_service();
+}
+
+#else // !UNICAST_DISABLED
+
+mDNSexport void xpc_server_init()
+{
+    return;
+}
+
+mDNSexport void xpcserver_info(mDNS *const m)
+{
+    (void) m;
+    
+    return;
+}
+
+#endif // !UNICAST_DISABLED
+
diff --git a/mDNSResponder/mDNSMacOSX/Private/xpc_services.h b/mDNSResponder/mDNSMacOSX/Private/xpc_services.h
new file mode 100644
index 00000000..50081bed
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/Private/xpc_services.h
@@ -0,0 +1,21 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2012 Apple Inc. All rights reserved.
+ *
+ *
+ *
+ *    File:       xpc_services.h
+ *
+ *    Contains:   Interfaces necessary to talk to xpc_services.c
+ *
+ */
+
+#ifndef XPC_SERVICES_H
+#define XPC_SERVICES_H
+
+#include "mDNSEmbeddedAPI.h"
+
+extern void xpc_server_init(void);
+extern void xpcserver_info(mDNS *const m);
+
+#endif // XPC_SERVICES_H
diff --git a/mDNSResponder/mDNSMacOSX/README.privsep b/mDNSResponder/mDNSMacOSX/README.privsep
new file mode 100644
index 00000000..130e3276
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/README.privsep
@@ -0,0 +1,40 @@
+On Mac OS X, mDNSResponder now runs with user-ID and group-ID
+"_mdnsresponder". In order to perform certain privileged operations, a
+helper (unimagintively called mDNSResponderHelper) runs as root when
+needed and handles requests from mDNSResponder.
+
+
+* A new LaunchD job com.apple.mDNSResponderHelper starts
+  mDNSResponderHelper on demand.  The helper exits after approximately
+  10 seconds of idle time.
+
+* The com.apple.mDNSResponder LaunchD job specifies the account under
+  which to run, so that mDNSResponder starts as _mdnsresponder.
+
+* A subdirectory named "mdns" and owned by _mdnsresponder has been
+  created in /var/run.  The PID file and uDNS server socket has been
+  moved to that subdirectory.
+
+* There are currently six remote procedure calls handled by
+  mDNSResponderHelper: mDNSPreferencesSetName, mDNSKeychainGetSecrets,
+  mDNSConfigureServer, and mDNSAutoTunnelSetKeys
+
+* mDNSPreferencesSetName allows mDNSResponder to set the computer name
+  or local host name, and displays a notification if there was a
+  conflict.
+
+* mDNSKeychainGetSecrets causes mDNSResponderHelper to collect DNS
+  keys from the system keychain.  SetDomainSecrets uses the result to
+  populate AuthInfoList.  One could refactor this code further so that
+  mDNSResponderHelper performs all the cryptographic operations, with
+  the result that a compromise of mDNSResponder does not compromise
+  keys.  But I think that may be more change than is advisable at this
+  point.
+
+* On the advice of the Security.framework team, I've used
+  SecKeychainSetPreferenceDomain to ensure that the system keychain is
+  references whenever a NULL SecKeychainRef is used.  Wherever a
+  SecKeychainRef is needed, NULL is now specified.
+
+* mDNSConfigureServer, and mDNSAutoTunnelSetKeys do various setup and
+  teardown for BTMM.
diff --git a/mDNSResponder/mDNSMacOSX/VPNService.c b/mDNSResponder/mDNSMacOSX/VPNService.c
new file mode 100644
index 00000000..8c1bf1d0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/VPNService.c
@@ -0,0 +1,35 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "mDNSMacOSX.h"
+#include <SystemConfiguration/VPNAppLayerPrivate.h>
+
+mDNSexport mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q)
+{
+    (void) m;
+    int sid;
+
+    if (q->pid)
+    {
+        sid = VPNAppLayerGetMatchingServiceIdentifier(q->pid, NULL);
+    }
+    else
+    {
+        sid = VPNAppLayerGetMatchingServiceIdentifier(0, q->uuid);
+    }
+    LogInfo("mDNSPlatformGetServiceID: returning %d for %##s (%s)", sid, q->qname.c, DNSTypeName(q->qtype));
+    return sid;
+}
diff --git a/mDNSResponder/mDNSMacOSX/com.apple.networking.mDNSResponder b/mDNSResponder/mDNSMacOSX/com.apple.networking.mDNSResponder
new file mode 100644
index 00000000..d07c99d0
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/com.apple.networking.mDNSResponder
@@ -0,0 +1 @@
+? [= LoggerID com.apple.networking.mDNSResponder] file /Library/Logs/CrashReporter/com.apple.networking.mDNSResponder.log rotate file_max=1M compress
diff --git a/mDNSResponder/mDNSMacOSX/daemon.c b/mDNSResponder/mDNSMacOSX/daemon.c
new file mode 100644
index 00000000..3b3ed393
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/daemon.c
@@ -0,0 +1,3052 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <signal.h>
+#include <unistd.h>
+#include <paths.h>
+#include <fcntl.h>
+#include <launch.h>
+#include <launch_priv.h>         // for launch_socket_service_check_in()
+#include <vproc.h>
+#include <pwd.h>
+#include <sys/event.h>
+#include <pthread.h>
+#include <sandbox.h>
+#include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h>
+#include <asl.h>
+#include <syslog.h>
+#include <err.h>
+#include <sysexits.h>
+#include <bootstrap_priv.h>      // for bootstrap_check_in() 
+
+#include "DNSServiceDiscoveryRequestServer.h"
+#include "DNSServiceDiscoveryReply.h"
+
+#include "uDNS.h"
+#include "DNSCommon.h"
+#include "mDNSMacOSX.h"             // Defines the specific types needed to run mDNS on this platform
+
+#include "uds_daemon.h"             // Interface to the server side implementation of dns_sd.h
+#include "xpc_services.h"           // Interface to XPC services
+
+#include "../mDNSMacOSX/DNSServiceDiscovery.h"
+#include "helper.h"
+
+static aslclient log_client = NULL;
+static aslmsg log_msg = NULL;
+
+// Used on Embedded Side for Reading mDNSResponder Managed Preferences Profile
+#if TARGET_OS_EMBEDDED
+#define kmDNSEnableLoggingStr CFSTR("EnableLogging")
+#define kmDNSResponderPrefIDStr "com.apple.mDNSResponder.plist"
+#define kmDNSResponderPrefID CFSTR(kmDNSResponderPrefIDStr)
+#endif
+
+//*************************************************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Globals
+#endif
+
+static mDNS_PlatformSupport PlatformStorage;
+
+// Start off with a default cache of 16K (99 records)
+// Each time we grow the cache we add another 99 records
+// 99 * 164 = 16236 bytes.
+// This fits in four 4kB pages, with 148 bytes spare for memory block headers and similar overhead
+#define RR_CACHE_SIZE ((16*1024) / sizeof(CacheRecord))
+static CacheEntity rrcachestorage[RR_CACHE_SIZE];
+
+static mach_port_t m_port            = MACH_PORT_NULL;
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+mDNSlocal void PrepareForIdle(void *m_param);
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+static mach_port_t client_death_port = MACH_PORT_NULL;
+static mach_port_t signal_port       = MACH_PORT_NULL;
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+static dnssd_sock_t *launchd_fds = mDNSNULL;
+static mDNSu32 launchd_fds_count = 0;
+
+// mDNS Mach Message Timeout, in milliseconds.
+// We need this to be short enough that we don't deadlock the mDNSResponder if a client
+// fails to service its mach message queue, but long enough to give a well-written
+// client a chance to service its mach message queue without getting cut off.
+// Empirically, 50ms seems to work, so we set the timeout to 250ms to give
+// even extra-slow clients a fair chance before we cut them off.
+#define MDNS_MM_TIMEOUT 250
+
+static mDNSBool advertise = mDNS_Init_AdvertiseLocalAddresses; // By default, advertise addresses (& other records) via multicast
+
+extern mDNSBool StrictUnicastOrdering;
+extern mDNSBool AlwaysAppendSearchDomains;
+
+//*************************************************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Active client list structures
+#endif
+
+typedef struct DNSServiceDomainEnumeration_struct DNSServiceDomainEnumeration;
+struct DNSServiceDomainEnumeration_struct
+{
+    DNSServiceDomainEnumeration *next;
+    mach_port_t ClientMachPort;
+    DNSQuestion dom;    // Question asking for domains
+    DNSQuestion def;    // Question asking for default domain
+};
+
+typedef struct DNSServiceBrowserResult_struct DNSServiceBrowserResult;
+struct DNSServiceBrowserResult_struct
+{
+    DNSServiceBrowserResult *next;
+    int resultType;
+    domainname result;
+};
+
+typedef struct DNSServiceBrowser_struct DNSServiceBrowser;
+
+typedef struct DNSServiceBrowserQuestion
+{
+    struct DNSServiceBrowserQuestion *next;
+    DNSQuestion q;
+    domainname domain;
+} DNSServiceBrowserQuestion;
+
+struct DNSServiceBrowser_struct
+{
+    DNSServiceBrowser *next;
+    mach_port_t ClientMachPort;
+    DNSServiceBrowserQuestion *qlist;
+    DNSServiceBrowserResult *results;
+    mDNSs32 lastsuccess;
+    mDNSBool DefaultDomain;                // was the browse started on an explicit domain?
+    domainname type;                       // registration type
+};
+
+typedef struct DNSServiceResolver_struct DNSServiceResolver;
+struct DNSServiceResolver_struct
+{
+    DNSServiceResolver *next;
+    mach_port_t ClientMachPort;
+    ServiceInfoQuery q;
+    ServiceInfo i;
+    mDNSs32 ReportTime;
+};
+
+// A single registered service: ServiceRecordSet + bookkeeping
+// Note that we duplicate some fields from parent DNSServiceRegistration object
+// to facilitate cleanup, when instances and parent may be deallocated at different times.
+typedef struct ServiceInstance
+{
+    struct ServiceInstance *next;
+    mach_port_t ClientMachPort;
+    mDNSBool autoname;          // Set if this name is tied to the Computer Name
+    mDNSBool renameonmemfree;   // Set if we just got a name conflict and now need to automatically pick a new name
+    domainlabel name;
+    domainname domain;
+    ServiceRecordSet srs;
+    // Don't add any fields after ServiceRecordSet.
+    // This is where the implicit extra space goes if we allocate an oversized ServiceRecordSet object
+} ServiceInstance;
+
+// A client-created service.  May reference several ServiceInstance objects if default
+// settings cause registration in multiple domains.
+typedef struct DNSServiceRegistration
+{
+    struct DNSServiceRegistration *next;
+    mach_port_t ClientMachPort;
+    mDNSBool DefaultDomain;
+    mDNSBool autoname;
+    size_t rdsize;
+    int NumSubTypes;
+    char regtype[MAX_ESCAPED_DOMAIN_NAME]; // for use in AllocateSubtypes
+    domainlabel name;  // used only if autoname is false
+    domainname type;
+    mDNSIPPort port;
+    unsigned char txtinfo[1024];
+    size_t txt_len;
+    uint32_t NextRef;
+    ServiceInstance *regs;
+} DNSServiceRegistration;
+
+static DNSServiceDomainEnumeration *DNSServiceDomainEnumerationList = NULL;
+static DNSServiceBrowser           *DNSServiceBrowserList           = NULL;
+static DNSServiceResolver          *DNSServiceResolverList          = NULL;
+static DNSServiceRegistration      *DNSServiceRegistrationList      = NULL;
+
+// We keep a list of client-supplied event sources in KQSocketEventSource records
+typedef struct KQSocketEventSource
+{
+    struct  KQSocketEventSource *next;
+    int fd;
+    KQueueEntry kqs;
+} KQSocketEventSource;
+
+static KQSocketEventSource *gEventSources;
+
+//*************************************************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Utility Functions
+#endif
+
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+
+char _malloc_options[] = "AXZ";
+
+mDNSexport void LogMemCorruption(const char *format, ...)
+{
+    char buffer[512];
+    va_list ptr;
+    va_start(ptr,format);
+    buffer[mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr)] = 0;
+    va_end(ptr);
+    LogMsg("!!!! %s !!!!", buffer);
+    NotifyOfElusiveBug("Memory Corruption", buffer);
+#if ForceAlerts
+    *(long*)0 = 0;  // Trick to crash and get a stack trace right here, if that's what we want
+#endif
+}
+
+mDNSlocal void validatelists(mDNS *const m)
+{
+    // Check local lists
+    KQSocketEventSource *k;
+    for (k = gEventSources; k; k=k->next)
+        if (k->next == (KQSocketEventSource *)~0 || k->fd < 0)
+            LogMemCorruption("gEventSources: %p is garbage (%d)", k, k->fd);
+
+    // Check Mach client lists
+    DNSServiceDomainEnumeration *e;
+    for (e = DNSServiceDomainEnumerationList; e; e=e->next)
+        if (e->next == (DNSServiceDomainEnumeration *)~0 || e->ClientMachPort == 0 || e->ClientMachPort == (mach_port_t) ~0)
+            LogMemCorruption("DNSServiceDomainEnumerationList: %p is garbage (%X)", e, e->ClientMachPort);
+
+    DNSServiceBrowser           *b;
+    for (b = DNSServiceBrowserList; b; b=b->next)
+        if (b->next == (DNSServiceBrowser *)~0 || b->ClientMachPort == 0 || b->ClientMachPort == (mach_port_t) ~0)
+            LogMemCorruption("DNSServiceBrowserList: %p is garbage (%X)", b, b->ClientMachPort);
+
+    DNSServiceResolver          *l;
+    for (l = DNSServiceResolverList; l; l=l->next)
+        if (l->next == (DNSServiceResolver *)~0 || l->ClientMachPort == 0 || l->ClientMachPort == (mach_port_t) ~0)
+            LogMemCorruption("DNSServiceResolverList: %p is garbage (%X)", l, l->ClientMachPort);
+
+    DNSServiceRegistration      *r;
+    for (r = DNSServiceRegistrationList; r; r=r->next)
+        if (r->next == (DNSServiceRegistration *)~0 || r->ClientMachPort == 0 || r->ClientMachPort == (mach_port_t) ~0)
+            LogMemCorruption("DNSServiceRegistrationList: %p is garbage (%X)", r, r->ClientMachPort);
+
+    // Check Unix Domain Socket client lists (uds_daemon.c)
+    uds_validatelists();
+
+    // Check core mDNS lists
+    AuthRecord                  *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (rr->next == (AuthRecord *)~0 || rr->resrec.RecordType == 0 || rr->resrec.RecordType == 0xFF)
+            LogMemCorruption("ResourceRecords list: %p is garbage (%X)", rr, rr->resrec.RecordType);
+        if (rr->resrec.name != &rr->namestorage)
+            LogMemCorruption("ResourceRecords list: %p name %p does not point to namestorage %p %##s",
+                             rr, rr->resrec.name->c, rr->namestorage.c, rr->namestorage.c);
+    }
+
+    for (rr = m->DuplicateRecords; rr; rr=rr->next)
+        if (rr->next == (AuthRecord *)~0 || rr->resrec.RecordType == 0 || rr->resrec.RecordType == 0xFF)
+            LogMemCorruption("DuplicateRecords list: %p is garbage (%X)", rr, rr->resrec.RecordType);
+
+    rr = m->NewLocalRecords;
+    if (rr)
+        if (rr->next == (AuthRecord *)~0 || rr->resrec.RecordType == 0 || rr->resrec.RecordType == 0xFF)
+            LogMemCorruption("NewLocalRecords: %p is garbage (%X)", rr, rr->resrec.RecordType);
+
+    rr = m->CurrentRecord;
+    if (rr)
+        if (rr->next == (AuthRecord *)~0 || rr->resrec.RecordType == 0 || rr->resrec.RecordType == 0xFF)
+            LogMemCorruption("CurrentRecord: %p is garbage (%X)", rr, rr->resrec.RecordType);
+
+    DNSQuestion                 *q;
+    for (q = m->Questions; q; q=q->next)
+        if (q->next == (DNSQuestion*)~0 || q->ThisQInterval == (mDNSs32) ~0)
+            LogMemCorruption("Questions list: %p is garbage (%lX %p)", q, q->ThisQInterval, q->next);
+
+    CacheGroup                  *cg;
+    CacheRecord                 *cr;
+    mDNSu32 slot;
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if (cr->resrec.RecordType == 0 || cr->resrec.RecordType == 0xFF)
+            LogMemCorruption("Cache slot %lu: %p is garbage (%X)", slot, cr, cr->resrec.RecordType);
+        if (cr->CRActiveQuestion)
+        {
+            for (q = m->Questions; q; q=q->next) if (q == cr->CRActiveQuestion) break;
+            if (!q) LogMemCorruption("Cache slot %lu: CRActiveQuestion %p not in m->Questions list %s", slot, cr->CRActiveQuestion, CRDisplayString(m, cr));
+        }
+    }
+
+    // Check core uDNS lists
+    udns_validatelists(m);
+
+    // Check platform-layer lists
+    NetworkInterfaceInfoOSX     *i;
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->next == (NetworkInterfaceInfoOSX *)~0 || !i->m || i->m == (mDNS *)~0)
+            LogMemCorruption("m->p->InterfaceList: %p is garbage (%p)", i, i->ifinfo.ifname);
+
+    ClientTunnel *t;
+    for (t = m->TunnelClients; t; t=t->next)
+        if (t->next == (ClientTunnel *)~0 || t->dstname.c[0] > 63)
+            LogMemCorruption("m->TunnelClients: %p is garbage (%d)", t, t->dstname.c[0]);
+}
+
+mDNSexport void *mallocL(char *msg, unsigned int size)
+{
+    // Allocate space for two words of sanity checking data before the requested block
+    mDNSu32 *mem = malloc(sizeof(mDNSu32) * 2 + size);
+    if (!mem)
+    { LogMsg("malloc( %s : %d ) failed", msg, size); return(NULL); }
+    else
+    {
+        if      (size > 24000) LogMsg("malloc( %s : %lu ) = %p suspiciously large", msg, size, &mem[2]);
+        else if (MACOSX_MDNS_MALLOC_DEBUGGING >= 2) LogMsg("malloc( %s : %lu ) = %p",                    msg, size, &mem[2]);
+        mem[0] = 0xDEAD1234;
+        mem[1] = size;
+        //mDNSPlatformMemZero(&mem[2], size);
+        memset(&mem[2], 0xFF, size);
+        validatelists(&mDNSStorage);
+        return(&mem[2]);
+    }
+}
+
+mDNSexport void freeL(char *msg, void *x)
+{
+    if (!x)
+        LogMsg("free( %s @ NULL )!", msg);
+    else
+    {
+        mDNSu32 *mem = ((mDNSu32 *)x) - 2;
+        if      (mem[0] != 0xDEAD1234)            { LogMsg("free( %s @ %p ) !!!! NOT ALLOCATED !!!!", msg, &mem[2]); return; }
+        if      (mem[1] > 24000) LogMsg("free( %s : %ld @ %p) suspiciously large", msg, mem[1], &mem[2]);
+        else if (MACOSX_MDNS_MALLOC_DEBUGGING >= 2) LogMsg("free( %s : %ld @ %p)",                    msg, mem[1], &mem[2]);
+        //mDNSPlatformMemZero(mem, sizeof(mDNSu32) * 2 + mem[1]);
+        memset(mem, 0xFF, sizeof(mDNSu32) * 2 + mem[1]);
+        validatelists(&mDNSStorage);
+        free(mem);
+    }
+}
+
+#endif
+
+//*************************************************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Mach client request handlers
+#endif
+
+//*************************************************************************************************************
+// Client Death Detection
+
+// This gets called after ALL constituent records of the Service Record Set have been deregistered
+mDNSlocal void FreeServiceInstance(ServiceInstance *x)
+{
+    ServiceRecordSet *s = &x->srs;
+    ExtraResourceRecord *e = x->srs.Extras, *tmp;
+
+    while (e)
+    {
+        e->r.RecordContext = e;
+        tmp = e;
+        e = e->next;
+        FreeExtraRR(&mDNSStorage, &tmp->r, mStatus_MemFree);
+    }
+
+    if (s->RR_TXT.resrec.rdata != &s->RR_TXT.rdatastorage)
+        freeL("TXT RData", s->RR_TXT.resrec.rdata);
+
+    if (s->SubTypes) freeL("ServiceSubTypes", s->SubTypes);
+    freeL("ServiceInstance", x);
+}
+
+// AbortClient finds whatever client is identified by the given Mach port,
+// stops whatever operation that client was doing, and frees its memory.
+// In the case of a service registration, the actual freeing may be deferred
+// until we get the mStatus_MemFree message, if necessary
+mDNSlocal void AbortClient(mach_port_t ClientMachPort, void *m)
+{
+    DNSServiceDomainEnumeration **e = &DNSServiceDomainEnumerationList;
+    DNSServiceBrowser           **b = &DNSServiceBrowserList;
+    DNSServiceResolver          **l = &DNSServiceResolverList;
+    DNSServiceRegistration      **r = &DNSServiceRegistrationList;
+
+    while (*e && (*e)->ClientMachPort != ClientMachPort) e = &(*e)->next;
+    if (*e)
+    {
+        DNSServiceDomainEnumeration *x = *e;
+        *e = (*e)->next;
+        if (m && m != x)
+            LogMsg("%5d: DNSServiceDomainEnumeration(%##s) STOP; WARNING m %p != x %p", ClientMachPort, x->dom.qname.c, m, x);
+        else LogOperation("%5d: DNSServiceDomainEnumeration(%##s) STOP", ClientMachPort, x->dom.qname.c);
+        mDNS_StopGetDomains(&mDNSStorage, &x->dom);
+        mDNS_StopGetDomains(&mDNSStorage, &x->def);
+        freeL("DNSServiceDomainEnumeration", x);
+        return;
+    }
+
+    while (*b && (*b)->ClientMachPort != ClientMachPort) b = &(*b)->next;
+    if (*b)
+    {
+        DNSServiceBrowser *x = *b;
+        DNSServiceBrowserQuestion *freePtr, *qptr = x->qlist;
+        *b = (*b)->next;
+        while (qptr)
+        {
+            if (m && m != x)
+                LogMsg("%5d: DNSServiceBrowse(%##s) STOP; WARNING m %p != x %p", ClientMachPort, qptr->q.qname.c, m, x);
+            else LogOperation("%5d: DNSServiceBrowse(%##s) STOP", ClientMachPort, qptr->q.qname.c);
+            mDNS_StopBrowse(&mDNSStorage, &qptr->q);
+            freePtr = qptr;
+            qptr = qptr->next;
+            freeL("DNSServiceBrowserQuestion", freePtr);
+        }
+        while (x->results)
+        {
+            DNSServiceBrowserResult *t = x->results;
+            x->results = x->results->next;
+            freeL("DNSServiceBrowserResult", t);
+        }
+        freeL("DNSServiceBrowser", x);
+        return;
+    }
+
+    while (*l && (*l)->ClientMachPort != ClientMachPort) l = &(*l)->next;
+    if (*l)
+    {
+        DNSServiceResolver *x = *l;
+        *l = (*l)->next;
+        if (m && m != x)
+            LogMsg("%5d: DNSServiceResolve(%##s) STOP; WARNING m %p != x %p", ClientMachPort, x->i.name.c, m, x);
+        else LogOperation("%5d: DNSServiceResolve(%##s) STOP", ClientMachPort, x->i.name.c);
+        mDNS_StopResolveService(&mDNSStorage, &x->q);
+        freeL("DNSServiceResolver", x);
+        return;
+    }
+
+    while (*r && (*r)->ClientMachPort != ClientMachPort) r = &(*r)->next;
+    if (*r)
+    {
+        ServiceInstance *si = NULL;
+        DNSServiceRegistration *x = *r;
+        *r = (*r)->next;
+
+        si = x->regs;
+        while (si)
+        {
+            ServiceInstance *instance = si;
+            si = si->next;
+            instance->renameonmemfree = mDNSfalse;
+            if (m && m != x) LogMsg("%5d: DNSServiceRegistration(%##s, %u) STOP; WARNING m %p != x %p", ClientMachPort, instance->srs.RR_SRV.resrec.name->c, SRS_PORT(&instance->srs), m, x);
+            else LogOperation("%5d: DNSServiceRegistration(%##s, %u) STOP", ClientMachPort, instance->srs.RR_SRV.resrec.name->c, SRS_PORT(&instance->srs));
+
+            // If mDNS_DeregisterService() returns mStatus_NoError, that means that the service was found in the list,
+            // is sending its goodbye packet, and we'll get an mStatus_MemFree message when we can free the memory.
+            // If mDNS_DeregisterService() returns an error, it means that the service had already been removed from
+            // the list, so we should go ahead and free the memory right now
+            if (mDNS_DeregisterService(&mDNSStorage, &instance->srs)) FreeServiceInstance(instance); // FreeServiceInstance invalidates pointer
+        }
+        x->regs = NULL;
+        freeL("DNSServiceRegistration", x);
+        return;
+    }
+
+    LogMsg("%5d: died or deallocated, but no record of client can be found!", ClientMachPort);
+}
+
+#define AbortBlockedClient(C,MSG,M) AbortClientWithLogMessage((C), "stopped accepting Mach messages", " (" MSG ")", (M))
+
+mDNSlocal void AbortClientWithLogMessage(mach_port_t c, char *reason, char *msg, void *m)
+{
+    DNSServiceDomainEnumeration *e = DNSServiceDomainEnumerationList;
+    DNSServiceBrowser           *b = DNSServiceBrowserList;
+    DNSServiceResolver          *l = DNSServiceResolverList;
+    DNSServiceRegistration      *r = DNSServiceRegistrationList;
+    DNSServiceBrowserQuestion   *qptr;
+
+    while (e && e->ClientMachPort != c) e = e->next;
+    while (b && b->ClientMachPort != c) b = b->next;
+    while (l && l->ClientMachPort != c) l = l->next;
+    while (r && r->ClientMachPort != c) r = r->next;
+
+    if      (e) LogMsg("%5d: DomainEnumeration(%##s) %s%s",                   c, e->dom.qname.c,                reason, msg);
+    else if (b)
+    {
+        for (qptr = b->qlist; qptr; qptr = qptr->next)
+            LogMsg("%5d: Browser(%##s) %s%s",                             c, qptr->q.qname.c,               reason, msg);
+    }
+    else if (l) LogMsg("%5d: Resolver(%##s) %s%s",                            c, l->i.name.c,                   reason, msg);
+    else if (r)
+    {
+        ServiceInstance *si;
+        for (si = r->regs; si; si = si->next)
+            LogMsg("%5d: Registration(%##s) %s%s",                        c, si->srs.RR_SRV.resrec.name->c, reason, msg);
+    }
+    else LogMsg("%5d: (%s) %s, but no record of client can be found!", c,                                reason, msg);
+
+    AbortClient(c, m);
+}
+
+mDNSlocal mDNSBool CheckForExistingClient(mach_port_t c)
+{
+    DNSServiceDomainEnumeration *e = DNSServiceDomainEnumerationList;
+    DNSServiceBrowser           *b = DNSServiceBrowserList;
+    DNSServiceResolver          *l = DNSServiceResolverList;
+    DNSServiceRegistration      *r = DNSServiceRegistrationList;
+    DNSServiceBrowserQuestion   *qptr;
+
+    while (e && e->ClientMachPort != c) e = e->next;
+    while (b && b->ClientMachPort != c) b = b->next;
+    while (l && l->ClientMachPort != c) l = l->next;
+    while (r && r->ClientMachPort != c) r = r->next;
+    if (e) LogMsg("%5d: DomainEnumeration(%##s) already exists!", c, e->dom.qname.c);
+    if (b)
+    {
+        for (qptr = b->qlist; qptr; qptr = qptr->next)
+            LogMsg("%5d: Browser(%##s) already exists!",          c, qptr->q.qname.c);
+    }
+    if (l) LogMsg("%5d: Resolver(%##s) already exists!",          c, l->i.name.c);
+    if (r) LogMsg("%5d: Registration(%##s) already exists!",      c, r->regs ? r->regs->srs.RR_SRV.resrec.name->c : NULL);
+    return(e || b || l || r);
+}
+
+#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void ClientDeathCallback(CFMachPortRef unusedport, void *voidmsg, CFIndex size, void *info)
+{
+    KQueueLock(&mDNSStorage);
+    mach_msg_header_t *msg = (mach_msg_header_t *)voidmsg;
+    (void)unusedport; // Unused
+    (void)size; // Unused
+    (void)info; // Unused
+    if (msg->msgh_id == MACH_NOTIFY_DEAD_NAME)
+    {
+        const mach_dead_name_notification_t *const deathMessage = (mach_dead_name_notification_t *)msg;
+        AbortClient(deathMessage->not_port, NULL);
+
+        /* Deallocate the send right that came in the dead name notification */
+        mach_port_destroy(mach_task_self(), deathMessage->not_port);
+    }
+    KQueueUnlock(&mDNSStorage, "Mach AbortClient");
+}
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void EnableDeathNotificationForClient(mach_port_t ClientMachPort, void *m)
+{
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    dispatch_source_t mach_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, ClientMachPort, 0, dispatch_get_main_queue());
+    if (mach_source == mDNSNULL)
+    {
+        AbortClientWithLogMessage(ClientMachPort, "died/deallocated before we could enable death notification", "", m);
+        return;
+    }
+    dispatch_source_set_event_handler(mach_source, ^{
+                                          mach_port_destroy(mach_task_self(), ClientMachPort);
+                                      });
+    dispatch_resume(mach_source);
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    mach_port_t prev;
+    kern_return_t r = mach_port_request_notification(mach_task_self(), ClientMachPort, MACH_NOTIFY_DEAD_NAME, 0,
+                                                     client_death_port, MACH_MSG_TYPE_MAKE_SEND_ONCE, &prev);
+    // If the port already died while we were thinking about it, then abort the operation right away
+    if (r != KERN_SUCCESS)
+        AbortClientWithLogMessage(ClientMachPort, "died/deallocated before we could enable death notification", "", m);
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+}
+
+//*************************************************************************************************************
+// Domain Enumeration
+
+mDNSlocal void DomainEnumFound(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    kern_return_t status;
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+    DNSServiceDomainEnumerationReplyResultType rt;
+    DNSServiceDomainEnumeration *x = (DNSServiceDomainEnumeration *)question->QuestionContext;
+    (void)m; // Unused
+
+    debugf("DomainEnumFound: %##s PTR %##s", answer->name->c, answer->rdata->u.name.c);
+    if (answer->rrtype != kDNSType_PTR) return;
+    if (!x) { debugf("DomainEnumFound: DNSServiceDomainEnumeration is NULL"); return; }
+
+    if (AddRecord)
+    {
+        if (question == &x->dom) rt = DNSServiceDomainEnumerationReplyAddDomain;
+        else rt = DNSServiceDomainEnumerationReplyAddDomainDefault;
+    }
+    else
+    {
+        if (question == &x->dom) rt = DNSServiceDomainEnumerationReplyRemoveDomain;
+        else return;
+    }
+
+    LogOperation("%5d: DNSServiceDomainEnumeration(%##s) %##s %s",
+                 x->ClientMachPort, x->dom.qname.c, answer->rdata->u.name.c,
+                 !AddRecord ? "RemoveDomain" :
+                 question == &x->dom ? "AddDomain" : "AddDomainDefault");
+
+    ConvertDomainNameToCString(&answer->rdata->u.name, buffer);
+    status = DNSServiceDomainEnumerationReply_rpc(x->ClientMachPort, rt, buffer, 0, MDNS_MM_TIMEOUT);
+    if (status == MACH_SEND_TIMED_OUT)
+        AbortBlockedClient(x->ClientMachPort, "enumeration", x);
+}
+
+mDNSexport kern_return_t provide_DNSServiceDomainEnumerationCreate_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                                       int regDom)
+{
+    // Check client parameter
+    (void)unusedserver; // Unused
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    if (client == (mach_port_t)-1)      { err = mStatus_Invalid; errormsg = "Client id -1 invalid";     goto fail; }
+    if (CheckForExistingClient(client)) { err = mStatus_Invalid; errormsg = "Client id already in use"; goto fail; }
+
+    mDNS_DomainType dt1 = regDom ? mDNS_DomainTypeRegistration        : mDNS_DomainTypeBrowse;
+    mDNS_DomainType dt2 = regDom ? mDNS_DomainTypeRegistrationDefault : mDNS_DomainTypeBrowseDefault;
+
+    // Allocate memory, and handle failure
+    DNSServiceDomainEnumeration *x = mallocL("DNSServiceDomainEnumeration", sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object, and link into list
+    x->ClientMachPort = client;
+    x->next = DNSServiceDomainEnumerationList;
+    DNSServiceDomainEnumerationList = x;
+
+    verbosedebugf("%5d: Enumerate %s Domains", client, regDom ? "Registration" : "Browsing");
+
+    // Do the operation
+    err           = mDNS_GetDomains(&mDNSStorage, &x->dom, dt1, NULL, mDNSInterface_LocalOnly, DomainEnumFound, x);
+    if (!err) err = mDNS_GetDomains(&mDNSStorage, &x->def, dt2, NULL, mDNSInterface_LocalOnly, DomainEnumFound, x);
+    if (err) { AbortClient(client, x); errormsg = "mDNS_GetDomains"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    LogOperation("%5d: DNSServiceDomainEnumeration(%##s) START", client, x->dom.qname.c);
+    EnableDeathNotificationForClient(client, x);
+    return(mStatus_NoError);
+
+fail:
+    LogMsg("%5d: DNSServiceDomainEnumeration(%d) failed: %s (%d)", client, regDom, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Browse for services
+
+mDNSlocal void FoundInstance(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    (void)m;        // Unused
+
+    if (answer->rrtype != kDNSType_PTR)
+    { LogMsg("FoundInstance: Should not be called with rrtype %d (not a PTR record)", answer->rrtype); return; }
+
+    domainlabel name;
+    domainname type, domain;
+    if (!DeconstructServiceName(&answer->rdata->u.name, &name, &type, &domain))
+    {
+        LogMsg("FoundInstance: %##s PTR %##s received from network is not valid DNS-SD service pointer",
+               answer->name->c, answer->rdata->u.name.c);
+        return;
+    }
+
+    DNSServiceBrowserResult *x = mallocL("DNSServiceBrowserResult", sizeof(*x));
+    if (!x) { LogMsg("FoundInstance: Failed to allocate memory for result %##s", answer->rdata->u.name.c); return; }
+
+    verbosedebugf("FoundInstance: %s %##s", AddRecord ? "Add" : "Rmv", answer->rdata->u.name.c);
+    AssignDomainName(&x->result, &answer->rdata->u.name);
+    if (AddRecord)
+        x->resultType = DNSServiceBrowserReplyAddInstance;
+    else x->resultType = DNSServiceBrowserReplyRemoveInstance;
+    x->next = NULL;
+
+    DNSServiceBrowser *browser = (DNSServiceBrowser *)question->QuestionContext;
+    DNSServiceBrowserResult **p = &browser->results;
+    while (*p) p = &(*p)->next;
+    *p = x;
+
+    LogOperation("%5d: DNSServiceBrowse(%##s, %s) RESULT %s %s",
+                 browser->ClientMachPort, question->qname.c, DNSTypeName(question->qtype), AddRecord ? "Add" : "Rmv", RRDisplayString(m, answer));
+}
+
+mDNSlocal mStatus AddDomainToBrowser(DNSServiceBrowser *browser, const domainname *d)
+{
+    mStatus err = mStatus_NoError;
+    DNSServiceBrowserQuestion *ptr, *question = NULL;
+
+    for (ptr = browser->qlist; ptr; ptr = ptr->next)
+    {
+        if (SameDomainName(&ptr->q.qname, d))
+        { debugf("Domain %##s already contained in browser", d->c); return mStatus_AlreadyRegistered; }
+    }
+
+    question = mallocL("DNSServiceBrowserQuestion", sizeof(DNSServiceBrowserQuestion));
+    if (!question) { LogMsg("Error: malloc"); return mStatus_NoMemoryErr; }
+    AssignDomainName(&question->domain, d);
+    question->next = browser->qlist;
+    LogOperation("%5d: DNSServiceBrowse(%##s%##s) START", browser->ClientMachPort, browser->type.c, d->c);
+    err = mDNS_StartBrowse(&mDNSStorage, &question->q, &browser->type, d, mDNSNULL, mDNSInterface_Any, 0, mDNSfalse, mDNSfalse, FoundInstance, browser);
+    if (!err)
+        browser->qlist = question;
+    else
+    {
+        LogMsg("Error: AddDomainToBrowser: mDNS_StartBrowse %d", err);
+        freeL("DNSServiceBrowserQuestion", question);
+    }
+    return err;
+}
+
+mDNSexport void machserver_automatic_browse_domain_changed(const domainname *d, mDNSBool add)
+{
+    DNSServiceBrowser *ptr;
+    for (ptr = DNSServiceBrowserList; ptr; ptr = ptr->next)
+    {
+        if (ptr->DefaultDomain)
+        {
+            if (add)
+            {
+                mStatus err = AddDomainToBrowser(ptr, d);
+                if (err && err != mStatus_AlreadyRegistered) LogMsg("Default browse in domain %##s for client %5d failed. Continuing", d, ptr->ClientMachPort);
+            }
+            else
+            {
+                DNSServiceBrowserQuestion **q = &ptr->qlist;
+                while (*q)
+                {
+                    if (SameDomainName(&(*q)->domain, d))
+                    {
+                        DNSServiceBrowserQuestion *rem = *q;
+                        *q = (*q)->next;
+                        mDNS_StopQueryWithRemoves(&mDNSStorage, &rem->q);
+                        freeL("DNSServiceBrowserQuestion", rem);
+                        return;
+                    }
+                    q = &(*q)->next;
+                }
+                LogMsg("Requested removal of default domain %##s not in client %5d's list", d->c, ptr->ClientMachPort);
+            }
+        }
+    }
+}
+
+mDNSexport kern_return_t provide_DNSServiceBrowserCreate_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                             DNSCString regtype, DNSCString domain)
+{
+    // Check client parameter
+    (void)unusedserver;     // Unused
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+
+    if (client == (mach_port_t)-1)      { err = mStatus_Invalid; errormsg = "Client id -1 invalid";     goto fail; }
+    if (CheckForExistingClient(client)) { err = mStatus_Invalid; errormsg = "Client id already in use"; goto fail; }
+
+    // Check other parameters
+    domainname t, d;
+    t.c[0] = 0;
+    mDNSs32 NumSubTypes = ChopSubTypes(regtype, mDNSNULL);    // Note: Modifies regtype string to remove trailing subtypes
+    if (NumSubTypes < 0 || NumSubTypes > 1)               { errormsg = "Bad Service SubType"; goto badparam; }
+    if (NumSubTypes == 1 && !AppendDNSNameString(&t, regtype + strlen(regtype) + 1))
+    { errormsg = "Bad Service SubType"; goto badparam; }
+    if (!regtype[0] || !AppendDNSNameString(&t, regtype)) { errormsg = "Illegal regtype";     goto badparam; }
+    domainname temp;
+    if (!MakeDomainNameFromDNSNameString(&temp, regtype)) { errormsg = "Illegal regtype";     goto badparam; }
+    if (temp.c[0] > 15 && (!domain || domain[0] == 0)) domain = "local."; // For over-long service types, we only allow domain "local"
+
+    // Allocate memory, and handle failure
+    DNSServiceBrowser *x = mallocL("DNSServiceBrowser", sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object, and link into list
+    AssignDomainName(&x->type, &t);
+    x->ClientMachPort = client;
+    x->results = NULL;
+    x->lastsuccess = 0;
+    x->qlist = NULL;
+    x->next = DNSServiceBrowserList;
+    DNSServiceBrowserList = x;
+
+    if (domain[0])
+    {
+        // Start browser for an explicit domain
+        x->DefaultDomain = mDNSfalse;
+        if (!MakeDomainNameFromDNSNameString(&d, domain)) { errormsg = "Illegal domain";  goto badparam; }
+        err = AddDomainToBrowser(x, &d);
+        if (err) { AbortClient(client, x); errormsg = "AddDomainToBrowser"; goto fail; }
+    }
+    else
+    {
+        DNameListElem *sdPtr;
+        // Start browser on all domains
+        x->DefaultDomain = mDNStrue;
+        if (!AutoBrowseDomains) { AbortClient(client, x); errormsg = "GetSearchDomainList"; goto fail; }
+        for (sdPtr = AutoBrowseDomains; sdPtr; sdPtr = sdPtr->next)
+        {
+            err = AddDomainToBrowser(x, &sdPtr->name);
+            if (err)
+            {
+                // only terminally bail if .local fails
+                if (!SameDomainName(&localdomain, &sdPtr->name))
+                    LogMsg("Default browse in domain %##s failed. Continuing", sdPtr->name.c);
+                else { AbortClient(client, x); errormsg = "AddDomainToBrowser"; goto fail; }
+            }
+        }
+    }
+
+    // Succeeded: Wrap up and return
+    EnableDeathNotificationForClient(client, x);
+    return(mStatus_NoError);
+
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("%5d: DNSServiceBrowse(\"%s\", \"%s\") failed: %s (%d)", client, regtype, domain, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Resolve Service Info
+
+mDNSlocal void FoundInstanceInfo(mDNS *const m, ServiceInfoQuery *query)
+{
+    kern_return_t status;
+    DNSServiceResolver *x = (DNSServiceResolver *)query->ServiceInfoQueryContext;
+    NetworkInterfaceInfoOSX *ifx = IfindexToInterfaceInfoOSX(m, query->info->InterfaceID);
+    if (query->info->InterfaceID == mDNSInterface_LocalOnly || query->info->InterfaceID == mDNSInterface_P2P) ifx = mDNSNULL;
+    struct sockaddr_storage interface;
+    struct sockaddr_storage address;
+    char cstring[1024];
+    int i, pstrlen = query->info->TXTinfo[0];
+    (void)m;        // Unused
+
+    //debugf("FoundInstanceInfo %.4a %.4a %##s", &query->info->InterfaceAddr, &query->info->ip, &query->info->name);
+
+    if (query->info->TXTlen > sizeof(cstring)) return;
+
+    mDNSPlatformMemZero(&interface, sizeof(interface));
+    mDNSPlatformMemZero(&address,   sizeof(address));
+
+    if (ifx && ifx->ifinfo.ip.type == mDNSAddrType_IPv4)
+    {
+        struct sockaddr_in *s = (struct sockaddr_in*)&interface;
+        s->sin_len         = sizeof(*s);
+        s->sin_family      = AF_INET;
+        s->sin_port        = 0;
+        s->sin_addr.s_addr = ifx->ifinfo.ip.ip.v4.NotAnInteger;
+    }
+    else if (ifx && ifx->ifinfo.ip.type == mDNSAddrType_IPv6)
+    {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&interface;
+        sin6->sin6_len       = sizeof(*sin6);
+        sin6->sin6_family    = AF_INET6;
+        sin6->sin6_flowinfo  = 0;
+        sin6->sin6_port      = 0;
+        sin6->sin6_addr      = *(struct in6_addr*)&ifx->ifinfo.ip.ip.v6;
+        sin6->sin6_scope_id  = ifx->scope_id;
+    }
+
+    if (query->info->ip.type == mDNSAddrType_IPv4)
+    {
+        struct sockaddr_in *s = (struct sockaddr_in*)&address;
+        s->sin_len         = sizeof(*s);
+        s->sin_family      = AF_INET;
+        s->sin_port        = query->info->port.NotAnInteger;
+        s->sin_addr.s_addr = query->info->ip.ip.v4.NotAnInteger;
+    }
+    else
+    {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&address;
+        sin6->sin6_len           = sizeof(*sin6);
+        sin6->sin6_family        = AF_INET6;
+        sin6->sin6_port          = query->info->port.NotAnInteger;
+        sin6->sin6_flowinfo      = 0;
+        sin6->sin6_addr          = *(struct in6_addr*)&query->info->ip.ip.v6;
+        sin6->sin6_scope_id      = ifx ? ifx->scope_id : 0;
+    }
+
+    // The OS X DNSServiceResolverResolve() API is defined using a C-string,
+    // but the mDNS_StartResolveService() call actually returns a packed block of P-strings.
+    // Hence we have to convert the P-string(s) to a C-string before returning the result to the client.
+    // ASCII-1 characters are used in the C-string as boundary markers,
+    // to indicate the boundaries between the original constituent P-strings.
+    for (i=1; i<query->info->TXTlen; i++)
+    {
+        if (--pstrlen >= 0)
+            cstring[i-1] = query->info->TXTinfo[i];
+        else
+        {
+            cstring[i-1] = 1;
+            pstrlen = query->info->TXTinfo[i];
+        }
+    }
+    cstring[i-1] = 0;       // Put the terminating NULL on the end
+
+    LogOperation("%5d: DNSServiceResolver(%##s) -> %#a:%u", x->ClientMachPort,
+                 x->i.name.c, &query->info->ip, mDNSVal16(query->info->port));
+    status = DNSServiceResolverReply_rpc(x->ClientMachPort,
+                                         (char*)&interface, (char*)&address, cstring, 0, MDNS_MM_TIMEOUT);
+    if (status == MACH_SEND_TIMED_OUT)
+        AbortBlockedClient(x->ClientMachPort, "resolve", x);
+}
+
+mDNSexport kern_return_t provide_DNSServiceResolverResolve_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                               DNSCString name, DNSCString regtype, DNSCString domain)
+{
+    // Check client parameter
+    (void)unusedserver;     // Unused
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    if (client == (mach_port_t)-1)      { err = mStatus_Invalid; errormsg = "Client id -1 invalid";     goto fail; }
+    if (CheckForExistingClient(client)) { err = mStatus_Invalid; errormsg = "Client id already in use"; goto fail; }
+
+    // Check other parameters
+    domainlabel n;
+    domainname t, d, srv;
+    if (!name[0]    || !MakeDomainLabelFromLiteralString(&n, name))        { errormsg = "Bad Instance Name"; goto badparam; }
+    if (!regtype[0] || !MakeDomainNameFromDNSNameString(&t, regtype))      { errormsg = "Bad Service Type";  goto badparam; }
+    if (!domain[0]  || !MakeDomainNameFromDNSNameString(&d, domain))       { errormsg = "Bad Domain";        goto badparam; }
+    if (!ConstructServiceName(&srv, &n, &t, &d))                           { errormsg = "Bad Name";          goto badparam; }
+
+    // Allocate memory, and handle failure
+    DNSServiceResolver *x = mallocL("DNSServiceResolver", sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object, and link into list
+    x->ClientMachPort = client;
+    x->i.InterfaceID = mDNSInterface_Any;
+    x->i.name = srv;
+    x->ReportTime = NonZeroTime(mDNS_TimeNow(&mDNSStorage) + 130 * mDNSPlatformOneSecond);
+    x->next = DNSServiceResolverList;
+    DNSServiceResolverList = x;
+
+    // Do the operation
+    LogOperation("%5d: DNSServiceResolve(%##s) START", client, x->i.name.c);
+    err = mDNS_StartResolveService(&mDNSStorage, &x->q, &x->i, FoundInstanceInfo, x);
+    if (err) { AbortClient(client, x); errormsg = "mDNS_StartResolveService"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    EnableDeathNotificationForClient(client, x);
+    return(mStatus_NoError);
+
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("%5d: DNSServiceResolve(\"%s\", \"%s\", \"%s\") failed: %s (%d)", client, name, regtype, domain, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Registration
+
+mDNSexport void RecordUpdatedNiceLabel(mDNS *const m, mDNSs32 delay)
+{
+    m->p->NotifyUser = NonZeroTime(m->timenow + delay);
+}
+
+mDNSlocal void RegCallback(mDNS *const m, ServiceRecordSet *const srs, mStatus result)
+{
+    ServiceInstance *si = (ServiceInstance*)srs->ServiceContext;
+
+    if (result == mStatus_NoError)
+    {
+        kern_return_t status;
+        LogOperation("%5d: DNSServiceRegistration(%##s, %u) Name Registered", si->ClientMachPort, srs->RR_SRV.resrec.name->c, SRS_PORT(srs));
+        status = DNSServiceRegistrationReply_rpc(si->ClientMachPort, result, MDNS_MM_TIMEOUT);
+        if (status == MACH_SEND_TIMED_OUT)
+            AbortBlockedClient(si->ClientMachPort, "registration success", si);
+        if (si->autoname && CountPeerRegistrations(m, srs) == 0)
+            RecordUpdatedNiceLabel(m, 0);   // Successfully got new name, tell user immediately
+    }
+
+    else if (result == mStatus_NameConflict)
+    {
+        LogOperation("%5d: DNSServiceRegistration(%##s, %u) Name Conflict", si->ClientMachPort, srs->RR_SRV.resrec.name->c, SRS_PORT(srs));
+        // Note: By the time we get the mStatus_NameConflict message, the service is already deregistered
+        // and the memory is free, so we don't have to wait for an mStatus_MemFree message as well.
+        if (si->autoname && CountPeerRegistrations(m, srs) == 0)
+        {
+            // On conflict for an autoname service, rename and reregister *all* autoname services
+            IncrementLabelSuffix(&m->nicelabel, mDNStrue);
+            mDNS_ConfigChanged(m);
+        }
+        else if (si->autoname)
+        {
+            mDNS_RenameAndReregisterService(m, srs, mDNSNULL);
+            return;
+        }
+        else
+        {
+            // If we get a name conflict, we tell the client about it, and then they are expected to dispose
+            // of their registration in the usual way (which we will catch via client death notification).
+            // If the Mach queue is full, we forcibly abort the client immediately.
+            kern_return_t status = DNSServiceRegistrationReply_rpc(si->ClientMachPort, result, MDNS_MM_TIMEOUT);
+            if (status == MACH_SEND_TIMED_OUT)
+                AbortBlockedClient(si->ClientMachPort, "registration conflict", NULL);
+        }
+    }
+
+    else if (result == mStatus_MemFree)
+    {
+        if (si->renameonmemfree)    // We intentionally terminated registration so we could re-register with new name
+        {
+            debugf("RegCallback renaming %#s to %#s", si->name.c, m->nicelabel.c);
+            si->renameonmemfree = mDNSfalse;
+            si->name            = m->nicelabel;
+            mDNS_RenameAndReregisterService(m, srs, &si->name);
+        }
+        else
+        {
+            // SANITY CHECK: make sure service instance is no longer in any ServiceRegistration's list
+            DNSServiceRegistration *r;
+            for (r = DNSServiceRegistrationList; r; r = r->next)
+            {
+                ServiceInstance **sp = &r->regs;
+                while (*sp)
+                {
+                    if (*sp == si) { LogMsg("RegCallback: %##s Still in list; removing", srs->RR_SRV.resrec.name->c); *sp = (*sp)->next; break; }
+                    sp = &(*sp)->next;
+                }
+            }
+            // END SANITY CHECK
+            FreeServiceInstance(si);
+        }
+    }
+
+    else if (result != mStatus_NATTraversal)
+        LogMsg("%5d: DNSServiceRegistration(%##s, %u) Unknown Result %d", si->ClientMachPort, srs->RR_SRV.resrec.name->c, SRS_PORT(srs), result);
+}
+
+mDNSlocal mStatus AddServiceInstance(DNSServiceRegistration *x, const domainname *domain)
+{
+    mStatus err = 0;
+    ServiceInstance *si = NULL;
+    AuthRecord *SubTypes = NULL;
+
+    for (si = x->regs; si; si = si->next)
+    {
+        if (SameDomainName(&si->domain, domain))
+        { LogMsg("Requested addition of domain %##s already in list", domain->c); return mStatus_AlreadyRegistered; }
+    }
+
+    SubTypes = AllocateSubTypes(x->NumSubTypes, x->regtype, mDNSNULL);
+    if (x->NumSubTypes && !SubTypes) return mStatus_NoMemoryErr;
+
+    si = mallocL("ServiceInstance", sizeof(*si) - sizeof(RDataBody) + x->rdsize);
+    if (!si) return mStatus_NoMemoryErr;
+
+    si->ClientMachPort  = x->ClientMachPort;
+    si->renameonmemfree = mDNSfalse;
+    si->autoname        = x->autoname;
+    si->name            = x->autoname ? mDNSStorage.nicelabel : x->name;
+    si->domain          = *domain;
+    si->srs.AnonData    = mDNSNULL;    
+
+    err = mDNS_RegisterService(&mDNSStorage, &si->srs, &si->name, &x->type, domain, NULL,
+                               x->port, x->txtinfo, x->txt_len, SubTypes, x->NumSubTypes, mDNSInterface_Any, RegCallback, si, 0);
+    if (!err)
+    {
+        si->next = x->regs;
+        x->regs = si;
+    }
+    else
+    {
+        LogMsg("Error %d for registration of service in domain %##s", err, domain->c);
+        freeL("ServiceInstance", si);
+    }
+    return err;
+}
+
+mDNSexport void machserver_automatic_registration_domain_changed(const domainname *d, mDNSBool add)
+{
+    DNSServiceRegistration *reg;
+
+    for (reg = DNSServiceRegistrationList; reg; reg = reg->next)
+    {
+        if (reg->DefaultDomain)
+        {
+            if (add)
+                AddServiceInstance(reg, d);
+            else
+            {
+                ServiceInstance **si = &reg->regs;
+                while (*si)
+                {
+                    if (SameDomainName(&(*si)->domain, d))
+                    {
+                        ServiceInstance *s = *si;
+                        *si = (*si)->next;
+                        if (mDNS_DeregisterService(&mDNSStorage, &s->srs)) FreeServiceInstance(s);  // only free memory synchronously on error
+                        break;
+                    }
+                    si = &(*si)->next;
+                }
+                if (!si) debugf("Requested removal of default domain %##s not in client %5d's list", d, reg->ClientMachPort); // normal if registration failed
+            }
+        }
+    }
+}
+
+mDNSexport kern_return_t provide_DNSServiceRegistrationCreate_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                                  DNSCString name, DNSCString regtype, DNSCString domain, IPPort IpPort, DNSCString txtRecord)
+{
+    (void)unusedserver;     // Unused
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+
+    // older versions of this code passed the port via mach IPC as an int.
+    // we continue to pass it as 4 bytes to maintain binary compatibility,
+    // but now ensure that the network byte order is preserved by using a struct
+    mDNSIPPort port;
+    port.b[0] = IpPort.bytes[2];
+    port.b[1] = IpPort.bytes[3];
+
+    if (client == (mach_port_t)-1)      { err = mStatus_Invalid; errormsg = "Client id -1 invalid";     goto fail; }
+    if (CheckForExistingClient(client)) { err = mStatus_Invalid; errormsg = "Client id already in use"; goto fail; }
+
+    // Check for sub-types after the service type
+    size_t reglen = strlen(regtype) + 1;
+    if (reglen > MAX_ESCAPED_DOMAIN_NAME) { errormsg = "reglen too long"; goto badparam; }
+    mDNSs32 NumSubTypes = ChopSubTypes(regtype, mDNSNULL);    // Note: Modifies regtype string to remove trailing subtypes
+    if (NumSubTypes < 0) { errormsg = "Bad Service SubType"; goto badparam; }
+
+    // Check other parameters
+    domainlabel n;
+    domainname t, d;
+    domainname srv;
+    if (!name[0]) n = mDNSStorage.nicelabel;
+    else if (!MakeDomainLabelFromLiteralString(&n, name))                  { errormsg = "Bad Instance Name"; goto badparam; }
+    if (!regtype[0] || !MakeDomainNameFromDNSNameString(&t, regtype))      { errormsg = "Bad Service Type";  goto badparam; }
+    if (!MakeDomainNameFromDNSNameString(&d, *domain ? domain : "local.")) { errormsg = "Bad Domain";        goto badparam; }
+    if (!ConstructServiceName(&srv, &n, &t, &d))                           { errormsg = "Bad Name";          goto badparam; }
+
+    unsigned char txtinfo[1024] = "";
+    unsigned int data_len = 0;
+    unsigned int size = sizeof(RDataBody);
+    unsigned char *pstring = &txtinfo[data_len];
+    char *ptr = txtRecord;
+
+    // The OS X DNSServiceRegistrationCreate() API is defined using a C-string,
+    // but the mDNS_RegisterService() call actually requires a packed block of P-strings.
+    // Hence we have to convert the C-string to a P-string.
+    // ASCII-1 characters are allowed in the C-string as boundary markers,
+    // so that a single C-string can be used to represent one or more P-strings.
+    while (*ptr)
+    {
+        if (++data_len >= sizeof(txtinfo)) { errormsg = "TXT record too long"; goto badtxt; }
+        if (*ptr == 1)      // If this is our boundary marker, start a new P-string
+        {
+            pstring = &txtinfo[data_len];
+            pstring[0] = 0;
+            ptr++;
+        }
+        else
+        {
+            if (pstring[0] == 255) { errormsg = "TXT record invalid (component longer than 255)"; goto badtxt; }
+            pstring[++pstring[0]] = *ptr++;
+        }
+    }
+
+    data_len++;
+    if (size < data_len)
+        size = data_len;
+
+    // Some clients use mDNS for lightweight copy protection, registering a pseudo-service with
+    // a port number of zero. When two instances of the protected client are allowed to run on one
+    // machine, we don't want to see misleading "Bogus client" messages in syslog and the console.
+    if (!mDNSIPPortIsZero(port))
+    {
+        int count = CountExistingRegistrations(&srv, port);
+        if (count)
+            LogMsg("%5d: Client application registered %d identical instances of service %##s port %u.",
+                   client, count+1, srv.c, mDNSVal16(port));
+    }
+
+    // Allocate memory, and handle failure
+    DNSServiceRegistration *x = mallocL("DNSServiceRegistration", sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+    mDNSPlatformMemZero(x, sizeof(*x));
+
+    // Set up object, and link into list
+    x->ClientMachPort = client;
+    x->DefaultDomain = !domain[0];
+    x->autoname = (!name[0]);
+    x->rdsize = size;
+    x->NumSubTypes = NumSubTypes;
+    memcpy(x->regtype, regtype, reglen);
+    x->name = n;
+    x->type = t;
+    x->port = port;
+    memcpy(x->txtinfo, txtinfo, 1024);
+    x->txt_len = data_len;
+    x->NextRef = 0;
+    x->regs = NULL;
+
+    x->next = DNSServiceRegistrationList;
+    DNSServiceRegistrationList = x;
+
+    LogOperation("%5d: DNSServiceRegistration(\"%s\", \"%s\", \"%s\", %u) START",
+                 x->ClientMachPort, name, regtype, domain, mDNSVal16(port));
+
+    err = AddServiceInstance(x, &d);
+    if (err) { AbortClient(client, x); errormsg = "mDNS_RegisterService"; goto fail; }  // bail if .local (or explicit domain) fails
+
+    if (x->DefaultDomain)
+    {
+        DNameListElem *p;
+        for (p = AutoRegistrationDomains; p; p = p->next)
+            AddServiceInstance(x, &p->name);
+    }
+
+    // Succeeded: Wrap up and return
+    EnableDeathNotificationForClient(client, x);
+    return(mStatus_NoError);
+
+badtxt:
+    LogMsg("%5d: TXT record: %.100s...", client, txtRecord);
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("%5d: DNSServiceRegister(\"%s\", \"%s\", \"%s\", %d) failed: %s (%d)",
+           client, name, regtype, domain, mDNSVal16(port), errormsg, err);
+    return(err);
+}
+
+mDNSlocal void mDNSPreferencesSetNames(mDNS *const m, int key, domainlabel *old, domainlabel *new)
+{
+    domainlabel *prevold, *prevnew;
+    switch (key)
+    {
+    case kmDNSComputerName:
+    case kmDNSLocalHostName:
+        if (key == kmDNSComputerName)
+        {
+            prevold = &m->p->prevoldnicelabel;
+            prevnew = &m->p->prevnewnicelabel;
+        }
+        else
+        {
+            prevold = &m->p->prevoldhostlabel;
+            prevnew = &m->p->prevnewhostlabel;
+        }
+        // There are a few cases where we need to invoke the helper.
+        //
+        // 1. If the "old" label and "new" label are not same, it means there is a conflict. We need
+        //    to invoke the helper so that it pops up a dialogue to inform the user about the
+        //    conflict
+        //
+        // 2. If the "old" label and "new" label are same, it means the user has set the host/nice label
+        //    through the preferences pane. We may have to inform the helper as it may have popped up
+        //    a dialogue previously (due to a conflict) and it needs to suppress it now. We can avoid invoking
+        //    the helper in this case if the previous values (old and new) that we told helper last time
+        //    are same. If the previous old and new values are same, helper does not care.
+        //
+        // Note: "new" can be NULL when we have repeated conflicts and we are asking helper to give up. "old"
+        // is not called with NULL today, but this makes it future proof.
+        if (!old || !new || !SameDomainLabelCS(old->c, new->c) ||
+            !SameDomainLabelCS(old->c, prevold->c) ||
+            !SameDomainLabelCS(new->c, prevnew->c))
+        {
+            if (old)
+                *prevold = *old;
+            else
+                prevold->c[0] = 0;
+            if (new)
+                *prevnew = *new;
+            else
+                prevnew->c[0] = 0;
+            mDNSPreferencesSetName(key, old, new);
+        }
+        else
+        {
+            LogInfo("mDNSPreferencesSetNames not invoking helper %s %#s, %s %#s, old %#s, new %#s",
+                    (key == kmDNSComputerName ? "prevoldnicelabel" : "prevoldhostlabel"), prevold->c,
+                    (key == kmDNSComputerName ? "prevnewnicelabel" : "prevnewhostlabel"), prevnew->c,
+                    old->c, new->c);
+        }
+        break;
+    default:
+        LogMsg("mDNSPreferencesSetNames: unrecognized key: %d", key);
+        return;
+    }
+}
+
+mDNSlocal void mDNS_StatusCallback(mDNS *const m, mStatus result)
+{
+    (void)m; // Unused
+    if (result == mStatus_NoError)
+    {
+        if (!SameDomainLabelCS(m->p->userhostlabel.c, m->hostlabel.c))
+            LogInfo("Local Hostname changed from \"%#s.local\" to \"%#s.local\"", m->p->userhostlabel.c, m->hostlabel.c);
+        // One second pause in case we get a Computer Name update too -- don't want to alert the user twice
+        RecordUpdatedNiceLabel(m, mDNSPlatformOneSecond);
+    }
+    else if (result == mStatus_NameConflict)
+    {
+        LogInfo("Local Hostname conflict for \"%#s.local\"", m->hostlabel.c);
+        if (!m->p->HostNameConflict) m->p->HostNameConflict = NonZeroTime(m->timenow);
+        else if (m->timenow - m->p->HostNameConflict > 60 * mDNSPlatformOneSecond)
+        {
+            // Tell the helper we've given up
+            mDNSPreferencesSetNames(m, kmDNSLocalHostName, &m->p->userhostlabel, NULL);
+        }
+    }
+    else if (result == mStatus_GrowCache)
+    {
+        // Allocate another chunk of cache storage
+        CacheEntity *storage = mallocL("mStatus_GrowCache", sizeof(CacheEntity) * RR_CACHE_SIZE);
+        //LogInfo("GrowCache %d * %d = %d", sizeof(CacheEntity), RR_CACHE_SIZE, sizeof(CacheEntity) * RR_CACHE_SIZE);
+        if (storage) mDNS_GrowCache(m, storage, RR_CACHE_SIZE);
+    }
+    else if (result == mStatus_ConfigChanged)
+    {
+        // Tell the helper we've seen a change in the labels.  It will dismiss the name conflict alert if needed.
+        mDNSPreferencesSetNames(m, kmDNSComputerName, &m->p->usernicelabel, &m->nicelabel);
+        mDNSPreferencesSetNames(m, kmDNSLocalHostName, &m->p->userhostlabel, &m->hostlabel);
+
+        // First we check our list of old Mach-based registered services, to see if any need to be updated to a new name
+        DNSServiceRegistration *r;
+        for (r = DNSServiceRegistrationList; r; r=r->next)
+            if (r->autoname)
+            {
+                ServiceInstance *si;
+                for (si = r->regs; si; si = si->next)
+                {
+                    if (!SameDomainLabelCS(si->name.c, m->nicelabel.c))
+                    {
+                        debugf("NetworkChanged renaming %##s to %#s", si->srs.RR_SRV.resrec.name->c, m->nicelabel.c);
+                        si->renameonmemfree = mDNStrue;
+                        if (mDNS_DeregisterService_drt(m, &si->srs, mDNS_Dereg_rapid))
+                            RegCallback(m, &si->srs, mStatus_MemFree);  // If service deregistered already, we can re-register immediately
+                    }
+                }
+            }
+
+        // Then we call into the UDS daemon code, to let it do the same
+        udsserver_handle_configchange(m);
+    }
+}
+
+//*************************************************************************************************************
+// Add / Update / Remove records from existing Registration
+
+mDNSexport kern_return_t provide_DNSServiceRegistrationAddRecord_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                                     int type, const char *data, mach_msg_type_number_t data_len, uint32_t ttl, natural_t *reference)
+{
+    // Check client parameter
+    uint32_t id;
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    DNSServiceRegistration *x = DNSServiceRegistrationList;
+    if (client == (mach_port_t)-1) { err = mStatus_Invalid;         errormsg = "Client id -1 invalid"; goto fail; }
+    ServiceInstance *si;
+    size_t size;
+    (void)unusedserver;     // Unused
+    while (x && x->ClientMachPort != client) x = x->next;
+    if (!x)                        { err = mStatus_BadReferenceErr; errormsg = "No such client";       goto fail; }
+
+    // Check other parameters
+    if (data_len > 8192) { err = mStatus_BadParamErr; errormsg = "data_len > 8K"; goto fail; }
+    if (data_len > sizeof(RDataBody)) size = data_len;
+    else size = sizeof(RDataBody);
+
+    id = x->NextRef++;
+    *reference = (natural_t)id;
+    for (si = x->regs; si; si = si->next)
+    {
+        // Allocate memory, and handle failure
+        ExtraResourceRecord *extra = mallocL("ExtraResourceRecord", sizeof(*extra) - sizeof(RDataBody) + size);
+        if (!extra) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+        // Fill in type, length, and data of new record
+        extra->r.resrec.rrtype = type;
+        extra->r.rdatastorage.MaxRDLength = size;
+        extra->r.resrec.rdlength          = data_len;
+        memcpy(&extra->r.rdatastorage.u.data, data, data_len);
+
+        // Do the operation
+        LogOperation("%5d: DNSServiceRegistrationAddRecord(%##s, type %d, length %d) REF %p",
+                     client, si->srs.RR_SRV.resrec.name->c, type, data_len, extra);
+        err = mDNS_AddRecordToService(&mDNSStorage, &si->srs, extra, &extra->r.rdatastorage, ttl, 0);
+
+        if (err)
+        {
+            freeL("Extra Resource Record", extra);
+            errormsg = "mDNS_AddRecordToService";
+            goto fail;
+        }
+
+        extra->ClientID = id;
+    }
+
+    return mStatus_NoError;
+
+fail:
+    LogMsg("%5d: DNSServiceRegistrationAddRecord(%##s, type %d, length %d) failed: %s (%d)", client, x ? x->name.c : (mDNSu8*)"\x8" "«NULL»", type, data_len, errormsg, err);
+    return mStatus_UnknownErr;
+}
+
+mDNSlocal void UpdateCallback(mDNS *const m, AuthRecord *const rr, RData *OldRData, mDNSu16 OldRDLen)
+{
+    (void)m;        // Unused
+    (void)OldRDLen; // Unused
+    if (OldRData != &rr->rdatastorage)
+        freeL("Old RData", OldRData);
+}
+
+mDNSlocal mStatus UpdateRecord(ServiceRecordSet *srs, mach_port_t client, AuthRecord *rr, const char *data, mach_msg_type_number_t data_len, uint32_t ttl)
+{
+    // Check client parameter
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    const domainname *name = (const domainname *)"";
+
+    name = srs->RR_SRV.resrec.name;
+
+    unsigned int size = sizeof(RDataBody);
+    if (size < data_len)
+        size = data_len;
+
+    // Allocate memory, and handle failure
+    RData *newrdata = mallocL("RData", sizeof(*newrdata) - sizeof(RDataBody) + size);
+    if (!newrdata) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Fill in new length, and data
+    newrdata->MaxRDLength = size;
+    memcpy(&newrdata->u, data, data_len);
+
+    // BIND named (name daemon) doesn't allow TXT records with zero-length rdata. This is strictly speaking correct,
+    // since RFC 1035 specifies a TXT record as "One or more <character-string>s", not "Zero or more <character-string>s".
+    // Since some legacy apps try to create zero-length TXT records, we'll silently correct it here.
+    if (rr->resrec.rrtype == kDNSType_TXT && data_len == 0) { data_len = 1; newrdata->u.txt.c[0] = 0; }
+
+    // Do the operation
+    LogOperation("%5d: DNSServiceRegistrationUpdateRecord(%##s, new length %d)",
+                 client, srs->RR_SRV.resrec.name->c, data_len);
+
+    err = mDNS_Update(&mDNSStorage, rr, ttl, data_len, newrdata, UpdateCallback);
+    if (err)
+    {
+        errormsg = "mDNS_Update";
+        freeL("RData", newrdata);
+        return err;
+    }
+    return(mStatus_NoError);
+
+fail:
+    LogMsg("%5d: DNSServiceRegistrationUpdateRecord(%##s, %d) failed: %s (%d)", client, name->c, data_len, errormsg, err);
+    return(err);
+}
+
+mDNSexport kern_return_t provide_DNSServiceRegistrationUpdateRecord_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                                        natural_t reference, const char *data, mach_msg_type_number_t data_len, uint32_t ttl)
+{
+    // Check client parameter
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    const domainname *name = (const domainname *)"";
+    ServiceInstance *si;
+
+    (void)unusedserver; // unused
+    if (client == (mach_port_t)-1) { err = mStatus_Invalid;         errormsg = "Client id -1 invalid"; goto fail; }
+    DNSServiceRegistration *x = DNSServiceRegistrationList;
+    while (x && x->ClientMachPort != client) x = x->next;
+    if (!x)                        { err = mStatus_BadReferenceErr; errormsg = "No such client";       goto fail; }
+
+    // Check other parameters
+    if (data_len > 8192) { err = mStatus_BadParamErr; errormsg = "data_len > 8K"; goto fail; }
+
+    for (si = x->regs; si; si = si->next)
+    {
+        AuthRecord *r = NULL;
+
+        // Find the record we're updating. NULL reference means update the primary TXT record
+        if (!reference) r = &si->srs.RR_TXT;
+        else
+        {
+            ExtraResourceRecord *ptr;
+            for (ptr = si->srs.Extras; ptr; ptr = ptr->next)
+            {
+                if ((natural_t)ptr->ClientID == reference)
+                { r = &ptr->r; break; }
+            }
+            if (!r) { err = mStatus_BadReferenceErr; errormsg = "No such record"; goto fail; }
+        }
+        err = UpdateRecord(&si->srs, client, r, data, data_len, ttl);
+        if (err) goto fail;  //!!!KRS this will cause failures for non-local defaults!
+    }
+
+    return mStatus_NoError;
+
+fail:
+    LogMsg("%5d: DNSServiceRegistrationUpdateRecord(%##s, %X, %d) failed: %s (%d)", client, name->c, reference, data_len, errormsg, err);
+    return(err);
+}
+
+mDNSlocal mStatus RemoveRecord(ServiceRecordSet *srs, ExtraResourceRecord *extra, mach_port_t client)
+{
+    const domainname *const name = srs->RR_SRV.resrec.name;
+    mStatus err = mStatus_NoError;
+
+    // Do the operation
+    LogOperation("%5d: DNSServiceRegistrationRemoveRecord(%##s)", client, srs->RR_SRV.resrec.name->c);
+
+    err = mDNS_RemoveRecordFromService(&mDNSStorage, srs, extra, FreeExtraRR, extra);
+    if (err) LogMsg("%5d: DNSServiceRegistrationRemoveRecord (%##s) failed: %d", client, name->c, err);
+
+    return err;
+}
+
+mDNSexport kern_return_t provide_DNSServiceRegistrationRemoveRecord_rpc(mach_port_t unusedserver, mach_port_t client,
+                                                                        natural_t reference)
+{
+    // Check client parameter
+    (void)unusedserver;     // Unused
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    if (client == (mach_port_t)-1) { err = mStatus_Invalid;         errormsg = "Client id -1 invalid"; goto fail; }
+    DNSServiceRegistration *x = DNSServiceRegistrationList;
+    ServiceInstance *si;
+
+    while (x && x->ClientMachPort != client) x = x->next;
+    if (!x)                        { err = mStatus_BadReferenceErr; errormsg = "No such client";       goto fail; }
+
+    for (si = x->regs; si; si = si->next)
+    {
+        ExtraResourceRecord *e;
+        for (e = si->srs.Extras; e; e = e->next)
+        {
+            if ((natural_t)e->ClientID == reference)
+            {
+                err = RemoveRecord(&si->srs, e, client);
+                break;
+            }
+        }
+        if (!e) { err = mStatus_BadReferenceErr; errormsg = "No such reference"; goto fail; }
+    }
+
+    return mStatus_NoError;
+
+fail:
+    LogMsg("%5d: DNSServiceRegistrationRemoveRecord(%X) failed: %s (%d)", client, reference, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Startup, shutdown, and supporting code
+#endif
+
+mDNSlocal void ExitCallback(int sig)
+{
+    (void)sig; // Unused
+    LogMsg("%s stopping", mDNSResponderVersionString);
+
+    debugf("ExitCallback: Aborting MIG clients");
+    while (DNSServiceDomainEnumerationList)
+        AbortClient(DNSServiceDomainEnumerationList->ClientMachPort, DNSServiceDomainEnumerationList);
+    while (DNSServiceBrowserList)
+        AbortClient(DNSServiceBrowserList->ClientMachPort, DNSServiceBrowserList);
+    while (DNSServiceResolverList)
+        AbortClient(DNSServiceResolverList->ClientMachPort, DNSServiceResolverList);
+    while (DNSServiceRegistrationList)
+        AbortClient(DNSServiceRegistrationList->ClientMachPort, DNSServiceRegistrationList);
+
+    if (udsserver_exit() < 0) 
+        LogMsg("ExitCallback: udsserver_exit failed");
+
+    debugf("ExitCallback: mDNS_StartExit");
+    mDNS_StartExit(&mDNSStorage);
+}
+
+#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void DNSserverCallback(CFMachPortRef port, void *msg, CFIndex size, void *info)
+{
+    mig_reply_error_t *request = msg;
+    mig_reply_error_t *reply;
+    mach_msg_return_t mr;
+    int options;
+    (void)port;     // Unused
+    (void)size;     // Unused
+    (void)info;     // Unused
+
+    KQueueLock(&mDNSStorage);
+
+    /* allocate a reply buffer */
+    reply = CFAllocatorAllocate(NULL, provide_DNSServiceDiscoveryRequest_subsystem.maxsize, 0);
+
+    /* call the MiG server routine */
+    (void) DNSServiceDiscoveryRequest_server(&request->Head, &reply->Head);
+
+    if (!(reply->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) && (reply->RetCode != KERN_SUCCESS))
+    {
+        if (reply->RetCode == MIG_NO_REPLY)
+        {
+            /*
+             * This return code is a little tricky -- it appears that the
+             * demux routine found an error of some sort, but since that
+             * error would not normally get returned either to the local
+             * user or the remote one, we pretend it's ok.
+             */
+            CFAllocatorDeallocate(NULL, reply);
+            goto done;
+        }
+
+        /*
+         * destroy any out-of-line data in the request buffer but don't destroy
+         * the reply port right (since we need that to send an error message).
+         */
+        request->Head.msgh_remote_port = MACH_PORT_NULL;
+        mach_msg_destroy(&request->Head);
+    }
+
+    if (reply->Head.msgh_remote_port == MACH_PORT_NULL)
+    {
+        /* no reply port, so destroy the reply */
+        if (reply->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX)
+            mach_msg_destroy(&reply->Head);
+        CFAllocatorDeallocate(NULL, reply);
+        goto done;
+    }
+
+    /*
+     * send reply.
+     *
+     * We don't want to block indefinitely because the client
+     * isn't receiving messages from the reply port.
+     * If we have a send-once right for the reply port, then
+     * this isn't a concern because the send won't block.
+     * If we have a send right, we need to use MACH_SEND_TIMEOUT.
+     * To avoid falling off the kernel's fast RPC path unnecessarily,
+     * we only supply MACH_SEND_TIMEOUT when absolutely necessary.
+     */
+
+    options = MACH_SEND_MSG;
+    if (MACH_MSGH_BITS_REMOTE(reply->Head.msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE)
+        options |= MACH_SEND_TIMEOUT;
+
+    mr = mach_msg(&reply->Head,     /* msg */
+                  options,      /* option */
+                  reply->Head.msgh_size, /* send_size */
+                  0,        /* rcv_size */
+                  MACH_PORT_NULL,   /* rcv_name */
+                  MACH_MSG_TIMEOUT_NONE, /* timeout */
+                  MACH_PORT_NULL);  /* notify */
+
+    /* Has a message error occurred? */
+    switch (mr)
+    {
+    case MACH_SEND_INVALID_DEST:
+    case MACH_SEND_TIMED_OUT:
+        /* the reply can't be delivered, so destroy it */
+        mach_msg_destroy(&reply->Head);
+        break;
+
+    default:
+        /* Includes success case. */
+        break;
+    }
+
+    CFAllocatorDeallocate(NULL, reply);
+
+done:
+    KQueueUnlock(&mDNSStorage, "Mach client event");
+}
+
+// Send a mach_msg to ourselves (since that is signal safe) telling us to cleanup and exit
+mDNSlocal void HandleSIG(int sig)
+{
+    kern_return_t status;
+    mach_msg_header_t header;
+
+    // WARNING: can't call syslog or fprintf from signal handler
+    header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND, 0);
+    header.msgh_remote_port = signal_port;
+    header.msgh_local_port = MACH_PORT_NULL;
+    header.msgh_size = sizeof(header);
+    header.msgh_id = sig;
+
+    status = mach_msg(&header, MACH_SEND_MSG | MACH_SEND_TIMEOUT, header.msgh_size,
+                      0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
+
+    if (status != MACH_MSG_SUCCESS)
+    {
+        if (status == MACH_SEND_TIMED_OUT) mach_msg_destroy(&header);
+        if (sig == SIGTERM || sig == SIGINT) exit(-1);
+    }
+}
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void INFOCallback(void)
+{
+    mDNSs32 utc = mDNSPlatformUTC();
+    NetworkInterfaceInfoOSX     *i;
+    DNSServer *s;
+    McastResolver *mr;
+
+    // Create LoggerID(Key)->com.apple.networking.mDNSResponder(Value) pair when SIGINFO is received.
+    // This key-value pair is used as a condition by syslogd to Log to com.apple.networking.mDNSResponder.log file
+    // present in /etc/asl/com.apple.networking.mDNSResponder.
+    asl_set(log_msg, "LoggerID", "com.apple.networking.mDNSResponder");
+
+    LogMsg("---- BEGIN STATE LOG ---- %s %s %d", mDNSResponderVersionString, OSXVers ? "OSXVers" : "iOSVers", OSXVers ? OSXVers : iOSVers);
+
+    udsserver_info(&mDNSStorage);
+    xpcserver_info(&mDNSStorage);
+
+    LogMsgNoIdent("----- KQSocketEventSources -----");
+    if (!gEventSources) LogMsgNoIdent("<None>");
+    else
+    {
+        KQSocketEventSource *k;
+        for (k = gEventSources; k; k=k->next)
+            LogMsgNoIdent("%3d %s %s", k->fd, k->kqs.KQtask, k->fd == mDNSStorage.uds_listener_skt ? "Listener for incoming UDS clients" : " ");
+    }
+
+    LogMsgNoIdent("------ Network Interfaces ------");
+    if (!mDNSStorage.p->InterfaceList) LogMsgNoIdent("<None>");
+    else
+    {
+        for (i = mDNSStorage.p->InterfaceList; i; i = i->next)
+        {
+            // Allow six characters for interface name, for names like "vmnet8"
+            if (!i->Exists)
+                LogMsgNoIdent("%p %2ld, Registered %p,  %s %-6s(%lu) %.6a %.6a %#-14a dormant for %d seconds",
+                              i, i->ifinfo.InterfaceID, i->Registered,
+                              i->sa_family == AF_INET ? "v4" : i->sa_family == AF_INET6 ? "v6" : "??", i->ifinfo.ifname, i->scope_id, &i->ifinfo.MAC, &i->BSSID,
+                              &i->ifinfo.ip, utc - i->LastSeen);
+            else
+            {
+                const CacheRecord *sps[3];
+                FindSPSInCache(&mDNSStorage, &i->ifinfo.NetWakeBrowse, sps);
+                LogMsgNoIdent("%p %2ld, Registered %p,  %s %-6s(%lu) %.6a %.6a %s %s %-15.4a %s %s %s %s %#a",
+                              i, i->ifinfo.InterfaceID, i->Registered,
+                              i->sa_family == AF_INET ? "v4" : i->sa_family == AF_INET6 ? "v6" : "??", i->ifinfo.ifname, i->scope_id, &i->ifinfo.MAC, &i->BSSID,
+                              i->ifinfo.InterfaceActive ? "Active" : "      ",
+                              i->ifinfo.IPv4Available ? "v4" : "  ",
+                              i->ifinfo.IPv4Available ? (mDNSv4Addr*)&i->ifa_v4addr : &zerov4Addr,
+                              i->ifinfo.IPv6Available ? "v6" : "  ",
+                              i->ifinfo.Advertise ? "A" : " ",
+                              i->ifinfo.McastTxRx ? "M" : " ",
+                              !(i->ifinfo.InterfaceActive && i->ifinfo.NetWake) ? " " : !sps[0] ? "p" : "P",
+                              &i->ifinfo.ip);
+
+                if (sps[0]) LogMsgNoIdent("  %13d %#s", SPSMetric(sps[0]->resrec.rdata->u.name.c), sps[0]->resrec.rdata->u.name.c);
+                if (sps[1]) LogMsgNoIdent("  %13d %#s", SPSMetric(sps[1]->resrec.rdata->u.name.c), sps[1]->resrec.rdata->u.name.c);
+                if (sps[2]) LogMsgNoIdent("  %13d %#s", SPSMetric(sps[2]->resrec.rdata->u.name.c), sps[2]->resrec.rdata->u.name.c);
+            }
+        }
+    }
+
+    LogMsgNoIdent("--------- DNS Servers(%d) ----------", NumUnicastDNSServers);
+    if (!mDNSStorage.DNSServers) LogMsgNoIdent("<None>");
+    else
+    {
+        for (s = mDNSStorage.DNSServers; s; s = s->next)
+        {
+            NetworkInterfaceInfoOSX *ifx = IfindexToInterfaceInfoOSX(&mDNSStorage, s->interface);
+            LogMsgNoIdent("DNS Server %##s %s%s%#a:%d %d %s %d %d %s %s %s %s %s",
+                          s->domain.c, ifx ? ifx->ifinfo.ifname : "", ifx ? " " : "", &s->addr, mDNSVal16(s->port),
+                          s->penaltyTime ? s->penaltyTime - mDNS_TimeNow(&mDNSStorage) : 0, DNSScopeToString(s->scoped),
+                          s->timeout, s->resGroupID,
+                          s->teststate == DNSServer_Untested ? "(Untested)" :
+                          s->teststate == DNSServer_Passed   ? ""           :
+                          s->teststate == DNSServer_Failed   ? "(Failed)"   :
+                          s->teststate == DNSServer_Disabled ? "(Disabled)" : "(Unknown state)",
+                          s->req_A ? "v4" : "!v4",  
+                          s->req_AAAA ? "v6" : "!v6",
+                          s->cellIntf ? "cell" : "!cell",
+                          s->DNSSECAware ? "DNSSECAware" : "!DNSSECAware");
+        }
+    }
+    mDNSs32 now = mDNS_TimeNow(&mDNSStorage);
+    LogMsgNoIdent("v4answers %d", mDNSStorage.p->v4answers);
+    LogMsgNoIdent("v6answers %d", mDNSStorage.p->v6answers);
+    LogMsgNoIdent("Last DNS Trigger: %d ms ago", (now - mDNSStorage.p->DNSTrigger));
+
+    LogMsgNoIdent("--------- Mcast Resolvers ----------");
+    if (!mDNSStorage.McastResolvers) LogMsgNoIdent("<None>");
+    else
+    {
+        for (mr = mDNSStorage.McastResolvers; mr; mr = mr->next)
+            LogMsgNoIdent("Mcast Resolver %##s timeout %u", mr->domain.c, mr->timeout);
+    }
+
+    LogMsgNoIdent("Timenow 0x%08lX (%d)", (mDNSu32)now, now);
+    LogMsg("----  END STATE LOG  ---- %s %s %d", mDNSResponderVersionString, OSXVers ? "OSXVers" : "iOSVers", OSXVers ? OSXVers : iOSVers);
+    
+    // If logging is disabled, only then clear the key we set at the top of this func
+    if (!mDNS_LoggingEnabled)
+        asl_unset(log_msg, "LoggerID");
+}
+
+mDNSlocal void DebugSetFilter()
+{
+    if (!log_client)
+        return;
+
+    // When USR1 is turned on, we log only the LOG_WARNING and LOG_NOTICE messages by default.
+    // The user has to manually do "syslog -c mDNSResponder -i" to get the LOG_INFO messages
+    // also to be logged. Most of the times, we need the INFO level messages for debugging.
+    // Hence, we set the filter to INFO level when USR1 logging is turned on to avoid 
+    // having the user to do this extra step manually. 
+
+    if (mDNS_LoggingEnabled)
+    {
+        asl_set_filter(log_client, ASL_FILTER_MASK_UPTO(ASL_LEVEL_INFO));
+        asl_set(log_msg, "LoggerID", "com.apple.networking.mDNSResponder");
+        // Create LoggerID(Key)->com.apple.networking.mDNSResponder(Value) pair when USR1 Logging is Enabled.
+        // This key-value pair is used as a condition by syslogd to Log to com.apple.networking.mDNSResponder.log file
+        // present in /etc/asl/com.apple.networking.mDNSResponder.
+    }
+    else
+    {
+        asl_set_filter(log_client, ASL_FILTER_MASK_UPTO(ASL_LEVEL_ERR));
+        asl_unset(log_msg, "LoggerID");
+        // Clear the key-value pair when USR1 Logging is Disabled, as we do not want to log to 
+        // com.apple.networking.mDNSResponder.log file in this case.
+    }
+}
+
+mDNSexport void mDNSPlatformLogToFile(int log_level, const char *buffer)
+{
+    int asl_level = ASL_LEVEL_ERR;
+
+    if (!log_client)
+    {
+        syslog(log_level, "%s", buffer);
+        return;
+    }
+    switch (log_level)
+    {
+        case LOG_ERR:
+            asl_level = ASL_LEVEL_ERR;
+            break;
+        case LOG_WARNING:
+            asl_level = ASL_LEVEL_WARNING;
+            break;
+        case LOG_NOTICE:
+            asl_level = ASL_LEVEL_NOTICE;
+            break;
+        case LOG_INFO:
+            asl_level = ASL_LEVEL_INFO;
+            break;
+        case LOG_DEBUG:
+            asl_level = ASL_LEVEL_DEBUG;
+            break;
+        default:
+            break;
+    }
+    asl_log(log_client, log_msg, asl_level, "%s", buffer);
+}
+
+// Writes the state out to the dynamic store and also affects the ASL filter level
+mDNSexport void UpdateDebugState()
+{
+    mDNSu32 one  = 1;
+    mDNSu32 zero = 0;
+
+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    if (!dict)
+    {
+        LogMsg("UpdateDebugState: Could not create dict");
+        return;
+    }
+
+    CFNumberRef numOne = CFNumberCreate(NULL, kCFNumberSInt32Type, &one);
+    if (!numOne)
+    {
+        LogMsg("UpdateDebugState: Could not create CFNumber one");
+        return;
+    }
+    CFNumberRef numZero = CFNumberCreate(NULL, kCFNumberSInt32Type, &zero);
+    if (!numZero)
+    {
+        LogMsg("UpdateDebugState: Could not create CFNumber zero");
+        CFRelease(numOne);
+        return;
+    }
+
+    if (mDNS_LoggingEnabled)
+        CFDictionarySetValue(dict, CFSTR("VerboseLogging"), numOne);
+    else
+        CFDictionarySetValue(dict, CFSTR("VerboseLogging"), numZero);
+
+    if (mDNS_PacketLoggingEnabled)
+        CFDictionarySetValue(dict, CFSTR("PacketLogging"), numOne);
+    else
+        CFDictionarySetValue(dict, CFSTR("PacketLogging"), numZero);
+
+    if (mDNS_McastLoggingEnabled)
+        CFDictionarySetValue(dict, CFSTR("McastLogging"), numOne);
+    else
+        CFDictionarySetValue(dict, CFSTR("McastLogging"), numZero);
+
+    if (mDNS_McastTracingEnabled)
+        CFDictionarySetValue(dict, CFSTR("McastTracing"), numOne);
+    else 
+        CFDictionarySetValue(dict, CFSTR("McastTracing"), numZero);
+
+    CFRelease(numOne);
+    CFRelease(numZero);
+    mDNSDynamicStoreSetConfig(kmDNSDebugState, mDNSNULL, dict);
+    CFRelease(dict);
+    // If we turned off USR1 logging, we need to reset the filter
+    DebugSetFilter();
+}
+
+#if TARGET_OS_EMBEDDED
+mDNSlocal void Prefschanged()
+{
+    mDNSBool mDNSProf_installed;
+    LogMsg("Prefschanged: mDNSResponder Managed Preferences have changed");
+    mDNSProf_installed = GetmDNSManagedPref(kmDNSEnableLoggingStr);
+    dispatch_async(dispatch_get_main_queue(), 
+        ^{ 
+            if (mDNSProf_installed)
+            {
+                mDNS_LoggingEnabled = mDNS_PacketLoggingEnabled = 1;
+            }
+            else
+            {
+                LogMsg("Prefschanged: mDNSDebugProfile is uninstalled -> Turning OFF USR1/USR2 Logging with SIGINFO o/p");
+                INFOCallback();
+                mDNS_LoggingEnabled = mDNS_PacketLoggingEnabled = 0;
+            }
+            UpdateDebugState();
+            // If Logging Enabled: Start Logging to com.apple.networking.mDNSResponder.log (has to be LogInfo)
+            LogInfo("Prefschanged: mDNSDebugProfile is installed -> Turned ON USR1/USR2 Logging");
+         });
+    return;
+}
+#endif //TARGET_OS_EMBEDDED
+
+#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void SignalCallback(CFMachPortRef port, void *msg, CFIndex size, void *info)
+{
+    (void)port;     // Unused
+    (void)size;     // Unused
+    (void)info;     // Unused
+    mach_msg_header_t *msg_header = (mach_msg_header_t *)msg;
+    mDNS *const m = &mDNSStorage;
+
+    // We're running on the CFRunLoop (Mach port) thread, not the kqueue thread, so we need to grab the KQueueLock before proceeding
+    KQueueLock(m);
+    switch(msg_header->msgh_id)
+    {
+    case SIGURG:
+        m->mDNSOppCaching = m->mDNSOppCaching ? mDNSfalse : mDNStrue;
+        LogMsg("SIGURG: Opportunistic Caching %s", m->mDNSOppCaching ? "Enabled" : "Disabled");
+        // FALL THROUGH to purge the cache so that we re-do the caching based on the new setting
+    case SIGHUP:    {
+        mDNSu32 slot;
+        CacheGroup *cg;
+        CacheRecord *rr;
+        LogMsg("SIGHUP: Purge cache");
+        mDNS_Lock(m);
+        FORALL_CACHERECORDS(slot, cg, rr)
+        {
+            mDNS_PurgeCacheResourceRecord(m, rr);
+        }
+        // Restart unicast and multicast queries
+        mDNSCoreRestartQueries(m);
+        mDNS_Unlock(m);
+    } break;
+    case SIGINT:
+    case SIGTERM:   ExitCallback(msg_header->msgh_id); break;
+    case SIGINFO:   INFOCallback(); break;
+    case SIGUSR1:   mDNS_LoggingEnabled = mDNS_LoggingEnabled ? 0 : 1;
+        LogMsg("SIGUSR1: Logging %s", mDNS_LoggingEnabled ? "Enabled" : "Disabled");
+        WatchDogReportingThreshold = mDNS_LoggingEnabled ? 50 : 250;
+        UpdateDebugState();
+        // If Logging Enabled: Start Logging to com.apple.networking.mDNSResponder.log 
+        LogInfo("USR1 Logging Enabled: Start Logging to mDNSResponder Log file"); 
+        break;
+    case SIGUSR2:   mDNS_PacketLoggingEnabled = mDNS_PacketLoggingEnabled ? 0 : 1;
+        LogMsg("SIGUSR2: Packet Logging %s", mDNS_PacketLoggingEnabled ? "Enabled" : "Disabled");
+        mDNS_McastTracingEnabled = (mDNS_PacketLoggingEnabled && mDNS_McastLoggingEnabled) ? mDNStrue : mDNSfalse;
+        LogInfo("SIGUSR2: Multicast Tracing is %s", mDNS_McastTracingEnabled ? "Enabled" : "Disabled");
+        UpdateDebugState();
+        break;
+    case SIGPROF:  mDNS_McastLoggingEnabled = mDNS_McastLoggingEnabled ? mDNSfalse : mDNStrue;
+        LogMsg("SIGPROF: Multicast Logging %s", mDNS_McastLoggingEnabled ? "Enabled" : "Disabled");
+        LogMcastStateInfo(m, mDNSfalse, mDNStrue, mDNStrue);
+        mDNS_McastTracingEnabled = (mDNS_PacketLoggingEnabled && mDNS_McastLoggingEnabled) ? mDNStrue : mDNSfalse;
+        LogMsg("SIGPROF: Multicast Tracing is %s", mDNS_McastTracingEnabled ? "Enabled" : "Disabled");
+        UpdateDebugState();
+        break;
+    case SIGTSTP:  mDNS_LoggingEnabled = mDNS_PacketLoggingEnabled = mDNS_McastLoggingEnabled = mDNS_McastTracingEnabled = mDNSfalse;
+        LogMsg("All mDNSResponder Debug Logging/Tracing Disabled (USR1/USR2/PROF)");
+        UpdateDebugState();
+        break;
+
+    default: LogMsg("SignalCallback: Unknown signal %d", msg_header->msgh_id); break;
+    }
+    KQueueUnlock(m, "Unix Signal");
+}
+
+// MachServerName is com.apple.mDNSResponder (Supported only till 10.9.x)
+mDNSlocal kern_return_t mDNSDaemonInitialize(void)
+{
+    mStatus err;
+    CFMachPortRef s_port;
+    CFRunLoopSourceRef s_rls;
+    CFRunLoopSourceRef d_rls;
+    
+    s_port = CFMachPortCreateWithPort(NULL, m_port, DNSserverCallback, NULL, NULL);
+    CFMachPortRef d_port = CFMachPortCreate(NULL, ClientDeathCallback, NULL, NULL);
+
+    err = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                    rrcachestorage, RR_CACHE_SIZE,
+                    advertise,
+                    mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
+
+    if (err) { LogMsg("Daemon start: mDNS_Init failed %d", err); return(err); }
+
+    client_death_port = CFMachPortGetPort(d_port);
+	
+    s_rls  = CFMachPortCreateRunLoopSource(NULL, s_port, 0);
+    CFRunLoopAddSource(PlatformStorage.CFRunLoop, s_rls, kCFRunLoopDefaultMode);
+    CFRelease(s_rls);
+
+    d_rls  = CFMachPortCreateRunLoopSource(NULL, d_port, 0);
+    CFRunLoopAddSource(PlatformStorage.CFRunLoop, d_rls, kCFRunLoopDefaultMode);
+    CFRelease(d_rls);
+
+    CFMachPortRef i_port = CFMachPortCreate(NULL, SignalCallback, NULL, NULL);
+    CFRunLoopSourceRef i_rls  = CFMachPortCreateRunLoopSource(NULL, i_port, 0);
+    signal_port       = CFMachPortGetPort(i_port);
+    CFRunLoopAddSource(PlatformStorage.CFRunLoop, i_rls, kCFRunLoopDefaultMode);
+    CFRelease(i_rls);
+
+    if (mDNS_DebugMode) printf("Service registered with Mach Port %d\n", m_port);
+    return(err);
+}
+
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+// SignalDispatch is mostly just a copy/paste of entire code block from SignalCallback above.
+// The common code should be a subroutine, or we end up having to fix bugs in two places all the time.
+// The same applies to mDNSDaemonInitialize, much of which is just a copy/paste of chunks
+// of code from above. Alternatively we could remove the duplicated source code by having
+// single routines, with the few differing parts bracketed with "#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM"
+
+mDNSlocal void SignalDispatch(dispatch_source_t source)
+{
+    int sig = (int)dispatch_source_get_handle(source);
+    mDNS *const m = &mDNSStorage;
+    KQueueLock(m);
+    switch(sig)
+    {
+    case SIGHUP:    {
+        mDNSu32 slot;
+        CacheGroup *cg;
+        CacheRecord *rr;
+        LogMsg("SIGHUP: Purge cache");
+        mDNS_Lock(m);
+        FORALL_CACHERECORDS(slot, cg, rr)
+        {
+            mDNS_PurgeCacheResourceRecord(m, rr);
+        }
+        // Restart unicast and multicast queries
+        mDNSCoreRestartQueries(m);
+        mDNS_Unlock(m);
+    } break;
+    case SIGINT:
+    case SIGTERM:   ExitCallback(sig); break;
+    case SIGINFO:   INFOCallback(); break;
+    case SIGUSR1:   mDNS_LoggingEnabled = mDNS_LoggingEnabled ? 0 : 1;
+        LogMsg("SIGUSR1: Logging %s", mDNS_LoggingEnabled ? "Enabled" : "Disabled");
+        WatchDogReportingThreshold = mDNS_LoggingEnabled ? 50 : 250;
+        UpdateDebugState();
+        break;
+    case SIGUSR2:   mDNS_PacketLoggingEnabled = mDNS_PacketLoggingEnabled ? 0 : 1;
+        LogMsg("SIGUSR2: Packet Logging %s", mDNS_PacketLoggingEnabled ? "Enabled" : "Disabled");
+        UpdateDebugState();
+        break;
+    default: LogMsg("SignalCallback: Unknown signal %d", sig); break;
+    }
+    KQueueUnlock(m, "Unix Signal");
+}
+
+mDNSlocal void mDNSSetupSignal(dispatch_queue_t queue, int sig)
+{
+    signal(sig, SIG_IGN);
+    dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, sig, 0, queue);
+
+    if (source)
+    {
+        dispatch_source_set_event_handler(source, ^{SignalDispatch(source);});
+        // Start processing signals
+        dispatch_resume(source);
+    }
+    else
+    {
+        LogMsg("mDNSSetupSignal: Cannot setup signal %d", sig);
+    }
+}
+
+// On 10.2 the MachServerName is DNSServiceDiscoveryServer
+// On 10.3 and later, the MachServerName is com.apple.mDNSResponder
+mDNSlocal kern_return_t mDNSDaemonInitialize(void)
+{
+    mStatus err;
+    dispatch_source_t mach_source;
+    dispatch_queue_t queue = dispatch_get_main_queue();
+
+    err = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                    rrcachestorage, RR_CACHE_SIZE,
+                    advertise,
+                    mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
+
+    if (err) { LogMsg("Daemon start: mDNS_Init failed %d", err); return(err); }
+
+    mach_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_port, 0, queue);
+    if (mach_source == mDNSNULL) {LogMsg("mDNSDaemonInitialize: Error creating source for m_port"); return -1;}
+    dispatch_source_set_event_handler(mach_source, ^{
+                                          dispatch_mig_server(mach_source, sizeof(union __RequestUnion__DNSServiceDiscoveryReply_subsystem),
+                                                              DNSServiceDiscoveryRequest_server);
+                                      });
+    dispatch_resume(mach_source);
+
+    mDNSSetupSignal(queue, SIGHUP);
+    mDNSSetupSignal(queue, SIGINT);
+    mDNSSetupSignal(queue, SIGTERM);
+    mDNSSetupSignal(queue, SIGINFO);
+    mDNSSetupSignal(queue, SIGUSR1);
+    mDNSSetupSignal(queue, SIGUSR2);
+    mDNSSetupSignal(queue, SIGURG);
+
+    // Create a custom handler for doing the housekeeping work. This is either triggered
+    // by the timer or an event source
+    PlatformStorage.custom = dispatch_source_create(DISPATCH_SOURCE_TYPE_DATA_ADD, 0, 0, queue);
+    if (PlatformStorage.custom == mDNSNULL) {LogMsg("mDNSDaemonInitialize: Error creating custom source"); return -1;}
+    dispatch_source_set_event_handler(PlatformStorage.custom, ^{PrepareForIdle(&mDNSStorage);});
+    dispatch_resume(PlatformStorage.custom);
+
+    // Create a timer source to trigger housekeeping work. The houskeeping work itself
+    // is done in the custom handler that we set below.
+
+    PlatformStorage.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+    if (PlatformStorage.timer == mDNSNULL) {LogMsg("mDNSDaemonInitialize: Error creating timer source"); return -1;}
+
+    // As the API does not support one shot timers, we pass zero for the interval. In the custom handler, we
+    // always reset the time to the new time computed. In effect, we ignore the interval
+    dispatch_source_set_timer(PlatformStorage.timer, DISPATCH_TIME_NOW, 1000ull * 1000000000, 0);
+    dispatch_source_set_event_handler(PlatformStorage.timer, ^{
+                                          dispatch_source_merge_data(PlatformStorage.custom, 1);
+                                      });
+    dispatch_resume(PlatformStorage.timer);
+
+    LogMsg("DaemonIntialize done successfully");
+
+    if (mDNS_DebugMode) printf("Service registered with Mach Port %d\n", m_port);
+    return(err);
+}
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal mDNSs32 mDNSDaemonIdle(mDNS *const m)
+{
+    mDNSs32 now = mDNS_TimeNow(m);
+
+    // 1. If we need to set domain secrets, do so before handling the network change
+    // Detailed reason:
+    // BTMM domains listed in DynStore Setup:/Network/BackToMyMac are added to the registration domains list,
+    // and we need to setup the associated AutoTunnel DomainAuthInfo entries before that happens.
+    if (m->p->KeyChainTimer && now - m->p->KeyChainTimer >= 0)
+    {
+        m->p->KeyChainTimer = 0;
+        mDNS_Lock(m);
+        SetDomainSecrets(m);
+        mDNS_Unlock(m);
+    }
+
+    // 2. If we have network change events to handle, do them before calling mDNS_Execute()
+    // Detailed reason:
+    // mDNSMacOSXNetworkChanged() currently closes and re-opens its sockets. If there are received packets waiting, they are lost.
+    // mDNS_Execute() generates packets, including multicasts that are looped back to ourself.
+    // If we call mDNS_Execute() first, and generate packets, and then call mDNSMacOSXNetworkChanged() immediately afterwards
+    // we then systematically lose our own looped-back packets.
+    if (m->p->NetworkChanged && now - m->p->NetworkChanged >= 0) mDNSMacOSXNetworkChanged(m);
+
+    if (m->p->RequestReSleep && now - m->p->RequestReSleep >= 0) { m->p->RequestReSleep = 0; mDNSPowerRequest(0, 0); }
+
+    // 3. Call mDNS_Execute() to let mDNSCore do what it needs to do
+    mDNSs32 nextevent = mDNS_Execute(m);
+
+    if (m->p->NetworkChanged)
+        if (nextevent - m->p->NetworkChanged > 0)
+            nextevent = m->p->NetworkChanged;
+
+    if (m->p->KeyChainTimer)
+        if (nextevent - m->p->KeyChainTimer > 0)
+            nextevent = m->p->KeyChainTimer;
+
+    if (m->p->RequestReSleep)
+        if (nextevent - m->p->RequestReSleep > 0)
+            nextevent = m->p->RequestReSleep;
+
+    // 4. Deliver any waiting browse messages to clients
+    DNSServiceBrowser *b = DNSServiceBrowserList;
+
+    while (b)
+    {
+        // Note: Need to advance b to the next element BEFORE we call DeliverInstance(), because in the
+        // event that the client Mach queue overflows, DeliverInstance() will call AbortBlockedClient()
+        // and that will cause the DNSServiceBrowser object's memory to be freed before it returns
+        DNSServiceBrowser *x = b;
+        b = b->next;
+        if (x->results)         // Try to deliver the list of results
+        {
+            while (x->results)
+            {
+                DNSServiceBrowserResult *const r = x->results;
+                domainlabel name;
+                domainname type, domain;
+                DeconstructServiceName(&r->result, &name, &type, &domain);  // Don't need to check result; already validated in FoundInstance()
+                char cname[MAX_DOMAIN_LABEL+1];         // Unescaped name: up to 63 bytes plus C-string terminating NULL.
+                char ctype[MAX_ESCAPED_DOMAIN_NAME];
+                char cdom [MAX_ESCAPED_DOMAIN_NAME];
+                ConvertDomainLabelToCString_unescaped(&name, cname);
+                ConvertDomainNameToCString(&type, ctype);
+                ConvertDomainNameToCString(&domain, cdom);
+                DNSServiceDiscoveryReplyFlags flags = (r->next) ? DNSServiceDiscoverReplyFlagsMoreComing : 0;
+                kern_return_t status = DNSServiceBrowserReply_rpc(x->ClientMachPort, r->resultType, cname, ctype, cdom, flags, 1);
+                // If we failed to send the mach message, try again in one second
+                if (status == MACH_SEND_TIMED_OUT)
+                {
+                    if (nextevent - now > mDNSPlatformOneSecond)
+                        nextevent = now + mDNSPlatformOneSecond;
+                    break;
+                }
+                else
+                {
+                    x->lastsuccess = now;
+                    x->results = x->results->next;
+                    freeL("DNSServiceBrowserResult", r);
+                }
+            }
+            // If this client hasn't read a single message in the last 60 seconds, abort it
+            if (now - x->lastsuccess >= 60 * mDNSPlatformOneSecond)
+                AbortBlockedClient(x->ClientMachPort, "browse", x);
+        }
+    }
+
+    DNSServiceResolver *l;
+    for (l = DNSServiceResolverList; l; l=l->next)
+        if (l->ReportTime && now - l->ReportTime >= 0)
+        {
+            l->ReportTime = 0;
+            LogMsgNoIdent("Client application bug: DNSServiceResolver(%##s) active for over two minutes. "
+                          "This places considerable burden on the network.", l->i.name.c);
+        }
+
+    if (m->p->NotifyUser)
+    {
+        if (m->p->NotifyUser - now < 0)
+        {
+            if (!SameDomainLabelCS(m->p->usernicelabel.c, m->nicelabel.c))
+            {
+                LogMsg("Name Conflict: Updated Computer Name from \"%#s\" to \"%#s\"", m->p->usernicelabel.c, m->nicelabel.c);
+                mDNSPreferencesSetNames(m, kmDNSComputerName, &m->p->usernicelabel, &m->nicelabel);
+                m->p->usernicelabel = m->nicelabel;
+            }
+            if (!SameDomainLabelCS(m->p->userhostlabel.c, m->hostlabel.c))
+            {
+                LogMsg("Name Conflict: Updated Local Hostname from \"%#s.local\" to \"%#s.local\"", m->p->userhostlabel.c, m->hostlabel.c);
+                mDNSPreferencesSetNames(m, kmDNSLocalHostName, &m->p->userhostlabel, &m->hostlabel);
+                m->p->HostNameConflict = 0; // Clear our indicator, now name change has been successful
+                m->p->userhostlabel = m->hostlabel;
+            }
+            m->p->NotifyUser = 0;
+        }
+        else
+        if (nextevent - m->p->NotifyUser > 0)
+            nextevent = m->p->NotifyUser;
+    }
+
+    return(nextevent);
+}
+
+// Right now we consider *ALL* of our DHCP leases
+// It might make sense to be a bit more selective and only consider the leases on interfaces
+// (a) that are capable and enabled for wake-on-LAN, and
+// (b) where we have found (and successfully registered with) a Sleep Proxy
+// If we can't be woken for traffic on a given interface, then why keep waking to renew its lease?
+mDNSlocal mDNSu32 DHCPWakeTime(void)
+{
+    mDNSu32 e = 24 * 3600;      // Maximum maintenance wake interval is 24 hours
+    const CFAbsoluteTime now = CFAbsoluteTimeGetCurrent();
+    if (!now) LogMsg("DHCPWakeTime: CFAbsoluteTimeGetCurrent failed");
+    else
+    {
+        int ic, j;
+
+        const void *pattern = SCDynamicStoreKeyCreateNetworkServiceEntity(NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetDHCP);
+        if (!pattern)
+        {
+            LogMsg("DHCPWakeTime: SCDynamicStoreKeyCreateNetworkServiceEntity failed\n");
+            return e;
+        }
+        CFArrayRef dhcpinfo = CFArrayCreate(NULL, (const void **)&pattern, 1, &kCFTypeArrayCallBacks);
+        CFRelease(pattern);
+        if (dhcpinfo)
+        {
+            SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("DHCP-LEASES"), NULL, NULL);
+            if (store)
+            {
+                CFDictionaryRef dict = SCDynamicStoreCopyMultiple(store, NULL, dhcpinfo);
+                if (dict)
+                {
+                    ic = CFDictionaryGetCount(dict);
+                    const void *vals[ic];
+                    CFDictionaryGetKeysAndValues(dict, NULL, vals);
+
+                    for (j = 0; j < ic; j++)
+                    {
+                        const CFDictionaryRef dhcp = (CFDictionaryRef)vals[j];
+                        if (dhcp)
+                        {
+                            const CFDateRef start = DHCPInfoGetLeaseStartTime(dhcp);
+                            const CFDataRef lease = DHCPInfoGetOptionData(dhcp, 51);    // Option 51 = IP Address Lease Time
+                            if (!start || !lease || CFDataGetLength(lease) < 4)
+                                LogMsg("DHCPWakeTime: SCDynamicStoreCopyDHCPInfo index %d failed "
+                                       "CFDateRef start %p CFDataRef lease %p CFDataGetLength(lease) %d",
+                                       j, start, lease, lease ? CFDataGetLength(lease) : 0);
+                            else
+                            {
+                                const UInt8 *d = CFDataGetBytePtr(lease);
+                                if (!d) LogMsg("DHCPWakeTime: CFDataGetBytePtr %d failed", j);
+                                else
+                                {
+                                    const mDNSu32 elapsed   = now - CFDateGetAbsoluteTime(start);
+                                    const mDNSu32 lifetime  = (mDNSs32) ((mDNSs32)d[0] << 24 | (mDNSs32)d[1] << 16 | (mDNSs32)d[2] << 8 | d[3]);
+                                    const mDNSu32 remaining = lifetime - elapsed;
+                                    const mDNSu32 wake      = remaining > 60 ? remaining - remaining/10 : 54;   // Wake at 90% of the lease time
+                                    LogSPS("DHCP Address Lease Elapsed %6u Lifetime %6u Remaining %6u Wake %6u", elapsed, lifetime, remaining, wake);
+                                    if (e > wake) e = wake;
+                                }
+                            }
+                        }
+                    }
+                    CFRelease(dict);
+                }
+                CFRelease(store);
+            }
+            CFRelease(dhcpinfo);
+        }
+    }
+    return(e);
+}
+
+// We deliberately schedule our wakeup for halfway between when we'd *like* it and when we *need* it.
+// For example, if our DHCP lease expires in two hours, we'll typically renew it at the halfway point, after one hour.
+// If we scheduled our wakeup for the one-hour renewal time, that might be just seconds from now, and sleeping
+// for a few seconds and then waking again is silly and annoying.
+// If we scheduled our wakeup for the two-hour expiry time, and we were slow to wake, we might lose our lease.
+// Scheduling our wakeup for halfway in between -- 90 minutes -- avoids short wakeups while still
+// allowing us an adequate safety margin to renew our lease before we lose it.
+
+mDNSlocal mDNSBool AllowSleepNow(mDNS *const m, mDNSs32 now)
+{
+    mDNSBool ready = mDNSCoreReadyForSleep(m, now);
+    if (m->SleepState && !ready && now - m->SleepLimit < 0) return(mDNSfalse);
+
+    m->p->WakeAtUTC = 0;
+    int result = kIOReturnSuccess;
+    CFDictionaryRef opts = NULL;
+
+    // If the sleep request was cancelled, and we're no longer planning to sleep, don't need to
+    // do the stuff below, but we *DO* still need to acknowledge the sleep message we received.
+    if (!m->SleepState)
+        LogMsg("AllowSleepNow: Sleep request was canceled with %d ticks remaining", m->SleepLimit - now);
+    else
+    {
+        if (!m->SystemWakeOnLANEnabled || !mDNSCoreHaveAdvertisedMulticastServices(m))
+            LogSPS("AllowSleepNow: Not scheduling wakeup: SystemWakeOnLAN %s enabled; %s advertised services",
+                   m->SystemWakeOnLANEnabled                  ? "is" : "not",
+                   mDNSCoreHaveAdvertisedMulticastServices(m) ? "have" : "no");
+        else
+        {
+            mDNSs32 dhcp = DHCPWakeTime();
+            LogSPS("ComputeWakeTime: DHCP Wake %d", dhcp);
+            mDNSs32 interval = mDNSCoreIntervalToNextWake(m, now) / mDNSPlatformOneSecond;
+            if (interval > dhcp) interval = dhcp;
+
+            // If we're not ready to sleep (failed to register with Sleep Proxy, maybe because of
+            // transient network problem) then schedule a wakeup in one hour to try again. Otherwise,
+            // a single SPS failure could result in a remote machine falling permanently asleep, requiring
+            // someone to go to the machine in person to wake it up again, which would be unacceptable.
+            if (!ready && interval > 3600) interval = 3600;
+
+            //interval = 48; // For testing
+
+#ifdef kIOPMAcknowledgmentOptionSystemCapabilityRequirements
+            if (m->p->IOPMConnection)   // If lightweight-wake capability is available, use that
+            {
+                const CFDateRef WakeDate = CFDateCreate(NULL, CFAbsoluteTimeGetCurrent() + interval);
+                if (!WakeDate) LogMsg("ScheduleNextWake: CFDateCreate failed");
+                else
+                {
+                    const mDNSs32 reqs         = kIOPMSystemPowerStateCapabilityNetwork;
+                    const CFNumberRef Requirements = CFNumberCreate(NULL, kCFNumberSInt32Type, &reqs);
+                    if (!Requirements) LogMsg("ScheduleNextWake: CFNumberCreate failed");
+                    else
+                    {
+                        const void *OptionKeys[2] = { CFSTR("WakeDate"), CFSTR("Requirements") };
+                        const void *OptionVals[2] = {        WakeDate,          Requirements   };
+                        opts = CFDictionaryCreate(NULL, (void*)OptionKeys, (void*)OptionVals, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+                        if (!opts) LogMsg("ScheduleNextWake: CFDictionaryCreate failed");
+                        CFRelease(Requirements);
+                    }
+                    CFRelease(WakeDate);
+                }
+                LogSPS("AllowSleepNow: Will request lightweight wakeup in %d seconds", interval);
+            }
+            else                        // else schedule the wakeup using the old API instead to
+#endif
+            {
+                // If we wake within +/- 30 seconds of our requested time we'll assume the system woke for us,
+                // so we should put it back to sleep. To avoid frustrating the user, we always request at least
+                // 60 seconds sleep, so if they immediately re-wake the system within seconds of it going to sleep,
+                // we then shouldn't hit our 30-second window, and we won't attempt to re-sleep the machine.
+                if (interval < 60) interval = 60;
+
+                result = mDNSPowerRequest(1, interval);
+
+                if (result == kIOReturnNotReady)
+                {
+                    int r;
+                    LogMsg("AllowSleepNow: Requested wakeup in %d seconds unsuccessful; retrying with longer intervals", interval);
+                    // IOPMSchedulePowerEvent fails with kIOReturnNotReady (-536870184/0xe00002d8) if the
+                    // requested wake time is "too soon", but there's no API to find out what constitutes
+                    // "too soon" on any given OS/hardware combination, so if we get kIOReturnNotReady
+                    // we just have to iterate with successively longer intervals until it doesn't fail.
+                    // We preserve the value of "result" because if our original power request was deemed "too soon"
+                    // for the machine to get to sleep and wake back up again, we attempt to cancel the sleep request,
+                    // since the implication is that the system won't manage to be awake again at the time we need it.
+                    do
+                    {
+                        interval += (interval < 20) ? 1 : ((interval+3) / 4);
+                        r = mDNSPowerRequest(1, interval);
+                    }
+                    while (r == kIOReturnNotReady);
+                    if (r) LogMsg("AllowSleepNow: Requested wakeup in %d seconds unsuccessful: %d %X", interval, r, r);
+                    else LogSPS("AllowSleepNow: Requested later wakeup in %d seconds; will also attempt IOCancelPowerChange", interval);
+                }
+                else
+                {
+                    if (result) LogMsg("AllowSleepNow: Requested wakeup in %d seconds unsuccessful: %d %X", interval, result, result);
+                    else LogSPS("AllowSleepNow: Requested wakeup in %d seconds", interval);
+                }
+                m->p->WakeAtUTC = mDNSPlatformUTC() + interval;
+            }
+        }
+
+        m->SleepState = SleepState_Sleeping;
+        // We used to clear our interface list to empty state here before going to sleep.
+        // The applications that try to connect to an external server during maintenance wakes, saw
+        // DNS resolution errors as we don't have any interfaces (most queries use SuppressUnusable
+        // flag). Thus, we don't remove our interfaces anymore on sleep.
+    }
+
+    LogSPS("AllowSleepNow: %s(%lX) %s at %ld (%d ticks remaining)",
+#if !TARGET_OS_EMBEDDED && defined(kIOPMAcknowledgmentOptionSystemCapabilityRequirements)
+           (m->p->IOPMConnection) ? "IOPMConnectionAcknowledgeEventWithOptions" :
+#endif
+           (result == kIOReturnSuccess) ? "IOAllowPowerChange" : "IOCancelPowerChange",
+           m->p->SleepCookie, ready ? "ready for sleep" : "giving up", now, m->SleepLimit - now);
+
+    m->SleepLimit = 0;  // Don't clear m->SleepLimit until after we've logged it above
+    m->TimeSlept = mDNSPlatformUTC();
+
+    // accumulate total time awake for this statistics gathering interval
+    if (m->StatStartTime)
+    {
+        m->ActiveStatTime += (m->TimeSlept - m->StatStartTime);
+
+        // indicate this value is invalid until reinitialzed on wakeup
+        m->StatStartTime = 0;
+    }
+
+#if !TARGET_OS_EMBEDDED && defined(kIOPMAcknowledgmentOptionSystemCapabilityRequirements)
+    if (m->p->IOPMConnection) IOPMConnectionAcknowledgeEventWithOptions(m->p->IOPMConnection, m->p->SleepCookie, opts);
+    else
+#endif
+    if (result == kIOReturnSuccess) IOAllowPowerChange (m->p->PowerConnection, m->p->SleepCookie);
+    else IOCancelPowerChange(m->p->PowerConnection, m->p->SleepCookie);
+
+    if (opts) CFRelease(opts);
+    return(mDNStrue);
+}
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSexport void TriggerEventCompletion()
+{
+    debugf("TriggerEventCompletion: Merge data");
+    dispatch_source_merge_data(PlatformStorage.custom, 1);
+}
+
+mDNSlocal void PrepareForIdle(void *m_param)
+{
+    mDNS            *m = m_param;
+    int64_t time_offset;
+    dispatch_time_t dtime;
+
+    const int multiplier = 1000000000 / mDNSPlatformOneSecond;
+
+    // This is the main work loop:
+    // (1) First we give mDNSCore a chance to finish off any of its deferred work and calculate the next sleep time
+    // (2) Then we make sure we've delivered all waiting browse messages to our clients
+    // (3) Then we sleep for the time requested by mDNSCore, or until the next event, whichever is sooner
+
+    debugf("PrepareForIdle: called");
+    // Run mDNS_Execute to find out the time we next need to wake up
+    mDNSs32 start          = mDNSPlatformRawTime();
+    mDNSs32 nextTimerEvent = udsserver_idle(mDNSDaemonIdle(m));
+    mDNSs32 end            = mDNSPlatformRawTime();
+    if (end - start >= WatchDogReportingThreshold)
+        LogInfo("CustomSourceHandler:WARNING: Idle task took %dms to complete", end - start);
+
+    mDNSs32 now = mDNS_TimeNow(m);
+
+    if (m->ShutdownTime)
+    {
+        if (mDNSStorage.ResourceRecords)
+        {
+            LogInfo("Cannot exit yet; Resource Record still exists: %s", ARDisplayString(m, mDNSStorage.ResourceRecords));
+            if (mDNS_LoggingEnabled) usleep(10000);     // Sleep 10ms so that we don't flood syslog with too many messages
+        }
+        if (mDNS_ExitNow(m, now))
+        {
+            LogInfo("IdleLoop: mDNS_FinalExit");
+            mDNS_FinalExit(&mDNSStorage);
+            usleep(1000);       // Little 1ms pause before exiting, so we don't lose our final syslog messages
+            exit(0);
+        }
+        if (nextTimerEvent - m->ShutdownTime >= 0)
+            nextTimerEvent = m->ShutdownTime;
+    }
+
+    if (m->SleepLimit)
+        if (!AllowSleepNow(m, now))
+            if (nextTimerEvent - m->SleepLimit >= 0)
+                nextTimerEvent = m->SleepLimit;
+
+    // Convert absolute wakeup time to a relative time from now
+    mDNSs32 ticks = nextTimerEvent - now;
+    if (ticks < 1) ticks = 1;
+
+    static mDNSs32 RepeatedBusy = 0;    // Debugging sanity check, to guard against CPU spins
+    if (ticks > 1)
+        RepeatedBusy = 0;
+    else
+    {
+        ticks = 1;
+        if (++RepeatedBusy >= mDNSPlatformOneSecond) { ShowTaskSchedulingError(&mDNSStorage); RepeatedBusy = 0; }
+    }
+
+    time_offset = ((mDNSu32)ticks / mDNSPlatformOneSecond) * 1000000000 + (ticks % mDNSPlatformOneSecond) * multiplier;
+    dtime = dispatch_time(DISPATCH_TIME_NOW, time_offset);
+    dispatch_source_set_timer(PlatformStorage.timer, dtime, 1000ull*1000000000, 0);
+    debugf("PrepareForIdle: scheduling timer with ticks %d", ticks);
+    return;
+}
+
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void KQWokenFlushBytes(int fd, __unused short filter, __unused void *context)
+{
+    // Read all of the bytes so we won't wake again.
+    char buffer[100];
+    while (recv(fd, buffer, sizeof(buffer), MSG_DONTWAIT) > 0) continue;
+}
+
+mDNSlocal void * KQueueLoop(void *m_param)
+{
+    mDNS            *m = m_param;
+    int numevents = 0;
+
+#if USE_SELECT_WITH_KQUEUEFD
+    fd_set readfds;
+    FD_ZERO(&readfds);
+    const int multiplier = 1000000    / mDNSPlatformOneSecond;
+#else
+    const int multiplier = 1000000000 / mDNSPlatformOneSecond;
+#endif
+
+    pthread_mutex_lock(&PlatformStorage.BigMutex);
+    LogInfo("Starting time value 0x%08lX (%ld)", (mDNSu32)mDNSStorage.timenow_last, mDNSStorage.timenow_last);
+
+    // This is the main work loop:
+    // (1) First we give mDNSCore a chance to finish off any of its deferred work and calculate the next sleep time
+    // (2) Then we make sure we've delivered all waiting browse messages to our clients
+    // (3) Then we sleep for the time requested by mDNSCore, or until the next event, whichever is sooner
+    // (4) On wakeup we first process *all* events
+    // (5) then when no more events remain, we go back to (1) to finish off any deferred work and do it all again
+    for ( ; ; )
+    {
+        #define kEventsToReadAtOnce 1
+        struct kevent new_events[kEventsToReadAtOnce];
+
+        // Run mDNS_Execute to find out the time we next need to wake up
+        mDNSs32 start          = mDNSPlatformRawTime();
+        mDNSs32 nextTimerEvent = udsserver_idle(mDNSDaemonIdle(m));
+        mDNSs32 end            = mDNSPlatformRawTime();
+        if (end - start >= WatchDogReportingThreshold)
+            LogInfo("WARNING: Idle task took %dms to complete", end - start);
+
+        mDNSs32 now = mDNS_TimeNow(m);
+
+        if (m->ShutdownTime)
+        {
+            if (mDNSStorage.ResourceRecords)
+            {
+                AuthRecord *rr;
+                for (rr = mDNSStorage.ResourceRecords; rr; rr=rr->next)
+                {
+                    LogInfo("Cannot exit yet; Resource Record still exists: %s", ARDisplayString(m, rr));
+                    if (mDNS_LoggingEnabled) usleep(10000);     // Sleep 10ms so that we don't flood syslog with too many messages
+                }
+            }
+            if (mDNS_ExitNow(m, now))
+            {
+                LogInfo("mDNS_FinalExit");
+                mDNS_FinalExit(&mDNSStorage);
+                usleep(1000);       // Little 1ms pause before exiting, so we don't lose our final syslog messages
+                exit(0);
+            }
+            if (nextTimerEvent - m->ShutdownTime >= 0)
+                nextTimerEvent = m->ShutdownTime;
+        }
+
+        if (m->SleepLimit)
+            if (!AllowSleepNow(m, now))
+                if (nextTimerEvent - m->SleepLimit >= 0)
+                    nextTimerEvent = m->SleepLimit;
+
+        // Convert absolute wakeup time to a relative time from now
+        mDNSs32 ticks = nextTimerEvent - now;
+        if (ticks < 1) ticks = 1;
+
+        static mDNSs32 RepeatedBusy = 0;    // Debugging sanity check, to guard against CPU spins
+        if (ticks > 1)
+            RepeatedBusy = 0;
+        else
+        {
+            ticks = 1;
+            if (++RepeatedBusy >= mDNSPlatformOneSecond) { ShowTaskSchedulingError(&mDNSStorage); RepeatedBusy = 0; }
+        }
+
+        verbosedebugf("KQueueLoop: Handled %d events; now sleeping for %d ticks", numevents, ticks);
+        numevents = 0;
+
+        // Release the lock, and sleep until:
+        // 1. Something interesting happens like a packet arriving, or
+        // 2. The other thread writes a byte to WakeKQueueLoopFD to poke us and make us wake up, or
+        // 3. The timeout expires
+        pthread_mutex_unlock(&PlatformStorage.BigMutex);
+
+#if USE_SELECT_WITH_KQUEUEFD
+        struct timeval timeout;
+        timeout.tv_sec = ticks / mDNSPlatformOneSecond;
+        timeout.tv_usec = (ticks % mDNSPlatformOneSecond) * multiplier;
+        FD_SET(KQueueFD, &readfds);
+        if (select(KQueueFD+1, &readfds, NULL, NULL, &timeout) < 0)
+        { LogMsg("select(%d) failed errno %d (%s)", KQueueFD, errno, strerror(errno)); sleep(1); }
+#else
+        struct timespec timeout;
+        timeout.tv_sec = ticks / mDNSPlatformOneSecond;
+        timeout.tv_nsec = (ticks % mDNSPlatformOneSecond) * multiplier;
+        // In my opinion, you ought to be able to call kevent() with nevents set to zero,
+        // and have it work similarly to the way it does with nevents non-zero --
+        // i.e. it waits until either an event happens or the timeout expires, and then wakes up.
+        // In fact, what happens if you do this is that it just returns immediately. So, we have
+        // to pass nevents set to one, and then we just ignore the event it gives back to us. -- SC
+        if (kevent(KQueueFD, NULL, 0, new_events, 1, &timeout) < 0)
+        { LogMsg("kevent(%d) failed errno %d (%s)", KQueueFD, errno, strerror(errno)); sleep(1); }
+#endif
+
+        pthread_mutex_lock(&PlatformStorage.BigMutex);
+        // We have to ignore the event we may have been told about above, because that
+        // was done without holding the lock, and between the time we woke up and the
+        // time we reclaimed the lock the other thread could have done something that
+        // makes the event no longer valid. Now we have the lock, we call kevent again
+        // and this time we can safely process the events it tells us about.
+
+        static const struct timespec zero_timeout = { 0, 0 };
+        int events_found;
+        while ((events_found = kevent(KQueueFD, NULL, 0, new_events, kEventsToReadAtOnce, &zero_timeout)) != 0)
+        {
+            if (events_found > kEventsToReadAtOnce || (events_found < 0 && errno != EINTR))
+            {
+                // Not sure what to do here, our kqueue has failed us - this isn't ideal
+                LogMsg("ERROR: KQueueLoop - kevent failed errno %d (%s)", errno, strerror(errno));
+                exit(errno);
+            }
+
+            numevents += events_found;
+
+            int i;
+            for (i = 0; i < events_found; i++)
+            {
+                const KQueueEntry *const kqentry = new_events[i].udata;
+                mDNSs32 stime = mDNSPlatformRawTime();
+                const char *const KQtask = kqentry->KQtask; // Grab a copy in case KQcallback deletes the task
+                kqentry->KQcallback(new_events[i].ident, new_events[i].filter, kqentry->KQcontext);
+                mDNSs32 etime = mDNSPlatformRawTime();
+                if (etime - stime >= WatchDogReportingThreshold)
+                    LogInfo("WARNING: %s took %dms to complete", KQtask, etime - stime);
+            }
+        }
+    }
+
+    return NULL;
+}
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void LaunchdCheckin(void)
+{
+    // Ask launchd for our socket
+    launch_data_t resp_sd = launch_socket_service_check_in();
+    if (!resp_sd)
+    { 
+        LogMsg("launch_socket_service_check_in returned NULL");
+        return; 
+    }
+    else
+    {
+        launch_data_t skts = launch_data_dict_lookup(resp_sd, LAUNCH_JOBKEY_SOCKETS);
+        if (!skts) LogMsg("launch_data_dict_lookup LAUNCH_JOBKEY_SOCKETS returned NULL");
+        else
+        {
+            launch_data_t skt = launch_data_dict_lookup(skts, "Listeners");
+            if (!skt) LogMsg("launch_data_dict_lookup Listeners returned NULL");
+            else
+            {
+                launchd_fds_count = launch_data_array_get_count(skt);
+                if (launchd_fds_count == 0) LogMsg("launch_data_array_get_count(skt) returned 0");
+                else
+                {
+                    launchd_fds = mallocL("LaunchdCheckin", sizeof(dnssd_sock_t) * launchd_fds_count);
+                    if (!launchd_fds) LogMsg("LaunchdCheckin: malloc failed");
+                    else
+                    {
+                        size_t i;
+                        for(i = 0; i < launchd_fds_count; i++)
+                        {
+                            launch_data_t s = launch_data_array_get_index(skt, i);
+                            if (!s)
+                            {
+                                launchd_fds[i] = dnssd_InvalidSocket;
+                                LogMsg("launch_data_array_get_index(skt, %d) returned NULL", i);
+                            }
+                            else
+                            {
+                                launchd_fds[i] = launch_data_get_fd(s);
+                                LogInfo("Launchd Unix Domain Socket [%d]: %d", i, launchd_fds[i]);
+                            }
+                        }
+                    }
+                    // In some early versions of 10.4.x, the permissions on the UDS were not set correctly, so we fix them here
+                    chmod(MDNS_UDS_SERVERPATH, S_IRUSR|S_IWUSR | S_IRGRP|S_IWGRP | S_IROTH|S_IWOTH);
+                }
+            }
+        }
+    }
+    launch_data_free(resp_sd);
+}
+
+static mach_port_t RegisterMachService(const char *service_name) 
+{
+    mach_port_t port = MACH_PORT_NULL;
+    kern_return_t kr; 
+
+    if (KERN_SUCCESS != (kr = bootstrap_check_in(bootstrap_port, (char *)service_name, &port)))
+    {   
+        LogMsg("RegisterMachService: %d %X %s", kr, kr, mach_error_string(kr));
+        return MACH_PORT_NULL;
+    }   
+    
+    if (KERN_SUCCESS != (kr = mach_port_insert_right(mach_task_self(), port, port, MACH_MSG_TYPE_MAKE_SEND)))
+    {   
+        LogMsg("RegisterMachService: %d %X %s", kr, kr, mach_error_string(kr));
+        mach_port_deallocate(mach_task_self(), port);
+        return MACH_PORT_NULL;
+    }   
+
+    return port;
+}
+
+extern int sandbox_init(const char *profile, uint64_t flags, char **errorbuf) __attribute__((weak_import));
+
+mDNSexport int main(int argc, char **argv)
+{
+    int i;
+    kern_return_t status;
+
+    mDNSMacOSXSystemBuildNumber(NULL);
+    LogMsg("%s starting %s %d", mDNSResponderVersionString, OSXVers ? "OSXVers" : "iOSVers", OSXVers ? OSXVers : iOSVers);
+
+#if 0
+    LogMsg("CacheRecord %d", sizeof(CacheRecord));
+    LogMsg("CacheGroup  %d", sizeof(CacheGroup));
+    LogMsg("ResourceRecord  %d", sizeof(ResourceRecord));
+    LogMsg("RData_small     %d", sizeof(RData_small));
+
+    LogMsg("sizeof(CacheEntity) %d", sizeof(CacheEntity));
+    LogMsg("RR_CACHE_SIZE       %d", RR_CACHE_SIZE);
+    LogMsg("block usage         %d", sizeof(CacheEntity) * RR_CACHE_SIZE);
+    LogMsg("block wastage       %d", 16*1024 - sizeof(CacheEntity) * RR_CACHE_SIZE);
+#endif
+
+    if (0 == geteuid())
+    {
+        LogMsg("mDNSResponder cannot be run as root !! Exiting..");
+        return -1;
+    }
+
+    for (i=1; i<argc; i++)
+    {
+        if (!strcasecmp(argv[i], "-d"                        )) mDNS_DebugMode            = mDNStrue;
+        if (!strcasecmp(argv[i], "-NoMulticastAdvertisements")) advertise                 = mDNS_Init_DontAdvertiseLocalAddresses;
+        if (!strcasecmp(argv[i], "-DisableSleepProxyClient"  )) DisableSleepProxyClient   = mDNStrue;
+        if (!strcasecmp(argv[i], "-DebugLogging"             )) mDNS_LoggingEnabled       = mDNStrue;
+        if (!strcasecmp(argv[i], "-UnicastPacketLogging"     )) mDNS_PacketLoggingEnabled = mDNStrue;
+        if (!strcasecmp(argv[i], "-OfferSleepProxyService"   ))
+            OfferSleepProxyService = (i+1 < argc && mDNSIsDigit(argv[i+1][0]) && mDNSIsDigit(argv[i+1][1]) && argv[i+1][2]==0) ? atoi(argv[++i]) : 100;
+        if (!strcasecmp(argv[i], "-UseInternalSleepProxy"    ))
+            UseInternalSleepProxy = (i+1<argc && mDNSIsDigit(argv[i+1][0]) && argv[i+1][1]==0) ? atoi(argv[++i]) : 1;
+        if (!strcasecmp(argv[i], "-StrictUnicastOrdering"    )) StrictUnicastOrdering     = mDNStrue;
+        if (!strcasecmp(argv[i], "-AlwaysAppendSearchDomains")) AlwaysAppendSearchDomains = mDNStrue;
+    }
+
+    // Note that mDNSPlatformInit will set DivertMulticastAdvertisements in the mDNS structure
+    if (!advertise) LogMsg("Administratively prohibiting multicast advertisements");
+
+#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    signal(SIGHUP,  HandleSIG);     // (Debugging) Purge the cache to check for cache handling bugs
+    signal(SIGINT,  HandleSIG);     // Ctrl-C: Detach from Mach BootstrapService and exit cleanly
+    signal(SIGPIPE,   SIG_IGN);     // Don't want SIGPIPE signals -- we'll handle EPIPE errors directly
+    signal(SIGTERM, HandleSIG);     // Machine shutting down: Detach from and exit cleanly like Ctrl-C
+    signal(SIGINFO, HandleSIG);     // (Debugging) Write state snapshot to syslog
+    signal(SIGUSR1, HandleSIG);     // (Debugging) Enable Logging
+    signal(SIGUSR2, HandleSIG);     // (Debugging) Enable Packet Logging
+    signal(SIGURG,  HandleSIG);     // (Debugging) Toggle Opportunistic Caching
+    signal(SIGPROF, HandleSIG);     // (Debugging) Toggle Multicast Logging
+    signal(SIGTSTP, HandleSIG);     // (Debugging) Disable all Debug Logging (USR1/USR2/PROF)
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    mDNSStorage.p = &PlatformStorage;   // Make sure mDNSStorage.p is set up, because validatelists uses it
+    // Need to Start XPC Server Before LaunchdCheckin() (Reason: rdar11023750)
+    xpc_server_init();
+    LaunchdCheckin();
+
+#ifndef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    // Create the kqueue, mutex and thread to support KQSockets
+    KQueueFD = kqueue();
+    if (KQueueFD == -1) { LogMsg("kqueue() failed errno %d (%s)", errno, strerror(errno)); status = errno; goto exit; }
+
+    i = pthread_mutex_init(&PlatformStorage.BigMutex, NULL);
+    if (i == -1) { LogMsg("pthread_mutex_init() failed errno %d (%s)", errno, strerror(errno)); status = errno; goto exit; }
+
+    int fdpair[2] = {0, 0};
+    i = socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair);
+    if (i == -1) { LogMsg("socketpair() failed errno %d (%s)", errno, strerror(errno)); status = errno; goto exit; }
+
+    // Socket pair returned us two identical sockets connected to each other
+    // We will use the first socket to send the second socket. The second socket
+    // will be added to the kqueue so it will wake when data is sent.
+    static const KQueueEntry wakeKQEntry = { KQWokenFlushBytes, NULL, "kqueue wakeup after CFRunLoop event" };
+
+    PlatformStorage.WakeKQueueLoopFD = fdpair[0];
+    KQueueSet(fdpair[1], EV_ADD, EVFILT_READ, &wakeKQEntry);
+
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    // Invoke sandbox profile /usr/share/sandbox/mDNSResponder.sb
+#if MDNS_NO_SANDBOX
+    LogMsg("Note: Compiled without Apple Sandbox support");
+#else // MDNS_NO_SANDBOX
+    if (!sandbox_init)
+        LogMsg("Note: Running without Apple Sandbox support (not available on this OS)");
+    else
+    {
+        char *sandbox_msg;
+        uint64_t sandbox_flags = SANDBOX_NAMED;
+
+        int sandbox_err = sandbox_init("mDNSResponder", sandbox_flags, &sandbox_msg);
+        if (sandbox_err)
+        {
+            LogMsg("WARNING: sandbox_init error %s", sandbox_msg);
+            // If we have errors in the sandbox during development, to prevent
+            // exiting, uncomment the following line.
+            //sandbox_free_error(sandbox_msg);
+
+            errx(EX_OSERR, "sandbox_init() failed: %s", sandbox_msg);
+        }
+        else LogInfo("Now running under Apple Sandbox restrictions");
+    }
+#endif // MDNS_NO_SANDBOX
+
+    // We use BeginTransactionAtShutdown in the plist that ensures that we will
+    // receive a SIGTERM during shutdown rather than a SIGKILL. But launchd (due to some
+    // limitation) currently requires us to still start and end the transaction for
+    // its proper initialization.
+    vproc_transaction_t vt = vproc_transaction_begin(NULL);
+    if (vt) vproc_transaction_end(NULL, vt);
+
+    m_port = RegisterMachService(kmDNSResponderServName);
+    // We should ALWAYS receive our Mach port from RegisterMachService() but sanity check before initializing daemon 
+    if (m_port == MACH_PORT_NULL)
+    {
+        LogMsg("! MACH PORT IS NULL ! bootstrap_checkin failed to give a mach port");
+        return -1;
+    }    
+
+    status = mDNSDaemonInitialize();
+    if (status) { LogMsg("Daemon start: mDNSDaemonInitialize failed"); goto exit; }
+
+    status = udsserver_init(launchd_fds, launchd_fds_count);
+    if (status) { LogMsg("Daemon start: udsserver_init failed"); goto exit; }
+
+    log_client = asl_open(NULL, "mDNSResponder", 0);
+    log_msg = asl_new(ASL_TYPE_MSG);
+	
+#if TARGET_OS_EMBEDDED
+    _scprefs_observer_watch(scprefs_observer_type_global, kmDNSResponderPrefIDStr, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),  
+                                                ^{   
+                                                    Prefschanged();
+                                                 });
+#endif
+
+    mDNSMacOSXNetworkChanged(&mDNSStorage);
+    UpdateDebugState();
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    LogInfo("Daemon Start: Using LibDispatch");
+    // CFRunLoopRun runs both CFRunLoop sources and dispatch sources
+    CFRunLoopRun();
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+      // Start the kqueue thread
+    pthread_t KQueueThread;
+    i = pthread_create(&KQueueThread, NULL, KQueueLoop, &mDNSStorage);
+    if (i == -1) { LogMsg("pthread_create() failed errno %d (%s)", errno, strerror(errno)); status = errno; goto exit; }
+    if (status == 0)
+    {
+        CFRunLoopRun();
+        LogMsg("ERROR: CFRunLoopRun Exiting.");
+        mDNS_Close(&mDNSStorage);
+    }
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    LogMsg("%s exiting", mDNSResponderVersionString);
+
+exit:
+    return(status);
+}
+
+// uds_daemon.c support routines /////////////////////////////////////////////
+
+// Arrange things so that when data appears on fd, callback is called with context
+mDNSexport mStatus udsSupportAddFDToEventLoop(int fd, udsEventCallback callback, void *context, void **platform_data)
+{
+    KQSocketEventSource **p = &gEventSources;
+    (void) platform_data;
+    while (*p && (*p)->fd != fd) p = &(*p)->next;
+    if (*p) { LogMsg("udsSupportAddFDToEventLoop: ERROR fd %d already has EventLoop source entry", fd); return mStatus_AlreadyRegistered; }
+
+    KQSocketEventSource *newSource = (KQSocketEventSource*) mallocL("KQSocketEventSource", sizeof *newSource);
+    if (!newSource) return mStatus_NoMemoryErr;
+
+    newSource->next           = mDNSNULL;
+    newSource->fd             = fd;
+    newSource->kqs.KQcallback = callback;
+    newSource->kqs.KQcontext  = context;
+    newSource->kqs.KQtask     = "UDS client";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    newSource->kqs.readSource  = mDNSNULL;
+    newSource->kqs.writeSource = mDNSNULL;
+    newSource->kqs.fdClosed    = mDNSfalse;
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+    if (KQueueSet(fd, EV_ADD, EVFILT_READ, &newSource->kqs) == 0)
+    {
+        *p = newSource;
+        return mStatus_NoError;
+    }
+
+    LogMsg("KQueueSet failed for fd %d errno %d (%s)", fd, errno, strerror(errno));
+    freeL("KQSocketEventSource", newSource);
+    return mStatus_BadParamErr;
+}
+
+int udsSupportReadFD(dnssd_sock_t fd, char *buf, int len, int flags, void *platform_data)
+{
+    (void) platform_data;
+    return recv(fd, buf, len, flags);
+}
+
+mDNSexport mStatus udsSupportRemoveFDFromEventLoop(int fd, void *platform_data)     // Note: This also CLOSES the file descriptor
+{
+    KQSocketEventSource **p = &gEventSources;
+    (void) platform_data;
+    while (*p && (*p)->fd != fd) p = &(*p)->next;
+    if (*p)
+    {
+        KQSocketEventSource *s = *p;
+        *p = (*p)->next;
+        // We don't have to explicitly do a kqueue EV_DELETE here because closing the fd
+        // causes the kernel to automatically remove any associated kevents
+        mDNSPlatformCloseFD(&s->kqs, s->fd);
+        freeL("KQSocketEventSource", s);
+        return mStatus_NoError;
+    }
+    LogMsg("udsSupportRemoveFDFromEventLoop: ERROR fd %d not found in EventLoop source list", fd);
+    return mStatus_NoSuchNameErr;
+}
+
+#if _BUILDING_XCODE_PROJECT_
+// If mDNSResponder crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = mDNSResponderVersionString;
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
+
+// For convenience when using the "strings" command, this is the last thing in the file
+// The "@(#) " pattern is a special prefix the "what" command looks for
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
diff --git a/mDNSResponder/mDNSMacOSX/dnsctl-entitlements.plist b/mDNSResponder/mDNSMacOSX/dnsctl-entitlements.plist
new file mode 100644
index 00000000..fb9c3a30
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/dnsctl-entitlements.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.mDNSResponder.dnsproxy</key>
+    <true/>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/helper-entitlements.plist b/mDNSResponder/mDNSMacOSX/helper-entitlements.plist
new file mode 100644
index 00000000..cf478cd9
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper-entitlements.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.SystemConfiguration.SCDynamicStore-write-access</key>
+	<true/>
+	<key>com.apple.SystemConfiguration.SCPreferences-write-access</key>
+	<array>
+		<string>com.apple.AutoWake.xml</string>
+	</array>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/helper-error.h b/mDNSResponder/mDNSMacOSX/helper-error.h
new file mode 100644
index 00000000..2e463b0a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper-error.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ERROR(kmDNSHelperCommunicationFailed,             "Mach communication failed")
+ERROR(kmDNSHelperNotAuthorized,                   "Not authorized")
+ERROR(kmDNSHelperCreationFailed,                  "Object creation failed")
+ERROR(kmDNSHelperInvalidPList,                    "Invalid property list")
+ERROR(kmDNSHelperInvalidNameKey,                  "Invalid name key")
+ERROR(kmDNSHelperInvalidConfigKey,                "Invalid configuration key")
+ERROR(kmDNSHelperTypeError,                       "Object was not of expected type")
+ERROR(kmDNSHelperPreferencesFailed,               "Could not create preferences session")
+ERROR(kmDNSHelperPreferencesLockFailed,           "Could not lock preferences")
+ERROR(kmDNSHelperPreferencesSetFailed,            "Could not update preferences")
+ERROR(kmDNSHelperKeychainCopyDefaultFailed,       "Could not copy keychain default")
+ERROR(kmDNSHelperKeychainSearchCreationFailed,    "Could not create keychain search")
+ERROR(kmDNSHelperPListWriteFailed,                "Could not write property list to stream")
+ERROR(kmDNSHelperResultTooLarge,                  "Result too large")
+ERROR(kmDNSHelperInterfaceCreationFailed,         "Could not create auto-tunnel interface")
+ERROR(kmDNSHelperInterfaceDeletionFailed,         "Could not delete auto-tunnel interface")
+ERROR(kmDNSHelperInvalidInterfaceState,           "Invalid interface state requested")
+ERROR(kmDNSHelperInvalidServerState,              "Invalid server state requested")
+ERROR(kmDNSHelperRacoonConfigCreationFailed,      "Could not create racoon configuration file")
+ERROR(kmDNSHelperRacoonStartFailed,               "Could not start racoon")
+ERROR(kmDNSHelperRacoonNotificationFailed,        "Could not notify racoon")
+ERROR(kmDNSHelperInvalidTunnelSetKeysOperation,   "Invalid tunnel setkey operation requested")
+ERROR(kmDNSHelperInvalidNetworkAddress,           "Invalid network address")
+ERROR(kmDNSHelperRouteAdditionFailed,             "Could not add route")
+ERROR(kmDNSHelperRouteDeletionFailed,             "Could not remove route")
+ERROR(kmDNSHelperRoutingSocketCreationFailed,     "Could not create routing socket")
+ERROR(kmDNSHelperDatagramSocketCreationFailed,    "Could not create datagram socket")
+ERROR(kmDNSHelperIPsecPolicyCreationFailed,       "Could not create IPsec policy")
+ERROR(kmDNSHelperIPsecPolicySetFailed,            "Could not set IPsec policy")
+ERROR(kmDNSHelperIPsecRemoveSAFailed,             "Could not remove IPsec SA")
+ERROR(kmDNSHelperIPsecPolicySocketCreationFailed, "Could not create IPsec policy socket")
+ERROR(kmDNSHelperIPsecDisabled,                   "IPSec support was not compiled in to the helper")
diff --git a/mDNSResponder/mDNSMacOSX/helper-main.c b/mDNSResponder/mDNSMacOSX/helper-main.c
new file mode 100644
index 00000000..52779e85
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper-main.c
@@ -0,0 +1,298 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _FORTIFY_SOURCE 2
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <sys/cdefs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <servers/bootstrap.h>
+#include <asl.h>
+#include <launch.h>
+#include <pwd.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+#include <Security/Security.h>
+#include "helper.h"
+#include "helper-server.h"
+#include "helpermsg.h"
+#include "helpermsgServer.h"
+#include <vproc.h>
+
+#if TARGET_OS_EMBEDDED
+#define NO_SECURITYFRAMEWORK 1
+#endif
+
+#ifndef LAUNCH_JOBKEY_MACHSERVICES
+#define LAUNCH_JOBKEY_MACHSERVICES "MachServices"
+#define LAUNCH_DATA_MACHPORT 10
+#define launch_data_get_machport launch_data_get_fd
+#endif
+
+union max_msg_size
+{
+    union __RequestUnion__proxy_helper_subsystem req;
+    union __ReplyUnion__proxy_helper_subsystem rep;
+};
+
+static const mach_msg_size_t MAX_MSG_SIZE = sizeof(union max_msg_size) + MAX_TRAILER_SIZE;
+static aslclient logclient = NULL;
+static int opt_debug;
+static pthread_t idletimer_thread;
+
+unsigned long maxidle = 15;
+unsigned long actualidle = 3600;
+
+CFRunLoopRef gRunLoop = NULL;
+CFRunLoopTimerRef gTimer = NULL;
+
+mach_port_t gPort = MACH_PORT_NULL;
+
+static void helplogv(int level, const char *fmt, va_list ap)
+{
+    if (NULL == logclient) { vfprintf(stderr, fmt, ap); fflush(stderr); }
+    else asl_vlog(logclient, NULL, level, fmt, ap);
+}
+
+void helplog(int level, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    helplogv(level, fmt, ap);
+    va_end(ap);
+}
+
+// for safe_vproc
+void LogMsgWithLevel(mDNSLogLevel_t logLevel, const char *fmt, ...)
+{
+    (void)logLevel;
+    va_list ap;
+    va_start(ap, fmt);
+    // safe_vproc only calls LogMsg, so assume logLevel maps to ASL_LEVEL_ERR
+    helplog(ASL_LEVEL_ERR, fmt, ap);
+    va_end(ap);
+}
+
+static void handle_sigterm(int sig)
+{
+    // debug("entry sig=%d", sig);	Can't use syslog from within a signal handler
+    assert(sig == SIGTERM);
+    (void)proxy_mDNSExit(gPort);
+}
+
+static void initialize_logging(void)
+{
+    logclient = asl_open(NULL, kmDNSHelperServiceName, (opt_debug ? ASL_OPT_STDERR : 0));
+    if (NULL == logclient) { fprintf(stderr, "Could not initialize ASL logging.\n"); fflush(stderr); return; }
+    if (opt_debug) asl_set_filter(logclient, ASL_FILTER_MASK_UPTO(ASL_LEVEL_DEBUG));
+}
+
+static void initialize_id(void)
+{
+    static char login[] = "_mdnsresponder";
+    struct passwd hardcode;
+    struct passwd *pwd = &hardcode; // getpwnam(login);
+    hardcode.pw_uid = 65;
+    hardcode.pw_gid = 65;
+
+    if (!pwd) { helplog(ASL_LEVEL_ERR, "Could not find account name `%s'.  I will only help root.", login); return; }
+    mDNSResponderUID = pwd->pw_uid;
+    mDNSResponderGID = pwd->pw_gid;
+}
+
+static void diediedie(CFRunLoopTimerRef timer, void *context)
+{
+    debug("entry %p %p %d", timer, context, maxidle);
+    assert(gTimer == timer);
+    if (maxidle)
+        (void)proxy_mDNSExit(gPort);
+}
+
+void pause_idle_timer(void)
+{
+    debug("entry");
+    assert(gTimer);
+    assert(gRunLoop);
+    CFRunLoopRemoveTimer(gRunLoop, gTimer, kCFRunLoopDefaultMode);
+}
+
+void unpause_idle_timer(void)
+{
+    debug("entry");
+    assert(gRunLoop);
+    assert(gTimer);
+    CFRunLoopAddTimer(gRunLoop, gTimer, kCFRunLoopDefaultMode);
+}
+
+void update_idle_timer(void)
+{
+    debug("entry");
+    assert(gTimer);
+    CFRunLoopTimerSetNextFireDate(gTimer, CFAbsoluteTimeGetCurrent() + actualidle);
+}
+
+static void *idletimer(void *context)
+{
+    debug("entry context=%p", context);
+    gRunLoop = CFRunLoopGetCurrent();
+
+    unpause_idle_timer();
+
+    for (;;)
+    {
+        debug("Running CFRunLoop");
+        CFRunLoopRun();
+        sleep(1);
+    }
+
+    return NULL;
+}
+
+static int initialize_timer()
+{
+    gTimer = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + actualidle, actualidle, 0, 0, diediedie, NULL);
+    int err = 0;
+
+    debug("entry");
+    if (0 != (err = pthread_create(&idletimer_thread, NULL, idletimer, NULL)))
+        helplog(ASL_LEVEL_ERR, "Could not start idletimer thread: %s", strerror(err));
+
+    return err;
+}
+
+static mach_port_t register_service(const char *service_name)
+{
+    mach_port_t port = MACH_PORT_NULL;
+    kern_return_t kr;
+
+    if (KERN_SUCCESS != (kr = bootstrap_check_in(bootstrap_port, (char *)service_name, &port)))
+    {
+        helplog(ASL_LEVEL_ERR, "bootstrap_check_in: %d %X %s", kr, kr, mach_error_string(kr));
+        return MACH_PORT_NULL;
+    }
+    
+    if (KERN_SUCCESS != (kr = mach_port_insert_right(mach_task_self(), port, port, MACH_MSG_TYPE_MAKE_SEND)))
+    {
+        helplog(ASL_LEVEL_ERR, "mach_port_insert_right: %d %X %s", kr, kr, mach_error_string(kr));
+        mach_port_deallocate(mach_task_self(), port);
+        return MACH_PORT_NULL;
+    }
+
+    return port;
+}
+
+int main(int ac, char *av[])
+{
+    char *p = NULL;
+    kern_return_t kr = KERN_FAILURE;
+    long n;
+    int ch;
+    mach_msg_header_t hdr;
+
+    while ((ch = getopt(ac, av, "dt:")) != -1)
+        switch (ch)
+        {
+        case 'd': opt_debug = 1; break;
+        case 't':
+            n = strtol(optarg, &p, 0);
+            if ('\0' == optarg[0] || '\0' != *p || n > LONG_MAX || n < 0)
+            { fprintf(stderr, "Invalid idle timeout: %s\n", optarg); exit(EXIT_FAILURE); }
+            maxidle = n;
+            break;
+        case '?':
+        default:
+            fprintf(stderr, "Usage: mDNSResponderHelper [-d] [-t maxidle]\n");
+            exit(EXIT_FAILURE);
+        }
+    ac -= optind;
+    av += optind;
+
+    initialize_logging();
+    helplog(ASL_LEVEL_INFO, "Starting");
+    initialize_id();
+
+#ifndef NO_SECURITYFRAMEWORK
+    // We should normally be running as a system daemon.  However, that might not be the case in some scenarios (e.g. debugging).
+    // Explicitly ensure that our Keychain operations utilize the system domain.
+    if (opt_debug) SecKeychainSetPreferenceDomain(kSecPreferencesDomainSystem);
+#endif
+    gPort = register_service(kmDNSHelperServiceName);
+    if (!gPort)
+        exit(EXIT_FAILURE);
+
+    if (maxidle) actualidle = maxidle;
+
+    signal(SIGTERM, handle_sigterm);
+
+    // We use BeginTransactionAtShutdown in the plist that ensures that we will
+    // receive a SIGTERM during shutdown rather than a SIGKILL. But launchd (due to some
+    // limitation) currently requires us to still start and end the transaction for
+    // its proper initialization.
+    vproc_transaction_t vt = vproc_transaction_begin(NULL);
+    if (vt) vproc_transaction_end(NULL, vt);
+
+    if (initialize_timer()) exit(EXIT_FAILURE);
+    for (n=0; n<100000; n++) if (!gRunLoop) usleep(100);
+    if (!gRunLoop)
+    {
+        helplog(ASL_LEVEL_ERR, "gRunLoop not set after waiting");
+        exit(EXIT_FAILURE);
+    }
+
+    for(;;)
+    {
+        hdr.msgh_bits = 0;
+        hdr.msgh_local_port = gPort;
+        hdr.msgh_remote_port = MACH_PORT_NULL;
+        hdr.msgh_size = sizeof(hdr);
+        hdr.msgh_id = 0;
+        kr = mach_msg(&hdr, MACH_RCV_LARGE | MACH_RCV_MSG, 0, hdr.msgh_size, gPort, 0, 0);
+        if (MACH_RCV_TOO_LARGE != kr)
+            helplog(ASL_LEVEL_ERR, "main MACH_RCV_MSG error: %d %X %s", kr, kr, mach_error_string(kr));
+
+        kr = mach_msg_server_once(helper_server, MAX_MSG_SIZE, gPort,
+                                  MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AUDIT) | MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0));
+        if (KERN_SUCCESS != kr)
+        { helplog(ASL_LEVEL_ERR, "mach_msg_server: %d %X %s", kr, kr, mach_error_string(kr)); exit(EXIT_FAILURE); }
+
+    }
+    exit(EXIT_SUCCESS);
+}
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// For convenience when using the "strings" command, this is the last thing in the file
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS[] = "@(#) mDNSResponderHelper " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = VersionString_SCCS + 5;
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
diff --git a/mDNSResponder/mDNSMacOSX/helper-server.h b/mDNSResponder/mDNSMacOSX/helper-server.h
new file mode 100644
index 00000000..1c391a01
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper-server.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef H_HELPER_SERVER_H
+#define H_HELPER_SERVER_H
+
+extern void helplog(int, const char *, ...);
+extern void pause_idle_timer(void);
+extern void unpause_idle_timer(void);
+extern void update_idle_timer(void);
+extern uid_t mDNSResponderUID;
+extern uid_t mDNSResponderGID;
+extern CFRunLoopRef gRunLoop;
+#define debug(...) debug_(__func__, __VA_ARGS__)
+extern void debug_(const char *func, const char *fmt, ...);
+
+#endif /* H_HELPER_SERVER_H */
diff --git a/mDNSResponder/mDNSMacOSX/helper-stubs.c b/mDNSResponder/mDNSMacOSX/helper-stubs.c
new file mode 100644
index 00000000..29fd9aed
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper-stubs.c
@@ -0,0 +1,496 @@
+/*
+ * Copyright (c) 2007-2012 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <mach/vm_map.h>
+#include <servers/bootstrap.h>
+#include <IOKit/IOReturn.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include "mDNSDebug.h"
+#include "helper.h"
+#include "helpermsg.h"
+#include <dispatch/dispatch.h>
+#include <arpa/inet.h>
+
+//
+// Implementation Notes about the HelperQueue:
+//
+// To prevent blocking the main queue, all communications with mDNSResponderHelper should happen on
+// HelperQueue. There are a few calls which are still synchronous and needs to be handled separately
+// case by case.
+//
+// When spawning off the work to the HelperQueue, any arguments that are pointers need to be copied
+// explicitly as they may cease to exist after the call returns. From within the block that is scheduled,
+// arrays defined on the stack can't be referenced and hence it is enclosed them in a struct. If the array is
+// an argument to the function, the blocks can reference them as they are passed in as pointers. But care should
+// be taken to copy them locally as they may cease to exist when the function returns.
+//
+static dispatch_queue_t HelperQueue;
+
+#define ERROR(x, y) y,
+static const char *errorstring[] =
+{
+    #include "helper-error.h"
+    NULL
+};
+#undef ERROR
+
+mDNSexport mStatus mDNSHelperInit()
+{
+    HelperQueue = dispatch_queue_create("com.apple.mDNSResponder.HelperQueue", NULL);
+    if (HelperQueue == NULL)
+    {
+        LogMsg("dispatch_queue_create: Helper queue NULL");
+        return mStatus_NoMemoryErr;
+    }
+    return mStatus_NoError;
+}
+
+static mach_port_t getHelperPort(int retry)
+{
+    static mach_port_t port = MACH_PORT_NULL;
+    if (retry) port = MACH_PORT_NULL;
+    if (port == MACH_PORT_NULL && BOOTSTRAP_SUCCESS != bootstrap_look_up(bootstrap_port, kmDNSHelperServiceName, &port))
+        LogMsg("%s: cannot contact helper", __func__);
+    return port;
+}
+
+const char *mDNSHelperError(int err)
+{
+    static const char *p = "<unknown error>";
+    if (mDNSHelperErrorBase < err && mDNSHelperErrorEnd > err)
+        p = errorstring[err - mDNSHelperErrorBase - 1];
+    return p;
+}
+
+/* Ugly but handy. */
+// We don't bother reporting kIOReturnNotReady because that error code occurs in "normal" operation
+// and doesn't indicate anything unexpected that needs to be investigated
+
+#define MACHRETRYLOOP_BEGIN(kr, retry, err, fin)                                            \
+    for (;;)                                                                                \
+    {
+#define MACHRETRYLOOP_END(kr, retry, err, fin)                                              \
+    if (KERN_SUCCESS == (kr)) break;                                                                                             \
+    else if (MACH_SEND_INVALID_DEST == (kr) && 0 == (retry)++) continue;                                                                                             \
+    else                                                                                \
+    {                                                                               \
+        (err) = kmDNSHelperCommunicationFailed;                                         \
+        LogMsg("%s: Mach communication failed: %d %X %s", __func__, kr, kr, mach_error_string(kr)); \
+        goto fin;                                                                       \
+    }                                                                               \
+    }                                                                                   \
+    if (0 != (err) && kIOReturnNotReady != (err))                                           \
+    { LogMsg("%s: %d 0x%X (%s)", __func__, (err), (err), mDNSHelperError(err)); goto fin; }
+
+void mDNSPreferencesSetName(int key, domainlabel *old, domainlabel *new)
+{
+    struct {
+        char oldname[MAX_DOMAIN_LABEL+1];
+        char newname[MAX_DOMAIN_LABEL+1];
+    } names;
+
+    mDNSPlatformMemZero(names.oldname, MAX_DOMAIN_LABEL + 1);
+    mDNSPlatformMemZero(names.newname, MAX_DOMAIN_LABEL + 1);
+
+    ConvertDomainLabelToCString_unescaped(old, names.oldname);
+    if (new) ConvertDomainLabelToCString_unescaped(new, names.newname);
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_FAILURE;
+        int retry = 0;
+        int err = 0;
+
+        LogInfo("%s: oldname %s newname %s", __func__, names.oldname, names.newname);
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSPreferencesSetName(getHelperPort(retry), key, names.oldname, names.newname);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+
+fin:
+        (void)err;
+    });
+}
+
+void mDNSRequestBPF(void)
+{
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_FAILURE;
+        int retry = 0, err = 0;
+        LogInfo("%s: BPF", __func__);
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSRequestBPF(getHelperPort(retry));
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        (void)err;
+    });
+}
+
+int mDNSPowerRequest(int key, int interval)
+{
+    kern_return_t kr = KERN_FAILURE;
+    int retry = 0, err = 0;
+    MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+    kr = proxy_mDNSPowerRequest(getHelperPort(retry), key, interval, &err);
+    MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+    return err;
+}
+
+int mDNSSetLocalAddressCacheEntry(int ifindex, int family, const v6addr_t ip, const ethaddr_t eth)
+{
+    kern_return_t kr = KERN_FAILURE;
+    int retry = 0, err = 0;
+    MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+    kr = proxy_mDNSSetLocalAddressCacheEntry(getHelperPort(retry), ifindex, family, (uint8_t*)ip, (uint8_t*)eth, &err);
+    MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+    return err;
+}
+
+void mDNSNotify(const char *title, const char *msg) // Both strings are UTF-8 text
+{
+    char *titleCopy = NULL;
+    char *msgCopy = NULL;
+
+    if (title)
+    {
+        int len = strlen(title);
+        titleCopy = mDNSPlatformMemAllocate(len + 1);
+        if (!titleCopy)
+        {
+            LogMsg("mDNSNotify: titleCopy NULL for %s", msg);
+            return;
+        }
+        mDNSPlatformMemCopy(titleCopy, title, len);
+        titleCopy[len] = 0;
+    }
+    if (msg)
+    {
+        int len = strlen(msg);
+        msgCopy = mDNSPlatformMemAllocate(len + 1);
+        if (!msgCopy)
+        {
+            LogMsg("mDNSNotify: msgCopy NULL for %s", msg);
+            return;
+        }
+        mDNSPlatformMemCopy(msgCopy, msg, len);
+        msgCopy[len] = 0;
+    }
+        
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_FAILURE;
+        int retry = 0, err = 0;
+
+        LogInfo("%s: title %s, msg %s", __func__, titleCopy, msgCopy);
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSNotify(getHelperPort(retry), titleCopy, msgCopy);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        if (titleCopy)
+            mDNSPlatformMemFree(titleCopy);
+        if (msgCopy)
+            mDNSPlatformMemFree(msgCopy);
+        (void)err;
+    });
+}
+
+int mDNSKeychainGetSecrets(CFArrayRef *result)
+{
+    CFPropertyListRef plist = NULL;
+    CFDataRef bytes = NULL;
+    kern_return_t kr = KERN_FAILURE;
+    unsigned int numsecrets = 0;
+    vm_offset_t secrets = 0;
+    mach_msg_type_number_t secretsCnt = 0;
+    int retry = 0, err = 0;
+
+    MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+    kr = proxy_mDNSKeychainGetSecrets(getHelperPort(retry), &numsecrets, &secrets, &secretsCnt, &err);
+    MACHRETRYLOOP_END(kr, retry, err, fin);
+
+    if (NULL == (bytes = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, (void*)secrets, secretsCnt, kCFAllocatorNull)))
+    {
+        err = kmDNSHelperCreationFailed;
+        LogMsg("%s: CFDataCreateWithBytesNoCopy failed", __func__);
+        goto fin;
+    }
+    if (NULL == (plist = CFPropertyListCreateFromXMLData(kCFAllocatorDefault, bytes, kCFPropertyListImmutable, NULL)))
+    {
+        err = kmDNSHelperInvalidPList;
+        LogMsg("%s: CFPropertyListCreateFromXMLData failed", __func__);
+        goto fin;
+    }
+    if (CFArrayGetTypeID() != CFGetTypeID(plist))
+    {
+        err = kmDNSHelperTypeError;
+        LogMsg("%s: Unexpected result type", __func__);
+        CFRelease(plist);
+        plist = NULL;
+        goto fin;
+    }
+    *result = (CFArrayRef)plist;
+
+fin:
+    if (bytes) CFRelease(bytes);
+    if (secrets) vm_deallocate(mach_task_self(), secrets, secretsCnt);
+    return err;
+}
+
+void mDNSConfigureServer(int updown, const char *const prefix, const domainname *const fqdn)
+{
+    struct
+    {
+        // Assume the prefix is no larger than 10 chars
+        char fqdnStr[MAX_ESCAPED_DOMAIN_NAME + 10];
+    } name;
+
+    mDNSPlatformMemZero(name.fqdnStr, MAX_DOMAIN_LABEL + 10);
+
+    if (fqdn)
+    {
+        mDNSPlatformStrCopy(name.fqdnStr, prefix);
+        ConvertDomainNameToCString(fqdn, name.fqdnStr + mDNSPlatformStrLen(prefix));
+    }
+
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_SUCCESS;
+        int retry = 0, err = 0;
+
+        LogInfo("%s: fqdnStr %s", __func__, name.fqdnStr);
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSConfigureServer(getHelperPort(retry), updown, name.fqdnStr);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        (void)err;
+
+    });
+}
+
+int mDNSAutoTunnelSetKeys(int replacedelete, v6addr_t local_inner,
+                          v6addr_t local_outer, short local_port, v6addr_t remote_inner,
+                          v6addr_t remote_outer, short remote_port, const char* const prefix, const domainname *const fqdn)
+{
+    kern_return_t kr = KERN_SUCCESS;
+    int retry = 0, err = 0;
+    char fqdnStr[MAX_ESCAPED_DOMAIN_NAME + 10] = { 0 }; // Assume the prefix is no larger than 10 chars
+    if (fqdn)
+    {
+        mDNSPlatformStrCopy(fqdnStr, prefix);
+        ConvertDomainNameToCString(fqdn, fqdnStr + mDNSPlatformStrLen(prefix));
+    }
+    MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+    kr = proxy_mDNSAutoTunnelSetKeys(getHelperPort(retry), replacedelete, local_inner, local_outer, local_port, remote_inner, remote_outer, remote_port, fqdnStr, &err);
+    MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+    return err;
+}
+
+void mDNSSendWakeupPacket(unsigned ifid, char *eth_addr, char *ip_addr, int iteration)
+{
+    char *ip_addr_copy = NULL;
+    char *eth_addr_copy = NULL;
+
+    if (eth_addr)
+    {
+        int len = strlen(eth_addr);
+        eth_addr_copy = mDNSPlatformMemAllocate(len + 1);
+        if (!eth_addr_copy)
+        {
+            LogMsg("mDNSSendWakeupPacket: eth_addr_copy NULL for %s", eth_addr);
+            return;
+        }
+        mDNSPlatformMemCopy(eth_addr_copy, eth_addr, len);
+        eth_addr_copy[len] = 0;
+    }
+    if (ip_addr)
+    {
+        int len = strlen(ip_addr);
+        ip_addr_copy = mDNSPlatformMemAllocate(len + 1);
+        if (!ip_addr_copy)
+        {
+            LogMsg("mDNSSendWakeupPacket: ip_addr_copy NULL for %s", ip_addr);
+            return;
+        }
+        mDNSPlatformMemCopy(ip_addr_copy, ip_addr, len);
+        ip_addr_copy[len] = 0;
+    }
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_SUCCESS;
+        int retry = 0, err = 0;
+
+        LogInfo("%s: Entered ethernet address %s, ip address %s", __func__, eth_addr_copy, ip_addr_copy);
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSSendWakeupPacket(getHelperPort(retry), ifid, eth_addr_copy, ip_addr_copy, iteration);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        if (eth_addr_copy)
+            mDNSPlatformMemFree(eth_addr_copy);
+        if (ip_addr_copy)
+            mDNSPlatformMemFree(ip_addr_copy);
+        (void) err;
+    });
+}
+
+void mDNSPacketFilterControl(uint32_t command, char * ifname, uint32_t count, pfArray_t portArray, pfArray_t protocolArray)
+{
+    struct
+    {
+        pfArray_t portArray;
+        pfArray_t protocolArray;
+    } pfa;
+    char *ifnameCopy = NULL;
+    
+    mDNSPlatformMemCopy(pfa.portArray, portArray, sizeof(pfArray_t));
+    mDNSPlatformMemCopy(pfa.protocolArray, protocolArray, sizeof(pfArray_t));
+    if (ifname)
+    {
+        int len = strlen(ifname);
+        ifnameCopy = mDNSPlatformMemAllocate(len + 1);
+        if (!ifnameCopy)
+        {
+            LogMsg("mDNSPacketFilterControl: ifnameCopy NULL");
+            return;
+        }
+        mDNSPlatformMemCopy(ifnameCopy, ifname, len);
+        ifnameCopy[len] = 0;
+    }
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_SUCCESS;
+        int retry = 0, err = 0;
+
+        LogInfo("%s, ifname %s", __func__, ifnameCopy);
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSPacketFilterControl(getHelperPort(retry), command, ifnameCopy, count, (uint16_t *)pfa.portArray, (uint16_t *)pfa.protocolArray);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        if (ifnameCopy)
+            mDNSPlatformMemFree(ifnameCopy);
+        (void) err;
+    });
+}
+
+void mDNSSendKeepalive(v6addr_t sadd, v6addr_t dadd, uint16_t lport, uint16_t rport, unsigned seq, unsigned ack, uint16_t win)
+{
+    struct
+    {
+        v6addr_t sadd;
+        v6addr_t dadd;
+    } addr;
+
+    mDNSPlatformMemCopy(addr.sadd, sadd, sizeof(v6addr_t));
+    mDNSPlatformMemCopy(addr.dadd, dadd, sizeof(v6addr_t));
+
+    dispatch_async(HelperQueue, ^{
+
+        kern_return_t kr = KERN_FAILURE;
+        int retry = 0, err = 0;
+        char buf1[INET6_ADDRSTRLEN];
+        char buf2[INET6_ADDRSTRLEN];
+
+        buf1[0] = 0;
+        buf2[0] = 0;
+
+        inet_ntop(AF_INET6, addr.sadd, buf1, sizeof(buf1));
+        inet_ntop(AF_INET6, addr.dadd, buf2, sizeof(buf2));
+        LogInfo("%s: sadd is %s, dadd is %s", __func__, buf1, buf2);
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSSendKeepalive(getHelperPort(retry), (uint8_t *)addr.sadd, (uint8_t *)addr.dadd, lport, rport, seq, ack, win);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        (void) err;
+    });
+}
+
+int mDNSRetrieveTCPInfo(int family, v6addr_t laddr, uint16_t lport, v6addr_t raddr, uint16_t rport, uint32_t *seq, uint32_t *ack, uint16_t *win, int32_t *intfid)
+{
+    kern_return_t kr = KERN_FAILURE;
+    int retry = 0, err = 0;
+    MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+    kr = proxy_mDNSRetrieveTCPInfo(getHelperPort(retry), family, (uint8_t *)laddr, lport, (uint8_t *)raddr, rport, seq, ack, win, intfid);
+    MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+    return err;
+}
+
+void mDNSGetRemoteMAC(mDNS *const m, int family, v6addr_t raddr)
+{
+    struct {
+        v6addr_t addr;
+    } dst;
+
+    mDNSPlatformMemCopy(dst.addr, raddr, sizeof(v6addr_t));
+    dispatch_async(HelperQueue, ^{
+        kern_return_t        kr    = KERN_FAILURE;
+        int                  retry = 0, err = 0;
+        ethaddr_t            eth;
+        IPAddressMACMapping *addrMapping;
+
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSGetRemoteMAC(getHelperPort(retry), family, (uint8_t *)dst.addr, eth);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+        // If the call to get the remote MAC address succeeds, allocate and copy
+        // the values and schedule a task to update the MAC address in the TCP Keepalive record.
+        if (kr == KERN_SUCCESS)
+        {
+            addrMapping = (IPAddressMACMapping *)malloc(sizeof(IPAddressMACMapping));
+            snprintf(addrMapping->ethaddr, sizeof(addrMapping->ethaddr), "%02x:%02x:%02x:%02x:%02x:%02x",
+                     eth[0], eth[1], eth[2], eth[3], eth[4], eth[5]);
+            if (family == AF_INET)
+            {
+                addrMapping->ipaddr.type = mDNSAddrType_IPv4;
+                mDNSPlatformMemCopy(addrMapping->ipaddr.ip.v4.b,  dst.addr, sizeof(v6addr_t));
+            }
+            else
+            {
+                addrMapping->ipaddr.type = mDNSAddrType_IPv6;
+                mDNSPlatformMemCopy(addrMapping->ipaddr.ip.v6.b,  dst.addr, sizeof(v6addr_t));
+            }
+            mDNSPlatformDispatchAsync(m, addrMapping, UpdateRMACCallback);
+        }
+fin:
+            (void) err;
+    });
+
+}
+
+void mDNSStoreSPSMACAddress(int family, v6addr_t spsaddr, char *ifname)
+{
+    struct {
+        v6addr_t saddr;
+    } addr;
+    mDNSPlatformMemCopy(addr.saddr, spsaddr, sizeof(v6addr_t));
+
+    dispatch_async(HelperQueue, ^{
+        kern_return_t kr = KERN_FAILURE;
+        int retry = 0, err = 0;
+        MACHRETRYLOOP_BEGIN(kr, retry, err, fin);
+        kr = proxy_mDNSStoreSPSMACAddress(getHelperPort(retry), family, (uint8_t *)addr.saddr, ifname);
+        MACHRETRYLOOP_END(kr, retry, err, fin);
+fin:
+        (void)err;
+    });
+}
diff --git a/mDNSResponder/mDNSMacOSX/helper.c b/mDNSResponder/mDNSMacOSX/helper.c
new file mode 100644
index 00000000..0251e709
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper.c
@@ -0,0 +1,2867 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007-2012 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <sys/cdefs.h>
+#include <arpa/inet.h>
+#include <bsm/libbsm.h>
+#include <net/if.h>
+#include <net/route.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
+#include <netinet6/ipsec.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <asl.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <Security/Security.h>
+#include <SystemConfiguration/SystemConfiguration.h>
+#include <SystemConfiguration/SCPreferencesSetSpecific.h>
+#include <TargetConditionals.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#include <net/bpf.h>
+#include <sys/sysctl.h>
+
+#include "mDNSEmbeddedAPI.h"
+#include "dns_sd.h"
+#include "dnssd_ipc.h"
+#include "libpfkey.h"
+#include "helper.h"
+#include "helpermsgServer.h"
+#include "helper-server.h"
+#include "ipsec_options.h"
+#include "P2PPacketFilter.h"
+
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+
+#ifndef RTF_IFSCOPE
+#define RTF_IFSCOPE 0x1000000
+#endif
+
+#if TARGET_OS_EMBEDDED
+#ifndef MDNS_NO_IPSEC
+#define MDNS_NO_IPSEC 1
+#endif
+#define NO_CFUSERNOTIFICATION 1
+#define NO_SECURITYFRAMEWORK 1
+#endif
+
+// Embed the client stub code here, so we can access private functions like ConnectToServer, create_hdr, deliver_request
+#include "../mDNSShared/dnssd_ipc.c"
+#include "../mDNSShared/dnssd_clientstub.c"
+
+typedef struct sadb_x_policy *ipsec_policy_t;
+
+unsigned short InetChecksum(unsigned short *ptr,int nbytes);
+unsigned long in_cksum(unsigned short *ptr,int nbytes);
+void TCPCheckSum(int af, struct tcphdr *t, int tcplen, v6addr_t sadd6, v6addr_t dadd6);
+
+uid_t mDNSResponderUID;
+gid_t mDNSResponderGID;
+
+void
+debug_(const char *func, const char *fmt, ...)
+{
+    char buf[2048];
+    va_list ap;
+
+    va_start(ap, fmt);
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    helplog(ASL_LEVEL_DEBUG, "%s: %s", func, buf);
+}
+
+static int
+authorized(audit_token_t *token)
+{
+    int ok = 0;
+    pid_t pid = (pid_t)-1;
+    uid_t euid = (uid_t)-1;
+
+    audit_token_to_au32(*token, NULL, &euid, NULL, NULL, NULL, &pid, NULL,
+                        NULL);
+    ok = (euid == mDNSResponderUID || euid == 0);
+    if (!ok)
+        helplog(ASL_LEVEL_NOTICE,
+                "Unauthorized access by euid=%lu pid=%lu",
+                (unsigned long)euid, (unsigned long)pid);
+    return ok;
+}
+
+kern_return_t
+do_mDNSExit(__unused mach_port_t port, audit_token_t token)
+{
+    debug("entry");
+    if (!authorized(&token))
+        goto fin;
+    helplog(ASL_LEVEL_INFO, "exit");
+    exit(0);
+
+fin:
+    debug("fin");
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_mDNSRequestBPF(__unused mach_port_t port, audit_token_t token)
+{
+    if (!authorized(&token)) return KERN_SUCCESS;
+    DNSServiceRef ref;
+    DNSServiceErrorType err = ConnectToServer(&ref, 0, send_bpf, NULL, NULL, NULL);
+    if (err) { helplog(ASL_LEVEL_ERR, "do_mDNSRequestBPF: ConnectToServer %d", err); return err; }
+
+    char *ptr;
+    size_t len = sizeof(DNSServiceFlags);
+    ipc_msg_hdr *hdr = create_hdr(send_bpf, &len, &ptr, 0, ref);
+    if (!hdr) { DNSServiceRefDeallocate(ref); return kDNSServiceErr_NoMemory; }
+    put_flags(0, &ptr);
+    deliver_request(hdr, ref);      // Will free hdr for us
+    DNSServiceRefDeallocate(ref);
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_mDNSPowerRequest(__unused mach_port_t port, int key, int interval, int *err, audit_token_t token)
+{
+    *err = -1;
+    if (!authorized(&token)) { *err = kmDNSHelperNotAuthorized; goto fin; }
+
+    CFArrayRef events = IOPMCopyScheduledPowerEvents();
+    if (events)
+    {
+        int i;
+        CFIndex count = CFArrayGetCount(events);
+        for (i=0; i<count; i++)
+        {
+            CFDictionaryRef dict = CFArrayGetValueAtIndex(events, i);
+            CFStringRef id = CFDictionaryGetValue(dict, CFSTR(kIOPMPowerEventAppNameKey));
+            if (CFEqual(id, CFSTR("mDNSResponderHelper")))
+            {
+                CFDateRef EventTime = CFDictionaryGetValue(dict, CFSTR(kIOPMPowerEventTimeKey));
+                CFStringRef EventType = CFDictionaryGetValue(dict, CFSTR(kIOPMPowerEventTypeKey));
+                IOReturn result = IOPMCancelScheduledPowerEvent(EventTime, id, EventType);
+                //helplog(ASL_LEVEL_ERR, "Deleting old event %s");
+                if (result) helplog(ASL_LEVEL_ERR, "IOPMCancelScheduledPowerEvent %d failed %d", i, result);
+            }
+        }
+        CFRelease(events);
+    }
+
+    if (key < 0)            // mDNSPowerRequest(-1,-1) means "clear any stale schedules" (see above)
+        *err = 0;
+    else if (key == 0)      // mDNSPowerRequest(0, 0) means "sleep now"
+    {
+        IOReturn r = IOPMSleepSystem(IOPMFindPowerManagement(MACH_PORT_NULL));
+        if (r) { usleep(100000); helplog(ASL_LEVEL_ERR, "IOPMSleepSystem %d", r); }
+        *err = r;
+    }
+    else if (key > 0)
+    {
+        CFDateRef w = CFDateCreate(NULL, CFAbsoluteTimeGetCurrent() + interval);
+        if (w)
+        {
+            IOReturn r = IOPMSchedulePowerEvent(w, CFSTR("mDNSResponderHelper"), key ? CFSTR(kIOPMAutoWake) : CFSTR(kIOPMAutoSleep));
+            if (r) { usleep(100000); helplog(ASL_LEVEL_ERR, "IOPMSchedulePowerEvent(%d) %d %x", interval, r, r); }
+            *err = r;
+            CFRelease(w);
+        }
+    }
+fin:
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_mDNSSetLocalAddressCacheEntry(__unused mach_port_t port, int ifindex, int family, v6addr_t ip, ethaddr_t eth, int *err, audit_token_t token)
+{
+    #define IPv6FMTSTRING "%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X"
+    #define IPv6FMTARGS  ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7], ip[8], ip[9], ip[10], ip[11], ip[12], ip[13], ip[14], ip[15]
+    #if 0
+    if (family == 4)
+        helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry %d IPv%d %d.%d.%d.%d %02X:%02X:%02X:%02X:%02X:%02X",
+                ifindex, family, ip[0], ip[1], ip[2], ip[3], eth[0], eth[1], eth[2], eth[3], eth[4], eth[5]);
+    else
+        helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry %d IPv%d " IPv6FMTSTRING " %02X:%02X:%02X:%02X:%02X:%02X",
+                ifindex, family, IPv6FMTARGS, eth[0], eth[1], eth[2], eth[3], eth[4], eth[5]);
+    #endif
+
+    *err = -1;
+    if (!authorized(&token)) { *err = kmDNSHelperNotAuthorized; goto fin; }
+
+    static int s = -1, seq = 0;
+    if (s < 0)
+    {
+        s = socket(PF_ROUTE, SOCK_RAW, 0);
+        if (s < 0) helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry: socket(PF_ROUTE, SOCK_RAW, 0) failed %d (%s)", errno, strerror(errno));
+    }
+
+    if (s >= 0)
+    {
+        struct timeval tv;
+        gettimeofday(&tv, 0);
+        if (family == 4)
+        {
+            struct { struct rt_msghdr hdr; struct sockaddr_inarp dst; struct sockaddr_dl sdl; } rtmsg;
+            memset(&rtmsg, 0, sizeof(rtmsg));
+
+            rtmsg.hdr.rtm_msglen         = sizeof(rtmsg);
+            rtmsg.hdr.rtm_version        = RTM_VERSION;
+            rtmsg.hdr.rtm_type           = RTM_ADD;
+            rtmsg.hdr.rtm_index          = ifindex;
+            rtmsg.hdr.rtm_flags          = RTF_HOST | RTF_STATIC | RTF_IFSCOPE;
+            rtmsg.hdr.rtm_addrs          = RTA_DST | RTA_GATEWAY;
+            rtmsg.hdr.rtm_pid            = 0;
+            rtmsg.hdr.rtm_seq            = seq++;
+            rtmsg.hdr.rtm_errno          = 0;
+            rtmsg.hdr.rtm_use            = 0;
+            rtmsg.hdr.rtm_inits          = RTV_EXPIRE;
+            rtmsg.hdr.rtm_rmx.rmx_expire = tv.tv_sec + 30;
+
+            rtmsg.dst.sin_len            = sizeof(rtmsg.dst);
+            rtmsg.dst.sin_family         = AF_INET;
+            rtmsg.dst.sin_port           = 0;
+            rtmsg.dst.sin_addr.s_addr    = *(in_addr_t*)ip;
+            rtmsg.dst.sin_srcaddr.s_addr = 0;
+            rtmsg.dst.sin_tos            = 0;
+            rtmsg.dst.sin_other          = 0;
+
+            rtmsg.sdl.sdl_len            = sizeof(rtmsg.sdl);
+            rtmsg.sdl.sdl_family         = AF_LINK;
+            rtmsg.sdl.sdl_index          = ifindex;
+            rtmsg.sdl.sdl_type           = IFT_ETHER;
+            rtmsg.sdl.sdl_nlen           = 0;
+            rtmsg.sdl.sdl_alen           = ETHER_ADDR_LEN;
+            rtmsg.sdl.sdl_slen           = 0;
+
+            // Target MAC address goes in rtmsg.sdl.sdl_data[0..5]; (See LLADDR() in /usr/include/net/if_dl.h)
+            memcpy(rtmsg.sdl.sdl_data, eth, sizeof(ethaddr_t));
+
+            int len = write(s, (char *)&rtmsg, sizeof(rtmsg));
+            if (len < 0)
+                helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry: write(%d) interface %d address %d.%d.%d.%d seq %d result %d errno %d (%s)",
+                        sizeof(rtmsg), ifindex, ip[0], ip[1], ip[2], ip[3], rtmsg.hdr.rtm_seq, len, errno, strerror(errno));
+            len = read(s, (char *)&rtmsg, sizeof(rtmsg));
+            if (len < 0 || rtmsg.hdr.rtm_errno)
+                helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry: read (%d) interface %d address %d.%d.%d.%d seq %d result %d errno %d (%s) %d",
+                        sizeof(rtmsg), ifindex, ip[0], ip[1], ip[2], ip[3], rtmsg.hdr.rtm_seq, len, errno, strerror(errno), rtmsg.hdr.rtm_errno);
+
+            *err = 0;
+        }
+        else
+        {
+            struct { struct rt_msghdr hdr; struct sockaddr_in6 dst; struct sockaddr_dl sdl; } rtmsg;
+            memset(&rtmsg, 0, sizeof(rtmsg));
+
+            rtmsg.hdr.rtm_msglen         = sizeof(rtmsg);
+            rtmsg.hdr.rtm_version        = RTM_VERSION;
+            rtmsg.hdr.rtm_type           = RTM_ADD;
+            rtmsg.hdr.rtm_index          = ifindex;
+            rtmsg.hdr.rtm_flags          = RTF_HOST | RTF_STATIC | RTF_IFSCOPE;
+            rtmsg.hdr.rtm_addrs          = RTA_DST | RTA_GATEWAY;
+            rtmsg.hdr.rtm_pid            = 0;
+            rtmsg.hdr.rtm_seq            = seq++;
+            rtmsg.hdr.rtm_errno          = 0;
+            rtmsg.hdr.rtm_use            = 0;
+            rtmsg.hdr.rtm_inits          = RTV_EXPIRE;
+            rtmsg.hdr.rtm_rmx.rmx_expire = tv.tv_sec + 30;
+
+            rtmsg.dst.sin6_len           = sizeof(rtmsg.dst);
+            rtmsg.dst.sin6_family        = AF_INET6;
+            rtmsg.dst.sin6_port          = 0;
+            rtmsg.dst.sin6_flowinfo      = 0;
+            rtmsg.dst.sin6_addr          = *(struct in6_addr*)ip;
+            rtmsg.dst.sin6_scope_id      = ifindex;
+
+            rtmsg.sdl.sdl_len            = sizeof(rtmsg.sdl);
+            rtmsg.sdl.sdl_family         = AF_LINK;
+            rtmsg.sdl.sdl_index          = ifindex;
+            rtmsg.sdl.sdl_type           = IFT_ETHER;
+            rtmsg.sdl.sdl_nlen           = 0;
+            rtmsg.sdl.sdl_alen           = ETHER_ADDR_LEN;
+            rtmsg.sdl.sdl_slen           = 0;
+
+            // Target MAC address goes in rtmsg.sdl.sdl_data[0..5]; (See LLADDR() in /usr/include/net/if_dl.h)
+            memcpy(rtmsg.sdl.sdl_data, eth, sizeof(ethaddr_t));
+
+            int len = write(s, (char *)&rtmsg, sizeof(rtmsg));
+            if (len < 0)
+                helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry: write(%d) interface %d address " IPv6FMTSTRING " seq %d result %d errno %d (%s)",
+                        sizeof(rtmsg), ifindex, IPv6FMTARGS, rtmsg.hdr.rtm_seq, len, errno, strerror(errno));
+            len = read(s, (char *)&rtmsg, sizeof(rtmsg));
+            if (len < 0 || rtmsg.hdr.rtm_errno)
+                helplog(ASL_LEVEL_ERR, "do_mDNSSetLocalAddressCacheEntry: read (%d) interface %d address " IPv6FMTSTRING " seq %d result %d errno %d (%s) %d",
+                        sizeof(rtmsg), ifindex, IPv6FMTARGS, rtmsg.hdr.rtm_seq, len, errno, strerror(errno), rtmsg.hdr.rtm_errno);
+
+            *err = 0;
+        }
+
+    }
+
+fin:
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_mDNSNotify(__unused mach_port_t port, const char *title, const char *msg, audit_token_t token)
+{
+    if (!authorized(&token)) return KERN_SUCCESS;
+
+#ifndef NO_CFUSERNOTIFICATION
+    static const char footer[] = "(Note: This message only appears on machines with 17.x.x.x IP addresses — i.e. at Apple — not on customer machines.)";
+    CFStringRef alertHeader  = CFStringCreateWithCString(NULL, title,  kCFStringEncodingUTF8);
+    CFStringRef alertBody    = CFStringCreateWithCString(NULL, msg,    kCFStringEncodingUTF8);
+    CFStringRef alertFooter  = CFStringCreateWithCString(NULL, footer, kCFStringEncodingUTF8);
+    CFStringRef alertMessage = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@\r\r%@"), alertBody, alertFooter);
+    CFRelease(alertBody);
+    CFRelease(alertFooter);
+    int err = CFUserNotificationDisplayNotice(0.0, kCFUserNotificationStopAlertLevel, NULL, NULL, NULL, alertHeader, alertMessage, NULL);
+    if (err) helplog(ASL_LEVEL_ERR, "CFUserNotificationDisplayNotice returned %d", err);
+    CFRelease(alertHeader);
+    CFRelease(alertMessage);
+#else
+    (void)title;
+    (void)msg;
+#endif /* NO_CFUSERNOTIFICATION */
+
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+char usercompname[MAX_DOMAIN_LABEL+1] = {0}; // the last computer name the user saw
+char userhostname[MAX_DOMAIN_LABEL+1] = {0}; // the last local host name the user saw
+char lastcompname[MAX_DOMAIN_LABEL+1] = {0}; // the last computer name saved to preferences
+char lasthostname[MAX_DOMAIN_LABEL+1] = {0}; // the last local host name saved to preferences
+
+#ifndef NO_CFUSERNOTIFICATION
+static CFStringRef CFS_OQ = NULL;
+static CFStringRef CFS_CQ = NULL;
+static CFStringRef CFS_Format = NULL;
+static CFStringRef CFS_ComputerName = NULL;
+static CFStringRef CFS_ComputerNameMsg = NULL;
+static CFStringRef CFS_LocalHostName = NULL;
+static CFStringRef CFS_LocalHostNameMsg = NULL;
+static CFStringRef CFS_Problem = NULL;
+
+static CFUserNotificationRef gNotification    = NULL;
+static CFRunLoopSourceRef gNotificationRLS = NULL;
+
+static void NotificationCallBackDismissed(CFUserNotificationRef userNotification, CFOptionFlags responseFlags)
+{
+    debug("entry");
+    (void)responseFlags;    // Unused
+    if (userNotification != gNotification) helplog(ASL_LEVEL_ERR, "NotificationCallBackDismissed: Wrong CFUserNotificationRef");
+    if (gNotificationRLS)
+    {
+        // Caution: don't use CFRunLoopGetCurrent() here, because the currently executing thread may not be our "CFRunLoopRun" thread.
+        // We need to explicitly specify the desired CFRunLoop from which we want to remove this event source.
+        CFRunLoopRemoveSource(gRunLoop, gNotificationRLS, kCFRunLoopDefaultMode);
+        CFRelease(gNotificationRLS);
+        gNotificationRLS = NULL;
+        CFRelease(gNotification);
+        gNotification = NULL;
+    }
+    // By dismissing the alert, the user has conceptually acknowleged the rename.
+    // (e.g. the machine's name is now officially "computer-2.local", not "computer.local".)
+    // If we get *another* conflict, the new alert should refer to the 'old' name
+    // as now being "computer-2.local", not "computer.local"
+    usercompname[0] = 0;
+    userhostname[0] = 0;
+    lastcompname[0] = 0;
+    lasthostname[0] = 0;
+    update_idle_timer();
+    unpause_idle_timer();
+}
+
+static void ShowNameConflictNotification(CFMutableArrayRef header, CFStringRef subtext)
+{
+    CFMutableDictionaryRef dictionary = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    if (!dictionary) return;
+
+    debug("entry");
+
+    CFDictionarySetValue(dictionary, kCFUserNotificationAlertHeaderKey, header);
+    CFDictionarySetValue(dictionary, kCFUserNotificationAlertMessageKey, subtext);
+
+    CFURLRef urlRef = CFURLCreateWithFileSystemPath(NULL, CFSTR("/System/Library/CoreServices/mDNSResponder.bundle"), kCFURLPOSIXPathStyle, true);
+    if (urlRef) { CFDictionarySetValue(dictionary, kCFUserNotificationLocalizationURLKey, urlRef); CFRelease(urlRef); }
+
+    if (gNotification)  // If notification already on-screen, update it in place
+        CFUserNotificationUpdate(gNotification, 0, kCFUserNotificationCautionAlertLevel, dictionary);
+    else                // else, we need to create it
+    {
+        SInt32 error;
+        gNotification = CFUserNotificationCreate(NULL, 0, kCFUserNotificationCautionAlertLevel, &error, dictionary);
+        if (!gNotification || error) { helplog(ASL_LEVEL_ERR, "ShowNameConflictNotification: CFUserNotificationRef: Error %d", error); return; }
+        gNotificationRLS = CFUserNotificationCreateRunLoopSource(NULL, gNotification, NotificationCallBackDismissed, 0);
+        if (!gNotificationRLS) { helplog(ASL_LEVEL_ERR,"ShowNameConflictNotification: RLS"); CFRelease(gNotification); gNotification = NULL; return; }
+        // Caution: don't use CFRunLoopGetCurrent() here, because the currently executing thread may not be our "CFRunLoopRun" thread.
+        // We need to explicitly specify the desired CFRunLoop to which we want to add this event source.
+        CFRunLoopAddSource(gRunLoop, gNotificationRLS, kCFRunLoopDefaultMode);
+        debug("gRunLoop=%p gNotification=%p gNotificationRLS=%p", gRunLoop, gNotification, gNotificationRLS);
+        pause_idle_timer();
+    }
+
+    CFRelease(dictionary);
+}
+
+static CFMutableArrayRef GetHeader(const char* oldname, const char* newname, const CFStringRef msg, const char* suffix)
+{
+    CFMutableArrayRef alertHeader = NULL;
+
+    const CFStringRef cfoldname = CFStringCreateWithCString(NULL, oldname,  kCFStringEncodingUTF8);
+    // NULL newname means we've given up trying to construct a name that doesn't conflict
+    const CFStringRef cfnewname = newname ? CFStringCreateWithCString(NULL, newname,  kCFStringEncodingUTF8) : NULL;
+    // We tag a zero-width non-breaking space at the end of the literal text to guarantee that, no matter what
+    // arbitrary computer name the user may choose, this exact text (with zero-width non-breaking space added)
+    // can never be one that occurs in the Localizable.strings translation file.
+    if (!cfoldname)
+        helplog(ASL_LEVEL_ERR,"Could not construct CFStrings for old=%s", newname);
+    else if (newname && !cfnewname)
+        helplog(ASL_LEVEL_ERR,"Could not construct CFStrings for new=%s", newname);
+    else
+    {
+        const CFStringRef s1 = CFStringCreateWithFormat(NULL, NULL, CFS_Format, cfoldname, suffix);
+        const CFStringRef s2 = cfnewname ? CFStringCreateWithFormat(NULL, NULL, CFS_Format, cfnewname, suffix) : NULL;
+
+        alertHeader = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+
+        if (!s1)
+            helplog(ASL_LEVEL_ERR, "Could not construct secondary CFString for old=%s", oldname);
+        else if (cfnewname && !s2)
+            helplog(ASL_LEVEL_ERR, "Could not construct secondary CFString for new=%s", newname);
+        else if (!alertHeader)
+            helplog(ASL_LEVEL_ERR, "Could not construct CFArray for notification");
+        else
+        {
+            // Make sure someone is logged in.  We don't want this popping up over the login window
+            uid_t uid;
+            gid_t gid;
+            CFStringRef userName = SCDynamicStoreCopyConsoleUser(NULL, &uid, &gid);
+            if (userName)
+            {
+                CFRelease(userName);
+                CFArrayAppendValue(alertHeader, msg); // Opening phrase of message, provided by caller
+                CFArrayAppendValue(alertHeader, CFS_OQ); CFArrayAppendValue(alertHeader, s1); CFArrayAppendValue(alertHeader, CFS_CQ);
+                CFArrayAppendValue(alertHeader, CFSTR(" is already in use on this network. "));
+                if (s2)
+                {
+                    CFArrayAppendValue(alertHeader, CFSTR("The name has been changed to "));
+                    CFArrayAppendValue(alertHeader, CFS_OQ); CFArrayAppendValue(alertHeader, s2); CFArrayAppendValue(alertHeader, CFS_CQ);
+                    CFArrayAppendValue(alertHeader, CFSTR("."));
+                }
+                else
+                    CFArrayAppendValue(alertHeader, CFSTR("All attempts to find an available name by adding a number to the name were also unsuccessful."));
+            }
+        }
+        if (s1) CFRelease(s1);
+        if (s2) CFRelease(s2);
+    }
+    if (cfoldname) CFRelease(cfoldname);
+    if (cfnewname) CFRelease(cfnewname);
+
+    return alertHeader;
+}
+#endif /* ndef NO_CFUSERNOTIFICATION */
+
+static void update_notification(void)
+{
+#ifndef NO_CFUSERNOTIFICATION
+    debug("entry ucn=%s, uhn=%s, lcn=%s, lhn=%s", usercompname, userhostname, lastcompname, lasthostname);
+    if (!CFS_OQ)
+    {
+        // Note: the "\xEF\xBB\xBF" byte sequence in the CFS_Format string is the UTF-8 encoding of the zero-width non-breaking space character.
+        // By appending this invisible character on the end of literal names, we ensure the these strings cannot inadvertently match any string
+        // in the localization file -- since we know for sure that none of our strings in the localization file contain the ZWNBS character.
+        //
+        // For languages that are written right to left, when we mix English (host names could be in english with brackets etc. and the
+        // rest in Arabic) we need unicode markups for proper formatting. The Unicode sequence 202C (UTF8 E2 80 AC), 200E (UTF8 E2 80 8E) and
+        // 202B (UTF8 E2 80 AB) helps with the formatting. See <rdar://problem/8629082> for more details.
+        CFS_OQ               = CFStringCreateWithCString(NULL, "“\xE2\x80\xAB",  kCFStringEncodingUTF8);
+        CFS_CQ               = CFStringCreateWithCString(NULL, "\xE2\x80\xAC”",  kCFStringEncodingUTF8);
+        CFS_Format           = CFStringCreateWithCString(NULL, "%@%s\xEF\xBB\xBF\xE2\x80\x8E", kCFStringEncodingUTF8);
+        CFS_ComputerName     = CFStringCreateWithCString(NULL, "The name of your computer ",  kCFStringEncodingUTF8);
+        CFS_ComputerNameMsg  = CFStringCreateWithCString(NULL, "To change the name of your computer, "
+                                                         "open System Preferences and click Sharing, then type the name in the Computer Name field.",  kCFStringEncodingUTF8);
+        CFS_LocalHostName    = CFStringCreateWithCString(NULL, "This computer’s local hostname ",  kCFStringEncodingUTF8);
+        CFS_LocalHostNameMsg = CFStringCreateWithCString(NULL, "To change the local hostname, "
+                                                         "open System Preferences and click Sharing, then click “Edit” and type the name in the Local Hostname field.",  kCFStringEncodingUTF8);
+        CFS_Problem          = CFStringCreateWithCString(NULL, "This may indicate a problem with the local network. "
+                                                         "Please inform your network administrator.",  kCFStringEncodingUTF8);
+    }
+
+    if (!usercompname[0] && !userhostname[0])
+    {
+        if (gNotificationRLS)
+        {
+            debug("canceling notification %p", gNotification);
+            CFUserNotificationCancel(gNotification);
+            unpause_idle_timer();
+        }
+    }
+    else
+    {
+        CFMutableArrayRef header = NULL;
+        CFStringRef* subtext = NULL;
+        if (userhostname[0] && !lasthostname[0]) // we've given up trying to construct a name that doesn't conflict
+        {
+            header = GetHeader(userhostname, NULL, CFS_LocalHostName, ".local");
+            subtext = &CFS_Problem;
+        }
+        else if (usercompname[0])
+        {
+            header = GetHeader(usercompname, lastcompname, CFS_ComputerName, "");
+            subtext = &CFS_ComputerNameMsg;
+        }
+        else
+        {
+            header = GetHeader(userhostname, lasthostname, CFS_LocalHostName, ".local");
+            subtext = &CFS_LocalHostNameMsg;
+        }
+        ShowNameConflictNotification(header, *subtext);
+        CFRelease(header);
+    }
+#endif
+}
+
+kern_return_t
+do_mDNSPreferencesSetName(__unused mach_port_t port, int key, const char* old, const char* new, audit_token_t token)
+{
+    SCPreferencesRef session = NULL;
+    Boolean ok = FALSE;
+    Boolean locked = FALSE;
+    CFStringRef cfstr = NULL;
+    char* user = NULL;
+    char* last = NULL;
+    Boolean needUpdate = FALSE;
+
+    debug("entry %s old=%s new=%s", key==kmDNSComputerName ? "ComputerName" : (key==kmDNSLocalHostName ? "LocalHostName" : "UNKNOWN"), old, new);
+    if (!authorized(&token)) goto fin;
+
+    switch ((enum mDNSPreferencesSetNameKey)key)
+    {
+    case kmDNSComputerName:
+        user = usercompname;
+        last = lastcompname;
+        break;
+    case kmDNSLocalHostName:
+        user = userhostname;
+        last = lasthostname;
+        break;
+    default:
+        debug("unrecognized key: %d", key);
+        goto fin;
+    }
+
+    if (!last)
+    {
+        helplog(ASL_LEVEL_ERR, "%s: no last ptr", __func__);
+        goto fin;
+    }
+
+    if (!user)
+    {
+        helplog(ASL_LEVEL_ERR, "%s: no user ptr", __func__);
+        goto fin;
+    }
+
+    if (0 == strncmp(old, new, MAX_DOMAIN_LABEL+1))
+    {
+        // old and new are same means the config changed i.e, the user has set something in the preferences pane.
+        // This means the conflict has been resolved. We need to dismiss the dialogue.
+        if (last[0] && 0 != strncmp(last, new, MAX_DOMAIN_LABEL+1))
+        {
+            last[0] = 0;
+            user[0] = 0;
+            needUpdate = TRUE;
+        }
+        goto fin;
+    }
+    else
+    {
+        // old and new are not same, this means there is a conflict. For the first conflict, we show
+        // the old value and the new value. For all subsequent conflicts, while the dialogue is still
+        // up, we do a real time update of the "new" value in the dialogue. That's why we update just
+        // "last" here and not "user".
+        if (strncmp(last, new, MAX_DOMAIN_LABEL+1))
+        {
+            strncpy(last, new, MAX_DOMAIN_LABEL);
+            needUpdate = TRUE;
+        }
+    }
+
+    // If we are not showing the dialogue, we need to remember the first "old" value so that
+    // we maintain the same through the lifetime of the dialogue. Subsequence conflicts don't
+    // update the "old" value.
+    if (!user[0])
+    {
+        strncpy(user, old, MAX_DOMAIN_LABEL);
+        needUpdate = TRUE;
+    }
+
+    if (!new[0]) // we've given up trying to construct a name that doesn't conflict
+        goto fin;
+
+    cfstr = CFStringCreateWithCString(NULL, new, kCFStringEncodingUTF8);
+
+    session = SCPreferencesCreate(NULL, CFSTR(kmDNSHelperServiceName), NULL);
+
+    if (cfstr == NULL || session == NULL)
+    {
+        debug("SCPreferencesCreate failed");
+        goto fin;
+    }
+    if (!SCPreferencesLock(session, 0))
+    {
+        debug("lock failed");
+        goto fin;
+    }
+    locked = TRUE;
+
+    switch ((enum mDNSPreferencesSetNameKey)key)
+    {
+    case kmDNSComputerName:
+    {
+        // We want to write the new Computer Name to System Preferences, without disturbing the user-selected
+        // system-wide default character set used for things like AppleTalk NBP and NETBIOS service advertising.
+        // Note that this encoding is not used for the computer name, but since both are set by the same call,
+        // we need to take care to set the name without changing the character set.
+        CFStringEncoding encoding = kCFStringEncodingUTF8;
+        CFStringRef unused = SCDynamicStoreCopyComputerName(NULL, &encoding);
+        if (unused) { CFRelease(unused); unused = NULL; }
+        else encoding = kCFStringEncodingUTF8;
+
+        ok = SCPreferencesSetComputerName(session, cfstr, encoding);
+    }
+    break;
+    case kmDNSLocalHostName:
+        ok = SCPreferencesSetLocalHostName(session, cfstr);
+        break;
+    default:
+        break;
+    }
+
+    if (!ok || !SCPreferencesCommitChanges(session) ||
+        !SCPreferencesApplyChanges(session))
+    {
+        debug("SCPreferences update failed");
+        goto fin;
+    }
+    debug("succeeded");
+
+fin:
+    if (NULL != cfstr)
+        CFRelease(cfstr);
+    if (NULL != session)
+    {
+        if (locked)
+            SCPreferencesUnlock(session);
+        CFRelease(session);
+    }
+    update_idle_timer();
+    if (needUpdate) update_notification();
+    return KERN_SUCCESS;
+}
+
+enum DNSKeyFormat
+{
+    formatNotDNSKey, formatDdnsTypeItem, formatDnsPrefixedServiceItem, formatBtmmPrefixedServiceItem
+};
+
+// On Mac OS X on Intel, the four-character string seems to be stored backwards, at least sometimes.
+// I suspect some overenthusiastic inexperienced engineer said, "On Intel everything's backwards,
+// therefore I need to add some byte swapping in this API to make this four-character string backwards too."
+// To cope with this we allow *both* "ddns" and "sndd" as valid item types.
+
+
+#ifndef NO_SECURITYFRAMEWORK
+static const char btmmprefix[] = "btmmdns:";
+static const char dnsprefix[] = "dns:";
+static const char ddns[] = "ddns";
+static const char ddnsrev[] = "sndd";
+
+static enum DNSKeyFormat
+getDNSKeyFormat(SecKeychainItemRef item, SecKeychainAttributeList **attributesp)
+{
+    static UInt32 tags[4] =
+    {
+        kSecTypeItemAttr, kSecServiceItemAttr, kSecAccountItemAttr, kSecLabelItemAttr
+    };
+    static SecKeychainAttributeInfo attributeInfo =
+    {
+        sizeof(tags)/sizeof(tags[0]), tags, NULL
+    };
+    SecKeychainAttributeList *attributes = NULL;
+    enum DNSKeyFormat format;
+    Boolean malformed = FALSE;
+    OSStatus status = noErr;
+    int i = 0;
+
+    *attributesp = NULL;
+    if (noErr != (status = SecKeychainItemCopyAttributesAndData(item,
+                                                                &attributeInfo, NULL, &attributes, NULL, NULL)))
+    {
+        debug("SecKeychainItemCopyAttributesAndData %d - skipping",
+              status);
+        goto skip;
+    }
+    if (attributeInfo.count != attributes->count)
+        malformed = TRUE;
+    for (i = 0; !malformed && i < (int)attributeInfo.count; ++i)
+        if (attributeInfo.tag[i] != attributes->attr[i].tag)
+            malformed = TRUE;
+    if (malformed)
+    {
+        debug(
+            "malformed result from SecKeychainItemCopyAttributesAndData - skipping");
+        goto skip;
+    }
+
+    debug("entry (\"%.*s\", \"%.*s\", \"%.*s\")",
+          (int)attributes->attr[0].length, attributes->attr[0].data,
+          (int)attributes->attr[1].length, attributes->attr[1].data,
+          (int)attributes->attr[2].length, attributes->attr[2].data);
+    if (attributes->attr[1].length >= MAX_ESCAPED_DOMAIN_NAME +
+        sizeof(dnsprefix)-1)
+    {
+        debug("kSecServiceItemAttr too long (%u) - skipping",
+              (unsigned int)attributes->attr[1].length);
+        goto skip;
+    }
+    if (attributes->attr[2].length >= MAX_ESCAPED_DOMAIN_NAME)
+    {
+        debug("kSecAccountItemAttr too long (%u) - skipping",
+              (unsigned int)attributes->attr[2].length);
+        goto skip;
+    }
+    if (attributes->attr[1].length >= sizeof(dnsprefix)-1 &&
+        0 == strncasecmp(attributes->attr[1].data, dnsprefix,
+                         sizeof(dnsprefix)-1))
+        format = formatDnsPrefixedServiceItem;
+    else if (attributes->attr[1].length >= sizeof(btmmprefix)-1 &&
+             0 == strncasecmp(attributes->attr[1].data, btmmprefix, sizeof(btmmprefix)-1))
+        format = formatBtmmPrefixedServiceItem;
+    else if (attributes->attr[0].length == sizeof(ddns)-1 &&
+             0 == strncasecmp(attributes->attr[0].data, ddns, sizeof(ddns)-1))
+        format = formatDdnsTypeItem;
+    else if (attributes->attr[0].length == sizeof(ddnsrev)-1 &&
+             0 == strncasecmp(attributes->attr[0].data, ddnsrev, sizeof(ddnsrev)-1))
+        format = formatDdnsTypeItem;
+    else
+    {
+        debug("uninterested in this entry");
+        goto skip;
+    }
+    *attributesp = attributes;
+    debug("accepting this entry");
+    return format;
+
+skip:
+    SecKeychainItemFreeAttributesAndData(attributes, NULL);
+    return formatNotDNSKey;
+}
+
+// Insert the attributes as defined by mDNSKeyChainAttributes
+static CFPropertyListRef
+getKeychainItemInfo(SecKeychainItemRef item,
+                    SecKeychainAttributeList *attributes, enum DNSKeyFormat format)
+{
+    CFMutableArrayRef entry = NULL;
+    CFDataRef data = NULL;
+    OSStatus status = noErr;
+    UInt32 keylen = 0;
+    void *keyp = 0;
+
+    if (NULL == (entry = CFArrayCreateMutable(NULL, 0,
+                                              &kCFTypeArrayCallBacks)))
+    {
+        debug("CFArrayCreateMutable failed");
+        goto error;
+    }
+
+    // Insert the Account attribute (kmDNSKcWhere)
+    switch ((enum DNSKeyFormat)format)
+    {
+    case formatDdnsTypeItem:
+        data = CFDataCreate(kCFAllocatorDefault,
+                            attributes->attr[1].data, attributes->attr[1].length);
+        break;
+    case formatDnsPrefixedServiceItem:
+    case formatBtmmPrefixedServiceItem:
+        data = CFDataCreate(kCFAllocatorDefault,
+                            attributes->attr[1].data, attributes->attr[1].length);
+        break;
+    default:
+        assert("unknown DNSKeyFormat value");
+        break;
+    }
+    if (NULL == data)
+    {
+        debug("CFDataCreate for attr[1] failed");
+        goto error;
+    }
+    CFArrayAppendValue(entry, data);
+    CFRelease(data);
+
+    // Insert the Where attribute (kmDNSKcAccount)
+    if (NULL == (data = CFDataCreate(kCFAllocatorDefault,
+                                     attributes->attr[2].data, attributes->attr[2].length)))
+    {
+        debug("CFDataCreate for attr[2] failed");
+        goto error;
+    }
+    CFArrayAppendValue(entry, data);
+    CFRelease(data);
+
+    // Insert the Key attribute (kmDNSKcKey)
+    if (noErr != (status = SecKeychainItemCopyAttributesAndData(item, NULL,
+                                                                NULL, NULL, &keylen, &keyp)))
+    {
+        debug("could not retrieve key for \"%.*s\": %d",
+              (int)attributes->attr[1].length, attributes->attr[1].data,
+              status);
+        goto error;
+    }
+    data = CFDataCreate(kCFAllocatorDefault, keyp, keylen);
+    SecKeychainItemFreeAttributesAndData(NULL, keyp);
+    if (NULL == data)
+    {
+        debug("CFDataCreate for keyp failed");
+        goto error;
+    }
+    CFArrayAppendValue(entry, data);
+    CFRelease(data);
+
+    // Insert the Name attribute (kmDNSKcName)
+    if (NULL == (data = CFDataCreate(kCFAllocatorDefault,
+                                     attributes->attr[3].data, attributes->attr[3].length)))
+    {
+        debug("CFDataCreate for attr[3] failed");
+        goto error;
+    }
+    CFArrayAppendValue(entry, data);
+    CFRelease(data);
+    return entry;
+
+error:
+    if (NULL != entry)
+        CFRelease(entry);
+    return NULL;
+}
+#endif
+
+kern_return_t
+do_mDNSKeychainGetSecrets(__unused mach_port_t port, __unused unsigned int *numsecrets,
+                          __unused vm_offset_t *secrets, __unused mach_msg_type_number_t *secretsCnt, __unused int *err,
+                          __unused audit_token_t token)
+{
+#ifndef NO_SECURITYFRAMEWORK
+    CFWriteStreamRef stream = NULL;
+    CFDataRef result = NULL;
+    CFPropertyListRef entry = NULL;
+    CFMutableArrayRef keys = NULL;
+    SecKeychainRef skc = NULL;
+    SecKeychainItemRef item = NULL;
+    SecKeychainSearchRef search = NULL;
+    SecKeychainAttributeList *attributes = NULL;
+    enum DNSKeyFormat format;
+    OSStatus status = 0;
+
+    debug("entry");
+    *err = 0;
+    *numsecrets = 0;
+    *secrets = (vm_offset_t)NULL;
+    if (!authorized(&token))
+    {
+        *err = kmDNSHelperNotAuthorized;
+        goto fin;
+    }
+    if (NULL == (keys = CFArrayCreateMutable(NULL, 0,
+                                             &kCFTypeArrayCallBacks)))
+    {
+        debug("CFArrayCreateMutable failed");
+        *err = kmDNSHelperCreationFailed;
+        goto fin;
+    }
+    if (noErr != (status = SecKeychainCopyDefault(&skc)))
+    {
+        *err = kmDNSHelperKeychainCopyDefaultFailed;
+        goto fin;
+    }
+    if (noErr != (status = SecKeychainSearchCreateFromAttributes(skc, kSecGenericPasswordItemClass, NULL, &search)))
+    {
+        *err = kmDNSHelperKeychainSearchCreationFailed;
+        goto fin;
+    }
+    for (status = SecKeychainSearchCopyNext(search, &item);
+         noErr == status;
+         status = SecKeychainSearchCopyNext(search, &item))
+    {
+        if (formatNotDNSKey != (format = getDNSKeyFormat(item,
+                                                         &attributes)) &&
+            NULL != (entry = getKeychainItemInfo(item, attributes,
+                                                 format)))
+        {
+            CFArrayAppendValue(keys, entry);
+            CFRelease(entry);
+        }
+        SecKeychainItemFreeAttributesAndData(attributes, NULL);
+        CFRelease(item);
+    }
+    if (errSecItemNotFound != status)
+        helplog(ASL_LEVEL_ERR, "%s: SecKeychainSearchCopyNext failed: %d",
+                __func__, status);
+    if (NULL == (stream =
+                     CFWriteStreamCreateWithAllocatedBuffers(kCFAllocatorDefault,
+                                                             kCFAllocatorDefault)))
+    {
+        *err = kmDNSHelperCreationFailed;
+        debug("CFWriteStreamCreateWithAllocatedBuffers failed");
+        goto fin;
+    }
+    CFWriteStreamOpen(stream);
+    if (0 == CFPropertyListWriteToStream(keys, stream,
+                                         kCFPropertyListBinaryFormat_v1_0, NULL))
+    {
+        *err = kmDNSHelperPListWriteFailed;
+        debug("CFPropertyListWriteToStream failed");
+        goto fin;
+    }
+    result = CFWriteStreamCopyProperty(stream,
+                                       kCFStreamPropertyDataWritten);
+    if (KERN_SUCCESS != vm_allocate(mach_task_self(), secrets,
+                                    CFDataGetLength(result), VM_FLAGS_ANYWHERE))
+    {
+        *err = kmDNSHelperCreationFailed;
+        debug("vm_allocate failed");
+        goto fin;
+    }
+    CFDataGetBytes(result, CFRangeMake(0, CFDataGetLength(result)),
+                   (void *)*secrets);
+    *secretsCnt = CFDataGetLength(result);
+    *numsecrets = CFArrayGetCount(keys);
+    debug("succeeded");
+
+fin:
+    debug("returning %u secrets", *numsecrets);
+    if (NULL != stream)
+    {
+        CFWriteStreamClose(stream);
+        CFRelease(stream);
+    }
+    if (NULL != result)
+        CFRelease(result);
+    if (NULL != keys)
+        CFRelease(keys);
+    if (NULL != search)
+        CFRelease(search);
+    if (NULL != skc)
+        CFRelease(skc);
+    update_idle_timer();
+    return KERN_SUCCESS;
+#else
+    return KERN_FAILURE;
+#endif
+}
+
+#ifndef MDNS_NO_IPSEC
+typedef enum _mDNSTunnelPolicyWhich
+{
+    kmDNSTunnelPolicySetup,
+    kmDNSTunnelPolicyTeardown,
+    kmDNSTunnelPolicyGenerate
+} mDNSTunnelPolicyWhich;
+
+// For kmDNSTunnelPolicySetup, you can setup IPv6-in-IPv6 tunnel or IPv6-in-IPv4 tunnel
+// kmDNSNoTunnel is used for other Policy types
+typedef enum _mDNSTunnelType
+{
+    kmDNSNoTunnel,
+    kmDNSIPv6IPv4Tunnel,
+    kmDNSIPv6IPv6Tunnel
+} mDNSTunnelType;
+
+static const uint8_t kWholeV6Mask = 128;
+
+#endif /* ifndef MDNS_NO_IPSEC */
+
+#ifndef MDNS_NO_IPSEC
+
+static const char g_racoon_config_dir[] = "/var/run/racoon/";
+static const char g_racoon_config_dir_old[] = "/etc/racoon/remote/";
+
+CF_EXPORT CFDictionaryRef _CFCopySystemVersionDictionary(void);
+CF_EXPORT const CFStringRef _kCFSystemVersionBuildVersionKey;
+
+// Major version  6 is 10.2.x (Jaguar)
+// Major version  7 is 10.3.x (Panther)
+// Major version  8 is 10.4.x (Tiger)
+// Major version  9 is 10.5.x (Leopard)
+// Major version 10 is 10.6.x (SnowLeopard)
+static int MacOSXSystemBuildNumber(char* letter_out, int* minor_out)
+{
+    int major = 0, minor = 0;
+    char letter = 0, buildver[256]="<Unknown>";
+    CFDictionaryRef vers = _CFCopySystemVersionDictionary();
+    if (vers)
+    {
+        CFStringRef cfbuildver = CFDictionaryGetValue(vers, _kCFSystemVersionBuildVersionKey);
+        if (cfbuildver) CFStringGetCString(cfbuildver, buildver, sizeof(buildver), kCFStringEncodingUTF8);
+        sscanf(buildver, "%d%c%d", &major, &letter, &minor);
+        CFRelease(vers);
+    }
+    else
+        helplog(ASL_LEVEL_NOTICE, "_CFCopySystemVersionDictionary failed");
+
+    if (!major) { major=10; letter = 'A'; minor = 190; helplog(ASL_LEVEL_NOTICE, "Note: No Major Build Version number found; assuming 10A190"); }
+    if (letter_out) *letter_out = letter;
+    if (minor_out) *minor_out = minor;
+    return(major);
+}
+
+static int UseOldRacoon()
+{
+    static int g_oldRacoon = -1;
+
+    if (g_oldRacoon == -1)
+    {
+        char letter = 0;
+        int minor = 0;
+        g_oldRacoon = (MacOSXSystemBuildNumber(&letter, &minor) < 10);
+        debug("%s", g_oldRacoon ? "old" : "new");
+    }
+
+    return g_oldRacoon;
+}
+
+static int RacoonSignal()
+{
+    return UseOldRacoon() ? SIGHUP : SIGUSR1;
+}
+
+static const char* GetRacoonConfigDir()
+{
+    return UseOldRacoon() ? g_racoon_config_dir_old : g_racoon_config_dir;
+}
+
+static const char* GetOldRacoonConfigDir()
+{
+    return UseOldRacoon() ? NULL : g_racoon_config_dir_old;
+}
+
+static const char racoon_config_file[] = "anonymous.conf";
+static const char racoon_config_file_orig[] = "anonymous.conf.orig";
+
+static const char configHeader[] = "# BackToMyMac\n";
+
+static int IsFamiliarRacoonConfiguration(const char* racoon_config_path)
+{
+    int fd = open(racoon_config_path, O_RDONLY);
+    debug("entry %s", racoon_config_path);
+    if (0 > fd)
+    {
+        helplog(ASL_LEVEL_NOTICE, "open \"%s\" failed: %s", racoon_config_path, strerror(errno));
+        return 0;
+    }
+    else
+    {
+        char header[sizeof(configHeader)] = {0};
+        ssize_t bytesRead = read(fd, header, sizeof(header)-1);
+        close(fd);
+        if (bytesRead != sizeof(header)-1) return 0;
+        return (0 == memcmp(header, configHeader, sizeof(header)-1));
+    }
+}
+
+static void
+revertAnonymousRacoonConfiguration(const char* dir)
+{
+    if (!dir) return;
+
+    debug("entry %s", dir);
+
+    char racoon_config_path[64];
+    strlcpy(racoon_config_path, dir, sizeof(racoon_config_path));
+    strlcat(racoon_config_path, racoon_config_file, sizeof(racoon_config_path));
+
+    struct stat s;
+    int ret = stat(racoon_config_path, &s);
+    debug("stat(%s): %d errno=%d", racoon_config_path, ret, errno);
+    if (ret == 0)
+    {
+        if (IsFamiliarRacoonConfiguration(racoon_config_path))
+        {
+            helplog(ASL_LEVEL_INFO, "\"%s\" looks familiar, unlinking", racoon_config_path);
+            unlink(racoon_config_path);
+        }
+        else
+        {
+            helplog(ASL_LEVEL_NOTICE, "\"%s\" does not look familiar, leaving in place", racoon_config_path);
+            return;
+        }
+    }
+    else if (errno != ENOENT)
+    {
+        helplog(ASL_LEVEL_NOTICE, "stat failed for \"%s\", leaving in place: %s", racoon_config_path, strerror(errno));
+        return;
+    }
+
+    char racoon_config_path_orig[64];
+    strlcpy(racoon_config_path_orig, dir, sizeof(racoon_config_path_orig));
+    strlcat(racoon_config_path_orig, racoon_config_file_orig, sizeof(racoon_config_path_orig));
+
+    ret = stat(racoon_config_path_orig, &s);
+    debug("stat(%s): %d errno=%d", racoon_config_path_orig, ret, errno);
+    if (ret == 0)
+    {
+        if (0 > rename(racoon_config_path_orig, racoon_config_path))
+            helplog(ASL_LEVEL_NOTICE, "rename \"%s\" \"%s\" failed: %s", racoon_config_path_orig, racoon_config_path, strerror(errno));
+        else
+            debug("reverted \"%s\" to \"%s\"", racoon_config_path_orig, racoon_config_path);
+    }
+    else if (errno != ENOENT)
+    {
+        helplog(ASL_LEVEL_NOTICE, "stat failed for \"%s\", leaving in place: %s", racoon_config_path_orig, strerror(errno));
+        return;
+    }
+}
+
+static void
+moveAsideAnonymousRacoonConfiguration(const char* dir)
+{
+    if (!dir) return;
+
+    debug("entry %s", dir);
+
+    char racoon_config_path[64];
+    strlcpy(racoon_config_path, dir, sizeof(racoon_config_path));
+    strlcat(racoon_config_path, racoon_config_file, sizeof(racoon_config_path));
+
+    struct stat s;
+    int ret = stat(racoon_config_path, &s);
+    if (ret == 0)
+    {
+        if (IsFamiliarRacoonConfiguration(racoon_config_path))
+        {
+            helplog(ASL_LEVEL_INFO, "\"%s\" looks familiar, unlinking", racoon_config_path);
+            unlink(racoon_config_path);
+        }
+        else
+        {
+            char racoon_config_path_orig[64];
+            strlcpy(racoon_config_path_orig, dir, sizeof(racoon_config_path_orig));
+            strlcat(racoon_config_path_orig, racoon_config_file_orig, sizeof(racoon_config_path_orig));
+            if (0 > rename(racoon_config_path, racoon_config_path_orig)) // If we didn't write it, move it to the side so it can be reverted later
+                helplog(ASL_LEVEL_NOTICE, "rename \"%s\" to \"%s\" failed: %s", racoon_config_path, racoon_config_path_orig, strerror(errno));
+            else
+                debug("successfully renamed \"%s\" to \"%s\"", racoon_config_path, racoon_config_path_orig);
+        }
+    }
+    else if (errno != ENOENT)
+    {
+        helplog(ASL_LEVEL_NOTICE, "stat failed for \"%s\", leaving in place: %s", racoon_config_path, strerror(errno));
+        return;
+    }
+}
+
+static int
+ensureExistenceOfRacoonConfigDir(const char* const racoon_config_dir)
+{
+    struct stat s;
+    int ret = stat(racoon_config_dir, &s);
+    if (ret != 0)
+    {
+        if (errno != ENOENT)
+        {
+            helplog(ASL_LEVEL_ERR, "stat of \"%s\" failed (%d): %s",
+                    racoon_config_dir, ret, strerror(errno));
+            return -1;
+        }
+        else
+        {
+            ret = mkdir(racoon_config_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+            if (ret != 0)
+            {
+                helplog(ASL_LEVEL_ERR, "mkdir \"%s\" failed: %s",
+                        racoon_config_dir, strerror(errno));
+                return -1;
+            }
+            else
+                helplog(ASL_LEVEL_INFO, "created directory \"%s\"", racoon_config_dir);
+        }
+    }
+    else if (!(s.st_mode & S_IFDIR))
+    {
+        helplog(ASL_LEVEL_ERR, "\"%s\" is not a directory!",
+                racoon_config_dir);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+createAnonymousRacoonConfiguration(const char *fqdn)
+{
+    static const char config1[] =
+        "remote anonymous {\n"
+        "  exchange_mode aggressive;\n"
+        "  doi ipsec_doi;\n"
+        "  situation identity_only;\n"
+        "  verify_identifier off;\n"
+        "  generate_policy on;\n"
+        "  shared_secret keychain_by_id \"";
+    static const char config2[] =
+        "\";\n"
+        "  nonce_size 16;\n"
+        "  lifetime time 15 min;\n"
+        "  initial_contact on;\n"
+        "  support_proxy on;\n"
+        "  nat_traversal force;\n"
+        "  proposal_check claim;\n"
+        "  proposal {\n"
+        "    encryption_algorithm aes;\n"
+        "    hash_algorithm sha256;\n"
+        "    authentication_method pre_shared_key;\n"
+        "    dh_group 2;\n"
+        "    lifetime time 15 min;\n"
+        "  }\n"
+        "  proposal {\n"
+        "    encryption_algorithm aes;\n"
+        "    hash_algorithm sha1;\n"
+        "    authentication_method pre_shared_key;\n"
+        "    dh_group 2;\n"
+        "    lifetime time 15 min;\n"
+        "  }\n"
+        "}\n\n"
+        "sainfo anonymous { \n"
+        "  pfs_group 2;\n"
+        "  lifetime time 10 min;\n"
+        "  encryption_algorithm aes;\n"
+        "  authentication_algorithm hmac_sha256,hmac_sha1;\n"
+        "  compression_algorithm deflate;\n"
+        "}\n";
+    char tmp_config_path[64];
+    char racoon_config_path[64];
+    const char* const racoon_config_dir = GetRacoonConfigDir();
+    const char* const racoon_config_dir_old = GetOldRacoonConfigDir();
+    int fd = -1;
+
+    debug("entry");
+
+    if (0 > ensureExistenceOfRacoonConfigDir(racoon_config_dir))
+        return -1;
+
+    strlcpy(tmp_config_path, racoon_config_dir, sizeof(tmp_config_path));
+    strlcat(tmp_config_path, "tmp.XXXXXX", sizeof(tmp_config_path));
+
+    fd = mkstemp(tmp_config_path);
+
+    if (0 > fd)
+    {
+        helplog(ASL_LEVEL_ERR, "mkstemp \"%s\" failed: %s",
+                tmp_config_path, strerror(errno));
+        return -1;
+    }
+    write(fd, configHeader, sizeof(configHeader)-1);
+    write(fd, config1, sizeof(config1)-1);
+    write(fd, fqdn, strlen(fqdn));
+    write(fd, config2, sizeof(config2)-1);
+    close(fd);
+
+    strlcpy(racoon_config_path, racoon_config_dir, sizeof(racoon_config_path));
+    strlcat(racoon_config_path, racoon_config_file, sizeof(racoon_config_path));
+
+    moveAsideAnonymousRacoonConfiguration(racoon_config_dir_old);
+    moveAsideAnonymousRacoonConfiguration(racoon_config_dir);
+
+    if (0 > rename(tmp_config_path, racoon_config_path))
+    {
+        unlink(tmp_config_path);
+        helplog(ASL_LEVEL_ERR, "rename \"%s\" \"%s\" failed: %s",
+                tmp_config_path, racoon_config_path, strerror(errno));
+        revertAnonymousRacoonConfiguration(racoon_config_dir_old);
+        revertAnonymousRacoonConfiguration(racoon_config_dir);
+        return -1;
+    }
+
+    debug("successfully renamed \"%s\" \"%s\"", tmp_config_path, racoon_config_path);
+    return 0;
+}
+
+static int
+notifyRacoon(void)
+{
+    debug("entry");
+    static const char racoon_pid_path[] = "/var/run/racoon.pid";
+    char buf[] = "18446744073709551615"; /* largest 64-bit integer */
+    char *p = NULL;
+    ssize_t n = 0;
+    unsigned long m = 0;
+    int fd = open(racoon_pid_path, O_RDONLY);
+
+    if (0 > fd)
+    {
+        debug("open \"%s\" failed, and that's OK: %s", racoon_pid_path,
+              strerror(errno));
+        return kmDNSHelperRacoonNotificationFailed;
+    }
+    n = read(fd, buf, sizeof(buf)-1);
+    close(fd);
+    if (1 > n)
+    {
+        debug("read of \"%s\" failed: %s", racoon_pid_path,
+              n == 0 ? "empty file" : strerror(errno));
+        return kmDNSHelperRacoonNotificationFailed;
+    }
+    buf[n] = '\0';
+    m = strtoul(buf, &p, 10);
+    if (*p != '\0' && !isspace(*p))
+    {
+        debug("invalid PID \"%s\" (around '%c')", buf, *p);
+        return kmDNSHelperRacoonNotificationFailed;
+    }
+    if (2 > m)
+    {
+        debug("refusing to kill PID %lu", m);
+        return kmDNSHelperRacoonNotificationFailed;
+    }
+    if (0 != kill(m, RacoonSignal()))
+    {
+        debug("Could not signal racoon (%lu): %s", m, strerror(errno));
+        return kmDNSHelperRacoonNotificationFailed;
+    }
+    debug("Sent racoon (%lu) signal %d", m, RacoonSignal());
+    return 0;
+}
+
+static void
+closefds(int from)
+{
+    int fd = 0;
+    struct dirent entry, *entryp = NULL;
+    DIR *dirp = opendir("/dev/fd");
+
+    if (dirp == NULL)
+    {
+        /* fall back to the erroneous getdtablesize method */
+        for (fd = from; fd < getdtablesize(); ++fd)
+            close(fd);
+        return;
+    }
+    while (0 == readdir_r(dirp, &entry, &entryp) && NULL != entryp)
+    {
+        fd = atoi(entryp->d_name);
+        if (fd >= from && fd != dirfd(dirp))
+            close(fd);
+    }
+    closedir(dirp);
+}
+
+static int
+startRacoonOld(void)
+{
+    debug("entry");
+    char * const racoon_args[] = { "/usr/sbin/racoon", "-e", NULL   };
+    ssize_t n = 0;
+    pid_t pid = 0;
+    int status = 0;
+
+    if (0 == (pid = fork()))
+    {
+        closefds(0);
+        execve(racoon_args[0], racoon_args, NULL);
+        helplog(ASL_LEVEL_ERR, "execve of \"%s\" failed: %s",
+                racoon_args[0], strerror(errno));
+        exit(2);
+    }
+    helplog(ASL_LEVEL_NOTICE, "racoon (pid=%lu) started",
+            (unsigned long)pid);
+    n = waitpid(pid, &status, 0);
+    if (-1 == n)
+    {
+        helplog(ASL_LEVEL_ERR, "Unexpected waitpid failure: %s",
+                strerror(errno));
+        return kmDNSHelperRacoonStartFailed;
+    }
+    else if (pid != n)
+    {
+        helplog(ASL_LEVEL_ERR, "Unexpected waitpid return value %d",
+                (int)n);
+        return kmDNSHelperRacoonStartFailed;
+    }
+    else if (WIFSIGNALED(status))
+    {
+        helplog(ASL_LEVEL_ERR,
+                "racoon (pid=%lu) terminated due to signal %d",
+                (unsigned long)pid, WTERMSIG(status));
+        return kmDNSHelperRacoonStartFailed;
+    }
+    else if (WIFSTOPPED(status))
+    {
+        helplog(ASL_LEVEL_ERR,
+                "racoon (pid=%lu) has stopped due to signal %d",
+                (unsigned long)pid, WSTOPSIG(status));
+        return kmDNSHelperRacoonStartFailed;
+    }
+    else if (0 != WEXITSTATUS(status))
+    {
+        helplog(ASL_LEVEL_ERR,
+                "racoon (pid=%lu) exited with status %d",
+                (unsigned long)pid, WEXITSTATUS(status));
+        return kmDNSHelperRacoonStartFailed;
+    }
+    debug("racoon (pid=%lu) daemonized normally", (unsigned long)pid);
+    return 0;
+}
+
+// constant and structure for the racoon control socket
+#define VPNCTL_CMD_PING 0x0004
+typedef struct vpnctl_hdr_struct
+{
+    u_int16_t msg_type;
+    u_int16_t flags;
+    u_int32_t cookie;
+    u_int32_t reserved;
+    u_int16_t result;
+    u_int16_t len;
+} vpnctl_hdr;
+
+static int
+startRacoon(void)
+{
+    debug("entry");
+    int fd = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (0 > fd)
+    {
+        helplog(ASL_LEVEL_ERR, "Could not create endpoint for racoon control socket: %d %s",
+                errno, strerror(errno));
+        return kmDNSHelperRacoonStartFailed;
+    }
+
+    struct sockaddr_un saddr;
+    memset(&saddr, 0, sizeof(saddr));
+    saddr.sun_family = AF_UNIX;
+    saddr.sun_len = sizeof(saddr);
+    static const char racoon_control_sock_path[] = "/var/run/vpncontrol.sock";
+    strcpy(saddr.sun_path, racoon_control_sock_path);
+    int result = connect(fd, (struct sockaddr*) &saddr, saddr.sun_len);
+    if (0 > result)
+    {
+        helplog(ASL_LEVEL_ERR, "Could not connect racoon control socket %s: %d %s",
+                racoon_control_sock_path, errno, strerror(errno));
+        return kmDNSHelperRacoonStartFailed;
+    }
+
+    u_int32_t btmm_cookie = 0x4d4d5442;
+    vpnctl_hdr h = { htons(VPNCTL_CMD_PING), 0, btmm_cookie, 0, 0, 0 };
+    size_t bytes = 0;
+    ssize_t ret = 0;
+
+    while (bytes < sizeof(vpnctl_hdr))
+    {
+        ret = write(fd, ((unsigned char*)&h)+bytes, sizeof(vpnctl_hdr) - bytes);
+        if (ret == -1)
+        {
+            helplog(ASL_LEVEL_ERR, "Could not write to racoon control socket: %d %s",
+                    errno, strerror(errno));
+            return kmDNSHelperRacoonStartFailed;
+        }
+        bytes += ret;
+    }
+
+    int nfds = fd + 1;
+    fd_set fds;
+    int counter = 0;
+    struct timeval tv;
+    bytes = 0;
+    h.cookie = 0;
+
+    for (counter = 0; counter < 100; counter++)
+    {
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+        tv = (struct timeval){ 0, 10000 }; // 10 milliseconds * 100 iterations = 1 second max wait time
+
+        result = select(nfds, &fds, (fd_set*)NULL, (fd_set*)NULL, &tv);
+        if (result > 0)
+        {
+            if (FD_ISSET(fd, &fds))
+            {
+                ret = read(fd, ((unsigned char*)&h)+bytes, sizeof(vpnctl_hdr) - bytes);
+
+                if (ret == -1)
+                {
+                    helplog(ASL_LEVEL_ERR, "Could not read from racoon control socket: %d %s",
+                            strerror(errno));
+                    break;
+                }
+                bytes += ret;
+                if (bytes >= sizeof(vpnctl_hdr)) break;
+            }
+            else
+            {
+                debug("select returned but fd_isset not on expected fd\n");
+            }
+        }
+        else if (result < 0)
+        {
+            debug("select returned %d errno %d %s\n", result, errno, strerror(errno));
+            if (errno != EINTR) break;
+        }
+    }
+
+    close(fd);
+
+    if (bytes < sizeof(vpnctl_hdr) || h.cookie != btmm_cookie) return kmDNSHelperRacoonStartFailed;
+
+    debug("racoon started");
+    return 0;
+}
+
+static int
+kickRacoon(void)
+{
+    if ( 0 == notifyRacoon() )
+        return 0;
+    return UseOldRacoon() ? startRacoonOld() : startRacoon();
+}
+
+#endif /* ndef MDNS_NO_IPSEC */
+
+int
+do_mDNSConfigureServer(__unused mach_port_t port, int updown, const char *fqdn, audit_token_t token)
+{
+#ifndef MDNS_NO_IPSEC
+    debug("entry");
+    if (!authorized(&token)) goto fin;
+
+    switch ((enum mDNSUpDown)updown)
+    {
+    case kmDNSUp:
+        if (0 != createAnonymousRacoonConfiguration(fqdn)) goto fin;
+        break;
+    case kmDNSDown:
+        revertAnonymousRacoonConfiguration(GetOldRacoonConfigDir());
+        revertAnonymousRacoonConfiguration(GetRacoonConfigDir());
+        break;
+    default:
+        goto fin;
+    }
+
+    if (0 != kickRacoon())
+        goto fin;
+    debug("succeeded");
+
+fin:
+#else
+    (void)port; (void)updown; (void)fqdn; (void)token;
+#endif
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+#ifndef MDNS_NO_IPSEC
+
+static unsigned int routeSeq = 1;
+
+static int
+setupTunnelRoute(v6addr_t local, v6addr_t remote)
+{
+    struct
+    {
+        struct rt_msghdr hdr;
+        struct sockaddr_in6 dst;
+        struct sockaddr_in6 gtwy;
+    } msg;
+    int err = 0;
+    int s = -1;
+
+    if (0 > (s = socket(PF_ROUTE, SOCK_RAW, AF_INET)))
+    {
+        helplog(ASL_LEVEL_ERR, "socket(PF_ROUTE, ...) failed: %s",
+                strerror(errno));
+        err = kmDNSHelperRoutingSocketCreationFailed;
+        goto fin;
+    }
+    memset(&msg, 0, sizeof(msg));
+    msg.hdr.rtm_msglen = sizeof(msg);
+    msg.hdr.rtm_type = RTM_ADD;
+    /* The following flags are set by `route add -inet6 -host ...` */
+    msg.hdr.rtm_flags = RTF_UP | RTF_GATEWAY | RTF_HOST | RTF_STATIC;
+    msg.hdr.rtm_version = RTM_VERSION;
+    msg.hdr.rtm_seq = routeSeq++;
+    msg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY;
+    msg.hdr.rtm_inits = RTV_MTU;
+    msg.hdr.rtm_rmx.rmx_mtu = 1280;
+
+    msg.dst.sin6_len = sizeof(msg.dst);
+    msg.dst.sin6_family = AF_INET6;
+    memcpy(&msg.dst.sin6_addr, remote, sizeof(msg.dst.sin6_addr));
+
+    msg.gtwy.sin6_len = sizeof(msg.gtwy);
+    msg.gtwy.sin6_family = AF_INET6;
+    memcpy(&msg.gtwy.sin6_addr, local, sizeof(msg.gtwy.sin6_addr));
+
+    /* send message, ignore error when route already exists */
+    if (0 > write(s, &msg, msg.hdr.rtm_msglen))
+    {
+        int errno_ = errno;
+
+        debug("write to routing socket failed: %s", strerror(errno_));
+        if (EEXIST != errno_)
+        {
+            err = kmDNSHelperRouteAdditionFailed;
+            goto fin;
+        }
+    }
+
+fin:
+    if (0 <= s)
+        close(s);
+    return err;
+}
+
+static int
+teardownTunnelRoute(v6addr_t remote)
+{
+    struct
+    {
+        struct rt_msghdr hdr;
+        struct sockaddr_in6 dst;
+    } msg;
+    int err = 0;
+    int s = -1;
+
+    if (0 > (s = socket(PF_ROUTE, SOCK_RAW, AF_INET)))
+    {
+        helplog(ASL_LEVEL_ERR, "socket(PF_ROUTE, ...) failed: %s",
+                strerror(errno));
+        err = kmDNSHelperRoutingSocketCreationFailed;
+        goto fin;
+    }
+    memset(&msg, 0, sizeof(msg));
+
+    msg.hdr.rtm_msglen = sizeof(msg);
+    msg.hdr.rtm_type = RTM_DELETE;
+    msg.hdr.rtm_version = RTM_VERSION;
+    msg.hdr.rtm_seq = routeSeq++;
+    msg.hdr.rtm_addrs = RTA_DST;
+
+    msg.dst.sin6_len = sizeof(msg.dst);
+    msg.dst.sin6_family = AF_INET6;
+    memcpy(&msg.dst.sin6_addr, remote, sizeof(msg.dst.sin6_addr));
+    if (0 > write(s, &msg, msg.hdr.rtm_msglen))
+    {
+        int errno_ = errno;
+
+        debug("write to routing socket failed: %s", strerror(errno_));
+        if (ESRCH != errno_)
+        {
+            err = kmDNSHelperRouteDeletionFailed;
+            goto fin;
+        }
+    }
+
+fin:
+    if (0 <= s)
+        close(s);
+    return err;
+}
+
+static int
+v4addr_to_string(v4addr_t addr, char *buf, size_t buflen)
+{
+    if (NULL == inet_ntop(AF_INET, addr, buf, buflen))
+    {
+        helplog(ASL_LEVEL_ERR, "inet_ntop failed: %s",
+                strerror(errno));
+        return kmDNSHelperInvalidNetworkAddress;
+    }
+    else
+        return 0;
+}
+
+static int
+v6addr_to_string(v6addr_t addr, char *buf, size_t buflen)
+{
+    if (NULL == inet_ntop(AF_INET6, addr, buf, buflen))
+    {
+        helplog(ASL_LEVEL_ERR, "inet_ntop failed: %s",
+                strerror(errno));
+        return kmDNSHelperInvalidNetworkAddress;
+    }
+    else
+        return 0;
+}
+
+/* Caller owns object returned in `policy' */
+static int
+generateTunnelPolicy(mDNSTunnelPolicyWhich which, mDNSTunnelType type, int in,
+                     v4addr_t src, uint16_t src_port,
+                     v4addr_t dst, uint16_t dst_port,
+                     v6addr_t src6, v6addr_t dst6,
+                     ipsec_policy_t *policy, size_t *len)
+{
+    char srcs[INET_ADDRSTRLEN], dsts[INET_ADDRSTRLEN];
+    char srcs6[INET6_ADDRSTRLEN], dsts6[INET6_ADDRSTRLEN];
+    char buf[512];
+    char *inOut = in ? "in" : "out";
+    ssize_t n = 0;
+    int err = 0;
+
+    *policy = NULL;
+    *len = 0;
+
+    switch (which)
+    {
+    case kmDNSTunnelPolicySetup:
+        if (type == kmDNSIPv6IPv4Tunnel)
+        {
+            if (0 != (err = v4addr_to_string(src, srcs, sizeof(srcs))))
+                goto fin;
+            if (0 != (err = v4addr_to_string(dst, dsts, sizeof(dsts))))
+                goto fin;
+            n = snprintf(buf, sizeof(buf),
+                         "%s ipsec esp/tunnel/%s[%u]-%s[%u]/require",
+                         inOut, srcs, src_port, dsts, dst_port);
+        }
+        else if (type == kmDNSIPv6IPv6Tunnel)
+        {
+            if (0 != (err = v6addr_to_string(src6, srcs6, sizeof(srcs6))))
+                goto fin;
+            if (0 != (err = v6addr_to_string(dst6, dsts6, sizeof(dsts6))))
+                goto fin;
+            n = snprintf(buf, sizeof(buf),
+                         "%s ipsec esp/tunnel/%s-%s/require",
+                         inOut, srcs6, dsts6);
+        }
+        break;
+    case kmDNSTunnelPolicyTeardown:
+        n = strlcpy(buf, inOut, sizeof(buf));
+        break;
+    case kmDNSTunnelPolicyGenerate:
+        n = snprintf(buf, sizeof(buf), "%s generate", inOut);
+        break;
+    default:
+        err = kmDNSHelperIPsecPolicyCreationFailed;
+        goto fin;
+    }
+
+    if (n >= (int)sizeof(buf))
+    {
+        err = kmDNSHelperResultTooLarge;
+        goto fin;
+    }
+
+    debug("policy=\"%s\"", buf);
+    if (NULL == (*policy = (ipsec_policy_t)ipsec_set_policy(buf, n)))
+    {
+        helplog(ASL_LEVEL_ERR,
+                "Could not create IPsec policy from \"%s\"", buf);
+        err = kmDNSHelperIPsecPolicyCreationFailed;
+        goto fin;
+    }
+    *len = ((ipsec_policy_t)(*policy))->sadb_x_policy_len * 8;
+
+fin:
+    return err;
+}
+
+static int
+sendPolicy(int s, int setup,
+           struct sockaddr *src, uint8_t src_bits,
+           struct sockaddr *dst, uint8_t dst_bits,
+           ipsec_policy_t policy, size_t len)
+{
+    static unsigned int policySeq = 0;
+    int err = 0;
+
+    debug("entry, setup=%d", setup);
+    if (setup)
+        err = pfkey_send_spdadd(s, src, src_bits, dst, dst_bits, -1,
+                                (char *)policy, len, policySeq++);
+    else
+        err = pfkey_send_spddelete(s, src, src_bits, dst, dst_bits, -1,
+                                   (char *)policy, len, policySeq++);
+    if (0 > err)
+    {
+        helplog(ASL_LEVEL_ERR, "Could not set IPsec policy: %s",
+                ipsec_strerror());
+        err = kmDNSHelperIPsecPolicySetFailed;
+        goto fin;
+    }
+    else
+        err = 0;
+    debug("succeeded");
+
+fin:
+    return err;
+}
+
+static int
+removeSA(int s, struct sockaddr *src, struct sockaddr *dst)
+{
+    int err = 0;
+
+    debug("entry");
+    err = pfkey_send_delete_all(s, SADB_SATYPE_ESP, IPSEC_MODE_ANY, src, dst);
+    if (0 > err)
+    {
+        helplog(ASL_LEVEL_ERR, "Could not remove IPsec SA: %s", ipsec_strerror());
+        err = kmDNSHelperIPsecRemoveSAFailed;
+        goto fin;
+    }
+    err = pfkey_send_delete_all(s, SADB_SATYPE_ESP, IPSEC_MODE_ANY, dst, src);
+    if (0 > err)
+    {
+        helplog(ASL_LEVEL_ERR, "Could not remove IPsec SA: %s", ipsec_strerror());
+        err = kmDNSHelperIPsecRemoveSAFailed;
+        goto fin;
+    }
+    else
+        err = 0;
+
+    debug("succeeded");
+
+fin:
+    return err;
+}
+
+static int
+doTunnelPolicy(mDNSTunnelPolicyWhich which, mDNSTunnelType type,
+               v6addr_t loc_inner, uint8_t loc_bits,
+               v4addr_t loc_outer, uint16_t loc_port,
+               v6addr_t rmt_inner, uint8_t rmt_bits,
+               v4addr_t rmt_outer, uint16_t rmt_port,
+               v6addr_t loc_outer6, v6addr_t rmt_outer6)
+{
+    struct sockaddr_in6 sin6_loc;
+    struct sockaddr_in6 sin6_rmt;
+    ipsec_policy_t policy = NULL;
+    size_t len = 0;
+    int s = -1;
+    int err = 0;
+
+    debug("entry");
+    if (0 > (s = pfkey_open()))
+    {
+        helplog(ASL_LEVEL_ERR,
+                "Could not create IPsec policy socket: %s",
+                ipsec_strerror());
+        err = kmDNSHelperIPsecPolicySocketCreationFailed;
+        goto fin;
+    }
+
+    memset(&sin6_loc, 0, sizeof(sin6_loc));
+    sin6_loc.sin6_len = sizeof(sin6_loc);
+    sin6_loc.sin6_family = AF_INET6;
+    sin6_loc.sin6_port = htons(0);
+    memcpy(&sin6_loc.sin6_addr, loc_inner, sizeof(sin6_loc.sin6_addr));
+
+    memset(&sin6_rmt, 0, sizeof(sin6_rmt));
+    sin6_rmt.sin6_len = sizeof(sin6_rmt);
+    sin6_rmt.sin6_family = AF_INET6;
+    sin6_rmt.sin6_port = htons(0);
+    memcpy(&sin6_rmt.sin6_addr, rmt_inner, sizeof(sin6_rmt.sin6_addr));
+
+    int setup = which != kmDNSTunnelPolicyTeardown;
+
+    if (0 != (err = generateTunnelPolicy(which, type, 1,
+                                         rmt_outer, rmt_port,
+                                         loc_outer, loc_port,
+                                         rmt_outer6, loc_outer6,
+                                         &policy, &len)))
+        goto fin;
+    if (0 != (err = sendPolicy(s, setup,
+                               (struct sockaddr *)&sin6_rmt, rmt_bits,
+                               (struct sockaddr *)&sin6_loc, loc_bits,
+                               policy, len)))
+        goto fin;
+    if (NULL != policy)
+    {
+        free(policy);
+        policy = NULL;
+    }
+    if (0 != (err = generateTunnelPolicy(which, type, 0,
+                                         loc_outer, loc_port,
+                                         rmt_outer, rmt_port,
+                                         loc_outer6, rmt_outer6,
+                                         &policy, &len)))
+        goto fin;
+    if (0 != (err = sendPolicy(s, setup,
+                               (struct sockaddr *)&sin6_loc, loc_bits,
+                               (struct sockaddr *)&sin6_rmt, rmt_bits,
+                               policy, len)))
+        goto fin;
+
+    if (which == kmDNSTunnelPolicyTeardown)
+    {
+        if (rmt_port)       // Outer tunnel is IPv4
+        {
+            if (loc_outer && rmt_outer)
+            {
+                struct sockaddr_in sin_loc;
+                struct sockaddr_in sin_rmt;
+                memset(&sin_loc, 0, sizeof(sin_loc));
+                sin_loc.sin_len = sizeof(sin_loc);
+                sin_loc.sin_family = AF_INET;
+                memcpy(&sin_loc.sin_addr, loc_outer, sizeof(sin_loc.sin_addr));
+
+                memset(&sin_rmt, 0, sizeof(sin_rmt));
+                sin_rmt.sin_len = sizeof(sin_rmt);
+                sin_rmt.sin_family = AF_INET;
+                memcpy(&sin_rmt.sin_addr, rmt_outer, sizeof(sin_rmt.sin_addr));
+                if (0 != (err = removeSA(s, (struct sockaddr *)&sin_loc, (struct sockaddr *)&sin_rmt)))
+                    goto fin;
+            }
+        }
+        else
+        {
+            if (loc_outer6 && rmt_outer6)
+            {
+                struct sockaddr_in6 sin6_lo;
+                struct sockaddr_in6 sin6_rm;
+
+                memset(&sin6_lo, 0, sizeof(sin6_lo));
+                sin6_lo.sin6_len = sizeof(sin6_lo);
+                sin6_lo.sin6_family = AF_INET6;
+                memcpy(&sin6_lo.sin6_addr, loc_outer6, sizeof(sin6_lo.sin6_addr));
+
+                memset(&sin6_rm, 0, sizeof(sin6_rm));
+                sin6_rm.sin6_len = sizeof(sin6_rm);
+                sin6_rm.sin6_family = AF_INET6;
+                memcpy(&sin6_rm.sin6_addr, rmt_outer6, sizeof(sin6_rm.sin6_addr));
+                if (0 != (err = removeSA(s, (struct sockaddr *)&sin6_lo, (struct sockaddr *)&sin6_rm)))
+                    goto fin;
+            }
+        }
+    }
+
+
+    debug("succeeded");
+
+fin:
+    if (s >= 0)
+        pfkey_close(s);
+    if (NULL != policy)
+        free(policy);
+    return err;
+}
+
+#endif /* ndef MDNS_NO_IPSEC */
+
+int
+do_mDNSAutoTunnelSetKeys(__unused mach_port_t port, int replacedelete,
+                         v6addr_t loc_inner, v6addr_t loc_outer6, uint16_t loc_port,
+                         v6addr_t rmt_inner, v6addr_t rmt_outer6, uint16_t rmt_port,
+                         const char *id, int *err, audit_token_t token)
+{
+#ifndef MDNS_NO_IPSEC
+    static const char config[] =
+        "%s"
+        "remote %s [%u] {\n"
+        "  disconnect_on_idle idle_timeout 600 idle_direction idle_outbound;\n"
+        "  exchange_mode aggressive;\n"
+        "  doi ipsec_doi;\n"
+        "  situation identity_only;\n"
+        "  verify_identifier off;\n"
+        "  generate_policy on;\n"
+        "  my_identifier user_fqdn \"%s\";\n"
+        "  shared_secret keychain \"%s\";\n"
+        "  nonce_size 16;\n"
+        "  lifetime time 15 min;\n"
+        "  initial_contact on;\n"
+        "  support_proxy on;\n"
+        "  nat_traversal force;\n"
+        "  proposal_check claim;\n"
+        "  proposal {\n"
+        "    encryption_algorithm aes;\n"
+        "    hash_algorithm sha256;\n"
+        "    authentication_method pre_shared_key;\n"
+        "    dh_group 2;\n"
+        "    lifetime time 15 min;\n"
+        "  }\n"
+        "  proposal {\n"
+        "    encryption_algorithm aes;\n"
+        "    hash_algorithm sha1;\n"
+        "    authentication_method pre_shared_key;\n"
+        "    dh_group 2;\n"
+        "    lifetime time 15 min;\n"
+        "  }\n"
+        "}\n\n"
+        "sainfo address %s any address %s any {\n"
+        "  pfs_group 2;\n"
+        "  lifetime time 10 min;\n"
+        "  encryption_algorithm aes;\n"
+        "  authentication_algorithm hmac_sha256,hmac_sha1;\n"
+        "  compression_algorithm deflate;\n"
+        "}\n\n"
+        "sainfo address %s any address %s any {\n"
+        "  pfs_group 2;\n"
+        "  lifetime time 10 min;\n"
+        "  encryption_algorithm aes;\n"
+        "  authentication_algorithm hmac_sha256,hmac_sha1;\n"
+        "  compression_algorithm deflate;\n"
+        "}\n";
+    char path[PATH_MAX] = "";
+    char li[INET6_ADDRSTRLEN], lo[INET_ADDRSTRLEN], lo6[INET6_ADDRSTRLEN],
+         ri[INET6_ADDRSTRLEN], ro[INET_ADDRSTRLEN], ro6[INET6_ADDRSTRLEN];
+    FILE *fp = NULL;
+    int fd = -1;
+    char tmp_path[PATH_MAX] = "";
+    v4addr_t loc_outer, rmt_outer;
+
+    debug("entry");
+    *err = 0;
+    if (!authorized(&token))
+    {
+        *err = kmDNSHelperNotAuthorized;
+        goto fin;
+    }
+    switch ((enum mDNSAutoTunnelSetKeysReplaceDelete)replacedelete)
+    {
+    case kmDNSAutoTunnelSetKeysReplace:
+    case kmDNSAutoTunnelSetKeysDelete:
+        break;
+    default:
+        *err = kmDNSHelperInvalidTunnelSetKeysOperation;
+        goto fin;
+    }
+
+    if (0 != (*err = v6addr_to_string(loc_inner, li, sizeof(li))))
+        goto fin;
+    if (0 != (*err = v6addr_to_string(rmt_inner, ri, sizeof(ri))))
+        goto fin;
+
+    debug("loc_inner=%s rmt_inner=%s", li, ri);
+    if (!rmt_port)
+    {
+        loc_outer[0] = loc_outer[1] = loc_outer[2] = loc_outer[3] = 0;
+        rmt_outer[0] = rmt_outer[1] = rmt_outer[2] = rmt_outer[3] = 0;
+
+        if (0 != (*err = v6addr_to_string(loc_outer6, lo6, sizeof(lo6))))
+            goto fin;
+        if (0 != (*err = v6addr_to_string(rmt_outer6, ro6, sizeof(ro6))))
+            goto fin;
+        debug("IPv6 outer tunnel: loc_outer6=%s rmt_outer6=%s", lo6, ro6);
+        if ((int)sizeof(path) <= snprintf(path, sizeof(path),
+                                          "%s%s.conf", GetRacoonConfigDir(), ro6))
+        {
+            *err = kmDNSHelperResultTooLarge;
+            goto fin;
+        }
+    }
+    else
+    {
+        loc_outer[0] = loc_outer6[0];
+        loc_outer[1] = loc_outer6[1];
+        loc_outer[2] = loc_outer6[2];
+        loc_outer[3] = loc_outer6[3];
+
+        rmt_outer[0] = rmt_outer6[0];
+        rmt_outer[1] = rmt_outer6[1];
+        rmt_outer[2] = rmt_outer6[2];
+        rmt_outer[3] = rmt_outer6[3];
+
+        if (0 != (*err = v4addr_to_string(loc_outer, lo, sizeof(lo))))
+            goto fin;
+        if (0 != (*err = v4addr_to_string(rmt_outer, ro, sizeof(ro))))
+            goto fin;
+        debug("IPv4 outer tunnel: loc_outer=%s loc_port=%u rmt_outer=%s rmt_port=%u",
+              lo, loc_port, ro, rmt_port);
+
+        if ((int)sizeof(path) <= snprintf(path, sizeof(path),
+                                          "%s%s.%u.conf", GetRacoonConfigDir(), ro,
+                                          rmt_port))
+        {
+            *err = kmDNSHelperResultTooLarge;
+            goto fin;
+        }
+    }
+
+
+
+    if (kmDNSAutoTunnelSetKeysReplace == replacedelete)
+    {
+        if (0 > ensureExistenceOfRacoonConfigDir(GetRacoonConfigDir()))
+        {
+            *err = kmDNSHelperRacoonConfigCreationFailed;
+            goto fin;
+        }
+        if ((int)sizeof(tmp_path) <=
+            snprintf(tmp_path, sizeof(tmp_path), "%s.XXXXXX", path))
+        {
+            *err = kmDNSHelperResultTooLarge;
+            goto fin;
+        }
+        if (0 > (fd = mkstemp(tmp_path)))
+        {
+            helplog(ASL_LEVEL_ERR, "mkstemp \"%s\" failed: %s",
+                    tmp_path, strerror(errno));
+            *err = kmDNSHelperRacoonConfigCreationFailed;
+            goto fin;
+        }
+        if (NULL == (fp = fdopen(fd, "w")))
+        {
+            helplog(ASL_LEVEL_ERR, "fdopen: %s",
+                    strerror(errno));
+            *err = kmDNSHelperRacoonConfigCreationFailed;
+            goto fin;
+        }
+        fd = -1;
+        fprintf(fp, config, configHeader, (!rmt_port ? ro6 : ro), rmt_port, id, id, ri, li, li, ri);
+        fclose(fp);
+        fp = NULL;
+        if (0 > rename(tmp_path, path))
+        {
+            helplog(ASL_LEVEL_ERR,
+                    "rename \"%s\" \"%s\" failed: %s",
+                    tmp_path, path, strerror(errno));
+            *err = kmDNSHelperRacoonConfigCreationFailed;
+            goto fin;
+        }
+    }
+    else
+    {
+        if (0 != unlink(path))
+            debug("unlink \"%s\" failed: %s", path,
+                  strerror(errno));
+    }
+
+    if (0 != (*err = doTunnelPolicy(kmDNSTunnelPolicyTeardown, kmDNSNoTunnel,
+                                    loc_inner, kWholeV6Mask, loc_outer, loc_port,
+                                    rmt_inner, kWholeV6Mask, rmt_outer, rmt_port, loc_outer6, rmt_outer6)))
+        goto fin;
+    if (kmDNSAutoTunnelSetKeysReplace == replacedelete &&
+        0 != (*err = doTunnelPolicy(kmDNSTunnelPolicySetup, (!rmt_port ? kmDNSIPv6IPv6Tunnel : kmDNSIPv6IPv4Tunnel),
+                                    loc_inner, kWholeV6Mask, loc_outer, loc_port,
+                                    rmt_inner, kWholeV6Mask, rmt_outer, rmt_port, loc_outer6, rmt_outer6)))
+        goto fin;
+
+    if (0 != (*err = teardownTunnelRoute(rmt_inner)))
+        goto fin;
+    if (kmDNSAutoTunnelSetKeysReplace == replacedelete &&
+        0 != (*err = setupTunnelRoute(loc_inner, rmt_inner)))
+        goto fin;
+
+    if (kmDNSAutoTunnelSetKeysReplace == replacedelete &&
+        0 != (*err = kickRacoon()))
+        goto fin;
+
+    debug("succeeded");
+
+fin:
+    if (NULL != fp)
+        fclose(fp);
+    if (0 <= fd)
+        close(fd);
+    unlink(tmp_path);
+#else
+    (void)replacedelete; (void)loc_inner; (void)loc_outer6; (void)loc_port; (void)rmt_inner;
+    (void)rmt_outer6; (void)rmt_port; (void)id; (void)token;
+
+    *err = kmDNSHelperIPsecDisabled;
+#endif /* MDNS_NO_IPSEC */
+    update_idle_timer();
+    return KERN_SUCCESS;
+}
+
+kern_return_t
+do_mDNSSendWakeupPacket(__unused mach_port_t port, unsigned ifid, const char *eth_addr, const char *ip_addr, int iteration, audit_token_t token)
+{
+    int bpf_fd, i, j;
+    struct ifreq ifr;
+    char ifname[IFNAMSIZ];
+    char packet[512];
+    char *ptr = packet;
+    char bpf_device[12];
+    struct ether_addr *ea;
+    (void) ip_addr; // unused
+    (void) iteration; // unused
+    (void) token; // unused
+
+    if (if_indextoname(ifid, ifname) == NULL)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket invalid interface index %u", ifid);
+        return errno;
+    }
+
+    ea = ether_aton(eth_addr);
+    if (ea == NULL)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket invalid ethernet address %s", eth_addr);
+        return errno;
+    }
+
+    for (i = 0; i < 100; i++)
+    {
+        snprintf(bpf_device, sizeof(bpf_device), "/dev/bpf%d", i);
+        bpf_fd = open(bpf_device, O_RDWR, 0);
+        if (bpf_fd == -1)
+            continue;
+        else break;
+    }
+
+    if (bpf_fd == -1)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket cannot find a bpf device");
+        return ENXIO;
+    }
+
+    memset(&ifr, 0, sizeof(ifr));
+    strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+
+    if (ioctl(bpf_fd, BIOCSETIF, (char *)&ifr) < 0)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket BIOCSETIF failed %s", strerror(errno));
+        return errno;
+    }
+
+    // 0x00 Destination address
+    for (i=0; i<6; i++) *ptr++ = ea->octet[i];
+
+    // 0x06 Source address (Note: Since we don't currently set the BIOCSHDRCMPLT option, BPF will fill in the real interface address for us)
+    for (i=0; i<6; i++) *ptr++ = 0;
+
+    // 0x0C Ethertype (0x0842)
+    *ptr++ = 0x08;
+    *ptr++ = 0x42;
+
+    // 0x0E Wakeup sync sequence
+    for (i=0; i<6; i++) *ptr++ = 0xFF;
+
+    // 0x14 Wakeup data
+    for (j=0; j<16; j++) for (i=0; i<6; i++) *ptr++ = ea->octet[i];
+
+    // 0x74 Password
+    for (i=0; i<6; i++) *ptr++ = 0;
+
+    if (write(bpf_fd, packet, ptr - packet) < 0)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket write failed %s", strerror(errno));
+        return errno;
+    }
+    helplog(ASL_LEVEL_INFO, "do_mDNSSendWakeupPacket sent unicast eth_addr %s, ip_addr %s", eth_addr, ip_addr);
+    // Send a broadcast one to handle ethernet switches that don't flood forward packets with
+    // unknown mac addresses.
+    for (i=0; i<6; i++) packet[i] = 0xFF;
+    if (write(bpf_fd, packet, ptr - packet) < 0)
+    {
+        helplog(ASL_LEVEL_ERR, "do_mDNSSendWakeupPacket write failed %s", strerror(errno));
+        return errno;
+    }
+    helplog(ASL_LEVEL_INFO, "do_mDNSSendWakeupPacket sent broadcast eth_addr %s, ip_addr %s", eth_addr, ip_addr);
+    close(bpf_fd);
+    return KERN_SUCCESS;
+}
+
+// Open the specified port for protocol in the P2P firewall.
+kern_return_t
+do_mDNSPacketFilterControl(__unused mach_port_t port, uint32_t command, const char * ifname, uint32_t count, pfArray_t portArray, pfArray_t protocolArray, audit_token_t token)
+{
+    (void) token; // unused
+    int error;
+    kern_return_t result = KERN_SUCCESS;
+
+    helplog(ASL_LEVEL_INFO, "do_mDNSPacketFilterControl: command %d ifname %s, count %d",
+            command, ifname, count);
+
+    switch (command)
+    {
+    case PF_SET_RULES:
+        error = P2PPacketFilterAddBonjourRuleSet(ifname, count, portArray, protocolArray);
+        if (error)
+        {
+            helplog(ASL_LEVEL_ERR, "P2PPacketFilterAddBonjourRuleSet failed %s", strerror(error));
+            result = KERN_FAILURE;
+        }
+        break;
+
+    case PF_CLEAR_RULES:
+        error = P2PPacketFilterClearBonjourRules();
+        if (error)
+        {
+            helplog(ASL_LEVEL_ERR, "P2PPacketFilterClearBonjourRules failed %s", strerror(error));
+            result = KERN_FAILURE;
+        }
+        break;
+
+    default:
+        helplog(ASL_LEVEL_ERR, "do_mDNSPacketFilterControl: invalid command %d", command);
+        result = KERN_INVALID_ARGUMENT;
+        break;
+    }
+
+    return result;
+}
+
+unsigned long
+in_cksum(unsigned short *ptr,int nbytes)
+{
+    unsigned long sum;
+    u_short oddbyte;
+
+    /*
+     * Our algorithm is simple, using a 32-bit accumulator (sum),
+     * we add sequential 16-bit words to it, and at the end, fold back
+     * all the carry bits from the top 16 bits into the lower 16 bits.
+     */
+    sum = 0;
+    while (nbytes > 1) {
+        sum += *ptr++;
+        nbytes -= 2;
+    }
+
+    /* mop up an odd byte, if necessary */
+    if (nbytes == 1) {
+        /* make sure top half is zero */
+        oddbyte = 0;
+
+        /* one byte only */
+        *((u_char *)&oddbyte) = *(u_char *)ptr;
+        sum += oddbyte;
+    }
+    /* Add back carry outs from top 16 bits to low 16 bits. */
+    sum = (sum >> 16) + (sum & 0xffff);
+
+    /* add carry */
+    sum += (sum >> 16);
+
+    return sum;
+}
+
+unsigned short
+InetChecksum(unsigned short *ptr,int nbytes)
+{
+    unsigned long sum;
+
+    sum = in_cksum(ptr, nbytes);
+    return (unsigned short)~sum;
+}
+
+void TCPCheckSum(int af, struct tcphdr *t, int tcplen, v6addr_t sadd6, v6addr_t dadd6)
+{
+    unsigned long sum = 0;
+    unsigned short *ptr;
+
+    /* TCP header checksum */
+    sum = in_cksum((unsigned short *)t, tcplen);
+
+    if (af == AF_INET)
+    {
+        /* Pseudo header */
+        ptr = (unsigned short *)sadd6;
+        sum += *ptr++;
+        sum += *ptr++;
+        ptr = (unsigned short *)dadd6;
+        sum += *ptr++;
+        sum += *ptr++;
+    }
+    else if (af == AF_INET6)
+    {
+        /* Pseudo header */
+        ptr = (unsigned short *)sadd6;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        ptr = (unsigned short *)dadd6;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+        sum += *ptr++;
+    }
+
+    sum += htons(tcplen);
+    sum += htons(IPPROTO_TCP);
+
+    while (sum >> 16)
+        sum = (sum >> 16) + (sum & 0xFFFF);
+
+    t->th_sum = ~sum;
+
+}
+
+kern_return_t do_mDNSSendKeepalive(__unused mach_port_t port, v6addr_t sadd6, v6addr_t dadd6, uint16_t lport, uint16_t rport, unsigned seq, unsigned ack, uint16_t win, audit_token_t token)
+{
+    struct packet4 {
+        struct ip ip;
+        struct tcphdr tcp;
+    } packet4;
+    struct packet6 {
+        struct tcphdr tcp;
+    } packet6;
+    int sock, on;
+    struct tcphdr *t;
+    int af;
+    struct sockaddr_storage ss_to;
+    struct sockaddr_in *sin_to = (struct sockaddr_in *)&ss_to;
+    struct sockaddr_in6 *sin6_to = (struct sockaddr_in6 *)&ss_to;
+    void *packet;
+    ssize_t packetlen;
+    char ctlbuf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+    struct msghdr msghdr;
+    struct iovec iov;
+    ssize_t len;
+
+    if (!authorized(&token))
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: Not authorized");
+        return kmDNSHelperNotAuthorized;
+    }
+
+    helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: called");
+
+    // all the incoming arguments are in network order
+    if ((*(unsigned *)(sadd6 +4) == 0) && (*(unsigned *)(sadd6 + 8) == 0) && (*(unsigned *)(sadd6 + 12) == 0))
+    {
+        af = AF_INET;
+        memset(&packet4, 0, sizeof (packet4));
+
+        /* Fill in all the IP header information - should be in host order*/
+        packet4.ip.ip_v = 4;            /* 4-bit Version */
+        packet4.ip.ip_hl = 5;       /* 4-bit Header Length */
+        packet4.ip.ip_tos = 0;      /* 8-bit Type of service */
+        packet4.ip.ip_len = 40;     /* 16-bit Total length */
+        packet4.ip.ip_id = 9864;        /* 16-bit ID field */
+        packet4.ip.ip_off = 0;      /* 13-bit Fragment offset */
+        packet4.ip.ip_ttl = 63;     /* 8-bit Time To Live */
+        packet4.ip.ip_p = IPPROTO_TCP;  /* 8-bit Protocol */
+        packet4.ip.ip_sum = 0;      /* 16-bit Header checksum (below) */
+        memcpy(&packet4.ip.ip_src.s_addr, sadd6, 4);
+        memcpy(&packet4.ip.ip_dst.s_addr, dadd6, 4);
+
+        /* IP header checksum */
+        packet4.ip.ip_sum = InetChecksum((unsigned short *)&packet4.ip, 20);
+        t = &packet4.tcp;
+        packet = &packet4;
+        packetlen = 40; // sum of IPv4 header len(20) and TCP header len(20)
+    }
+    else
+    {
+        af = AF_INET6;
+        memset(&packet6, 0, sizeof (packet6));
+        t = &packet6.tcp;
+        packet = &packet6;
+        // We don't send IPv6 header, hence just the TCP header len (20)
+        packetlen = 20;
+    }
+
+    /* Fill in all the TCP header information */
+    t->th_sport = lport;        /* 16-bit Source port number */
+    t->th_dport = rport;        /* 16-bit Destination port */
+    t->th_seq = seq;            /* 32-bit Sequence Number */
+    t->th_ack = ack;            /* 32-bit Acknowledgement Number */
+    t->th_off = 5;              /* Data offset */
+    t->th_flags = TH_ACK;
+    t->th_win = win;
+    t->th_sum = 0;              /* 16-bit checksum (below) */
+    t->th_urp = 0;              /* 16-bit urgent offset */
+
+    TCPCheckSum(af, t, 20, sadd6, dadd6);
+
+    /* Open up a RAW socket */
+    if ((sock = socket(af, SOCK_RAW, IPPROTO_TCP)) < 0)
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: socket %s", strerror(errno));
+        return errno;
+    }
+
+
+    if (af == AF_INET)
+    {
+        on = 1;
+        if (setsockopt(sock, IPPROTO_IP, IP_HDRINCL, &on, sizeof (on)))
+        {
+            close(sock);
+            helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: setsockopt %s", strerror(errno));
+            return errno;
+        }
+
+        memset(sin_to, 0, sizeof(struct sockaddr_in));
+        sin_to->sin_len = sizeof(struct sockaddr_in);
+        sin_to->sin_family = AF_INET;
+        memcpy(&sin_to->sin_addr, sadd6, sizeof(struct in_addr));
+        sin_to->sin_port = rport;
+
+        msghdr.msg_control = NULL;
+        msghdr.msg_controllen = 0;
+
+    }
+    else
+    {
+        struct cmsghdr *ctl;
+
+        memset(sin6_to, 0, sizeof(struct sockaddr_in6));
+        sin6_to->sin6_len = sizeof(struct sockaddr_in6);
+        sin6_to->sin6_family = AF_INET6;
+        memcpy(&sin6_to->sin6_addr, dadd6, sizeof(struct in6_addr));
+
+        sin6_to->sin6_port = rport;
+        sin6_to->sin6_flowinfo = 0;
+
+
+        msghdr.msg_control = ctlbuf;
+        msghdr.msg_controllen = sizeof(ctlbuf);
+        ctl = CMSG_FIRSTHDR(&msghdr);
+        ctl->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
+        ctl->cmsg_level = IPPROTO_IPV6;
+        ctl->cmsg_type = IPV6_PKTINFO;
+        struct in6_pktinfo *pktinfo = (struct in6_pktinfo *) CMSG_DATA(ctl);
+        memcpy(&pktinfo->ipi6_addr, sadd6, sizeof(struct in6_addr));
+        pktinfo->ipi6_ifindex = 0;
+    }
+
+    msghdr.msg_name = (struct sockaddr *)&ss_to;
+    msghdr.msg_namelen = ss_to.ss_len;
+    iov.iov_base = packet;
+    iov.iov_len = packetlen;
+    msghdr.msg_iov = &iov;
+    msghdr.msg_iovlen = 1;
+    msghdr.msg_flags = 0;
+again:
+    len = sendmsg(sock, &msghdr, 0);
+    if (len == -1)
+    {
+        if (errno == EINTR)
+            goto again;
+    }
+
+    if (len != packetlen)
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: sendmsg failed %s", strerror(errno));
+    }
+    else
+    {
+        char source[INET6_ADDRSTRLEN], dest[INET6_ADDRSTRLEN];
+
+        inet_ntop(af, (void *)sadd6, source, sizeof(source));
+        inet_ntop(af, (void *)dadd6, dest, sizeof(dest));
+
+        helplog(ASL_LEVEL_ERR, "mDNSSendKeepalive: Success Source %s:%d, Dest %s:%d, %u, %u, %u", source, ntohs(lport), dest, ntohs(rport), ntohl(seq), ntohl(ack), ntohs(win));
+
+    }
+    close(sock);
+    return KERN_SUCCESS;
+}
+
+
+kern_return_t do_mDNSRetrieveTCPInfo(__unused mach_port_t port, int family, v6addr_t laddr, uint16_t lport, v6addr_t raddr, uint16_t  rport,
+                                     uint32_t *seq, uint32_t *ack, uint16_t *win, int32_t *intfid, audit_token_t token)
+{
+    struct tcp_info   ti;
+    struct info_tuple itpl;
+    int               mib[4];
+    unsigned int      miblen;
+    size_t            len;
+    size_t            sz;
+
+    memset(&itpl, 0, sizeof(struct info_tuple));
+    memset(&ti,   0, sizeof(struct tcp_info));
+
+    if (!authorized(&token))
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSRetrieveTCPInfo: Not authorized");
+        return kmDNSHelperNotAuthorized;
+    }
+
+    if (family == AF_INET)
+    {
+        memcpy(&itpl.itpl_local_sin.sin_addr,  laddr, sizeof(struct in_addr));
+        memcpy(&itpl.itpl_remote_sin.sin_addr, raddr, sizeof(struct in_addr));
+        itpl.itpl_local_sin.sin_port    = lport;
+        itpl.itpl_remote_sin.sin_port   = rport;
+        itpl.itpl_local_sin.sin_family  = AF_INET;
+        itpl.itpl_remote_sin.sin_family = AF_INET;
+    }
+    else
+    {
+        memcpy(&itpl.itpl_local_sin6.sin6_addr,  laddr, sizeof(struct in6_addr));
+        memcpy(&itpl.itpl_remote_sin6.sin6_addr, raddr, sizeof(struct in6_addr));
+        itpl.itpl_local_sin6.sin6_port    = lport;
+        itpl.itpl_remote_sin6.sin6_port   = rport;
+        itpl.itpl_local_sin6.sin6_family  = AF_INET6;
+        itpl.itpl_remote_sin6.sin6_family = AF_INET6;
+    }
+    itpl.itpl_proto = IPPROTO_TCP;
+    sz = sizeof(mib)/sizeof(mib[0]);
+    if (sysctlnametomib("net.inet.tcp.info", mib, &sz) == -1)
+    {
+        helplog(ASL_LEVEL_ERR, "do_RetrieveTCPInfo: sysctlnametomib failed %d, %s", errno, strerror(errno));
+        return errno;
+    }
+    miblen = (unsigned int)sz;
+    len    = sizeof(struct tcp_info);
+    if (sysctl(mib, miblen, &ti, &len, &itpl, sizeof(struct info_tuple)) == -1)
+    {
+        helplog(ASL_LEVEL_ERR, "do_RetrieveTCPInfo: sysctl failed %d, %s", errno, strerror(errno));
+        return errno;
+    }
+
+    *seq    = ti.tcpi_snd_nxt - 1;
+    *ack    = ti.tcpi_rcv_nxt;
+    *win    = ti.tcpi_rcv_space >> ti.tcpi_rcv_wscale;
+    *intfid = ti.tcpi_last_outif;
+    return KERN_SUCCESS;
+}
+
+static int getMACAddress(int family, v6addr_t raddr, v6addr_t gaddr, int *gfamily, ethaddr_t eth)
+{
+    struct
+    {
+        struct rt_msghdr m_rtm;
+        char   m_space[512];
+    } m_rtmsg;
+
+    struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
+    char  *cp  = m_rtmsg.m_space;
+    int    seq = 6367, sock, rlen, i;
+    struct sockaddr_in      *sin  = NULL;
+    struct sockaddr_in6     *sin6 = NULL;
+    struct sockaddr_dl      *sdl  = NULL;
+    struct sockaddr_storage  sins;
+    struct sockaddr_dl       sdl_m;
+
+#define NEXTADDR(w, s, len)         \
+    if (rtm->rtm_addrs & (w))       \
+    {                               \
+        bcopy((char *)s, cp, len);  \
+        cp += len;                  \
+    }
+
+    bzero(&sins,  sizeof(struct sockaddr_storage));
+    bzero(&sdl_m, sizeof(struct sockaddr_dl));
+    bzero((char *)&m_rtmsg, sizeof(m_rtmsg));
+
+    sock = socket(PF_ROUTE, SOCK_RAW, 0);
+    if (sock < 0)
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSGetRemoteMAC: Can not open the socket - %s", strerror(errno));
+        return errno;
+    }
+
+    rtm->rtm_addrs   |= RTA_DST | RTA_GATEWAY;
+    rtm->rtm_type     = RTM_GET;
+    rtm->rtm_flags    = 0;
+    rtm->rtm_version  = RTM_VERSION;
+    rtm->rtm_seq      = ++seq;
+
+    sdl_m.sdl_len     = sizeof(sdl_m);
+    sdl_m.sdl_family  = AF_LINK;
+    if (family == AF_INET)
+    {
+        sin = (struct sockaddr_in*)&sins;
+        sin->sin_family = AF_INET;
+        sin->sin_len    = sizeof(struct sockaddr_in);
+        memcpy(&sin->sin_addr, raddr, sizeof(struct in_addr));
+        NEXTADDR(RTA_DST, sin, sin->sin_len);
+    }
+    else if (family == AF_INET6)
+    {
+        sin6 = (struct sockaddr_in6 *)&sins;
+        sin6->sin6_len    = sizeof(struct sockaddr_in6);
+        sin6->sin6_family = AF_INET6;
+        memcpy(&sin6->sin6_addr, raddr, sizeof(struct in6_addr));
+        NEXTADDR(RTA_DST, sin6, sin6->sin6_len);
+    }
+    NEXTADDR(RTA_GATEWAY, &sdl_m, sdl_m.sdl_len);
+    rtm->rtm_msglen = rlen = cp - (char *)&m_rtmsg;
+
+    if (write(sock, (char *)&m_rtmsg, rlen) < 0)
+    {
+        helplog(ASL_LEVEL_INFO, "do_mDNSGetRemoteMAC: writing to routing socket: %s", strerror(errno));
+        close(sock);
+        return errno;
+    }
+
+    do
+    {
+        rlen = read(sock, (char *)&m_rtmsg, sizeof(m_rtmsg));
+    }
+    while (rlen > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != getpid()));
+
+    if (rlen < 0)
+        helplog(ASL_LEVEL_ERR, "do_mDNSGetRemoteMAC: Read from routing socket failed");
+
+    if (family == AF_INET)
+    {
+        sin = (struct sockaddr_in *) (rtm + 1);
+        sdl = (struct sockaddr_dl *) (sin->sin_len + (char *) sin);
+    }
+    else if (family == AF_INET6)
+    {
+        sin6 = (struct sockaddr_in6 *) (rtm +1);
+        sdl  = (struct sockaddr_dl  *) (sin6->sin6_len + (char *) sin6);
+    }
+    // If the address is not on the local net, we get the IP address of the gateway.
+    // We would have to repeat the process to get the MAC address of the gateway
+    *gfamily = sdl->sdl_family;
+    if (sdl->sdl_family == AF_INET)
+    {
+        struct sockaddr_in *new_sin = (struct sockaddr_in *)(sin->sin_len +(char*) sin);
+        memcpy(gaddr, &new_sin->sin_addr, sizeof(struct in_addr));
+        close(sock);
+        return -1;
+    }
+    else if (sdl->sdl_family == AF_INET6)
+    {
+        struct sockaddr_in6 *new_sin6 = (struct sockaddr_in6 *)(sin6->sin6_len +(char*) sin6);
+        memcpy(gaddr, &new_sin6->sin6_addr, sizeof(struct in6_addr));
+        close(sock);
+        return -1;
+    }
+
+    unsigned char *ptr = (unsigned char *)LLADDR(sdl);
+    for (i = 0; i < ETHER_ADDR_LEN; i++)
+        (eth)[i] = *(ptr +i);
+
+    close(sock);
+    return KERN_SUCCESS;
+}
+
+kern_return_t do_mDNSGetRemoteMAC(__unused mach_port_t port, int family, v6addr_t raddr, ethaddr_t eth, audit_token_t token)
+{
+    int      ret = 0;
+    v6addr_t gateway;
+    int      gfamily;
+    int      count = 0;
+
+    if (!authorized(&token))
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSGetRemoteMAC: Not authorized");
+        return kmDNSHelperNotAuthorized;
+    }
+
+    do
+    {
+        ret = getMACAddress(family, raddr, gateway, &gfamily, eth);
+        if (ret == -1)
+        {
+            memcpy(raddr, gateway, sizeof(family));
+            family = gfamily;
+            count++;
+        }
+    }
+    while ((ret == -1) && (count < 5));
+    return ret;
+}
+
+
+kern_return_t do_mDNSStoreSPSMACAddress(__unused mach_port_t port, int family, v6addr_t spsaddr, const char *ifname, audit_token_t token)
+{
+    ethaddr_t              eth;
+    char                   spsip[INET6_ADDRSTRLEN];
+    int                    ret        = 0;
+    CFStringRef            sckey      = NULL;
+    SCDynamicStoreRef      store      = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:StoreSPSMACAddress"), NULL, NULL);
+    SCDynamicStoreRef      ipstore    = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:GetIPv6Addresses"), NULL, NULL);
+    CFMutableDictionaryRef dict       = NULL;
+    CFStringRef            entityname = NULL;
+    CFDictionaryRef        ipdict     = NULL;
+    CFArrayRef             addrs      = NULL;
+
+    if (!authorized(&token))
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSStoreSPSMAC: Not authorized");
+        return kmDNSHelperNotAuthorized;
+    }
+
+    if ((store == NULL) || (ipstore == NULL))
+    {
+        helplog(ASL_LEVEL_ERR, "Unable to access SC Dynamic Store");
+        return KERN_FAILURE;
+    }
+
+    // Get the MAC address of the Sleep Proxy Server
+    memset(eth, 0, sizeof(eth));
+    ret = do_mDNSGetRemoteMAC(port, family, spsaddr, eth, token);
+    if (ret !=  KERN_SUCCESS)
+    {
+        helplog(ASL_LEVEL_ERR, "mDNSStoreSPSMAC: Failed to determine the MAC address");
+        goto fin;
+    }
+
+    // Create/Update the dynamic store entry for the specified interface
+    sckey = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%s%s%s"), "State:/Network/Interface/", ifname, "/BonjourSleepProxyAddress");
+    dict  = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    if (!dict)
+    {
+        helplog(ASL_LEVEL_ERR, "SPSCreateDict: Could not create CFDictionary dict");
+        ret = KERN_FAILURE;
+        goto fin;
+    }
+
+    CFStringRef macaddr = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%02x:%02x:%02x:%02x:%02x:%02x"), eth[0], eth[1], eth[2], eth[3], eth[4], eth[5]);
+    CFDictionarySetValue(dict, CFSTR("MACAddress"), macaddr);
+    if (NULL != macaddr) CFRelease(macaddr);
+
+    if( NULL == inet_ntop(family, (void *)spsaddr, spsip, sizeof(spsip)))
+    {
+         helplog(ASL_LEVEL_ERR, "inet_ntop failed: %s", strerror(errno));
+         ret = kmDNSHelperInvalidNetworkAddress;
+         goto fin;
+    }
+
+    CFStringRef ipaddr = CFStringCreateWithCString(NULL, spsip, kCFStringEncodingUTF8);
+    CFDictionarySetValue(dict, CFSTR("IPAddress"), ipaddr);
+    if (NULL != ipaddr) CFRelease(ipaddr);
+
+    // Get the current IPv6 addresses on this interface and store them so NAs can be sent on wakeup
+    if ((entityname = CFStringCreateWithFormat(NULL, NULL, CFSTR("State:/Network/Interface/%s/IPv6"), ifname)) != NULL)
+    {
+        if ((ipdict = SCDynamicStoreCopyValue(ipstore, entityname)) != NULL)
+        {
+            if((addrs = CFDictionaryGetValue(ipdict, CFSTR("Addresses"))) != NULL)
+            {
+                addrs = CFRetain(addrs);
+                CFDictionarySetValue(dict, CFSTR("RegisteredAddresses"), addrs);
+            }
+        }
+    }
+    SCDynamicStoreSetValue(store, sckey, dict);
+
+fin:
+    if (store)      CFRelease(store);
+    if (ipstore)    CFRelease(ipstore);
+    if (sckey)      CFRelease(sckey);
+    if (dict)       CFRelease(dict);
+    if (ipdict)     CFRelease(ipdict);
+    if (entityname) CFRelease(entityname);
+    if (addrs)      CFRelease(addrs);
+
+    update_idle_timer();
+    return ret;
+}
diff --git a/mDNSResponder/mDNSMacOSX/helper.h b/mDNSResponder/mDNSMacOSX/helper.h
new file mode 100644
index 00000000..a2982372
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helper.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007-2012 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef H_HELPER_H
+#define H_HELPER_H
+
+#define kmDNSHelperServiceName "com.apple.mDNSResponderHelper"
+
+enum mDNSPreferencesSetNameKey
+{
+    kmDNSComputerName = 1,
+    kmDNSLocalHostName
+};
+
+enum mDNSUpDown
+{
+    kmDNSUp = 1,
+    kmDNSDown
+};
+
+enum mDNSAutoTunnelSetKeysReplaceDelete
+{
+    kmDNSAutoTunnelSetKeysReplace = 1,
+    kmDNSAutoTunnelSetKeysDelete
+};
+
+// helper parses the system keychain and returns the information to mDNSResponder.
+// It returns four attributes. Attributes are defined after how they show up in
+// keychain access utility (the actual attribute name to retrieve these are different).
+enum mDNSKeyChainAttributes
+{
+    kmDNSKcWhere,   // Where
+    kmDNSKcAccount, // Account
+    kmDNSKcKey,     // Key
+    kmDNSKcName     // Name
+};
+
+#define ERROR(x, y) x,
+enum mDNSHelperErrors
+{
+    mDNSHelperErrorBase = 2300,
+    #include "helper-error.h"
+    mDNSHelperErrorEnd
+};
+#undef ERROR
+
+#include "mDNSEmbeddedAPI.h"
+#include "helpermsg-types.h"
+
+extern const char *mDNSHelperError(int errornum);
+
+extern mStatus mDNSHelperInit(void);
+extern void mDNSRequestBPF(void);
+extern int  mDNSPowerRequest(int key, int interval);
+extern int  mDNSSetLocalAddressCacheEntry(int ifindex, int family, const v6addr_t ip, const ethaddr_t eth);
+extern void mDNSNotify(const char *title, const char *msg);     // Both strings are UTF-8 text
+extern void mDNSPreferencesSetName(int key, domainlabel *old, domainlabel *new);
+extern int  mDNSKeychainGetSecrets(CFArrayRef *secrets);
+extern void mDNSConfigureServer(int updown, const char *const prefix, const domainname *const fqdn);
+extern int  mDNSAutoTunnelSetKeys(int replacedelete, v6addr_t local_inner,
+                                  v6addr_t local_outer, short local_port, v6addr_t remote_inner,
+                                  v6addr_t remote_outer, short remote_port, const char *const prefix, const domainname *const fqdn);
+extern void mDNSSendWakeupPacket(unsigned ifid, char *eth_addr, char *ip_addr, int iteration);
+extern void mDNSPacketFilterControl(uint32_t command, char * ifname, uint32_t count, pfArray_t portArray, pfArray_t protocolArray);
+extern void mDNSSendKeepalive(v6addr_t sadd, v6addr_t dadd, uint16_t lport, uint16_t rport, unsigned seq, unsigned ack, uint16_t win);
+extern int  mDNSRetrieveTCPInfo(int family, v6addr_t laddr, uint16_t lport, v6addr_t raddr, uint16_t rport, uint32_t *seq, uint32_t *ack, uint16_t *win, int32_t *intfid);
+extern void mDNSGetRemoteMAC(mDNS *const m, int family, v6addr_t raddr);
+extern void mDNSStoreSPSMACAddress(int family, v6addr_t spsaddr, char *ifname);
+
+#endif /* H_HELPER_H */
diff --git a/mDNSResponder/mDNSMacOSX/helpermsg-types.h b/mDNSResponder/mDNSMacOSX/helpermsg-types.h
new file mode 100644
index 00000000..ca5b140a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helpermsg-types.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef H_HELPERMSG_TYPES_H
+#define H_HELPERMSG_TYPES_H
+
+#include <stdint.h>
+typedef uint8_t v4addr_t [ 4];
+typedef uint8_t ethaddr_t[ 6];
+typedef uint8_t v6addr_t [16];
+typedef const char *string_t;
+
+#define PFPortArraySize 16
+typedef uint16_t pfArray_t [PFPortArraySize];
+
+#endif /* H_HELPERMSG_TYPES_H */
diff --git a/mDNSResponder/mDNSMacOSX/helpermsg.defs b/mDNSResponder/mDNSMacOSX/helpermsg.defs
new file mode 100644
index 00000000..58363082
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/helpermsg.defs
@@ -0,0 +1,143 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2007-2012 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+import "helpermsg-types.h";
+
+type v4addr_t  = array [ 4] of uint8_t;
+type ethaddr_t = array [ 6] of uint8_t;
+type v6addr_t  = array [16] of uint8_t;
+type string_t = c_string[*:1024];
+
+// Mig doesn't generate the output file if I use the constant PFPortArraySize below
+type pfArray_t  = array [16] of uint16_t;
+
+subsystem helper 1833193043;
+serverprefix do_;
+userprefix proxy_;
+
+simpleroutine mDNSExit(			port			: mach_port_t;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSRequestBPF(	port			: mach_port_t;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSPowerRequest(		port			: mach_port_t;
+								key				: int;
+								interval		: int;
+		out						err				: int;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSSetLocalAddressCacheEntry(
+								port			: mach_port_t;
+								ifindex			: int;
+								family			: int;
+								ip				: v6addr_t;
+								eth				: ethaddr_t;
+		out						err				: int;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSNotify(		port			: mach_port_t;
+								title			: string_t;
+								msg				: string_t;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSPreferencesSetName(
+								port			: mach_port_t;
+								key				: int;
+								old				: string_t;
+								new				: string_t;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSKeychainGetSecrets( port			: mach_port_t;
+		out						numsecrets		: unsigned;
+		out						secrets			: pointer_t;
+		out						err				: int;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSConfigureServer(
+								port			: mach_port_t;
+								updown			: int;
+								id				: string_t;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSAutoTunnelSetKeys(	port			: mach_port_t;
+								replacedelete	: int;
+								local_inner		: v6addr_t;
+								local_outer		: v6addr_t;
+								local_port		: uint16_t;		/* Port expressed as a numeric integer value */
+								remote_inner	: v6addr_t;
+								remote_outer	: v6addr_t;
+								remote_port		: uint16_t;		/* Port expressed as a numeric integer value */
+								id				: string_t;
+		out						err				: int;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSSendWakeupPacket(
+								port			: mach_port_t;
+								ifid			: unsigned;
+								eth_addr		: string_t;
+								ip_addr			: string_t;
+								iteration		: int;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSPacketFilterControl(
+								port			: mach_port_t;
+								command			: uint32_t;
+								ifname			: string_t;
+								arraySize		: uint32_t;
+								portArray		: pfArray_t;
+								protocolArray	: pfArray_t;
+		ServerAuditToken		token			: audit_token_t);
+
+
+simpleroutine mDNSSendKeepalive( port		: mach_port_t;
+								sadd			: v6addr_t;
+								dadd			: v6addr_t;
+								lport			: uint16_t;
+								rport			: uint16_t;
+								seq				: unsigned;
+								ack				: unsigned;
+								win				: uint16_t;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSRetrieveTCPInfo(
+								port			: mach_port_t;
+								family			: int;
+								laddr			: v6addr_t;
+								lport			: uint16_t;
+								raddr			: v6addr_t;
+								rport			: uint16_t;
+						 out	seq				: uint32_t;
+						 out	ack				: uint32_t;
+						 out	win				: uint16_t;
+						 out	intfid			: int32_t;
+		ServerAuditToken		token			: audit_token_t);
+
+routine mDNSGetRemoteMAC(		port			: mach_port_t;
+								family			: int;
+								raddr			: v6addr_t;
+		out						eth				: ethaddr_t;
+		ServerAuditToken		token			: audit_token_t);
+
+simpleroutine mDNSStoreSPSMACAddress(	port			: mach_port_t;
+								family			: int;
+								spsaddr			: v6addr_t;
+								ifname			: string_t;
+		ServerAuditToken		token			: audit_token_t);
diff --git a/mDNSResponder/mDNSMacOSX/ipsec_strerror.h b/mDNSResponder/mDNSMacOSX/ipsec_strerror.h
new file mode 100644
index 00000000..ecacf3b2
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/ipsec_strerror.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2003-2007 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*	$FreeBSD: src/lib/libipsec/ipsec_strerror.h,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $	*/
+/*	$KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+extern int __ipsec_errcode;
+extern void __ipsec_set_strerror __P((const char *));
+
+#define EIPSEC_NO_ERROR     0   /*success*/
+#define EIPSEC_NOT_SUPPORTED    1   /*not supported*/
+#define EIPSEC_INVAL_ARGUMENT   2   /*invalid argument*/
+#define EIPSEC_INVAL_SADBMSG    3   /*invalid sadb message*/
+#define EIPSEC_INVAL_VERSION    4   /*invalid version*/
+#define EIPSEC_INVAL_POLICY 5   /*invalid security policy*/
+#define EIPSEC_INVAL_ADDRESS    6   /*invalid address specification*/
+#define EIPSEC_INVAL_PROTO  7   /*invalid ipsec protocol*/
+#define EIPSEC_INVAL_MODE   8   /*Invalid ipsec mode*/
+#define EIPSEC_INVAL_LEVEL  9   /*invalid ipsec level*/
+#define EIPSEC_INVAL_SATYPE 10  /*invalid SA type*/
+#define EIPSEC_INVAL_MSGTYPE    11  /*invalid message type*/
+#define EIPSEC_INVAL_EXTTYPE    12  /*invalid extension type*/
+#define EIPSEC_INVAL_ALGS   13  /*Invalid algorithm type*/
+#define EIPSEC_INVAL_KEYLEN 14  /*invalid key length*/
+#define EIPSEC_INVAL_FAMILY 15  /*invalid address family*/
+#define EIPSEC_INVAL_PREFIXLEN  16  /*SPI range violation*/
+#define EIPSEC_INVAL_DIR    17  /*Invalid direciton*/
+#define EIPSEC_INVAL_SPI    18  /*invalid prefixlen*/
+#define EIPSEC_NO_PROTO     19  /*no protocol specified*/
+#define EIPSEC_NO_ALGS      20  /*No algorithm specified*/
+#define EIPSEC_NO_BUFS      21  /*no buffers available*/
+#define EIPSEC_DO_GET_SUPP_LIST 22  /*must get supported algorithm first*/
+#define EIPSEC_PROTO_MISMATCH   23  /*protocol mismatch*/
+#define EIPSEC_FAMILY_MISMATCH  24  /*family mismatch*/
+#define EIPSEC_FEW_ARGUMENTS    25  /*Too few arguments*/
+#define EIPSEC_SYSTEM_ERROR 26  /*system error*/
+#define EIPSEC_MAX      27  /*unknown error*/
diff --git a/mDNSResponder/mDNSMacOSX/libpfkey.h b/mDNSResponder/mDNSMacOSX/libpfkey.h
new file mode 100644
index 00000000..98d192d8
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/libpfkey.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2003-2007 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*	$FreeBSD: src/lib/libipsec/libpfkey.h,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $	*/
+/*	$KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+struct sadb_msg;
+extern void pfkey_sadump __P((struct sadb_msg *));
+extern void pfkey_spdump __P((struct sadb_msg *));
+
+struct sockaddr;
+struct sadb_alg;
+int ipsec_check_keylen __P((u_int, u_int, u_int));
+int ipsec_check_keylen2 __P((u_int, u_int, u_int));
+int ipsec_get_keylen __P((u_int, u_int, struct sadb_alg *));
+u_int pfkey_set_softrate __P((u_int, u_int));
+u_int pfkey_get_softrate __P((u_int));
+int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *,
+                           struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
+                           struct sockaddr *, u_int32_t, u_int32_t, u_int,
+                           caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
+                           u_int64_t, u_int64_t, u_int32_t));
+int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
+                        struct sockaddr *, u_int32_t, u_int32_t, u_int,
+                        caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
+                        u_int64_t, u_int64_t, u_int32_t));
+int pfkey_send_delete __P((int, u_int, u_int,
+                           struct sockaddr *, struct sockaddr *, u_int32_t));
+int pfkey_send_delete_all __P((int, u_int, u_int,
+                               struct sockaddr *, struct sockaddr *));
+int pfkey_send_get __P((int, u_int, u_int,
+                        struct sockaddr *, struct sockaddr *, u_int32_t));
+int pfkey_send_register __P((int, u_int));
+int pfkey_recv_register __P((int));
+int pfkey_set_supported __P((struct sadb_msg *, int));
+int pfkey_send_flush __P((int, u_int));
+int pfkey_send_dump __P((int, u_int));
+int pfkey_send_promisc_toggle __P((int, int));
+int pfkey_send_spdadd __P((int, struct sockaddr *, u_int,
+                           struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
+int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int,
+                            struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
+                            caddr_t, int, u_int32_t));
+int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int,
+                              struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
+int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int,
+                               struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
+                               caddr_t, int, u_int32_t));
+int pfkey_send_spddelete __P((int, struct sockaddr *, u_int,
+                              struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
+int pfkey_send_spddelete2 __P((int, u_int32_t));
+int pfkey_send_spdget __P((int, u_int32_t));
+int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int,
+                              struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
+int pfkey_send_spdflush __P((int));
+int pfkey_send_spddump __P((int));
+
+int pfkey_open __P((void));
+void pfkey_close __P((int));
+struct sadb_msg *pfkey_recv __P((int));
+int pfkey_send __P((int, struct sadb_msg *, int));
+int pfkey_align __P((struct sadb_msg *, caddr_t *));
+int pfkey_check __P((caddr_t *));
diff --git a/mDNSResponder/mDNSMacOSX/mDNSMacOSX.c b/mDNSResponder/mDNSMacOSX/mDNSMacOSX.c
new file mode 100644
index 00000000..fda595c9
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSMacOSX.c
@@ -0,0 +1,10442 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ***************************************************************************
+// mDNSMacOSX.c:
+// Supporting routines to run mDNS on a CFRunLoop platform
+// ***************************************************************************
+
+// For debugging, set LIST_ALL_INTERFACES to 1 to display all found interfaces,
+// including ones that mDNSResponder chooses not to use.
+#define LIST_ALL_INTERFACES 0
+
+#include "mDNSEmbeddedAPI.h"        // Defines the interface provided to the client layer above
+#include "DNSCommon.h"
+#include "uDNS.h"
+#include "mDNSMacOSX.h"             // Defines the specific types needed to run mDNS on this platform
+#include "dns_sd.h"                 // For mDNSInterface_LocalOnly etc.
+#include "PlatformCommon.h"
+#include "uds_daemon.h"
+#include "CryptoSupport.h"
+
+#include <stdio.h>
+#include <stdarg.h>                 // For va_list support
+#include <stdlib.h>                 // For arc4random
+#include <net/if.h>
+#include <net/if_types.h>           // For IFT_ETHER
+#include <net/if_dl.h>
+#include <net/bpf.h>                // For BIOCSETIF etc.
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/event.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <time.h>                   // platform support for UTC time
+#include <arpa/inet.h>              // for inet_aton
+#include <pthread.h>
+#include <netdb.h>                  // for getaddrinfo
+#include <sys/sockio.h>             // for SIOCGIFEFLAGS
+#include <notify.h>
+#include <netinet/in.h>             // For IP_RECVTTL
+#ifndef IP_RECVTTL
+#define IP_RECVTTL 24               // bool; receive reception TTL w/dgram
+#endif
+
+#include <netinet/in_systm.h>       // For n_long, required by <netinet/ip.h> below
+#include <netinet/ip.h>             // For IPTOS_LOWDELAY etc.
+#include <netinet6/in6_var.h>       // For IN6_IFF_NOTREADY etc.
+#include <netinet6/nd6.h>           // For ND6_INFINITE_LIFETIME etc.
+
+#include <netinet/tcp.h>
+
+#include <DebugServices.h>
+#include "dnsinfo.h"
+
+#include <ifaddrs.h>
+
+#include <IOKit/IOKitLib.h>
+#include <IOKit/IOMessage.h>
+
+#include <IOKit/ps/IOPowerSources.h>
+#include <IOKit/ps/IOPowerSourcesPrivate.h>
+#include <IOKit/ps/IOPSKeys.h>
+
+#include <mach/mach_error.h>
+#include <mach/mach_port.h>
+#include <mach/mach_time.h>
+#include "helper.h"
+#include "P2PPacketFilter.h"
+
+#include <asl.h>
+#include <SystemConfiguration/SCPrivate.h>
+
+// Include definition of opaque_presence_indication for KEV_DL_NODE_PRESENCE handling logic.
+#include <Kernel/IOKit/apple80211/apple80211_var.h>
+
+#if APPLE_OSX_mDNSResponder
+#include <DeviceToDeviceManager/DeviceToDeviceManager.h>
+#include <AWACS.h>
+#if !NO_D2D
+D2DStatus D2DInitialize(CFRunLoopRef runLoop, D2DServiceCallback serviceCallback, void* userData) __attribute__((weak_import));
+D2DStatus D2DRetain(D2DServiceInstance instanceHandle, D2DTransportType transportType) __attribute__((weak_import));
+D2DStatus D2DStopAdvertisingPairOnTransport(const Byte *key, const size_t keySize, const Byte *value, const size_t valueSize, D2DTransportType transport) __attribute__((weak_import));
+D2DStatus D2DRelease(D2DServiceInstance instanceHandle, D2DTransportType transportType) __attribute__((weak_import));
+D2DStatus D2DStartAdvertisingPairOnTransport(const Byte *key, const size_t keySize, const Byte *value, const size_t valueSize, D2DTransportType transport) __attribute__((weak_import));
+D2DStatus D2DStartBrowsingForKeyOnTransport(const Byte *key, const size_t keySize, D2DTransportType transport) __attribute__((weak_import));
+D2DStatus D2DStopBrowsingForKeyOnTransport(const Byte *key, const size_t keySize, D2DTransportType transport) __attribute__((weak_import));
+void D2DStartResolvingPairOnTransport(const Byte *key, const size_t keySize, const Byte *value, const size_t valueSize, D2DTransportType transport) __attribute__((weak_import));
+void D2DStopResolvingPairOnTransport(const Byte *key, const size_t keySize, const Byte *value, const size_t valueSize, D2DTransportType transport) __attribute__((weak_import));
+D2DStatus D2DTerminate() __attribute__((weak_import));
+
+#endif // ! NO_D2D
+
+#else
+#define NO_D2D 1
+#define NO_AWACS 1
+#endif // APPLE_OSX_mDNSResponder
+
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+#include <IOKit/platform/IOPlatformSupportPrivate.h>
+#endif // APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+
+
+#define kInterfaceSpecificOption "interface="
+
+#define mDNS_IOREG_KEY               "mDNS_KEY"
+#define mDNS_IOREG_VALUE             "2009-07-30"
+#define mDNS_IOREG_KA_KEY            "mDNS_Keepalive"
+#define mDNS_USER_CLIENT_CREATE_TYPE 'mDNS'
+
+// cache the InterfaceID of the AWDL interface 
+static mDNSInterfaceID AWDLInterfaceID;
+
+// ***************************************************************************
+// Globals
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark - Globals
+#endif
+
+// By default we don't offer sleep proxy service
+// If OfferSleepProxyService is set non-zero (typically via command-line switch),
+// then we'll offer sleep proxy service on desktop Macs that are set to never sleep.
+// We currently do not offer sleep proxy service on laptops, or on machines that are set to go to sleep.
+mDNSexport int OfferSleepProxyService = 0;
+mDNSexport int DisableSleepProxyClient = 0;
+mDNSexport int UseInternalSleepProxy = 1;       // Set to non-zero to use internal (in-NIC) Sleep Proxy
+
+mDNSexport int OSXVers, iOSVers;
+mDNSexport int KQueueFD;
+
+#ifndef NO_SECURITYFRAMEWORK
+static CFArrayRef ServerCerts;
+OSStatus SSLSetAllowAnonymousCiphers(SSLContextRef context, Boolean enable);
+#endif /* NO_SECURITYFRAMEWORK */
+
+static CFStringRef NetworkChangedKey_IPv4;
+static CFStringRef NetworkChangedKey_IPv6;
+static CFStringRef NetworkChangedKey_Hostnames;
+static CFStringRef NetworkChangedKey_Computername;
+static CFStringRef NetworkChangedKey_DNS;
+static CFStringRef NetworkChangedKey_StateInterfacePrefix;
+static CFStringRef NetworkChangedKey_DynamicDNS       = CFSTR("Setup:/Network/DynamicDNS");
+static CFStringRef NetworkChangedKey_BackToMyMac      = CFSTR("Setup:/Network/BackToMyMac");
+static CFStringRef NetworkChangedKey_BTMMConnectivity = CFSTR("State:/Network/Connectivity");
+static CFStringRef NetworkChangedKey_PowerSettings    = CFSTR("State:/IOKit/PowerManagement/CurrentSettings");
+
+static char HINFO_HWstring_buffer[32];
+static char *HINFO_HWstring = "Device";
+static int HINFO_HWstring_prefixlen = 6;
+
+mDNSexport int WatchDogReportingThreshold = 250;
+
+dispatch_queue_t SSLqueue;
+
+//To prevent blocking the main queue, all writes to DynamicStore happen on the DynamicStoreQueue
+static dispatch_queue_t DynamicStoreQueue;
+
+#if TARGET_OS_EMBEDDED
+#define kmDNSResponderManagedPrefsID CFSTR("/Library/Managed Preferences/mobile/com.apple.mDNSResponder.plist")
+#endif
+
+#if APPLE_OSX_mDNSResponder
+static mDNSu8 SPMetricPortability   = 99;
+static mDNSu8 SPMetricMarginalPower = 99;
+static mDNSu8 SPMetricTotalPower    = 99;
+static mDNSu8 SPMetricFeatures      = 1; /* The current version supports TCP Keep Alive Feature */
+mDNSexport domainname ActiveDirectoryPrimaryDomain;
+mDNSexport int ActiveDirectoryPrimaryDomainLabelCount;
+mDNSexport mDNSAddr ActiveDirectoryPrimaryDomainServer;
+#endif // APPLE_OSX_mDNSResponder
+
+// Don't send triggers too often. We arbitrarily limit it to three minutes.
+#define DNS_TRIGGER_INTERVAL (180 * mDNSPlatformOneSecond)
+
+// Used by AutoTunnel
+const char btmmprefix[] = "btmmdns:";
+const char dnsprefix[] = "dns:";
+
+// String Array used to write list of private domains to Dynamic Store
+static CFArrayRef privateDnsArray = NULL;
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - D2D Support
+#endif
+
+#if !NO_D2D
+
+mDNSexport void D2D_start_advertising_interface(NetworkInterfaceInfo *interface)
+{
+    // AWDL wants the address and reverse address PTR record communicated
+    // via the D2D interface layer.
+    if (interface->InterfaceID == AWDLInterfaceID)
+    {
+        // only log if we have a valid record to start advertising
+        if (interface->RR_A.resrec.RecordType || interface->RR_PTR.resrec.RecordType)
+            LogInfo("D2D_start_advertising_interface: %s", interface->ifname);
+
+        if (interface->RR_A.resrec.RecordType)
+            external_start_advertising_service(&interface->RR_A.resrec, NULL);
+        if (interface->RR_PTR.resrec.RecordType)
+            external_start_advertising_service(&interface->RR_PTR.resrec, NULL);
+    }
+}
+
+mDNSexport void D2D_stop_advertising_interface(NetworkInterfaceInfo *interface)
+{
+    if (interface->InterfaceID == AWDLInterfaceID)
+    {
+        // only log if we have a valid record to stop advertising
+        if (interface->RR_A.resrec.RecordType || interface->RR_PTR.resrec.RecordType)
+            LogInfo("D2D_stop_advertising_interface: %s", interface->ifname);
+
+        if (interface->RR_A.resrec.RecordType)
+            external_stop_advertising_service(&interface->RR_A.resrec, NULL);
+        if (interface->RR_PTR.resrec.RecordType)
+            external_stop_advertising_service(&interface->RR_PTR.resrec, NULL);
+    }
+}
+
+// Name compression items for fake packet version number 1
+static const mDNSu8 compression_packet_v1 = 0x01;
+
+static DNSMessage compression_base_msg = { { {{0}}, {{0}}, 2, 0, 0, 0 }, "\x04_tcp\x05local\x00\x00\x0C\x00\x01\x04_udp\xC0\x11\x00\x0C\x00\x01" };
+static mDNSu8 *const compression_limit = (mDNSu8 *) &compression_base_msg + sizeof(DNSMessage);
+static mDNSu8 *const compression_lhs = (mDNSu8 *const) compression_base_msg.data + 27;
+
+mDNSlocal void FreeD2DARElemCallback(mDNS *const m, AuthRecord *const rr, mStatus result);
+mDNSlocal void PrintHex(mDNSu8 *data, mDNSu16 len);
+
+typedef struct D2DRecordListElem
+{
+    struct D2DRecordListElem *next;
+    D2DServiceInstance       instanceHandle;
+    D2DTransportType         transportType;
+    AuthRecord               ar;    // must be last in the structure to accomodate extra space
+                                    // allocated for large records.
+} D2DRecordListElem;
+
+static D2DRecordListElem *D2DRecords = NULL; // List of records returned with D2DServiceFound events
+
+typedef struct D2DBrowseListElem
+{
+    struct D2DBrowseListElem *next;
+    domainname name;
+    mDNSu16 type;
+    unsigned int refCount;
+} D2DBrowseListElem;
+
+D2DBrowseListElem* D2DBrowseList = NULL;
+
+mDNSlocal mDNSu8 *putVal16(mDNSu8 *ptr, mDNSu16 val)
+{
+    ptr[0] = (mDNSu8)((val >> 8 ) & 0xFF);
+    ptr[1] = (mDNSu8)((val      ) & 0xFF);
+    return ptr + sizeof(mDNSu16);
+}
+
+mDNSlocal mDNSu8 *putVal32(mDNSu8 *ptr, mDNSu32 val)
+{
+    ptr[0] = (mDNSu8)((val >> 24) & 0xFF);
+    ptr[1] = (mDNSu8)((val >> 16) & 0xFF);
+    ptr[2] = (mDNSu8)((val >>  8) & 0xFF);
+    ptr[3] = (mDNSu8)((val      ) & 0xFF);
+    return ptr + sizeof(mDNSu32);
+}
+
+mDNSlocal void DomainnameToLower(const domainname * const in, domainname * const out)
+{
+    const mDNSu8 * const start = (const mDNSu8 * const)in;
+    mDNSu8 *ptr = (mDNSu8*)start;
+    while(*ptr)
+    {
+        mDNSu8 c = *ptr;
+        out->c[ptr-start] = *ptr;
+        ptr++;
+        for (; c; c--,ptr++) out->c[ptr-start] = mDNSIsUpperCase(*ptr) ? (*ptr - 'A' + 'a') : *ptr;
+    }
+    out->c[ptr-start] = *ptr;
+}
+
+mDNSlocal mStatus DNSNameCompressionParseBytes(mDNS *const m, const mDNSu8 *const lhs, const mDNSu16 lhs_len, const mDNSu8 *const rhs, const mDNSu16 rhs_len, AuthRecord *rr)
+{
+    if (mDNS_LoggingEnabled)
+    {
+        LogInfo("%s", __func__);
+        LogInfo("  Static Bytes: (%d bytes)", compression_lhs - (mDNSu8*)&compression_base_msg);
+        PrintHex((mDNSu8*)&compression_base_msg, compression_lhs - (mDNSu8*)&compression_base_msg);
+    }
+
+    mDNSu8 *ptr = compression_lhs; // pointer to the end of our fake packet
+
+    // Check to make sure we're not going to go past the end of the DNSMessage data
+    // 7 = 2 for CLASS (-1 for our version) + 4 for TTL + 2 for RDLENGTH
+    if (ptr + lhs_len - 7 + rhs_len >= compression_limit) return mStatus_NoMemoryErr;
+
+    // Copy the LHS onto our fake wire packet
+    mDNSPlatformMemCopy(ptr, lhs, lhs_len);
+    ptr += lhs_len - 1;
+
+    // Check the 'fake packet' version number, to ensure that we know how to decompress this data
+    if (*ptr != compression_packet_v1) return mStatus_Incompatible;
+
+    // two bytes of CLASS
+    ptr = putVal16(ptr, kDNSClass_IN | kDNSClass_UniqueRRSet);
+
+    // four bytes of TTL
+    ptr = putVal32(ptr, 120);
+
+    // Copy the RHS length into the RDLENGTH of our fake wire packet
+    ptr = putVal16(ptr, rhs_len);
+
+    // Copy the RHS onto our fake wire packet
+    mDNSPlatformMemCopy(ptr, rhs, rhs_len);
+    ptr += rhs_len;
+
+    if (mDNS_LoggingEnabled)
+    {
+        LogInfo("  Our Bytes (%d bytes): ", ptr - compression_lhs);
+        PrintHex(compression_lhs, ptr - compression_lhs);
+    }
+
+    ptr = (mDNSu8 *) GetLargeResourceRecord(m, &compression_base_msg, compression_lhs, ptr, mDNSInterface_Any, kDNSRecordTypePacketAns, &m->rec);
+    if (!ptr || m->rec.r.resrec.RecordType == kDNSRecordTypePacketNegative)
+    { LogMsg("DNSNameCompressionParseBytes: failed to get large RR"); m->rec.r.resrec.RecordType = 0; return mStatus_UnknownErr; }
+    else LogInfo("DNSNameCompressionParseBytes: got rr: %s", CRDisplayString(m, &m->rec.r));
+
+    mDNS_SetupResourceRecord(rr, mDNSNULL, mDNSInterface_P2P, m->rec.r.resrec.rrtype, 7200, kDNSRecordTypeShared, AuthRecordP2P, FreeD2DARElemCallback, NULL);
+    AssignDomainName(&rr->namestorage, &m->rec.namestorage);
+    rr->resrec.rdlength = m->rec.r.resrec.rdlength;
+    rr->resrec.rdata->MaxRDLength = m->rec.r.resrec.rdlength;
+    mDNSPlatformMemCopy(rr->resrec.rdata->u.data, m->rec.r.resrec.rdata->u.data, m->rec.r.resrec.rdlength);
+    rr->resrec.namehash = DomainNameHashValue(rr->resrec.name);
+    SetNewRData(&rr->resrec, mDNSNULL, 0);  // Sets rr->rdatahash for us
+
+    m->rec.r.resrec.RecordType = 0; // Mark m->rec as no longer in use
+
+    return mStatus_NoError;
+}
+
+mDNSlocal mDNSu8 * DNSNameCompressionBuildLHS(const domainname* typeDomain, DNS_TypeValues qtype)
+{
+    mDNSu8 *ptr = putDomainNameAsLabels(&compression_base_msg, compression_lhs, compression_limit, typeDomain);
+    if (!ptr) return ptr;
+    *ptr = (qtype >> 8) & 0xff;
+    ptr += 1;
+    *ptr = qtype & 0xff;
+    ptr += 1;
+    *ptr = compression_packet_v1;
+    return ptr + 1;
+}
+
+mDNSlocal mDNSu8 * DNSNameCompressionBuildRHS(mDNSu8 *start, const ResourceRecord *const resourceRecord)
+{
+    return putRData(&compression_base_msg, start, compression_limit, resourceRecord);
+}
+
+#define PRINT_DEBUG_BYTES_LIMIT 64  // set limit on number of record bytes printed for debugging
+
+mDNSlocal void PrintHex(mDNSu8 *data, mDNSu16 len)
+{
+    mDNSu8 *end;
+    char buffer[49] = {0};
+    char *bufend = buffer + sizeof(buffer);
+
+    if (len > PRINT_DEBUG_BYTES_LIMIT)
+    {
+        LogInfo(" (limiting debug output to %d bytes)", PRINT_DEBUG_BYTES_LIMIT);
+        len = PRINT_DEBUG_BYTES_LIMIT;
+    }
+    end = data + len;
+
+    while(data < end)
+    {
+        char *ptr = buffer;
+        for(; data < end && ptr < bufend-1; ptr+=3,data++)
+            mDNS_snprintf(ptr, bufend - ptr, "%02X ", *data);
+        LogInfo("    %s", buffer);
+    }
+}
+
+mDNSlocal void PrintHelper(const char *const tag, mDNSu8 *lhs, mDNSu16 lhs_len, mDNSu8 *rhs, mDNSu16 rhs_len)
+{
+    if (!mDNS_LoggingEnabled) return;
+
+    LogInfo("%s:", tag);
+    LogInfo("  LHS: (%d bytes)", lhs_len);
+    PrintHex(lhs, lhs_len);
+
+    if (!rhs) return;
+
+    LogInfo("  RHS: (%d bytes)", rhs_len);
+    PrintHex(rhs, rhs_len);
+}
+
+mDNSlocal void FreeD2DARElemCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;  // unused
+    if (result == mStatus_MemFree)
+    {
+        D2DRecordListElem **ptr = &D2DRecords;
+        D2DRecordListElem *tmp;
+        while (*ptr && &(*ptr)->ar != rr) ptr = &(*ptr)->next;
+        if (!*ptr) { LogMsg("FreeD2DARElemCallback: Could not find in D2DRecords: %s", ARDisplayString(m, rr)); return; }
+        LogInfo("FreeD2DARElemCallback: Found in D2DRecords: %s", ARDisplayString(m, rr));
+        tmp = *ptr;
+        *ptr = (*ptr)->next;
+        // Just because we stoppped browsing, doesn't mean we should tear down the PAN connection.
+        mDNSPlatformMemFree(tmp);
+    }
+}
+
+mDNSexport void external_connection_release(const domainname *instance)
+{
+    (void) instance;
+    D2DRecordListElem *ptr = D2DRecords;
+
+    for ( ; ptr ; ptr = ptr->next)
+    {
+        if ((ptr->ar.resrec.rrtype == kDNSServiceType_PTR) &&
+             SameDomainName(&ptr->ar.rdatastorage.u.name, instance))
+        {
+            LogInfo("external_connection_release: Calling D2DRelease(instanceHandle = %p, transportType = %d", 
+                ptr->instanceHandle,  ptr->transportType);
+            if (D2DRelease) D2DRelease(ptr->instanceHandle, ptr->transportType);
+        }
+    }
+}
+
+mDNSlocal void xD2DClearCache(const domainname *regType, DNS_TypeValues qtype)
+{
+    D2DRecordListElem *ptr = D2DRecords;
+    for ( ; ptr ; ptr = ptr->next)
+    {
+        if ((ptr->ar.resrec.rrtype == qtype) && SameDomainName(&ptr->ar.namestorage, regType))
+        {
+            mDNS_Deregister(&mDNSStorage, &ptr->ar);
+            LogInfo("xD2DClearCache: Clearing cache record and deregistering %s", ARDisplayString(&mDNSStorage, &ptr->ar));
+        }
+    }
+}
+
+mDNSlocal D2DBrowseListElem ** D2DFindInBrowseList(const domainname *const name, mDNSu16 type)
+{
+    D2DBrowseListElem **ptr = &D2DBrowseList;
+
+    for ( ; *ptr; ptr = &(*ptr)->next)
+        if ((*ptr)->type == type && SameDomainName(&(*ptr)->name, name))
+            break;
+
+    return ptr;
+}
+
+mDNSlocal unsigned int D2DBrowseListRefCount(const domainname *const name, mDNSu16 type)
+{
+    D2DBrowseListElem **ptr = D2DFindInBrowseList(name, type);
+    return *ptr ? (*ptr)->refCount : 0;
+}
+
+mDNSlocal void D2DBrowseListRetain(const domainname *const name, mDNSu16 type)
+{
+    D2DBrowseListElem **ptr = D2DFindInBrowseList(name, type);
+
+    if (!*ptr)
+    {
+        *ptr = mDNSPlatformMemAllocate(sizeof(**ptr));
+        mDNSPlatformMemZero(*ptr, sizeof(**ptr));
+        (*ptr)->type = type;
+        AssignDomainName(&(*ptr)->name, name);
+    }
+    (*ptr)->refCount += 1;
+
+    LogInfo("D2DBrowseListRetain: %##s %s refcount now %u", (*ptr)->name.c, DNSTypeName((*ptr)->type), (*ptr)->refCount);
+}
+
+mDNSlocal void D2DBrowseListRelease(const domainname *const name, mDNSu16 type)
+{
+    D2DBrowseListElem **ptr = D2DFindInBrowseList(name, type);
+
+    if (!*ptr) { LogMsg("D2DBrowseListRelease: Didn't find %##s %s in list", name->c, DNSTypeName(type)); return; }
+
+    (*ptr)->refCount -= 1;
+
+    LogInfo("D2DBrowseListRelease: %##s %s refcount now %u", (*ptr)->name.c, DNSTypeName((*ptr)->type), (*ptr)->refCount);
+
+    if (!(*ptr)->refCount)
+    {
+        D2DBrowseListElem *tmp = *ptr;
+        *ptr = (*ptr)->next;
+        mDNSPlatformMemFree(tmp);
+    }
+}
+
+mDNSlocal mStatus xD2DParse(mDNS *const m, const mDNSu8 * const lhs, const mDNSu16 lhs_len, const mDNSu8 * const rhs, const mDNSu16 rhs_len, AuthRecord *rr)
+{
+    if (*(lhs + (lhs_len - 1)) == compression_packet_v1)
+        return DNSNameCompressionParseBytes(m, lhs, lhs_len, rhs, rhs_len, rr);
+    else
+        return mStatus_Incompatible;
+}
+
+mDNSlocal void xD2DAddToCache(mDNS *const m, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize)
+{
+    if (result == kD2DSuccess)
+    {
+        if ( key == NULL || value == NULL || keySize == 0 || valueSize == 0) { LogMsg("xD2DAddToCache: NULL Byte * passed in or length == 0"); return; }
+
+        mStatus err;
+        D2DRecordListElem *ptr = mDNSPlatformMemAllocate(sizeof(D2DRecordListElem) + (valueSize < sizeof(RData) ? 0 : valueSize - sizeof(RData)));
+
+        if (ptr == NULL) { LogMsg("xD2DAddToCache: memory allocation failure"); return; }
+
+        err = xD2DParse(m, (const mDNSu8 * const)key, (const mDNSu16)keySize, (const mDNSu8 * const)value, (const mDNSu16)valueSize, &ptr->ar);
+        if (err)
+        {
+            LogMsg("xD2DAddToCache: xD2DParse returned error: %d", err);
+            PrintHelper(__func__, (mDNSu8 *)key, (mDNSu16)keySize, (mDNSu8 *)value, (mDNSu16)valueSize);
+            mDNSPlatformMemFree(ptr);
+            return;
+        }
+        err = mDNS_Register(m, &ptr->ar);
+        if (err)
+        {
+            LogMsg("xD2DAddToCache: mDNS_Register returned error %d for %s", err, ARDisplayString(m, &ptr->ar));
+            mDNSPlatformMemFree(ptr);
+            return;
+        }
+
+        LogInfo("xD2DAddToCache: mDNS_Register succeeded for %s", ARDisplayString(m, &ptr->ar));
+        ptr->instanceHandle = instanceHandle;
+        ptr->transportType = transportType;
+        ptr->next = D2DRecords;
+        D2DRecords = ptr;
+    }
+    else
+        LogMsg("xD2DAddToCache: Unexpected result %d", result);
+}
+
+mDNSlocal D2DRecordListElem * xD2DFindInList(mDNS *const m, const Byte *const key, const size_t keySize, const Byte *const value, const size_t valueSize)
+{
+    D2DRecordListElem *ptr = D2DRecords;
+    D2DRecordListElem *arptr;
+
+    if ( key == NULL || value == NULL || keySize == 0 || valueSize == 0) { LogMsg("xD2DFindInList: NULL Byte * passed in or length == 0"); return NULL; }
+
+    arptr = mDNSPlatformMemAllocate(sizeof(D2DRecordListElem) + (valueSize < sizeof(RData) ? 0 : valueSize - sizeof(RData)));
+    if (arptr == NULL) { LogMsg("xD2DFindInList: memory allocation failure"); return NULL; }
+
+    if (xD2DParse(m, (const mDNSu8 *const)key, (const mDNSu16)keySize, (const mDNSu8 *const)value, (const mDNSu16)valueSize, &arptr->ar) != mStatus_NoError)
+    {
+        LogMsg("xD2DFindInList: xD2DParse failed for key: %p (%u) value: %p (%u)", key, keySize, value, valueSize);
+        mDNSPlatformMemFree(arptr);
+        return NULL;
+    }
+
+    while (ptr)
+    {
+        if (IdenticalResourceRecord(&arptr->ar.resrec, &ptr->ar.resrec)) break;
+        ptr = ptr->next;
+    }
+
+    if (!ptr) LogMsg("xD2DFindInList: Could not find in D2DRecords: %s", ARDisplayString(m, &arptr->ar));
+    mDNSPlatformMemFree(arptr);
+    return ptr;
+}
+
+mDNSlocal void xD2DRemoveFromCache(mDNS *const m, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize)
+{
+    (void)transportType; // We don't care about this, yet.
+    (void)instanceHandle; // We don't care about this, yet.
+
+    if (result == kD2DSuccess)
+    {
+        D2DRecordListElem *ptr = xD2DFindInList(m, key, keySize, value, valueSize);
+        if (ptr)
+        {
+            LogInfo("xD2DRemoveFromCache: Remove from cache: %s", ARDisplayString(m, &ptr->ar));
+            mDNS_Deregister(m, &ptr->ar);
+        }
+    }
+    else
+        LogMsg("xD2DRemoveFromCache: Unexpected result %d", result);
+}
+
+mDNSlocal void xD2DServiceResolved(mDNS *const m, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize)
+{
+    (void)m;
+    (void)key;
+    (void)keySize;
+    (void)value;
+    (void)valueSize;
+
+    if (result == kD2DSuccess)
+    {
+        LogInfo("xD2DServiceResolved: Starting up PAN connection for %p", instanceHandle);
+        if (D2DRetain) D2DRetain(instanceHandle, transportType);
+    }
+    else LogMsg("xD2DServiceResolved: Unexpected result %d", result);
+}
+
+mDNSlocal void xD2DRetainHappened(mDNS *const m, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize)
+{
+    (void)m;
+    (void)instanceHandle;
+    (void)transportType;
+    (void)key;
+    (void)keySize;
+    (void)value;
+    (void)valueSize;
+
+    if (result == kD2DSuccess) LogInfo("xD2DRetainHappened: Opening up PAN connection for %p", instanceHandle);
+    else LogMsg("xD2DRetainHappened: Unexpected result %d", result);
+}
+
+mDNSlocal void xD2DReleaseHappened(mDNS *const m, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize)
+{
+    (void)m;
+    (void)instanceHandle;
+    (void)transportType;
+    (void)key;
+    (void)keySize;
+    (void)value;
+    (void)valueSize;
+
+    if (result == kD2DSuccess) LogInfo("xD2DReleaseHappened: Closing PAN connection for %p", instanceHandle);
+    else LogMsg("xD2DReleaseHappened: Unexpected result %d", result);
+}
+
+mDNSlocal void xD2DServiceCallback(D2DServiceEvent event, D2DStatus result, D2DServiceInstance instanceHandle, D2DTransportType transportType, const Byte *key, size_t keySize, const Byte *value, size_t valueSize, void *userData)
+{
+    mDNS *m = (mDNS *) userData;
+    const char *eventString = "unknown";
+
+    KQueueLock(m);
+
+    if (keySize   > 0xFFFF) LogMsg("xD2DServiceCallback: keySize too large: %u", keySize);
+    if (valueSize > 0xFFFF) LogMsg("xD2DServiceCallback: valueSize too large: %u", valueSize);
+
+    switch (event)
+    {
+    case D2DServiceFound:
+        eventString = "D2DServiceFound";
+        break;
+    case D2DServiceLost:
+        eventString = "D2DServiceLost";
+        break;
+    case D2DServiceResolved:
+        eventString = "D2DServiceResolved";
+        break;
+    case D2DServiceRetained:
+        eventString = "D2DServiceRetained";
+        break;
+    case D2DServiceReleased:
+        eventString = "D2DServiceReleased";
+        break;
+    default:
+        break;
+    }
+
+    LogInfo("xD2DServiceCallback: event=%s result=%d instanceHandle=%p transportType=%d LHS=%p (%u) RHS=%p (%u) userData=%p", eventString, result, instanceHandle, transportType, key, keySize, value, valueSize, userData);
+    PrintHelper(__func__, (mDNSu8 *)key, (mDNSu16)keySize, (mDNSu8 *)value, (mDNSu16)valueSize);
+
+    switch (event)
+    {
+    case D2DServiceFound:
+        xD2DAddToCache(m, result, instanceHandle, transportType, key, keySize, value, valueSize);
+        break;
+    case D2DServiceLost:
+        xD2DRemoveFromCache(m, result, instanceHandle, transportType, key, keySize, value, valueSize);
+        break;
+    case D2DServiceResolved:
+        xD2DServiceResolved(m, result, instanceHandle, transportType, key, keySize, value, valueSize);
+        break;
+    case D2DServiceRetained:
+        xD2DRetainHappened(m, result, instanceHandle, transportType, key, keySize, value, valueSize);
+        break;
+    case D2DServiceReleased:
+        xD2DReleaseHappened(m, result, instanceHandle, transportType, key, keySize, value, valueSize);
+        break;
+    default:
+        break;
+    }
+
+    // Need to tickle the main kqueue loop to potentially handle records we removed or added.
+    KQueueUnlock(m, "xD2DServiceCallback");
+}
+
+// Map interface index and flags to a specific D2D transport type or D2DTransportMax if all plugins 
+// should be called.
+// When D2DTransportMax is returned, if a specific transport should not be called, *excludedTransportType 
+// will be set to the excluded transport value, otherwise, it will be set to D2DTransportMax.
+// If the return value is not D2DTransportMax, excludedTransportType is undefined.
+
+mDNSlocal D2DTransportType xD2DInterfaceToTransportType(mDNSInterfaceID InterfaceID, DNSServiceFlags flags, D2DTransportType * excludedTransportType)
+{
+    NetworkInterfaceInfoOSX *info;
+
+    // Default exludes the D2DAWDLTransport when D2DTransportMax is returned.
+    *excludedTransportType = D2DAWDLTransport;
+
+    // Call all D2D plugins when both kDNSServiceFlagsIncludeP2P and kDNSServiceFlagsIncludeAWDL are set.
+    if ((flags & kDNSServiceFlagsIncludeP2P) && (flags & kDNSServiceFlagsIncludeAWDL))
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DTransportMax (including AWDL) since both kDNSServiceFlagsIncludeP2P and kDNSServiceFlagsIncludeAWDL are set");
+        *excludedTransportType = D2DTransportMax;
+        return D2DTransportMax;
+    } 
+    // Call all D2D plugins (exlcluding AWDL) when only kDNSServiceFlagsIncludeP2P is set.
+    else if (flags & kDNSServiceFlagsIncludeP2P)
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DTransportMax (excluding AWDL) since only kDNSServiceFlagsIncludeP2P is set");
+        return D2DTransportMax;
+    }
+    // Call AWDL D2D plugin when only kDNSServiceFlagsIncludeAWDL is set.
+    else if (flags & kDNSServiceFlagsIncludeAWDL)
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DAWDLTransport since only kDNSServiceFlagsIncludeAWDL is set");
+        return D2DAWDLTransport;
+    }
+
+    if (InterfaceID == mDNSInterface_P2P)
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DTransportMax (excluding AWDL) for interface index mDNSInterface_P2P");
+        return D2DTransportMax; 
+    }
+
+    // Compare to cached AWDL interface ID.
+    if (AWDLInterfaceID && (InterfaceID == AWDLInterfaceID))
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DAWDLTransport for interface index %d", InterfaceID);
+        return D2DAWDLTransport;
+    }
+
+    info = IfindexToInterfaceInfoOSX(&mDNSStorage, InterfaceID);
+    if (info == NULL)
+    {
+        LogInfo("xD2DInterfaceToTransportType: Invalid interface index %d", InterfaceID);
+        return D2DTransportMax;
+    }
+
+    // Recognize AirDrop specific p2p* interface based on interface name.
+    if (strncmp(info->ifinfo.ifname, "p2p", 3) == 0)
+    {
+        LogInfo("xD2DInterfaceToTransportType: returning D2DWifiPeerToPeerTransport for interface index %d", InterfaceID);
+        return D2DWifiPeerToPeerTransport;
+    }
+
+    // Currently there is no way to identify Bluetooth interface by name,
+    // since they use "en*" based name strings.
+
+    LogInfo("xD2DInterfaceToTransportType: returning default D2DTransportMax for interface index %d", InterfaceID);
+    return D2DTransportMax;
+}
+
+mDNSexport void external_start_browsing_for_service(mDNSInterfaceID InterfaceID, const domainname *const typeDomain, DNS_TypeValues qtype, DNSServiceFlags flags)
+{
+    domainname lower;
+
+    if (qtype == kDNSServiceType_A || qtype == kDNSServiceType_AAAA)
+    {
+        LogInfo("external_start_browsing_for_service: ignoring address record");
+        return;
+    }
+
+    DomainnameToLower(typeDomain, &lower);
+
+    if (!D2DBrowseListRefCount(&lower, qtype))
+    {
+        D2DTransportType transportType, excludedTransport;
+
+        LogInfo("external_start_browsing_for_service: Starting browse for: %##s %s", lower.c, DNSTypeName(qtype));
+        mDNSu8 *end = DNSNameCompressionBuildLHS(&lower, qtype);
+        PrintHelper(__func__, compression_lhs, end - compression_lhs, mDNSNULL, 0);
+
+        transportType = xD2DInterfaceToTransportType(InterfaceID, flags, & excludedTransport);
+        if (transportType == D2DTransportMax)
+        {
+            D2DTransportType i;
+            for (i = 0; i < D2DTransportMax; i++)
+            {
+                if (i == excludedTransport) continue;
+                if (D2DStartBrowsingForKeyOnTransport) D2DStartBrowsingForKeyOnTransport(compression_lhs, end - compression_lhs, i);
+            }
+        }
+        else
+        {
+            if (D2DStartBrowsingForKeyOnTransport) D2DStartBrowsingForKeyOnTransport(compression_lhs, end - compression_lhs, transportType);
+        }
+    }
+    D2DBrowseListRetain(&lower, qtype);
+}
+
+mDNSexport void external_stop_browsing_for_service(mDNSInterfaceID InterfaceID, const domainname *const typeDomain, DNS_TypeValues qtype, DNSServiceFlags flags)
+{
+    domainname lower;
+
+    if (qtype == kDNSServiceType_A || qtype == kDNSServiceType_AAAA)
+    {
+        LogInfo("external_stop_browsing_for_service: ignoring address record");
+        return;
+    }
+
+    DomainnameToLower(typeDomain, &lower);
+
+    D2DBrowseListRelease(&lower, qtype);
+    if (!D2DBrowseListRefCount(&lower, qtype))
+    {
+        D2DTransportType transportType, excludedTransport;
+
+        LogInfo("external_stop_browsing_for_service: Stopping browse for: %##s %s", lower.c, DNSTypeName(qtype));
+        mDNSu8 *end = DNSNameCompressionBuildLHS(&lower, qtype);
+        PrintHelper(__func__, compression_lhs, end - compression_lhs, mDNSNULL, 0);
+
+        transportType = xD2DInterfaceToTransportType(InterfaceID, flags, & excludedTransport);
+        if (transportType == D2DTransportMax)
+        {
+            D2DTransportType i;
+            for (i = 0; i < D2DTransportMax; i++)
+            {
+                if (i == excludedTransport) continue;
+                if (D2DStopBrowsingForKeyOnTransport) D2DStopBrowsingForKeyOnTransport(compression_lhs, end - compression_lhs, i);
+            }
+        }
+        else
+        {
+            if (D2DStopBrowsingForKeyOnTransport) D2DStopBrowsingForKeyOnTransport(compression_lhs, end - compression_lhs, transportType);
+        }
+
+        // The D2D driver may not generate the D2DServiceLost event for this key after
+        // the D2DStopBrowsingForKey*() call above.  So, we flush the key from the D2D 
+        // record cache now.
+        xD2DClearCache(&lower, qtype);
+    }
+}
+
+mDNSexport void external_start_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags)
+{
+    domainname lower;
+    mDNSu8 *rhs = NULL;
+    mDNSu8 *end = NULL;
+    D2DTransportType transportType, excludedTransport;
+    DomainnameToLower(resourceRecord->name, &lower);
+
+    LogInfo("external_start_advertising_service: %s", RRDisplayString(&mDNSStorage, resourceRecord));
+    // For SRV records, update packet filter if p2p interface already exists, otherwise,
+    // if will be updated when we get the KEV_DL_IF_ATTACHED event for the interface.
+    if (resourceRecord->rrtype == kDNSType_SRV)
+        mDNSUpdatePacketFilter(NULL);
+
+    rhs = DNSNameCompressionBuildLHS(&lower, resourceRecord->rrtype);
+    end = DNSNameCompressionBuildRHS(rhs, resourceRecord);
+    PrintHelper(__func__, compression_lhs, rhs - compression_lhs, rhs, end - rhs);
+
+    transportType = xD2DInterfaceToTransportType(resourceRecord->InterfaceID, flags, & excludedTransport);
+    if (transportType == D2DTransportMax)
+    {
+        D2DTransportType i;
+        for (i = 0; i < D2DTransportMax; i++)
+        {
+            if (i == excludedTransport) continue;
+            if (D2DStartAdvertisingPairOnTransport) D2DStartAdvertisingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, i);
+        }
+    }
+    else
+    {
+        if (D2DStartAdvertisingPairOnTransport) D2DStartAdvertisingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, transportType);
+    }
+}
+
+mDNSexport void external_stop_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags)
+{
+    domainname lower;
+    mDNSu8 *rhs = NULL;
+    mDNSu8 *end = NULL;
+    D2DTransportType transportType, excludedTransport;
+    DomainnameToLower(resourceRecord->name, &lower);
+
+    LogInfo("external_stop_advertising_service: %s", RRDisplayString(&mDNSStorage, resourceRecord));
+
+    // For SRV records, update packet filter to to remove this port from list
+    if (resourceRecord->rrtype == kDNSType_SRV)
+        mDNSUpdatePacketFilter(resourceRecord);
+
+    rhs = DNSNameCompressionBuildLHS(&lower, resourceRecord->rrtype);
+    end = DNSNameCompressionBuildRHS(rhs, resourceRecord);
+    PrintHelper(__func__, compression_lhs, rhs - compression_lhs, rhs, end - rhs);
+
+    transportType = xD2DInterfaceToTransportType(resourceRecord->InterfaceID, flags, & excludedTransport);
+    if (transportType == D2DTransportMax)
+    {
+        D2DTransportType i;
+        for (i = 0; i < D2DTransportMax; i++)
+        {
+            if (i == excludedTransport) continue;
+            if (D2DStopAdvertisingPairOnTransport) D2DStopAdvertisingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, i);
+        }
+    }
+    else
+    {
+        if (D2DStopAdvertisingPairOnTransport) D2DStopAdvertisingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, transportType);
+    }
+}
+
+mDNSexport void external_start_resolving_service(mDNSInterfaceID InterfaceID, const domainname *const fqdn, DNSServiceFlags flags)
+{
+    domainname lower;
+    mDNSu8 *rhs = NULL;
+    mDNSu8 *end = NULL;
+    mDNSBool AWDL_used = false;   // whether AWDL was used for this resolve
+    D2DTransportType transportType, excludedTransport;
+    DomainnameToLower(SkipLeadingLabels(fqdn, 1), &lower);
+
+    LogInfo("external_start_resolving_service: %##s", fqdn->c);
+    rhs = DNSNameCompressionBuildLHS(&lower, kDNSType_PTR);
+    end = putDomainNameAsLabels(&compression_base_msg, rhs, compression_limit, fqdn);
+    PrintHelper(__func__, compression_lhs, rhs - compression_lhs, rhs, end - rhs);
+
+    transportType = xD2DInterfaceToTransportType(InterfaceID, flags, & excludedTransport);
+    if (transportType == D2DTransportMax)
+    {
+        // Resolving over all the transports, except for excludedTransport if set.
+        D2DTransportType i;
+        for (i = 0; i < D2DTransportMax; i++)
+        {
+            if (i == excludedTransport) continue;
+            if (D2DStartResolvingPairOnTransport) D2DStartResolvingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, i);
+
+            if (i == D2DAWDLTransport)
+                AWDL_used = true;
+        }
+    }
+    else
+    {
+        // Resolving over one specific transport.
+        if (D2DStartResolvingPairOnTransport) D2DStartResolvingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, transportType);
+
+        if (transportType == D2DAWDLTransport)
+            AWDL_used = true;
+    }
+
+    // AWDL wants the SRV and TXT record queries communicated over the D2D interface.
+    // We only want these records going to AWDL, so use AWDLInterfaceID as the
+    // interface and don't set any other flags.
+    if (AWDL_used && AWDLInterfaceID)
+    {
+        LogInfo("external_start_resolving_service: browse for TXT and SRV over AWDL");
+        external_start_browsing_for_service(AWDLInterfaceID, fqdn, kDNSType_TXT, NULL);
+        external_start_browsing_for_service(AWDLInterfaceID, fqdn, kDNSType_SRV, NULL);
+    }
+}
+
+mDNSexport void external_stop_resolving_service(mDNSInterfaceID InterfaceID, const domainname *const fqdn, DNSServiceFlags flags)
+{
+    domainname lower;
+    mDNSu8 *rhs = NULL;
+    mDNSu8 *end = NULL;
+    mDNSBool AWDL_used = false;   // whether AWDL was used for this resolve
+    D2DTransportType transportType, excludedTransport;
+    DomainnameToLower(SkipLeadingLabels(fqdn, 1), &lower);
+
+    LogInfo("external_stop_resolving_service: %##s", fqdn->c);
+    rhs = DNSNameCompressionBuildLHS(&lower, kDNSType_PTR);
+    end = putDomainNameAsLabels(&compression_base_msg, rhs, compression_limit, fqdn);
+    PrintHelper(__func__, compression_lhs, rhs - compression_lhs, rhs, end - rhs);
+
+    transportType = xD2DInterfaceToTransportType(InterfaceID, flags, & excludedTransport);
+    if (transportType == D2DTransportMax)
+    {
+        D2DTransportType i;
+        for (i = 0; i < D2DTransportMax; i++)
+        {
+            if (i == excludedTransport) continue;
+            if (D2DStopResolvingPairOnTransport) D2DStopResolvingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, i);
+
+            if (i == D2DAWDLTransport)
+                AWDL_used = true;
+        }
+    }
+    else
+    {
+        if (D2DStopResolvingPairOnTransport) D2DStopResolvingPairOnTransport(compression_lhs, rhs - compression_lhs, rhs, end - rhs, transportType);
+
+        if (transportType == D2DAWDLTransport)
+            AWDL_used = true;
+    }
+
+    // AWDL wants the SRV and TXT record queries communicated over the D2D interface.
+    // We only want these records going to AWDL, so use AWDLInterfaceID as the
+    // interface and don't set any other flags.
+    if (AWDL_used && AWDLInterfaceID)
+    {
+        LogInfo("external_stop_resolving_service: stop browse for TXT and SRV on AWDL");
+        external_stop_browsing_for_service(AWDLInterfaceID, fqdn, kDNSType_TXT, NULL);
+        external_stop_browsing_for_service(AWDLInterfaceID, fqdn, kDNSType_SRV, NULL);
+    }
+}
+
+#elif APPLE_OSX_mDNSResponder
+
+mDNSexport void external_start_browsing_for_service(mDNS *const m, const domainname *const type, DNS_TypeValues qtype, DNSServiceFlags flags) { (void)m; (void)type; (void)qtype; (void)flags;}
+mDNSexport void external_stop_browsing_for_service(mDNS *const m, const domainname *const type, DNS_TypeValues qtype, DNSServiceFlags flags) { (void)m; (void)type; (void)qtype; (void)flags;}
+mDNSexport void external_start_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags) { (void)resourceRecord; (void)flags;}
+mDNSexport void external_stop_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags) { (void)resourceRecord; (void)flags;}
+mDNSexport void external_start_resolving_service(const domainname *const fqdn, DNSServiceFlags flags)  { (void)fqdn; (void)flags;}
+mDNSexport void external_stop_resolving_service(const domainname *const fqdn, DNSServiceFlags flags)  { (void)fqdn; (void)flags;}
+
+#endif // ! NO_D2D
+
+// ***************************************************************************
+// Functions
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Utility Functions
+#endif
+
+// We only attempt to send and receive multicast packets on interfaces that are
+// (a) flagged as multicast-capable
+// (b) *not* flagged as point-to-point (e.g. modem)
+// Typically point-to-point interfaces are modems (including mobile-phone pseudo-modems), and we don't want
+// to run up the user's bill sending multicast traffic over a link where there's only a single device at the
+// other end, and that device (e.g. a modem bank) is probably not answering Multicast DNS queries anyway.
+#define MulticastInterface(i) (((i)->ifa_flags & IFF_MULTICAST) && !((i)->ifa_flags & IFF_POINTOPOINT))
+
+mDNSexport void NotifyOfElusiveBug(const char *title, const char *msg)  // Both strings are UTF-8 text
+{
+    static int notifyCount = 0;
+    if (notifyCount) return;
+
+    // If we display our alert early in the boot process, then it vanishes once the desktop appears.
+    // To avoid this, we don't try to display alerts in the first three minutes after boot.
+    if ((mDNSu32)(mDNSPlatformRawTime()) < (mDNSu32)(mDNSPlatformOneSecond * 180)) return;
+
+    // Unless ForceAlerts is defined, we only show these bug report alerts on machines that have a 17.x.x.x address
+    #if !ForceAlerts
+    {
+        // Determine if we're at Apple (17.*.*.*)
+        NetworkInterfaceInfoOSX *i;
+        for (i = mDNSStorage.p->InterfaceList; i; i = i->next)
+            if (i->ifinfo.ip.type == mDNSAddrType_IPv4 && i->ifinfo.ip.ip.v4.b[0] == 17)
+                break;
+        if (!i) return; // If not at Apple, don't show the alert
+    }
+    #endif
+
+    LogMsg("%s", title);
+    LogMsg("%s", msg);
+    // Display a notification to the user
+    notifyCount++;
+
+#ifndef NO_CFUSERNOTIFICATION
+    mDNSNotify(title, msg);
+#endif /* NO_CFUSERNOTIFICATION */
+}
+
+// Returns true if it is an AppleTV based hardware running iOS, false otherwise
+mDNSlocal mDNSBool IsAppleTV(void)
+{
+#if TARGET_OS_EMBEDDED
+    static mDNSBool sInitialized = mDNSfalse;
+    static mDNSBool sIsAppleTV   = mDNSfalse;
+    CFStringRef deviceClass = NULL;
+
+    if(!sInitialized)
+    {
+        deviceClass = (CFStringRef) MGCopyAnswer(kMGQDeviceClass, NULL);
+        if(deviceClass)
+        {
+            if(CFEqual(deviceClass, kMGDeviceClassAppleTV))
+                sIsAppleTV = mDNStrue;
+            CFRelease(deviceClass);
+        }
+        sInitialized = mDNStrue;
+    }
+    return(sIsAppleTV);
+#else 
+    return mDNSfalse;
+#endif // TARGET_OS_EMBEDDED
+}
+
+mDNSlocal struct ifaddrs *myGetIfAddrs(int refresh)
+{
+    static struct ifaddrs *ifa = NULL;
+
+    if (refresh && ifa)
+    {
+        freeifaddrs(ifa);
+        ifa = NULL;
+    }
+
+    if (ifa == NULL) 
+        getifaddrs(&ifa);
+    return ifa;
+}
+
+mDNSlocal void DynamicStoreWrite(int key, const char* subkey, uintptr_t value, signed long valueCnt)
+{
+    CFStringRef sckey       = NULL;
+    Boolean release_sckey   = FALSE;
+    CFDataRef bytes         = NULL;
+    CFPropertyListRef plist = NULL;
+    SCDynamicStoreRef store = NULL;
+
+    switch ((enum mDNSDynamicStoreSetConfigKey)key)
+    {
+        case kmDNSMulticastConfig:
+            sckey = CFSTR("State:/Network/" kDNSServiceCompMulticastDNS);
+            break;
+        case kmDNSDynamicConfig:
+            sckey = CFSTR("State:/Network/DynamicDNS");
+            break;
+        case kmDNSPrivateConfig:
+            sckey = CFSTR("State:/Network/" kDNSServiceCompPrivateDNS);
+            break;
+        case kmDNSBackToMyMacConfig:
+            sckey = CFSTR("State:/Network/BackToMyMac");
+            break;
+        case kmDNSSleepProxyServersState:
+        {
+            CFMutableStringRef tmp = CFStringCreateMutable(kCFAllocatorDefault, 0);
+            CFStringAppend(tmp, CFSTR("State:/Network/Interface/"));
+            CFStringAppendCString(tmp, subkey, kCFStringEncodingUTF8);
+            CFStringAppend(tmp, CFSTR("/SleepProxyServers"));
+            sckey = CFStringCreateCopy(kCFAllocatorDefault, tmp);
+            release_sckey = TRUE;
+            CFRelease(tmp);
+            break;
+        }
+        case kmDNSDebugState:
+            sckey = CFSTR("State:/Network/mDNSResponder/DebugState");
+            break;
+        default:
+            LogMsg("unrecognized key %d", key);
+            goto fin;
+    }
+    if (NULL == (bytes = CFDataCreateWithBytesNoCopy(NULL, (void *)value,
+                                                     valueCnt, kCFAllocatorNull)))
+    {
+        LogMsg("CFDataCreateWithBytesNoCopy of value failed");
+        goto fin;
+    }
+    if (NULL == (plist = CFPropertyListCreateFromXMLData(NULL, bytes,
+                                                         kCFPropertyListImmutable, NULL)))
+    {
+        LogMsg("CFPropertyListCreateFromXMLData of bytes failed");
+        goto fin;
+    }
+    CFRelease(bytes);
+    bytes = NULL;
+    if (NULL == (store = SCDynamicStoreCreate(NULL,
+                                              CFSTR(kmDNSResponderServName), NULL, NULL)))
+    {
+        LogMsg("SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+        goto fin;
+    }
+    SCDynamicStoreSetValue(store, sckey, plist);
+
+fin:
+    if (NULL != bytes)
+        CFRelease(bytes);
+    if (NULL != plist)
+        CFRelease(plist);
+    if (NULL != store)
+        CFRelease(store);
+    if (release_sckey && sckey)
+        CFRelease(sckey);
+}
+
+mDNSexport void mDNSDynamicStoreSetConfig(int key, const char *subkey, CFPropertyListRef value)
+{
+    CFPropertyListRef valueCopy;
+    char *subkeyCopy  = NULL;
+    if (!value)
+        return;
+
+    // We need to copy the key and value before we dispatch off the block below as the
+    // caller will free the memory once we return from this function.
+    valueCopy = CFPropertyListCreateDeepCopy(NULL, value, kCFPropertyListImmutable);
+    if (!valueCopy)
+    {   
+        LogMsg("mDNSDynamicStoreSetConfig: ERROR valueCopy NULL");
+        return;
+    }
+    if (subkey)
+    {
+        int len    = strlen(subkey);
+        subkeyCopy = mDNSPlatformMemAllocate(len + 1);
+        if (!subkeyCopy)
+        {
+            LogMsg("mDNSDynamicStoreSetConfig: ERROR subkeyCopy NULL");
+            return;
+        }
+        mDNSPlatformMemCopy(subkeyCopy, subkey, len);
+        subkeyCopy[len] = 0;
+    }
+
+    dispatch_async(DynamicStoreQueue, ^{
+        CFWriteStreamRef stream = NULL;
+        CFDataRef bytes = NULL;
+        CFStringRef error;
+        CFIndex ret;
+
+        if (NULL == (stream = CFWriteStreamCreateWithAllocatedBuffers(NULL, NULL)))
+        {
+            LogMsg("mDNSDynamicStoreSetConfig : CFWriteStreamCreateWithAllocatedBuffers failed (Object creation failed)");
+            goto END;
+        }
+        CFWriteStreamOpen(stream);
+        ret = CFPropertyListWriteToStream(valueCopy, stream, kCFPropertyListBinaryFormat_v1_0, &error);
+        if (ret == 0)
+        {
+            LogMsg("mDNSDynamicStoreSetConfig : CFPropertyListWriteToStream failed (Could not write property list to stream)");
+            goto END;
+        }
+        if (NULL == (bytes = CFWriteStreamCopyProperty(stream, kCFStreamPropertyDataWritten)))
+        {
+            LogMsg("mDNSDynamicStoreSetConfig : CFWriteStreamCopyProperty failed (Object creation failed) ");
+            goto END;
+        }
+        CFWriteStreamClose(stream);
+        CFRelease(stream);
+        stream = NULL;
+        LogInfo("mDNSDynamicStoreSetConfig: key %d subkey %s", key, subkeyCopy);
+        DynamicStoreWrite(key, subkeyCopy ? subkeyCopy : "", (uintptr_t)CFDataGetBytePtr(bytes), CFDataGetLength(bytes));
+
+    END:
+        CFRelease(valueCopy);
+        if (NULL != stream)
+        {
+            CFWriteStreamClose(stream);
+            CFRelease(stream);
+        }
+        if (NULL != bytes)
+            CFRelease(bytes); 
+        if (subkeyCopy)
+            mDNSPlatformMemFree(subkeyCopy);
+    });
+}
+
+// To match *either* a v4 or v6 instance of this interface name, pass AF_UNSPEC for type
+mDNSlocal NetworkInterfaceInfoOSX *SearchForInterfaceByName(mDNS *const m, const char *ifname, int type)
+{
+    NetworkInterfaceInfoOSX *i;
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->Exists && !strcmp(i->ifinfo.ifname, ifname) &&
+            ((type == AF_UNSPEC                                         ) ||
+             (type == AF_INET  && i->ifinfo.ip.type == mDNSAddrType_IPv4) ||
+             (type == AF_INET6 && i->ifinfo.ip.type == mDNSAddrType_IPv6))) return(i);
+    return(NULL);
+}
+
+#if TARGET_OS_EMBEDDED
+mDNSlocal SCPreferencesRef mDNSManagedPrefsGet(void)
+{
+    SCPreferencesRef smDNSManagedPrefs = NULL;
+    smDNSManagedPrefs = SCPreferencesCreate(kCFAllocatorDefault, CFSTR("mDNSManagedPrefs"), kmDNSResponderManagedPrefsID);
+
+    return (smDNSManagedPrefs);
+}
+
+mDNSlocal mDNSBool GetmDNSManagedPrefKeyVal(SCPreferencesRef prefs, CFStringRef key)
+{
+    mDNSBool val = mDNSfalse;
+    CFBooleanRef val_cf = NULL;
+ 
+    if (prefs != NULL)
+    {
+        val_cf = SCPreferencesGetValue(prefs, key);
+        if (isA_CFBoolean(val_cf) != NULL)
+            val = CFBooleanGetValue(val_cf); //When mDNSResponder-Debug-profile is Installed
+        else
+            val = mDNSfalse; //When mDNSResponder-Debug-profile is Uninstalled
+    }
+    else 
+    {
+        LogMsg("GetmDNSManagedPrefKeyVal: mDNSManagedPrefs are NULL!");
+        val = mDNSfalse;
+    }
+    if (val_cf)
+        CFRelease(val_cf);
+    return (val);
+}
+
+mDNSexport mDNSBool GetmDNSManagedPref(CFStringRef key)
+{
+    SCPreferencesRef  managed = NULL;
+    mDNSBool ret_value;
+     
+    managed = mDNSManagedPrefsGet();
+    ret_value = GetmDNSManagedPrefKeyVal(managed, key);
+    
+    if (managed)
+        CFRelease(managed);
+    return (ret_value);
+}
+#endif //TARGET_OS_EMBEDDED
+
+mDNSlocal int myIfIndexToName(u_short ifindex, char *name)
+{
+    struct ifaddrs *ifa;
+    for (ifa = myGetIfAddrs(0); ifa; ifa = ifa->ifa_next)
+        if (ifa->ifa_addr->sa_family == AF_LINK)
+            if (((struct sockaddr_dl*)ifa->ifa_addr)->sdl_index == ifindex)
+            { strlcpy(name, ifa->ifa_name, IF_NAMESIZE); return 0; }
+    return -1;
+}
+
+mDNSexport NetworkInterfaceInfoOSX *IfindexToInterfaceInfoOSX(const mDNS *const m, mDNSInterfaceID ifindex)
+{
+    mDNSu32 scope_id = (mDNSu32)(uintptr_t)ifindex;
+    NetworkInterfaceInfoOSX *i;
+
+    // Don't get tricked by inactive interfaces
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->Registered && i->scope_id == scope_id) return(i);
+
+    return mDNSNULL;
+}
+
+mDNSexport mDNSInterfaceID mDNSPlatformInterfaceIDfromInterfaceIndex(mDNS *const m, mDNSu32 ifindex)
+{
+    if (ifindex == kDNSServiceInterfaceIndexLocalOnly) return(mDNSInterface_LocalOnly);
+    if (ifindex == kDNSServiceInterfaceIndexP2P      ) return(mDNSInterface_P2P);
+    if (ifindex == kDNSServiceInterfaceIndexAny      ) return(mDNSNULL);
+
+    NetworkInterfaceInfoOSX* ifi = IfindexToInterfaceInfoOSX(m, (mDNSInterfaceID)(uintptr_t)ifindex);
+    if (!ifi)
+    {
+        // Not found. Make sure our interface list is up to date, then try again.
+        LogInfo("mDNSPlatformInterfaceIDfromInterfaceIndex: InterfaceID for interface index %d not found; Updating interface list", ifindex);
+        mDNSMacOSXNetworkChanged(m);
+        ifi = IfindexToInterfaceInfoOSX(m, (mDNSInterfaceID)(uintptr_t)ifindex);
+    }
+
+    if (!ifi) return(mDNSNULL);
+
+    return(ifi->ifinfo.InterfaceID);
+}
+
+
+mDNSexport mDNSu32 mDNSPlatformInterfaceIndexfromInterfaceID(mDNS *const m, mDNSInterfaceID id, mDNSBool suppressNetworkChange)
+{
+    NetworkInterfaceInfoOSX *i;
+    if (id == mDNSInterface_LocalOnly) return(kDNSServiceInterfaceIndexLocalOnly);
+    if (id == mDNSInterface_P2P      ) return(kDNSServiceInterfaceIndexP2P);
+    if (id == mDNSInterface_Any      ) return(0);
+
+    mDNSu32 scope_id = (mDNSu32)(uintptr_t)id;
+
+    // Don't use i->Registered here, because we DO want to find inactive interfaces, which have no Registered set
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->scope_id == scope_id) return(i->scope_id);
+
+    // If we are supposed to suppress network change, return "id" back
+    if (suppressNetworkChange) return scope_id;
+
+    // Not found. Make sure our interface list is up to date, then try again.
+    LogInfo("Interface index for InterfaceID %p not found; Updating interface list", id);
+    mDNSMacOSXNetworkChanged(m);
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->scope_id == scope_id) return(i->scope_id);
+
+    return(0);
+}
+
+#if APPLE_OSX_mDNSResponder
+mDNSexport void mDNSASLLog(uuid_t *uuid, const char *subdomain, const char *result, const char *signature, const char *fmt, ...)
+{
+    if (iOSVers) 
+        return; // No ASL on iOS
+
+    static char buffer[512];
+    aslmsg asl_msg = asl_new(ASL_TYPE_MSG);
+
+    if (!asl_msg)   { LogMsg("mDNSASLLog: asl_new failed"); return; }
+    if (uuid)
+    {
+        char uuidStr[37];
+        uuid_unparse(*uuid, uuidStr);
+        asl_set     (asl_msg, "com.apple.message.uuid", uuidStr);
+    }
+
+    static char domainBase[] = "com.apple.mDNSResponder.%s";
+    mDNS_snprintf   (buffer, sizeof(buffer), domainBase, subdomain);
+    asl_set         (asl_msg, "com.apple.message.domain", buffer);
+
+    if (result) asl_set(asl_msg, "com.apple.message.result", result);
+    if (signature) asl_set(asl_msg, "com.apple.message.signature", signature);
+
+    va_list ptr;
+    va_start(ptr,fmt);
+    mDNS_vsnprintf(buffer, sizeof(buffer), fmt, ptr);
+    va_end(ptr);
+
+    int old_filter = asl_set_filter(NULL,ASL_FILTER_MASK_UPTO(ASL_LEVEL_DEBUG));
+    asl_log(NULL, asl_msg, ASL_LEVEL_DEBUG, "%s", buffer);
+    asl_set_filter(NULL, old_filter);
+    asl_free(asl_msg);
+}
+
+
+mDNSlocal void mDNSLogDNSSECStatistics(mDNS *const m)
+{
+    char    buffer[16];
+
+    aslmsg  aslmsg = asl_new(ASL_TYPE_MSG);
+
+    // If we failed to allocate an aslmsg structure, keep accumulating
+    // the statistics and try again at the next log interval.
+    if (!aslmsg)
+    {
+        LogMsg("mDNSLogDNSSECStatistics: asl_new() failed!");
+        return;
+    }
+
+    asl_set(aslmsg,"com.apple.message.domain", "com.apple.mDNSResponder.DNSSECstatistics");
+
+    if (m->rrcache_totalused_unicast)
+    {
+        mDNS_snprintf(buffer, sizeof(buffer), "%u", (mDNSu32) ((unsigned long)(m->DNSSECStats.TotalMemUsed * 100))/m->rrcache_totalused_unicast);
+    }
+    else
+    {
+        LogMsg("mDNSLogDNSSECStatistics: unicast is zero");
+        buffer[0] = 0;
+    }
+    asl_set(aslmsg,"com.apple.message.MemUsage", buffer);
+
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.Latency0);
+    asl_set(aslmsg,"com.apple.message.Latency0", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.Latency10);
+    asl_set(aslmsg,"com.apple.message.Latency10", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.Latency20);
+    asl_set(aslmsg,"com.apple.message.Latency20", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.Latency50);
+    asl_set(aslmsg,"com.apple.message.Latency50", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.Latency100);
+    asl_set(aslmsg,"com.apple.message.Latency100", buffer);
+
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.ExtraPackets0);
+    asl_set(aslmsg,"com.apple.message.ExtraPackets0", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.ExtraPackets3);
+    asl_set(aslmsg,"com.apple.message.ExtraPackets3", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.ExtraPackets7);
+    asl_set(aslmsg,"com.apple.message.ExtraPackets7", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.ExtraPackets10);
+    asl_set(aslmsg,"com.apple.message.ExtraPackets10", buffer);
+
+    // Ignore IndeterminateStatus as we don't log them
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.SecureStatus);
+    asl_set(aslmsg,"com.apple.message.SecureStatus", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.InsecureStatus);
+    asl_set(aslmsg,"com.apple.message.InsecureStatus", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.BogusStatus);
+    asl_set(aslmsg,"com.apple.message.BogusStatus", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.NoResponseStatus);
+    asl_set(aslmsg,"com.apple.message.NoResponseStatus", buffer);
+
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.NumProbesSent);
+    asl_set(aslmsg,"com.apple.message.NumProbesSent", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.MsgSize0);
+    asl_set(aslmsg,"com.apple.message.MsgSize0", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.MsgSize1);
+    asl_set(aslmsg,"com.apple.message.MsgSize1", buffer);
+    mDNS_snprintf(buffer, sizeof(buffer), "%u", m->DNSSECStats.MsgSize2);
+    asl_set(aslmsg,"com.apple.message.MsgSize2", buffer);
+
+    asl_log(NULL, aslmsg, ASL_LEVEL_NOTICE, "");
+    asl_free(aslmsg);
+}
+
+// Calculate packets per hour given total packet count and interval in seconds.
+// Cast one term of multiplication to (long) to use 64-bit arithmetic 
+// and avoid a potential 32-bit overflow prior to the division.
+#define ONE_HOUR    3600
+#define PACKET_RATE(PACKETS, INTERVAL) (int)(((long) (PACKETS) * ONE_HOUR)/(INTERVAL))
+
+// Put packet rate data in discrete buckets.
+mDNSlocal int mDNSBucketData(int inputData, int interval)
+{
+    if (!interval)
+    {
+        LogMsg("mDNSBucketData: interval is zero!");
+        return 0;
+    }
+
+    int ratePerHour = PACKET_RATE(inputData, interval);
+    int bucket;
+
+    if (ratePerHour == 0)
+        bucket = 0;
+    else if (ratePerHour <= 10)
+        bucket = 10;
+    else if (ratePerHour <= 100)
+        bucket = 100;
+    else if (ratePerHour <= 1000)
+        bucket = 1000;
+    else if (ratePerHour <= 5000)
+        bucket = 5000;
+    else if (ratePerHour <= 10000)
+        bucket = 10000;
+    else if (ratePerHour <= 50000)
+        bucket = 50000;
+    else if (ratePerHour <= 100000)
+        bucket = 100000;
+    else if (ratePerHour <= 250000)
+        bucket = 250000;
+    else if (ratePerHour <= 500000)
+        bucket = 500000;
+    else
+        bucket = 1000000;
+
+    return bucket;
+}
+
+mDNSlocal void mDNSLogBonjourStatistics(mDNS *const m)
+{
+    static mDNSs32 last_PktNum, last_MPktNum;
+    static mDNSs32 last_UnicastPacketsSent, last_MulticastPacketsSent;
+    static mDNSs32 last_RemoteSubnet;
+
+    mDNSs32 interval;
+    char    buffer[16];
+    mDNSs32 inMulticast = m->MPktNum - last_MPktNum;
+    mDNSs32 inUnicast   = m->PktNum - last_PktNum - inMulticast;
+    mDNSs32 outUnicast  = m->UnicastPacketsSent - last_UnicastPacketsSent;
+    mDNSs32 outMulticast = m->MulticastPacketsSent - last_MulticastPacketsSent;
+    mDNSs32 remoteSubnet = m->RemoteSubnet - last_RemoteSubnet;
+
+    
+    // save starting values for new interval
+    last_PktNum = m->PktNum;
+    last_MPktNum = m->MPktNum;
+    last_UnicastPacketsSent = m->UnicastPacketsSent;
+    last_MulticastPacketsSent = m->MulticastPacketsSent;
+    last_RemoteSubnet = m->RemoteSubnet;
+
+    // Need a non-zero active time interval.
+    if (!m->ActiveStatTime)
+        return;
+
+    // Round interval time to nearest hour boundary. Less then 30 minutes rounds to zero.
+    interval = (m->ActiveStatTime + ONE_HOUR/2)/ONE_HOUR; 
+
+    // Use a minimum of 30 minutes of awake time to calculate average packet rates.
+    // The rounded awake interval should not be greater than the rounded reporting
+    // interval.
+    if ((interval == 0) || (interval > (kDefaultNextStatsticsLogTime + ONE_HOUR/2)/ONE_HOUR))
+        return;
+
+    aslmsg  aslmsg = asl_new(ASL_TYPE_MSG);
+
+    if (!aslmsg)
+    {
+        LogMsg("mDNSLogBonjourStatistics: asl_new() failed!");
+        return;
+    }
+    // log in MessageTracer format
+    asl_set(aslmsg,"com.apple.message.domain", "com.apple.mDNSResponder.statistics");
+
+    snprintf(buffer, sizeof(buffer), "%d", interval);
+    asl_set(aslmsg,"com.apple.message.interval", buffer);
+
+    // log the packet rates as packets per hour
+    snprintf(buffer, sizeof(buffer), "%d",
+            mDNSBucketData(inUnicast, m->ActiveStatTime)); 
+    asl_set(aslmsg,"com.apple.message.UnicastIn", buffer);
+
+    snprintf(buffer, sizeof(buffer), "%d",
+            mDNSBucketData(inMulticast, m->ActiveStatTime));
+    asl_set(aslmsg,"com.apple.message.MulticastIn", buffer);
+
+    snprintf(buffer, sizeof(buffer), "%d",
+            mDNSBucketData(outUnicast, m->ActiveStatTime));
+    asl_set(aslmsg,"com.apple.message.UnicastOut", buffer);
+
+    snprintf(buffer, sizeof(buffer), "%d",
+            mDNSBucketData(outMulticast, m->ActiveStatTime));
+    asl_set(aslmsg,"com.apple.message.MulticastOut", buffer);
+
+    snprintf(buffer, sizeof(buffer), "%d",
+            mDNSBucketData(remoteSubnet, m->ActiveStatTime));
+    asl_set(aslmsg,"com.apple.message.RemoteSubnet", buffer);
+
+    asl_log(NULL, aslmsg, ASL_LEVEL_NOTICE, "");
+
+    asl_free(aslmsg);
+}
+
+// Log multicast and unicast traffic statistics to MessageTracer on OSX
+mDNSexport void mDNSLogStatistics(mDNS *const m)
+{
+    // MessageTracer only available on OSX
+    if (iOSVers)
+        return;
+
+    mDNSs32 currentUTC = mDNSPlatformUTC();
+
+    // log runtime statistics
+    if ((currentUTC - m->NextStatLogTime) >= 0)
+    {
+        m->NextStatLogTime = currentUTC + kDefaultNextStatsticsLogTime;
+        // If StatStartTime is zero, it hasn't been reinitialized yet
+        // in the wakeup code path.
+        if (m->StatStartTime)
+        {
+            m->ActiveStatTime += currentUTC - m->StatStartTime;
+        }
+
+        // Only log statistics if we have recorded some active time during
+        // this statistics interval.
+        if (m->ActiveStatTime)
+        {
+            mDNSLogBonjourStatistics(m);
+            mDNSLogDNSSECStatistics(m);
+        }
+ 
+        // Start a new statistics gathering interval.
+        m->StatStartTime = currentUTC;
+        m->ActiveStatTime = 0;
+    }
+}
+
+#endif // APPLE_OSX_mDNSResponder
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - UDP & TCP send & receive
+#endif
+
+mDNSlocal mDNSBool AddrRequiresPPPConnection(const struct sockaddr *addr)
+{
+    mDNSBool result = mDNSfalse;
+    SCNetworkConnectionFlags flags;
+    CFDataRef remote_addr;
+    CFMutableDictionaryRef options;
+    SCNetworkReachabilityRef ReachRef = NULL;
+
+    options = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    remote_addr = CFDataCreate(NULL, (const UInt8 *)addr, addr->sa_len);
+    CFDictionarySetValue(options, kSCNetworkReachabilityOptionRemoteAddress, remote_addr);
+    CFDictionarySetValue(options, kSCNetworkReachabilityOptionServerBypass, kCFBooleanTrue);
+    ReachRef = SCNetworkReachabilityCreateWithOptions(kCFAllocatorDefault, options);
+    CFRelease(options);
+    CFRelease(remote_addr);
+
+    if (!ReachRef) 
+    { 
+        LogMsg("ERROR: RequiresConnection - SCNetworkReachabilityCreateWithOptions"); 
+        goto end; 
+    }
+    if (!SCNetworkReachabilityGetFlags(ReachRef, &flags)) 
+    { 
+        LogMsg("ERROR: AddrRequiresPPPConnection - SCNetworkReachabilityGetFlags"); 
+        goto end; 
+    }
+    result = flags & kSCNetworkFlagsConnectionRequired;
+
+end:
+    if (ReachRef) 
+        CFRelease(ReachRef);
+    return result;
+}
+
+// Set traffic class for socket
+mDNSlocal void setTrafficClass(int socketfd, mDNSBool useBackgroundTrafficClass)
+{
+    int traffic_class;
+
+    if (useBackgroundTrafficClass)
+        traffic_class = SO_TC_BK_SYS;
+    else
+        traffic_class = SO_TC_CTL;
+
+    (void) setsockopt(socketfd, SOL_SOCKET, SO_TRAFFIC_CLASS, (void *)&traffic_class, sizeof(traffic_class));
+}
+
+mDNSexport void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)
+{
+    if (src)
+    {
+        int s;
+
+        if (dst->type == mDNSAddrType_IPv4)
+        {
+            s = src->ss.sktv4;
+        }
+        else
+        {
+            s = src->ss.sktv6;
+        }
+
+        if (q->pid)
+        {
+            if (setsockopt(s, SOL_SOCKET, SO_DELEGATED, &q->pid, sizeof(q->pid)) == -1)
+            {
+                LogInfo("mDNSPlatformSetDelegatePID: Delegate PID failed %s for PID %d", strerror(errno), q->pid);
+            }
+        }
+        else
+        {
+            if (setsockopt(s, SOL_SOCKET, SO_DELEGATED_UUID, &q->uuid, sizeof(q->uuid)) == -1)
+            {
+                LogInfo("mDNSPlatformSetDelegatePID: Delegate UUID failed %s", strerror(errno));
+            }
+        }
+    }
+}
+
+// Note: If InterfaceID is NULL, it means, "send this packet through our anonymous unicast socket"
+// Note: If InterfaceID is non-NULL it means, "send this packet through our port 5353 socket on the specified interface"
+// OR send via our primary v4 unicast socket
+// UPDATE: The UDPSocket *src parameter now allows the caller to specify the source socket
+mDNSexport mStatus mDNSPlatformSendUDP(const mDNS *const m, const void *const msg, const mDNSu8 *const end,
+                                       mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
+                                       mDNSIPPort dstPort, mDNSBool useBackgroundTrafficClass)
+{
+    NetworkInterfaceInfoOSX *info = mDNSNULL;
+    struct sockaddr_storage to;
+    int s = -1, err;
+    mStatus result = mStatus_NoError;
+
+    if (InterfaceID)
+    {
+        info = IfindexToInterfaceInfoOSX(m, InterfaceID);
+        if (info == NULL)
+        {
+            // We may not have registered interfaces with the "core" as we may not have
+            // seen any interface notifications yet. This typically happens during wakeup
+            // where we might try to send DNS requests (non-SuppressUnusable questions internal
+            // to mDNSResponder) before we receive network notifications.
+            LogInfo("mDNSPlatformSendUDP: Invalid interface index %p", InterfaceID);
+            return mStatus_BadParamErr;
+        }
+    }
+
+    char *ifa_name = InterfaceID ? info->ifinfo.ifname : "unicast";
+
+    if (dst->type == mDNSAddrType_IPv4)
+    {
+        struct sockaddr_in *sin_to = (struct sockaddr_in*)&to;
+        sin_to->sin_len            = sizeof(*sin_to);
+        sin_to->sin_family         = AF_INET;
+        sin_to->sin_port           = dstPort.NotAnInteger;
+        sin_to->sin_addr.s_addr    = dst->ip.v4.NotAnInteger;
+        s = (src ? src->ss : m->p->permanentsockets).sktv4;
+
+        if (info)   // Specify outgoing interface
+        {
+            if (!mDNSAddrIsDNSMulticast(dst))
+            {
+                #ifdef IP_BOUND_IF
+                if (info->scope_id == 0)
+                    LogInfo("IP_BOUND_IF socket option not set -- info %p (%s) scope_id is zero", info, ifa_name);
+                else
+                    setsockopt(s, IPPROTO_IP, IP_BOUND_IF, &info->scope_id, sizeof(info->scope_id));
+                #else
+                {
+                    static int displayed = 0;
+                    if (displayed < 1000)
+                    {
+                        displayed++;
+                        LogInfo("IP_BOUND_IF socket option not defined -- cannot specify interface for unicast packets");
+                    }
+                }
+                #endif
+            }
+            else
+                #ifdef IP_MULTICAST_IFINDEX
+            {
+                err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_IFINDEX, &info->scope_id, sizeof(info->scope_id));
+                // We get an error when we compile on a machine that supports this option and run the binary on
+                // a different machine that does not support it
+                if (err < 0)
+                {
+                    if (errno != ENOPROTOOPT) LogInfo("mDNSPlatformSendUDP: setsockopt: IP_MUTLTICAST_IFINDEX returned %d", errno);
+                    err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, &info->ifa_v4addr, sizeof(info->ifa_v4addr));
+                    if (err < 0 && !m->p->NetworkChanged)
+                        LogMsg("setsockopt - IP_MULTICAST_IF error %.4a %d errno %d (%s)", &info->ifa_v4addr, err, errno, strerror(errno));
+                }
+            }
+                #else
+            {
+                err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, &info->ifa_v4addr, sizeof(info->ifa_v4addr));
+                if (err < 0 && !m->p->NetworkChanged)
+                    LogMsg("setsockopt - IP_MULTICAST_IF error %.4a %d errno %d (%s)", &info->ifa_v4addr, err, errno, strerror(errno));
+
+            }
+                #endif
+        }
+    }
+
+    else if (dst->type == mDNSAddrType_IPv6)
+    {
+        struct sockaddr_in6 *sin6_to = (struct sockaddr_in6*)&to;
+        sin6_to->sin6_len            = sizeof(*sin6_to);
+        sin6_to->sin6_family         = AF_INET6;
+        sin6_to->sin6_port           = dstPort.NotAnInteger;
+        sin6_to->sin6_flowinfo       = 0;
+        sin6_to->sin6_addr           = *(struct in6_addr*)&dst->ip.v6;
+        sin6_to->sin6_scope_id       = info ? info->scope_id : 0;
+        s = (src ? src->ss : m->p->permanentsockets).sktv6;
+        if (info && mDNSAddrIsDNSMulticast(dst))    // Specify outgoing interface
+        {
+            err = setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &info->scope_id, sizeof(info->scope_id));
+            if (err < 0)
+            {
+                char name[IFNAMSIZ];
+                if (if_indextoname(info->scope_id, name) != NULL)
+                    LogMsg("setsockopt - IPV6_MULTICAST_IF error %d errno %d (%s)", err, errno, strerror(errno));
+                else
+                    LogInfo("setsockopt - IPV6_MUTLICAST_IF scopeid %d, not a valid interface", info->scope_id);
+            }
+        }
+    }
+
+    else
+    {
+        LogMsg("mDNSPlatformSendUDP: dst is not an IPv4 or IPv6 address!");
+#if ForceAlerts
+        *(long*)0 = 0;
+#endif
+        return mStatus_BadParamErr;
+    }
+
+    if (s >= 0)
+        verbosedebugf("mDNSPlatformSendUDP: sending on InterfaceID %p %5s/%ld to %#a:%d skt %d",
+                      InterfaceID, ifa_name, dst->type, dst, mDNSVal16(dstPort), s);
+    else
+        verbosedebugf("mDNSPlatformSendUDP: NOT sending on InterfaceID %p %5s/%ld (socket of this type not available)",
+                      InterfaceID, ifa_name, dst->type, dst, mDNSVal16(dstPort));
+
+    // Note: When sending, mDNSCore may often ask us to send both a v4 multicast packet and then a v6 multicast packet
+    // If we don't have the corresponding type of socket available, then return mStatus_Invalid
+    if (s < 0) return(mStatus_Invalid);
+
+    // switch to background traffic class for this message if requested
+    if (useBackgroundTrafficClass)
+        setTrafficClass(s, useBackgroundTrafficClass);
+
+    err = sendto(s, msg, (UInt8*)end - (UInt8*)msg, 0, (struct sockaddr *)&to, to.ss_len);
+
+    // set traffic class back to default value
+    if (useBackgroundTrafficClass)
+        setTrafficClass(s, mDNSfalse);
+
+    if (err < 0)
+    {
+        static int MessageCount = 0;
+        // Don't report EHOSTDOWN (i.e. ARP failure), ENETDOWN, or no route to host for unicast destinations
+        if (!mDNSAddressIsAllDNSLinkGroup(dst))
+            if (errno == EHOSTDOWN || errno == ENETDOWN || errno == EHOSTUNREACH || errno == ENETUNREACH) return(mStatus_TransientErr);
+        // Don't report EHOSTUNREACH in the first three minutes after boot
+        // This is because mDNSResponder intentionally starts up early in the boot process (See <rdar://problem/3409090>)
+        // but this means that sometimes it starts before configd has finished setting up the multicast routing entries.
+        if (errno == EHOSTUNREACH && (mDNSu32)(mDNSPlatformRawTime()) < (mDNSu32)(mDNSPlatformOneSecond * 180)) return(mStatus_TransientErr);
+        // Don't report EADDRNOTAVAIL ("Can't assign requested address") if we're in the middle of a network configuration change
+        if (errno == EADDRNOTAVAIL && m->p->NetworkChanged) return(mStatus_TransientErr);
+        if (errno == EHOSTUNREACH || errno == EADDRNOTAVAIL || errno == ENETDOWN)
+            LogInfo("mDNSPlatformSendUDP sendto(%d) failed to send packet on InterfaceID %p %5s/%d to %#a:%d skt %d error %d errno %d (%s) %lu",
+                    s, InterfaceID, ifa_name, dst->type, dst, mDNSVal16(dstPort), s, err, errno, strerror(errno), (mDNSu32)(m->timenow));
+        else
+        {
+            MessageCount++;
+            if (MessageCount < 50)  // Cap and ensure NO spamming of LogMsgs
+                LogMsg("mDNSPlatformSendUDP: sendto(%d) failed to send packet on InterfaceID %p %5s/%d to %#a:%d skt %d error %d errno %d (%s) %lu MessageCount is %d",
+                       s, InterfaceID, ifa_name, dst->type, dst, mDNSVal16(dstPort), s, err, errno, strerror(errno), (mDNSu32)(m->timenow), MessageCount);
+            else  // If logging is enabled, remove the cap and log aggressively
+                LogInfo("mDNSPlatformSendUDP: sendto(%d) failed to send packet on InterfaceID %p %5s/%d to %#a:%d skt %d error %d errno %d (%s) %lu MessageCount is %d",
+                        s, InterfaceID, ifa_name, dst->type, dst, mDNSVal16(dstPort), s, err, errno, strerror(errno), (mDNSu32)(m->timenow), MessageCount);
+        }
+
+        result = mStatus_UnknownErr;
+    }
+
+#ifdef IP_BOUND_IF
+    if (dst->type == mDNSAddrType_IPv4 && info && !mDNSAddrIsDNSMulticast(dst))
+    {
+        static const mDNSu32 ifindex = 0;
+        setsockopt(s, IPPROTO_IP, IP_BOUND_IF, &ifindex, sizeof(ifindex));
+    }
+#endif
+
+    return(result);
+}
+
+mDNSexport ssize_t myrecvfrom(const int s, void *const buffer, const size_t max,
+                             struct sockaddr *const from, size_t *const fromlen, mDNSAddr *dstaddr, char ifname[IF_NAMESIZE], mDNSu8 *ttl)
+{
+    static unsigned int numLogMessages = 0;
+    struct iovec databuffers = { (char *)buffer, max };
+    struct msghdr msg;
+    ssize_t n;
+    struct cmsghdr *cmPtr;
+    char ancillary[1024];
+
+    *ttl = 255;  // If kernel fails to provide TTL data (e.g. Jaguar doesn't) then assume the TTL was 255 as it should be
+
+    // Set up the message
+    msg.msg_name       = (caddr_t)from;
+    msg.msg_namelen    = *fromlen;
+    msg.msg_iov        = &databuffers;
+    msg.msg_iovlen     = 1;
+    msg.msg_control    = (caddr_t)&ancillary;
+    msg.msg_controllen = sizeof(ancillary);
+    msg.msg_flags      = 0;
+
+    // Receive the data
+    n = recvmsg(s, &msg, 0);
+    if (n<0)
+    {
+        if (errno != EWOULDBLOCK && numLogMessages++ < 100) LogMsg("mDNSMacOSX.c: recvmsg(%d) returned error %d errno %d", s, n, errno);
+        return(-1);
+    }
+    if (msg.msg_controllen < (int)sizeof(struct cmsghdr))
+    {
+        if (numLogMessages++ < 100) LogMsg("mDNSMacOSX.c: recvmsg(%d) returned %d msg.msg_controllen %d < sizeof(struct cmsghdr) %lu, errno %d",
+                                           s, n, msg.msg_controllen, sizeof(struct cmsghdr), errno);
+        return(-1);
+    }
+    if (msg.msg_flags & MSG_CTRUNC)
+    {
+        if (numLogMessages++ < 100) LogMsg("mDNSMacOSX.c: recvmsg(%d) msg.msg_flags & MSG_CTRUNC", s);
+        return(-1);
+    }
+
+    *fromlen = msg.msg_namelen;
+
+    // Parse each option out of the ancillary data.
+    for (cmPtr = CMSG_FIRSTHDR(&msg); cmPtr; cmPtr = CMSG_NXTHDR(&msg, cmPtr))
+    {
+        // debugf("myrecvfrom cmsg_level %d cmsg_type %d", cmPtr->cmsg_level, cmPtr->cmsg_type);
+        if (cmPtr->cmsg_level == IPPROTO_IP && cmPtr->cmsg_type == IP_RECVDSTADDR)
+        {
+            dstaddr->type = mDNSAddrType_IPv4;
+            dstaddr->ip.v4 = *(mDNSv4Addr*)CMSG_DATA(cmPtr);
+            //LogMsg("mDNSMacOSX.c: recvmsg IP_RECVDSTADDR %.4a", &dstaddr->ip.v4);
+        }
+        if (cmPtr->cmsg_level == IPPROTO_IP && cmPtr->cmsg_type == IP_RECVIF)
+        {
+            struct sockaddr_dl *sdl = (struct sockaddr_dl *)CMSG_DATA(cmPtr);
+            if (sdl->sdl_nlen < IF_NAMESIZE)
+            {
+                mDNSPlatformMemCopy(ifname, sdl->sdl_data, sdl->sdl_nlen);
+                ifname[sdl->sdl_nlen] = 0;
+                // debugf("IP_RECVIF sdl_index %d, sdl_data %s len %d", sdl->sdl_index, ifname, sdl->sdl_nlen);
+            }
+        }
+        if (cmPtr->cmsg_level == IPPROTO_IP && cmPtr->cmsg_type == IP_RECVTTL)
+            *ttl = *(u_char*)CMSG_DATA(cmPtr);
+        if (cmPtr->cmsg_level == IPPROTO_IPV6 && cmPtr->cmsg_type == IPV6_PKTINFO)
+        {
+            struct in6_pktinfo *ip6_info = (struct in6_pktinfo*)CMSG_DATA(cmPtr);
+            dstaddr->type = mDNSAddrType_IPv6;
+            dstaddr->ip.v6 = *(mDNSv6Addr*)&ip6_info->ipi6_addr;
+            myIfIndexToName(ip6_info->ipi6_ifindex, ifname);
+        }
+        if (cmPtr->cmsg_level == IPPROTO_IPV6 && cmPtr->cmsg_type == IPV6_HOPLIMIT)
+            *ttl = *(int*)CMSG_DATA(cmPtr);
+    }
+
+    return(n);
+}
+
+mDNSlocal mDNSInterfaceID FindMyInterface(mDNS *const m, const mDNSAddr *addr)
+{
+    NetworkInterfaceInfo *intf;
+
+    if (addr->type == mDNSAddrType_IPv4)
+    {
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+        {
+            if (intf->ip.type == addr->type && intf->McastTxRx)
+            {
+                if ((intf->ip.ip.v4.NotAnInteger ^ addr->ip.v4.NotAnInteger) == 0)
+                {
+                    return(intf->InterfaceID);
+                }
+            }
+        }
+    }
+
+    if (addr->type == mDNSAddrType_IPv6)
+    {
+        for (intf = m->HostInterfaces; intf; intf = intf->next)
+        {
+            if (intf->ip.type == addr->type && intf->McastTxRx)
+            {
+                if (((intf->ip.ip.v6.l[0] ^ addr->ip.v6.l[0]) == 0) &&
+                    ((intf->ip.ip.v6.l[1] ^ addr->ip.v6.l[1]) == 0) &&
+                    ((intf->ip.ip.v6.l[2] ^ addr->ip.v6.l[2]) == 0) &&
+                    (((intf->ip.ip.v6.l[3] ^ addr->ip.v6.l[3]) == 0)))
+                    {
+                        return(intf->InterfaceID);
+                    }
+            }
+        }
+    }
+    return(mDNSInterface_Any);
+}
+
+mDNSexport mDNSBool mDNSPlatformPeekUDP(mDNS *const m, UDPSocket *src)
+{
+    // We should have a DNSMessage header followed by the question and an answer
+    // which also includes a CNAME (that's when this function is called).  To keep it
+    // simple, we expect at least the size of DNSMessage header(12) and size of "A"
+    // record (14 bytes).
+    char buffer[26];
+    int ret;
+
+    (void) m;
+
+    if (!src)
+        return mDNSfalse;
+
+    ret = recv(src->ss.sktv4, buffer, sizeof(buffer), MSG_PEEK);
+    if (ret > 0)
+        return mDNStrue;
+    else
+        return mDNSfalse;
+}
+
+mDNSexport void myKQSocketCallBack(int s1, short filter, void *context)
+{
+    KQSocketSet *const ss = (KQSocketSet *)context;
+    mDNS *const m = ss->m;
+    int err = 0, count = 0, closed = 0;
+
+    if (filter != EVFILT_READ)
+        LogMsg("myKQSocketCallBack: Why is filter %d not EVFILT_READ (%d)?", filter, EVFILT_READ);
+
+    if (s1 != ss->sktv4 && s1 != ss->sktv6)
+    {
+        LogMsg("myKQSocketCallBack: native socket %d", s1);
+        LogMsg("myKQSocketCallBack: sktv4 %d sktv6 %d", ss->sktv4, ss->sktv6);
+    }
+
+    while (!closed)
+    {
+        mDNSAddr senderAddr, destAddr;
+        mDNSIPPort senderPort;
+        struct sockaddr_storage from;
+        size_t fromlen = sizeof(from);
+        char packetifname[IF_NAMESIZE] = "";
+        mDNSu8 ttl;
+        err = myrecvfrom(s1, &m->imsg, sizeof(m->imsg), (struct sockaddr *)&from, &fromlen, &destAddr, packetifname, &ttl);
+        if (err < 0) break;
+
+        count++;
+        if (from.ss_family == AF_INET)
+        {
+            struct sockaddr_in *s = (struct sockaddr_in*)&from;
+            senderAddr.type = mDNSAddrType_IPv4;
+            senderAddr.ip.v4.NotAnInteger = s->sin_addr.s_addr;
+            senderPort.NotAnInteger = s->sin_port;
+            //LogInfo("myKQSocketCallBack received IPv4 packet from %#-15a to %#-15a on skt %d %s", &senderAddr, &destAddr, s1, packetifname);
+        }
+        else if (from.ss_family == AF_INET6)
+        {
+            struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&from;
+            senderAddr.type = mDNSAddrType_IPv6;
+            senderAddr.ip.v6 = *(mDNSv6Addr*)&sin6->sin6_addr;
+            senderPort.NotAnInteger = sin6->sin6_port;
+            //LogInfo("myKQSocketCallBack received IPv6 packet from %#-15a to %#-15a on skt %d %s", &senderAddr, &destAddr, s1, packetifname);
+        }
+        else
+        {
+            LogMsg("myKQSocketCallBack from is unknown address family %d", from.ss_family);
+            return;
+        }
+
+        // Note: When handling multiple packets in a batch, MUST reset InterfaceID before handling each packet
+        mDNSInterfaceID InterfaceID = mDNSNULL;
+        NetworkInterfaceInfoOSX *intf = m->p->InterfaceList;
+        while (intf) 
+        {
+            if (intf->Exists && !strcmp(intf->ifinfo.ifname, packetifname))
+                break;
+            intf = intf->next;
+        }
+
+        // When going to sleep we deregister all our interfaces, but if the machine
+        // takes a few seconds to sleep we may continue to receive multicasts
+        // during that time, which would confuse mDNSCoreReceive, because as far
+        // as it's concerned, we should have no active interfaces any more.
+        // Hence we ignore multicasts for which we can find no matching InterfaceID.
+        if (intf)
+            InterfaceID = intf->ifinfo.InterfaceID;
+        else if (mDNSAddrIsDNSMulticast(&destAddr))
+            continue;
+
+        if (!InterfaceID)
+        {
+            InterfaceID = FindMyInterface(m, &destAddr);
+        }
+
+//		LogMsg("myKQSocketCallBack got packet from %#a to %#a on interface %#a/%s",
+//			&senderAddr, &destAddr, &ss->info->ifinfo.ip, ss->info->ifinfo.ifname);
+
+        // mDNSCoreReceive may close the socket we're reading from.  We must break out of our
+        // loop when that happens, or we may try to read from an invalid FD.  We do this by
+        // setting the closeFlag pointer in the socketset, so CloseSocketSet can inform us
+        // if it closes the socketset.
+        ss->closeFlag = &closed;
+
+        if (ss->proxy)
+        {
+            m->p->UDPProxyCallback(m, &m->p->UDPProxy, (unsigned char *)&m->imsg, (unsigned char*)&m->imsg + err, &senderAddr,
+                senderPort, &destAddr, ss->port, InterfaceID, NULL);
+        }
+        else
+        {
+            mDNSCoreReceive(m, &m->imsg, (unsigned char*)&m->imsg + err, &senderAddr, senderPort, &destAddr, ss->port, InterfaceID);
+        }
+
+        // if we didn't close, we can safely dereference the socketset, and should to
+        // reset the closeFlag, since it points to something on the stack
+        if (!closed) ss->closeFlag = mDNSNULL;
+    }
+
+    if (err < 0 && (errno != EWOULDBLOCK || count == 0))
+    {
+        // Something is busted here.
+        // kqueue says there is a packet, but myrecvfrom says there is not.
+        // Try calling select() to get another opinion.
+        // Find out about other socket parameter that can help understand why select() says the socket is ready for read
+        // All of this is racy, as data may have arrived after the call to select()
+        static unsigned int numLogMessages = 0;
+        int save_errno = errno;
+        int so_error = -1;
+        int so_nread = -1;
+        int fionread = -1;
+        socklen_t solen = sizeof(int);
+        fd_set readfds;
+        struct timeval timeout;
+        int selectresult;
+        FD_ZERO(&readfds);
+        FD_SET(s1, &readfds);
+        timeout.tv_sec  = 0;
+        timeout.tv_usec = 0;
+        selectresult = select(s1+1, &readfds, NULL, NULL, &timeout);
+        if (getsockopt(s1, SOL_SOCKET, SO_ERROR, &so_error, &solen) == -1)
+            LogMsg("myKQSocketCallBack getsockopt(SO_ERROR) error %d", errno);
+        if (getsockopt(s1, SOL_SOCKET, SO_NREAD, &so_nread, &solen) == -1)
+            LogMsg("myKQSocketCallBack getsockopt(SO_NREAD) error %d", errno);
+        if (ioctl(s1, FIONREAD, &fionread) == -1)
+            LogMsg("myKQSocketCallBack ioctl(FIONREAD) error %d", errno);
+        if (numLogMessages++ < 100)
+            LogMsg("myKQSocketCallBack recvfrom skt %d error %d errno %d (%s) select %d (%spackets waiting) so_error %d so_nread %d fionread %d count %d",
+                   s1, err, save_errno, strerror(save_errno), selectresult, FD_ISSET(s1, &readfds) ? "" : "*NO* ", so_error, so_nread, fionread, count);
+        if (numLogMessages > 5)
+            NotifyOfElusiveBug("Flaw in Kernel (select/recvfrom mismatch)",
+                               "Congratulations, you've reproduced an elusive bug.\r"
+                               "Please contact the current assignee of <rdar://problem/3375328>.\r"
+                               "Alternatively, you can send email to radar-3387020@group.apple.com. (Note number is different.)\r"
+                               "If possible, please leave your machine undisturbed so that someone can come to investigate the problem.");
+
+        sleep(1);       // After logging this error, rate limit so we don't flood syslog
+    }
+}
+
+mDNSlocal void doTcpSocketCallback(TCPSocket *sock)
+{
+    mDNSBool c = !sock->connected;
+    sock->connected = mDNStrue;
+    sock->callback(sock, sock->context, c, sock->err);
+    // Note: the callback may call CloseConnection here, which frees the context structure!
+}
+
+#ifndef NO_SECURITYFRAMEWORK
+
+mDNSlocal OSStatus tlsWriteSock(SSLConnectionRef connection, const void *data, size_t *dataLength)
+{
+    int ret = send(((TCPSocket *)connection)->fd, data, *dataLength, 0);
+    if (ret >= 0 && (size_t)ret < *dataLength) { *dataLength = ret; return(errSSLWouldBlock); }
+    if (ret >= 0)                              { *dataLength = ret; return(noErr); }
+    *dataLength = 0;
+    if (errno == EAGAIN                      ) return(errSSLWouldBlock);
+    if (errno == ENOENT                      ) return(errSSLClosedGraceful);
+    if (errno == EPIPE || errno == ECONNRESET) return(errSSLClosedAbort);
+    LogMsg("ERROR: tlsWriteSock: %d error %d (%s)\n", ((TCPSocket *)connection)->fd, errno, strerror(errno));
+    return(errSSLClosedAbort);
+}
+
+mDNSlocal OSStatus tlsReadSock(SSLConnectionRef connection, void *data, size_t *dataLength)
+{
+    int ret = recv(((TCPSocket *)connection)->fd, data, *dataLength, 0);
+    if (ret > 0 && (size_t)ret < *dataLength) { *dataLength = ret; return(errSSLWouldBlock); }
+    if (ret > 0)                              { *dataLength = ret; return(noErr); }
+    *dataLength = 0;
+    if (ret == 0 || errno == ENOENT    ) return(errSSLClosedGraceful);
+    if (            errno == EAGAIN    ) return(errSSLWouldBlock);
+    if (            errno == ECONNRESET) return(errSSLClosedAbort);
+    LogMsg("ERROR: tlsSockRead: error %d (%s)\n", errno, strerror(errno));
+    return(errSSLClosedAbort);
+}
+
+mDNSlocal OSStatus tlsSetupSock(TCPSocket *sock, SSLProtocolSide pside, SSLConnectionType ctype)
+{
+    char domname_cstr[MAX_ESCAPED_DOMAIN_NAME];
+
+    sock->tlsContext = SSLCreateContext(kCFAllocatorDefault, pside, ctype);
+    if (!sock->tlsContext) 
+    { 
+        LogMsg("ERROR: tlsSetupSock: SSLCreateContext failed"); 
+        return(mStatus_UnknownErr); 
+    }
+
+    mStatus err = SSLSetIOFuncs(sock->tlsContext, tlsReadSock, tlsWriteSock);
+    if (err) 
+    { 
+        LogMsg("ERROR: tlsSetupSock: SSLSetIOFuncs failed with error code: %d", err); 
+        goto fail; 
+    }
+
+    err = SSLSetConnection(sock->tlsContext, (SSLConnectionRef) sock);
+    if (err) 
+    { 
+        LogMsg("ERROR: tlsSetupSock: SSLSetConnection failed with error code: %d", err); 
+        goto fail; 
+    }
+
+    // Instead of listing all the acceptable ciphers, we just disable the bad ciphers. It does not disable
+    // all the bad ciphers like RC4_MD5, but it assumes that the servers don't offer them.
+    err = SSLSetAllowAnonymousCiphers(sock->tlsContext, 0);
+    if (err) 
+    { 
+        LogMsg("ERROR: tlsSetupSock: SSLSetAllowAnonymousCiphers failed with error code: %d", err); 
+        goto fail; 
+    }
+
+    // We already checked for NULL in hostname and this should never happen. Hence, returning -1
+    // (error not in OSStatus space) is okay.
+    if (!sock->hostname.c[0]) 
+    {
+        LogMsg("ERROR: tlsSetupSock: hostname NULL"); 
+        err = -1;
+        goto fail;
+    }
+
+    ConvertDomainNameToCString(&sock->hostname, domname_cstr);
+    err = SSLSetPeerDomainName(sock->tlsContext, domname_cstr, strlen(domname_cstr));
+    if (err) 
+    { 
+        LogMsg("ERROR: tlsSetupSock: SSLSetPeerDomainname: %s failed with error code: %d", domname_cstr, err); 
+        goto fail; 
+    }
+
+    return(err);
+
+fail:
+    if (sock->tlsContext)
+        CFRelease(sock->tlsContext);
+    return(err);
+}
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+mDNSlocal void doSSLHandshake(TCPSocket *sock)
+{
+    mStatus err = SSLHandshake(sock->tlsContext);
+
+    //Can't have multiple threads in mDNS core. When MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM is
+    //defined, KQueueLock is a noop. Hence we need to serialize here
+    //
+    //NOTE: We just can't serialize doTcpSocketCallback alone on the main queue.
+    //We need the rest of the logic also. Otherwise, we can enable the READ
+    //events below, dispatch a doTcpSocketCallback on the main queue. Assume it is
+    //ConnFailed which means we are going to free the tcpInfo. While it
+    //is waiting to be dispatched, another read event can come into tcpKQSocketCallback
+    //and potentially call doTCPCallback with error which can close the fd and free the
+    //tcpInfo. Later when the thread gets dispatched it will crash because the tcpInfo
+    //is already freed.
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+
+                       LogInfo("doSSLHandshake %p: got lock", sock); // Log *after* we get the lock
+
+                       if (sock->handshake == handshake_to_be_closed)
+                       {
+                           LogInfo("SSLHandshake completed after close");
+                           mDNSPlatformTCPCloseConnection(sock);
+                       }
+                       else
+                       {
+                           if (sock->fd != -1) KQueueSet(sock->fd, EV_ADD, EVFILT_READ, sock->kqEntry);
+                           else LogMsg("doSSLHandshake: sock->fd is -1");
+
+                           if (err == errSSLWouldBlock)
+                               sock->handshake = handshake_required;
+                           else
+                           {
+                               if (err)
+                               {
+                                   LogMsg("SSLHandshake failed: %d%s", err, err == errSSLPeerInternalError ? " (server busy)" : "");
+                                   CFRelease(sock->tlsContext);
+                                   sock->tlsContext = NULL;
+                               }
+
+                               sock->err = err ? mStatus_ConnFailed : 0;
+                               sock->handshake = handshake_completed;
+
+                               LogInfo("doSSLHandshake: %p calling doTcpSocketCallback fd %d", sock, sock->fd);
+                               doTcpSocketCallback(sock);
+                           }
+                       }
+
+                       LogInfo("SSLHandshake %p: dropping lock for fd %d", sock, sock->fd);
+                       return;
+                   });
+}
+#else // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+mDNSlocal void *doSSLHandshake(TCPSocket *sock)
+{
+    // Warning: Touching sock without the kqueue lock!
+    // We're protected because sock->handshake == handshake_in_progress
+    mDNS * const m = sock->m; // Get m now, as we may free sock if marked to be closed while we're waiting on SSLHandshake
+    mStatus err = SSLHandshake(sock->tlsContext);
+
+    KQueueLock(m);
+    debugf("doSSLHandshake %p: got lock", sock); // Log *after* we get the lock
+
+    if (sock->handshake == handshake_to_be_closed)
+    {
+        LogInfo("SSLHandshake completed after close");
+        mDNSPlatformTCPCloseConnection(sock);
+    }
+    else
+    {
+        if (sock->fd != -1) KQueueSet(sock->fd, EV_ADD, EVFILT_READ, sock->kqEntry);
+        else LogMsg("doSSLHandshake: sock->fd is -1");
+
+        if (err == errSSLWouldBlock)
+            sock->handshake = handshake_required;
+        else
+        {
+            if (err)
+            {
+                LogMsg("SSLHandshake failed: %d%s", err, err == errSSLPeerInternalError ? " (server busy)" : "");
+                CFRelease(sock->tlsContext);
+                sock->tlsContext = NULL;
+            }
+
+            sock->err = err ? mStatus_ConnFailed : 0;
+            sock->handshake = handshake_completed;
+
+            debugf("doSSLHandshake: %p calling doTcpSocketCallback fd %d", sock, sock->fd);
+            doTcpSocketCallback(sock);
+        }
+    }
+
+    debugf("SSLHandshake %p: dropping lock for fd %d", sock, sock->fd);
+    KQueueUnlock(m, "doSSLHandshake");
+    return NULL;
+}
+#endif // MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+
+mDNSlocal void spawnSSLHandshake(TCPSocket* sock)
+{
+    debugf("spawnSSLHandshake %p: entry", sock);
+
+    if (sock->handshake != handshake_required) LogMsg("spawnSSLHandshake: handshake status not required: %d", sock->handshake);
+    sock->handshake = handshake_in_progress;
+    KQueueSet(sock->fd, EV_DELETE, EVFILT_READ, sock->kqEntry);
+
+    // Dispatch it on a separate queue to help avoid blocking other threads/queues, and
+    // to limit the number of threads used for SSLHandshake
+    dispatch_async(SSLqueue, ^{doSSLHandshake(sock);});
+
+    debugf("spawnSSLHandshake %p: done for %d", sock, sock->fd);
+}
+
+#endif /* NO_SECURITYFRAMEWORK */
+
+mDNSlocal void tcpKQSocketCallback(__unused int fd, short filter, void *context)
+{
+    TCPSocket *sock = context;
+    sock->err = mStatus_NoError;
+
+    //if (filter == EVFILT_READ ) LogMsg("myKQSocketCallBack: tcpKQSocketCallback %d is EVFILT_READ", filter);
+    //if (filter == EVFILT_WRITE) LogMsg("myKQSocketCallBack: tcpKQSocketCallback %d is EVFILT_WRITE", filter);
+    // EV_ONESHOT doesn't seem to work, so we add the filter with EV_ADD, and explicitly delete it here with EV_DELETE
+    if (filter == EVFILT_WRITE) 
+        KQueueSet(sock->fd, EV_DELETE, EVFILT_WRITE, sock->kqEntry);
+
+    if (sock->flags & kTCPSocketFlags_UseTLS)
+    {
+#ifndef NO_SECURITYFRAMEWORK
+        if (!sock->setup) 
+        { 
+            sock->setup = mDNStrue; 
+            sock->err = tlsSetupSock(sock, kSSLClientSide, kSSLStreamType);
+            if (sock->err)
+            {
+                LogMsg("ERROR: tcpKQSocketCallback: tlsSetupSock failed with error code: %d", sock->err);
+                return;
+            }
+        }
+        if (sock->handshake == handshake_required) 
+        { 
+            spawnSSLHandshake(sock); 
+            return;
+        }
+        else if (sock->handshake == handshake_in_progress || sock->handshake == handshake_to_be_closed)
+        {
+            return;
+        }
+        else if (sock->handshake != handshake_completed)
+        {
+            if (!sock->err) 
+                sock->err = mStatus_UnknownErr;
+            LogMsg("tcpKQSocketCallback called with unexpected SSLHandshake status: %d", sock->handshake);
+        }
+#else  /* NO_SECURITYFRAMEWORK */ 
+        sock->err = mStatus_UnsupportedErr;
+#endif /* NO_SECURITYFRAMEWORK */
+    }
+
+    doTcpSocketCallback(sock);
+}
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+mDNSexport int KQueueSet(int fd, u_short flags, short filter, KQueueEntry *const entryRef)
+{
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    dispatch_source_t source;
+    if (flags == EV_DELETE)
+    {
+        if (filter == EVFILT_READ)
+        {
+            dispatch_source_cancel(entryRef->readSource);
+            dispatch_release(entryRef->readSource);
+            entryRef->readSource = mDNSNULL;
+            debugf("KQueueSet: source cancel for read %p, %p", entryRef->readSource, entryRef->writeSource);
+        }
+        else if (filter == EVFILT_WRITE)
+        {
+            dispatch_source_cancel(entryRef->writeSource);
+            dispatch_release(entryRef->writeSource);
+            entryRef->writeSource = mDNSNULL;
+            debugf("KQueueSet: source cancel for write %p, %p", entryRef->readSource, entryRef->writeSource);
+        }
+        else
+            LogMsg("KQueueSet: ERROR: Wrong filter value %d for EV_DELETE", filter);
+        return 0;
+    }
+    if (flags != EV_ADD) LogMsg("KQueueSet: Invalid flags %d", flags);
+
+    if (filter == EVFILT_READ)
+    {
+        source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0, queue);
+    }
+    else if (filter == EVFILT_WRITE)
+    {
+        source = dispatch_source_create(DISPATCH_SOURCE_TYPE_WRITE, fd, 0, queue);
+    }
+    else
+    {
+        LogMsg("KQueueSet: ERROR: Wrong filter value %d for EV_ADD", filter);
+        return -1;
+    }
+    if (!source) return -1;
+    dispatch_source_set_event_handler(source, ^{
+
+                                          mDNSs32 stime = mDNSPlatformRawTime();
+                                          entryRef->KQcallback(fd, filter, entryRef->KQcontext);
+                                          mDNSs32 etime = mDNSPlatformRawTime();
+                                          if (etime - stime >= WatchDogReportingThreshold)
+                                              LogInfo("KQEntryCallback Block: WARNING: took %dms to complete", etime - stime);
+
+                                          // Trigger the event delivery to the application. Even though we trigger the
+                                          // event completion after handling every event source, these all will hopefully
+                                          // get merged
+                                          TriggerEventCompletion();
+
+                                      });
+    dispatch_source_set_cancel_handler(source, ^{
+                                           if (entryRef->fdClosed)
+                                           {
+                                               //LogMsg("CancelHandler: closing fd %d", fd);
+                                               close(fd);
+                                           }
+                                       });
+    dispatch_resume(source);
+    if (filter == EVFILT_READ)
+        entryRef->readSource = source;
+    else
+        entryRef->writeSource = source;
+
+    return 0;
+}
+
+mDNSexport void KQueueLock(mDNS *const m)
+{
+    (void)m; //unused
+}
+mDNSexport void KQueueUnlock(mDNS *const m, const char const *task)
+{
+    (void)m; //unused
+    (void)task; //unused
+}
+#else
+mDNSexport int KQueueSet(int fd, u_short flags, short filter, const KQueueEntry *const entryRef)
+{
+    struct kevent new_event;
+    EV_SET(&new_event, fd, filter, flags, 0, 0, (void*)entryRef);
+    return (kevent(KQueueFD, &new_event, 1, NULL, 0, NULL) < 0) ? errno : 0;
+}
+
+mDNSexport void KQueueLock(mDNS *const m)
+{
+    pthread_mutex_lock(&m->p->BigMutex);
+    m->p->BigMutexStartTime = mDNSPlatformRawTime();
+}
+
+mDNSexport void KQueueUnlock(mDNS *const m, const char* task)
+{
+    mDNSs32 end = mDNSPlatformRawTime();
+    (void)task;
+    if (end - m->p->BigMutexStartTime >= WatchDogReportingThreshold)
+        LogInfo("WARNING: %s took %dms to complete", task, end - m->p->BigMutexStartTime);
+
+    pthread_mutex_unlock(&m->p->BigMutex);
+
+    char wake = 1;
+    if (send(m->p->WakeKQueueLoopFD, &wake, sizeof(wake), 0) == -1)
+        LogMsg("ERROR: KQueueWake: send failed with error code: %d (%s)", errno, strerror(errno));
+}
+#endif
+
+mDNSexport void mDNSPlatformCloseFD(KQueueEntry *kq, int fd)
+{
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+        (void) fd; //unused
+    if (kq->readSource)
+    {
+        dispatch_source_cancel(kq->readSource);
+        kq->readSource = mDNSNULL;
+    }
+    if (kq->writeSource)
+    {
+        dispatch_source_cancel(kq->writeSource);
+        kq->writeSource = mDNSNULL;
+    }
+    // Close happens in the cancellation handler
+    debugf("mDNSPlatformCloseFD: resetting sources for %d", fd);
+    kq->fdClosed = mDNStrue;
+#else
+    (void)kq; //unused
+    close(fd);
+#endif
+}
+
+mDNSlocal mStatus SetupTCPSocket(TCPSocket *sock, u_short sa_family, mDNSIPPort *port, mDNSBool useBackgroundTrafficClass)
+{
+    KQSocketSet *cp = &sock->ss;
+    int         *s        = (sa_family == AF_INET) ? &cp->sktv4 : &cp->sktv6;
+    KQueueEntry *k        = (sa_family == AF_INET) ? &cp->kqsv4 : &cp->kqsv6;
+    const int on = 1;  // "on" for setsockopt
+    mStatus err;
+
+    int skt = socket(sa_family, SOCK_STREAM, IPPROTO_TCP);
+    if (skt < 3) { if (errno != EAFNOSUPPORT) LogMsg("SetupTCPSocket: socket error %d errno %d (%s)", skt, errno, strerror(errno));return(skt); }
+
+    // for TCP sockets, the traffic class is set once and not changed
+    setTrafficClass(skt, useBackgroundTrafficClass);
+
+    if (sa_family == AF_INET)
+    {
+        // Bind it
+        struct sockaddr_in addr;
+        mDNSPlatformMemZero(&addr, sizeof(addr));
+        addr.sin_family = AF_INET;
+        addr.sin_port = port->NotAnInteger;
+        err = bind(skt, (struct sockaddr*) &addr, sizeof(addr));
+        if (err < 0) { LogMsg("ERROR: bind %s", strerror(errno)); return err; }
+
+        // Receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVIF, &on, sizeof(on));
+        if (err < 0) { LogMsg("setsockopt IP_RECVIF - %s", strerror(errno)); return err; }
+
+        mDNSPlatformMemZero(&addr, sizeof(addr));
+        socklen_t len = sizeof(addr);
+        err = getsockname(skt, (struct sockaddr*) &addr, &len);
+        if (err < 0) { LogMsg("getsockname - %s", strerror(errno)); return err; }
+
+        port->NotAnInteger = addr.sin_port;
+    }
+    else
+    {
+        // Bind it
+        struct sockaddr_in6 addr6;
+        mDNSPlatformMemZero(&addr6, sizeof(addr6));
+        addr6.sin6_family = AF_INET6;
+        addr6.sin6_port = port->NotAnInteger;
+        err = bind(skt, (struct sockaddr*) &addr6, sizeof(addr6));
+        if (err < 0) { LogMsg("ERROR: bind6 %s", strerror(errno)); return err; }
+
+        // We want to receive destination addresses and receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
+        if (err < 0) { LogMsg("ERROR: setsockopt IPV6_RECVPKTINFO %s", strerror(errno)); return err; }
+
+        mDNSPlatformMemZero(&addr6, sizeof(addr6));
+        socklen_t len = sizeof(addr6);
+        err = getsockname(skt, (struct sockaddr *) &addr6, &len);
+        if (err < 0) { LogMsg("getsockname6 - %s", strerror(errno)); return err; }
+
+        port->NotAnInteger = addr6.sin6_port;
+
+    }
+    *s = skt;
+    k->KQcallback = tcpKQSocketCallback;
+    k->KQcontext  = sock;
+    k->KQtask     = "mDNSPlatformTCPSocket";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    k->readSource = mDNSNULL;
+    k->writeSource = mDNSNULL;
+    k->fdClosed = mDNSfalse;
+#endif
+    return mStatus_NoError;
+}
+
+mDNSexport TCPSocket *mDNSPlatformTCPSocket(mDNS *const m, TCPSocketFlags flags, mDNSIPPort *port, mDNSBool useBackgroundTrafficClass)
+{
+    mStatus err;
+    (void) m;
+
+    TCPSocket *sock = mallocL("TCPSocket/mDNSPlatformTCPSocket", sizeof(TCPSocket));
+    if (!sock) { LogMsg("mDNSPlatformTCPSocket: memory allocation failure"); return(mDNSNULL); }
+
+    mDNSPlatformMemZero(sock, sizeof(TCPSocket));
+
+    sock->ss.m     = m;
+    sock->ss.sktv4 = -1;
+    sock->ss.sktv6 = -1;
+    err = SetupTCPSocket(sock, AF_INET, port, useBackgroundTrafficClass);
+
+    if (!err)
+    {
+        err = SetupTCPSocket(sock, AF_INET6, port, useBackgroundTrafficClass);
+        if (err) { mDNSPlatformCloseFD(&sock->ss.kqsv4, sock->ss.sktv4); sock->ss.sktv4 = -1; }
+    }
+    if (err)
+    {
+        LogMsg("mDNSPlatformTCPSocket: socket error %d errno %d (%s)", sock->fd, errno, strerror(errno));
+        freeL("TCPSocket/mDNSPlatformTCPSocket", sock);
+        return(mDNSNULL);
+    }
+    // sock->fd is used as the default fd  if the caller does not call mDNSPlatformTCPConnect
+    sock->fd                = sock->ss.sktv4;
+    sock->callback          = mDNSNULL;
+    sock->flags             = flags;
+    sock->context           = mDNSNULL;
+    sock->setup             = mDNSfalse;
+    sock->connected         = mDNSfalse;
+    sock->handshake         = handshake_required;
+    sock->m                 = m;
+    sock->err               = mStatus_NoError;
+
+    return sock;
+}
+
+mDNSexport mStatus mDNSPlatformTCPConnect(TCPSocket *sock, const mDNSAddr *dst, mDNSOpaque16 dstport, domainname *hostname, mDNSInterfaceID InterfaceID, TCPConnectionCallback callback, void *context)
+{
+    KQSocketSet *cp = &sock->ss;
+    int         *s        = (dst->type == mDNSAddrType_IPv4) ? &cp->sktv4 : &cp->sktv6;
+    KQueueEntry *k        = (dst->type == mDNSAddrType_IPv4) ? &cp->kqsv4 : &cp->kqsv6;
+    mStatus err = mStatus_NoError;
+    struct sockaddr_storage ss;
+
+    sock->callback          = callback;
+    sock->context           = context;
+    sock->setup             = mDNSfalse;
+    sock->connected         = mDNSfalse;
+    sock->handshake         = handshake_required;
+    sock->err               = mStatus_NoError;
+
+    if (hostname) { debugf("mDNSPlatformTCPConnect: hostname %##s", hostname->c); AssignDomainName(&sock->hostname, hostname); }
+
+    if (dst->type == mDNSAddrType_IPv4)
+    {
+        struct sockaddr_in *saddr = (struct sockaddr_in *)&ss;
+        mDNSPlatformMemZero(saddr, sizeof(*saddr));
+        saddr->sin_family      = AF_INET;
+        saddr->sin_port        = dstport.NotAnInteger;
+        saddr->sin_len         = sizeof(*saddr);
+        saddr->sin_addr.s_addr = dst->ip.v4.NotAnInteger;
+    }
+    else
+    {
+        struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&ss;
+        mDNSPlatformMemZero(saddr6, sizeof(*saddr6));
+        saddr6->sin6_family      = AF_INET6;
+        saddr6->sin6_port        = dstport.NotAnInteger;
+        saddr6->sin6_len         = sizeof(*saddr6);
+        saddr6->sin6_addr        = *(struct in6_addr *)&dst->ip.v6;
+    }
+
+    // Watch for connect complete (write is ready)
+    // EV_ONESHOT doesn't seem to work, so we add the filter with EV_ADD, and explicitly delete it in tcpKQSocketCallback using EV_DELETE
+    if (KQueueSet(*s, EV_ADD /* | EV_ONESHOT */, EVFILT_WRITE, k))
+    {
+        LogMsg("ERROR: mDNSPlatformTCPConnect - KQueueSet failed");
+        return errno;
+    }
+
+    // Watch for incoming data
+    if (KQueueSet(*s, EV_ADD, EVFILT_READ, k))
+    {
+        LogMsg("ERROR: mDNSPlatformTCPConnect - KQueueSet failed");
+        return errno;
+    }
+
+    if (fcntl(*s, F_SETFL, fcntl(*s, F_GETFL, 0) | O_NONBLOCK) < 0) // set non-blocking
+    {
+        LogMsg("ERROR: setsockopt O_NONBLOCK - %s", strerror(errno));
+        return mStatus_UnknownErr;
+    }
+
+    // We bind to the interface and all subsequent packets including the SYN will be sent out
+    // on this interface
+    //
+    // Note: If we are in Active Directory domain, we may try TCP (if the response can't fit in
+    // UDP). mDNSInterface_Unicast indicates this case and not a valid interface.
+    if (InterfaceID && InterfaceID != mDNSInterface_Unicast)
+    {
+        NetworkInterfaceInfoOSX *info = IfindexToInterfaceInfoOSX(&mDNSStorage, InterfaceID);
+        if (dst->type == mDNSAddrType_IPv4)
+        {
+        #ifdef IP_BOUND_IF
+            if (info) setsockopt(*s, IPPROTO_IP, IP_BOUND_IF, &info->scope_id, sizeof(info->scope_id));
+            else { LogMsg("mDNSPlatformTCPConnect: Invalid interface index %p", InterfaceID); return mStatus_BadParamErr; }
+        #else
+            (void)InterfaceID; // Unused
+            (void)info; // Unused
+        #endif
+        }
+        else
+        {
+        #ifdef IPV6_BOUND_IF
+            if (info) setsockopt(*s, IPPROTO_IPV6, IPV6_BOUND_IF, &info->scope_id, sizeof(info->scope_id));
+            else { LogMsg("mDNSPlatformTCPConnect: Invalid interface index %p", InterfaceID); return mStatus_BadParamErr; }
+        #else
+            (void)InterfaceID; // Unused
+            (void)info; // Unused
+        #endif
+        }
+    }
+
+    // mDNSPlatformReadTCP/WriteTCP (unlike the UDP counterpart) does not provide the destination address
+    // from which we can infer the destination address family. Hence we need to remember that here.
+    // Instead of remembering the address family, we remember the right fd.
+    sock->fd = *s;
+    sock->kqEntry = k;
+    // initiate connection wth peer
+    if (connect(*s, (struct sockaddr *)&ss, ss.ss_len) < 0)
+    {
+        if (errno == EINPROGRESS) return mStatus_ConnPending;
+        if (errno == EHOSTUNREACH || errno == EADDRNOTAVAIL || errno == ENETDOWN)
+            LogInfo("ERROR: mDNSPlatformTCPConnect - connect failed: socket %d: Error %d (%s)", sock->fd, errno, strerror(errno));
+        else
+            LogMsg("ERROR: mDNSPlatformTCPConnect - connect failed: socket %d: Error %d (%s) length %d", sock->fd, errno, strerror(errno), ss.ss_len);
+        return mStatus_ConnFailed;
+    }
+
+    LogMsg("NOTE: mDNSPlatformTCPConnect completed synchronously");
+    // kQueue should notify us, but this LogMsg is to help track down if it doesn't
+    return err;
+}
+
+// Why doesn't mDNSPlatformTCPAccept actually call accept() ?
+mDNSexport TCPSocket *mDNSPlatformTCPAccept(TCPSocketFlags flags, int fd)
+{
+    mStatus err = mStatus_NoError;
+
+    TCPSocket *sock = mallocL("TCPSocket/mDNSPlatformTCPAccept", sizeof(TCPSocket));
+    if (!sock) return(mDNSNULL);
+
+    mDNSPlatformMemZero(sock, sizeof(*sock));
+    sock->fd = fd;
+    sock->flags = flags;
+
+    if (flags & kTCPSocketFlags_UseTLS)
+    {
+#ifndef NO_SECURITYFRAMEWORK
+        if (!ServerCerts) { LogMsg("ERROR: mDNSPlatformTCPAccept: unable to find TLS certificates"); err = mStatus_UnknownErr; goto exit; }
+
+        err = tlsSetupSock(sock, kSSLServerSide, kSSLStreamType);
+        if (err) { LogMsg("ERROR: mDNSPlatformTCPAccept: tlsSetupSock failed with error code: %d", err); goto exit; }
+
+        err = SSLSetCertificate(sock->tlsContext, ServerCerts);
+        if (err) { LogMsg("ERROR: mDNSPlatformTCPAccept: SSLSetCertificate failed with error code: %d", err); goto exit; }
+#else
+        err = mStatus_UnsupportedErr;
+#endif /* NO_SECURITYFRAMEWORK */
+    }
+#ifndef NO_SECURITYFRAMEWORK
+exit:
+#endif
+
+    if (err) { freeL("TCPSocket/mDNSPlatformTCPAccept", sock); return(mDNSNULL); }
+    return(sock);
+}
+
+mDNSexport mDNSu16 mDNSPlatformGetUDPPort(UDPSocket *sock)
+{
+    mDNSu16 port;
+
+    port = -1;
+    if (sock)
+    {
+        port = sock->ss.port.NotAnInteger;
+    }
+    return port;
+}
+
+mDNSlocal void CloseSocketSet(KQSocketSet *ss)
+{
+    if (ss->sktv4 != -1)
+    {
+        mDNSPlatformCloseFD(&ss->kqsv4,  ss->sktv4);
+        ss->sktv4 = -1;
+    }
+    if (ss->sktv6 != -1)
+    {
+        mDNSPlatformCloseFD(&ss->kqsv6,  ss->sktv6);
+        ss->sktv6 = -1;
+    }
+    if (ss->closeFlag) *ss->closeFlag = 1;
+}
+
+mDNSexport void mDNSPlatformTCPCloseConnection(TCPSocket *sock)
+{
+    if (sock)
+    {
+#ifndef NO_SECURITYFRAMEWORK
+        if (sock->tlsContext)
+        {
+            if (sock->handshake == handshake_in_progress) // SSLHandshake thread using this sock (esp. tlsContext)
+            {
+                LogInfo("mDNSPlatformTCPCloseConnection: called while handshake in progress");
+                // When we come back from SSLHandshake, we will notice that a close was here and
+                // call this function again which will do the cleanup then.
+                sock->handshake = handshake_to_be_closed;
+                return;
+            }
+
+            SSLClose(sock->tlsContext);
+            CFRelease(sock->tlsContext);
+            sock->tlsContext = NULL;
+        }
+#endif /* NO_SECURITYFRAMEWORK */
+        if (sock->ss.sktv4 != -1) 
+            shutdown(sock->ss.sktv4, 2);
+        if (sock->ss.sktv6 != -1) 
+            shutdown(sock->ss.sktv6, 2);
+        CloseSocketSet(&sock->ss);
+        sock->fd = -1;
+
+        freeL("TCPSocket/mDNSPlatformTCPCloseConnection", sock);
+    }
+}
+
+mDNSexport long mDNSPlatformReadTCP(TCPSocket *sock, void *buf, unsigned long buflen, mDNSBool *closed)
+{
+    ssize_t nread = 0;
+    *closed = mDNSfalse;
+
+    if (sock->flags & kTCPSocketFlags_UseTLS)
+    {
+#ifndef NO_SECURITYFRAMEWORK
+        if (sock->handshake == handshake_required) { LogMsg("mDNSPlatformReadTCP called while handshake required"); return 0; }
+        else if (sock->handshake == handshake_in_progress) return 0;
+        else if (sock->handshake != handshake_completed) LogMsg("mDNSPlatformReadTCP called with unexpected SSLHandshake status: %d", sock->handshake);
+
+        //LogMsg("Starting SSLRead %d %X", sock->fd, fcntl(sock->fd, F_GETFL, 0));
+        mStatus err = SSLRead(sock->tlsContext, buf, buflen, (size_t *)&nread);
+        //LogMsg("SSLRead returned %d (%d) nread %d buflen %d", err, errSSLWouldBlock, nread, buflen);
+        if (err == errSSLClosedGraceful) { nread = 0; *closed = mDNStrue; }
+        else if (err && err != errSSLWouldBlock)
+        { LogMsg("ERROR: mDNSPlatformReadTCP - SSLRead: %d", err); nread = -1; *closed = mDNStrue; }
+#else
+        nread = -1;
+        *closed = mDNStrue;
+#endif /* NO_SECURITYFRAMEWORK */
+    }
+    else
+    {
+        static int CLOSEDcount = 0;
+        static int EAGAINcount = 0;
+        nread = recv(sock->fd, buf, buflen, 0);
+
+        if (nread > 0) 
+        { 
+            CLOSEDcount = 0; 
+            EAGAINcount = 0; 
+        } // On success, clear our error counters
+        else if (nread == 0)
+        {
+            *closed = mDNStrue;
+            if ((++CLOSEDcount % 1000) == 0) 
+            { 
+                LogMsg("ERROR: mDNSPlatformReadTCP - recv %d got CLOSED %d times", sock->fd, CLOSEDcount); 
+                assert(CLOSEDcount < 1000);
+                // Recovery Mechanism to bail mDNSResponder out of trouble: Instead of logging the same error msg multiple times,
+                // crash mDNSResponder using assert() and restart fresh. See advantages below:
+                // 1.Better User Experience 
+                // 2.CrashLogs frequency can be monitored 
+                // 3.StackTrace can be used for more info
+            }
+        }
+        // else nread is negative -- see what kind of error we got
+        else if (errno == ECONNRESET) { nread = 0; *closed = mDNStrue; }
+        else if (errno != EAGAIN) { LogMsg("ERROR: mDNSPlatformReadTCP - recv: %d (%s)", errno, strerror(errno)); nread = -1; }
+        else // errno is EAGAIN (EWOULDBLOCK) -- no data available
+        {
+            nread = 0;
+            if ((++EAGAINcount % 1000) == 0) { LogMsg("ERROR: mDNSPlatformReadTCP - recv %d got EAGAIN %d times", sock->fd, EAGAINcount); sleep(1); }
+        }
+    }
+
+    return nread;
+}
+
+mDNSexport long mDNSPlatformWriteTCP(TCPSocket *sock, const char *msg, unsigned long len)
+{
+    int nsent;
+
+    if (sock->flags & kTCPSocketFlags_UseTLS)
+    {
+#ifndef NO_SECURITYFRAMEWORK
+        size_t processed;
+        if (sock->handshake == handshake_required) { LogMsg("mDNSPlatformWriteTCP called while handshake required"); return 0; }
+        if (sock->handshake == handshake_in_progress) return 0;
+        else if (sock->handshake != handshake_completed) LogMsg("mDNSPlatformWriteTCP called with unexpected SSLHandshake status: %d", sock->handshake);
+
+        mStatus err = SSLWrite(sock->tlsContext, msg, len, &processed);
+
+        if (!err) nsent = (int) processed;
+        else if (err == errSSLWouldBlock) nsent = 0;
+        else { LogMsg("ERROR: mDNSPlatformWriteTCP - SSLWrite returned %d", err); nsent = -1; }
+#else
+        nsent = -1;
+#endif /* NO_SECURITYFRAMEWORK */
+    }
+    else
+    {
+        nsent = send(sock->fd, msg, len, 0);
+        if (nsent < 0)
+        {
+            if (errno == EAGAIN) nsent = 0;
+            else { LogMsg("ERROR: mDNSPlatformWriteTCP - send %s", strerror(errno)); nsent = -1; }
+        }
+    }
+
+    return nsent;
+}
+
+mDNSexport int mDNSPlatformTCPGetFD(TCPSocket *sock)
+{
+    return sock->fd;
+}
+
+// If mDNSIPPort port is non-zero, then it's a multicast socket on the specified interface
+// If mDNSIPPort port is zero, then it's a randomly assigned port number, used for sending unicast queries
+mDNSlocal mStatus SetupSocket(KQSocketSet *cp, const mDNSIPPort port, u_short sa_family, mDNSIPPort *const outport)
+{
+    int         *s        = (sa_family == AF_INET) ? &cp->sktv4 : &cp->sktv6;
+    KQueueEntry *k        = (sa_family == AF_INET) ? &cp->kqsv4 : &cp->kqsv6;
+    const int on = 1;
+    const int twofivefive = 255;
+    mStatus err = mStatus_NoError;
+    char *errstr = mDNSNULL;
+    const int mtu = 0;
+
+    cp->closeFlag = mDNSNULL;
+
+    int skt = socket(sa_family, SOCK_DGRAM, IPPROTO_UDP);
+    if (skt < 3) { if (errno != EAFNOSUPPORT) LogMsg("SetupSocket: socket error %d errno %d (%s)", skt, errno, strerror(errno));return(skt); }
+
+    // set default traffic class
+    setTrafficClass(skt, mDNSfalse);
+
+#ifdef SO_RECV_ANYIF
+    // Enable inbound packets on IFEF_AWDL interface.
+    // Only done for multicast sockets, since we don't expect unicast socket operations
+    // on the IFEF_AWDL interface. Operation is a no-op for other interface types.
+    if (mDNSSameIPPort(port, MulticastDNSPort)) 
+    {
+        err = setsockopt(skt, SOL_SOCKET, SO_RECV_ANYIF, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - SO_RECV_ANYIF"; goto fail; }
+    }
+#endif // SO_RECV_ANYIF
+
+    // ... with a shared UDP port, if it's for multicast receiving
+    if (mDNSSameIPPort(port, MulticastDNSPort) || mDNSSameIPPort(port, NATPMPAnnouncementPort)) err = setsockopt(skt, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on));
+    if (err < 0) { errstr = "setsockopt - SO_REUSEPORT"; goto fail; }
+
+    if (sa_family == AF_INET)
+    {
+        // We want to receive destination addresses
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IP_RECVDSTADDR"; goto fail; }
+
+        // We want to receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVIF, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IP_RECVIF"; goto fail; }
+
+        // We want to receive packet TTL value so we can check it
+        err = setsockopt(skt, IPPROTO_IP, IP_RECVTTL, &on, sizeof(on));
+        // We ignore errors here -- we already know Jaguar doesn't support this, but we can get by without it
+
+        // Send unicast packets with TTL 255
+        err = setsockopt(skt, IPPROTO_IP, IP_TTL, &twofivefive, sizeof(twofivefive));
+        if (err < 0) { errstr = "setsockopt - IP_TTL"; goto fail; }
+
+        // And multicast packets with TTL 255 too
+        err = setsockopt(skt, IPPROTO_IP, IP_MULTICAST_TTL, &twofivefive, sizeof(twofivefive));
+        if (err < 0) { errstr = "setsockopt - IP_MULTICAST_TTL"; goto fail; }
+
+        // And start listening for packets
+        struct sockaddr_in listening_sockaddr;
+        listening_sockaddr.sin_family      = AF_INET;
+        listening_sockaddr.sin_port        = port.NotAnInteger;     // Pass in opaque ID without any byte swapping
+        listening_sockaddr.sin_addr.s_addr = mDNSSameIPPort(port, NATPMPAnnouncementPort) ? AllHosts_v4.NotAnInteger : 0;
+        err = bind(skt, (struct sockaddr *) &listening_sockaddr, sizeof(listening_sockaddr));
+        if (err) { errstr = "bind"; goto fail; }
+        if (outport) outport->NotAnInteger = listening_sockaddr.sin_port;
+    }
+    else if (sa_family == AF_INET6)
+    {
+        // NAT-PMP Announcements make no sense on IPv6, and we don't support IPv6 for PCP, so bail early w/o error
+        if (mDNSSameIPPort(port, NATPMPAnnouncementPort)) { if (outport) *outport = zeroIPPort;return mStatus_NoError; }
+
+        // We want to receive destination addresses and receive interface identifiers
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IPV6_RECVPKTINFO"; goto fail; }
+
+        // We want to receive packet hop count value so we can check it
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IPV6_RECVHOPLIMIT"; goto fail; }
+
+        // We want to receive only IPv6 packets. Without this option we get IPv4 packets too,
+        // with mapped addresses of the form 0:0:0:0:0:FFFF:xxxx:xxxx, where xxxx:xxxx is the IPv4 address
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IPV6_V6ONLY"; goto fail; }
+
+        // Send unicast packets with TTL 255
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &twofivefive, sizeof(twofivefive));
+        if (err < 0) { errstr = "setsockopt - IPV6_UNICAST_HOPS"; goto fail; }
+
+        // And multicast packets with TTL 255 too
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &twofivefive, sizeof(twofivefive));
+        if (err < 0) { errstr = "setsockopt - IPV6_MULTICAST_HOPS"; goto fail; }
+
+        // Want to receive our own packets
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &on, sizeof(on));
+        if (err < 0) { errstr = "setsockopt - IPV6_MULTICAST_LOOP"; goto fail; }
+
+        // Disable default option to send mDNSv6 packets at min IPv6 MTU: RFC 3542, Sec 11
+        err = setsockopt(skt, IPPROTO_IPV6, IPV6_USE_MIN_MTU, &mtu, sizeof(mtu));
+        if (err < 0) // Since it is an optimization if we fail just log the err, no need to close the skt
+            LogMsg("SetupSocket: setsockopt - IPV6_USE_MIN_MTU: IP6PO_MINMTU_DISABLE socket %d err %d errno %d (%s)", 
+                    skt, err, errno, strerror(errno));
+        
+        // And start listening for packets
+        struct sockaddr_in6 listening_sockaddr6;
+        mDNSPlatformMemZero(&listening_sockaddr6, sizeof(listening_sockaddr6));
+        listening_sockaddr6.sin6_len         = sizeof(listening_sockaddr6);
+        listening_sockaddr6.sin6_family      = AF_INET6;
+        listening_sockaddr6.sin6_port        = port.NotAnInteger;       // Pass in opaque ID without any byte swapping
+        listening_sockaddr6.sin6_flowinfo    = 0;
+        listening_sockaddr6.sin6_addr        = in6addr_any; // Want to receive multicasts AND unicasts on this socket
+        listening_sockaddr6.sin6_scope_id    = 0;
+        err = bind(skt, (struct sockaddr *) &listening_sockaddr6, sizeof(listening_sockaddr6));
+        if (err) { errstr = "bind"; goto fail; }
+        if (outport) outport->NotAnInteger = listening_sockaddr6.sin6_port;
+    }
+
+    fcntl(skt, F_SETFL, fcntl(skt, F_GETFL, 0) | O_NONBLOCK); // set non-blocking
+    fcntl(skt, F_SETFD, 1); // set close-on-exec
+    *s = skt;
+    k->KQcallback = myKQSocketCallBack;
+    k->KQcontext  = cp;
+    k->KQtask     = "UDP packet reception";
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    k->readSource = mDNSNULL;
+    k->writeSource = mDNSNULL;
+    k->fdClosed = mDNSfalse;
+#endif
+    KQueueSet(*s, EV_ADD, EVFILT_READ, k);
+
+    return(err);
+
+fail:
+    // For "bind" failures, only write log messages for our shared mDNS port, or for binding to zero
+    if (strcmp(errstr, "bind") || mDNSSameIPPort(port, MulticastDNSPort) || mDNSIPPortIsZero(port))
+        LogMsg("%s skt %d port %d error %d errno %d (%s)", errstr, skt, mDNSVal16(port), err, errno, strerror(errno));
+
+    // If we got a "bind" failure of EADDRINUSE, inform the caller as it might need to try another random port
+    if (!strcmp(errstr, "bind") && errno == EADDRINUSE)
+    {
+        err = EADDRINUSE;
+        if (mDNSSameIPPort(port, MulticastDNSPort))
+            NotifyOfElusiveBug("Setsockopt SO_REUSEPORT failed",
+                               "Congratulations, you've reproduced an elusive bug.\r"
+                               "Please contact the current assignee of <rdar://problem/3814904>.\r"
+                               "Alternatively, you can send email to radar-3387020@group.apple.com. (Note number is different.)\r"
+                               "If possible, please leave your machine undisturbed so that someone can come to investigate the problem.");
+    }
+
+    mDNSPlatformCloseFD(k, skt);
+    return(err);
+}
+
+mDNSexport UDPSocket *mDNSPlatformUDPSocket(mDNS *const m, const mDNSIPPort requestedport)
+{
+    mStatus err;
+    mDNSIPPort port = requestedport;
+    mDNSBool randomizePort = mDNSIPPortIsZero(requestedport);
+    int i = 10000; // Try at most 10000 times to get a unique random port
+    UDPSocket *p = mallocL("UDPSocket", sizeof(UDPSocket));
+    if (!p) { LogMsg("mDNSPlatformUDPSocket: memory exhausted"); return(mDNSNULL); }
+    mDNSPlatformMemZero(p, sizeof(UDPSocket));
+    p->ss.port  = zeroIPPort;
+    p->ss.m     = m;
+    p->ss.sktv4 = -1;
+    p->ss.sktv6 = -1;
+    p->ss.proxy = mDNSfalse;
+
+    do
+    {
+        // The kernel doesn't do cryptographically strong random port allocation, so we do it ourselves here
+        if (randomizePort) port = mDNSOpaque16fromIntVal(0xC000 + mDNSRandom(0x3FFF));
+        err = SetupSocket(&p->ss, port, AF_INET, &p->ss.port);
+        if (!err)
+        {
+            err = SetupSocket(&p->ss, port, AF_INET6, &p->ss.port);
+            if (err) { mDNSPlatformCloseFD(&p->ss.kqsv4, p->ss.sktv4); p->ss.sktv4 = -1; }
+        }
+        i--;
+    } while (err == EADDRINUSE && randomizePort && i);
+
+    if (err)
+    {
+        // In customer builds we don't want to log failures with port 5351, because this is a known issue
+        // of failing to bind to this port when Internet Sharing has already bound to it
+        // We also don't want to log about port 5350, due to a known bug when some other
+        // process is bound to it.
+        if (mDNSSameIPPort(requestedport, NATPMPPort) || mDNSSameIPPort(requestedport, NATPMPAnnouncementPort))
+            LogInfo("mDNSPlatformUDPSocket: SetupSocket %d failed error %d errno %d (%s)", mDNSVal16(requestedport), err, errno, strerror(errno));
+        else LogMsg("mDNSPlatformUDPSocket: SetupSocket %d failed error %d errno %d (%s)", mDNSVal16(requestedport), err, errno, strerror(errno));
+        freeL("UDPSocket", p);
+        return(mDNSNULL);
+    }
+    return(p);
+}
+
+mDNSexport void mDNSPlatformUDPClose(UDPSocket *sock)
+{
+    CloseSocketSet(&sock->ss);
+    freeL("UDPSocket", sock);
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - BPF Raw packet sending/receiving
+#endif
+
+#if APPLE_OSX_mDNSResponder
+
+mDNSexport void mDNSPlatformSendRawPacket(const void *const msg, const mDNSu8 *const end, mDNSInterfaceID InterfaceID)
+{
+    if (!InterfaceID) { LogMsg("mDNSPlatformSendRawPacket: No InterfaceID specified"); return; }
+    NetworkInterfaceInfoOSX *info;
+
+    info = IfindexToInterfaceInfoOSX(&mDNSStorage, InterfaceID);
+    if (info == NULL)
+    {
+        LogMsg("mDNSPlatformSendUDP: Invalid interface index %p", InterfaceID);
+        return;
+    }
+    if (info->BPF_fd < 0)
+        LogMsg("mDNSPlatformSendRawPacket: %s BPF_fd %d not ready", info->ifinfo.ifname, info->BPF_fd);
+    else
+    {
+        //LogMsg("mDNSPlatformSendRawPacket %d bytes on %s", end - (mDNSu8 *)msg, info->ifinfo.ifname);
+        if (write(info->BPF_fd, msg, end - (mDNSu8 *)msg) < 0)
+            LogMsg("mDNSPlatformSendRawPacket: BPF write(%d) failed %d (%s)", info->BPF_fd, errno, strerror(errno));
+    }
+}
+
+mDNSexport void mDNSPlatformSetLocalAddressCacheEntry(mDNS *const m, const mDNSAddr *const tpa, const mDNSEthAddr *const tha, mDNSInterfaceID InterfaceID)
+{
+    if (!InterfaceID) { LogMsg("mDNSPlatformSetLocalAddressCacheEntry: No InterfaceID specified"); return; }
+    NetworkInterfaceInfoOSX *info;
+    info = IfindexToInterfaceInfoOSX(m, InterfaceID);
+    if (info == NULL) { LogMsg("mDNSPlatformSetLocalAddressCacheEntry: Invalid interface index %p", InterfaceID); return; }
+    // Manually inject an entry into our local ARP cache.
+    // (We can't do this by sending an ARP broadcast, because the kernel only pays attention to incoming ARP packets, not outgoing.)
+    if (!mDNS_AddressIsLocalSubnet(m, InterfaceID, tpa, mDNSNULL))
+        LogSPS("Don't need address cache entry for %s %#a %.6a",            info->ifinfo.ifname, tpa, tha);
+    else
+    {
+        int result = mDNSSetLocalAddressCacheEntry(info->scope_id, tpa->type, tpa->ip.v6.b, tha->b);
+        if (result) LogMsg("Set local address cache entry for %s %#a %.6a failed: %d", info->ifinfo.ifname, tpa, tha, result);
+        else LogSPS("Set local address cache entry for %s %#a %.6a",            info->ifinfo.ifname, tpa, tha);
+    }
+}
+
+mDNSlocal void CloseBPF(NetworkInterfaceInfoOSX *const i)
+{
+    LogSPS("%s closing BPF fd %d", i->ifinfo.ifname, i->BPF_fd);
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    // close will happen in the cancel handler
+    dispatch_source_cancel(i->BPF_source);
+#else
+
+    // Note: MUST NOT close() the underlying native BSD sockets.
+    // CFSocketInvalidate() will do that for us, in its own good time, which may not necessarily be immediately, because
+    // it first has to unhook the sockets from its select() call on its other thread, before it can safely close them.
+    CFRunLoopRemoveSource(i->m->p->CFRunLoop, i->BPF_rls, kCFRunLoopDefaultMode);
+    CFRelease(i->BPF_rls);
+    CFSocketInvalidate(i->BPF_cfs);
+    CFRelease(i->BPF_cfs);
+#endif
+    i->BPF_fd = -1;
+    if (i->BPF_mcfd >= 0) { close(i->BPF_mcfd); i->BPF_mcfd = -1; }
+}
+
+mDNSlocal void bpf_callback_common(NetworkInterfaceInfoOSX *info)
+{
+    KQueueLock(info->m);
+
+    // Now we've got the lock, make sure the kqueue thread didn't close the fd out from under us (will not be a problem once the OS X
+    // kernel has a mechanism for dispatching all events to a single thread, but for now we have to guard against this race condition).
+    if (info->BPF_fd < 0) goto exit;
+
+    ssize_t n = read(info->BPF_fd, &info->m->imsg, info->BPF_len);
+    const mDNSu8 *ptr = (const mDNSu8 *)&info->m->imsg;
+    const mDNSu8 *end = (const mDNSu8 *)&info->m->imsg + n;
+    debugf("%3d: bpf_callback got %d bytes on %s", info->BPF_fd, n, info->ifinfo.ifname);
+
+    if (n<0)
+    {
+        /* <rdar://problem/10287386>
+         * sometimes there can be a race condition btw when the bpf socket
+         * gets data and the callback get scheduled and when we call BIOCSETF (which
+         * clears the socket).  this can cause the read to hang for a really long time
+         * and effectively prevent us from responding to requests for long periods of time.
+         * to prevent this make the socket non blocking and just bail if we dont get anything
+         */
+        if (errno == EAGAIN)
+        {
+            LogMsg("bpf_callback got EAGAIN bailing");
+            goto exit;
+        }
+        LogMsg("Closing %s BPF fd %d due to error %d (%s)", info->ifinfo.ifname, info->BPF_fd, errno, strerror(errno));
+        CloseBPF(info);
+        goto exit;
+    }
+
+    while (ptr < end)
+    {
+        const struct bpf_hdr *const bh = (const struct bpf_hdr *)ptr;
+        debugf("%3d: bpf_callback ptr %p bh_hdrlen %d data %p bh_caplen %4d bh_datalen %4d next %p remaining %4d",
+               info->BPF_fd, ptr, bh->bh_hdrlen, ptr + bh->bh_hdrlen, bh->bh_caplen, bh->bh_datalen,
+               ptr + BPF_WORDALIGN(bh->bh_hdrlen + bh->bh_caplen), end - (ptr + BPF_WORDALIGN(bh->bh_hdrlen + bh->bh_caplen)));
+        // Note that BPF guarantees that the NETWORK LAYER header will be word aligned, not the link-layer header.
+        // Given that An Ethernet header is 14 bytes, this means that if the network layer header (e.g. IP header,
+        // ARP message, etc.) is 4-byte aligned, then necessarily the Ethernet header will be NOT be 4-byte aligned.
+        mDNSCoreReceiveRawPacket(info->m, ptr + bh->bh_hdrlen, ptr + bh->bh_hdrlen + bh->bh_caplen, info->ifinfo.InterfaceID);
+        ptr += BPF_WORDALIGN(bh->bh_hdrlen + bh->bh_caplen);
+    }
+exit:
+    KQueueUnlock(info->m, "bpf_callback");
+}
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+mDNSlocal void bpf_callback_dispatch(NetworkInterfaceInfoOSX *const info)
+{
+    bpf_callback_common(info);
+}
+#else
+mDNSlocal void bpf_callback(const CFSocketRef cfs, const CFSocketCallBackType CallBackType, const CFDataRef address, const void *const data, void *const context)
+{
+    (void)cfs;
+    (void)CallBackType;
+    (void)address;
+    (void)data;
+    bpf_callback_common((NetworkInterfaceInfoOSX *)context);
+}
+#endif
+
+mDNSexport void mDNSPlatformSendKeepalive(mDNSAddr *sadd, mDNSAddr *dadd, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu32 seq, mDNSu32 ack, mDNSu16 win)
+{
+    LogMsg("mDNSPlatformSendKeepalive called\n");
+    mDNSSendKeepalive(sadd->ip.v6.b, dadd->ip.v6.b, lport->NotAnInteger, rport->NotAnInteger, seq, ack, win);
+}
+
+mDNSexport mStatus  mDNSPlatformClearSPSMACAddr(void)
+{
+    SCDynamicStoreRef store = NULL;
+    CFStringRef  entityname = NULL;
+
+    if ((store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:ClearSPSMACAddress"), NULL, NULL)))
+    {
+        if ((entityname = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%s%s%s"), "State:/Network/Interface/", "[^/]", "/BonjourSleepProxyAddress")))
+        {
+            if (SCDynamicStoreRemoveValue(store, entityname) == false)
+                LogMsg("mDNSPlatformClearSPSMACAddr: Unable to remove key");
+        }
+    }
+
+    if (entityname) CFRelease(entityname);
+    if (store)      CFRelease(store);
+    return KERN_SUCCESS;
+}
+
+mDNSexport mStatus mDNSPlatformStoreSPSMACAddr(mDNSAddr *spsaddr, char *ifname)
+{
+    int family = (spsaddr->type == mDNSAddrType_IPv4) ? AF_INET : AF_INET6;
+    LogSPS("mDNSPlatformStoreSPSMACAddr : Storing %#a on interface %s", spsaddr, ifname);
+    mDNSStoreSPSMACAddress(family, spsaddr->ip.v6.b, ifname);
+    return KERN_SUCCESS;
+}
+
+mDNSexport mStatus mDNSPlatformGetRemoteMacAddr(mDNS *const m, mDNSAddr *raddr)
+{
+    int family = (raddr->type == mDNSAddrType_IPv4) ? AF_INET : AF_INET6;
+
+    mDNSGetRemoteMAC(m, family, raddr->ip.v6.b);
+    return KERN_SUCCESS;
+}
+
+mDNSexport mStatus mDNSPlatformRetrieveTCPInfo(mDNS *const m, mDNSAddr *laddr, mDNSIPPort *lport, mDNSAddr *raddr, mDNSIPPort *rport, mDNSTCPInfo *mti)
+{
+    mDNSs32 intfid;
+    mDNSs32 error  = 0;
+    int     family = (laddr->type == mDNSAddrType_IPv4) ? AF_INET : AF_INET6;
+
+    error = mDNSRetrieveTCPInfo(family, laddr->ip.v6.b, lport->NotAnInteger, raddr->ip.v6.b, rport->NotAnInteger, (uint32_t *)&(mti->seq), (uint32_t *)&(mti->ack), (uint16_t *)&(mti->window), (int32_t*)&intfid);
+    if (error != KERN_SUCCESS)
+    {
+        LogMsg("%s: mDNSRetrieveTCPInfo returned : %d", __func__, error);
+        return error;
+    }
+    mti->IntfId = mDNSPlatformInterfaceIDfromInterfaceIndex(m, intfid);
+    return error;
+}
+
+#define BPF_SetOffset(from, cond, to) (from)->cond = (to) - 1 - (from)
+
+mDNSlocal int CountProxyTargets(mDNS *const m, NetworkInterfaceInfoOSX *x, int *p4, int *p6)
+{
+    int numv4 = 0, numv6 = 0;
+    AuthRecord *rr;
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.InterfaceID == x->ifinfo.InterfaceID && rr->AddressProxy.type == mDNSAddrType_IPv4)
+        {
+            if (p4) LogSPS("CountProxyTargets: fd %d %-7s IP%2d %.4a", x->BPF_fd, x->ifinfo.ifname, numv4, &rr->AddressProxy.ip.v4);
+            numv4++;
+        }
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.InterfaceID == x->ifinfo.InterfaceID && rr->AddressProxy.type == mDNSAddrType_IPv6)
+        {
+            if (p6) LogSPS("CountProxyTargets: fd %d %-7s IP%2d %.16a", x->BPF_fd, x->ifinfo.ifname, numv6, &rr->AddressProxy.ip.v6);
+            numv6++;
+        }
+
+    if (p4) *p4 = numv4;
+    if (p6) *p6 = numv6;
+    return(numv4 + numv6);
+}
+
+mDNSexport void mDNSPlatformUpdateProxyList(mDNS *const m, const mDNSInterfaceID InterfaceID)
+{
+    NetworkInterfaceInfoOSX *x;
+
+    // Note: We can't use IfIndexToInterfaceInfoOSX because that looks for Registered also.
+    for (x = m->p->InterfaceList; x; x = x->next) if (x->ifinfo.InterfaceID == InterfaceID) break;
+
+    if (!x) { LogMsg("mDNSPlatformUpdateProxyList: ERROR InterfaceID %p not found", InterfaceID); return; }
+
+    #define MAX_BPF_ADDRS 250
+    int numv4 = 0, numv6 = 0;
+
+    if (CountProxyTargets(m, x, &numv4, &numv6) > MAX_BPF_ADDRS)
+    {
+        LogMsg("mDNSPlatformUpdateProxyList: ERROR Too many address proxy records v4 %d v6 %d", numv4, numv6);
+        if (numv4 > MAX_BPF_ADDRS) numv4 = MAX_BPF_ADDRS;
+        numv6 = MAX_BPF_ADDRS - numv4;
+    }
+
+    LogSPS("mDNSPlatformUpdateProxyList: fd %d %-7s MAC  %.6a %d v4 %d v6", x->BPF_fd, x->ifinfo.ifname, &x->ifinfo.MAC, numv4, numv6);
+
+    // Caution: This is a static structure, so we need to be careful that any modifications we make to it
+    // are done in such a way that they work correctly when mDNSPlatformUpdateProxyList is called multiple times
+    static struct bpf_insn filter[17 + MAX_BPF_ADDRS] =
+    {
+        BPF_STMT(BPF_LD  + BPF_H   + BPF_ABS, 12),              // 0 Read Ethertype (bytes 12,13)
+
+        BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x0806, 0, 1),      // 1 If Ethertype == ARP goto next, else 3
+        BPF_STMT(BPF_RET + BPF_K,             42),              // 2 Return 42-byte ARP
+
+        BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x0800, 4, 0),      // 3 If Ethertype == IPv4 goto 8 (IPv4 address list check) else next
+
+        BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x86DD, 0, 9),      // 4 If Ethertype == IPv6 goto next, else exit
+        BPF_STMT(BPF_LD  + BPF_H   + BPF_ABS, 20),              // 5 Read Protocol and Hop Limit (bytes 20,21)
+        BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x3AFF, 0, 9),      // 6 If (Prot,TTL) == (3A,FF) goto next, else IPv6 address list check
+        BPF_STMT(BPF_RET + BPF_K,             86),              // 7 Return 86-byte ND
+
+        // Is IPv4 packet; check if it's addressed to any IPv4 address we're proxying for
+        BPF_STMT(BPF_LD  + BPF_W   + BPF_ABS, 30),              // 8 Read IPv4 Dst (bytes 30,31,32,33)
+    };
+
+    struct bpf_insn *pc   = &filter[9];
+    struct bpf_insn *chk6 = pc   + numv4 + 1;   // numv4 address checks, plus a "return 0"
+    struct bpf_insn *fail = chk6 + 1 + numv6;   // Get v6 Dst LSW, plus numv6 address checks
+    struct bpf_insn *ret4 = fail + 1;
+    struct bpf_insn *ret6 = ret4 + 4;
+
+    static const struct bpf_insn rf  = BPF_STMT(BPF_RET + BPF_K, 0);                // No match: Return nothing
+
+    static const struct bpf_insn g6  = BPF_STMT(BPF_LD  + BPF_W   + BPF_ABS, 50);   // Read IPv6 Dst LSW (bytes 50,51,52,53)
+
+    static const struct bpf_insn r4a = BPF_STMT(BPF_LDX + BPF_B   + BPF_MSH, 14);   // Get IP Header length (normally 20)
+    static const struct bpf_insn r4b = BPF_STMT(BPF_LD  + BPF_IMM,           54);   // A = 54 (14-byte Ethernet plus 20-byte TCP + 20 bytes spare)
+    static const struct bpf_insn r4c = BPF_STMT(BPF_ALU + BPF_ADD + BPF_X,    0);   // A += IP Header length
+    static const struct bpf_insn r4d = BPF_STMT(BPF_RET + BPF_A, 0);                // Success: Return Ethernet + IP + TCP + 20 bytes spare (normally 74)
+
+    static const struct bpf_insn r6a = BPF_STMT(BPF_RET + BPF_K, 94);               // Success: Return Eth + IPv6 + TCP + 20 bytes spare
+
+    BPF_SetOffset(&filter[4], jf, fail);    // If Ethertype not ARP, IPv4, or IPv6, fail
+    BPF_SetOffset(&filter[6], jf, chk6);    // If IPv6 but not ICMPv6, go to IPv6 address list check
+
+    // BPF Byte-Order Note
+    // The BPF API designers apparently thought that programmers would not be smart enough to use htons
+    // and htonl correctly to convert numeric values to network byte order on little-endian machines,
+    // so instead they chose to make the API implicitly byte-swap *ALL* values, even literal byte strings
+    // that shouldn't be byte-swapped, like ASCII text, Ethernet addresses, IP addresses, etc.
+    // As a result, if we put Ethernet addresses and IP addresses in the right byte order, the BPF API
+    // will byte-swap and make them backwards, and then our filter won't work. So, we have to arrange
+    // that on little-endian machines we deliberately put addresses in memory with the bytes backwards,
+    // so that when the BPF API goes through and swaps them all, they end up back as they should be.
+    // In summary, if we byte-swap all the non-numeric fields that shouldn't be swapped, and we *don't*
+    // swap any of the numeric values that *should* be byte-swapped, then the filter will work correctly.
+
+    // IPSEC capture size notes:
+    //  8 bytes UDP header
+    //  4 bytes Non-ESP Marker
+    // 28 bytes IKE Header
+    // --
+    // 40 Total. Capturing TCP Header + 20 gets us enough bytes to receive the IKE Header in a UDP-encapsulated IKE packet.
+
+    AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.InterfaceID == InterfaceID && rr->AddressProxy.type == mDNSAddrType_IPv4)
+        {
+            mDNSv4Addr a = rr->AddressProxy.ip.v4;
+            pc->code = BPF_JMP + BPF_JEQ + BPF_K;
+            BPF_SetOffset(pc, jt, ret4);
+            pc->jf   = 0;
+            pc->k    = (bpf_u_int32)a.b[0] << 24 | (bpf_u_int32)a.b[1] << 16 | (bpf_u_int32)a.b[2] << 8 | (bpf_u_int32)a.b[3];
+            pc++;
+        }
+    *pc++ = rf;
+
+    if (pc != chk6) LogMsg("mDNSPlatformUpdateProxyList: pc %p != chk6 %p", pc, chk6);
+    *pc++ = g6; // chk6 points here
+
+    // First cancel any previous ND group memberships we had, then create a fresh socket
+    if (x->BPF_mcfd >= 0) close(x->BPF_mcfd);
+    x->BPF_mcfd = socket(AF_INET6, SOCK_DGRAM, 0);
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.InterfaceID == InterfaceID && rr->AddressProxy.type == mDNSAddrType_IPv6)
+        {
+            const mDNSv6Addr *const a = &rr->AddressProxy.ip.v6;
+            pc->code = BPF_JMP + BPF_JEQ + BPF_K;
+            BPF_SetOffset(pc, jt, ret6);
+            pc->jf   = 0;
+            pc->k    = (bpf_u_int32)a->b[0x0C] << 24 | (bpf_u_int32)a->b[0x0D] << 16 | (bpf_u_int32)a->b[0x0E] << 8 | (bpf_u_int32)a->b[0x0F];
+            pc++;
+
+            struct ipv6_mreq i6mr;
+            i6mr.ipv6mr_interface = x->scope_id;
+            i6mr.ipv6mr_multiaddr = *(const struct in6_addr*)&NDP_prefix;
+            i6mr.ipv6mr_multiaddr.s6_addr[0xD] = a->b[0xD];
+            i6mr.ipv6mr_multiaddr.s6_addr[0xE] = a->b[0xE];
+            i6mr.ipv6mr_multiaddr.s6_addr[0xF] = a->b[0xF];
+
+            // Do precautionary IPV6_LEAVE_GROUP first, necessary to clear stale kernel state
+            mStatus err = setsockopt(x->BPF_mcfd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &i6mr, sizeof(i6mr));
+            if (err < 0 && (errno != EADDRNOTAVAIL))
+                LogMsg("mDNSPlatformUpdateProxyList: IPV6_LEAVE_GROUP error %d errno %d (%s) group %.16a on %u", err, errno, strerror(errno), &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+
+            err = setsockopt(x->BPF_mcfd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &i6mr, sizeof(i6mr));
+            if (err < 0 && (errno != EADDRINUSE))   // Joining same group twice can give "Address already in use" error -- no need to report that
+                LogMsg("mDNSPlatformUpdateProxyList: IPV6_JOIN_GROUP error %d errno %d (%s) group %.16a on %u", err, errno, strerror(errno), &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+
+            LogSPS("Joined IPv6 ND multicast group %.16a for %.16a", &i6mr.ipv6mr_multiaddr, a);
+        }
+
+    if (pc != fail) LogMsg("mDNSPlatformUpdateProxyList: pc %p != fail %p", pc, fail);
+    *pc++ = rf;     // fail points here
+
+    if (pc != ret4) LogMsg("mDNSPlatformUpdateProxyList: pc %p != ret4 %p", pc, ret4);
+    *pc++ = r4a;    // ret4 points here
+    *pc++ = r4b;
+    *pc++ = r4c;
+    *pc++ = r4d;
+
+    if (pc != ret6) LogMsg("mDNSPlatformUpdateProxyList: pc %p != ret6 %p", pc, ret6);
+    *pc++ = r6a;    // ret6 points here
+
+    struct bpf_program prog = { pc - filter, filter };
+
+#if 0
+    // For debugging BPF filter program
+    unsigned int q;
+    for (q=0; q<prog.bf_len; q++)
+        LogSPS("mDNSPlatformUpdateProxyList: %2d { 0x%02x, %d, %d, 0x%08x },", q, prog.bf_insns[q].code, prog.bf_insns[q].jt, prog.bf_insns[q].jf, prog.bf_insns[q].k);
+#endif
+
+    if (!numv4 && !numv6)
+    {
+        LogSPS("mDNSPlatformUpdateProxyList: No need for filter");
+        if (m->timenow == 0) LogMsg("mDNSPlatformUpdateProxyList: m->timenow == 0");
+        // Schedule check to see if we can close this BPF_fd now
+        if (!m->p->NetworkChanged) m->p->NetworkChanged = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 2);
+        // prog.bf_len = 0; This seems to panic the kernel
+        if (x->BPF_fd < 0) return;      // If we've already closed our BPF_fd, no need to generate an error message below
+    }
+    
+    if (ioctl(x->BPF_fd, BIOCSETFNR, &prog) < 0) LogMsg("mDNSPlatformUpdateProxyList: BIOCSETFNR(%d) failed %d (%s)", prog.bf_len, errno, strerror(errno));
+    else LogSPS("mDNSPlatformUpdateProxyList: BIOCSETFNR(%d) successful", prog.bf_len);
+}
+
+mDNSexport void mDNSPlatformReceiveBPF_fd(mDNS *const m, int fd)
+{
+    mDNS_Lock(m);
+
+    NetworkInterfaceInfoOSX *i;
+    for (i = m->p->InterfaceList; i; i = i->next) if (i->BPF_fd == -2) break;
+    if (!i) { LogSPS("mDNSPlatformReceiveBPF_fd: No Interfaces awaiting BPF fd %d; closing", fd); close(fd); }
+    else
+    {
+        LogSPS("%s using   BPF fd %d", i->ifinfo.ifname, fd);
+
+        struct bpf_version v;
+        if (ioctl(fd, BIOCVERSION, &v) < 0)
+            LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCVERSION failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+        else if (BPF_MAJOR_VERSION != v.bv_major || BPF_MINOR_VERSION != v.bv_minor)
+            LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCVERSION header %d.%d kernel %d.%d",
+                   fd, i->ifinfo.ifname, BPF_MAJOR_VERSION, BPF_MINOR_VERSION, v.bv_major, v.bv_minor);
+
+        if (ioctl(fd, BIOCGBLEN, &i->BPF_len) < 0)
+            LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCGBLEN failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+
+        if (i->BPF_len > sizeof(m->imsg))
+        {
+            i->BPF_len = sizeof(m->imsg);
+            if (ioctl(fd, BIOCSBLEN, &i->BPF_len) < 0)
+                LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCSBLEN failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+            else
+                LogSPS("mDNSPlatformReceiveBPF_fd: %d %s BIOCSBLEN %d", fd, i->ifinfo.ifname, i->BPF_len);
+        }
+
+        static const u_int opt_one = 1;
+        if (ioctl(fd, BIOCIMMEDIATE, &opt_one) < 0)
+            LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCIMMEDIATE failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+
+        //if (ioctl(fd, BIOCPROMISC, &opt_one) < 0)
+        //	LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCPROMISC failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+
+        //if (ioctl(fd, BIOCSHDRCMPLT, &opt_one) < 0)
+        //	LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCSHDRCMPLT failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+
+        /*  <rdar://problem/10287386>
+         *  make socket non blocking see comments in bpf_callback_common for more info
+         */
+        if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK) < 0) // set non-blocking
+        {
+            LogMsg("mDNSPlatformReceiveBPF_fd: %d %s O_NONBLOCK failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno));
+        }
+
+        struct ifreq ifr;
+        mDNSPlatformMemZero(&ifr, sizeof(ifr));
+        strlcpy(ifr.ifr_name, i->ifinfo.ifname, sizeof(ifr.ifr_name));
+        if (ioctl(fd, BIOCSETIF, &ifr) < 0)
+        { LogMsg("mDNSPlatformReceiveBPF_fd: %d %s BIOCSETIF failed %d (%s)", fd, i->ifinfo.ifname, errno, strerror(errno)); i->BPF_fd = -3; }
+        else
+        {
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+            i->BPF_fd  = fd;
+            i->BPF_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0, dispatch_get_main_queue());
+            if (!i->BPF_source) {LogMsg("mDNSPlatformReceiveBPF_fd: dispatch source create failed"); return;}
+            dispatch_source_set_event_handler(i->BPF_source, ^{bpf_callback_dispatch(i);});
+            dispatch_source_set_cancel_handler(i->BPF_source, ^{close(fd);});
+            dispatch_resume(i->BPF_source);
+#else
+            CFSocketContext myCFSocketContext = { 0, i, NULL, NULL, NULL };
+            i->BPF_fd  = fd;
+            i->BPF_cfs = CFSocketCreateWithNative(kCFAllocatorDefault, fd, kCFSocketReadCallBack, bpf_callback, &myCFSocketContext);
+            i->BPF_rls = CFSocketCreateRunLoopSource(kCFAllocatorDefault, i->BPF_cfs, 0);
+            CFRunLoopAddSource(i->m->p->CFRunLoop, i->BPF_rls, kCFRunLoopDefaultMode);
+#endif
+            mDNSPlatformUpdateProxyList(m, i->ifinfo.InterfaceID);
+        }
+    }
+
+    mDNS_Unlock(m);
+}
+
+#endif // APPLE_OSX_mDNSResponder
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Key Management
+#endif
+
+#ifndef NO_SECURITYFRAMEWORK
+mDNSlocal CFArrayRef GetCertChain(SecIdentityRef identity)
+{
+    CFMutableArrayRef certChain = NULL;
+    if (!identity) { LogMsg("getCertChain: identity is NULL"); return(NULL); }
+    SecCertificateRef cert;
+    OSStatus err = SecIdentityCopyCertificate(identity, &cert);
+    if (err || !cert) LogMsg("getCertChain: SecIdentityCopyCertificate() returned %d", (int) err);
+    else
+    {
+        SecPolicySearchRef searchRef;
+        err = SecPolicySearchCreate(CSSM_CERT_X_509v3, &CSSMOID_APPLE_X509_BASIC, NULL, &searchRef);
+        if (err || !searchRef) LogMsg("getCertChain: SecPolicySearchCreate() returned %d", (int) err);
+        else
+        {
+            SecPolicyRef policy;
+            err = SecPolicySearchCopyNext(searchRef, &policy);
+            if (err || !policy) LogMsg("getCertChain: SecPolicySearchCopyNext() returned %d", (int) err);
+            else
+            {
+                CFArrayRef wrappedCert = CFArrayCreate(NULL, (const void**) &cert, 1, &kCFTypeArrayCallBacks);
+                if (!wrappedCert) LogMsg("getCertChain: wrappedCert is NULL");
+                else
+                {
+                    SecTrustRef trust;
+                    err = SecTrustCreateWithCertificates(wrappedCert, policy, &trust);
+                    if (err || !trust) LogMsg("getCertChain: SecTrustCreateWithCertificates() returned %d", (int) err);
+                    else
+                    {
+                        err = SecTrustEvaluate(trust, NULL);
+                        if (err) LogMsg("getCertChain: SecTrustEvaluate() returned %d", (int) err);
+                        else
+                        {
+                            CFArrayRef rawCertChain;
+                            CSSM_TP_APPLE_EVIDENCE_INFO *statusChain = NULL;
+                            err = SecTrustGetResult(trust, NULL, &rawCertChain, &statusChain);
+                            if (err || !rawCertChain || !statusChain) LogMsg("getCertChain: SecTrustGetResult() returned %d", (int) err);
+                            else
+                            {
+                                certChain = CFArrayCreateMutableCopy(NULL, 0, rawCertChain);
+                                if (!certChain) LogMsg("getCertChain: certChain is NULL");
+                                else
+                                {
+                                    // Replace the SecCertificateRef at certChain[0] with a SecIdentityRef per documentation for SSLSetCertificate:
+                                    // <http://devworld.apple.com/documentation/Security/Reference/secureTransportRef/index.html>
+                                    CFArraySetValueAtIndex(certChain, 0, identity);
+                                    // Remove root from cert chain, but keep any and all intermediate certificates that have been signed by the root certificate
+                                    if (CFArrayGetCount(certChain) > 1) CFArrayRemoveValueAtIndex(certChain, CFArrayGetCount(certChain) - 1);
+                                }
+                                CFRelease(rawCertChain);
+                                // Do not free statusChain:
+                                // <http://developer.apple.com/documentation/Security/Reference/certifkeytrustservices/Reference/reference.html> says:
+                                // certChain: Call the CFRelease function to release this object when you are finished with it.
+                                // statusChain: Do not attempt to free this pointer; it remains valid until the trust management object is released...
+                            }
+                        }
+                        CFRelease(trust);
+                    }
+                    CFRelease(wrappedCert);
+                }
+                CFRelease(policy);
+            }
+            CFRelease(searchRef);
+        }
+        CFRelease(cert);
+    }
+    return certChain;
+}
+#endif /* NO_SECURITYFRAMEWORK */
+
+mDNSexport mStatus mDNSPlatformTLSSetupCerts(void)
+{
+#ifdef NO_SECURITYFRAMEWORK
+    return mStatus_UnsupportedErr;
+#else
+    SecIdentityRef identity = nil;
+    SecIdentitySearchRef srchRef = nil;
+    OSStatus err;
+
+    // search for "any" identity matching specified key use
+    // In this app, we expect there to be exactly one
+    err = SecIdentitySearchCreate(NULL, CSSM_KEYUSE_DECRYPT, &srchRef);
+    if (err) { LogMsg("ERROR: mDNSPlatformTLSSetupCerts: SecIdentitySearchCreate returned %d", (int) err); return err; }
+
+    err = SecIdentitySearchCopyNext(srchRef, &identity);
+    if (err) { LogMsg("ERROR: mDNSPlatformTLSSetupCerts: SecIdentitySearchCopyNext returned %d", (int) err); return err; }
+
+    if (CFGetTypeID(identity) != SecIdentityGetTypeID())
+    { LogMsg("ERROR: mDNSPlatformTLSSetupCerts: SecIdentitySearchCopyNext CFTypeID failure"); return mStatus_UnknownErr; }
+
+    // Found one. Call getCertChain to create the correct certificate chain.
+    ServerCerts = GetCertChain(identity);
+    if (ServerCerts == nil) { LogMsg("ERROR: mDNSPlatformTLSSetupCerts: getCertChain error"); return mStatus_UnknownErr; }
+
+    return mStatus_NoError;
+#endif /* NO_SECURITYFRAMEWORK */
+}
+
+mDNSexport void  mDNSPlatformTLSTearDownCerts(void)
+{
+#ifndef NO_SECURITYFRAMEWORK
+    if (ServerCerts) { CFRelease(ServerCerts); ServerCerts = NULL; }
+#endif /* NO_SECURITYFRAMEWORK */
+}
+
+// This gets the text of the field currently labelled "Computer Name" in the Sharing Prefs Control Panel
+mDNSlocal void GetUserSpecifiedFriendlyComputerName(domainlabel *const namelabel)
+{
+    CFStringEncoding encoding = kCFStringEncodingUTF8;
+    CFStringRef cfs = SCDynamicStoreCopyComputerName(NULL, &encoding);
+    if (cfs)
+    {
+        CFStringGetPascalString(cfs, namelabel->c, sizeof(*namelabel), kCFStringEncodingUTF8);
+        CFRelease(cfs);
+    }
+}
+
+// This gets the text of the field currently labelled "Local Hostname" in the Sharing Prefs Control Panel
+mDNSlocal void GetUserSpecifiedLocalHostName(domainlabel *const namelabel)
+{
+    CFStringRef cfs = SCDynamicStoreCopyLocalHostName(NULL);
+    if (cfs)
+    {
+        CFStringGetPascalString(cfs, namelabel->c, sizeof(*namelabel), kCFStringEncodingUTF8);
+        CFRelease(cfs);
+    }
+}
+
+mDNSexport mDNSBool DictionaryIsEnabled(CFDictionaryRef dict)
+{
+    mDNSs32 val;
+    CFNumberRef state = (CFNumberRef)CFDictionaryGetValue(dict, CFSTR("Enabled"));
+    if (!state) return mDNSfalse;
+    if (!CFNumberGetValue(state, kCFNumberSInt32Type, &val))
+    { LogMsg("ERROR: DictionaryIsEnabled - CFNumberGetValue"); return mDNSfalse; }
+    return val ? mDNStrue : mDNSfalse;
+}
+
+mDNSlocal mStatus SetupAddr(mDNSAddr *ip, const struct sockaddr *const sa)
+{
+    if (!sa) { LogMsg("SetupAddr ERROR: NULL sockaddr"); return(mStatus_Invalid); }
+
+    if (sa->sa_family == AF_INET)
+    {
+        struct sockaddr_in *ifa_addr = (struct sockaddr_in *)sa;
+        ip->type = mDNSAddrType_IPv4;
+        ip->ip.v4.NotAnInteger = ifa_addr->sin_addr.s_addr;
+        return(mStatus_NoError);
+    }
+
+    if (sa->sa_family == AF_INET6)
+    {
+        struct sockaddr_in6 *ifa_addr = (struct sockaddr_in6 *)sa;
+        // Inside the BSD kernel they use a hack where they stuff the sin6->sin6_scope_id
+        // value into the second word of the IPv6 link-local address, so they can just
+        // pass around IPv6 address structures instead of full sockaddr_in6 structures.
+        // Those hacked IPv6 addresses aren't supposed to escape the kernel in that form, but they do.
+        // To work around this we always whack the second word of any IPv6 link-local address back to zero.
+        if (IN6_IS_ADDR_LINKLOCAL(&ifa_addr->sin6_addr)) ifa_addr->sin6_addr.__u6_addr.__u6_addr16[1] = 0;
+        ip->type = mDNSAddrType_IPv6;
+        ip->ip.v6 = *(mDNSv6Addr*)&ifa_addr->sin6_addr;
+        return(mStatus_NoError);
+    }
+
+    LogMsg("SetupAddr invalid sa_family %d", sa->sa_family);
+    return(mStatus_Invalid);
+}
+
+mDNSlocal mDNSEthAddr GetBSSID(char *ifa_name)
+{
+    mDNSEthAddr eth = zeroEthAddr;
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:GetBSSID"), NULL, NULL);
+    if (!store)
+        LogMsg("GetBSSID: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+    else
+    {
+        CFStringRef entityname = CFStringCreateWithFormat(NULL, NULL, CFSTR("State:/Network/Interface/%s/AirPort"), ifa_name);
+        if (entityname)
+        {
+            CFDictionaryRef dict = SCDynamicStoreCopyValue(store, entityname);
+            if (dict)
+            {
+                CFRange range = { 0, 6 };       // Offset, length
+                CFDataRef data = CFDictionaryGetValue(dict, CFSTR("BSSID"));
+                if (data && CFDataGetLength(data) == 6) CFDataGetBytes(data, range, eth.b);
+                CFRelease(dict);
+            }
+            CFRelease(entityname);
+        }
+        CFRelease(store);
+    }
+    return(eth);
+}
+
+mDNSlocal int GetMAC(mDNSEthAddr *eth, u_short ifindex)
+{
+    struct ifaddrs *ifa;
+    for (ifa = myGetIfAddrs(0); ifa; ifa = ifa->ifa_next)
+        if (ifa->ifa_addr->sa_family == AF_LINK)
+        {
+            const struct sockaddr_dl *const sdl = (const struct sockaddr_dl *)ifa->ifa_addr;
+            if (sdl->sdl_index == ifindex)
+            { mDNSPlatformMemCopy(eth->b, sdl->sdl_data + sdl->sdl_nlen, 6); return 0; }
+        }
+    *eth = zeroEthAddr;
+    return -1;
+}
+
+#ifndef SIOCGIFWAKEFLAGS
+#define SIOCGIFWAKEFLAGS _IOWR('i', 136, struct ifreq) /* get interface wake property flags */
+#endif
+
+#ifndef IF_WAKE_ON_MAGIC_PACKET
+#define IF_WAKE_ON_MAGIC_PACKET 0x01
+#endif
+
+#ifndef ifr_wake_flags
+#define ifr_wake_flags ifr_ifru.ifru_intval
+#endif
+
+mDNSlocal mDNSBool  CheckInterfaceSupport(NetworkInterfaceInfo *const intf, const char *key)
+{
+    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOBSDNameMatching(kIOMasterPortDefault, 0, intf->ifname));
+    if (!service)
+    {
+        LogSPS("CheckInterfaceSupport: No service for interface %s", intf->ifname);
+        return mDNSfalse;
+    }
+
+    io_name_t n1, n2;
+    IOObjectGetClass(service, n1);
+    io_object_t parent;
+    mDNSBool    ret = mDNSfalse;
+    kern_return_t kr = IORegistryEntryGetParentEntry(service, kIOServicePlane, &parent);
+    if (kr == KERN_SUCCESS)
+    {
+        CFStringRef keystr =  CFStringCreateWithCString(NULL, key, kCFStringEncodingUTF8);
+        IOObjectGetClass(parent, n2);
+        LogSPS("CheckInterfaceSupport: Interface %s service %s parent %s", intf->ifname, n1, n2);
+        const CFTypeRef ref = IORegistryEntryCreateCFProperty(parent, keystr, kCFAllocatorDefault, mDNSNULL);
+        if (!ref)
+        {
+            LogSPS("CheckInterfaceSupport: No mDNS_IOREG_KEY for interface %s/%s/%s", intf->ifname, n1, n2);
+            ret = mDNSfalse;
+        }
+        else
+        {
+            ret = mDNStrue;
+            CFRelease(ref);
+        }
+        IOObjectRelease(parent);
+        CFRelease(keystr);
+    }
+    else
+    {
+        LogSPS("CheckInterfaceSupport: IORegistryEntryGetParentEntry for %s/%s failed %d", intf->ifname, n1, kr);
+        ret = mDNSfalse;
+    }
+    IOObjectRelease(service);
+    return ret;
+}
+
+
+mDNSlocal  mDNSBool InterfaceSupportsKeepAlive(NetworkInterfaceInfo *const intf)
+{
+    return CheckInterfaceSupport(intf, mDNS_IOREG_KA_KEY);
+}
+
+mDNSlocal mDNSBool NetWakeInterface(NetworkInterfaceInfoOSX *i)
+{
+    if (!MulticastInterface(i)     ) return(mDNSfalse); // We only use Sleep Proxy Service on multicast-capable interfaces
+    if (i->ifa_flags & IFF_LOOPBACK) return(mDNSfalse); // except loopback
+
+    // If the interface supports TCPKeepalive, it is capable of waking up for a magic packet
+    // This check is needed since the SIOCGIFWAKEFLAGS ioctl returns wrong values for WOMP capability
+    // when the power source is not AC Power.
+    if (InterfaceSupportsKeepAlive(&i->ifinfo))
+    {
+        LogSPS("NetWakeInterface: %s supports TCP Keepalive returning true", i->ifinfo.ifname);
+        return mDNStrue;
+    }
+
+    int s = socket(AF_INET, SOCK_DGRAM, 0);
+    if (s < 0) { LogMsg("NetWakeInterface socket failed %s error %d errno %d (%s)", i->ifinfo.ifname, s, errno, strerror(errno)); return(mDNSfalse); }
+
+    struct ifreq ifr;
+    strlcpy(ifr.ifr_name, i->ifinfo.ifname, sizeof(ifr.ifr_name));
+    if (ioctl(s, SIOCGIFWAKEFLAGS, &ifr) < 0)
+    {
+        // For some strange reason, in /usr/include/sys/errno.h, EOPNOTSUPP is defined to be
+        // 102 when compiling kernel code, and 45 when compiling user-level code. Since this
+        // error code is being returned from the kernel, we need to use the kernel version.
+        #define KERNEL_EOPNOTSUPP 102
+        if (errno != KERNEL_EOPNOTSUPP) // "Operation not supported on socket", the expected result on Leopard and earlier
+            LogMsg("NetWakeInterface SIOCGIFWAKEFLAGS %s errno %d (%s)", i->ifinfo.ifname, errno, strerror(errno));
+        // If on Leopard or earlier, we get EOPNOTSUPP, so in that case
+        // we enable WOL if this interface is not AirPort and "Wake for Network access" is turned on.
+        ifr.ifr_wake_flags = (errno == KERNEL_EOPNOTSUPP && !(i)->BSSID.l[0] && i->m->SystemWakeOnLANEnabled) ? IF_WAKE_ON_MAGIC_PACKET : 0;
+    }
+
+    close(s);
+
+    // ifr.ifr_wake_flags = IF_WAKE_ON_MAGIC_PACKET;	// For testing with MacBook Air, using a USB dongle that doesn't actually support Wake-On-LAN
+
+    LogSPS("%-6s %#-14a %s WOMP", i->ifinfo.ifname, &i->ifinfo.ip, (ifr.ifr_wake_flags & IF_WAKE_ON_MAGIC_PACKET) ? "supports" : "no");
+
+    return((ifr.ifr_wake_flags & IF_WAKE_ON_MAGIC_PACKET) != 0);
+}
+
+mDNSlocal u_int64_t getExtendedFlags(char * ifa_name)
+{
+    int sockFD;
+    struct ifreq ifr;
+
+    sockFD = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockFD < 0)
+    {
+        LogMsg("getExtendedFlags: socket() call failed, errno = %d (%s)", errno, strerror(errno));
+        return 0;
+    }
+
+    ifr.ifr_addr.sa_family = AF_INET;
+    strlcpy(ifr.ifr_name, ifa_name, sizeof(ifr.ifr_name));
+
+    if (ioctl(sockFD, SIOCGIFEFLAGS, (caddr_t)&ifr) == -1)
+    {
+        LogMsg("getExtendedFlags: SIOCGIFEFLAGS failed, errno = %d (%s)", errno, strerror(errno));
+        ifr.ifr_eflags = 0;
+    }
+    LogInfo("getExtendedFlags: %s ifr_eflags = 0x%x", ifa_name, ifr.ifr_eflags);
+
+    close(sockFD);
+    return ifr.ifr_eflags;
+}
+
+// Returns pointer to newly created NetworkInterfaceInfoOSX object, or
+// pointer to already-existing NetworkInterfaceInfoOSX object found in list, or
+// may return NULL if out of memory (unlikely) or parameters are invalid for some reason
+// (e.g. sa_family not AF_INET or AF_INET6)
+mDNSlocal NetworkInterfaceInfoOSX *AddInterfaceToList(mDNS *const m, struct ifaddrs *ifa, mDNSs32 utc)
+{
+    mDNSu32 scope_id  = if_nametoindex(ifa->ifa_name);
+    mDNSEthAddr bssid = GetBSSID(ifa->ifa_name);
+    u_int64_t   eflags = getExtendedFlags(ifa->ifa_name);
+
+    mDNSAddr ip, mask;
+    if (SetupAddr(&ip,   ifa->ifa_addr   ) != mStatus_NoError) return(NULL);
+    if (SetupAddr(&mask, ifa->ifa_netmask) != mStatus_NoError) return(NULL);
+
+    NetworkInterfaceInfoOSX **p;
+    for (p = &m->p->InterfaceList; *p; p = &(*p)->next)
+        if (scope_id == (*p)->scope_id &&
+            mDNSSameAddress(&ip, &(*p)->ifinfo.ip) &&
+            mDNSSameEthAddress(&bssid, &(*p)->BSSID))
+        {
+            debugf("AddInterfaceToList: Found existing interface %lu %.6a with address %#a at %p, ifname before %s, after %s", scope_id, &bssid, &ip, *p, (*p)->ifinfo.ifname, ifa->ifa_name);
+            // The name should be updated to the new name so that we don't report a wrong name in our SIGINFO output.
+            // When interfaces are created with same MAC address, kernel resurrects the old interface.
+            // Even though the interface index is the same (which should be sufficient), when we receive a UDP packet
+            // we get the corresponding name for the interface index on which the packet was received and check against
+            // the InterfaceList for a matching name. So, keep the name in sync
+            strlcpy((*p)->ifinfo.ifname, ifa->ifa_name, sizeof((*p)->ifinfo.ifname));
+            (*p)->Exists = mDNStrue;
+            // If interface was not in getifaddrs list last time we looked, but it is now, update 'AppearanceTime' for this record
+            if ((*p)->LastSeen != utc) (*p)->AppearanceTime = utc;
+
+            // If Wake-on-LAN capability of this interface has changed (e.g. because power cable on laptop has been disconnected)
+            // we may need to start or stop or sleep proxy browse operation
+            const mDNSBool NetWake = NetWakeInterface(*p);
+            if ((*p)->ifinfo.NetWake != NetWake)
+            {
+                (*p)->ifinfo.NetWake = NetWake;
+                // If this interface is already registered with mDNSCore, then we need to start or stop its NetWake browse on-the-fly.
+                // If this interface is not already registered (i.e. it's a dormant interface we had in our list
+                // from when we previously saw it) then we mustn't do that, because mDNSCore doesn't know about it yet.
+                // In this case, the mDNS_RegisterInterface() call will take care of starting the NetWake browse if necessary.
+                if ((*p)->Registered)
+                {
+                    mDNS_Lock(m);
+                    if (NetWake) mDNS_ActivateNetWake_internal  (m, &(*p)->ifinfo);
+                    else mDNS_DeactivateNetWake_internal(m, &(*p)->ifinfo);
+                    mDNS_Unlock(m);
+                }
+            }
+            // Reset the flag if it has changed this time.
+            (*p)->ifinfo.IgnoreIPv4LL = ((eflags & IFEF_ARPLL) != 0) ? mDNSfalse : mDNStrue;
+
+            return(*p);
+        }
+
+    NetworkInterfaceInfoOSX *i = (NetworkInterfaceInfoOSX *)mallocL("NetworkInterfaceInfoOSX", sizeof(*i));
+    debugf("AddInterfaceToList: Making   new   interface %lu %.6a with address %#a at %p", scope_id, &bssid, &ip, i);
+    if (!i) return(mDNSNULL);
+    mDNSPlatformMemZero(i, sizeof(NetworkInterfaceInfoOSX));
+    i->ifinfo.InterfaceID = (mDNSInterfaceID)(uintptr_t)scope_id;
+    i->ifinfo.ip          = ip;
+    i->ifinfo.mask        = mask;
+    strlcpy(i->ifinfo.ifname, ifa->ifa_name, sizeof(i->ifinfo.ifname));
+    i->ifinfo.ifname[sizeof(i->ifinfo.ifname)-1] = 0;
+    // We can be configured to disable multicast advertisement, but we want to to support
+    // local-only services, which need a loopback address record.
+    i->ifinfo.Advertise   = m->DivertMulticastAdvertisements ? ((ifa->ifa_flags & IFF_LOOPBACK) ? mDNStrue : mDNSfalse) : m->AdvertiseLocalAddresses;
+    i->ifinfo.McastTxRx   = mDNSfalse; // For now; will be set up later at the end of UpdateInterfaceList
+    i->ifinfo.Loopback    = ((ifa->ifa_flags & IFF_LOOPBACK) != 0) ? mDNStrue : mDNSfalse;
+    i->ifinfo.IgnoreIPv4LL = ((eflags & IFEF_ARPLL) != 0) ? mDNSfalse : mDNStrue;
+    i->ifinfo.DirectLink  = (eflags & IFEF_DIRECTLINK) ? mDNStrue: mDNSfalse;
+
+    i->next            = mDNSNULL;
+    i->m               = m;
+    i->Exists          = mDNStrue;
+    i->Flashing        = mDNSfalse;
+    i->Occulting       = mDNSfalse;
+    i->D2DInterface    = (eflags & IFEF_LOCALNET_PRIVATE) ? mDNStrue: mDNSfalse;
+    if (eflags & IFEF_AWDL)
+    {
+        AWDLInterfaceID = i->ifinfo.InterfaceID;
+        LogInfo("AddInterfaceToList: AWDLInterfaceID = %d", (int) AWDLInterfaceID);
+    }
+    i->AppearanceTime  = utc;       // Brand new interface; AppearanceTime is now
+    i->LastSeen        = utc;
+    i->ifa_flags       = ifa->ifa_flags;
+    i->scope_id        = scope_id;
+    i->BSSID           = bssid;
+    i->sa_family       = ifa->ifa_addr->sa_family;
+    i->BPF_fd          = -1;
+    i->BPF_mcfd        = -1;
+    i->BPF_len         = 0;
+    i->Registered      = mDNSNULL;
+
+    // Do this AFTER i->BSSID has been set up
+    i->ifinfo.NetWake  = NetWakeInterface(i);
+    GetMAC(&i->ifinfo.MAC, scope_id);
+    if (i->ifinfo.NetWake && !i->ifinfo.MAC.l[0])
+        LogMsg("AddInterfaceToList: Bad MAC address %.6a for %d %s %#a", &i->ifinfo.MAC, scope_id, i->ifinfo.ifname, &ip);
+
+    *p = i;
+    return(i);
+}
+
+#if APPLE_OSX_mDNSResponder
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - AutoTunnel
+#endif
+
+#define kRacoonPort 4500
+
+static DomainAuthInfo* AnonymousRacoonConfig = mDNSNULL;
+
+#ifndef NO_SECURITYFRAMEWORK
+
+static CFMutableDictionaryRef domainStatusDict = NULL;
+
+mDNSlocal mStatus CheckQuestionForStatus(const DNSQuestion *const q)
+{
+    if (q->LongLived)
+    {
+        if (q->servAddr.type == mDNSAddrType_IPv4 && mDNSIPv4AddressIsOnes(q->servAddr.ip.v4))
+            return mStatus_NoSuchRecord;
+        else if (q->state == LLQ_Poll)
+            return mStatus_PollingMode;
+        else if (q->state != LLQ_Established && !q->DuplicateOf)
+            return mStatus_TransientErr;
+    }
+
+    return mStatus_NoError;
+}
+
+mDNSlocal mStatus UpdateLLQStatus(const mDNS *const m, char *buffer, int bufsz, const DomainAuthInfo *const info)
+{
+    mStatus status = mStatus_NoError;
+    DNSQuestion* q, *worst_q = mDNSNULL;
+    for (q = m->Questions; q; q=q->next)
+        if (q->AuthInfo == info)
+        {
+            mStatus newStatus = CheckQuestionForStatus(q);
+            if      (newStatus == mStatus_NoSuchRecord) { status = newStatus; worst_q = q; break; }
+            else if (newStatus == mStatus_PollingMode)  { status = newStatus; worst_q = q; }
+            else if (newStatus == mStatus_TransientErr && status == mStatus_NoError) { status = newStatus; worst_q = q; }
+        }
+
+    if      (status == mStatus_NoError) mDNS_snprintf(buffer, bufsz, "Success");
+    else if (status == mStatus_NoSuchRecord) mDNS_snprintf(buffer, bufsz, "GetZoneData %s: %##s", worst_q->nta ? "not yet complete" : "failed", worst_q->qname.c);
+    else if (status == mStatus_PollingMode) mDNS_snprintf(buffer, bufsz, "Query polling %##s", worst_q->qname.c);
+    else if (status == mStatus_TransientErr) mDNS_snprintf(buffer, bufsz, "Query not yet established %##s", worst_q->qname.c);
+    return status;
+}
+
+mDNSlocal mStatus UpdateRRStatus(const mDNS *const m, char *buffer, int bufsz, const DomainAuthInfo *const info)
+{
+    AuthRecord *r;
+
+    if (info->deltime) return mStatus_NoError;
+    for (r = m->ResourceRecords; r; r = r->next)
+    {
+        // This function is called from UpdateAutoTunnelDomainStatus which in turn may be called from
+        // a callback e.g., CheckNATMappings. GetAuthInfoFor_internal does not like that (reentrancy being 1),
+        // hence we inline the code here. We just need the lock to walk the list of AuthInfos which the caller
+        // has already checked
+        const domainname *n = r->resrec.name;
+        while (n->c[0])
+        {
+            DomainAuthInfo *ptr;
+            for (ptr = m->AuthInfoList; ptr; ptr = ptr->next)
+                if (SameDomainName(&ptr->domain, n))
+                {
+                    if (ptr == info && (r->updateError == mStatus_BadSig || r->updateError == mStatus_BadKey || r->updateError == mStatus_BadTime))
+                    {
+                        mDNS_snprintf(buffer, bufsz, "Resource record update failed for %##s", r->resrec.name);
+                        return r->updateError;
+                    }
+                }
+            n = (const domainname *)(n->c + 1 + n->c[0]);
+        }
+    }
+    return mStatus_NoError;
+}
+
+#endif // ndef NO_SECURITYFRAMEWORK
+
+// MUST be called with lock held
+mDNSlocal void UpdateAutoTunnelDomainStatus(const mDNS *const m, const DomainAuthInfo *const info)
+{
+#ifdef NO_SECURITYFRAMEWORK
+        (void) m;
+    (void)info;
+#else
+    // Note that in the LLQNAT, the clientCallback being non-zero means it's in use,
+    // whereas in the AutoTunnelNAT, the clientContext being non-zero means it's in use
+    const NATTraversalInfo *const llq = m->LLQNAT.clientCallback ? &m->LLQNAT : mDNSNULL;
+    const NATTraversalInfo *const tun = m->AutoTunnelNAT.clientContext ? &m->AutoTunnelNAT : mDNSNULL;
+    char buffer[1024];
+    mDNSu32 buflen = 0;
+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    CFStringRef domain = NULL;
+    CFStringRef tmp = NULL;
+    CFNumberRef num = NULL;
+    mStatus status = mStatus_NoError;
+    mStatus llqStatus = mStatus_NoError;
+    char llqBuffer[1024];
+
+    mDNS_CheckLock(m);
+
+    if (!domainStatusDict)
+    {
+        domainStatusDict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+        if (!domainStatusDict) { LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFDictionary domainStatusDict"); return; }
+    }
+
+    if (!dict) { LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFDictionary dict"); return; }
+
+    buflen = mDNS_snprintf(buffer, sizeof(buffer), "%##s", info->domain.c);
+    domain = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+    if (!domain) { LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFString domain"); return; }
+
+    if (info->deltime)
+    {
+        if (CFDictionaryContainsKey(domainStatusDict, domain))
+        {
+            CFDictionaryRemoveValue(domainStatusDict, domain);
+            if (!m->ShutdownTime) mDNSDynamicStoreSetConfig(kmDNSBackToMyMacConfig, mDNSNULL, domainStatusDict);
+        }
+        CFRelease(domain);
+        CFRelease(dict);
+
+        return;
+    }
+
+    mDNS_snprintf(buffer, sizeof(buffer), "%#a", &m->Router);
+    tmp = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+    if (!tmp)
+        LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFString RouterAddress");
+    else
+    {
+        CFDictionarySetValue(dict, CFSTR("RouterAddress"), tmp);
+        CFRelease(tmp);
+    }
+
+    if (llq)
+    {
+        mDNSu32 port = mDNSVal16(llq->ExternalPort);
+
+        num = CFNumberCreate(NULL, kCFNumberSInt32Type, &port);
+        if (!num)
+            LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber LLQExternalPort");
+        else
+        {
+            CFDictionarySetValue(dict, CFSTR("LLQExternalPort"), num);
+            CFRelease(num);
+        }
+
+        if (llq->Result)
+        {
+            num = CFNumberCreate(NULL, kCFNumberSInt32Type, &llq->Result);
+            if (!num)
+                LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber LLQNPMStatus");
+            else
+            {
+                CFDictionarySetValue(dict, CFSTR("LLQNPMStatus"), num);
+                CFRelease(num);
+            }
+        }
+    }
+
+    if (tun)
+    {
+        mDNSu32 port = mDNSVal16(tun->ExternalPort);
+
+        num = CFNumberCreate(NULL, kCFNumberSInt32Type, &port);
+        if (!num)
+            LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber AutoTunnelExternalPort");
+        else
+        {
+            CFDictionarySetValue(dict, CFSTR("AutoTunnelExternalPort"), num);
+            CFRelease(num);
+        }
+
+        mDNS_snprintf(buffer, sizeof(buffer), "%.4a", &tun->ExternalAddress);
+        tmp = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+        if (!tmp)
+            LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFString ExternalAddress");
+        else
+        {
+            CFDictionarySetValue(dict, CFSTR("ExternalAddress"), tmp);
+            CFRelease(tmp);
+        }
+
+        if (tun->Result)
+        {
+            num = CFNumberCreate(NULL, kCFNumberSInt32Type, &tun->Result);
+            if (!num)
+                LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber AutoTunnelNPMStatus");
+            else
+            {
+                CFDictionarySetValue(dict, CFSTR("AutoTunnelNPMStatus"), num);
+                CFRelease(num);
+            }
+        }
+    }
+    if (tun || llq)
+    {
+        mDNSu32 code = m->LastNATMapResultCode;
+
+        num = CFNumberCreate(NULL, kCFNumberSInt32Type, &code);
+        if (!num)
+            LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber LastNATMapResultCode");
+        else
+        {
+            CFDictionarySetValue(dict, CFSTR("LastNATMapResultCode"), num);
+            CFRelease(num);
+        }
+    }
+
+    mDNS_snprintf(buffer, sizeof(buffer), "Success");
+    llqStatus = UpdateLLQStatus(m, llqBuffer, sizeof(llqBuffer), info);
+    status = UpdateRRStatus(m, buffer, sizeof(buffer), info);
+
+    // If we have a bad signature error updating a RR, it overrides any error as it needs to be
+    // reported so that it can be fixed automatically (or the user needs to be notified)
+    if (status != mStatus_NoError)
+    {
+        LogInfo("UpdateAutoTunnelDomainStatus: RR Status %d, %s", status, buffer);
+    }
+    else if (m->Router.type == mDNSAddrType_None)
+    {
+        status = mStatus_NoRouter;
+        mDNS_snprintf(buffer, sizeof(buffer), "No network connection - none");
+    }
+    else if (m->Router.type == mDNSAddrType_IPv4 && mDNSIPv4AddressIsZero(m->Router.ip.v4))
+    {
+        status = mStatus_NoRouter;
+        mDNS_snprintf(buffer, sizeof(buffer), "No network connection - v4 zero");
+    }
+    else if (mDNSIPv6AddressIsZero(info->AutoTunnelInnerAddress))
+    {
+        status = mStatus_ServiceNotRunning;
+        mDNS_snprintf(buffer, sizeof(buffer), "No inner address");
+    }
+    else if (!llq && !tun)
+    {
+        status = mStatus_NotInitializedErr;
+        mDNS_snprintf(buffer, sizeof(buffer), "Neither LLQ nor AutoTunnel NAT port mapping is currently active");
+    }
+    else if (llqStatus == mStatus_NoSuchRecord)
+    {
+        status = llqStatus;
+        mDNS_snprintf(buffer, sizeof(buffer), llqBuffer);
+    }
+    else if ((llq && llq->Result == mStatus_DoubleNAT) || (tun && tun->Result == mStatus_DoubleNAT))
+    {
+        status = mStatus_DoubleNAT;
+        mDNS_snprintf(buffer, sizeof(buffer), "Double NAT: Router is reporting a private address");
+    }
+    else if ((llq && llq->Result == mStatus_NATPortMappingDisabled) ||
+             (tun && tun->Result == mStatus_NATPortMappingDisabled) ||
+             (m->LastNATMapResultCode == NATErr_Refused && ((llq && !llq->Result && mDNSIPPortIsZero(llq->ExternalPort)) || (tun && !tun->Result && mDNSIPPortIsZero(tun->ExternalPort)))))
+    {
+        status = mStatus_NATPortMappingDisabled;
+        mDNS_snprintf(buffer, sizeof(buffer), "PCP/NAT-PMP is disabled on the router");
+    }
+    else if ((llq && llq->Result) || (tun && tun->Result))
+    {
+        status = mStatus_NATTraversal;
+        mDNS_snprintf(buffer, sizeof(buffer), "Error obtaining NAT port mapping from router");
+    }
+    else if ((llq && mDNSIPPortIsZero(llq->ExternalPort)) || (tun && mDNSIPPortIsZero(tun->ExternalPort)))
+    {
+        status = mStatus_NATTraversal;
+        mDNS_snprintf(buffer, sizeof(buffer), "Unable to obtain NAT port mapping from router");
+    }
+    else
+    {
+        status = llqStatus;
+        mDNS_snprintf(buffer, sizeof(buffer), llqBuffer);
+        LogInfo("UpdateAutoTunnelDomainStatus: LLQ Status %d, %s", status, buffer);
+    }
+
+    num = CFNumberCreate(NULL, kCFNumberSInt32Type, &status);
+    if (!num)
+        LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFNumber StatusCode");
+    else
+    {
+        CFDictionarySetValue(dict, CFSTR("StatusCode"), num);
+        CFRelease(num);
+    }
+
+    tmp = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+    if (!tmp)
+        LogMsg("UpdateAutoTunnelDomainStatus: Could not create CFString StatusMessage");
+    else
+    {
+        CFDictionarySetValue(dict, CFSTR("StatusMessage"), tmp);
+        CFRelease(tmp);
+    }
+
+    if (!CFDictionaryContainsKey(domainStatusDict, domain) ||
+        !CFEqual(dict, (CFMutableDictionaryRef)CFDictionaryGetValue(domainStatusDict, domain)))
+    {
+        CFDictionarySetValue(domainStatusDict, domain, dict);
+        if (!m->ShutdownTime)
+        {
+            static char statusBuf[16];
+            mDNS_snprintf(statusBuf, sizeof(statusBuf), "%d", (int)status);
+            mDNSASLLog((uuid_t *)&m->asl_uuid, "autotunnel.domainstatus", status ? "failure" : "success", statusBuf, "");
+            mDNSDynamicStoreSetConfig(kmDNSBackToMyMacConfig, mDNSNULL, domainStatusDict);
+        }
+    }
+
+    CFRelease(domain);
+    CFRelease(dict);
+
+    debugf("UpdateAutoTunnelDomainStatus: %s", buffer);
+#endif // def NO_SECURITYFRAMEWORK
+}
+
+// MUST be called with lock held
+mDNSexport void UpdateAutoTunnelDomainStatuses(const mDNS *const m)
+{
+#ifdef NO_SECURITYFRAMEWORK
+        (void) m;
+#else
+    mDNS_CheckLock(m);
+    DomainAuthInfo* info;
+    for (info = m->AuthInfoList; info; info = info->next)
+        if (info->AutoTunnel && !info->deltime)
+            UpdateAutoTunnelDomainStatus(m, info);
+#endif // def NO_SECURITYFRAMEWORK
+}
+
+mDNSlocal void UpdateAnonymousRacoonConfig(mDNS *m)     // Determine whether we need racoon to accept incoming connections
+{
+    DomainAuthInfo *info;
+
+    for (info = m->AuthInfoList; info; info = info->next)
+        if (info->AutoTunnel && !info->deltime && (!mDNSIPPortIsZero(m->AutoTunnelNAT.ExternalPort) || !mDNSIPv6AddressIsZero(m->AutoTunnelRelayAddr)))
+            break;
+
+    if (info != AnonymousRacoonConfig)
+    {
+        AnonymousRacoonConfig = info;
+        // Create or revert configuration file, and start (or SIGHUP) Racoon
+        (void)mDNSConfigureServer(AnonymousRacoonConfig ? kmDNSUp : kmDNSDown, AnonymousRacoonConfig ? btmmprefix : mDNSNULL, AnonymousRacoonConfig ? &AnonymousRacoonConfig->domain : mDNSNULL);
+    }
+}
+
+mDNSlocal void AutoTunnelRecordCallback(mDNS *const m, AuthRecord *const rr, mStatus result);
+
+// Caller must hold the lock
+mDNSlocal mDNSBool DeregisterAutoTunnelRecord(mDNS *m, DomainAuthInfo *info, AuthRecord* record)
+{
+    mDNS_CheckLock(m);
+
+    LogInfo("DeregisterAutoTunnelRecord %##s %##s", &info->domain.c, record->namestorage.c);
+
+    if (record->resrec.RecordType > kDNSRecordTypeDeregistering)
+    {
+        mStatus err = mDNS_Deregister_internal(m, record, mDNS_Dereg_normal);
+        if (err)
+        {
+            record->resrec.RecordType = kDNSRecordTypeUnregistered;
+            LogMsg("DeregisterAutoTunnelRecord error %d deregistering %##s %##s", err, info->domain.c, record->namestorage.c);
+            return mDNSfalse;
+        }
+        else LogInfo("DeregisterAutoTunnelRecord: Deregistered");
+    }
+    else LogInfo("DeregisterAutoTunnelRecord: Not deregistering, state:%d", record->resrec.RecordType);
+
+    return mDNStrue;
+}
+
+// Caller must hold the lock
+mDNSlocal void DeregisterAutoTunnelHostRecord(mDNS *m, DomainAuthInfo *info)
+{
+    if (!DeregisterAutoTunnelRecord(m, info, &info->AutoTunnelHostRecord))
+    {
+        info->AutoTunnelHostRecord.namestorage.c[0] = 0;
+        m->NextSRVUpdate = NonZeroTime(m->timenow);
+    }
+}
+
+// Caller must hold the lock
+mDNSlocal void UpdateAutoTunnelHostRecord(mDNS *m, DomainAuthInfo *info)
+{
+    mStatus err;
+    mDNSBool NATProblem = mDNSIPPortIsZero(m->AutoTunnelNAT.ExternalPort) || m->AutoTunnelNAT.Result;
+
+    mDNS_CheckLock(m);
+
+    if (!info->AutoTunnelServiceStarted || info->deltime || m->ShutdownTime || mDNSIPv6AddressIsZero(info->AutoTunnelInnerAddress) || (m->SleepState != SleepState_Awake && NATProblem))
+    {
+        LogInfo("UpdateAutoTunnelHostRecord: Dereg %##s : AutoTunnelServiceStarted(%d) deltime(%d) address(%.16a) sleepstate(%d)",
+                info->domain.c, info->AutoTunnelServiceStarted, info->deltime, &info->AutoTunnelInnerAddress, m->SleepState);
+        DeregisterAutoTunnelHostRecord(m, info);
+    }
+    else if (info->AutoTunnelHostRecord.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        mDNS_SetupResourceRecord(&info->AutoTunnelHostRecord, mDNSNULL, mDNSInterface_Any, kDNSType_AAAA, kHostNameTTL,
+                                 kDNSRecordTypeUnregistered, AuthRecordAny, AutoTunnelRecordCallback, info);
+        info->AutoTunnelHostRecord.namestorage.c[0] = 0;
+        AppendDomainLabel(&info->AutoTunnelHostRecord.namestorage, &m->hostlabel);
+        AppendDomainName (&info->AutoTunnelHostRecord.namestorage, &info->domain);
+        info->AutoTunnelHostRecord.resrec.rdata->u.ipv6 = info->AutoTunnelInnerAddress;
+        info->AutoTunnelHostRecord.resrec.RecordType = kDNSRecordTypeKnownUnique;
+
+        err = mDNS_Register_internal(m, &info->AutoTunnelHostRecord);
+        if (err) LogMsg("UpdateAutoTunnelHostRecord error %d registering %##s", err, info->AutoTunnelHostRecord.namestorage.c);
+        else
+        {
+            // Make sure we trigger the registration of all SRV records in regState_NoTarget again
+            m->NextSRVUpdate = NonZeroTime(m->timenow);
+            LogInfo("UpdateAutoTunnelHostRecord registering %##s", info->AutoTunnelHostRecord.namestorage.c);
+        }
+    }
+    else LogInfo("UpdateAutoTunnelHostRecord: Type %d", info->AutoTunnelHostRecord.resrec.RecordType);
+}
+
+// Caller must hold the lock
+mDNSlocal void DeregisterAutoTunnelServiceRecords(mDNS *m, DomainAuthInfo *info)
+{
+    LogInfo("DeregisterAutoTunnelServiceRecords %##s", info->domain.c);
+
+    DeregisterAutoTunnelRecord(m, info, &info->AutoTunnelTarget);
+    DeregisterAutoTunnelRecord(m, info, &info->AutoTunnelService);
+    UpdateAutoTunnelHostRecord(m, info);
+}
+
+// Caller must hold the lock
+mDNSlocal void UpdateAutoTunnelServiceRecords(mDNS *m, DomainAuthInfo *info)
+{
+    mDNS_CheckLock(m);
+
+    if (!info->AutoTunnelServiceStarted || info->deltime || m->ShutdownTime || mDNSIPPortIsZero(m->AutoTunnelNAT.ExternalPort) || m->AutoTunnelNAT.Result)
+    {
+        LogInfo("UpdateAutoTunnelServiceRecords: Dereg %##s : AutoTunnelServiceStarted(%d) deltime(%d) ExtPort(%d) NATResult(%d)", info->domain.c, info->AutoTunnelServiceStarted, info->deltime, mDNSVal16(m->AutoTunnelNAT.ExternalPort), m->AutoTunnelNAT.Result);
+        DeregisterAutoTunnelServiceRecords(m, info);
+    }
+    else
+    {
+        if (info->AutoTunnelTarget.resrec.RecordType == kDNSRecordTypeUnregistered)
+        {
+            // 1. Set up our address record for the external tunnel address
+            // (Constructed name, not generally user-visible, used as target in IKE tunnel's SRV record)
+            mDNS_SetupResourceRecord(&info->AutoTunnelTarget, mDNSNULL, mDNSInterface_Any, kDNSType_A, kHostNameTTL,
+                                     kDNSRecordTypeUnregistered, AuthRecordAny, AutoTunnelRecordCallback, info);
+            AssignDomainName (&info->AutoTunnelTarget.namestorage, (const domainname*) "\x0B" "_autotunnel");
+            AppendDomainLabel(&info->AutoTunnelTarget.namestorage, &m->hostlabel);
+            AppendDomainName (&info->AutoTunnelTarget.namestorage, &info->domain);
+            info->AutoTunnelTarget.resrec.rdata->u.ipv4 = m->AutoTunnelNAT.ExternalAddress;
+            info->AutoTunnelTarget.resrec.RecordType = kDNSRecordTypeKnownUnique;
+
+            mStatus err = mDNS_Register_internal(m, &info->AutoTunnelTarget);
+            if (err) LogMsg("UpdateAutoTunnelServiceRecords error %d registering %##s", err, info->AutoTunnelTarget.namestorage.c);
+            else LogInfo("UpdateAutoTunnelServiceRecords registering %##s", info->AutoTunnelTarget.namestorage.c);
+        }
+        else LogInfo("UpdateAutoTunnelServiceRecords: NOOP Target state(%d)", info->AutoTunnelTarget.resrec.RecordType);
+
+        if (info->AutoTunnelService.resrec.RecordType == kDNSRecordTypeUnregistered)
+        {
+            // 2. Set up IKE tunnel's SRV record: _autotunnel._udp.AutoTunnelHost SRV 0 0 port AutoTunnelTarget
+            mDNS_SetupResourceRecord(&info->AutoTunnelService, mDNSNULL, mDNSInterface_Any, kDNSType_SRV,  kHostNameTTL,
+                                     kDNSRecordTypeUnregistered, AuthRecordAny, AutoTunnelRecordCallback, info);
+            AssignDomainName (&info->AutoTunnelService.namestorage, (const domainname*) "\x0B" "_autotunnel" "\x04" "_udp");
+            AppendDomainLabel(&info->AutoTunnelService.namestorage, &m->hostlabel);
+            AppendDomainName (&info->AutoTunnelService.namestorage, &info->domain);
+            info->AutoTunnelService.resrec.rdata->u.srv.priority = 0;
+            info->AutoTunnelService.resrec.rdata->u.srv.weight   = 0;
+            info->AutoTunnelService.resrec.rdata->u.srv.port     = m->AutoTunnelNAT.ExternalPort;
+            AssignDomainName(&info->AutoTunnelService.resrec.rdata->u.srv.target, &info->AutoTunnelTarget.namestorage);
+            info->AutoTunnelService.resrec.RecordType = kDNSRecordTypeKnownUnique;
+
+            mStatus err = mDNS_Register_internal(m, &info->AutoTunnelService);
+            if (err) LogMsg("UpdateAutoTunnelServiceRecords error %d registering %##s", err, info->AutoTunnelService.namestorage.c);
+            else LogInfo("UpdateAutoTunnelServiceRecords registering %##s", info->AutoTunnelService.namestorage.c);
+        }
+        else LogInfo("UpdateAutoTunnelServiceRecords: NOOP Service state(%d)", info->AutoTunnelService.resrec.RecordType);
+
+        UpdateAutoTunnelHostRecord(m, info);
+
+        LogInfo("AutoTunnel server listening for connections on %##s[%.4a]:%d:%##s[%.16a]",
+                info->AutoTunnelTarget.namestorage.c,     &m->AdvertisedV4.ip.v4, mDNSVal16(m->AutoTunnelNAT.IntPort),
+                info->AutoTunnelHostRecord.namestorage.c, &info->AutoTunnelInnerAddress);
+
+    }
+}
+
+// Caller must hold the lock
+mDNSlocal void DeregisterAutoTunnelDeviceInfoRecord(mDNS *m, DomainAuthInfo *info)
+{
+    DeregisterAutoTunnelRecord(m, info, &info->AutoTunnelDeviceInfo);
+}
+
+// Caller must hold the lock
+mDNSlocal void UpdateAutoTunnelDeviceInfoRecord(mDNS *m, DomainAuthInfo *info)
+{
+    mDNS_CheckLock(m);
+
+    if (!info->AutoTunnelServiceStarted || info->deltime || m->ShutdownTime)
+        DeregisterAutoTunnelDeviceInfoRecord(m, info);
+    else if (info->AutoTunnelDeviceInfo.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        mDNS_SetupResourceRecord(&info->AutoTunnelDeviceInfo, mDNSNULL, mDNSInterface_Any, kDNSType_TXT,  kStandardTTL, kDNSRecordTypeUnregistered, AuthRecordAny, AutoTunnelRecordCallback, info);
+        ConstructServiceName(&info->AutoTunnelDeviceInfo.namestorage, &m->nicelabel, &DeviceInfoName, &info->domain);
+
+        info->AutoTunnelDeviceInfo.resrec.rdlength = initializeDeviceInfoTXT(m, info->AutoTunnelDeviceInfo.resrec.rdata->u.data);
+        info->AutoTunnelDeviceInfo.resrec.RecordType = kDNSRecordTypeKnownUnique;
+
+        mStatus err = mDNS_Register_internal(m, &info->AutoTunnelDeviceInfo);
+        if (err) LogMsg("UpdateAutoTunnelDeviceInfoRecord error %d registering %##s", err, info->AutoTunnelDeviceInfo.namestorage.c);
+        else LogInfo("UpdateAutoTunnelDeviceInfoRecord registering %##s", info->AutoTunnelDeviceInfo.namestorage.c);
+    }
+    else
+        LogInfo("UpdateAutoTunnelDeviceInfoRecord: not in Unregistered state: %d",info->AutoTunnelDeviceInfo.resrec.RecordType);
+}
+
+// Caller must hold the lock
+mDNSlocal void DeregisterAutoTunnel6Record(mDNS *m, DomainAuthInfo *info)
+{
+    LogInfo("DeregisterAutoTunnel6Record %##s", info->domain.c);
+
+    DeregisterAutoTunnelRecord(m, info, &info->AutoTunnel6Record);
+    UpdateAutoTunnelHostRecord(m, info);
+    UpdateAutoTunnelDomainStatus(m, info);
+}
+
+// Caller must hold the lock
+mDNSlocal void UpdateAutoTunnel6Record(mDNS *m, DomainAuthInfo *info)
+{
+    mDNS_CheckLock(m);
+
+    if (!info->AutoTunnelServiceStarted || info->deltime || m->ShutdownTime || mDNSIPv6AddressIsZero(m->AutoTunnelRelayAddr) || m->SleepState != SleepState_Awake)
+        DeregisterAutoTunnel6Record(m, info);
+    else if (info->AutoTunnel6Record.resrec.RecordType == kDNSRecordTypeUnregistered)
+    {
+        mDNS_SetupResourceRecord(&info->AutoTunnel6Record, mDNSNULL, mDNSInterface_Any, kDNSType_AAAA, kHostNameTTL,
+                                 kDNSRecordTypeUnregistered, AuthRecordAny, AutoTunnelRecordCallback, info);
+        AssignDomainName (&info->AutoTunnel6Record.namestorage, (const domainname*) "\x0C" "_autotunnel6");
+        AppendDomainLabel(&info->AutoTunnel6Record.namestorage, &m->hostlabel);
+        AppendDomainName (&info->AutoTunnel6Record.namestorage, &info->domain);
+        info->AutoTunnel6Record.resrec.rdata->u.ipv6 = m->AutoTunnelRelayAddr;
+        info->AutoTunnel6Record.resrec.RecordType = kDNSRecordTypeKnownUnique;
+
+        mStatus err = mDNS_Register_internal(m, &info->AutoTunnel6Record);
+        if (err) LogMsg("UpdateAutoTunnel6Record error %d registering %##s", err, info->AutoTunnel6Record.namestorage.c);
+        else LogInfo("UpdateAutoTunnel6Record registering %##s", info->AutoTunnel6Record.namestorage.c);
+
+        UpdateAutoTunnelHostRecord(m, info);
+
+        LogInfo("AutoTunnel6 server listening for connections on %##s[%.16a] :%##s[%.16a]",
+                info->AutoTunnel6Record.namestorage.c,    &m->AutoTunnelRelayAddr,
+                info->AutoTunnelHostRecord.namestorage.c, &info->AutoTunnelInnerAddress);
+
+    }
+    else LogInfo("UpdateAutoTunnel6Record NOOP state(%d)",info->AutoTunnel6Record.resrec.RecordType);
+}
+
+mDNSlocal void AutoTunnelRecordCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    DomainAuthInfo *info = (DomainAuthInfo *)rr->RecordContext;
+    if (result == mStatus_MemFree)
+    {
+        LogInfo("AutoTunnelRecordCallback MemFree %s", ARDisplayString(m, rr));
+        
+        mDNS_Lock(m);
+        
+        // Reset the host record namestorage to force high-level PTR/SRV/TXT to deregister
+        if (rr == &info->AutoTunnelHostRecord)
+        {
+            rr->namestorage.c[0] = 0;
+            m->NextSRVUpdate = NonZeroTime(m->timenow);
+            LogInfo("AutoTunnelRecordCallback: NextSRVUpdate in %d %d", m->NextSRVUpdate - m->timenow, m->timenow);
+        }
+        if (m->ShutdownTime)
+        {
+            LogInfo("AutoTunnelRecordCallback: Shutdown, returning");
+            mDNS_Unlock(m);        
+            return;
+        }
+        if (rr == &info->AutoTunnelHostRecord)
+        {
+            LogInfo("AutoTunnelRecordCallback: calling UpdateAutoTunnelHostRecord");
+            UpdateAutoTunnelHostRecord(m,info);
+        }
+        else if (rr == &info->AutoTunnelDeviceInfo)
+        {
+            LogInfo("AutoTunnelRecordCallback: Calling UpdateAutoTunnelDeviceInfoRecord");
+            UpdateAutoTunnelDeviceInfoRecord(m,info);
+        }
+        else if (rr == &info->AutoTunnelService || rr == &info->AutoTunnelTarget)
+        {
+            LogInfo("AutoTunnelRecordCallback: Calling UpdateAutoTunnelServiceRecords");
+            UpdateAutoTunnelServiceRecords(m,info);
+        }
+        else if (rr == &info->AutoTunnel6Record)
+        {
+            LogInfo("AutoTunnelRecordCallback: Calling UpdateAutoTunnel6Record");
+            UpdateAutoTunnel6Record(m,info);
+        }
+
+        mDNS_Unlock(m);        
+    }
+}
+
+mDNSlocal void AutoTunnelNATCallback(mDNS *m, NATTraversalInfo *n)
+{
+    DomainAuthInfo *info;
+
+    LogInfo("AutoTunnelNATCallback Result %d %.4a Internal %d External %d",
+            n->Result, &n->ExternalAddress, mDNSVal16(n->IntPort), mDNSVal16(n->ExternalPort));
+
+    mDNS_Lock(m);
+    
+    m->NextSRVUpdate = NonZeroTime(m->timenow);
+    LogInfo("AutoTunnelNATCallback: NextSRVUpdate in %d %d", m->NextSRVUpdate - m->timenow, m->timenow);
+
+    for (info = m->AuthInfoList; info; info = info->next)
+        if (info->AutoTunnel)
+            UpdateAutoTunnelServiceRecords(m, info);
+
+    UpdateAnonymousRacoonConfig(m);     // Determine whether we need racoon to accept incoming connections
+
+    UpdateAutoTunnelDomainStatuses(m);
+
+    mDNS_Unlock(m);
+}
+
+mDNSlocal void AutoTunnelHostNameChanged(mDNS *m, DomainAuthInfo *info)
+{
+    LogInfo("AutoTunnelHostNameChanged %#s.%##s", m->hostlabel.c, info->domain.c);
+
+    mDNS_Lock(m);
+    // We forcibly deregister the records that are based on the hostname.
+    // When deregistration of each completes, the MemFree callback will make the
+    // appropriate Update* call to use the new name to reregister.
+    DeregisterAutoTunnelHostRecord(m, info);
+    DeregisterAutoTunnelDeviceInfoRecord(m, info);
+    DeregisterAutoTunnelServiceRecords(m, info);
+    DeregisterAutoTunnel6Record(m, info);
+    m->NextSRVUpdate = NonZeroTime(m->timenow);
+    mDNS_Unlock(m);
+}
+
+// Must be called with the lock held
+mDNSexport void StartServerTunnel(mDNS *const m, DomainAuthInfo *const info)
+{
+    if (info->deltime) return;
+    
+    if (info->AutoTunnelServiceStarted)
+    {
+        // On wake from sleep, this function will be called when determining SRV targets,
+        // and needs to re-register the host record for the target to be set correctly
+        UpdateAutoTunnelHostRecord(m, info);
+        return;
+    }
+    
+    info->AutoTunnelServiceStarted = mDNStrue;
+
+    // Now that we have a service in this domain, we need to try to register the
+    // AutoTunnel records, because the relay connection & NAT-T may have already been
+    // started for another domain. If the relay connection is not up or the NAT-T has not
+    // yet succeeded, the Update* functions are smart enough to not register the records.
+    // Note: This should be done after we set AutoTunnelServiceStarted, as that variable is used to
+    // decide whether to register the AutoTunnel records in the calls below.
+    UpdateAutoTunnelServiceRecords(m, info);
+    UpdateAutoTunnel6Record(m, info);
+    UpdateAutoTunnelDeviceInfoRecord(m, info);
+    UpdateAutoTunnelHostRecord(m, info);
+
+    // If the global AutoTunnel NAT-T is not yet started, start it.
+    if (!m->AutoTunnelNAT.clientContext)
+    {
+        m->AutoTunnelNAT.clientCallback   = AutoTunnelNATCallback;
+        m->AutoTunnelNAT.clientContext    = (void*)1; // Means AutoTunnelNAT Traversal is active;
+        m->AutoTunnelNAT.Protocol         = NATOp_MapUDP;
+        m->AutoTunnelNAT.IntPort          = IPSECPort;
+        m->AutoTunnelNAT.RequestedPort    = IPSECPort;
+        m->AutoTunnelNAT.NATLease         = 0;
+        mStatus err = mDNS_StartNATOperation_internal(m, &m->AutoTunnelNAT);
+        if (err) LogMsg("StartServerTunnel: error %d starting NAT mapping", err);
+    }
+}
+
+mDNSlocal mStatus AutoTunnelSetKeys(ClientTunnel *tun, mDNSBool AddNew)
+{
+    mDNSv6Addr loc_outer6;
+    mDNSv6Addr rmt_outer6;
+
+    // When we are tunneling over IPv6 Relay address, the port number is zero
+    if (mDNSIPPortIsZero(tun->rmt_outer_port))
+    {
+        loc_outer6 = tun->loc_outer6;
+        rmt_outer6 = tun->rmt_outer6;
+    }
+    else
+    {
+        loc_outer6 = zerov6Addr;
+        loc_outer6.b[0] = tun->loc_outer.b[0];
+        loc_outer6.b[1] = tun->loc_outer.b[1];
+        loc_outer6.b[2] = tun->loc_outer.b[2];
+        loc_outer6.b[3] = tun->loc_outer.b[3];
+
+        rmt_outer6 = zerov6Addr;
+        rmt_outer6.b[0] = tun->rmt_outer.b[0];
+        rmt_outer6.b[1] = tun->rmt_outer.b[1];
+        rmt_outer6.b[2] = tun->rmt_outer.b[2];
+        rmt_outer6.b[3] = tun->rmt_outer.b[3];
+    }
+
+    return(mDNSAutoTunnelSetKeys(AddNew ? kmDNSAutoTunnelSetKeysReplace : kmDNSAutoTunnelSetKeysDelete, tun->loc_inner.b, loc_outer6.b, kRacoonPort, tun->rmt_inner.b, rmt_outer6.b, mDNSVal16(tun->rmt_outer_port), btmmprefix, SkipLeadingLabels(&tun->dstname, 1)));
+}
+
+// If the EUI-64 part of the IPv6 ULA matches, then that means the two addresses point to the same machine
+#define mDNSSameClientTunnel(A,B) ((A)->l[2] == (B)->l[2] && (A)->l[3] == (B)->l[3])
+
+mDNSlocal void ReissueBlockedQuestionWithType(mDNS *const m, domainname *d, mDNSBool success, mDNSu16 qtype)
+{
+    DNSQuestion *q = m->Questions;
+    while (q)
+    {
+        if (q->NoAnswer == NoAnswer_Suspended && q->qtype == qtype && q->AuthInfo && q->AuthInfo->AutoTunnel && SameDomainName(&q->qname, d))
+        {
+            LogInfo("Restart %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+            mDNSQuestionCallback *tmp = q->QuestionCallback;
+            q->QuestionCallback = AutoTunnelCallback;   // Set QuestionCallback to suppress another call back to AddNewClientTunnel
+            mDNS_StopQuery(m, q);
+            mDNS_StartQuery(m, q);
+            q->QuestionCallback = tmp;                  // Restore QuestionCallback back to the real value
+            if (!success) q->NoAnswer = NoAnswer_Fail;
+            // When we call mDNS_StopQuery, it's possible for other subordinate questions like the GetZoneData query to be cancelled too.
+            // In general we have to assume that the question list might have changed in arbitrary ways.
+            // This code is itself called from a question callback, so the m->CurrentQuestion mechanism is
+            // already in use. The safest solution is just to go back to the start of the list and start again.
+            // In principle this sounds like an n^2 algorithm, but in practice we almost always activate
+            // just one suspended question, so it's really a 2n algorithm.
+            q = m->Questions;
+        }
+        else
+            q = q->next;
+    }
+}
+
+mDNSlocal void ReissueBlockedQuestions(mDNS *const m, domainname *d, mDNSBool success)
+{
+    // 1. We deliberately restart AAAA queries before A queries, because in the common case where a BTTM host has
+    //    a v6 address but no v4 address, we prefer the caller to get the positive AAAA response before the A NXDOMAIN.
+    // 2. In the case of AAAA queries, if our tunnel setup failed, then we return a deliberate failure indication to the caller --
+    //    even if the name does have a valid AAAA record, we don't want clients trying to connect to it without a properly encrypted tunnel.
+    // 3. For A queries we never fabricate failures -- if a BTTM service is really using raw IPv4, then it doesn't need the IPv6 tunnel.
+    ReissueBlockedQuestionWithType(m, d, success, kDNSType_AAAA);
+    ReissueBlockedQuestionWithType(m, d, mDNStrue, kDNSType_A);
+}
+
+mDNSlocal void UnlinkAndReissueBlockedQuestions(mDNS *const m, ClientTunnel *tun, mDNSBool success)
+{
+    ClientTunnel **p = &m->TunnelClients;
+    while (*p != tun && *p) p = &(*p)->next;
+    if (*p) *p = tun->next;
+    ReissueBlockedQuestions(m, &tun->dstname, success);
+    LogInfo("UnlinkAndReissueBlockedQuestions: Disposing ClientTunnel %p", tun);
+    freeL("ClientTunnel", tun);
+}
+
+mDNSlocal mDNSBool TunnelClientDeleteMatching(mDNS *const m, ClientTunnel *tun, mDNSBool v6Tunnel)
+{
+    ClientTunnel **p;
+    mDNSBool needSetKeys = mDNStrue;
+
+    p = &tun->next;
+    while (*p)
+    {
+        // Is this a tunnel to the same host that we are trying to setup now?
+        if (!mDNSSameClientTunnel(&(*p)->rmt_inner, &tun->rmt_inner)) p = &(*p)->next;
+        else
+        {
+            ClientTunnel *old = *p;
+            if (v6Tunnel)
+            {
+                if (!mDNSIPPortIsZero(old->rmt_outer_port)) { p = &old->next; continue; }
+                LogInfo("TunnelClientDeleteMatching: Found existing IPv6 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                if (old->q.ThisQInterval >= 0)
+                {
+                    LogInfo("TunnelClientDeleteMatching: Stopping query on IPv6 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                    mDNS_StopQuery(m, &old->q);
+                }
+                else if (!mDNSSameIPv6Address((*p)->rmt_inner, tun->rmt_inner) ||
+                         !mDNSSameIPv6Address(old->loc_inner, tun->loc_inner)   ||
+                         !mDNSSameIPv6Address(old->loc_outer6, tun->loc_outer6) ||
+                         !mDNSSameIPv6Address(old->rmt_outer6, tun->rmt_outer6))
+                {
+                    // Delete the old tunnel if the current tunnel to the same host does not have the same ULA or
+                    // the other parameters of the tunnel are different
+                    LogInfo("TunnelClientDeleteMatching: Deleting existing IPv6 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                    AutoTunnelSetKeys(old, mDNSfalse);
+                }
+                else
+                {
+                    // Reusing the existing tunnel means that we reuse the IPsec SAs and the policies. We delete the old
+                    // as "tun" and "old" are identical
+                    LogInfo("TunnelClientDeleteMatching: Reusing the existing IPv6 AutoTunnel for %##s %.16a", old->dstname.c,
+                            &old->rmt_inner);
+                    needSetKeys = mDNSfalse;
+                }
+            }
+            else
+            {
+                if (mDNSIPPortIsZero(old->rmt_outer_port)) { p = &old->next; continue; }
+                LogInfo("TunnelClientDeleteMatching: Found existing IPv4 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                if (old->q.ThisQInterval >= 0)
+                {
+                    LogInfo("TunnelClientDeleteMatching: Stopping query on IPv4 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                    mDNS_StopQuery(m, &old->q);
+                }
+                else if (!mDNSSameIPv6Address((*p)->rmt_inner, tun->rmt_inner) ||
+                         !mDNSSameIPv6Address(old->loc_inner, tun->loc_inner)   ||
+                         !mDNSSameIPv4Address(old->loc_outer, tun->loc_outer)   ||
+                         !mDNSSameIPv4Address(old->rmt_outer, tun->rmt_outer)   ||
+                         !mDNSSameIPPort(old->rmt_outer_port, tun->rmt_outer_port))
+                {
+                    // Delete the old tunnel if the current tunnel to the same host does not have the same ULA or
+                    // the other parameters of the tunnel are different
+                    LogInfo("TunnelClientDeleteMatching: Deleting existing IPv4 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                    AutoTunnelSetKeys(old, mDNSfalse);
+                }
+                else
+                {
+                    // Reusing the existing tunnel means that we reuse the IPsec SAs and the policies. We delete the old
+                    // as "tun" and "old" are identical
+                    LogInfo("TunnelClientDeleteMatching: Reusing the existing IPv4 AutoTunnel for %##s %.16a", old->dstname.c,
+                            &old->rmt_inner);
+                    needSetKeys = mDNSfalse;
+                }
+            }
+
+            *p = old->next;
+            LogInfo("TunnelClientDeleteMatching: Disposing ClientTunnel %p", old);
+            freeL("ClientTunnel", old);
+        }
+    }
+    return needSetKeys;
+}
+
+// v6Tunnel indicates whether to delete a tunnel whose outer header is IPv6. If false, outer IPv4
+// tunnel will be deleted
+mDNSlocal void TunnelClientDeleteAny(mDNS *const m, ClientTunnel *tun, mDNSBool v6Tunnel)
+{
+    ClientTunnel **p;
+
+    p = &tun->next;
+    while (*p)
+    {
+        // If there is more than one client tunnel to the same host, delete all of them.
+        // We do this by just checking against the EUI64 rather than the full address
+        if (!mDNSSameClientTunnel(&(*p)->rmt_inner, &tun->rmt_inner)) p = &(*p)->next;
+        else
+        {
+            ClientTunnel *old = *p;
+            if (v6Tunnel)
+            {
+                if (!mDNSIPPortIsZero(old->rmt_outer_port)) { p = &old->next; continue;}
+                LogInfo("TunnelClientDeleteAny: Found existing IPv6 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+            }
+            else
+            {
+                if (mDNSIPPortIsZero(old->rmt_outer_port)) { p = &old->next; continue;}
+                LogInfo("TunnelClientDeleteAny: Found existing IPv4 AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+            }
+            if (old->q.ThisQInterval >= 0)
+            {
+                LogInfo("TunnelClientDeleteAny: Stopping query on AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                mDNS_StopQuery(m, &old->q);
+            }
+            else
+            {
+                LogInfo("TunnelClientDeleteAny: Deleting existing AutoTunnel for %##s %.16a", old->dstname.c, &old->rmt_inner);
+                AutoTunnelSetKeys(old, mDNSfalse);
+            }
+            *p = old->next;
+            LogInfo("TunnelClientDeleteAny: Disposing ClientTunnel %p", old);
+            freeL("ClientTunnel", old);
+        }
+    }
+}
+
+mDNSlocal void TunnelClientFinish(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer)
+{
+    mDNSBool needSetKeys = mDNStrue;
+    ClientTunnel *tun = (ClientTunnel *)question->QuestionContext;
+    mDNSBool v6Tunnel = mDNSfalse;
+    DomainAuthInfo *info;
+
+    // If the port is zero, then we have a relay address of the peer
+    if (mDNSIPPortIsZero(tun->rmt_outer_port))
+        v6Tunnel = mDNStrue;
+
+    if (v6Tunnel)
+    {
+        LogInfo("TunnelClientFinish: Relay address %.16a", &answer->rdata->u.ipv6);
+        tun->rmt_outer6 = answer->rdata->u.ipv6;
+        tun->loc_outer6 = m->AutoTunnelRelayAddr;
+    }
+    else
+    {
+        LogInfo("TunnelClientFinish: SRV target address %.4a", &answer->rdata->u.ipv4);
+        tun->rmt_outer = answer->rdata->u.ipv4;
+        mDNSAddr tmpDst = { mDNSAddrType_IPv4, {{{0}}} };
+        tmpDst.ip.v4 = tun->rmt_outer;
+        mDNSAddr tmpSrc = zeroAddr;
+        mDNSPlatformSourceAddrForDest(&tmpSrc, &tmpDst);
+        if (tmpSrc.type == mDNSAddrType_IPv4) tun->loc_outer = tmpSrc.ip.v4;
+        else tun->loc_outer = m->AdvertisedV4.ip.v4;
+    }
+
+    question->ThisQInterval = -1;       // So we know this tunnel setup has completed
+
+    info = GetAuthInfoForName(m, &tun->dstname);
+    if (!info)
+    {
+        LogMsg("TunnelClientFinish: Could not get AuthInfo for %##s", tun->dstname.c);
+        ReissueBlockedQuestions(m, &tun->dstname, mDNSfalse);
+        return;
+    }
+    
+    tun->loc_inner = info->AutoTunnelInnerAddress;
+
+    // If we found a v6Relay address for our peer, delete all the v4Tunnels for our peer and
+    // look for existing tunnels to see whether they have the same information for our peer.
+    // If not, delete them and need to create a new tunnel. If they are same, just use the
+    // same tunnel. Do the similar thing if we found a v4Tunnel end point for our peer.
+    TunnelClientDeleteAny(m, tun, !v6Tunnel);
+    needSetKeys = TunnelClientDeleteMatching(m, tun, v6Tunnel);
+
+    if (needSetKeys) LogInfo("TunnelClientFinish: New %s AutoTunnel for %##s %.16a", (v6Tunnel ? "IPv6" : "IPv4"), tun->dstname.c, &tun->rmt_inner);
+    else LogInfo("TunnelClientFinish: Reusing exiting %s AutoTunnel for %##s %.16a", (v6Tunnel ? "IPv6" : "IPv4"), tun->dstname.c, &tun->rmt_inner);
+
+    mStatus result = needSetKeys ? AutoTunnelSetKeys(tun, mDNStrue) : mStatus_NoError;
+    static char msgbuf[32];
+    mDNS_snprintf(msgbuf, sizeof(msgbuf), "Tunnel setup - %d", result);
+    mDNSASLLog((uuid_t *)&m->asl_uuid, "autotunnel.config", result ? "failure" : "success", msgbuf, "");
+    // Kick off any questions that were held pending this tunnel setup
+    ReissueBlockedQuestions(m, &tun->dstname, (result == mStatus_NoError) ? mDNStrue : mDNSfalse);
+}
+
+mDNSexport void AutoTunnelCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    ClientTunnel *tun = (ClientTunnel *)question->QuestionContext;
+    DomainAuthInfo *info;
+
+    LogInfo("AutoTunnelCallback tun %p AddRecord %d rdlength %d qtype %d", tun, AddRecord, answer->rdlength, question->qtype);
+
+    if (!AddRecord) return;
+    mDNS_StopQuery(m, question);
+
+    // If we are looking up the AAAA record for _autotunnel6, don't consider it as failure.
+    // The code below will look for _autotunnel._udp SRV record followed by A record
+    if (tun->tc_state != TC_STATE_AAAA_PEER_RELAY && !answer->rdlength)
+    {
+        LogInfo("AutoTunnelCallback NXDOMAIN %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+        static char msgbuf[16];
+        mDNS_snprintf(msgbuf, sizeof(msgbuf), "%s lookup", DNSTypeName(question->qtype));
+        mDNSASLLog((uuid_t *)&m->asl_uuid, "autotunnel.config", "failure", msgbuf, "");
+        UnlinkAndReissueBlockedQuestions(m, tun, mDNSfalse);
+        return;
+    }
+
+    switch (tun->tc_state)
+    {
+    case TC_STATE_AAAA_PEER:
+        if (question->qtype != kDNSType_AAAA)
+        {
+            LogMsg("AutoTunnelCallback: Bad question type %d in TC_STATE_AAAA_PEER", question->qtype);
+        }
+        info = GetAuthInfoForName(m, &tun->dstname);
+        if (!info)
+        {
+            LogMsg("AutoTunnelCallback: Could not get AuthInfo for %##s", tun->dstname.c);
+            UnlinkAndReissueBlockedQuestions(m, tun, mDNStrue);
+            return;
+        }
+        if (mDNSSameIPv6Address(answer->rdata->u.ipv6, info->AutoTunnelInnerAddress))
+        {
+            LogInfo("AutoTunnelCallback: suppressing tunnel to self %.16a", &answer->rdata->u.ipv6);
+            UnlinkAndReissueBlockedQuestions(m, tun, mDNStrue);
+            return;
+        }
+        if (info && mDNSSameIPv6NetworkPart(answer->rdata->u.ipv6, info->AutoTunnelInnerAddress))
+        {
+            LogInfo("AutoTunnelCallback: suppressing tunnel to peer %.16a", &answer->rdata->u.ipv6);
+            UnlinkAndReissueBlockedQuestions(m, tun, mDNStrue);
+            return;
+        }
+        tun->rmt_inner = answer->rdata->u.ipv6;
+        LogInfo("AutoTunnelCallback:TC_STATE_AAAA_PEER: dst host %.16a", &tun->rmt_inner);
+        if (!mDNSIPv6AddressIsZero(m->AutoTunnelRelayAddr))
+        {
+            LogInfo("AutoTunnelCallback: Looking up _autotunnel6 AAAA");
+            tun->tc_state = TC_STATE_AAAA_PEER_RELAY;
+            question->qtype = kDNSType_AAAA;
+            AssignDomainName(&question->qname, (const domainname*) "\x0C" "_autotunnel6");
+        }
+        else
+        {
+            LogInfo("AutoTunnelCallback: Looking up _autotunnel._udp SRV");
+            tun->tc_state = TC_STATE_SRV_PEER;
+            question->qtype = kDNSType_SRV;
+            AssignDomainName(&question->qname, (const domainname*) "\x0B" "_autotunnel" "\x04" "_udp");
+        }
+        AppendDomainName(&question->qname, &tun->dstname);
+        mDNS_StartQuery(m, &tun->q);
+        return;
+    case TC_STATE_AAAA_PEER_RELAY:
+        if (question->qtype != kDNSType_AAAA)
+        {
+            LogMsg("AutoTunnelCallback: Bad question type %d in TC_STATE_AAAA_PEER_RELAY", question->qtype);
+        }
+        // If it failed, look for the SRV record.
+        if (!answer->rdlength)
+        {
+            LogInfo("AutoTunnelCallback: Looking up _autotunnel6 AAAA failed, trying SRV");
+            tun->tc_state = TC_STATE_SRV_PEER;
+            AssignDomainName(&question->qname, (const domainname*) "\x0B" "_autotunnel" "\x04" "_udp");
+            AppendDomainName(&question->qname, &tun->dstname);
+            question->qtype = kDNSType_SRV;
+            mDNS_StartQuery(m, &tun->q);
+            return;
+        }
+        TunnelClientFinish(m, question, answer);
+        return;
+    case TC_STATE_SRV_PEER:
+        if (question->qtype != kDNSType_SRV)
+        {
+            LogMsg("AutoTunnelCallback: Bad question type %d in TC_STATE_SRV_PEER", question->qtype);
+        }
+        LogInfo("AutoTunnelCallback: SRV target name %##s", answer->rdata->u.srv.target.c);
+        tun->tc_state = TC_STATE_ADDR_PEER;
+        AssignDomainName(&tun->q.qname, &answer->rdata->u.srv.target);
+        tun->rmt_outer_port = answer->rdata->u.srv.port;
+        question->qtype = kDNSType_A;
+        mDNS_StartQuery(m, &tun->q);
+        return;
+    case TC_STATE_ADDR_PEER:
+        if (question->qtype != kDNSType_A)
+        {
+            LogMsg("AutoTunnelCallback: Bad question type %d in TC_STATE_ADDR_PEER", question->qtype);
+        }
+        TunnelClientFinish(m, question, answer);
+        return;
+    default:
+        LogMsg("AutoTunnelCallback: Unknown question %p", question);
+    }
+}
+
+// Must be called with the lock held
+mDNSexport void AddNewClientTunnel(mDNS *const m, DNSQuestion *const q)
+{
+    ClientTunnel *p = mallocL("ClientTunnel", sizeof(ClientTunnel));
+    if (!p) return;
+    AssignDomainName(&p->dstname, &q->qname);
+    p->MarkedForDeletion = mDNSfalse;
+    p->loc_inner      = zerov6Addr;
+    p->loc_outer      = zerov4Addr;
+    p->loc_outer6     = zerov6Addr;
+    p->rmt_inner      = zerov6Addr;
+    p->rmt_outer      = zerov4Addr;
+    p->rmt_outer6     = zerov6Addr;
+    p->rmt_outer_port = zeroIPPort;
+    p->tc_state = TC_STATE_AAAA_PEER;
+    p->next = m->TunnelClients;
+    m->TunnelClients = p;       // We intentionally build list in reverse order
+
+    p->q.InterfaceID      = mDNSInterface_Any;
+    p->q.flags            = 0;
+    p->q.Target           = zeroAddr;
+    AssignDomainName(&p->q.qname, &q->qname);
+    p->q.qtype            = kDNSType_AAAA;
+    p->q.qclass           = kDNSClass_IN;
+    p->q.LongLived        = mDNSfalse;
+    p->q.ExpectUnique     = mDNStrue;
+    p->q.ForceMCast       = mDNSfalse;
+    p->q.ReturnIntermed   = mDNStrue;
+    p->q.SuppressUnusable = mDNSfalse;
+    p->q.SearchListIndex  = 0;
+    p->q.AppendSearchDomains = 0;
+    p->q.RetryWithSearchDomains = mDNSfalse;
+    p->q.TimeoutQuestion  = 0;
+    p->q.WakeOnResolve    = 0;
+    p->q.UseBackgroundTrafficClass = mDNSfalse;
+    p->q.ValidationRequired = 0;
+    p->q.ValidatingResponse = 0;
+    p->q.ProxyQuestion      = 0;
+    p->q.qnameOrig        = mDNSNULL;
+    p->q.AnonInfo         = mDNSNULL;
+    p->q.pid              = mDNSPlatformGetPID();
+    p->q.QuestionCallback = AutoTunnelCallback;
+    p->q.QuestionContext  = p;
+
+    LogInfo("AddNewClientTunnel start tun %p %##s (%s)%s", p, &q->qname.c, DNSTypeName(q->qtype), q->LongLived ? " LongLived" : "");
+    mDNS_StartQuery_internal(m, &p->q);
+}
+
+#endif // APPLE_OSX_mDNSResponder
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Power State & Configuration Change Management
+#endif
+
+mDNSlocal mStatus UpdateInterfaceList(mDNS *const m, mDNSs32 utc)
+{
+    mDNSBool foundav4           = mDNSfalse;
+    mDNSBool foundav6           = mDNSfalse;
+    struct ifaddrs *ifa         = myGetIfAddrs(1);
+    struct ifaddrs *v4Loopback  = NULL;
+    struct ifaddrs *v6Loopback  = NULL;
+    char defaultname[64];
+    int InfoSocket              = socket(AF_INET6, SOCK_DGRAM, 0);
+    if (InfoSocket < 3 && errno != EAFNOSUPPORT) 
+        LogMsg("UpdateInterfaceList: InfoSocket error %d errno %d (%s)", InfoSocket, errno, strerror(errno));
+
+    while (ifa)
+    {
+#if LIST_ALL_INTERFACES
+        if (ifa->ifa_addr->sa_family == AF_APPLETALK)
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d is AF_APPLETALK",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        else if (ifa->ifa_addr->sa_family == AF_LINK)
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d is AF_LINK",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        else if (ifa->ifa_addr->sa_family != AF_INET && ifa->ifa_addr->sa_family != AF_INET6)
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d not AF_INET (2) or AF_INET6 (30)",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        if (!(ifa->ifa_flags & IFF_UP))
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d Interface not IFF_UP",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        if (!(ifa->ifa_flags & IFF_MULTICAST))
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d Interface not IFF_MULTICAST",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        if (ifa->ifa_flags & IFF_POINTOPOINT)
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d Interface IFF_POINTOPOINT",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+        if (ifa->ifa_flags & IFF_LOOPBACK)
+            LogMsg("UpdateInterfaceList: %5s(%d) Flags %04X Family %2d Interface IFF_LOOPBACK",
+                   ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family);
+#endif
+
+        if (ifa->ifa_addr->sa_family == AF_LINK)
+        {
+            struct sockaddr_dl *sdl = (struct sockaddr_dl *)ifa->ifa_addr;
+            if (sdl->sdl_type == IFT_ETHER && sdl->sdl_alen == sizeof(m->PrimaryMAC) && mDNSSameEthAddress(&m->PrimaryMAC, &zeroEthAddr))
+                mDNSPlatformMemCopy(m->PrimaryMAC.b, sdl->sdl_data + sdl->sdl_nlen, 6);
+        }
+
+        if (ifa->ifa_flags & IFF_UP && ifa->ifa_addr)
+            if (ifa->ifa_addr->sa_family == AF_INET || ifa->ifa_addr->sa_family == AF_INET6)
+            {
+                if (!ifa->ifa_netmask)
+                {
+                    mDNSAddr ip;
+                    SetupAddr(&ip, ifa->ifa_addr);
+                    LogMsg("getifaddrs: ifa_netmask is NULL for %5s(%d) Flags %04X Family %2d %#a",
+                           ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family, &ip);
+                }
+                // Apparently it's normal for the sa_family of an ifa_netmask to sometimes be zero, so we don't complain about that
+                // <rdar://problem/5492035> getifaddrs is returning invalid netmask family for fw0 and vmnet
+                else if (ifa->ifa_netmask->sa_family != ifa->ifa_addr->sa_family && ifa->ifa_netmask->sa_family != 0)
+                {
+                    mDNSAddr ip;
+                    SetupAddr(&ip, ifa->ifa_addr);
+                    LogMsg("getifaddrs ifa_netmask for %5s(%d) Flags %04X Family %2d %#a has different family: %d",
+                           ifa->ifa_name, if_nametoindex(ifa->ifa_name), ifa->ifa_flags, ifa->ifa_addr->sa_family, &ip, ifa->ifa_netmask->sa_family);
+                }
+                // Currently we use a few internal ones like mDNSInterfaceID_LocalOnly etc. that are negative values (0, -1, -2).
+                else if ((int)if_nametoindex(ifa->ifa_name) <= 0)
+                {
+                    LogMsg("UpdateInterfaceList: if_nametoindex returned zero/negative value for %5s(%d)", ifa->ifa_name, if_nametoindex(ifa->ifa_name));
+                }
+                else
+                {
+                    // Make sure ifa_netmask->sa_family is set correctly
+                    // <rdar://problem/5492035> getifaddrs is returning invalid netmask family for fw0 and vmnet
+                    ifa->ifa_netmask->sa_family = ifa->ifa_addr->sa_family;
+                    int ifru_flags6 = 0;
+
+                    struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+                    if (ifa->ifa_addr->sa_family == AF_INET6 && InfoSocket >= 0)
+                    {
+                        struct in6_ifreq ifr6;
+                        mDNSPlatformMemZero((char *)&ifr6, sizeof(ifr6));
+                        strlcpy(ifr6.ifr_name, ifa->ifa_name, sizeof(ifr6.ifr_name));
+                        ifr6.ifr_addr = *sin6;
+                        if (ioctl(InfoSocket, SIOCGIFAFLAG_IN6, &ifr6) != -1)
+                            ifru_flags6 = ifr6.ifr_ifru.ifru_flags6;
+                        verbosedebugf("%s %.16a %04X %04X", ifa->ifa_name, &sin6->sin6_addr, ifa->ifa_flags, ifru_flags6);
+                    }
+
+                    if (!(ifru_flags6 & (IN6_IFF_NOTREADY | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED | IN6_IFF_TEMPORARY)))
+                    {
+                        if (ifa->ifa_flags & IFF_LOOPBACK)
+                        {
+                            if (ifa->ifa_addr->sa_family == AF_INET) 
+                                v4Loopback = ifa;
+                            else if (sin6->sin6_addr.s6_addr[0] != 0xFD) 
+                                v6Loopback = ifa;
+                        }
+                        else
+                        {
+                            NetworkInterfaceInfoOSX *i = AddInterfaceToList(m, ifa, utc);
+                            if (i && MulticastInterface(i) && i->ifinfo.Advertise)
+                            {
+                                if (ifa->ifa_addr->sa_family == AF_INET) 
+                                    foundav4 = mDNStrue;
+                                else 
+                                    foundav6 = mDNStrue;
+                            }
+                        }
+                    }
+                }
+            }
+        ifa = ifa->ifa_next;
+    }
+
+    // For efficiency, we don't register a loopback interface when other interfaces of that family are available and advertising
+    if (!foundav4 && v4Loopback) AddInterfaceToList(m, v4Loopback, utc);
+    if (!foundav6 && v6Loopback) AddInterfaceToList(m, v6Loopback, utc);
+
+    // Now the list is complete, set the McastTxRx setting for each interface.
+    NetworkInterfaceInfoOSX *i;
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->Exists)
+        {
+            mDNSBool txrx = MulticastInterface(i);
+            if (i->ifinfo.McastTxRx != txrx)
+            {
+                i->ifinfo.McastTxRx = txrx;
+                i->Exists = 2; // State change; need to deregister and reregister this interface
+            }
+        }
+
+    if (InfoSocket >= 0) 
+        close(InfoSocket);
+
+    mDNS_snprintf(defaultname, sizeof(defaultname), "%.*s-%02X%02X%02X%02X%02X%02X", HINFO_HWstring_prefixlen, HINFO_HWstring,
+                  m->PrimaryMAC.b[0], m->PrimaryMAC.b[1], m->PrimaryMAC.b[2], m->PrimaryMAC.b[3], m->PrimaryMAC.b[4], m->PrimaryMAC.b[5]);
+
+    // Set up the nice label
+    domainlabel nicelabel;
+    nicelabel.c[0] = 0;
+    GetUserSpecifiedFriendlyComputerName(&nicelabel);
+    if (nicelabel.c[0] == 0)
+    {
+        debugf("Couldn’t read user-specified Computer Name; using default “%s” instead", defaultname);
+        MakeDomainLabelFromLiteralString(&nicelabel, defaultname);
+    }
+
+    // Set up the RFC 1034-compliant label
+    domainlabel hostlabel;
+    hostlabel.c[0] = 0;
+    GetUserSpecifiedLocalHostName(&hostlabel);
+    if (hostlabel.c[0] == 0)
+    {
+        debugf("Couldn’t read user-specified Local Hostname; using default “%s.local” instead", defaultname);
+        MakeDomainLabelFromLiteralString(&hostlabel, defaultname);
+    }
+
+    mDNSBool namechange = mDNSfalse;
+
+    // We use a case-sensitive comparison here because even though changing the capitalization
+    // of the name alone is not significant to DNS, it's still a change from the user's point of view
+    if (SameDomainLabelCS(m->p->usernicelabel.c, nicelabel.c))
+        debugf("Usernicelabel (%#s) unchanged since last time; not changing m->nicelabel (%#s)", m->p->usernicelabel.c, m->nicelabel.c);
+    else
+    {
+        if (m->p->usernicelabel.c[0])   // Don't show message first time through, when we first read name from prefs on boot
+            LogMsg("User updated Computer Name from “%#s” to “%#s”", m->p->usernicelabel.c, nicelabel.c);
+        m->p->usernicelabel = m->nicelabel = nicelabel;
+        namechange = mDNStrue;
+    }
+
+    if (SameDomainLabelCS(m->p->userhostlabel.c, hostlabel.c))
+        debugf("Userhostlabel (%#s) unchanged since last time; not changing m->hostlabel (%#s)", m->p->userhostlabel.c, m->hostlabel.c);
+    else
+    {
+        if (m->p->userhostlabel.c[0])   // Don't show message first time through, when we first read name from prefs on boot
+            LogMsg("User updated Local Hostname from “%#s” to “%#s”", m->p->userhostlabel.c, hostlabel.c);
+        m->p->userhostlabel = m->hostlabel = hostlabel;
+        mDNS_SetFQDN(m);
+        namechange = mDNStrue;
+    }
+
+#if APPLE_OSX_mDNSResponder
+    if (namechange)     // If either name has changed, we need to tickle our AutoTunnel state machine to update its registered records
+    {
+        DomainAuthInfo *info;
+        for (info = m->AuthInfoList; info; info = info->next)
+            if (info->AutoTunnel) AutoTunnelHostNameChanged(m, info);
+    }
+#endif // APPLE_OSX_mDNSResponder
+
+    return(mStatus_NoError);
+}
+
+// Returns number of leading one-bits in mask: 0-32 for IPv4, 0-128 for IPv6
+// Returns -1 if all the one-bits are not contiguous
+mDNSlocal int CountMaskBits(mDNSAddr *mask)
+{
+    int i = 0, bits = 0;
+    int bytes = mask->type == mDNSAddrType_IPv4 ? 4 : mask->type == mDNSAddrType_IPv6 ? 16 : 0;
+    while (i < bytes)
+    {
+        mDNSu8 b = mask->ip.v6.b[i++];
+        while (b & 0x80) { bits++; b <<= 1; }
+        if (b) return(-1);
+    }
+    while (i < bytes) if (mask->ip.v6.b[i++]) return(-1);
+    return(bits);
+}
+
+// returns count of non-link local V4 addresses registered
+mDNSlocal int SetupActiveInterfaces(mDNS *const m, mDNSs32 utc)
+{
+    NetworkInterfaceInfoOSX *i;
+    int count = 0;
+    for (i = m->p->InterfaceList; i; i = i->next)
+        if (i->Exists)
+        {
+            NetworkInterfaceInfo *const n = &i->ifinfo;
+            NetworkInterfaceInfoOSX *primary = SearchForInterfaceByName(m, i->ifinfo.ifname, AF_UNSPEC);
+            if (!primary) LogMsg("SetupActiveInterfaces ERROR! SearchForInterfaceByName didn't find %s", i->ifinfo.ifname);
+
+            if (i->Registered && i->Registered != primary)  // Sanity check
+            {
+                LogMsg("SetupActiveInterfaces ERROR! n->Registered %p != primary %p", i->Registered, primary);
+                i->Registered = mDNSNULL;
+            }
+
+            if (!i->Registered)
+            {
+                // Note: If i->Registered is set, that means we've called mDNS_RegisterInterface() for this interface,
+                // so we need to make sure we call mDNS_DeregisterInterface() before disposing it.
+                // If i->Registered is NOT set, then we haven't registered it and we should not try to deregister it
+                //
+
+                i->Registered = primary;
+
+                // If i->LastSeen == utc, then this is a brand-new interface, just created, or an interface that never went away.
+                // If i->LastSeen != utc, then this is an old interface, previously seen, that went away for (utc - i->LastSeen) seconds.
+                // If the interface is an old one that went away and came back in less than a minute, then we're in a flapping scenario.
+                i->Occulting = !(i->ifa_flags & IFF_LOOPBACK) && (utc - i->LastSeen > 0 && utc - i->LastSeen < 60);
+
+                // Temporary fix to handle P2P flapping. P2P reuses the scope-id, mac address and the IP address
+                // everytime it creates a new interface. We think it is a duplicate and hence consider it
+                // as flashing and occulting, that is, flapping. If an interface is marked as flapping,
+                // mDNS_RegisterInterface() changes the probe delay from 1/2 second to 5 seconds and
+                // logs a warning message to system.log noting frequent interface transitions.
+                // Same logic applies when IFEF_DIRECTLINK flag is set on the interface.
+                if ((strncmp(i->ifinfo.ifname, "p2p", 3) == 0) || i->ifinfo.DirectLink)
+                {
+                    LogInfo("SetupActiveInterfaces: %s interface registering %s %s", i->ifinfo.ifname,
+                            i->Flashing               ? " (Flashing)"  : "",
+                            i->Occulting              ? " (Occulting)" : "");
+                    mDNS_RegisterInterface(m, n, 0);
+                }
+                else
+                {
+                    mDNS_RegisterInterface(m, n, i->Flashing && i->Occulting);
+                }
+
+                if (!mDNSAddressIsLinkLocal(&n->ip)) count++;
+                LogInfo("SetupActiveInterfaces:   Registered    %5s(%lu) %.6a InterfaceID %p(%p), primary %p, %#a/%d%s%s%s",
+                        i->ifinfo.ifname, i->scope_id, &i->BSSID, i->ifinfo.InterfaceID, i, primary, &n->ip, CountMaskBits(&n->mask),
+                        i->Flashing        ? " (Flashing)"  : "",
+                        i->Occulting       ? " (Occulting)" : "",
+                        n->InterfaceActive ? " (Primary)"   : "");
+
+                if (!n->McastTxRx)
+                    debugf("SetupActiveInterfaces:   No Tx/Rx on   %5s(%lu) %.6a InterfaceID %p %#a", i->ifinfo.ifname, i->scope_id, &i->BSSID, i->ifinfo.InterfaceID, &n->ip);
+                else
+                {
+                    if (i->sa_family == AF_INET)
+                    {
+                        struct ip_mreq imr;
+                        primary->ifa_v4addr.s_addr = n->ip.ip.v4.NotAnInteger;
+                        imr.imr_multiaddr.s_addr = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+                        imr.imr_interface        = primary->ifa_v4addr;
+
+                        // If this is our *first* IPv4 instance for this interface name, we need to do a IP_DROP_MEMBERSHIP first,
+                        // before trying to join the group, to clear out stale kernel state which may be lingering.
+                        // In particular, this happens with removable network interfaces like USB Ethernet adapters -- the kernel has stale state
+                        // from the last time the USB Ethernet adapter was connected, and part of the kernel thinks we've already joined the group
+                        // on that interface (so we get EADDRINUSE when we try to join again) but a different part of the kernel thinks we haven't
+                        // joined the group (so we receive no multicasts). Doing an IP_DROP_MEMBERSHIP before joining seems to flush the stale state.
+                        // Also, trying to make the code leave the group when the adapter is removed doesn't work either,
+                        // because by the time we get the configuration change notification, the interface is already gone,
+                        // so attempts to unsubscribe fail with EADDRNOTAVAIL (errno 49 "Can't assign requested address").
+                        // <rdar://problem/5585972> IP_ADD_MEMBERSHIP fails for previously-connected removable interfaces
+                        if (SearchForInterfaceByName(m, i->ifinfo.ifname, AF_INET) == i)
+                        {
+                            LogInfo("SetupActiveInterfaces: %5s(%lu) Doing precautionary IP_DROP_MEMBERSHIP for %.4a on %.4a", i->ifinfo.ifname, i->scope_id, &imr.imr_multiaddr, &imr.imr_interface);
+                            mStatus err = setsockopt(m->p->permanentsockets.sktv4, IPPROTO_IP, IP_DROP_MEMBERSHIP, &imr, sizeof(imr));
+                            if (err < 0 && (errno != EADDRNOTAVAIL))
+                                LogMsg("setsockopt - IP_DROP_MEMBERSHIP error %d errno %d (%s)", err, errno, strerror(errno));
+                        }
+
+                        LogInfo("SetupActiveInterfaces: %5s(%lu) joining IPv4 mcast group %.4a on %.4a", i->ifinfo.ifname, i->scope_id, &imr.imr_multiaddr, &imr.imr_interface);
+                        mStatus err = setsockopt(m->p->permanentsockets.sktv4, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof(imr));
+                        // Joining same group twice can give "Address already in use" error -- no need to report that
+                        if (err < 0 && (errno != EADDRINUSE))
+                            LogMsg("setsockopt - IP_ADD_MEMBERSHIP error %d errno %d (%s) group %.4a on %.4a", err, errno, strerror(errno), &imr.imr_multiaddr, &imr.imr_interface);
+                    }
+                    if (i->sa_family == AF_INET6)
+                    {
+                        struct ipv6_mreq i6mr;
+                        i6mr.ipv6mr_interface = primary->scope_id;
+                        i6mr.ipv6mr_multiaddr = *(struct in6_addr*)&AllDNSLinkGroup_v6.ip.v6;
+
+                        if (SearchForInterfaceByName(m, i->ifinfo.ifname, AF_INET6) == i)
+                        {
+                            LogInfo("SetupActiveInterfaces: %5s(%lu) Doing precautionary IPV6_LEAVE_GROUP for %.16a on %u", i->ifinfo.ifname, i->scope_id, &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+                            mStatus err = setsockopt(m->p->permanentsockets.sktv6, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &i6mr, sizeof(i6mr));
+                            if (err < 0 && (errno != EADDRNOTAVAIL))
+                                LogMsg("setsockopt - IPV6_LEAVE_GROUP error %d errno %d (%s) group %.16a on %u", err, errno, strerror(errno), &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+                        }
+
+                        LogInfo("SetupActiveInterfaces: %5s(%lu) joining IPv6 mcast group %.16a on %u", i->ifinfo.ifname, i->scope_id, &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+                        mStatus err = setsockopt(m->p->permanentsockets.sktv6, IPPROTO_IPV6, IPV6_JOIN_GROUP, &i6mr, sizeof(i6mr));
+                        // Joining same group twice can give "Address already in use" error -- no need to report that
+                        if (err < 0 && (errno != EADDRINUSE))
+                            LogMsg("setsockopt - IPV6_JOIN_GROUP error %d errno %d (%s) group %.16a on %u", err, errno, strerror(errno), &i6mr.ipv6mr_multiaddr, i6mr.ipv6mr_interface);
+                    }
+                }
+            }
+        }
+
+    return count;
+}
+
+mDNSlocal void MarkAllInterfacesInactive(mDNS *const m, mDNSs32 utc)
+{
+    NetworkInterfaceInfoOSX *i;
+    for (i = m->p->InterfaceList; i; i = i->next)
+    {
+        if (i->Exists) i->LastSeen = utc;
+        i->Exists = mDNSfalse;
+    }
+}
+
+// returns count of non-link local V4 addresses deregistered
+mDNSlocal int ClearInactiveInterfaces(mDNS *const m, mDNSs32 utc)
+{
+    // First pass:
+    // If an interface is going away, then deregister this from the mDNSCore.
+    // We also have to deregister it if the primary interface that it's using for its InterfaceID is going away.
+    // We have to do this because mDNSCore will use that InterfaceID when sending packets, and if the memory
+    // it refers to has gone away we'll crash.
+    NetworkInterfaceInfoOSX *i;
+    int count = 0;
+    for (i = m->p->InterfaceList; i; i = i->next)
+    {
+        // If this interface is no longer active, or its InterfaceID is changing, deregister it
+        NetworkInterfaceInfoOSX *primary = SearchForInterfaceByName(m, i->ifinfo.ifname, AF_UNSPEC);
+        if (i->Registered)
+            if (i->Exists == 0 || i->Exists == 2 || i->Registered != primary)
+            {
+                i->Flashing = !(i->ifa_flags & IFF_LOOPBACK) && (utc - i->AppearanceTime < 60);
+                LogInfo("ClearInactiveInterfaces: Deregistering %5s(%lu) %.6a InterfaceID %p(%p), primary %p, %#a/%d%s%s%s",
+                        i->ifinfo.ifname, i->scope_id, &i->BSSID, i->ifinfo.InterfaceID, i, primary,
+                        &i->ifinfo.ip, CountMaskBits(&i->ifinfo.mask),
+                        i->Flashing               ? " (Flashing)"  : "",
+                        i->Occulting              ? " (Occulting)" : "",
+                        i->ifinfo.InterfaceActive ? " (Primary)"   : "");
+
+                // Temporary fix to handle P2P flapping. P2P reuses the scope-id, mac address and the IP address
+                // everytime it creates a new interface. We think it is a duplicate and hence consider it
+                // as flashing and occulting. The "core" does not flush the cache for this case. This leads to
+                // stale data returned to the application even after the interface is removed. The application
+                // then starts to send data but the new interface is not yet created.
+                // Same logic applies when IFEF_DIRECTLINK flag is set on the interface.
+                if ((strncmp(i->ifinfo.ifname, "p2p", 3) == 0) || i->ifinfo.DirectLink)
+                {
+                    LogInfo("ClearInactiveInterfaces: %s interface deregistering %s %s", i->ifinfo.ifname,
+                            i->Flashing               ? " (Flashing)"  : "",
+                            i->Occulting              ? " (Occulting)" : "");
+                    mDNS_DeregisterInterface(m, &i->ifinfo, 0);
+                }
+                else
+                {
+                    mDNS_DeregisterInterface(m, &i->ifinfo, i->Flashing && i->Occulting);
+                }
+                if (!mDNSAddressIsLinkLocal(&i->ifinfo.ip)) count++;
+                i->Registered = mDNSNULL;
+                // Note: If i->Registered is set, that means we've called mDNS_RegisterInterface() for this interface,
+                // so we need to make sure we call mDNS_DeregisterInterface() before disposing it.
+                // If i->Registered is NOT set, then it's not registered and we should not call mDNS_DeregisterInterface() on it.
+
+                // Caution: If we ever decide to add code here to leave the multicast group, we need to make sure that this
+                // is the LAST representative of this physical interface, or we'll unsubscribe from the group prematurely.
+            }
+    }
+
+    // Second pass:
+    // Now that everything that's going to deregister has done so, we can clean up and free the memory
+    NetworkInterfaceInfoOSX **p = &m->p->InterfaceList;
+    while (*p)
+    {
+        i = *p;
+        // If no longer active, delete interface from list and free memory
+        if (!i->Exists)
+        {
+            if (i->LastSeen == utc) i->LastSeen = utc - 1;
+            mDNSBool delete = (NumCacheRecordsForInterfaceID(m, i->ifinfo.InterfaceID) == 0) && (utc - i->LastSeen >= 60);
+            LogInfo("ClearInactiveInterfaces: %-13s %5s(%lu) %.6a InterfaceID %p(%p) %#a/%d Age %d%s", delete ? "Deleting" : "Holding",
+                    i->ifinfo.ifname, i->scope_id, &i->BSSID, i->ifinfo.InterfaceID, i,
+                    &i->ifinfo.ip, CountMaskBits(&i->ifinfo.mask), utc - i->LastSeen,
+                    i->ifinfo.InterfaceActive ? " (Primary)" : "");
+#if APPLE_OSX_mDNSResponder
+            if (i->BPF_fd >= 0) CloseBPF(i);
+#endif // APPLE_OSX_mDNSResponder
+            if (delete)
+            {
+                *p = i->next;
+                freeL("NetworkInterfaceInfoOSX", i);
+                continue;   // After deleting this object, don't want to do the "p = &i->next;" thing at the end of the loop
+            }
+        }
+        p = &i->next;
+    }
+    return count;
+}
+
+mDNSlocal void AppendDNameListElem(DNameListElem ***List, mDNSu32 uid, domainname *name)
+{
+    DNameListElem *dnle = (DNameListElem*) mallocL("DNameListElem/AppendDNameListElem", sizeof(DNameListElem));
+    if (!dnle) LogMsg("ERROR: AppendDNameListElem: memory exhausted");
+    else
+    {
+        dnle->next = mDNSNULL;
+        dnle->uid  = uid;
+        AssignDomainName(&dnle->name, name);
+        **List = dnle;
+        *List = &dnle->next;
+    }
+}
+
+mDNSlocal int compare_dns_configs(const void *aa, const void *bb)
+{
+    dns_resolver_t *a = *(dns_resolver_t**)aa;
+    dns_resolver_t *b = *(dns_resolver_t**)bb;
+
+    return (a->search_order < b->search_order) ? -1 : (a->search_order == b->search_order) ? 0 : 1;
+}
+
+mDNSlocal void UpdateSearchDomainHash(mDNS *const m, MD5_CTX *sdc, char *domain, mDNSInterfaceID InterfaceID)
+{
+    char *buf = ".";
+    mDNSu32 scopeid = 0;
+    char ifid_buf[16];
+
+    if (domain)
+        buf = domain;
+    //
+    // Hash the search domain name followed by the InterfaceID.
+    // As we have scoped search domains, we also included InterfaceID. If either of them change,
+    // we will detect it. Even if the order of them change, we will detect it.
+    //
+    // Note: We have to handle a few of these tricky cases.
+    //
+    // 1) Current: com, apple.com Changing to: comapple.com
+    // 2) Current: a.com,b.com Changing to a.comb.com
+    // 3) Current: a.com,b.com (ifid 8), Changing to a.com8b.com (ifid 8)
+    // 4) Current: a.com (ifid 12), Changing to a.com1 (ifid: 2)
+    //
+    // There are more variants of the above. The key thing is if we include the null in each case
+    // at the end of name and the InterfaceID, it will prevent a new name (which can't include
+    // NULL as part of the name) to be mistakenly thought of as a old name.
+
+    scopeid = mDNSPlatformInterfaceIndexfromInterfaceID(m, InterfaceID, mDNStrue);
+    // mDNS_snprintf always null terminates
+    if (mDNS_snprintf(ifid_buf, sizeof(ifid_buf), "%u", scopeid) >= sizeof(ifid_buf))
+        LogMsg("UpdateSearchDomainHash: mDNS_snprintf failed for scopeid %u", scopeid);
+
+    LogInfo("UpdateSearchDomainHash: buf %s, ifid_buf %s", buf, ifid_buf);
+    MD5_Update(sdc, buf, strlen(buf) + 1);
+    MD5_Update(sdc, ifid_buf, strlen(ifid_buf) + 1);
+}
+
+mDNSlocal void FinalizeSearchDomainHash(mDNS *const m, MD5_CTX *sdc)
+{
+    mDNSu8 md5_hash[MD5_LEN];
+
+    MD5_Final(md5_hash, sdc);
+
+    if (memcmp(md5_hash, m->SearchDomainsHash, MD5_LEN))
+    {
+        // If the hash is different, either the search domains have changed or
+        // the ordering between them has changed. Restart the questions that
+        // would be affected by this.
+        LogInfo("FinalizeSearchDomains: The hash is different");
+        memcpy(m->SearchDomainsHash, md5_hash, MD5_LEN);
+        RetrySearchDomainQuestions(m);
+    }
+    else { LogInfo("FinalizeSearchDomains: The hash is same"); }
+}
+
+mDNSexport const char *DNSScopeToString(mDNSu32 scope)
+{
+    switch (scope)
+    {
+        case kScopeNone:
+            return "Unscoped";
+        case kScopeInterfaceID:
+            return "InterfaceScoped";
+        case kScopeServiceID:
+            return "ServiceScoped";
+        default:
+            return "Unknown";
+    }
+}
+
+mDNSlocal void ConfigSearchDomains(mDNS *const m, dns_resolver_t *resolver, mDNSInterfaceID interface, mDNSu32 scope, MD5_CTX *sdc)
+{
+    const char *scopeString = DNSScopeToString(scope);
+    int j;
+
+    if (scope != kScopeNone)
+    {
+        LogInfo("ConfigSearchDomains: (%s) Ignoring search domain for Interface %p", scopeString, interface);
+        return;
+    }
+    for (j = 0; j < resolver->n_search; j++)
+    {
+        LogInfo("ConfigSearchDomains: (%s) configuring search list %s", scopeString, resolver->search[j]);
+        UpdateSearchDomainHash(m, sdc, resolver->search[j], NULL);
+        mDNS_AddSearchDomain_CString(resolver->search[j], NULL);
+    }
+}
+
+mDNSlocal mDNSInterfaceID ConfigParseInterfaceID(mDNS *const m, mDNSu32 ifindex)
+{
+    NetworkInterfaceInfoOSX *ni;
+    mDNSInterfaceID interface;
+
+    for (ni = m->p->InterfaceList; ni; ni = ni->next)
+    {
+        if (ni->ifinfo.InterfaceID && ni->scope_id == ifindex) 
+            break;
+    }
+    if (ni != NULL) 
+    {
+        interface = ni->ifinfo.InterfaceID;
+    }
+    else
+    {
+        // In rare circumstances, we could potentially hit this case where we cannot parse the InterfaceID
+        // (see <rdar://problem/13214785>). At this point, we still accept the DNS Config from configd 
+        // Note: We currently ack the whole dns configuration and not individual resolvers or DNS servers. 
+        // As the caller is going to ack the configuration always, we have to add all the DNS servers 
+        // in the configuration. Otherwise, we won't have any DNS servers up until the network change.
+
+        LogMsg("ConfigParseInterfaceID: interface specific index %d not found (interface may not be UP)",ifindex);
+
+        // Set the correct interface from configd before passing this to mDNS_AddDNSServer() below
+        interface = (mDNSInterfaceID)(unsigned long)ifindex;
+    }
+    return interface;
+}
+
+mDNSlocal void ConfigNonUnicastResolver(mDNS *const m, dns_resolver_t *r)
+{
+    char *opt = r->options;
+    domainname d; 
+
+    if (opt && !strncmp(opt, "mdns", strlen(opt)))
+    {
+        if (!MakeDomainNameFromDNSNameString(&d, r->domain))
+        { 
+            LogMsg("ConfigNonUnicastResolver: config->resolver bad domain %s", r->domain); 
+            return;
+        }
+        mDNS_AddMcastResolver(m, &d, mDNSInterface_Any, r->timeout);
+    }
+}
+
+mDNSlocal void ConfigDNSServers(mDNS *const m, dns_resolver_t *r, mDNSInterfaceID interface, mDNSu32 scope, mDNSu16 resGroupID)
+{
+    int n;
+    domainname d;
+    int serviceID = 0;
+    mDNSBool cellIntf = mDNSfalse;
+    mDNSBool scopedDNS = mDNSfalse;
+    mDNSBool reqA, reqAAAA;
+
+    if (!r->domain || !*r->domain) 
+    {
+        d.c[0] = 0;
+    }
+    else if (!MakeDomainNameFromDNSNameString(&d, r->domain))
+    { 
+        LogMsg("ConfigDNSServers: bad domain %s", r->domain); 
+        return;
+    }
+    // Parse the resolver specific attributes that affects all the DNS servers.
+    if (scope == kScopeInterfaceID)
+    {
+        scopedDNS = mDNStrue;
+    }
+    else if (scope == kScopeServiceID)
+    {
+        serviceID = r->service_identifier;
+    }
+
+#if TARGET_OS_IPHONE
+    cellIntf = (r->reach_flags & kSCNetworkReachabilityFlagsIsWWAN) ? mDNStrue : mDNSfalse;
+#endif
+    reqA = (r->flags & DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS ? mDNStrue : mDNSfalse);
+    reqAAAA = (r->flags & DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS ? mDNStrue : mDNSfalse);
+
+    for (n = 0; n < r->n_nameserver; n++)
+    {
+        mDNSAddr saddr;
+        DNSServer *s;
+
+        if (r->nameserver[n]->sa_family != AF_INET && r->nameserver[n]->sa_family != AF_INET6)
+            continue;
+        
+        if (SetupAddr(&saddr, r->nameserver[n]))
+        {
+            LogMsg("ConfigDNSServers: Bad address");
+            continue;
+        }
+        
+        // The timeout value is for all the DNS servers in a given resolver, hence we pass
+        // the timeout value only for the first DNSServer. If we don't have a value in the
+        // resolver, then use the core's default value
+        //
+        // Note: this assumes that when the core picks a list of DNSServers for a question,
+        // it takes the sum of all the timeout values for all DNS servers. By doing this, it
+        // tries all the DNS servers in a specified timeout
+        s = mDNS_AddDNSServer(m, &d, interface, serviceID, &saddr, r->port ? mDNSOpaque16fromIntVal(r->port) : UnicastDNSPort, scope,
+                              (n == 0 ? (r->timeout ? r->timeout : DEFAULT_UDNS_TIMEOUT) : 0), cellIntf, resGroupID, reqA, reqAAAA, mDNStrue);
+        if (s)
+        {
+            LogInfo("ConfigDNSServers(%s): DNS server %#a:%d for domain %##s", DNSScopeToString(scope), &s->addr, mDNSVal16(s->port), d.c);
+        }
+    }
+}
+
+// ConfigResolvers is called for different types of resolvers: Unscoped resolver, Interface scope resolver and
+// Service scope resolvers. This is indicated by the scope argument.
+//
+// "resolver" has entries that should only be used for unscoped questions.
+//
+// "scoped_resolver" has entries that should only be used for Interface scoped question i.e., questions that specify an
+// interface index (q->InterfaceID)
+//
+// "service_specific_resolver" has entries that should be used for Service scoped question i.e., questions that specify
+// a service identifier (q->ServiceID)
+//
+mDNSlocal void ConfigResolvers(mDNS *const m, dns_config_t *config, mDNSu32 scope, mDNSBool setsearch, mDNSBool setservers, MD5_CTX *sdc, mDNSu16 resGroupID)
+{
+    int i;
+    dns_resolver_t **resolver;
+    int nresolvers;
+    const char *scopeString = DNSScopeToString(scope);
+    mDNSInterfaceID interface;
+
+    switch (scope)
+    {
+        case kScopeNone:
+            resolver = config->resolver;
+            nresolvers = config->n_resolver;
+            break;
+        case kScopeInterfaceID:
+            resolver = config->scoped_resolver;
+            nresolvers = config->n_scoped_resolver;
+            break;
+        case kScopeServiceID:
+            resolver = config->service_specific_resolver;
+            nresolvers = config->n_service_specific_resolver;
+            break;
+        default:
+            return;
+    }
+    qsort(resolver, nresolvers, sizeof(dns_resolver_t*), compare_dns_configs);
+
+    for (i = 0; i < nresolvers; i++)
+    {
+        dns_resolver_t *r = resolver[i];
+
+        LogInfo("ConfigResolvers: %s resolver[%d] domain %s n_nameserver %d", scopeString, i, r->domain, r->n_nameserver);
+
+        interface = mDNSInterface_Any;
+
+        // Parse the interface index 
+        if (r->if_index != 0)
+        {
+            interface = ConfigParseInterfaceID(m, r->if_index);
+        }
+
+        if (setsearch)
+        {
+            ConfigSearchDomains(m, resolver[i], interface, scope, sdc);
+            // Parse other scoped resolvers for search lists
+            if (!setservers) 
+                continue;
+        }
+
+        if (r->port == 5353 || r->n_nameserver == 0)
+        {
+            ConfigNonUnicastResolver(m, r);
+        }
+        else
+        {
+            // Each scoped resolver gets its own ID (i.e., they are in their own group) so that responses from the
+            // scoped resolver are not used by other non-scoped or scoped resolvers.
+            if (scope != kScopeNone) 
+                resGroupID++;
+
+            ConfigDNSServers(m, r, interface, scope, resGroupID);
+        }
+    }
+}
+
+#if APPLE_OSX_mDNSResponder
+mDNSlocal mDNSBool QuestionValidForDNSTrigger(DNSQuestion *q)
+{
+    if (QuerySuppressed(q))
+    {
+        debugf("QuestionValidForDNSTrigger: Suppressed: %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+    if (mDNSOpaque16IsZero(q->TargetQID))
+    {
+        debugf("QuestionValidForDNSTrigger: Multicast: %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+    // If we answered using LocalOnly records e.g., /etc/hosts, don't consider that a valid response
+    // for trigger.
+    if (q->LOAddressAnswers)
+    {
+        debugf("QuestionValidForDNSTrigger: LocalOnly answers: %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mDNSfalse;
+    }
+    return mDNStrue;
+}
+#endif
+
+// This function is called if we are not delivering unicast answers to "A" or "AAAA" questions.
+// We set our state appropriately so that if we start receiving answers, trigger the
+// upper layer to retry DNS questions.
+#if APPLE_OSX_mDNSResponder
+mDNSexport void mDNSPlatformUpdateDNSStatus(mDNS *const m, DNSQuestion *q)
+{
+    if (!QuestionValidForDNSTrigger(q))
+        return;
+
+    // Ignore applications that start and stop queries for no reason before we ever talk
+    // to any DNS server.
+    if (!q->triedAllServersOnce)
+    {
+        LogInfo("QuestionValidForDNSTrigger: question %##s (%s) stopped too soon", q->qname.c, DNSTypeName(q->qtype));
+        return;
+    }
+    if (q->qtype == kDNSType_A)
+        m->p->v4answers = 0;
+    if (q->qtype == kDNSType_AAAA)
+        m->p->v6answers = 0;
+    if (!m->p->v4answers || !m->p->v6answers)
+    {
+        LogInfo("mDNSPlatformUpdateDNSStatus: Trigger needed v4 %d, v6 %d, quesiton %##s (%s)", m->p->v4answers, m->p->v6answers, q->qname.c,
+            DNSTypeName(q->qtype));
+    }
+}
+#endif
+
+mDNSlocal void AckConfigd(mDNS *const m, dns_config_t *config)
+{
+    mDNS_CheckLock(m);
+
+    // Acking the configuration triggers configd to reissue the reachability queries
+    m->p->DNSTrigger = NonZeroTime(m->timenow);
+    _dns_configuration_ack(config, "com.apple.mDNSResponder");
+}
+
+// If v4q is non-NULL, it means we have received some answers for "A" type questions
+// If v6q is non-NULL, it means we have received some answers for "AAAA" type questions
+#if APPLE_OSX_mDNSResponder
+mDNSexport void mDNSPlatformTriggerDNSRetry(mDNS *const m, DNSQuestion *v4q, DNSQuestion *v6q)
+{
+    mDNSBool trigger = mDNSfalse;
+    mDNSs32 timenow;
+
+    // Don't send triggers too often.
+    // If we have started delivering answers to questions, we should send a trigger
+    // if the time permits. If we are delivering answers, we should set the state
+    // of v4answers/v6answers to 1 and avoid sending a trigger.  But, we don't know
+    // whether the answers that are being delivered currently is for configd or some
+    // other application. If we set the v4answers/v6answers to 1 and not deliver a trigger,
+    // then we won't deliver the trigger later when it is okay to send one as the
+    // "answers" are already set to 1. Hence, don't affect the state of v4answers and
+    // v6answers if we are not delivering triggers.
+    mDNS_Lock(m);
+    timenow = m->timenow;
+    if (m->p->DNSTrigger && (timenow - m->p->DNSTrigger) < DNS_TRIGGER_INTERVAL)
+    {
+        if (!m->p->v4answers || !m->p->v6answers)
+        {
+            debugf("mDNSPlatformTriggerDNSRetry: not triggering, time since last trigger %d ms, v4ans %d, v6ans %d",
+                (timenow - m->p->DNSTrigger), m->p->v4answers, m->p->v6answers);
+        }
+        mDNS_Unlock(m);
+        return;
+    }
+    mDNS_Unlock(m);
+    if (v4q != NULL && QuestionValidForDNSTrigger(v4q))
+    {
+        int old = m->p->v4answers;
+
+        m->p->v4answers = 1;
+
+        // If there are IPv4 answers now and previously we did not have
+        // any answers, trigger a DNS change so that reachability
+        // can retry the queries again.
+        if (!old)
+        {
+            LogInfo("mDNSPlatformTriggerDNSRetry: Triggering because of IPv4, last trigger %d ms, %##s (%s)", (timenow - m->p->DNSTrigger),
+                v4q->qname.c, DNSTypeName(v4q->qtype));
+            trigger = mDNStrue;
+        }
+    }
+    if (v6q != NULL && QuestionValidForDNSTrigger(v6q))
+    {
+        int old = m->p->v6answers;
+
+        m->p->v6answers = 1;
+        // If there are IPv6 answers now and previously we did not have
+        // any answers, trigger a DNS change so that reachability
+        // can retry the queries again.
+        if (!old)
+        {
+            LogInfo("mDNSPlatformTriggerDNSRetry: Triggering because of IPv6, last trigger %d ms, %##s (%s)", (timenow - m->p->DNSTrigger),
+                v6q->qname.c, DNSTypeName(v6q->qtype));
+            trigger = mDNStrue;
+        }
+    }
+    if (trigger)
+    {
+        dns_config_t *config = dns_configuration_copy();
+        if (config)
+        {
+            mDNS_Lock(m);
+            AckConfigd(m, config);
+            mDNS_Unlock(m);
+            dns_configuration_free(config);
+        }
+        else
+        {
+            LogMsg("mDNSPlatformTriggerDNSRetry: ERROR!! configd did not return config");
+        }
+    }
+}
+
+mDNSlocal void SetupActiveDirectoryDomain(dns_config_t *config)
+{
+    // Record the so-called "primary" domain, which we use as a hint to tell if the user is on a network set up
+    // by someone using Microsoft Active Directory using "local" as a private internal top-level domain
+    if (config->n_resolver && config->resolver[0]->domain && config->resolver[0]->n_nameserver &&
+        config->resolver[0]->nameserver[0])
+    {
+        MakeDomainNameFromDNSNameString(&ActiveDirectoryPrimaryDomain, config->resolver[0]->domain);
+    }
+    else
+    {
+         ActiveDirectoryPrimaryDomain.c[0] = 0;
+    }
+
+    //MakeDomainNameFromDNSNameString(&ActiveDirectoryPrimaryDomain, "test.local");
+    ActiveDirectoryPrimaryDomainLabelCount = CountLabels(&ActiveDirectoryPrimaryDomain);
+    if (config->n_resolver && config->resolver[0]->n_nameserver &&
+        SameDomainName(SkipLeadingLabels(&ActiveDirectoryPrimaryDomain, ActiveDirectoryPrimaryDomainLabelCount - 1), &localdomain))
+    {
+        SetupAddr(&ActiveDirectoryPrimaryDomainServer, config->resolver[0]->nameserver[0]);
+    }
+    else
+    {
+        AssignDomainName(&ActiveDirectoryPrimaryDomain, (const domainname *)"");
+        ActiveDirectoryPrimaryDomainLabelCount = 0;
+        ActiveDirectoryPrimaryDomainServer = zeroAddr;
+    }
+}
+#endif
+
+mDNSlocal void SetupDDNSDomains(domainname *const fqdn, DNameListElem **RegDomains, DNameListElem **BrowseDomains)
+{
+    int i;
+    char buf[MAX_ESCAPED_DOMAIN_NAME];  // Max legal C-string name, including terminating NUL
+    domainname d;
+
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:mDNSPlatformSetDNSConfig"), NULL, NULL);
+    if (!store)
+    {
+        LogMsg("SetupDDNSDomains: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+    }
+    else
+    {
+        CFDictionaryRef ddnsdict = SCDynamicStoreCopyValue(store, NetworkChangedKey_DynamicDNS);
+        if (ddnsdict)
+        {
+            if (fqdn)
+            {
+                CFArrayRef fqdnArray = CFDictionaryGetValue(ddnsdict, CFSTR("HostNames"));
+                if (fqdnArray && CFArrayGetCount(fqdnArray) > 0)
+                {
+                    // for now, we only look at the first array element.  if we ever support multiple configurations, we will walk the list
+                    CFDictionaryRef fqdnDict = CFArrayGetValueAtIndex(fqdnArray, 0);
+                    if (fqdnDict && DictionaryIsEnabled(fqdnDict))
+                    {
+                        CFStringRef name = CFDictionaryGetValue(fqdnDict, CFSTR("Domain"));
+                        if (name)
+                        {
+                            if (!CFStringGetCString(name, buf, sizeof(buf), kCFStringEncodingUTF8) ||
+                                !MakeDomainNameFromDNSNameString(fqdn, buf) || !fqdn->c[0])
+                                LogMsg("GetUserSpecifiedDDNSConfig SCDynamicStore bad DDNS host name: %s", buf[0] ? buf : "(unknown)");
+                            else debugf("GetUserSpecifiedDDNSConfig SCDynamicStore DDNS host name: %s", buf);
+                        }
+                    }
+                }
+            }
+
+            if (RegDomains)
+            {
+                CFArrayRef regArray = CFDictionaryGetValue(ddnsdict, CFSTR("RegistrationDomains"));
+                if (regArray && CFArrayGetCount(regArray) > 0)
+                {
+                    CFDictionaryRef regDict = CFArrayGetValueAtIndex(regArray, 0);
+                    if (regDict && DictionaryIsEnabled(regDict))
+                    {
+                        CFStringRef name = CFDictionaryGetValue(regDict, CFSTR("Domain"));
+                        if (name)
+                        {
+                            if (!CFStringGetCString(name, buf, sizeof(buf), kCFStringEncodingUTF8) ||
+                                !MakeDomainNameFromDNSNameString(&d, buf) || !d.c[0])
+                                LogMsg("GetUserSpecifiedDDNSConfig SCDynamicStore bad DDNS registration domain: %s", buf[0] ? buf : "(unknown)");
+                            else
+                            {
+                                debugf("GetUserSpecifiedDDNSConfig SCDynamicStore DDNS registration domain: %s", buf);
+                                AppendDNameListElem(&RegDomains, 0, &d);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (BrowseDomains)
+            {
+                CFArrayRef browseArray = CFDictionaryGetValue(ddnsdict, CFSTR("BrowseDomains"));
+                if (browseArray)
+                {
+                    for (i = 0; i < CFArrayGetCount(browseArray); i++)
+                    {
+                        CFDictionaryRef browseDict = CFArrayGetValueAtIndex(browseArray, i);
+                        if (browseDict && DictionaryIsEnabled(browseDict))
+                        {
+                            CFStringRef name = CFDictionaryGetValue(browseDict, CFSTR("Domain"));
+                            if (name)
+                            {
+                                if (!CFStringGetCString(name, buf, sizeof(buf), kCFStringEncodingUTF8) ||
+                                    !MakeDomainNameFromDNSNameString(&d, buf) || !d.c[0])
+                                    LogMsg("GetUserSpecifiedDDNSConfig SCDynamicStore bad DDNS browsing domain: %s", buf[0] ? buf : "(unknown)");
+                                else
+                                {
+                                    debugf("GetUserSpecifiedDDNSConfig SCDynamicStore DDNS browsing domain: %s", buf);
+                                    AppendDNameListElem(&BrowseDomains, 0, &d);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            CFRelease(ddnsdict);
+        }
+
+        if (RegDomains)
+        {
+            CFDictionaryRef btmm = SCDynamicStoreCopyValue(store, NetworkChangedKey_BackToMyMac);
+            if (btmm)
+            {
+                CFIndex size = CFDictionaryGetCount(btmm);
+                const void *key[size];
+                const void *val[size];
+                CFDictionaryGetKeysAndValues(btmm, key, val);
+                for (i = 0; i < size; i++)
+                {
+                    LogInfo("BackToMyMac %d", i);
+                    if (!CFStringGetCString(key[i], buf, sizeof(buf), kCFStringEncodingUTF8))
+                        LogMsg("Can't read BackToMyMac %d key %s", i, buf);
+                    else
+                    {
+                        mDNSu32 uid = atoi(buf);
+                        if (!CFStringGetCString(val[i], buf, sizeof(buf), kCFStringEncodingUTF8))
+                            LogMsg("Can't read BackToMyMac %d val %s", i, buf);
+                        else if (MakeDomainNameFromDNSNameString(&d, buf) && d.c[0])
+                        {
+                            LogInfo("BackToMyMac %d %d %##s", i, uid, d.c);
+                            AppendDNameListElem(&RegDomains, uid, &d);
+                        }
+                    }
+                }
+                CFRelease(btmm);
+            }
+        }
+        CFRelease(store);
+    }
+}
+
+// Returns mDNSfalse, if it does not set the configuration i.e., if the DNS configuration did not change
+mDNSexport mDNSBool mDNSPlatformSetDNSConfig(mDNS *const m, mDNSBool setservers, mDNSBool setsearch, domainname *const fqdn,
+    DNameListElem **RegDomains, DNameListElem **BrowseDomains, mDNSBool ackConfig)
+{
+    MD5_CTX sdc;    // search domain context
+    static mDNSu16 resolverGroupID = 0;
+
+    // Need to set these here because we need to do this even if SCDynamicStoreCreate() or SCDynamicStoreCopyValue() below don't succeed
+    if (fqdn) fqdn->c[0]      = 0;
+    if (RegDomains   ) *RegDomains     = NULL;
+    if (BrowseDomains) *BrowseDomains  = NULL;
+
+    LogInfo("mDNSPlatformSetDNSConfig:%s%s%s%s%s",
+            setservers    ? " setservers"    : "",
+            setsearch     ? " setsearch"     : "",
+            fqdn          ? " fqdn"          : "",
+            RegDomains    ? " RegDomains"    : "",
+            BrowseDomains ? " BrowseDomains" : "");
+
+    if (setsearch) MD5_Init(&sdc);
+
+    // Add the inferred address-based configuration discovery domains
+    // (should really be in core code I think, not platform-specific)
+    if (setsearch)
+    {
+        struct ifaddrs *ifa = mDNSNULL;
+        struct sockaddr_in saddr;
+        mDNSPlatformMemZero(&saddr, sizeof(saddr));
+        saddr.sin_len = sizeof(saddr);
+        saddr.sin_family = AF_INET;
+        saddr.sin_port = 0;
+        saddr.sin_addr.s_addr = *(in_addr_t *)&m->Router.ip.v4;
+
+        // Don't add any reverse-IP search domains if doing the WAB bootstrap queries would cause dial-on-demand connection initiation
+        if (!AddrRequiresPPPConnection((struct sockaddr *)&saddr)) ifa =  myGetIfAddrs(1);
+
+        while (ifa)
+        {
+            mDNSAddr a, n;
+            char buf[64];
+
+            if (ifa->ifa_addr->sa_family == AF_INET &&
+                ifa->ifa_netmask                    &&
+                !(ifa->ifa_flags & IFF_LOOPBACK)    &&
+                !SetupAddr(&a, ifa->ifa_addr)       &&
+                !mDNSv4AddressIsLinkLocal(&a.ip.v4)  )
+            {
+                // Apparently it's normal for the sa_family of an ifa_netmask to sometimes be incorrect, so we explicitly fix it here before calling SetupAddr
+                // <rdar://problem/5492035> getifaddrs is returning invalid netmask family for fw0 and vmnet
+                ifa->ifa_netmask->sa_family = ifa->ifa_addr->sa_family;     // Make sure ifa_netmask->sa_family is set correctly
+                SetupAddr(&n, ifa->ifa_netmask);
+                // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+                mDNS_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa.", a.ip.v4.b[3] & n.ip.v4.b[3],
+                              a.ip.v4.b[2] & n.ip.v4.b[2],
+                              a.ip.v4.b[1] & n.ip.v4.b[1],
+                              a.ip.v4.b[0] & n.ip.v4.b[0]);
+                UpdateSearchDomainHash(m, &sdc, buf, NULL);
+                mDNS_AddSearchDomain_CString(buf, mDNSNULL);
+            }
+            ifa = ifa->ifa_next;
+        }
+    }
+
+#ifndef MDNS_NO_DNSINFO
+    if (setservers || setsearch)
+    {
+        dns_config_t *config = dns_configuration_copy();
+        if (!config)
+        {
+            // When running on 10.3 (build 7xxx) and earlier, we don't expect dns_configuration_copy() to succeed
+            // On 10.4, calls to dns_configuration_copy() early in the boot process often fail.
+            // Apparently this is expected behaviour -- "not a bug".
+            // Accordingly, we suppress syslog messages for the first three minutes after boot.
+            // If we are still getting failures after three minutes, then we log them.
+            if ((mDNSu32)mDNSPlatformRawTime() > (mDNSu32)(mDNSPlatformOneSecond * 180))
+                LogMsg("mDNSPlatformSetDNSConfig: Error: dns_configuration_copy returned NULL");
+        }
+        else
+        {
+            LogInfo("mDNSPlatformSetDNSConfig: config->n_resolver = %d, generation %llu", config->n_resolver, config->generation);
+            if (m->p->LastConfigGeneration == config->generation)
+            {
+                LogInfo("mDNSPlatformSetDNSConfig: generation number %llu same, not processing", config->generation);
+                dns_configuration_free(config);
+                SetupDDNSDomains(fqdn, RegDomains, BrowseDomains);
+                return mDNSfalse;
+            }
+#if APPLE_OSX_mDNSResponder
+            SetupActiveDirectoryDomain(config);
+#endif
+
+            // With scoped DNS, we don't want to answer a non-scoped question using a scoped cache entry
+            // and vice-versa. As we compare resolverGroupID for matching cache entry with question, we need
+            // to make sure that they don't match. We ensure this by always bumping up resolverGroupID between
+            // the two calls to ConfigResolvers DNSServers for scoped and non-scoped can never have the
+            // same resolverGroupID.
+            //
+            // All non-scoped resolvers use the same resolverGroupID i.e, we treat them all equally.
+            ConfigResolvers(m, config, kScopeNone, setsearch, setservers, &sdc, ++resolverGroupID);
+            resolverGroupID += config->n_resolver;
+
+            ConfigResolvers(m, config, kScopeInterfaceID, setsearch, setservers, &sdc, resolverGroupID);
+            resolverGroupID += config->n_scoped_resolver;
+
+            ConfigResolvers(m, config, kScopeServiceID, setsearch, setservers, &sdc, resolverGroupID);
+
+            // Acking provides a hint that we processed this current configuration and
+            // we will use that from now on, assuming we don't get another one immediately
+            // after we return from here.
+            if (ackConfig)
+            {
+                // Note: We have to set the generation number here when we are acking.
+                // For every DNS configuration change, we do the following:
+                //
+                // 1) Copy dns configuration, handle search domains change
+                // 2) Copy dns configuration, handle dns server change
+                //
+                // If we update the generation number at step (1), we won't process the
+                // DNS servers the second time because generation number would be the same.
+                // As we ack only when we process dns servers, we set the generation number
+                // during acking.
+                m->p->LastConfigGeneration = config->generation;
+                LogInfo("mDNSPlatformSetDNSConfig: Acking configuration setservers %d, setsearch %d", setservers, setsearch);
+                AckConfigd(m, config);
+            }
+            dns_configuration_free(config);
+            if (setsearch) FinalizeSearchDomainHash(m, &sdc);
+            setservers = mDNSfalse;  // Done these now -- no need to fetch the same data from SCDynamicStore
+            setsearch  = mDNSfalse;
+        }
+    }
+#endif // MDNS_NO_DNSINFO
+    SetupDDNSDomains(fqdn, RegDomains, BrowseDomains);
+    return mDNStrue;
+}
+
+
+mDNSexport mStatus mDNSPlatformGetPrimaryInterface(mDNS *const m, mDNSAddr *v4, mDNSAddr *v6, mDNSAddr *r)
+{
+    char buf[256];
+    (void)m; // Unused
+
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:mDNSPlatformGetPrimaryInterface"), NULL, NULL);
+    if (!store)
+        LogMsg("mDNSPlatformGetPrimaryInterface: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+    else
+    {
+        CFDictionaryRef dict = SCDynamicStoreCopyValue(store, NetworkChangedKey_IPv4);
+        if (dict)
+        {
+            r->type  = mDNSAddrType_IPv4;
+            r->ip.v4 = zerov4Addr;
+            CFStringRef string = CFDictionaryGetValue(dict, kSCPropNetIPv4Router);
+            if (string)
+            {
+                if (!CFStringGetCString(string, buf, 256, kCFStringEncodingUTF8))
+                    LogMsg("Could not convert router to CString");
+                else
+                {
+                    struct sockaddr_in saddr;
+                    saddr.sin_len = sizeof(saddr);
+                    saddr.sin_family = AF_INET;
+                    saddr.sin_port = 0;
+                    inet_aton(buf, &saddr.sin_addr);
+
+                    *(in_addr_t *)&r->ip.v4 = saddr.sin_addr.s_addr;
+                }
+            }
+
+            string = CFDictionaryGetValue(dict, kSCDynamicStorePropNetPrimaryInterface);
+            if (string)
+            {
+                mDNSBool HavePrimaryGlobalv6 = mDNSfalse;  // does the primary interface have a global v6 address?
+                struct ifaddrs *ifa = myGetIfAddrs(1);
+
+                *v4 = *v6 = zeroAddr;
+
+                if (!CFStringGetCString(string, buf, 256, kCFStringEncodingUTF8)) { LogMsg("Could not convert router to CString"); goto exit; }
+
+                // find primary interface in list
+                while (ifa && (mDNSIPv4AddressIsZero(v4->ip.v4) || mDNSv4AddressIsLinkLocal(&v4->ip.v4) || !HavePrimaryGlobalv6))
+                {
+                    mDNSAddr tmp6 = zeroAddr;
+                    if (!strcmp(buf, ifa->ifa_name))
+                    {
+                        if (ifa->ifa_addr->sa_family == AF_INET)
+                        {
+                            if (mDNSIPv4AddressIsZero(v4->ip.v4) || mDNSv4AddressIsLinkLocal(&v4->ip.v4)) SetupAddr(v4, ifa->ifa_addr);
+                        }
+                        else if (ifa->ifa_addr->sa_family == AF_INET6)
+                        {
+                            SetupAddr(&tmp6, ifa->ifa_addr);
+                            if (tmp6.ip.v6.b[0] >> 5 == 1)   // global prefix: 001
+                            { HavePrimaryGlobalv6 = mDNStrue; *v6 = tmp6; }
+                        }
+                    }
+                    else
+                    {
+                        // We'll take a V6 address from the non-primary interface if the primary interface doesn't have a global V6 address
+                        if (!HavePrimaryGlobalv6 && ifa->ifa_addr->sa_family == AF_INET6 && !v6->ip.v6.b[0])
+                        {
+                            SetupAddr(&tmp6, ifa->ifa_addr);
+                            if (tmp6.ip.v6.b[0] >> 5 == 1) *v6 = tmp6;
+                        }
+                    }
+                    ifa = ifa->ifa_next;
+                }
+
+                // Note that while we advertise v6, we still require v4 (possibly NAT'd, but not link-local) because we must use
+                // V4 to communicate w/ our DNS server
+            }
+
+exit:
+            CFRelease(dict);
+        }
+        CFRelease(store);
+    }
+    return mStatus_NoError;
+}
+
+mDNSexport void mDNSPlatformDynDNSHostNameStatusChanged(const domainname *const dname, const mStatus status)
+{
+    LogInfo("mDNSPlatformDynDNSHostNameStatusChanged %d %##s", status, dname->c);
+    char uname[MAX_ESCAPED_DOMAIN_NAME];    // Max legal C-string name, including terminating NUL
+    ConvertDomainNameToCString(dname, uname);
+
+    char *p = uname;
+    while (*p)
+    {
+        *p = tolower(*p);
+        if (!(*(p+1)) && *p == '.') *p = 0; // if last character, strip trailing dot
+        p++;
+    }
+
+    // We need to make a CFDictionary called "State:/Network/DynamicDNS" containing (at present) a single entity.
+    // That single entity is a CFDictionary with name "HostNames".
+    // The "HostNames" CFDictionary contains a set of name/value pairs, where the each name is the FQDN
+    // in question, and the corresponding value is a CFDictionary giving the state for that FQDN.
+    // (At present we only support a single FQDN, so this dictionary holds just a single name/value pair.)
+    // The CFDictionary for each FQDN holds (at present) a single name/value pair,
+    // where the name is "Status" and the value is a CFNumber giving an errror code (with zero meaning success).
+
+    const CFStringRef StateKeys [1] = { CFSTR("HostNames") };
+    const CFStringRef HostKeys  [1] = { CFStringCreateWithCString(NULL, uname, kCFStringEncodingUTF8) };
+    const CFStringRef StatusKeys[1] = { CFSTR("Status") };
+    if (!HostKeys[0]) LogMsg("SetDDNSNameStatus: CFStringCreateWithCString(%s) failed", uname);
+    else
+    {
+        const CFNumberRef StatusVals[1] = { CFNumberCreate(NULL, kCFNumberSInt32Type, &status) };
+        if (!StatusVals[0]) LogMsg("SetDDNSNameStatus: CFNumberCreate(%d) failed", status);
+        else
+        {
+            const CFDictionaryRef HostVals[1] = { CFDictionaryCreate(NULL, (void*)StatusKeys, (void*)StatusVals, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) };
+            if (HostVals[0])
+            {
+                const CFDictionaryRef StateVals[1] = { CFDictionaryCreate(NULL, (void*)HostKeys, (void*)HostVals, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) };
+                if (StateVals[0])
+                {
+                    CFDictionaryRef StateDict = CFDictionaryCreate(NULL, (void*)StateKeys, (void*)StateVals, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+                    if (StateDict)
+                    {
+                        mDNSDynamicStoreSetConfig(kmDNSDynamicConfig, mDNSNULL, StateDict);
+                        CFRelease(StateDict);
+                    }
+                    CFRelease(StateVals[0]);
+                }
+                CFRelease(HostVals[0]);
+            }
+            CFRelease(StatusVals[0]);
+        }
+        CFRelease(HostKeys[0]);
+    }
+}
+
+#if APPLE_OSX_mDNSResponder
+#if !NO_AWACS
+
+// checks whether a domain is present in Setup:/Network/BackToMyMac. Just because there is a key in the
+// keychain for a domain, it does not become a valid BTMM domain. If things get inconsistent, this will
+// help catch it
+mDNSlocal mDNSBool IsBTMMDomain(domainname *d)
+{
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:IsBTMMDomain"), NULL, NULL);
+    if (!store)
+    {
+        LogMsg("IsBTMMDomain: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+        return mDNSfalse;
+    }
+    CFDictionaryRef btmm = SCDynamicStoreCopyValue(store, NetworkChangedKey_BackToMyMac);
+    if (btmm)
+    {
+        CFIndex size = CFDictionaryGetCount(btmm);
+        char buf[MAX_ESCAPED_DOMAIN_NAME];  // Max legal C-string name, including terminating NUL
+        const void *key[size];
+        const void *val[size];
+        domainname dom;
+        int i;
+        CFDictionaryGetKeysAndValues(btmm, key, val);
+        for (i = 0; i < size; i++)
+        {
+            LogInfo("BackToMyMac %d", i);
+            if (!CFStringGetCString(key[i], buf, sizeof(buf), kCFStringEncodingUTF8))
+                LogMsg("IsBTMMDomain: ERROR!! Can't read BackToMyMac %d key %s", i, buf);
+            else
+            {
+                mDNSu32 uid = atoi(buf);
+                if (!CFStringGetCString(val[i], buf, sizeof(buf), kCFStringEncodingUTF8))
+                    LogMsg("IsBTMMDomain: Can't read BackToMyMac %d val %s", i, buf);
+                else if (MakeDomainNameFromDNSNameString(&dom, buf) && dom.c[0])
+                {
+                    if (SameDomainName(&dom, d))
+                    {
+                        LogInfo("IsBTMMDomain: Domain %##s is a btmm domain, uid %u", d->c, uid);
+                        CFRelease(btmm);
+                        CFRelease(store);
+                        return mDNStrue;
+                    }
+                }
+            }
+        }
+        CFRelease(btmm);
+    }
+    CFRelease(store);
+    LogInfo("IsBTMMDomain: Domain %##s not a btmm domain", d->c);
+    return mDNSfalse;
+}
+
+// Appends data to the buffer
+mDNSlocal int AddOneItem(char *buf, int bufsz, char *data, int *currlen)
+{
+    int len;
+
+    len = strlcpy(buf + *currlen, data, bufsz - *currlen);
+    if (len >= (bufsz - *currlen))
+    {
+        // if we have exceeded the space in buf, it has already been NULL terminated
+        // and we have nothing more to do. Set currlen to the last byte so that the caller
+        // knows to do the right thing
+        LogMsg("AddOneItem: Exceeded the max buffer size currlen %d, len %d", *currlen, len);
+        *currlen = bufsz - 1;
+        return -1;
+    }
+    else { (*currlen) += len; }
+
+    buf[*currlen] = ',';
+    if (*currlen >= bufsz)
+    {
+        LogMsg("AddOneItem: ERROR!! How can currlen be %d", *currlen);
+        *currlen = bufsz - 1;
+        buf[*currlen] = 0;
+        return -1;
+    }
+    // if we have filled up the buffer exactly, then there is no more work to do
+    if (*currlen == bufsz - 1) { buf[*currlen] = 0; return -1; }
+    (*currlen)++;
+    return *currlen;
+}
+
+// If we have at least one BTMM domain, then trigger the connection to the relay. If we have no
+// BTMM domains, then bring down the connection to the relay.
+mDNSlocal void UpdateBTMMRelayConnection(mDNS *const m)
+{
+    DomainAuthInfo *BTMMDomain = mDNSNULL;
+    DomainAuthInfo *FoundInList;
+    static mDNSBool AWACSDConnected = mDNSfalse;
+    char AllUsers[1024];    // maximum size of mach message
+    char AllPass[1024];     // maximum size of mach message
+    char username[MAX_DOMAIN_LABEL + 1];
+    int currulen = 0;
+    int currplen = 0;
+
+    // if a domain is being deleted, we want to send a disconnect. If we send a disconnect now,
+    // we may not be able to send the dns queries over the relay connection which may be needed
+    // for sending the deregistrations. Hence, we need to delay sending the disconnect. But we
+    // need to make sure that we send the disconnect before attempting the next connect as the
+    // awacs connections are redirected based on usernames.
+    //
+    // For now we send a disconnect immediately. When we start sending dns queries over the relay
+    // connection, we will need to fix this.
+
+    for (FoundInList = m->AuthInfoList; FoundInList; FoundInList = FoundInList->next)
+        if (!FoundInList->deltime && FoundInList->AutoTunnel && IsBTMMDomain(&FoundInList->domain))
+        {
+            // We need the passwd from the first domain.
+            BTMMDomain = FoundInList;
+            ConvertDomainLabelToCString_unescaped((domainlabel *)BTMMDomain->domain.c, username);
+            LogInfo("UpdateBTMMRelayConnection: user %s for domain %##s", username, BTMMDomain->domain.c);
+            if (AddOneItem(AllUsers, sizeof(AllUsers), username, &currulen) == -1) break;
+            if (AddOneItem(AllPass, sizeof(AllPass), BTMMDomain->b64keydata, &currplen) == -1) break;
+        }
+
+    if (BTMMDomain)
+    {
+        // In the normal case (where we neither exceed the buffer size nor write bytes that
+        // fit exactly into the buffer), currulen/currplen should be a different size than
+        // (AllUsers - 1) / (AllPass - 1). In that case, we need to override the "," with a NULL byte.
+
+        if (currulen != (int)(sizeof(AllUsers) - 1)) AllUsers[currulen - 1] = 0;
+        if (currplen != (int)(sizeof(AllPass) - 1)) AllPass[currplen - 1] = 0;
+
+        LogInfo("UpdateBTMMRelayConnection: AWS_Connect for user %s", AllUsers);
+        AWACS_Connect(AllUsers, AllPass, "hello.connectivity.me.com");
+        AWACSDConnected = mDNStrue;
+    }
+    else
+    {
+        // Disconnect only if we connected previously
+        if (AWACSDConnected)
+        {
+            LogInfo("UpdateBTMMRelayConnection: AWS_Disconnect");
+            AWACS_Disconnect();
+            AWACSDConnected = mDNSfalse;
+        }
+        else LogInfo("UpdateBTMMRelayConnection: Not calling AWS_Disconnect");
+    }
+}
+#else
+mDNSlocal void UpdateBTMMRelayConnection(mDNS *const m)
+{
+    (void) m; // Unused
+    LogInfo("UpdateBTMMRelayConnection: AWACS connection not started, no AWACS library");
+}
+#endif // ! NO_AWACS
+
+mDNSlocal void ProcessConndConfigChanges(mDNS *const m);
+
+#endif // APPLE_OSX_mDNSResponder
+
+// MUST be called holding the lock
+mDNSexport void SetDomainSecrets(mDNS *m)
+{
+#ifdef NO_SECURITYFRAMEWORK
+        (void) m;
+    LogMsg("Note: SetDomainSecrets: no keychain support");
+#else
+    mDNSBool haveAutoTunnels = mDNSfalse;
+
+    LogInfo("SetDomainSecrets");
+
+    // Rather than immediately deleting all keys now, we mark them for deletion in ten seconds.
+    // In the case where the user simultaneously removes their DDNS host name and the key
+    // for it, this gives mDNSResponder ten seconds to gracefully delete the name from the
+    // server before it loses access to the necessary key. Otherwise, we'd leave orphaned
+    // address records behind that we no longer have permission to delete.
+    DomainAuthInfo *ptr;
+    for (ptr = m->AuthInfoList; ptr; ptr = ptr->next)
+        ptr->deltime = NonZeroTime(m->timenow + mDNSPlatformOneSecond*10);
+
+#if APPLE_OSX_mDNSResponder
+    {
+        // Mark all TunnelClients for deletion
+        ClientTunnel *client;
+        for (client = m->TunnelClients; client; client = client->next)
+        {
+            LogInfo("SetDomainSecrets: tunnel to %##s marked for deletion", client->dstname.c);
+            client->MarkedForDeletion = mDNStrue;
+        }
+    }
+#endif // APPLE_OSX_mDNSResponder
+
+    // String Array used to write list of private domains to Dynamic Store
+    CFMutableArrayRef sa = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+    if (!sa) { LogMsg("SetDomainSecrets: CFArrayCreateMutable failed"); return; }
+    CFIndex i;
+    CFDataRef data = NULL;
+    const int itemsPerEntry = 4; // domain name, key name, key value, Name value
+    CFArrayRef secrets = NULL;
+    int err = mDNSKeychainGetSecrets(&secrets);
+    if (err || !secrets)
+        LogMsg("SetDomainSecrets: mDNSKeychainGetSecrets failed error %d CFArrayRef %p", err, secrets);
+    else
+    {
+        CFIndex ArrayCount = CFArrayGetCount(secrets);
+        // Iterate through the secrets
+        for (i = 0; i < ArrayCount; ++i)
+        {
+            mDNSBool AutoTunnel;
+            int j, offset;
+            CFArrayRef entry = CFArrayGetValueAtIndex(secrets, i);
+            if (CFArrayGetTypeID() != CFGetTypeID(entry) || itemsPerEntry != CFArrayGetCount(entry))
+            { LogMsg("SetDomainSecrets: malformed entry %d, itemsPerEntry %d", i, itemsPerEntry); continue; }
+            for (j = 0; j < CFArrayGetCount(entry); ++j)
+                if (CFDataGetTypeID() != CFGetTypeID(CFArrayGetValueAtIndex(entry, j)))
+                { LogMsg("SetDomainSecrets: malformed entry item %d", j); continue; }
+
+            // The names have already been vetted by the helper, but checking them again here helps humans and automated tools verify correctness
+
+            // Max legal domainname as C-string, including space for btmmprefix and terminating NUL
+            // Get DNS domain this key is for (kmDNSKcWhere)
+            char stringbuf[MAX_ESCAPED_DOMAIN_NAME + sizeof(btmmprefix)];
+            data = CFArrayGetValueAtIndex(entry, kmDNSKcWhere);
+            if (CFDataGetLength(data) >= (int)sizeof(stringbuf))
+            { LogMsg("SetDomainSecrets: Bad kSecServiceItemAttr length %d", CFDataGetLength(data)); continue; }
+            CFDataGetBytes(data, CFRangeMake(0, CFDataGetLength(data)), (UInt8 *)stringbuf);
+            stringbuf[CFDataGetLength(data)] = '\0';
+
+            AutoTunnel = mDNSfalse;
+            offset = 0;
+            if (!strncmp(stringbuf, dnsprefix, strlen(dnsprefix)))
+                offset = strlen(dnsprefix);
+            else if (!strncmp(stringbuf, btmmprefix, strlen(btmmprefix)))
+            {
+                AutoTunnel = mDNStrue;
+                offset = strlen(btmmprefix);
+            }
+            domainname domain;
+            if (!MakeDomainNameFromDNSNameString(&domain, stringbuf + offset)) { LogMsg("SetDomainSecrets: bad key domain %s", stringbuf); continue; }
+
+            // Get key name (kmDNSKcAccount)
+            data = CFArrayGetValueAtIndex(entry, kmDNSKcAccount);
+            if (CFDataGetLength(data) >= (int)sizeof(stringbuf))
+            { LogMsg("SetDomainSecrets: Bad kSecAccountItemAttr length %d", CFDataGetLength(data)); continue; }
+            CFDataGetBytes(data, CFRangeMake(0,CFDataGetLength(data)), (UInt8 *)stringbuf);
+            stringbuf[CFDataGetLength(data)] = '\0';
+
+            domainname keyname;
+            if (!MakeDomainNameFromDNSNameString(&keyname, stringbuf)) { LogMsg("SetDomainSecrets: bad key name %s", stringbuf); continue; }
+
+            // Get key data (kmDNSKcKey)
+            data = CFArrayGetValueAtIndex(entry, kmDNSKcKey);
+            if (CFDataGetLength(data) >= (int)sizeof(stringbuf))
+            { 
+                LogMsg("SetDomainSecrets: Shared secret too long: %d", CFDataGetLength(data));
+                continue;
+            }
+            CFDataGetBytes(data, CFRangeMake(0, CFDataGetLength(data)), (UInt8 *)stringbuf);
+            stringbuf[CFDataGetLength(data)] = '\0';    // mDNS_SetSecretForDomain requires NULL-terminated C string for key
+
+            // Get the Name of the keychain entry (kmDNSKcName) host or host:port
+            // The hostname also has the port number and ":". It should take a maximum of 6 bytes.
+            char hostbuf[MAX_ESCAPED_DOMAIN_NAME + 6];  // Max legal domainname as C-string, including terminating NUL
+            data = CFArrayGetValueAtIndex(entry, kmDNSKcName);
+            if (CFDataGetLength(data) >= (int)sizeof(hostbuf))
+            { 
+                LogMsg("SetDomainSecrets: host:port data too long: %d", CFDataGetLength(data));
+                continue;
+            }
+            CFDataGetBytes(data, CFRangeMake(0,CFDataGetLength(data)), (UInt8 *)hostbuf);
+            hostbuf[CFDataGetLength(data)] = '\0';
+
+            domainname hostname;
+            mDNSIPPort port;
+            char *hptr;
+            hptr = strchr(hostbuf, ':');
+
+            port.NotAnInteger = 0;
+            if (hptr)
+            {
+                mDNSu8 *p;
+                mDNSu16 val = 0;
+
+                *hptr++ = '\0';
+                while(hptr && *hptr != 0)
+                {
+                    if (*hptr < '0' || *hptr > '9')
+                    { LogMsg("SetDomainSecrets: Malformed Port number %d, val %d", *hptr, val); val = 0; break;}
+                    val = val * 10 + *hptr - '0';
+                    hptr++;
+                }
+                if (!val) continue;
+                p = (mDNSu8 *)&val;
+                port.NotAnInteger = p[0] << 8 | p[1];
+            }
+            // The hostbuf is of the format dsid@hostname:port. We don't care about the dsid.
+            hptr = strchr(hostbuf, '@');
+            if (hptr)
+                hptr++;
+            else
+                hptr = hostbuf;
+            if (!MakeDomainNameFromDNSNameString(&hostname, hptr)) { LogMsg("SetDomainSecrets: bad host name %s", hptr); continue; }
+
+            DomainAuthInfo *FoundInList;
+            for (FoundInList = m->AuthInfoList; FoundInList; FoundInList = FoundInList->next)
+                if (SameDomainName(&FoundInList->domain, &domain)) break;
+
+#if APPLE_OSX_mDNSResponder
+            if (FoundInList)
+            {
+                // If any client tunnel destination is in this domain, set deletion flag to false
+                ClientTunnel *client;
+                for (client = m->TunnelClients; client; client = client->next)
+                    if (FoundInList == GetAuthInfoForName_internal(m, &client->dstname))
+                    {
+                        LogInfo("SetDomainSecrets: tunnel to %##s no longer marked for deletion", client->dstname.c);
+                        client->MarkedForDeletion = mDNSfalse;
+                    }
+            }
+
+#endif // APPLE_OSX_mDNSResponder
+
+            // Uncomment the line below to view the keys as they're read out of the system keychain
+            // DO NOT SHIP CODE THIS WAY OR YOU'LL LEAK SECRET DATA INTO A PUBLICLY READABLE FILE!
+            //LogInfo("SetDomainSecrets: domain %##s keyname %##s key %s hostname %##s port %d", &domain.c, &keyname.c, stringbuf, hostname.c, (port.b[0] << 8 | port.b[1]));
+            LogInfo("SetDomainSecrets: domain %##s keyname %##s hostname %##s port %d", &domain.c, &keyname.c, hostname.c, (port.b[0] << 8 | port.b[1]));
+
+            // If didn't find desired domain in the list, make a new entry
+            ptr = FoundInList;
+            if (FoundInList && FoundInList->AutoTunnel && haveAutoTunnels == mDNSfalse) haveAutoTunnels = mDNStrue;
+            if (!FoundInList)
+            {
+                ptr = (DomainAuthInfo*)mallocL("DomainAuthInfo", sizeof(*ptr));
+                if (!ptr) { LogMsg("SetDomainSecrets: No memory"); continue; }
+            }
+
+            //LogInfo("SetDomainSecrets: %d of %d %##s", i, ArrayCount, &domain);
+
+            // It is an AutoTunnel if the keychains tells us so (with btmm prefix) or if it is a TunnelModeDomain
+            if (mDNS_SetSecretForDomain(m, ptr, &domain, &keyname, stringbuf, &hostname, &port, AutoTunnel) == mStatus_BadParamErr)
+            {
+                if (!FoundInList) mDNSPlatformMemFree(ptr);     // If we made a new DomainAuthInfo here, and it turned out bad, dispose it immediately
+                continue;
+            }
+
+            ConvertDomainNameToCString(&domain, stringbuf);
+            CFStringRef cfs = CFStringCreateWithCString(NULL, stringbuf, kCFStringEncodingUTF8);
+            if (cfs) { CFArrayAppendValue(sa, cfs); CFRelease(cfs); }
+        }
+        CFRelease(secrets);
+    }
+
+    if (!privateDnsArray || !CFEqual(privateDnsArray, sa))
+    {
+        if (privateDnsArray)
+            CFRelease(privateDnsArray);
+        
+        privateDnsArray = sa;
+        CFRetain(privateDnsArray);
+        mDNSDynamicStoreSetConfig(kmDNSPrivateConfig, mDNSNULL, privateDnsArray);
+    }
+    CFRelease(sa);
+
+#if APPLE_OSX_mDNSResponder
+    {
+        // clean up ClientTunnels
+        ClientTunnel **pp = &m->TunnelClients;
+        while (*pp)
+        {
+            if ((*pp)->MarkedForDeletion)
+            {
+                ClientTunnel *cur = *pp;
+                LogInfo("SetDomainSecrets: removing client %p %##s from list", cur, cur->dstname.c);
+                if (cur->q.ThisQInterval >= 0) mDNS_StopQuery(m, &cur->q);
+                AutoTunnelSetKeys(cur, mDNSfalse);
+                *pp = cur->next;
+                freeL("ClientTunnel", cur);
+            }
+            else
+                pp = &(*pp)->next;
+        }
+
+        mDNSBool needAutoTunnelNAT = mDNSfalse;
+        DomainAuthInfo *info;
+        for (info = m->AuthInfoList; info; info = info->next)
+        {
+            if (info->AutoTunnel)
+            {
+                UpdateAutoTunnelDeviceInfoRecord(m, info);
+                UpdateAutoTunnelHostRecord(m, info);
+                UpdateAutoTunnelServiceRecords(m, info);
+                UpdateAutoTunnel6Record(m, info);
+                if (info->deltime)
+                {
+                    if (info->AutoTunnelServiceStarted) info->AutoTunnelServiceStarted = mDNSfalse;
+                }
+                else if (info->AutoTunnelServiceStarted)
+                    needAutoTunnelNAT = true;
+
+	            UpdateAutoTunnelDomainStatus(m, info);
+            }
+        }
+
+        // If the AutoTunnel NAT-T is no longer needed (& is currently running), stop it
+        if (!needAutoTunnelNAT && m->AutoTunnelNAT.clientContext)
+        {
+            // stop the NAT operation, reset port, cleanup state
+            mDNS_StopNATOperation_internal(m, &m->AutoTunnelNAT);
+            m->AutoTunnelNAT.ExternalAddress = zerov4Addr;
+            m->AutoTunnelNAT.NewAddress      = zerov4Addr;
+            m->AutoTunnelNAT.ExternalPort    = zeroIPPort;
+            m->AutoTunnelNAT.RequestedPort   = zeroIPPort;
+            m->AutoTunnelNAT.Lifetime        = 0;
+            m->AutoTunnelNAT.Result          = mStatus_NoError;
+            m->AutoTunnelNAT.clientContext   = mDNSNULL;
+        }
+
+        UpdateAnonymousRacoonConfig(m);     // Determine whether we need racoon to accept incoming connections
+        ProcessConndConfigChanges(m);       // Update AutoTunnelInnerAddress values and default ipsec policies as necessary
+    }
+#endif // APPLE_OSX_mDNSResponder
+
+    CheckSuppressUnusableQuestions(m);
+
+#endif /* NO_SECURITYFRAMEWORK */
+}
+
+mDNSlocal void SetLocalDomains(void)
+{
+    CFMutableArrayRef sa = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+    if (!sa) { LogMsg("SetLocalDomains: CFArrayCreateMutable failed"); return; }
+
+    CFArrayAppendValue(sa, CFSTR("local"));
+    CFArrayAppendValue(sa, CFSTR("254.169.in-addr.arpa"));
+    CFArrayAppendValue(sa, CFSTR("8.e.f.ip6.arpa"));
+    CFArrayAppendValue(sa, CFSTR("9.e.f.ip6.arpa"));
+    CFArrayAppendValue(sa, CFSTR("a.e.f.ip6.arpa"));
+    CFArrayAppendValue(sa, CFSTR("b.e.f.ip6.arpa"));
+
+    mDNSDynamicStoreSetConfig(kmDNSMulticastConfig, mDNSNULL, sa);
+    CFRelease(sa);
+}
+
+mDNSlocal void GetCurrentPMSetting(const CFStringRef name, mDNSs32 *val)
+{
+#if USE_IOPMCOPYACTIVEPMPREFERENCES
+    CFTypeRef blob = NULL;
+    CFStringRef str = NULL;
+    CFDictionaryRef odict = NULL;
+    CFDictionaryRef idict = NULL;
+    CFNumberRef number = NULL;
+
+    blob = IOPSCopyPowerSourcesInfo();
+    if (!blob) { LogMsg("GetCurrentPMSetting: IOPSCopyPowerSourcesInfo failed!"); goto end; }
+
+    odict = IOPMCopyActivePMPreferences();
+    if (!odict) { LogMsg("GetCurrentPMSetting: IOPMCopyActivePMPreferences failed!"); goto end; }
+
+    str = IOPSGetProvidingPowerSourceType(blob);
+    if (!str) { LogMsg("GetCurrentPMSetting: IOPSGetProvidingPowerSourceType failed!"); goto end; }
+
+    idict = CFDictionaryGetValue(odict, str);
+    if (!idict)
+    {
+        char buf[256];
+        if (!CFStringGetCString(str, buf, sizeof(buf), kCFStringEncodingUTF8)) buf[0] = 0;
+        LogMsg("GetCurrentPMSetting: CFDictionaryGetValue (%s) failed!", buf);
+        goto end;
+    }
+
+    number = CFDictionaryGetValue(idict, name);
+    if (!number || CFGetTypeID(number) != CFNumberGetTypeID() || !CFNumberGetValue(number, kCFNumberSInt32Type, val))
+        *val = 0;
+end:
+    if (blob) CFRelease(blob);
+    if (odict) CFRelease(odict);
+
+#else
+
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:GetCurrentPMSetting"), NULL, NULL);
+    if (!store) LogMsg("GetCurrentPMSetting: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+    else
+    {
+        CFDictionaryRef dict = SCDynamicStoreCopyValue(store, NetworkChangedKey_PowerSettings);
+        if (!dict) LogSPS("GetCurrentPMSetting: Could not get IOPM CurrentSettings dict");
+        else
+        {
+            CFNumberRef number = CFDictionaryGetValue(dict, name);
+            if (!number || CFGetTypeID(number) != CFNumberGetTypeID() || !CFNumberGetValue(number, kCFNumberSInt32Type, val))
+                *val = 0;
+            CFRelease(dict);
+        }
+        CFRelease(store);
+    }
+
+#endif
+}
+
+#if APPLE_OSX_mDNSResponder
+
+static CFMutableDictionaryRef spsStatusDict = NULL;
+static const CFStringRef kMetricRef = CFSTR("Metric");
+
+mDNSlocal void SPSStatusPutNumber(CFMutableDictionaryRef dict, const mDNSu8* const ptr, CFStringRef key)
+{
+    mDNSu8 tmp = (ptr[0] - '0') * 10 + ptr[1] - '0';
+    CFNumberRef num = CFNumberCreate(NULL, kCFNumberSInt8Type, &tmp);
+    if (!num)
+        LogMsg("SPSStatusPutNumber: Could not create CFNumber");
+    else
+    {
+        CFDictionarySetValue(dict, key, num);
+        CFRelease(num);
+    }
+}
+
+mDNSlocal CFMutableDictionaryRef SPSCreateDict(const mDNSu8* const ptr)
+{
+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    if (!dict) { LogMsg("SPSCreateDict: Could not create CFDictionary dict"); return dict; }
+
+    char buffer[1024];
+    buffer[mDNS_snprintf(buffer, sizeof(buffer), "%##s", ptr) - 1] = 0;
+    CFStringRef spsname = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+    if (!spsname) { LogMsg("SPSCreateDict: Could not create CFString spsname full"); CFRelease(dict); return NULL; }
+    CFDictionarySetValue(dict, CFSTR("FullName"), spsname);
+    CFRelease(spsname);
+
+    if (ptr[0] >=  2) SPSStatusPutNumber(dict, ptr + 1, CFSTR("Type"));
+    if (ptr[0] >=  5) SPSStatusPutNumber(dict, ptr + 4, CFSTR("Portability"));
+    if (ptr[0] >=  8) SPSStatusPutNumber(dict, ptr + 7, CFSTR("MarginalPower"));
+    if (ptr[0] >= 11) SPSStatusPutNumber(dict, ptr +10, CFSTR("TotalPower"));
+
+    mDNSu32 tmp = SPSMetric(ptr);
+    CFNumberRef num = CFNumberCreate(NULL, kCFNumberSInt32Type, &tmp);
+    if (!num)
+        LogMsg("SPSCreateDict: Could not create CFNumber");
+    else
+    {
+        CFDictionarySetValue(dict, kMetricRef, num);
+        CFRelease(num);
+    }
+
+    if (ptr[0] >= 12)
+    {
+        memcpy(buffer, ptr + 13, ptr[0] - 12);
+        buffer[ptr[0] - 12] = 0;
+        spsname = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+        if (!spsname) { LogMsg("SPSCreateDict: Could not create CFString spsname"); CFRelease(dict); return NULL; }
+        else
+        {
+            CFDictionarySetValue(dict, CFSTR("PrettyName"), spsname);
+            CFRelease(spsname);
+        }
+    }
+
+    return dict;
+}
+
+mDNSlocal CFComparisonResult CompareSPSEntries(const void *val1, const void *val2, void *context)
+{
+    (void)context;
+    return CFNumberCompare((CFNumberRef)CFDictionaryGetValue((CFDictionaryRef)val1, kMetricRef),
+                           (CFNumberRef)CFDictionaryGetValue((CFDictionaryRef)val2, kMetricRef),
+                           NULL);
+}
+
+mDNSlocal void UpdateSPSStatus(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    NetworkInterfaceInfo* info = (NetworkInterfaceInfo*)question->QuestionContext;
+    debugf("UpdateSPSStatus: %s %##s %s %s", info->ifname, question->qname.c, AddRecord ? "Add" : "Rmv", answer ? RRDisplayString(m, answer) : "<null>");
+
+    mDNS_Lock(m);
+    mDNS_UpdateAllowSleep(m);
+    mDNS_Unlock(m);
+
+    if (answer && SPSMetric(answer->rdata->u.name.c) > 999999) return;  // Ignore instances with invalid names
+
+    if (!spsStatusDict)
+    {
+        spsStatusDict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+        if (!spsStatusDict) { LogMsg("UpdateSPSStatus: Could not create CFDictionary spsStatusDict"); return; }
+    }
+
+    CFStringRef ifname = CFStringCreateWithCString(NULL, info->ifname, kCFStringEncodingUTF8);
+    if (!ifname) { LogMsg("UpdateSPSStatus: Could not create CFString ifname"); return; }
+
+    CFMutableArrayRef array = NULL;
+
+    if (!CFDictionaryGetValueIfPresent(spsStatusDict, ifname, (const void**) &array))
+    {
+        array = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+        if (!array) { LogMsg("UpdateSPSStatus: Could not create CFMutableArray"); CFRelease(ifname); return; }
+        CFDictionarySetValue(spsStatusDict, ifname, array);
+        CFRelease(array); // let go of our reference, now that the dict has one
+    }
+    else
+    if (!array) { LogMsg("UpdateSPSStatus: Could not get CFMutableArray for %s", info->ifname); CFRelease(ifname); return; }
+
+    if (!answer) // special call that means the question has been stopped (because the interface is going away)
+        CFArrayRemoveAllValues(array);
+    else
+    {
+        CFMutableDictionaryRef dict = SPSCreateDict(answer->rdata->u.name.c);
+        if (!dict) { CFRelease(ifname); return; }
+
+        if (AddRecord)
+        {
+            if (!CFArrayContainsValue(array, CFRangeMake(0, CFArrayGetCount(array)), dict))
+            {
+                int i=0;
+                for (i=0; i<CFArrayGetCount(array); i++)
+                    if (CompareSPSEntries(CFArrayGetValueAtIndex(array, i), dict, NULL) != kCFCompareLessThan)
+                        break;
+                CFArrayInsertValueAtIndex(array, i, dict);
+            }
+            else LogMsg("UpdateSPSStatus: %s array already contains %##s", info->ifname, answer->rdata->u.name.c);
+        }
+        else
+        {
+            CFIndex i = CFArrayGetFirstIndexOfValue(array, CFRangeMake(0, CFArrayGetCount(array)), dict);
+            if (i != -1) CFArrayRemoveValueAtIndex(array, i);
+            else LogMsg("UpdateSPSStatus: %s array does not contain %##s", info->ifname, answer->rdata->u.name.c);
+        }
+
+        CFRelease(dict);
+    }
+
+    if (!m->ShutdownTime) mDNSDynamicStoreSetConfig(kmDNSSleepProxyServersState, info->ifname, array);
+
+    CFRelease(ifname);
+}
+
+mDNSlocal mDNSs32 GetSystemSleepTimerSetting(void)
+{
+    mDNSs32 val = -1;
+    SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:GetSystemSleepTimerSetting"), NULL, NULL);
+    if (!store)
+        LogMsg("GetSystemSleepTimerSetting: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+    else
+    {
+        CFDictionaryRef dict = SCDynamicStoreCopyValue(store, NetworkChangedKey_PowerSettings);
+        if (dict)
+        {
+            CFNumberRef number = CFDictionaryGetValue(dict, CFSTR("System Sleep Timer"));
+            if (number) CFNumberGetValue(number, kCFNumberSInt32Type, &val);
+            CFRelease(dict);
+        }
+        CFRelease(store);
+    }
+    return val;
+}
+
+mDNSlocal void SetSPS(mDNS *const m)
+{
+    
+    // If we ever want to know InternetSharing status in the future, use DNSXEnableProxy()
+    mDNSu8 sps = (OfferSleepProxyService && GetSystemSleepTimerSetting() == 0) ? mDNSSleepProxyMetric_IncidentalSoftware : 0;
+
+    // For devices that are not running NAT, but are set to never sleep, we may choose to act
+    // as a Sleep Proxy, but only for non-portable Macs (Portability > 35 means nominal weight < 3kg)
+    //if (sps > mDNSSleepProxyMetric_PrimarySoftware && SPMetricPortability > 35) sps = 0;
+
+    // If we decide to let laptops act as Sleep Proxy, we should do it only when running on AC power, not on battery
+
+    // For devices that are unable to sleep at all to save power, or save 1W or less by sleeping,
+    // it makes sense for them to offer low-priority Sleep Proxy service on the network.
+    // We rate such a device as metric 70 ("Incidentally Available Hardware")
+    if (SPMetricMarginalPower <= 60 && !sps) sps = mDNSSleepProxyMetric_IncidentalHardware;
+
+    // If the launchd plist specifies an explicit value for the Intent Metric, then use that instead of the
+    // computed value (currently 40 "Primary Network Infrastructure Software" or 80 "Incidentally Available Software")
+    if (sps && OfferSleepProxyService && OfferSleepProxyService < 100) sps = OfferSleepProxyService;
+
+#ifdef NO_APPLETV_SLEEP_PROXY_ON_WIFI
+    // AppleTVs are not reliable sleep proxy servers on WiFi. Do not offer to be a BSP if the WiFi interface is active.
+    if (IsAppleTV())
+    {
+        NetworkInterfaceInfo *intf  = mDNSNULL;
+        mDNSEthAddr           bssid = zeroEthAddr;
+        for (intf = GetFirstActiveInterface(m->HostInterfaces); intf; intf = GetFirstActiveInterface(intf->next))
+        {
+            bssid = GetBSSID(intf->ifname);
+            if (!mDNSSameEthAddress(&bssid, &zeroEthAddr))
+            {
+                LogMsg("SetSPS: AppleTV on WiFi - not advertising BSP services");
+                sps = 0;
+                break;
+            }
+        }
+    }
+#endif  //  NO_APPLETV_SLEEP_PROXY_ON_WIFI
+
+    mDNSCoreBeSleepProxyServer(m, sps, SPMetricPortability, SPMetricMarginalPower, SPMetricTotalPower, SPMetricFeatures);
+}
+
+// The definitions below should eventually come from some externally-supplied header file.
+// However, since these definitions can't really be changed without breaking binary compatibility,
+// they should never change, so in practice it should not be a big problem to have them defined here.
+
+enum
+{                               // commands from the daemon to the driver
+    cmd_mDNSOffloadRR = 21,     // give the mdns update buffer to the driver
+};
+
+typedef union { void *ptr; mDNSOpaque64 sixtyfourbits; } FatPtr;
+
+typedef struct
+{                                       // cmd_mDNSOffloadRR structure
+    uint32_t command;                 // set to OffloadRR
+    uint32_t rrBufferSize;            // number of bytes of RR records
+    uint32_t numUDPPorts;             // number of SRV UDP ports
+    uint32_t numTCPPorts;             // number of SRV TCP ports
+    uint32_t numRRRecords;            // number of RR records
+    uint32_t compression;             // rrRecords - compression is base for compressed strings
+    FatPtr rrRecords;                 // address of array of pointers to the rr records
+    FatPtr udpPorts;                  // address of udp port list (SRV)
+    FatPtr tcpPorts;                  // address of tcp port list (SRV)
+} mDNSOffloadCmd;
+
+#include <IOKit/IOKitLib.h>
+#include <dns_util.h>
+
+mDNSlocal mDNSu16 GetPortArray(mDNS *const m, int trans, mDNSIPPort *portarray)
+{
+    const domainlabel *const tp = (trans == mDNSTransport_UDP) ? (const domainlabel *)"\x4_udp" : (const domainlabel *)"\x4_tcp";
+    int count = 0;
+    AuthRecord *rr;
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.rrtype == kDNSType_SRV && SameDomainLabel(ThirdLabel(rr->resrec.name)->c, tp->c))
+        {
+            if (portarray) portarray[count] = rr->resrec.rdata->u.srv.port;
+            count++;
+        }
+
+    // If Back to My Mac is on, also wake for packets to the IPSEC UDP port (4500)
+    if (trans == mDNSTransport_UDP && m->AutoTunnelNAT.clientContext)
+    {
+        LogSPS("GetPortArray Back to My Mac at %d", count);
+        if (portarray) portarray[count] = IPSECPort;
+        count++;
+    }
+    return(count);
+}
+
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+mDNSlocal mDNSBool SupportsTCPKeepAlive()
+{
+    IOReturn  ret      = kIOReturnSuccess;
+    CFTypeRef obj      = NULL;
+    mDNSBool  supports = mDNSfalse;
+
+    ret = IOPlatformCopyFeatureActive(CFSTR("TCPKeepAliveDuringSleep"), &obj);
+    if ((kIOReturnSuccess == ret) && (obj != NULL))
+    {
+        supports = (obj ==  kCFBooleanTrue)? mDNStrue : mDNSfalse;
+        CFRelease(obj);
+    }
+    LogSPS("%s: The hardware %s TCP Keep Alive", __func__, (supports ? "supports" : "does not support"));
+    return supports;
+}
+
+mDNSlocal mDNSBool OnBattery(void)
+{
+    CFTypeRef powerInfo = IOPSCopyPowerSourcesInfo();
+    CFTypeRef powerSrc  = IOPSGetProvidingPowerSourceType(powerInfo);
+    mDNSBool  result    = mDNSfalse;
+
+    if (powerInfo != NULL)
+    {
+        result = CFEqual(CFSTR(kIOPSBatteryPowerValue), powerSrc);
+        CFRelease(powerInfo);
+    }
+    LogSPS("%s: The system is on %s", __func__, (result)? "Battery" : "AC Power");
+    return result;
+}
+
+#endif // !TARGET_OS_EMBEDDED
+
+#define TfrRecordToNIC(RR) \
+    ((!(RR)->resrec.InterfaceID && ((RR)->ForceMCast || IsLocalDomain((RR)->resrec.name))))
+
+mDNSlocal mDNSu32 CountProxyRecords(mDNS *const m, uint32_t *const numbytes, NetworkInterfaceInfo *const intf, mDNSBool TCPKAOnly, mDNSBool supportsTCPKA)
+{
+    *numbytes = 0;
+    int count = 0;
+
+    AuthRecord *rr;
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (!(rr->AuthFlags & AuthFlagsWakeOnly) && rr->resrec.RecordType > kDNSRecordTypeDeregistering)
+        {
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+            mDNSBool   isKeepAliveRecord = mDNS_KeepaliveRecord(&rr->resrec);
+            // Skip over all other records if we are registering TCP KeepAlive records only
+            // Skip over TCP KeepAlive records if the policy prohibits it or if the interface does not support TCP Keepalive.
+            if ((TCPKAOnly && !isKeepAliveRecord) || (isKeepAliveRecord && !supportsTCPKA))
+                continue;
+
+            // Update the record before calculating the number of bytes required
+            // We offload the TCP Keepalive record even if the update fails. When the driver gets the record, it will
+            // attempt to update the record again.
+            if (isKeepAliveRecord && (UpdateKeepaliveRData(m, rr, intf, mDNSfalse, mDNSNULL) != mStatus_NoError))
+                LogSPS("CountProxyRecords: Failed to update keepalive record - %s", ARDisplayString(m, rr));
+#else
+            (void) TCPKAOnly;     // unused
+            (void) supportsTCPKA; // unused
+            (void) intf;          // unused
+#endif // APPLE_OSX_mDNSResponder
+            if (TfrRecordToNIC(rr))
+            {
+                *numbytes += DomainNameLength(rr->resrec.name) + 10 + rr->resrec.rdestimate;
+                LogSPS("CountProxyRecords: %3d size %5d total %5d %s",
+                       count, DomainNameLength(rr->resrec.name) + 10 + rr->resrec.rdestimate, *numbytes, ARDisplayString(m,rr));
+                count++;
+            }
+        }
+    }
+    return(count);
+}
+
+mDNSlocal void GetProxyRecords(mDNS *const m, DNSMessage *const msg, uint32_t *const numbytes, FatPtr *const records, mDNSBool TCPKAOnly, mDNSBool supportsTCPKA)
+{
+    mDNSu8 *p = msg->data;
+    const mDNSu8 *const limit = p + *numbytes;
+    InitializeDNSMessage(&msg->h, zeroID, zeroID);
+
+    int count = 0;
+    AuthRecord *rr;
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if (!(rr->AuthFlags & AuthFlagsWakeOnly) && rr->resrec.RecordType > kDNSRecordTypeDeregistering)
+        {
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+            mDNSBool   isKeepAliveRecord = mDNS_KeepaliveRecord(&rr->resrec);
+
+            // Skip over all other records if we are registering TCP KeepAlive records only
+            // Skip over TCP KeepAlive records if the policy prohibits it or if the interface does not support TCP Keepalive
+            if ((TCPKAOnly && !isKeepAliveRecord) || (isKeepAliveRecord && !supportsTCPKA))
+                continue;
+#else
+            (void) TCPKAOnly;     // unused
+            (void) supportsTCPKA; // unused
+#endif // APPLE_OSX_mDNSResponder
+
+            if (TfrRecordToNIC(rr))
+            {
+                records[count].sixtyfourbits = zeroOpaque64;
+                records[count].ptr = p;
+                if (rr->resrec.RecordType & kDNSRecordTypeUniqueMask)
+                    rr->resrec.rrclass |= kDNSClass_UniqueRRSet;    // Temporarily set the 'unique' bit so PutResourceRecord will set it
+                p = PutResourceRecordTTLWithLimit(msg, p, &msg->h.mDNS_numUpdates, &rr->resrec, rr->resrec.rroriginalttl, limit);
+                rr->resrec.rrclass &= ~kDNSClass_UniqueRRSet;       // Make sure to clear 'unique' bit back to normal state
+                LogSPS("GetProxyRecords: %3d start %p end %p size %5d total %5d %s",
+                       count, records[count].ptr, p, p - (mDNSu8 *)records[count].ptr, p - msg->data, ARDisplayString(m,rr));
+                count++;
+            }
+        }
+    }
+    *numbytes = p - msg->data;
+}
+
+// If compiling with old headers and libraries (pre 10.5) that don't include IOConnectCallStructMethod
+// then we declare a dummy version here so that the code at least compiles
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
+static kern_return_t
+IOConnectCallStructMethod(
+    mach_port_t connection,         // In
+    uint32_t selector,              // In
+    const void  *inputStruct,       // In
+    size_t inputStructCnt,          // In
+    void        *outputStruct,      // Out
+    size_t      *outputStructCnt)   // In/Out
+{
+    (void)connection;
+    (void)selector;
+    (void)inputStruct;
+    (void)inputStructCnt;
+    (void)outputStruct;
+    (void)outputStructCnt;
+    LogMsg("Compiled without IOConnectCallStructMethod");
+    return(KERN_FAILURE);
+}
+#endif
+
+mDNSexport mDNSBool SupportsInNICProxy(NetworkInterfaceInfo *const intf)
+{
+    if(!UseInternalSleepProxy)
+    {
+        LogSPS("SupportsInNICProxy: Internal Sleep Proxy is disabled");
+        return mDNSfalse;
+    }
+    return CheckInterfaceSupport(intf, mDNS_IOREG_KEY);
+}
+
+mDNSexport mStatus ActivateLocalProxy(mDNS *const m, NetworkInterfaceInfo *const intf)  // Called with the lock held
+{
+    mStatus      result        = mStatus_UnknownErr;
+    mDNSBool     TCPKAOnly     = mDNSfalse;
+    mDNSBool     supportsTCPKA = mDNSfalse;
+    mDNSBool     onbattery     = mDNSfalse; 
+    io_service_t service       = IOServiceGetMatchingService(kIOMasterPortDefault, IOBSDNameMatching(kIOMasterPortDefault, 0, intf->ifname));
+
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+    onbattery = OnBattery();
+    // Check if the interface supports TCP Keepalives and the system policy says it is ok to offload TCP Keepalive records
+    supportsTCPKA = (InterfaceSupportsKeepAlive(intf) && SupportsTCPKeepAlive());
+
+    // Only TCP Keepalive records are to be offloaded if
+    // - The system is on battery
+    // - OR wake for network access is not set but powernap is enabled
+    TCPKAOnly     = supportsTCPKA && ((m->SystemWakeOnLANEnabled == mDNS_WakeOnBattery) || onbattery);
+#else
+    (void) onbattery; // unused;
+#endif
+    if (!service) { LogMsg("ActivateLocalProxy: No service for interface %s", intf->ifname); return(mStatus_UnknownErr); }
+
+    io_name_t n1, n2;
+    IOObjectGetClass(service, n1);
+    io_object_t parent;
+    kern_return_t kr = IORegistryEntryGetParentEntry(service, kIOServicePlane, &parent);
+    if (kr != KERN_SUCCESS) LogMsg("ActivateLocalProxy: IORegistryEntryGetParentEntry for %s/%s failed %d", intf->ifname, n1, kr);
+    else
+    {
+        IOObjectGetClass(parent, n2);
+        LogSPS("ActivateLocalProxy: Interface %s service %s parent %s", intf->ifname, n1, n2);
+        const CFTypeRef ref = IORegistryEntryCreateCFProperty(parent, CFSTR(mDNS_IOREG_KEY), kCFAllocatorDefault, mDNSNULL);
+        if (!ref) LogSPS("ActivateLocalProxy: No mDNS_IOREG_KEY for interface %s/%s/%s", intf->ifname, n1, n2);
+        else
+        {
+            if (CFGetTypeID(ref) != CFStringGetTypeID() || !CFEqual(ref, CFSTR(mDNS_IOREG_VALUE)))
+                LogMsg("ActivateLocalProxy: mDNS_IOREG_KEY for interface %s/%s/%s value %s != %s",
+                       intf->ifname, n1, n2, CFStringGetCStringPtr(ref, mDNSNULL), mDNS_IOREG_VALUE);
+            else if (!UseInternalSleepProxy)
+                LogSPS("ActivateLocalProxy: Not using internal (NIC) sleep proxy for interface %s", intf->ifname);
+            else
+            {
+                io_connect_t conObj;
+                kr = IOServiceOpen(parent, mach_task_self(), mDNS_USER_CLIENT_CREATE_TYPE, &conObj);
+                if (kr != KERN_SUCCESS) LogMsg("ActivateLocalProxy: IOServiceOpen for %s/%s/%s failed %d", intf->ifname, n1, n2, kr);
+                else
+                {
+                    mDNSOffloadCmd cmd;
+                    mDNSPlatformMemZero(&cmd, sizeof(cmd)); // When compiling 32-bit, make sure top 32 bits of 64-bit pointers get initialized to zero
+                    cmd.command       = cmd_mDNSOffloadRR;
+                    cmd.numUDPPorts   = GetPortArray(m, mDNSTransport_UDP, mDNSNULL);
+                    cmd.numTCPPorts   = GetPortArray(m, mDNSTransport_TCP, mDNSNULL);
+                    cmd.numRRRecords  = CountProxyRecords(m, &cmd.rrBufferSize, intf, TCPKAOnly, supportsTCPKA);
+                    cmd.compression   = sizeof(DNSMessageHeader);
+
+                    DNSMessage *msg = (DNSMessage *)mallocL("mDNSOffloadCmd msg", sizeof(DNSMessageHeader) + cmd.rrBufferSize);
+                    cmd.rrRecords.ptr = mallocL("mDNSOffloadCmd rrRecords", cmd.numRRRecords * sizeof(FatPtr));
+                    cmd.udpPorts.ptr = mallocL("mDNSOffloadCmd udpPorts",  cmd.numUDPPorts  * sizeof(mDNSIPPort));
+                    cmd.tcpPorts.ptr = mallocL("mDNSOffloadCmd tcpPorts",  cmd.numTCPPorts  * sizeof(mDNSIPPort));
+
+                    LogSPS("ActivateLocalProxy: msg %p %d RR %p %d, UDP %p %d, TCP %p %d",
+                           msg, cmd.rrBufferSize,
+                           cmd.rrRecords.ptr, cmd.numRRRecords,
+                           cmd.udpPorts.ptr, cmd.numUDPPorts,
+                           cmd.tcpPorts.ptr, cmd.numTCPPorts);
+
+                    if (!msg || !cmd.rrRecords.ptr || !cmd.udpPorts.ptr || !cmd.tcpPorts.ptr)
+                        LogMsg("ActivateLocalProxy: Failed to allocate memory: msg %p %d RR %p %d, UDP %p %d, TCP %p %d",
+                               msg, cmd.rrBufferSize,
+                               cmd.rrRecords.ptr, cmd.numRRRecords,
+                               cmd.udpPorts.ptr, cmd.numUDPPorts,
+                               cmd.tcpPorts.ptr, cmd.numTCPPorts);
+                    else
+                    {
+                        GetProxyRecords(m, msg, &cmd.rrBufferSize, cmd.rrRecords.ptr, TCPKAOnly, supportsTCPKA);
+                        GetPortArray(m, mDNSTransport_UDP, cmd.udpPorts.ptr);
+                        GetPortArray(m, mDNSTransport_TCP, cmd.tcpPorts.ptr);
+                        char outputData[2];
+                        size_t outputDataSize = sizeof(outputData);
+                        kr = IOConnectCallStructMethod(conObj, 0, &cmd, sizeof(cmd), outputData, &outputDataSize);
+                        LogSPS("ActivateLocalProxy: IOConnectCallStructMethod for %s/%s/%s %d", intf->ifname, n1, n2, kr);
+                        if (kr == KERN_SUCCESS) result = mStatus_NoError;
+                    }
+
+                    if (cmd.tcpPorts.ptr) freeL("mDNSOffloadCmd udpPorts",  cmd.tcpPorts.ptr);
+                    if (cmd.udpPorts.ptr) freeL("mDNSOffloadCmd tcpPorts",  cmd.udpPorts.ptr);
+                    if (cmd.rrRecords.ptr) freeL("mDNSOffloadCmd rrRecords", cmd.rrRecords.ptr);
+                    if (msg) freeL("mDNSOffloadCmd msg",       msg);
+                    IOServiceClose(conObj);
+                }
+            }
+            CFRelease(ref);
+        }
+        IOObjectRelease(parent);
+    }
+    IOObjectRelease(service);
+    return result;
+}
+
+#endif // APPLE_OSX_mDNSResponder
+
+mDNSlocal mDNSu8 SystemWakeForNetworkAccess(void)
+{
+    mDNSs32 val = 0;
+    mDNSu8  ret = (mDNSu8)mDNS_NoWake;
+
+    if (DisableSleepProxyClient)
+    {
+       LogSPS("SystemWakeForNetworkAccess: Sleep Proxy Client disabled by command-line option");
+       return mDNSfalse;
+    }
+
+    GetCurrentPMSetting(CFSTR("Wake On LAN"), &val);
+
+    ret = (mDNSu8)(val != 0) ? mDNS_WakeOnAC : mDNS_NoWake;
+
+#if APPLE_OSX_mDNSResponder && !TARGET_OS_EMBEDDED
+    // If we have TCP Keepalive support, system is capable of registering for TCP Keepalives.
+    // Further policy decisions on whether to offload the records is handled during sleep processing.
+    if ((ret == mDNS_NoWake) && SupportsTCPKeepAlive())
+        ret = (mDNSu8)mDNS_WakeOnBattery;
+#endif // APPLE_OSX_mDNSResponder
+
+    LogSPS("SystemWakeForNetworkAccess: Wake On LAN: %d", ret);
+    return ret;
+}
+
+mDNSlocal mDNSBool SystemSleepOnlyIfWakeOnLAN(void)
+{
+    mDNSs32 val = 0;
+    GetCurrentPMSetting(CFSTR("PrioritizeNetworkReachabilityOverSleep"), &val);
+    return val != 0 ? mDNStrue : mDNSfalse;
+}
+
+#if APPLE_OSX_mDNSResponder
+// When sleeping, we always ensure that the _autotunnel6 record (if connected to RR relay)
+// gets deregistered, so that older peers are forced to connect over direct UDP instead of
+// the RR relay.
+//
+// When sleeping w/o a successful AutoTunnel NAT Mapping, we ensure that all our BTMM
+// service records are deregistered, so they do not appear in peers' Finder sidebars.
+// We do this by checking for the (non-autotunnel) SRV records, as the PTR and TXT records
+// depend on their associated SRV record and therefore will be deregistered together in a
+// single update with the SRV record.
+//
+// Also, the per-zone _kerberos TXT record is always there, including while sleeping, so
+// its presence shouldn't delay sleep.
+//
+// Note that the order of record deregistration is: first _autotunnel6 (if connected to RR
+// relay) and host records get deregistered, then SRV (UpdateAllSrvRecords), PTR and TXT.
+//
+// Also note that returning false here will not delay sleep past the maximum of 10 seconds.
+mDNSexport mDNSBool RecordReadyForSleep(mDNS *const m, AuthRecord *rr)
+{
+    if (!AuthRecord_uDNS(rr)) return mDNStrue;
+    
+    if ((rr->resrec.rrtype == kDNSType_AAAA) && SameDomainLabel(rr->namestorage.c, (const mDNSu8 *)"\x0c_autotunnel6"))
+    {
+        LogInfo("RecordReadyForSleep: %s not ready for sleep", ARDisplayString(m, rr));
+        return mDNSfalse;
+    }
+    
+    if ((mDNSIPPortIsZero(m->AutoTunnelNAT.ExternalPort) || m->AutoTunnelNAT.Result))
+    {
+        if (rr->resrec.rrtype == kDNSType_SRV && rr->state != regState_NoTarget && rr->zone
+            && !SameDomainLabel(rr->namestorage.c, (const mDNSu8 *)"\x0b_autotunnel"))
+        {
+            DomainAuthInfo *info = GetAuthInfoForName_internal(m, rr->zone);
+            if (info && info->AutoTunnel)
+            {
+                LogInfo("RecordReadyForSleep: %s not ready for sleep", ARDisplayString(m, rr));
+                return mDNSfalse;
+            }
+        }
+    }
+    
+    return mDNStrue;
+}
+
+// Caller must hold the lock
+mDNSexport void RemoveAutoTunnel6Record(mDNS *const m)
+{
+    DomainAuthInfo *info;
+    // Set the address to zero before calling UpdateAutoTunnel6Record, so that it will
+    // deregister the record, and the MemFree callback won't re-register.
+    m->AutoTunnelRelayAddr = zerov6Addr;
+    for (info = m->AuthInfoList; info; info = info->next)
+        if (info->AutoTunnel)
+            UpdateAutoTunnel6Record(m, info);
+}
+
+mDNSlocal mDNSBool IPv6AddressIsOnInterface(mDNSv6Addr ipv6Addr, char *ifname)
+{
+    struct ifaddrs  *ifa;
+    struct ifaddrs  *ifaddrs;
+    mDNSAddr addr;
+
+    if (if_nametoindex(ifname) == 0) {LogInfo("IPv6AddressIsOnInterface: Invalid name %s", ifname); return mDNSfalse;}
+
+    if (getifaddrs(&ifaddrs) < 0) {LogInfo("IPv6AddressIsOnInterface: getifaddrs failed"); return mDNSfalse;}
+
+    for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next)
+    {
+        if (strncmp(ifa->ifa_name, ifname, IFNAMSIZ) != 0)
+            continue;
+        if ((ifa->ifa_flags & IFF_UP) == 0 || !ifa->ifa_addr || ifa->ifa_addr->sa_family != AF_INET6)
+            continue;
+        if (SetupAddr(&addr, ifa->ifa_addr) != mStatus_NoError)
+        {
+            LogInfo("IPv6AddressIsOnInterface: SetupAddr error, continuing to the next address");
+            continue;
+        }
+        if (mDNSSameIPv6Address(ipv6Addr, *(mDNSv6Addr*)&addr.ip.v6))
+        {
+            LogInfo("IPv6AddressIsOnInterface: found %.16a", &ipv6Addr);
+            break;
+        }
+    }
+    freeifaddrs(ifaddrs);
+    return ifa != NULL;
+}
+
+mDNSlocal mDNSv6Addr IPv6AddressFromString(char* buf)
+{
+    mDNSv6Addr retVal;
+    struct addrinfo hints;
+    struct addrinfo *res0;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET6;
+    hints.ai_flags = AI_NUMERICHOST;
+
+    int err = getaddrinfo(buf, NULL, &hints, &res0);
+    if (err)
+        return zerov6Addr;
+
+    retVal = *(mDNSv6Addr*)&((struct sockaddr_in6*)res0->ai_addr)->sin6_addr;
+
+    freeaddrinfo(res0);
+
+    return retVal;
+}
+
+mDNSlocal CFDictionaryRef CopyConnectivityBackToMyMacDict()
+{
+    SCDynamicStoreRef store = NULL;
+    CFDictionaryRef connd = NULL;
+    CFDictionaryRef BTMMDict = NULL;
+
+    store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:CopyConnectivityBackToMyMacDict"), NULL, NULL);
+    if (!store)
+    {
+        LogMsg("CopyConnectivityBackToMyMacDict: SCDynamicStoreCreate failed: %s", SCErrorString(SCError()));
+        goto end;
+    }
+
+    connd = SCDynamicStoreCopyValue(store, NetworkChangedKey_BTMMConnectivity);
+    if (!connd)
+    {
+        LogInfo("CopyConnectivityBackToMyMacDict: SCDynamicStoreCopyValue failed: %s", SCErrorString(SCError()));
+        goto end;
+    }
+
+    BTMMDict = CFDictionaryGetValue(connd, CFSTR("BackToMyMac"));
+    if (!BTMMDict)
+    {
+        LogInfo("CopyConnectivityBackToMyMacDict: CFDictionaryGetValue: No value for BackToMyMac");
+        goto end;
+    }
+
+    // Non-dictionary is treated as non-existent dictionary
+    if (CFGetTypeID(BTMMDict) != CFDictionaryGetTypeID())
+    {
+        BTMMDict = NULL;
+        LogMsg("CopyConnectivityBackToMyMacDict: BackToMyMac not a dictionary");
+        goto end;
+    }
+
+    CFRetain(BTMMDict);
+
+end:
+    if (connd) CFRelease(connd);
+    if (store) CFRelease(store);
+
+    return BTMMDict;
+}
+
+#define MAX_IPV6_TEXTUAL 40
+
+mDNSlocal mDNSv6Addr ParseBackToMyMacAddr(CFDictionaryRef BTMMDict, CFStringRef ifKey, CFStringRef addrKey)
+{
+    mDNSv6Addr retVal = zerov6Addr;
+    CFTypeRef string = NULL;
+    char ifname[IFNAMSIZ];
+    char address[MAX_IPV6_TEXTUAL];
+
+    if (!BTMMDict)
+        return zerov6Addr;
+
+    if (!CFDictionaryGetValueIfPresent(BTMMDict, ifKey, &string))
+    {
+        LogInfo("ParseBackToMyMacAddr: interface key does not exist");
+        return zerov6Addr;
+    }
+
+    if (!CFStringGetCString(string, ifname, IFNAMSIZ, kCFStringEncodingUTF8))
+    {
+        LogMsg("ParseBackToMyMacAddr: Could not convert interface to CString");
+        return zerov6Addr;
+    }
+
+    if (!CFDictionaryGetValueIfPresent(BTMMDict, addrKey, &string))
+    {
+        LogMsg("ParseBackToMyMacAddr: address key does not exist, but interface key does");
+        return zerov6Addr;
+    }
+
+    if (!CFStringGetCString(string, address, sizeof(address), kCFStringEncodingUTF8))
+    {
+        LogMsg("ParseBackToMyMacAddr: Could not convert address to CString");
+        return zerov6Addr;
+    }
+
+    retVal = IPv6AddressFromString(address);
+    LogInfo("ParseBackToMyMacAddr: %s (%s) %.16a", ifname, address, &retVal);
+
+    if (mDNSIPv6AddressIsZero(retVal))
+        return zerov6Addr;
+
+    if (!IPv6AddressIsOnInterface(retVal, ifname))
+    {
+        LogMsg("ParseBackToMyMacAddr: %.16a is not on %s", &retVal, ifname);
+        return zerov6Addr;
+    }
+
+    return retVal;
+}
+
+mDNSlocal CFDictionaryRef GetBackToMyMacZones(CFDictionaryRef BTMMDict)
+{
+    CFTypeRef zones = NULL;
+
+    if (!BTMMDict)
+        return NULL;
+
+    if (!CFDictionaryGetValueIfPresent(BTMMDict, CFSTR("Zones"), &zones))
+    {
+        LogInfo("CopyBTMMZones: Zones key does not exist");
+        return NULL;
+    }
+
+    return zones;
+}
+
+mDNSlocal mDNSv6Addr ParseBackToMyMacZone(CFDictionaryRef zones, DomainAuthInfo* info)
+{
+    mDNSv6Addr addr = zerov6Addr;
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+    CFStringRef domain = NULL;
+    CFTypeRef theZone = NULL;
+
+    if (!zones)
+        return addr;
+
+    ConvertDomainNameToCString(&info->domain, buffer);
+    domain = CFStringCreateWithCString(NULL, buffer, kCFStringEncodingUTF8);
+    if (!domain)
+        return addr;
+
+    if (CFDictionaryGetValueIfPresent(zones, domain, &theZone))
+        addr = ParseBackToMyMacAddr(theZone, CFSTR("Interface"), CFSTR("Address"));
+
+    CFRelease(domain);
+
+    return addr;
+}
+
+mDNSlocal void SetupBackToMyMacInnerAddresses(mDNS *const m, CFDictionaryRef BTMMDict)
+{
+    DomainAuthInfo* info;
+    CFDictionaryRef zones = GetBackToMyMacZones(BTMMDict);
+    mDNSv6Addr newAddr;
+
+    for (info = m->AuthInfoList; info; info = info->next)
+    {
+        if (!info->AutoTunnel)
+            continue;
+
+        newAddr = ParseBackToMyMacZone(zones, info);
+
+        if (mDNSSameIPv6Address(newAddr, info->AutoTunnelInnerAddress))
+            continue;
+
+        info->AutoTunnelInnerAddress = newAddr;
+        DeregisterAutoTunnelHostRecord(m, info);
+        UpdateAutoTunnelHostRecord(m, info);
+        UpdateAutoTunnelDomainStatus(m, info);
+    }
+}
+
+// MUST be called holding the lock
+mDNSlocal void ProcessConndConfigChanges(mDNS *const m)
+{
+    CFDictionaryRef dict = CopyConnectivityBackToMyMacDict();
+    if (!dict)
+        LogInfo("ProcessConndConfigChanges: No BTMM dictionary");
+    mDNSv6Addr relayAddr = ParseBackToMyMacAddr(dict, CFSTR("RelayInterface"), CFSTR("RelayAddress"));
+
+    LogInfo("ProcessConndConfigChanges: relay %.16a", &relayAddr);
+
+    SetupBackToMyMacInnerAddresses(m, dict);
+
+    if (dict) CFRelease(dict);
+
+    if (!mDNSSameIPv6Address(relayAddr, m->AutoTunnelRelayAddr))
+    {
+        m->AutoTunnelRelayAddr = relayAddr;
+
+        DomainAuthInfo* info;
+        for (info = m->AuthInfoList; info; info = info->next)
+            if (info->AutoTunnel)
+            {
+                DeregisterAutoTunnel6Record(m, info);
+                UpdateAutoTunnel6Record(m, info);
+                UpdateAutoTunnelDomainStatus(m, info);
+            }
+
+        // Determine whether we need racoon to accept incoming connections
+        UpdateAnonymousRacoonConfig(m);
+    }
+
+    // If awacsd crashes or exits for some reason, restart it
+    UpdateBTMMRelayConnection(m);
+}
+#endif /* APPLE_OSX_mDNSResponder */
+
+mDNSlocal mDNSBool IsAppleNetwork(mDNS *const m)
+{
+    DNSServer *s;
+    // Determine if we're on AppleNW based on DNSServer having 17.x.y.z IPv4 addr
+    for (s = m->DNSServers; s; s = s->next)
+    {
+        if (s->addr.ip.v4.b[0] == 17)
+        {     
+            LogInfo("IsAppleNetwork: Found 17.x.y.z DNSServer concluding that we are on AppleNW: %##s %#a", s->domain.c, &s->addr);
+            return mDNStrue;
+        }     
+    }
+    return mDNSfalse;
+}
+
+mDNSexport void mDNSMacOSXNetworkChanged(mDNS *const m)
+{
+    LogInfo("***   Network Configuration Change   ***  (%d)%s",
+            m->p->NetworkChanged ? mDNS_TimeNow(m) - m->p->NetworkChanged : 0,
+            m->p->NetworkChanged ? "" : " (no scheduled configuration change)");
+    m->p->NetworkChanged = 0;       // If we received a network change event and deferred processing, we're now dealing with it
+    mDNSs32 utc = mDNSPlatformUTC();
+    m->SystemWakeOnLANEnabled = SystemWakeForNetworkAccess();
+    m->SystemSleepOnlyIfWakeOnLAN = SystemSleepOnlyIfWakeOnLAN();
+    MarkAllInterfacesInactive(m, utc);
+    UpdateInterfaceList(m, utc);
+    ClearInactiveInterfaces(m, utc);
+    SetupActiveInterfaces(m, utc);
+
+#if APPLE_OSX_mDNSResponder
+
+    mDNS_Lock(m);
+    ProcessConndConfigChanges(m);
+    mDNS_Unlock(m);
+
+    // Scan to find client tunnels whose questions have completed,
+    // but whose local inner/outer addresses have changed since the tunnel was set up
+    ClientTunnel *p;
+    for (p = m->TunnelClients; p; p = p->next)
+        if (p->q.ThisQInterval < 0)
+        {
+            DomainAuthInfo* info = GetAuthInfoForName(m, &p->dstname);
+            if (!info)
+            {
+                LogMsg("mDNSMacOSXNetworkChanged: Could not get AuthInfo for %##s, removing tunnel keys", p->dstname.c);
+                AutoTunnelSetKeys(p, mDNSfalse);
+            }
+            else
+            {
+                mDNSv6Addr inner = info->AutoTunnelInnerAddress;
+
+                if (!mDNSIPPortIsZero(p->rmt_outer_port))
+                {
+                    mDNSAddr tmpSrc = zeroAddr;
+                    mDNSAddr tmpDst = { mDNSAddrType_IPv4, {{{0}}} };
+                    tmpDst.ip.v4 = p->rmt_outer;
+                    mDNSPlatformSourceAddrForDest(&tmpSrc, &tmpDst);
+                    if (!mDNSSameIPv6Address(p->loc_inner, inner) ||
+                        !mDNSSameIPv4Address(p->loc_outer, tmpSrc.ip.v4))
+                    {
+                        AutoTunnelSetKeys(p, mDNSfalse);
+                        p->loc_inner = inner;
+                        p->loc_outer = tmpSrc.ip.v4;
+                        AutoTunnelSetKeys(p, mDNStrue);
+                    }
+                }
+                else
+                {
+                    if (!mDNSSameIPv6Address(p->loc_inner, inner) ||
+                        !mDNSSameIPv6Address(p->loc_outer6, m->AutoTunnelRelayAddr))
+                    {
+                        AutoTunnelSetKeys(p, mDNSfalse);
+                        p->loc_inner = inner;
+                        p->loc_outer6 = m->AutoTunnelRelayAddr;
+                        AutoTunnelSetKeys(p, mDNStrue);
+                    }
+                }
+            }
+        }
+
+    SetSPS(m);
+
+    NetworkInterfaceInfoOSX *i;
+    for (i = m->p->InterfaceList; i; i = i->next)
+    {
+        if (!m->SPSSocket)      // Not being Sleep Proxy Server; close any open BPF fds
+        {
+            if (i->BPF_fd >= 0 && CountProxyTargets(m, i, mDNSNULL, mDNSNULL) == 0) CloseBPF(i);
+        }
+        else                                // else, we're Sleep Proxy Server; open BPF fds
+        {
+            if (i->Exists && i->Registered == i && i->ifinfo.McastTxRx && !(i->ifa_flags & IFF_LOOPBACK) && i->BPF_fd == -1)
+            { LogSPS("%s requesting BPF", i->ifinfo.ifname); i->BPF_fd = -2; mDNSRequestBPF(); }
+        }
+    }
+
+#endif // APPLE_OSX_mDNSResponder
+
+    uDNS_SetupDNSConfig(m);
+    mDNS_ConfigChanged(m);
+
+    if (IsAppleNetwork(m) != mDNS_McastTracingEnabled)
+    {
+        mDNS_McastTracingEnabled = mDNS_McastTracingEnabled ? mDNSfalse : mDNStrue; 
+        LogMsg("mDNSMacOSXNetworkChanged: Multicast Tracing %s", mDNS_McastTracingEnabled ? "Enabled" : "Disabled");
+        UpdateDebugState();
+    }
+
+}
+
+// Called with KQueueLock & mDNS lock
+mDNSlocal void SetNetworkChanged(mDNS *const m, mDNSs32 delay)
+{
+    if (!m->p->NetworkChanged || m->p->NetworkChanged - NonZeroTime(m->timenow + delay) < 0)
+    {
+        m->p->NetworkChanged = NonZeroTime(m->timenow + delay);
+        LogInfo("SetNetworkChanged: scheduling in %d msec", delay);
+    }
+}
+
+// Called with KQueueLock & mDNS lock
+mDNSlocal void SetKeyChainTimer(mDNS *const m, mDNSs32 delay)
+{
+    // If it's not set or it needs to happen sooner than when it's currently set
+    if (!m->p->KeyChainTimer || m->p->KeyChainTimer - NonZeroTime(m->timenow + delay) > 0)
+    {
+        m->p->KeyChainTimer = NonZeroTime(m->timenow + delay);
+        LogInfo("SetKeyChainTimer: %d", delay);
+    }
+}
+
+// Copy the fourth slash-delimited element from either:
+//   State:/Network/Interface/<bsdname>/IPv4
+// or
+//   Setup:/Network/Service/<servicename>/Interface
+mDNSlocal CFStringRef CopyNameFromKey(CFStringRef key)
+{
+    CFArrayRef a;
+    CFStringRef name = NULL;
+
+    a = CFStringCreateArrayBySeparatingStrings(NULL, key, CFSTR("/"));
+    if (a && CFArrayGetCount(a) == 5) name = CFRetain(CFArrayGetValueAtIndex(a, 3));
+    if (a != NULL) CFRelease(a);
+
+    return name;
+}
+
+// Whether a key from a network change notification corresponds to
+// an IP service that is explicitly configured for IPv4 Link Local
+mDNSlocal mDNSBool ChangedKeysHaveIPv4LL(CFArrayRef inkeys)
+{
+    SCDynamicStoreRef store = NULL;
+    CFDictionaryRef dict = NULL;
+    CFMutableArrayRef a;
+    const void **keys = NULL, **vals = NULL;
+    CFStringRef pattern = NULL;
+    int i, ic, j, jc;
+    mDNSBool found = mDNSfalse;
+
+    jc = CFArrayGetCount(inkeys);
+    if (!jc) goto done;
+
+    store = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:ChangedKeysHaveIPv4LL"), NULL, NULL);
+    if (store == NULL) goto done;
+
+    a = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+    if (a == NULL) goto done;
+
+    // Setup:/Network/Service/[^/]+/Interface
+    pattern = SCDynamicStoreKeyCreateNetworkServiceEntity(NULL, kSCDynamicStoreDomainSetup, kSCCompAnyRegex, kSCEntNetInterface);
+    if (pattern == NULL) goto done;
+    CFArrayAppendValue(a, pattern);
+    CFRelease(pattern);
+
+    // Setup:/Network/Service/[^/]+/IPv4
+    pattern = SCDynamicStoreKeyCreateNetworkServiceEntity(NULL, kSCDynamicStoreDomainSetup, kSCCompAnyRegex, kSCEntNetIPv4);
+    if (pattern == NULL) goto done;
+    CFArrayAppendValue(a, pattern);
+    CFRelease(pattern);
+
+    dict = SCDynamicStoreCopyMultiple(store, NULL, a);
+    CFRelease(a);
+
+    if (!dict)
+    {
+        LogMsg("ChangedKeysHaveIPv4LL: Empty dictionary");
+        goto done;
+    }
+
+    ic = CFDictionaryGetCount(dict);
+    vals = mDNSPlatformMemAllocate(sizeof (void *) * ic);
+    keys = mDNSPlatformMemAllocate(sizeof (void *) * ic);
+    CFDictionaryGetKeysAndValues(dict, keys, vals);
+
+    for (j = 0; j < jc && !found; j++)
+    {
+        CFStringRef key = CFArrayGetValueAtIndex(inkeys, j);
+        CFStringRef ifname = NULL;
+
+        char buf[256];
+
+        // It would be nice to use a regex here
+        if (!CFStringHasPrefix(key, CFSTR("State:/Network/Interface/")) || !CFStringHasSuffix(key, kSCEntNetIPv4)) continue;
+
+        if ((ifname = CopyNameFromKey(key)) == NULL) continue;
+        if (mDNS_LoggingEnabled)
+        {
+            if (!CFStringGetCString(ifname, buf, sizeof(buf), kCFStringEncodingUTF8)) buf[0] = 0;
+            LogInfo("ChangedKeysHaveIPv4LL: potential ifname %s", buf);
+        }
+
+        for (i = 0; i < ic; i++)
+        {
+            CFDictionaryRef ipv4dict;
+            CFStringRef name;
+            CFStringRef serviceid;
+            CFStringRef configmethod;
+
+            if (!CFStringHasSuffix(keys[i], kSCEntNetInterface)) continue;
+
+            if (CFDictionaryGetTypeID() != CFGetTypeID(vals[i])) continue;
+
+            if ((name = CFDictionaryGetValue(vals[i], kSCPropNetInterfaceDeviceName)) == NULL) continue;
+
+            if (!CFEqual(ifname, name)) continue;
+
+            if ((serviceid = CopyNameFromKey(keys[i])) == NULL) continue;
+            if (mDNS_LoggingEnabled)
+            {
+                if (!CFStringGetCString(serviceid, buf, sizeof(buf), kCFStringEncodingUTF8)) buf[0] = 0;
+                LogInfo("ChangedKeysHaveIPv4LL: found serviceid %s", buf);
+            }
+
+            pattern = SCDynamicStoreKeyCreateNetworkServiceEntity(NULL, kSCDynamicStoreDomainSetup, serviceid, kSCEntNetIPv4);
+            CFRelease(serviceid);
+            if (pattern == NULL) continue;
+
+            ipv4dict = CFDictionaryGetValue(dict, pattern);
+            CFRelease(pattern);
+            if (!ipv4dict || CFDictionaryGetTypeID() != CFGetTypeID(ipv4dict)) continue;
+
+            configmethod = CFDictionaryGetValue(ipv4dict, kSCPropNetIPv4ConfigMethod);
+            if (!configmethod) continue;
+
+            if (mDNS_LoggingEnabled)
+            {
+                if (!CFStringGetCString(configmethod, buf, sizeof(buf), kCFStringEncodingUTF8)) buf[0] = 0;
+                LogInfo("ChangedKeysHaveIPv4LL: configmethod %s", buf);
+            }
+
+            if (CFEqual(configmethod, kSCValNetIPv4ConfigMethodLinkLocal)) { found = mDNStrue; break; }
+        }
+
+        CFRelease(ifname);
+    }
+
+done:
+    if (vals != NULL) mDNSPlatformMemFree(vals);
+    if (keys != NULL) mDNSPlatformMemFree(keys);
+    if (dict != NULL) CFRelease(dict);
+    if (store != NULL) CFRelease(store);
+
+    return found;
+}
+
+mDNSlocal void NetworkChanged(SCDynamicStoreRef store, CFArrayRef changedKeys, void *context)
+{
+    (void)store;        // Parameter not used
+    mDNSBool changeNow = mDNSfalse;
+    mDNS *const m = (mDNS *const)context;
+    KQueueLock(m);
+    mDNS_Lock(m);
+
+    mDNSs32 delay = mDNSPlatformOneSecond * 2;              // Start off assuming a two-second delay
+
+    int c = CFArrayGetCount(changedKeys);                   // Count changes
+    CFRange range = { 0, c };
+    int c1 = (CFArrayContainsValue(changedKeys, range, NetworkChangedKey_Hostnames   ) != 0);
+    int c2 = (CFArrayContainsValue(changedKeys, range, NetworkChangedKey_Computername) != 0);
+    int c3 = (CFArrayContainsValue(changedKeys, range, NetworkChangedKey_DynamicDNS  ) != 0);
+    int c4 = (CFArrayContainsValue(changedKeys, range, NetworkChangedKey_DNS         ) != 0);
+    if (c && c - c1 - c2 - c3 - c4 == 0)
+        delay = mDNSPlatformOneSecond/10;  // If these were the only changes, shorten delay
+
+    // Do immediate network changed processing for "p2p*" interfaces and
+    // for interfaces with the IFEF_DIRECTLINK flag set.
+    {
+        CFArrayRef  labels;
+        CFIndex     n;
+        for (int i = 0; i < c; i++)
+        {
+            CFStringRef key = CFArrayGetValueAtIndex(changedKeys, i);
+
+            // Only look at keys with prefix "State:/Network/Interface/"
+            if (!CFStringHasPrefix(key, NetworkChangedKey_StateInterfacePrefix))
+                continue;
+
+            // And suffix "IPv6" or "IPv4".
+            if (!CFStringHasSuffix(key, kSCEntNetIPv6) && !CFStringHasSuffix(key, kSCEntNetIPv4))
+                continue;
+
+            labels = CFStringCreateArrayBySeparatingStrings(NULL, key, CFSTR("/"));
+            if (labels == NULL)
+                break;
+            n = CFArrayGetCount(labels);
+
+            // Interface changes will have keys of the form: 
+            //     State:/Network/Interface/<interfaceName>/IPv6
+            // Thus five '/' seperated fields, the 4th one being the <interfaceName> string.
+            if (n == 5)
+            {
+                char buf[256];
+
+                // The 4th label (index = 3) should be the interface name.
+                if (CFStringGetCString(CFArrayGetValueAtIndex(labels, 3), buf, sizeof(buf), kCFStringEncodingUTF8)
+                    && (strstr(buf, "p2p") || (getExtendedFlags(buf) & IFEF_DIRECTLINK)))
+                {
+                    LogInfo("NetworkChanged: interface %s, not delaying network change", buf);
+                    changeNow = mDNStrue;
+                    CFRelease(labels);
+                    break;
+                }
+            }
+            CFRelease(labels);
+        }
+    }
+
+    mDNSBool btmmChanged = CFArrayContainsValue(changedKeys, range, NetworkChangedKey_BackToMyMac);
+    if (btmmChanged) delay = 0;
+
+    if (mDNS_LoggingEnabled)
+    {
+        int i;
+        for (i=0; i<c; i++)
+        {
+            char buf[256];
+            if (!CFStringGetCString(CFArrayGetValueAtIndex(changedKeys, i), buf, sizeof(buf), kCFStringEncodingUTF8)) buf[0] = 0;
+            LogInfo("***   NetworkChanged SC key: %s", buf);
+        }
+        LogInfo("***   NetworkChanged   *** %d change%s %s%s%s%sdelay %d",
+                c, c>1 ? "s" : "",
+                c1 ? "(Local Hostname) " : "",
+                c2 ? "(Computer Name) "  : "",
+                c3 ? "(DynamicDNS) "     : "",
+                c4 ? "(DNS) "            : "",
+                changeNow ? 0 : delay);
+    }
+
+    if (!changeNow)
+        SetNetworkChanged(m, delay);
+
+    // Other software might pick up these changes to register or browse in WAB or BTMM domains,
+    // so in order for secure updates to be made to the server, make sure to read the keychain and
+    // setup the DomainAuthInfo before handing the network change.
+    // If we don't, then we will first try to register services in the clear, then later setup the
+    // DomainAuthInfo, which is incorrect.
+    if (c3 || btmmChanged)
+        SetKeyChainTimer(m, delay);
+
+    mDNS_Unlock(m);
+
+    // If DNS settings changed, immediately force a reconfig (esp. cache flush)
+    // Similarly, if an interface changed that is explicitly IPv4 link local, immediately force a reconfig
+    if (c4 || ChangedKeysHaveIPv4LL(changedKeys) || changeNow) mDNSMacOSXNetworkChanged(m);
+
+    KQueueUnlock(m, "NetworkChanged");
+}
+
+#if APPLE_OSX_mDNSResponder
+mDNSlocal void RefreshSPSStatus(const void *key, const void *value, void *context)
+{
+    (void)context;
+    char buf[IFNAMSIZ];
+
+    CFStringRef ifnameStr = (CFStringRef)key;
+    CFArrayRef array = (CFArrayRef)value;
+    if (!CFStringGetCString(ifnameStr, buf, sizeof(buf), kCFStringEncodingUTF8)) 
+        buf[0] = 0;
+
+    LogInfo("RefreshSPSStatus: Updating SPS state for key %s, array count %d", buf, CFArrayGetCount(array));
+    mDNSDynamicStoreSetConfig(kmDNSSleepProxyServersState, buf, value);
+}
+#endif
+
+mDNSlocal void DynamicStoreReconnected(SCDynamicStoreRef store, void *info)
+{
+    mDNS *const m = (mDNS *const)info;
+    (void)store;
+
+    LogInfo("DynamicStoreReconnected: Reconnected");
+
+    // State:/Network/MulticastDNS
+    SetLocalDomains();
+
+    // State:/Network/DynamicDNS
+    if (m->FQDN.c[0])
+        mDNSPlatformDynDNSHostNameStatusChanged(&m->FQDN, 1);
+
+    // Note: PrivateDNS and BackToMyMac are automatically populated when configd is restarted
+    // as we receive network change notifications and thus not necessary. But we leave it here
+    // so that if things are done differently in the future, this code still works.
+
+    // State:/Network/PrivateDNS
+    if (privateDnsArray)
+        mDNSDynamicStoreSetConfig(kmDNSPrivateConfig, mDNSNULL, privateDnsArray);
+
+#if APPLE_OSX_mDNSResponder
+    mDNS_Lock(m);
+    // State:/Network/BackToMyMac
+    UpdateAutoTunnelDomainStatuses(m);
+    mDNS_Unlock(m);
+
+    // State:/Network/Interface/en0/SleepProxyServers
+    if (spsStatusDict) 
+        CFDictionaryApplyFunction(spsStatusDict, RefreshSPSStatus, NULL);
+#endif
+}
+
+mDNSlocal mStatus WatchForNetworkChanges(mDNS *const m)
+{
+    mStatus err = -1;
+    SCDynamicStoreContext context = { 0, m, NULL, NULL, NULL };
+    SCDynamicStoreRef store    = SCDynamicStoreCreate(NULL, CFSTR("mDNSResponder:WatchForNetworkChanges"), NetworkChanged, &context);
+    CFMutableArrayRef keys     = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+    CFStringRef pattern1 = SCDynamicStoreKeyCreateNetworkInterfaceEntity(NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv4);
+    CFStringRef pattern2 = SCDynamicStoreKeyCreateNetworkInterfaceEntity(NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv6);
+    CFMutableArrayRef patterns = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+
+    if (!store) { LogMsg("SCDynamicStoreCreate failed: %s", SCErrorString(SCError())); goto error; }
+    if (!keys || !pattern1 || !pattern2 || !patterns) goto error;
+
+    CFArrayAppendValue(keys, NetworkChangedKey_IPv4);
+    CFArrayAppendValue(keys, NetworkChangedKey_IPv6);
+    CFArrayAppendValue(keys, NetworkChangedKey_Hostnames);
+    CFArrayAppendValue(keys, NetworkChangedKey_Computername);
+    CFArrayAppendValue(keys, NetworkChangedKey_DNS);
+    CFArrayAppendValue(keys, NetworkChangedKey_DynamicDNS);
+    CFArrayAppendValue(keys, NetworkChangedKey_BackToMyMac);
+    CFArrayAppendValue(keys, NetworkChangedKey_PowerSettings); // should remove as part of <rdar://problem/6751656>
+    CFArrayAppendValue(keys, NetworkChangedKey_BTMMConnectivity);
+    CFArrayAppendValue(patterns, pattern1);
+    CFArrayAppendValue(patterns, pattern2);
+    CFArrayAppendValue(patterns, CFSTR("State:/Network/Interface/[^/]+/AirPort"));
+    if (!SCDynamicStoreSetNotificationKeys(store, keys, patterns))
+    { LogMsg("SCDynamicStoreSetNotificationKeys failed: %s", SCErrorString(SCError())); goto error; }
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    if (!SCDynamicStoreSetDispatchQueue(store, dispatch_get_main_queue()))
+    { LogMsg("SCDynamicStoreCreateRunLoopSource failed: %s", SCErrorString(SCError())); goto error; }
+#else
+    m->p->StoreRLS = SCDynamicStoreCreateRunLoopSource(NULL, store, 0);
+    if (!m->p->StoreRLS) { LogMsg("SCDynamicStoreCreateRunLoopSource failed: %s", SCErrorString(SCError())); goto error; }
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), m->p->StoreRLS, kCFRunLoopDefaultMode);
+#endif
+    SCDynamicStoreSetDisconnectCallBack(store, DynamicStoreReconnected);
+    m->p->Store = store;
+    err = 0;
+    goto exit;
+
+error:
+    if (store) CFRelease(store);
+
+exit:
+    if (patterns) CFRelease(patterns);
+    if (pattern2) CFRelease(pattern2);
+    if (pattern1) CFRelease(pattern1);
+    if (keys) CFRelease(keys);
+
+    return(err);
+}
+
+#if 0 // <rdar://problem/6751656>
+mDNSlocal void PMChanged(void *context)
+{
+    mDNS *const m = (mDNS *const)context;
+
+    KQueueLock(m);
+    mDNS_Lock(m);
+
+    LogSPS("PMChanged");
+
+    SetNetworkChanged(m, mDNSPlatformOneSecond * 2);
+
+    mDNS_Unlock(m);
+    KQueueUnlock(m, "PMChanged");
+}
+
+mDNSlocal mStatus WatchForPMChanges(mDNS *const m)
+{
+    m->p->PMRLS = IOPMPrefsNotificationCreateRunLoopSource(PMChanged, m);
+    if (!m->p->PMRLS) { LogMsg("IOPMPrefsNotificationCreateRunLoopSource failed!"); return mStatus_UnknownErr; }
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), m->p->PMRLS, kCFRunLoopDefaultMode);
+
+    return mStatus_NoError;
+}
+#endif
+
+#if !TARGET_OS_EMBEDDED     // don't setup packet filter rules on embedded
+
+mDNSlocal void mDNSSetPacketFilterRules(mDNS *const m, char * ifname, const ResourceRecord *const excludeRecord)
+{
+    AuthRecord  *rr;
+    pfArray_t portArray;
+    pfArray_t protocolArray;
+    uint32_t count = 0;
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if ((rr->resrec.rrtype == kDNSServiceType_SRV) 
+            && ((rr->ARType == AuthRecordAnyIncludeP2P) || (rr->ARType == AuthRecordAnyIncludeAWDLandP2P)))
+        {
+            const mDNSu8    *p;
+
+            if (count >= PFPortArraySize)
+            {
+                LogMsg("mDNSSetPacketFilterRules: %d service limit, skipping %s", PFPortArraySize, ARDisplayString(m, rr));
+                continue;
+            }
+
+            if (excludeRecord && IdenticalResourceRecord(&rr->resrec, excludeRecord))
+            {
+                LogInfo("mDNSSetPacketFilterRules: record being removed, skipping %s", ARDisplayString(m, rr));
+                continue;
+            }
+
+            LogInfo("mDNSSetPacketFilterRules: found %s", ARDisplayString(m, rr));
+
+            portArray[count] = rr->resrec.rdata->u.srv.port.NotAnInteger;
+
+            // Assume <Service Instance>.<App Protocol>.<Transport Protocol>.<Name>
+            p = rr->resrec.name->c;
+
+            // Skip to App Protocol
+            if (p[0]) p += 1 + p[0];
+
+            // Skip to Transport Protocol
+            if (p[0]) p += 1 + p[0];
+
+            if      (SameDomainLabel(p, (mDNSu8 *)"\x4" "_tcp")) protocolArray[count] = IPPROTO_TCP;
+            else if (SameDomainLabel(p, (mDNSu8 *)"\x4" "_udp")) protocolArray[count] = IPPROTO_UDP;
+            else
+            {
+                LogMsg("mDNSSetPacketFilterRules: could not determine transport protocol of service");
+                LogMsg("mDNSSetPacketFilterRules: %s", ARDisplayString(m, rr));
+                return;
+            }
+            count++;
+        }
+    }
+    mDNSPacketFilterControl(PF_SET_RULES, ifname, count, portArray, protocolArray);
+}
+
+// If the p2p interface already exists, update the Bonjour packet filter rules for it.
+mDNSexport void mDNSUpdatePacketFilter(const ResourceRecord *const excludeRecord)
+{
+    mDNS *const m = &mDNSStorage;
+
+    NetworkInterfaceInfo *intf = GetFirstActiveInterface(m->HostInterfaces);
+    while (intf)
+    {
+        if (strncmp(intf->ifname, "p2p", 3) == 0)
+        {
+            LogInfo("mDNSInitPacketFilter: Setting rules for ifname %s", intf->ifname);
+            mDNSSetPacketFilterRules(m, intf->ifname, excludeRecord);
+            break;
+        }
+        intf = GetFirstActiveInterface(intf->next);
+    }
+}
+
+#else // !TARGET_OS_EMBEDDED
+
+// Currently no packet filter setup required on embedded platforms.
+mDNSexport void mDNSUpdatePacketFilter(const ResourceRecord *const excludeRecord)
+{
+    (void) excludeRecord; // unused
+}
+
+#endif // !TARGET_OS_EMBEDDED
+
+// Handle AWDL KEV_DL_MASTER_ELECTED event by restarting queries and advertisements
+// marked to include the AWDL interface.
+mDNSlocal void newMasterElected(mDNS *const m, struct net_event_data * ptr)
+{
+    char        ifname[IFNAMSIZ];
+    mDNSu32     interfaceIndex;
+    DNSQuestion *q;
+    AuthRecord  *rr;
+    NetworkInterfaceInfoOSX *infoOSX;
+    mDNSInterfaceID InterfaceID;
+
+    snprintf(ifname, IFNAMSIZ, "%s%d", ptr->if_name, ptr->if_unit);
+    interfaceIndex  = if_nametoindex(ifname);
+
+    if (!interfaceIndex)
+    {
+        LogMsg("newMasterElected: if_nametoindex(%s) failed", ifname);
+        return;
+    }
+
+    LogInfo("newMasterElected: ifname = %s, interfaceIndex = %d", ifname, interfaceIndex);
+    infoOSX = IfindexToInterfaceInfoOSX(m, (mDNSInterfaceID)(uintptr_t)interfaceIndex);
+
+    // Can get an KEV_DL_MASTER_ELECTED event prior to the interface existing
+    // when it is first brought up.
+    if (!infoOSX)
+    {
+        LogInfo("newMasterElected: interface not yet active");
+        return;
+    }
+    InterfaceID = infoOSX->ifinfo.InterfaceID;
+
+    for (q = m->Questions; q; q=q->next)
+    {
+        if ((!q->InterfaceID && (q->flags & kDNSServiceFlagsIncludeAWDL))
+            || q->InterfaceID == InterfaceID)
+        {
+            LogInfo("newMasterElected: restarting %s query for %##s", DNSTypeName(q->qtype), q->qname.c);
+            mDNSCoreRestartQuestion(m, q);
+        }
+    }
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+    {
+        if ((!rr->resrec.InterfaceID 
+            && ((rr->ARType == AuthRecordAnyIncludeAWDL) || ((rr->ARType == AuthRecordAnyIncludeAWDLandP2P))))
+           || rr->resrec.InterfaceID == InterfaceID)
+        {
+            LogInfo("newMasterElected: restarting %s announcements for %##s", DNSTypeName(rr->resrec.rrtype), rr->namestorage.c);
+            mDNSCoreRestartRegistration(m, rr, -1);
+        }
+    }
+}
+
+// An ssth array of all zeroes indicates the peer has no services registered.
+mDNSlocal mDNSBool allZeroSSTH(struct opaque_presence_indication *op)
+{
+    int i;
+    int *intp = (int *) op->ssth;
+
+    // MAX_SSTH_SIZE should always be a multiple of sizeof(int), if
+    // it's not, print an error message and return false so that
+    // corresponding peer records are not flushed when KEV_DL_NODE_PRESENCE event
+    // is received.
+    if (MAX_SSTH_SIZE % sizeof(int))
+    {
+        LogInfo("allZeroSSTH: MAX_SSTH_SIZE = %d not a multiple of sizeof(int)", MAX_SSTH_SIZE);
+        return mDNSfalse;
+    }
+
+    for (i = 0; i < (int)(MAX_SSTH_SIZE / sizeof(int)); i++, intp++)
+    {
+        if (*intp)
+            return mDNSfalse;
+    }
+    return mDNStrue;
+}
+
+// mDNS_Reconfirm_internal() adds 33% to this interval, so the records should
+// be removed in 4 seconds.
+#define kAWDLReconfirmTime ((mDNSu32)mDNSPlatformOneSecond *  3)
+
+// Mark records from this peer for deletion from the cache.
+mDNSlocal void removeCachedPeerRecords(mDNS *const m, mDNSu32 ifindex, mDNSAddr *ap)
+{
+    mDNSu32     slot;
+    CacheGroup  *cg;
+    CacheRecord *cr;
+    mDNSInterfaceID InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(m, ifindex);
+
+    if (!InterfaceID)
+    {
+        LogInfo("removeCachedPeerRecords: Invalid ifindex: %d", ifindex);
+        return;
+    }
+
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        if ((InterfaceID == cr->resrec.InterfaceID) && mDNSSameAddress(ap, & cr->sourceAddress))
+        {
+            LogInfo("removeCachedPeerRecords: %s %##s marking for deletion",
+                 DNSTypeName(cr->resrec.rrtype), cr->resrec.name->c);
+            mDNS_Reconfirm_internal(m, cr, kAWDLReconfirmTime);
+        }
+    }
+}
+
+// Handle KEV_DL_NODE_PRESENCE event.
+mDNSlocal void nodePresence(mDNS *const m, struct kev_dl_node_presence * p)
+{
+    char buf[INET6_ADDRSTRLEN];
+    struct opaque_presence_indication *op = (struct opaque_presence_indication *) p->node_service_info;
+
+    if (inet_ntop(AF_INET6, & p->sin6_node_address.sin6_addr, buf, sizeof(buf)))
+        LogInfo("nodePresence:  IPv6 address: %s, SUI %d", buf, op->SUI);
+    else
+        LogInfo("nodePresence:  inet_ntop() error");
+ 
+    // AWDL will generate a KEV_DL_NODE_PRESENCE event with SSTH field of
+    // all zeroes when a node is present and has no services registered.
+    if (allZeroSSTH(op))
+    {
+        mDNSAddr    peerAddr;
+
+        peerAddr.type = mDNSAddrType_IPv6;
+        peerAddr.ip.v6 = *(mDNSv6Addr*)&p->sin6_node_address.sin6_addr;
+
+        LogInfo("nodePresence: ssth is all zeroes, delete cached records from this peer");
+        removeCachedPeerRecords(m, p->sdl_node_address.sdl_index, & peerAddr);
+    }
+}
+
+// Handle KEV_DL_NODE_ABSENCE event.
+mDNSlocal void nodeAbsence(mDNS *const m, struct kev_dl_node_absence * p)
+{
+    mDNSAddr    peerAddr;
+    char buf[INET6_ADDRSTRLEN];
+
+    if (inet_ntop(AF_INET6, & p->sin6_node_address.sin6_addr, buf, sizeof(buf)))
+        LogInfo("nodeAbsence:  IPv6 address: %s", buf);
+    else
+        LogInfo("nodeAbsence:  inet_ntop() error");
+
+    peerAddr.type = mDNSAddrType_IPv6;
+    peerAddr.ip.v6 = *(mDNSv6Addr*)&p->sin6_node_address.sin6_addr;
+
+    LogInfo("nodeAbsence: delete cached records from this peer");
+    removeCachedPeerRecords(m, p->sdl_node_address.sdl_index, & peerAddr);
+}
+
+mDNSlocal void SysEventCallBack(int s1, short __unused filter, void *context)
+{
+    mDNS *const m = (mDNS *const)context;
+
+    mDNS_Lock(m);
+
+    struct { struct kern_event_msg k; char extra[256]; } msg;
+    int bytes = recv(s1, &msg, sizeof(msg), 0);
+    if (bytes < 0)
+        LogMsg("SysEventCallBack: recv error %d errno %d (%s)", bytes, errno, strerror(errno));
+    else
+    {
+        LogInfo("SysEventCallBack got %d bytes size %d %X %s %X %s %X %s id %d code %d %s",
+                bytes, msg.k.total_size,
+                msg.k.vendor_code, msg.k.vendor_code  == KEV_VENDOR_APPLE  ? "KEV_VENDOR_APPLE"  : "?",
+                msg.k.kev_class, msg.k.kev_class    == KEV_NETWORK_CLASS ? "KEV_NETWORK_CLASS" : "?",
+                msg.k.kev_subclass, msg.k.kev_subclass == KEV_DL_SUBCLASS   ? "KEV_DL_SUBCLASS"   : "?",
+                msg.k.id, msg.k.event_code,
+                msg.k.event_code == KEV_DL_SIFFLAGS             ? "KEV_DL_SIFFLAGS"             :
+                msg.k.event_code == KEV_DL_SIFMETRICS           ? "KEV_DL_SIFMETRICS"           :
+                msg.k.event_code == KEV_DL_SIFMTU               ? "KEV_DL_SIFMTU"               :
+                msg.k.event_code == KEV_DL_SIFPHYS              ? "KEV_DL_SIFPHYS"              :
+                msg.k.event_code == KEV_DL_SIFMEDIA             ? "KEV_DL_SIFMEDIA"             :
+                msg.k.event_code == KEV_DL_SIFGENERIC           ? "KEV_DL_SIFGENERIC"           :
+                msg.k.event_code == KEV_DL_ADDMULTI             ? "KEV_DL_ADDMULTI"             :
+                msg.k.event_code == KEV_DL_DELMULTI             ? "KEV_DL_DELMULTI"             :
+                msg.k.event_code == KEV_DL_IF_ATTACHED          ? "KEV_DL_IF_ATTACHED"          :
+                msg.k.event_code == KEV_DL_IF_DETACHING         ? "KEV_DL_IF_DETACHING"         :
+                msg.k.event_code == KEV_DL_IF_DETACHED          ? "KEV_DL_IF_DETACHED"          :
+                msg.k.event_code == KEV_DL_LINK_OFF             ? "KEV_DL_LINK_OFF"             :
+                msg.k.event_code == KEV_DL_LINK_ON              ? "KEV_DL_LINK_ON"              :
+                msg.k.event_code == KEV_DL_PROTO_ATTACHED       ? "KEV_DL_PROTO_ATTACHED"       :
+                msg.k.event_code == KEV_DL_PROTO_DETACHED       ? "KEV_DL_PROTO_DETACHED"       :
+                msg.k.event_code == KEV_DL_LINK_ADDRESS_CHANGED ? "KEV_DL_LINK_ADDRESS_CHANGED" :
+                msg.k.event_code == KEV_DL_WAKEFLAGS_CHANGED    ? "KEV_DL_WAKEFLAGS_CHANGED"    :
+                msg.k.event_code == KEV_DL_IF_IDLE_ROUTE_REFCNT ? "KEV_DL_IF_IDLE_ROUTE_REFCNT" :
+                msg.k.event_code == KEV_DL_IFCAP_CHANGED        ? "KEV_DL_IFCAP_CHANGED"        :
+                msg.k.event_code == KEV_DL_LINK_QUALITY_METRIC_CHANGED    ? "KEV_DL_LINK_QUALITY_METRIC_CHANGED"    :
+                msg.k.event_code == KEV_DL_NODE_PRESENCE        ? "KEV_DL_NODE_PRESENCE"        :
+                msg.k.event_code == KEV_DL_NODE_ABSENCE         ? "KEV_DL_NODE_ABSENCE"         :
+                msg.k.event_code == KEV_DL_MASTER_ELECTED       ? "KEV_DL_MASTER_ELECTED"       :
+                 "?");
+
+        if (msg.k.event_code == KEV_DL_NODE_PRESENCE)
+            nodePresence(m, (struct kev_dl_node_presence *) &msg.k.event_data);
+
+        if (msg.k.event_code == KEV_DL_NODE_ABSENCE)
+            nodeAbsence(m, (struct kev_dl_node_absence *) &msg.k.event_data);
+
+        if (msg.k.event_code == KEV_DL_MASTER_ELECTED)
+            newMasterElected(m, (struct net_event_data *) &msg.k.event_data);
+
+        // We receive network change notifications both through configd and through SYSPROTO_EVENT socket.
+        // Configd may not generate network change events for manually configured interfaces (i.e., non-DHCP)
+        // always during sleep/wakeup due to some race conditions (See radar:8666757). At the same time, if
+        // "Wake on Network Access" is not turned on, the notification will not have KEV_DL_WAKEFLAGS_CHANGED.
+        // Hence, during wake up, if we see a KEV_DL_LINK_ON (i.e., link is UP), we trigger a network change.
+
+        if (msg.k.event_code == KEV_DL_WAKEFLAGS_CHANGED || msg.k.event_code == KEV_DL_LINK_ON)
+            SetNetworkChanged(m, mDNSPlatformOneSecond * 2);
+
+#if !TARGET_OS_EMBEDDED     // don't setup packet filter rules on embedded
+
+        // For p2p interfaces, need to open the advertised service port in the firewall.
+        if (msg.k.event_code == KEV_DL_IF_ATTACHED)
+        {
+            struct net_event_data   * p;
+            p = (struct net_event_data *) &msg.k.event_data;
+
+            if (strncmp(p->if_name, "p2p", 3) == 0)
+            {
+                char ifname[IFNAMSIZ];
+                snprintf(ifname, IFNAMSIZ, "%s%d", p->if_name, p->if_unit);
+
+                LogInfo("SysEventCallBack: KEV_DL_IF_ATTACHED if_family = %d, if_unit = %d, if_name = %s", p->if_family, p->if_unit, p->if_name);
+
+                mDNSSetPacketFilterRules(m, ifname, NULL);
+            }
+        }
+
+        // For p2p interfaces, need to clear the firewall rules on interface detach
+        if (msg.k.event_code == KEV_DL_IF_DETACHED)
+        {
+            struct net_event_data   * p;
+            p = (struct net_event_data *) &msg.k.event_data;
+
+            if (strncmp(p->if_name, "p2p", 3) == 0)
+            {
+                pfArray_t portArray, protocolArray; // not initialized since count is 0 for PF_CLEAR_RULES
+                char ifname[IFNAMSIZ];
+                snprintf(ifname, IFNAMSIZ, "%s%d", p->if_name, p->if_unit);
+
+                LogInfo("SysEventCallBack: KEV_DL_IF_DETACHED if_family = %d, if_unit = %d, if_name = %s", p->if_family, p->if_unit, p->if_name);
+
+                mDNSPacketFilterControl(PF_CLEAR_RULES, ifname, 0, portArray, protocolArray);
+            }
+        }
+#endif // !TARGET_OS_EMBEDDED
+
+    }
+
+    mDNS_Unlock(m);
+}
+
+mDNSlocal mStatus WatchForSysEvents(mDNS *const m)
+{
+    m->p->SysEventNotifier = socket(PF_SYSTEM, SOCK_RAW, SYSPROTO_EVENT);
+    if (m->p->SysEventNotifier < 0)
+    { LogMsg("WatchForSysEvents: socket failed error %d errno %d (%s)", m->p->SysEventNotifier, errno, strerror(errno)); return(mStatus_NoMemoryErr); }
+
+    struct kev_request kev_req = { KEV_VENDOR_APPLE, KEV_NETWORK_CLASS, KEV_DL_SUBCLASS };
+    int err = ioctl(m->p->SysEventNotifier, SIOCSKEVFILT, &kev_req);
+    if (err < 0)
+    {
+        LogMsg("WatchForSysEvents: SIOCSKEVFILT failed error %d errno %d (%s)", err, errno, strerror(errno));
+        close(m->p->SysEventNotifier);
+        m->p->SysEventNotifier = -1;
+        return(mStatus_UnknownErr);
+    }
+
+    m->p->SysEventKQueue.KQcallback = SysEventCallBack;
+    m->p->SysEventKQueue.KQcontext  = m;
+    m->p->SysEventKQueue.KQtask     = "System Event Notifier";
+    KQueueSet(m->p->SysEventNotifier, EV_ADD, EVFILT_READ, &m->p->SysEventKQueue);
+
+    return(mStatus_NoError);
+}
+
+#ifndef NO_SECURITYFRAMEWORK
+mDNSlocal OSStatus KeychainChanged(SecKeychainEvent keychainEvent, SecKeychainCallbackInfo *info, void *context)
+{
+    LogInfo("***   Keychain Changed   ***");
+    mDNS *const m = (mDNS *const)context;
+    SecKeychainRef skc;
+    OSStatus err = SecKeychainCopyDefault(&skc);
+    if (!err)
+    {
+        if (info->keychain == skc)
+        {
+            // For delete events, attempt to verify what item was deleted fail because the item is already gone, so we just assume they may be relevant
+            mDNSBool relevant = (keychainEvent == kSecDeleteEvent);
+            if (!relevant)
+            {
+                UInt32 tags[3] = { kSecTypeItemAttr, kSecServiceItemAttr, kSecAccountItemAttr };
+                SecKeychainAttributeInfo attrInfo = { 3, tags, NULL };  // Count, array of tags, array of formats
+                SecKeychainAttributeList *a = NULL;
+                err = SecKeychainItemCopyAttributesAndData(info->item, &attrInfo, NULL, &a, NULL, NULL);
+                if (!err)
+                {
+                    relevant = ((a->attr[0].length == 4 && (!strncasecmp(a->attr[0].data, "ddns", 4) || !strncasecmp(a->attr[0].data, "sndd", 4))) ||
+                                (a->attr[1].length >= mDNSPlatformStrLen(dnsprefix) && (!strncasecmp(a->attr[1].data, dnsprefix, mDNSPlatformStrLen(dnsprefix)))) ||
+                                (a->attr[1].length >= mDNSPlatformStrLen(btmmprefix) && (!strncasecmp(a->attr[1].data, btmmprefix, mDNSPlatformStrLen(btmmprefix)))));
+                    SecKeychainItemFreeAttributesAndData(a, NULL);
+                }
+            }
+            if (relevant)
+            {
+                LogInfo("***   Keychain Changed   *** KeychainEvent=%d %s",
+                        keychainEvent,
+                        keychainEvent == kSecAddEvent    ? "kSecAddEvent"    :
+                        keychainEvent == kSecDeleteEvent ? "kSecDeleteEvent" :
+                        keychainEvent == kSecUpdateEvent ? "kSecUpdateEvent" : "<Unknown>");
+                // We're running on the CFRunLoop (Mach port) thread, not the kqueue thread, so we need to grab the KQueueLock before proceeding
+                KQueueLock(m);
+                mDNS_Lock(m);
+
+                // To not read the keychain twice: when BTMM is enabled, changes happen to the keychain
+                // then the BTMM DynStore dictionary, so delay reading the keychain for a second.
+                // NetworkChanged() will reset the keychain timer to fire immediately when the DynStore changes.
+                //
+                // In the "fixup" case where the BTMM DNS servers aren't accepting the key mDNSResponder has,
+                // the DynStore dictionary won't change (because the BTMM zone won't change).  In that case,
+                // a one second delay is ok, as we'll still converge to correctness, and there's no race
+                // condition between the RegistrationDomain and the DomainAuthInfo.
+                //
+                // Lastly, non-BTMM WAB cases can use the keychain but not the DynStore, so we need to set
+                // the timer here, as it will not get set by NetworkChanged().
+                SetKeyChainTimer(m, mDNSPlatformOneSecond);
+
+                mDNS_Unlock(m);
+                KQueueUnlock(m, "KeychainChanged");
+            }
+        }
+        CFRelease(skc);
+    }
+
+    return 0;
+}
+#endif
+
+mDNSlocal void PowerOn(mDNS *const m)
+{
+    mDNSCoreMachineSleep(m, false);     // Will set m->SleepState = SleepState_Awake;
+    if (m->p->WakeAtUTC)
+    {
+        long utc = mDNSPlatformUTC();
+        mDNSPowerRequest(-1,-1);        // Need to explicitly clear any previous power requests -- they're not cleared automatically on wake
+        if (m->p->WakeAtUTC - utc > 30)
+        { 
+            LogSPS("PowerChanged PowerOn %d seconds early, assuming not maintenance wake", m->p->WakeAtUTC - utc);
+        }
+        else if (utc - m->p->WakeAtUTC > 30) 
+        {
+            LogSPS("PowerChanged PowerOn %d seconds late, assuming not maintenance wake", utc - m->p->WakeAtUTC);
+        }
+        else if (IsAppleTV())
+        { 
+            LogSPS("PowerChanged PowerOn %d seconds late, device is an AppleTV running iOS so not re-sleeping", utc - m->p->WakeAtUTC);
+        }
+        else
+        {
+            LogSPS("PowerChanged: Waking for network maintenance operations %d seconds early; re-sleeping in 20 seconds", m->p->WakeAtUTC - utc);
+            m->p->RequestReSleep = mDNS_TimeNow(m) + 20 * mDNSPlatformOneSecond;
+        }
+    }
+}
+
+mDNSlocal void PowerChanged(void *refcon, io_service_t service, natural_t messageType, void *messageArgument)
+{
+    mDNS *const m = (mDNS *const)refcon;
+    KQueueLock(m);
+    (void)service;    // Parameter not used
+    debugf("PowerChanged %X %lX", messageType, messageArgument);
+
+    // Make sure our m->SystemWakeOnLANEnabled value correctly reflects the current system setting
+    m->SystemWakeOnLANEnabled = SystemWakeForNetworkAccess();
+
+    switch(messageType)
+    {
+    case kIOMessageCanSystemPowerOff:       LogSPS("PowerChanged kIOMessageCanSystemPowerOff     (no action)"); break;          // E0000240
+    case kIOMessageSystemWillPowerOff:      LogSPS("PowerChanged kIOMessageSystemWillPowerOff");                                // E0000250
+        mDNSCoreMachineSleep(m, true);
+        if (m->SleepState == SleepState_Sleeping) mDNSMacOSXNetworkChanged(m);
+        break;
+    case kIOMessageSystemWillNotPowerOff:   LogSPS("PowerChanged kIOMessageSystemWillNotPowerOff (no action)"); break;          // E0000260
+    case kIOMessageCanSystemSleep:          LogSPS("PowerChanged kIOMessageCanSystemSleep        (no action)"); break;          // E0000270
+    case kIOMessageSystemWillSleep:         LogSPS("PowerChanged kIOMessageSystemWillSleep");                                   // E0000280
+        mDNSCoreMachineSleep(m, true);
+        break;
+    case kIOMessageSystemWillNotSleep:      LogSPS("PowerChanged kIOMessageSystemWillNotSleep    (no action)"); break;          // E0000290
+    case kIOMessageSystemHasPoweredOn:      LogSPS("PowerChanged kIOMessageSystemHasPoweredOn");                                // E0000300
+        // If still sleeping (didn't get 'WillPowerOn' message for some reason?) wake now
+        if (m->SleepState)
+        {
+            LogMsg("PowerChanged kIOMessageSystemHasPoweredOn: ERROR m->SleepState %d", m->SleepState);
+            PowerOn(m);
+        }
+        // Just to be safe, schedule a mDNSMacOSXNetworkChanged(), in case we never received
+        // the System Configuration Framework "network changed" event that we expect
+        // to receive some time shortly after the kIOMessageSystemWillPowerOn message
+        mDNS_Lock(m);
+        if (!m->p->NetworkChanged ||
+            m->p->NetworkChanged - NonZeroTime(m->timenow + mDNSPlatformOneSecond * 2) < 0)
+            m->p->NetworkChanged = NonZeroTime(m->timenow + mDNSPlatformOneSecond * 2);
+        mDNS_Unlock(m);
+
+        break;
+    case kIOMessageSystemWillRestart:       LogSPS("PowerChanged kIOMessageSystemWillRestart     (no action)"); break;          // E0000310
+    case kIOMessageSystemWillPowerOn:       LogSPS("PowerChanged kIOMessageSystemWillPowerOn");                                 // E0000320
+
+        // Make sure our interface list is cleared to the empty state, then tell mDNSCore to wake
+        if (m->SleepState != SleepState_Sleeping)
+        {
+            LogMsg("kIOMessageSystemWillPowerOn: ERROR m->SleepState %d", m->SleepState);
+            m->SleepState = SleepState_Sleeping;
+            mDNSMacOSXNetworkChanged(m);
+        }
+        PowerOn(m);
+        break;
+    default:                                LogSPS("PowerChanged unknown message %X", messageType); break;
+    }
+
+    if (messageType == kIOMessageSystemWillSleep) m->p->SleepCookie = (long)messageArgument;
+    else IOAllowPowerChange(m->p->PowerConnection, (long)messageArgument);
+
+    KQueueUnlock(m, "PowerChanged Sleep/Wake");
+}
+
+// iPhone OS doesn't currently have SnowLeopard's IO Power Management
+// but it does define kIOPMAcknowledgmentOptionSystemCapabilityRequirements
+#if defined(kIOPMAcknowledgmentOptionSystemCapabilityRequirements) && !TARGET_OS_EMBEDDED
+mDNSlocal void SnowLeopardPowerChanged(void *refcon, IOPMConnection connection, IOPMConnectionMessageToken token, IOPMSystemPowerStateCapabilities eventDescriptor)
+{
+    mDNS *const m = (mDNS *const)refcon;
+    KQueueLock(m);
+    LogSPS("SnowLeopardPowerChanged %X %X %X%s%s%s%s%s",
+           connection, token, eventDescriptor,
+           eventDescriptor & kIOPMSystemPowerStateCapabilityCPU     ? " CPU"     : "",
+           eventDescriptor & kIOPMSystemPowerStateCapabilityVideo   ? " Video"   : "",
+           eventDescriptor & kIOPMSystemPowerStateCapabilityAudio   ? " Audio"   : "",
+           eventDescriptor & kIOPMSystemPowerStateCapabilityNetwork ? " Network" : "",
+           eventDescriptor & kIOPMSystemPowerStateCapabilityDisk    ? " Disk"    : "");
+
+    // Make sure our m->SystemWakeOnLANEnabled value correctly reflects the current system setting
+    m->SystemWakeOnLANEnabled = SystemWakeForNetworkAccess();
+
+    if (eventDescriptor & kIOPMSystemPowerStateCapabilityCPU)
+    {
+        // We might be in Sleeping or Transferring state. When we go from "wakeup" to "sleep" state, we don't
+        // go directly to sleep state, but transfer in to the sleep state during which SleepState is set to
+        // SleepState_Transferring. During that time, we might get another wakeup before we transition to Sleeping
+        // state. In that case, we need to acknowledge the previous "sleep" before we acknowledge the wakeup.
+        if (m->SleepLimit)
+        {
+            LogSPS("SnowLeopardPowerChanged: Waking up, Acking old Sleep, SleepLimit %d SleepState %d", m->SleepLimit, m->SleepState);
+            IOPMConnectionAcknowledgeEvent(connection, m->p->SleepCookie);
+            m->SleepLimit = 0;
+        }
+        LogSPS("SnowLeopardPowerChanged: Waking up, Acking Wakeup, SleepLimit %d SleepState %d", m->SleepLimit, m->SleepState);
+        // If the network notifications have already come before we got the wakeup, we ignored them and
+        // in case we get no more, we need to trigger one.
+        mDNS_Lock(m);
+        SetNetworkChanged(m, 2 * mDNSPlatformOneSecond);
+        mDNS_Unlock(m);
+        // CPU Waking. Note: Can get this message repeatedly, as other subsystems power up or down.
+        if (m->SleepState != SleepState_Awake) PowerOn(m);
+        IOPMConnectionAcknowledgeEvent(connection, token);
+    }
+    else
+    {
+        // CPU sleeping. Should not get this repeatedly -- once we're told that the CPU is halting
+        // we should hear nothing more until we're told that the CPU has started executing again.
+        if (m->SleepState) LogMsg("SnowLeopardPowerChanged: Sleep Error %X m->SleepState %d", eventDescriptor, m->SleepState);
+        //sleep(5);
+        //mDNSMacOSXNetworkChanged(m);
+        mDNSCoreMachineSleep(m, true);
+        //if (m->SleepState == SleepState_Sleeping) mDNSMacOSXNetworkChanged(m);
+        m->p->SleepCookie = token;
+    }
+
+    KQueueUnlock(m, "SnowLeopardPowerChanged Sleep/Wake");
+}
+#endif
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - /etc/hosts support
+#endif
+
+// Implementation Notes
+//
+// As /etc/hosts file can be huge (1000s of entries - when this comment was written, the test file had about
+// 23000 entries with about 4000 duplicates), we can't use a linked list to store these entries. So, we parse
+// them into a hash table. The implementation need to be able to do the following things efficiently
+//
+// 1. Detect duplicates e.g., two entries with "1.2.3.4 foo"
+// 2. Detect whether /etc/hosts has changed and what has changed since the last read from the disk
+// 3. Ability to support multiple addresses per name e.g., "1.2.3.4 foo, 2.3.4.5 foo". To support this, we
+//    need to be able set the RRSet of a resource record to the first one in the list and also update when
+//    one of them go away. This is needed so that the core thinks that they are all part of the same RRSet and
+//    not a duplicate
+// 4. Don't maintain any local state about any records registered with the core to detect changes to /etc/hosts
+//
+// CFDictionary is not a suitable candidate because it does not support duplicates and even if we use a custom
+// "hash" function to solve this, the others are hard to solve. Hence, we share the hash (AuthHash) implementation
+// of the core layer which does all of the above very efficiently
+
+#define ETCHOSTS_BUFSIZE    1024    // Buffer size to parse a single line in /etc/hosts
+
+mDNSexport void FreeEtcHosts(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;  // unused
+    (void)rr;
+    (void)result;
+    if (result == mStatus_MemFree)
+    {
+        LogInfo("FreeEtcHosts: %s", ARDisplayString(m, rr));
+        freeL("etchosts", rr);
+    }
+}
+
+// Returns true on success and false on failure
+mDNSlocal mDNSBool mDNSMacOSXCreateEtcHostsEntry(mDNS *const m, const domainname *domain, const struct sockaddr *sa, const domainname *cname, char *ifname, AuthHash *auth)
+{
+    AuthRecord *rr;
+    mDNSu32 slot;
+    mDNSu32 namehash;
+    AuthGroup *ag;
+    mDNSInterfaceID InterfaceID = mDNSInterface_LocalOnly;
+    mDNSu16 rrtype;
+
+    if (!domain)
+    {
+        LogMsg("mDNSMacOSXCreateEtcHostsEntry: ERROR!! name NULL");
+        return mDNSfalse;
+    }
+    if (!sa && !cname)
+    {
+        LogMsg("mDNSMacOSXCreateEtcHostsEntry: ERROR!! sa and cname both NULL");
+        return mDNSfalse;
+    }
+
+    if (sa && sa->sa_family != AF_INET && sa->sa_family != AF_INET6)
+    {
+        LogMsg("mDNSMacOSXCreateEtcHostsEntry: ERROR!! sa with bad family %d", sa->sa_family);
+        return mDNSfalse;
+    }
+
+
+    if (ifname)
+    {
+        mDNSu32 ifindex = if_nametoindex(ifname);
+        if (!ifindex)
+        {
+            LogMsg("mDNSMacOSXCreateEtcHostsEntry: hosts entry %##s with invalid ifname %s", domain->c, ifname);
+            return mDNSfalse;
+        }
+        InterfaceID = (mDNSInterfaceID)(uintptr_t)ifindex;
+    }
+
+    if (sa)
+        rrtype = (sa->sa_family == AF_INET ? kDNSType_A : kDNSType_AAAA);
+    else
+        rrtype = kDNSType_CNAME;
+
+    // Check for duplicates. See whether we parsed an entry before like this ?
+    slot = AuthHashSlot(domain);
+    namehash = DomainNameHashValue(domain);
+    ag = AuthGroupForName(auth, slot, namehash, domain);
+    if (ag)
+    {
+        rr = ag->members;
+        while (rr)
+        {
+            if (rr->resrec.rrtype == rrtype)
+            {
+                if (rrtype == kDNSType_A)
+                {
+                    mDNSv4Addr ip;
+                    ip.NotAnInteger = ((struct sockaddr_in*)sa)->sin_addr.s_addr;
+                    if (mDNSSameIPv4Address(rr->resrec.rdata->u.ipv4, ip))
+                    {
+                        LogInfo("mDNSMacOSXCreateEtcHostsEntry: Same IPv4 address for name %##s", domain->c);
+                        return mDNSfalse;
+                    }
+                }
+                else if (rrtype == kDNSType_AAAA)
+                {
+                    mDNSv6Addr ip6;
+                    ip6.l[0] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[0];
+                    ip6.l[1] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[1];
+                    ip6.l[2] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[2];
+                    ip6.l[3] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[3];
+                    if (mDNSSameIPv6Address(rr->resrec.rdata->u.ipv6, ip6))
+                    {
+                        LogInfo("mDNSMacOSXCreateEtcHostsEntry: Same IPv6 address for name %##s", domain->c);
+                        return mDNSfalse;
+                    }
+                }
+                else if (rrtype == kDNSType_CNAME)
+                {
+                    if (SameDomainName(&rr->resrec.rdata->u.name, cname))
+                    {
+                        LogInfo("mDNSMacOSXCreateEtcHostsEntry: Same cname %##s for name %##s", cname->c, domain->c);
+                        return mDNSfalse;
+                    }
+                }
+            }
+            rr = rr->next;
+        }
+    }
+    rr= mallocL("etchosts", sizeof(*rr));
+    if (rr == NULL) return mDNSfalse;
+    mDNSPlatformMemZero(rr, sizeof(*rr));
+    mDNS_SetupResourceRecord(rr, NULL, InterfaceID, rrtype, 1, kDNSRecordTypeKnownUnique, AuthRecordLocalOnly, FreeEtcHosts, NULL);
+    AssignDomainName(&rr->namestorage, domain);
+
+    if (sa)
+    {
+        rr->resrec.rdlength = sa->sa_family == AF_INET ? sizeof(mDNSv4Addr) : sizeof(mDNSv6Addr);
+        if (sa->sa_family == AF_INET)
+            rr->resrec.rdata->u.ipv4.NotAnInteger = ((struct sockaddr_in*)sa)->sin_addr.s_addr;
+        else
+        {
+            rr->resrec.rdata->u.ipv6.l[0] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[0];
+            rr->resrec.rdata->u.ipv6.l[1] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[1];
+            rr->resrec.rdata->u.ipv6.l[2] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[2];
+            rr->resrec.rdata->u.ipv6.l[3] = ((struct sockaddr_in6*)sa)->sin6_addr.__u6_addr.__u6_addr32[3];
+        }
+    }
+    else
+    {
+        rr->resrec.rdlength = DomainNameLength(cname);
+        rr->resrec.rdata->u.name.c[0] = 0;
+        AssignDomainName(&rr->resrec.rdata->u.name, cname);
+    }
+    rr->resrec.namehash = DomainNameHashValue(rr->resrec.name);
+    SetNewRData(&rr->resrec, mDNSNULL, 0);  // Sets rr->rdatahash for us
+    LogInfo("mDNSMacOSXCreateEtcHostsEntry: Adding resource record %s", ARDisplayString(m, rr));
+    InsertAuthRecord(m, auth, rr);
+    return mDNStrue;
+}
+
+mDNSlocal int EtcHostsParseOneName(int start, int length, char *buffer, char **name)
+{
+    int i;
+
+    *name = NULL;
+    for (i = start; i < length; i++)
+    {
+        if (buffer[i] == '#')
+            return -1;
+        if (buffer[i] != ' ' && buffer[i] != ',' && buffer[i] != '\t')
+        {
+            *name = &buffer[i];
+
+            // Found the start of a name, find the end and null terminate
+            for (i++; i < length; i++)
+            {
+                if (buffer[i] == ' ' || buffer[i] == ',' || buffer[i] == '\t')
+                {
+                    buffer[i] = 0;
+                    break;
+                }
+            }
+            return i;
+        }
+    }
+    return -1;
+}
+
+mDNSlocal void mDNSMacOSXParseEtcHostsLine(mDNS *const m, char *buffer, ssize_t length, AuthHash *auth)
+{
+    int i;
+    int ifStart = 0;
+    char *ifname = NULL;
+    domainname name1d;
+    domainname name2d;
+    char *name1;
+    char *name2;
+    int aliasIndex;
+
+    //Ignore leading whitespaces and tabs
+    while (*buffer == ' ' || *buffer == '\t')
+    {
+        buffer++;
+        length--;
+    }
+
+    // Find the end of the address string
+    for (i = 0; i < length; i++)
+    {
+        if (buffer[i] == ' ' || buffer[i] == ',' || buffer[i] == '\t' || buffer[i] == '%')
+        {
+            if (buffer[i] == '%')
+                ifStart = i + 1;
+            buffer[i] = 0;
+            break;
+        }
+    }
+
+    // Convert the address string to an address
+    struct addrinfo hints;
+    bzero(&hints, sizeof(hints));
+    hints.ai_flags = AI_NUMERICHOST;
+    struct addrinfo *gairesults = NULL;
+    if (getaddrinfo(buffer, NULL, &hints, &gairesults) != 0)
+    {
+        LogInfo("mDNSMacOSXParseEtcHostsLine: getaddrinfo returning null");
+        return;
+    }
+
+    if (ifStart)
+    {
+        // Parse the interface
+        ifname = &buffer[ifStart];
+        for (i = ifStart + 1; i < length; i++)
+        {
+            if (buffer[i] == ' ' || buffer[i] == ',' || buffer[i] == '\t')
+            {
+                buffer[i] = 0;
+                break;
+            }
+        }
+    }
+
+    i = EtcHostsParseOneName(i + 1, length, buffer, &name1);
+    if (i == length)
+    {
+        // Common case (no aliases) : The entry is of the form "1.2.3.4 somehost" with no trailing white spaces/tabs etc.
+        if (!MakeDomainNameFromDNSNameString(&name1d, name1))
+        {
+            LogMsg("mDNSMacOSXParseEtcHostsLine: ERROR!! cannot convert to domain name %s", name1);
+            freeaddrinfo(gairesults);
+            return;
+        }
+        mDNSMacOSXCreateEtcHostsEntry(m, &name1d, gairesults->ai_addr, mDNSNULL, ifname, auth);
+    }
+    else if (i != -1)
+    {
+        domainname first;
+        // We might have some extra white spaces at the end for the common case of "1.2.3.4 somehost".
+        // When we parse again below, EtchHostsParseOneName would return -1 and we will end up
+        // doing the right thing.
+        if (!MakeDomainNameFromDNSNameString(&first, name1))
+        {
+            LogMsg("mDNSMacOSXParseEtcHostsLine: ERROR!! cannot convert to domain name %s", name1);
+            freeaddrinfo(gairesults);
+            return;
+        }
+        // If the /etc/hosts has an entry like this
+        //
+        // 1.2.3.4 sun star bright
+        //
+        // star and bright are aliases (gethostbyname h_alias should point to these) and sun is the canonical
+        // name (getaddrinfo ai_cannonname and gethostbyname h_name points to "sun")
+        //
+        // To achieve this, we need to add the entry like this:
+        //
+        // star CNAME bright
+        // bright CNAME sun
+        // sun A 1.2.3.4
+        //
+        // We store the first name we parsed in "first". Then we parse additional names adding CNAME records
+        // till we reach the end. When we reach the end, we wrap around and add one final CNAME with the last
+        // entry and the first entry. Finally, we add the Address (A/AAAA) record.
+        aliasIndex = 0;
+        while (i <= length)
+        {
+            // Parse a name. If there are no names, we need to know whether we
+            // parsed CNAMEs before or not. If we parsed CNAMEs before, then we
+            // add a CNAME with the last name and the first name. Otherwise, this
+            // is same as the common case above where the line has just one name
+            // but with trailing white spaces.
+            i = EtcHostsParseOneName(i + 1, length, buffer, &name2);
+            if (name2)
+            {
+                if (!MakeDomainNameFromDNSNameString(&name2d, name2))
+                {
+                    LogMsg("mDNSMacOSXParseEtcHostsLine: ERROR!! cannot convert to domain name %s", name2);
+                    freeaddrinfo(gairesults);
+                    return;
+                }
+                aliasIndex++;
+            }
+            else if (!aliasIndex)
+            {
+                // We have never parsed any aliases. This case happens if there
+                // is just one name and some extra white spaces at the end.
+                LogInfo("mDNSMacOSXParseEtcHostsLine: White space at the end of %##s", first.c);
+                break;
+            }
+            else
+            {
+                // We have parsed at least one alias before and we reached the end of the line.
+                // Setup a CNAME for the last name with "first" name as its RDATA
+                name2d.c[0] = 0;
+                AssignDomainName(&name2d, &first);
+            }
+
+            // Don't add a CNAME for the first alias we parse (see the example above).
+            // As we parse more, we might discover that there are no more aliases, in
+            // which case we would have set "name2d" to "first" above. We need to add
+            // the CNAME in that case.
+
+            if (aliasIndex > 1 || SameDomainName(&name2d, &first))
+            {
+                // Ignore if it points to itself
+                if (!SameDomainName(&name1d, &name2d))
+                {
+                    if (!mDNSMacOSXCreateEtcHostsEntry(m, &name1d, mDNSNULL, &name2d, ifname, auth))
+                    {
+                        freeaddrinfo(gairesults);
+                        return;
+                    }
+                }
+                else
+                    LogMsg("mDNSMacOSXParseEtcHostsLine: Ignoring entry with same names name1 %##s, name2 %##s", name1d.c, name2d.c);
+            }
+
+            // If we have already wrapped around, we just need to add the A/AAAA record alone
+            // which is done below
+            if (SameDomainName(&name2d, &first)) break;
+
+            // Remember the current name so that we can set the CNAME record if we parse one
+            // more name
+            name1d.c[0] = 0;
+            AssignDomainName(&name1d, &name2d);
+        }
+        // Added all the CNAMEs if any, add the "A/AAAA" record
+        mDNSMacOSXCreateEtcHostsEntry(m, &first, gairesults->ai_addr, mDNSNULL, ifname, auth);
+    }
+    freeaddrinfo(gairesults);
+}
+
+mDNSlocal void mDNSMacOSXParseEtcHosts(mDNS *const m, int fd, AuthHash *auth)
+{
+    mDNSBool good;
+    char buf[ETCHOSTS_BUFSIZE];
+    ssize_t len;
+    FILE *fp;
+
+    if (fd == -1) { LogInfo("mDNSMacOSXParseEtcHosts: fd is -1"); return; }
+
+    fp = fopen("/etc/hosts", "r");
+    if (!fp) { LogInfo("mDNSMacOSXParseEtcHosts: fp is NULL"); return; }
+
+    while (1)
+    {
+        good = (fgets(buf, ETCHOSTS_BUFSIZE, fp) != NULL);
+        if (!good) break;
+
+        // skip comment and empty lines
+        if (buf[0] == '#' || buf[0] == '\r' || buf[0] == '\n')
+            continue;
+
+        len = strlen(buf);
+        if (!len) break;    // sanity check
+        //Check for end of line code(mostly only \n but pre-OS X Macs could have only \r)
+        if (buf[len - 1] == '\r' || buf[len - 1] == '\n')
+        {
+            buf[len - 1] = '\0';
+            len = len - 1;
+        }
+        // fgets always null terminates and hence even if we have no
+        // newline at the end, it is null terminated. The callee
+        // (mDNSMacOSXParseEtcHostsLine) expects the length to be such that
+        // buf[length] is zero and hence we decrement len to reflect that.
+        if (len)
+        {
+            //Additional check when end of line code is 2 chars ie\r\n(DOS, other old OSes)
+            //here we need to check for just \r but taking extra caution.
+            if (buf[len - 1] == '\r' || buf[len - 1] == '\n')
+            {
+                buf[len - 1] = '\0';
+                len = len - 1;
+            }
+        }
+        if (!len) //Sanity Check: len should never be zero
+        {
+            LogMsg("mDNSMacOSXParseEtcHosts: Length is zero!");
+            continue;
+        }
+        mDNSMacOSXParseEtcHostsLine(m, buf, len, auth);
+    }
+    fclose(fp);
+}
+
+mDNSlocal void mDNSMacOSXUpdateEtcHosts(mDNS *const m);
+
+mDNSlocal int mDNSMacOSXGetEtcHostsFD(mDNS *const m)
+{
+#ifdef __DISPATCH_GROUP__
+    // Can't do this stuff to be notified of changes in /etc/hosts if we don't have libdispatch
+    static dispatch_queue_t etcq     = 0;
+    static dispatch_source_t etcsrc   = 0;
+    static dispatch_source_t hostssrc = 0;
+
+    // First time through? just schedule ourselves on the main queue and we'll do the work later
+    if (!etcq)
+    {
+        etcq = dispatch_get_main_queue();
+        if (etcq)
+        {
+            // Do this work on the queue, not here - solves potential synchronization issues
+            dispatch_async(etcq, ^{mDNSMacOSXUpdateEtcHosts(m);});
+        }
+        return -1;
+    }
+
+    if (hostssrc) return dispatch_source_get_handle(hostssrc);
+#endif
+
+    int fd = open("/etc/hosts", O_RDONLY);
+
+#ifdef __DISPATCH_GROUP__
+    // Can't do this stuff to be notified of changes in /etc/hosts if we don't have libdispatch
+    if (fd == -1)
+    {
+        // If the open failed and we're already watching /etc, we're done
+        if (etcsrc) { LogInfo("mDNSMacOSXGetEtcHostsFD: Returning etcfd because no etchosts"); return fd; }
+
+        // we aren't watching /etc, we should be
+        fd = open("/etc", O_RDONLY);
+        if (fd == -1) { LogInfo("mDNSMacOSXGetEtcHostsFD: etc does not exist"); return -1; }
+        etcsrc = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_RENAME, etcq);
+        if (etcsrc == NULL)
+        {
+            close(fd);
+            return -1;
+        }
+        dispatch_source_set_event_handler(etcsrc,
+                                          ^{
+                                              u_int32_t flags = dispatch_source_get_data(etcsrc);
+                                              LogMsg("mDNSMacOSXGetEtcHostsFD: /etc changed 0x%x", flags);
+                                              if ((flags & (DISPATCH_VNODE_DELETE | DISPATCH_VNODE_RENAME)) != 0)
+                                              {
+                                                  dispatch_source_cancel(etcsrc);
+                                                  dispatch_release(etcsrc);
+                                                  etcsrc = NULL;
+                                                  dispatch_async(etcq, ^{mDNSMacOSXUpdateEtcHosts(m);});
+                                                  return;
+                                              }
+                                              if ((flags & DISPATCH_VNODE_WRITE) != 0 && hostssrc == NULL)
+                                              {
+                                                  mDNSMacOSXUpdateEtcHosts(m);
+                                              }
+                                          });
+        dispatch_source_set_cancel_handler(etcsrc, ^{close(fd);});
+        dispatch_resume(etcsrc);
+
+        // Try and open /etc/hosts once more now that we're watching /etc, in case we missed the creation
+        fd = open("/etc/hosts", O_RDONLY | O_EVTONLY);
+        if (fd == -1) { LogMsg("mDNSMacOSXGetEtcHostsFD etc hosts does not exist, watching etc"); return -1; }
+    }
+
+    // create a dispatch source to watch for changes to hosts file
+    hostssrc = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd,
+                                      (DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_RENAME |
+                                       DISPATCH_VNODE_ATTRIB | DISPATCH_VNODE_EXTEND | DISPATCH_VNODE_LINK | DISPATCH_VNODE_REVOKE), etcq);
+    if (hostssrc == NULL)
+    {
+        close(fd);
+        return -1;
+    }
+    dispatch_source_set_event_handler(hostssrc,
+                                      ^{
+                                          u_int32_t flags = dispatch_source_get_data(hostssrc);
+                                          LogInfo("mDNSMacOSXGetEtcHostsFD: /etc/hosts changed 0x%x", flags);
+                                          if ((flags & (DISPATCH_VNODE_DELETE | DISPATCH_VNODE_RENAME)) != 0)
+                                          {
+                                              dispatch_source_cancel(hostssrc);
+                                              dispatch_release(hostssrc);
+                                              hostssrc = NULL;
+                                              // Bug in LibDispatch: wait a second before scheduling the block. If we schedule
+                                              // the block immediately, we try to open the file and the file may not exist and may
+                                              // fail to get a notification in the future. When the file does not exist and
+                                              // we start to monitor the directory, on "dispatch_resume" of that source, there
+                                              // is no guarantee that the file creation will be notified always because when
+                                              // the dispatch_resume returns, the kevent manager may not have registered the
+                                              // kevent yet but the file may have been created
+                                              usleep(1000000);
+                                              dispatch_async(etcq, ^{mDNSMacOSXUpdateEtcHosts(m);});
+                                              return;
+                                          }
+                                          if ((flags & DISPATCH_VNODE_WRITE) != 0)
+                                          {
+                                              mDNSMacOSXUpdateEtcHosts(m);
+                                          }
+                                      });
+    dispatch_source_set_cancel_handler(hostssrc, ^{LogInfo("mDNSMacOSXGetEtcHostsFD: Closing etchosts fd %d", fd); close(fd);});
+    dispatch_resume(hostssrc);
+
+    // Cleanup /etc source, no need to watch it if we already have /etc/hosts
+    if (etcsrc)
+    {
+        dispatch_source_cancel(etcsrc);
+        dispatch_release(etcsrc);
+        etcsrc = NULL;
+    }
+
+    LogInfo("mDNSMacOSXGetEtcHostsFD: /etc/hosts being monitored, and not etc");
+    return hostssrc ? (int)dispatch_source_get_handle(hostssrc) : -1;
+#else
+    (void)m;
+    return fd;
+#endif
+}
+
+// When /etc/hosts is modified, flush all the cache records as there may be local
+// authoritative answers now
+mDNSlocal void FlushAllCacheRecords(mDNS *const m)
+{
+    CacheRecord *cr;
+    mDNSu32 slot;
+    CacheGroup *cg;
+
+    FORALL_CACHERECORDS(slot, cg, cr)
+    {
+        // Skip multicast.
+        if (cr->resrec.InterfaceID) continue;
+
+        // If a resource record can answer A or AAAA, they need to be flushed so that we will
+        // never used to deliver an ADD or RMV
+        if (RRTypeAnswersQuestionType(&cr->resrec, kDNSType_A) ||
+            RRTypeAnswersQuestionType(&cr->resrec, kDNSType_AAAA))
+        {
+            LogInfo("FlushAllCacheRecords: Purging Resourcerecord %s", CRDisplayString(m, cr));
+            mDNS_PurgeCacheResourceRecord(m, cr);
+        }
+    }
+}
+
+// Add new entries to the core. If justCheck is set, this function does not add, just returns true
+mDNSlocal mDNSBool EtcHostsAddNewEntries(mDNS *const m, AuthHash *newhosts, mDNSBool justCheck)
+{
+    AuthGroup *ag;
+    mDNSu32 slot;
+    AuthRecord *rr, *primary, *rrnext;
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+        for (ag = newhosts->rrauth_hash[slot]; ag; ag = ag->next)
+        {
+            primary = NULL;
+            for (rr = ag->members; rr; rr = rrnext)
+            {
+                rrnext = rr->next;
+                AuthGroup *ag1;
+                AuthRecord *rr1;
+                mDNSBool found = mDNSfalse;
+                ag1 = AuthGroupForRecord(&m->rrauth, slot, &rr->resrec);
+                if (ag1 && ag1->members)
+                {
+                    if (!primary) primary = ag1->members;
+                    rr1 = ag1->members;
+                    while (rr1)
+                    {
+                        // We are not using InterfaceID in checking for duplicates. This means,
+                        // if there are two addresses for a given name e.g., fe80::1%en0 and
+                        // fe80::1%en1, we only add the first one. It is not clear whether
+                        // this is a common case. To fix this, we also need to modify
+                        // mDNS_Register_internal in how it handles duplicates. If it becomes a
+                        // common case, we will fix it then.
+                        if (IdenticalResourceRecord(&rr1->resrec, &rr->resrec))
+                        {
+                            LogInfo("EtcHostsAddNewEntries: Skipping, not adding %s", ARDisplayString(m, rr1));
+                            found = mDNStrue;
+                            break;
+                        }
+                        rr1 = rr1->next;
+                    }
+                }
+                if (!found)
+                {
+                    if (justCheck)
+                    {
+                        LogInfo("EtcHostsAddNewEntries: Entry %s not registered with core yet", ARDisplayString(m, rr));
+                        return mDNStrue;
+                    }
+                    RemoveAuthRecord(m, newhosts, rr);
+                    // if there is no primary, point to self
+                    rr->RRSet = (primary ? primary : rr);
+                    rr->next = NULL;
+                    LogInfo("EtcHostsAddNewEntries: Adding %s", ARDisplayString(m, rr));
+                    if (mDNS_Register_internal(m, rr) != mStatus_NoError)
+                        LogMsg("EtcHostsAddNewEntries: mDNS_Register failed for %s", ARDisplayString(m, rr));
+                }
+            }
+        }
+    return mDNSfalse;
+}
+
+// Delete entries from the core that are no longer needed. If justCheck is set, this function
+// does not delete, just returns true
+mDNSlocal mDNSBool EtcHostsDeleteOldEntries(mDNS *const m, AuthHash *newhosts, mDNSBool justCheck)
+{
+    AuthGroup *ag;
+    mDNSu32 slot;
+    AuthRecord *rr, *primary, *rrnext;
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+        for (ag = m->rrauth.rrauth_hash[slot]; ag; ag = ag->next)
+            for (rr = ag->members; rr; rr = rrnext)
+            {
+                mDNSBool found = mDNSfalse;
+                AuthGroup *ag1;
+                AuthRecord *rr1;
+                rrnext = rr->next;
+                if (rr->RecordCallback != FreeEtcHosts) continue;
+                ag1 = AuthGroupForRecord(newhosts, slot, &rr->resrec);
+                if (ag1)
+                {
+                    primary = rr1 = ag1->members;
+                    while (rr1)
+                    {
+                        if (IdenticalResourceRecord(&rr1->resrec, &rr->resrec))
+                        {
+                            LogInfo("EtcHostsDeleteOldEntries: Old record %s found in new, skipping", ARDisplayString(m, rr));
+                            found = mDNStrue;
+                            break;
+                        }
+                        rr1 = rr1->next;
+                    }
+                }
+                // there is no corresponding record in newhosts for the same name. This means
+                // we should delete this from the core.
+                if (!found)
+                {
+                    if (justCheck)
+                    {
+                        LogInfo("EtcHostsDeleteOldEntries: Record %s not found in new, deleting", ARDisplayString(m, rr));
+                        return mDNStrue;
+                    }
+                    // if primary is going away, make sure that the rest of the records
+                    // point to the new primary
+                    if (rr == ag->members)
+                    {
+                        AuthRecord *new_primary = rr->next;
+                        AuthRecord *r = new_primary;
+                        while (r)
+                        {
+                            if (r->RRSet == rr)
+                            {
+                                LogInfo("EtcHostsDeleteOldEntries: Updating Resource Record %s to primary", ARDisplayString(m, r));
+                                r->RRSet = new_primary;
+                            }
+                            else LogMsg("EtcHostsDeleteOldEntries: ERROR!! Resource Record %s not pointing to primary %##s", ARDisplayString(m, r), r->resrec.name);
+                            r = r->next;
+                        }
+                    }
+                    LogInfo("EtcHostsDeleteOldEntries: Deleting %s", ARDisplayString(m, rr));
+                    mDNS_Deregister_internal(m, rr, mDNS_Dereg_normal);
+                }
+            }
+    return mDNSfalse;
+}
+
+mDNSlocal void UpdateEtcHosts(mDNS *const m, void *context)
+{
+    AuthHash *newhosts = (AuthHash *)context;
+
+    mDNS_CheckLock(m);
+
+    //Delete old entries from the core if they are not present in the newhosts
+    EtcHostsDeleteOldEntries(m, newhosts, mDNSfalse);
+    // Add the new entries to the core if not already present in the core
+    EtcHostsAddNewEntries(m, newhosts, mDNSfalse);
+}
+
+mDNSlocal void FreeNewHosts(AuthHash *newhosts)
+{
+    mDNSu32 slot;
+    AuthGroup *ag, *agnext;
+    AuthRecord *rr, *rrnext;
+
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+        for (ag = newhosts->rrauth_hash[slot]; ag; ag = agnext)
+        {
+            agnext = ag->next;
+            for (rr = ag->members; rr; rr = rrnext)
+            {
+                rrnext = rr->next;
+                freeL("etchosts", rr);
+            }
+            freeL("AuthGroups", ag);
+        }
+}
+
+mDNSlocal void mDNSMacOSXUpdateEtcHosts(mDNS *const m)
+{
+    AuthHash newhosts;
+
+    // As we will be modifying the core, we can only have one thread running at
+    // any point in time.
+    KQueueLock(m);
+
+    mDNSPlatformMemZero(&newhosts, sizeof(AuthHash));
+
+    // Get the file desecriptor (will trigger us to start watching for changes)
+    int fd = mDNSMacOSXGetEtcHostsFD(m);
+    if (fd != -1)
+    {
+        LogInfo("mDNSMacOSXUpdateEtcHosts: Parsing /etc/hosts fd %d", fd);
+        mDNSMacOSXParseEtcHosts(m, fd, &newhosts);
+    }
+    else LogInfo("mDNSMacOSXUpdateEtcHosts: /etc/hosts is not present");
+
+    // Optimization: Detect whether /etc/hosts changed or not.
+    //
+    // 1. Check to see if there are any new entries. We do this by seeing whether any entries in
+    //    newhosts is already registered with core.  If we find at least one entry that is not
+    //    registered with core, then it means we have work to do.
+    //
+    // 2. Next, we check to see if any of the entries that are registered with core is not present
+    //   in newhosts. If we find at least one entry that is not present, it means we have work to
+    //   do.
+    //
+    // Note: We may not have to hold the lock right here as KQueueLock is held which prevents any
+    // other thread from running. But mDNS_Lock is needed here as we will be traversing the core
+    // data structure in EtcHostsDeleteOldEntries/NewEntries which might expect the lock to be held
+    // in the future and this code does not have to change.
+    mDNS_Lock(m);
+    // Add the new entries to the core if not already present in the core
+    if (!EtcHostsAddNewEntries(m, &newhosts, mDNStrue))
+    {
+        // No new entries to add, check to see if we need to delete any old entries from the
+        // core if they are not present in the newhosts
+        if (!EtcHostsDeleteOldEntries(m, &newhosts, mDNStrue))
+        {
+            LogInfo("mDNSMacOSXUpdateEtcHosts: No work");
+            mDNS_Unlock(m);
+            KQueueUnlock(m, "/etc/hosts changed");
+            FreeNewHosts(&newhosts);
+            return;
+        }
+    }
+
+    // This will flush the cache, stop and start the query so that the queries
+    // can look at the /etc/hosts again
+    //
+    // Notes:
+    //
+    // We can't delete and free the records here. We wait for the mDNSCoreRestartAddressQueries to
+    // deliver RMV events. It has to be done in a deferred way because we can't deliver RMV
+    // events for local records *before* the RMV events for cache records. mDNSCoreRestartAddressQueries
+    // delivers these events in the right order and then calls us back to delete them.
+    //
+    // Similarly, we do a deferred Registration of the record because mDNSCoreRestartAddressQueries
+    // is a common function that looks at all local auth records and delivers a RMV including
+    // the records that we might add here. If we deliver a ADD here, it will get a RMV and then when
+    // the query is restarted, it will get another ADD. To avoid this (ADD-RMV-ADD), we defer registering
+    // the record until the RMVs are delivered in mDNSCoreRestartAddressQueries after which UpdateEtcHosts
+    // is called back where we do the Registration of the record. This results in RMV followed by ADD which
+    // looks normal.
+    mDNSCoreRestartAddressQueries(m, mDNSfalse, FlushAllCacheRecords, UpdateEtcHosts, &newhosts);
+    mDNS_Unlock(m);
+
+    KQueueUnlock(m, "/etc/hosts changed");
+    FreeNewHosts(&newhosts);
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Initialization & Teardown
+#endif
+
+CF_EXPORT CFDictionaryRef _CFCopySystemVersionDictionary(void);
+CF_EXPORT const CFStringRef _kCFSystemVersionProductNameKey;
+CF_EXPORT const CFStringRef _kCFSystemVersionProductVersionKey;
+CF_EXPORT const CFStringRef _kCFSystemVersionBuildVersionKey;
+
+// Major version 13 is 10.9.x 
+mDNSexport void mDNSMacOSXSystemBuildNumber(char *HINFO_SWstring)
+{
+    int major = 0, minor = 0;
+    char letter = 0, prodname[256]="<Unknown>", prodvers[256]="<Unknown>", buildver[256]="<Unknown>";
+    CFDictionaryRef vers = _CFCopySystemVersionDictionary();
+    if (vers)
+    {
+        CFStringRef cfprodname = CFDictionaryGetValue(vers, _kCFSystemVersionProductNameKey);
+        CFStringRef cfprodvers = CFDictionaryGetValue(vers, _kCFSystemVersionProductVersionKey);
+        CFStringRef cfbuildver = CFDictionaryGetValue(vers, _kCFSystemVersionBuildVersionKey);
+        if (cfprodname) 
+            CFStringGetCString(cfprodname, prodname, sizeof(prodname), kCFStringEncodingUTF8);
+        if (cfprodvers) 
+            CFStringGetCString(cfprodvers, prodvers, sizeof(prodvers), kCFStringEncodingUTF8);
+        if (cfbuildver && CFStringGetCString(cfbuildver, buildver, sizeof(buildver), kCFStringEncodingUTF8))
+            sscanf(buildver, "%d%c%d", &major, &letter, &minor);
+        CFRelease(vers);
+    }
+    if (!major) 
+    { 
+        major = 13; 
+        LogMsg("Note: No Major Build Version number found; assuming 13"); 
+    }
+    if (HINFO_SWstring) 
+        mDNS_snprintf(HINFO_SWstring, 256, "%s %s (%s), %s", prodname, prodvers, buildver, STRINGIFY(mDNSResponderVersion));
+    //LogMsg("%s %s (%s), %d %c %d", prodname, prodvers, buildver, major, letter, minor);
+
+    // If product name is "Mac OS X" (or similar) we set OSXVers, else we set iOSVers;
+    if ((prodname[0] & 0xDF) == 'M') 
+        OSXVers = major;
+    else 
+        iOSVers = major;
+}
+
+// Test to see if we're the first client running on UDP port 5353, by trying to bind to 5353 without using SO_REUSEPORT.
+// If we fail, someone else got here first. That's not a big problem; we can share the port for multicast responses --
+// we just need to be aware that we shouldn't expect to successfully receive unicast UDP responses.
+mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void)
+{
+    int err = -1;
+    int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (s < 3)
+        LogMsg("mDNSPlatformInit_CanReceiveUnicast: socket error %d errno %d (%s)", s, errno, strerror(errno));
+    else
+    {
+        struct sockaddr_in s5353;
+        s5353.sin_family      = AF_INET;
+        s5353.sin_port        = MulticastDNSPort.NotAnInteger;
+        s5353.sin_addr.s_addr = 0;
+        err = bind(s, (struct sockaddr *)&s5353, sizeof(s5353));
+        close(s);
+    }
+
+    if (err) LogMsg("No unicast UDP responses");
+    else debugf("Unicast UDP responses okay");
+    return(err == 0);
+}
+
+mDNSlocal void CreatePTRRecord(mDNS *const m, const domainname *domain)
+{
+    AuthRecord *rr;
+    const domainname *pname = (domainname *)"\x9" "localhost";
+
+    rr= mallocL("localhosts", sizeof(*rr));
+    if (rr == NULL) return;
+    mDNSPlatformMemZero(rr, sizeof(*rr));
+
+    mDNS_SetupResourceRecord(rr, mDNSNULL, mDNSInterface_LocalOnly, kDNSType_PTR, kHostNameTTL, kDNSRecordTypeKnownUnique, AuthRecordLocalOnly, mDNSNULL, mDNSNULL);
+    AssignDomainName(&rr->namestorage, domain);
+
+    rr->resrec.rdlength = DomainNameLength(pname);
+    rr->resrec.rdata->u.name.c[0] = 0;
+    AssignDomainName(&rr->resrec.rdata->u.name, pname);
+
+    rr->resrec.namehash = DomainNameHashValue(rr->resrec.name);
+    SetNewRData(&rr->resrec, mDNSNULL, 0);  // Sets rr->rdatahash for us
+    mDNS_Register(m, rr);
+}
+
+// Setup PTR records for 127.0.0.1 and ::1. This helps answering them locally rather than relying
+// on the external DNS server to answer this. Sometimes, the DNS servers don't respond in a timely
+// fashion and applications depending on this e.g., telnetd, times out after 30 seconds creating
+// a bad user experience. For now, we specifically create only localhosts to handle radar://9354225
+//
+// Note: We could have set this up while parsing the entries in /etc/hosts. But this is kept separate
+// intentionally to avoid adding to the complexity of code handling /etc/hosts.
+mDNSlocal void SetupLocalHostRecords(mDNS *const m)
+{
+    char buffer[MAX_REVERSE_MAPPING_NAME];
+    domainname name;
+    int i;
+    struct in6_addr addr;
+    mDNSu8 *ptr = addr.__u6_addr.__u6_addr8;
+
+    if (inet_pton(AF_INET, "127.0.0.1", &addr) == 1)
+    {
+        mDNS_snprintf(buffer, sizeof(buffer), "%d.%d.%d.%d.in-addr.arpa.",
+                      ptr[3], ptr[2], ptr[1], ptr[0]);
+        MakeDomainNameFromDNSNameString(&name, buffer);
+        CreatePTRRecord(m, &name);
+    }
+    else LogMsg("SetupLocalHostRecords: ERROR!! inet_pton AF_INET failed");
+
+    if (inet_pton(AF_INET6, "::1", &addr) == 1)
+    {
+        for (i = 0; i < 16; i++)
+        {
+            static const char hexValues[] = "0123456789ABCDEF";
+            buffer[i * 4    ] = hexValues[ptr[15 - i] & 0x0F];
+            buffer[i * 4 + 1] = '.';
+            buffer[i * 4 + 2] = hexValues[ptr[15 - i] >> 4];
+            buffer[i * 4 + 3] = '.';
+        }
+        mDNS_snprintf(&buffer[64], sizeof(buffer)-64, "ip6.arpa.");
+        MakeDomainNameFromDNSNameString(&name, buffer);
+        CreatePTRRecord(m, &name);
+    }
+    else LogMsg("SetupLocalHostRecords: ERROR!! inet_pton AF_INET6 failed");
+}
+
+// Construction of Default Browse domain list (i.e. when clients pass NULL) is as follows:
+// 1) query for b._dns-sd._udp.local on LocalOnly interface
+//    (.local manually generated via explicit callback)
+// 2) for each search domain (from prefs pane), query for b._dns-sd._udp.<searchdomain>.
+// 3) for each result from (2), register LocalOnly PTR record b._dns-sd._udp.local. -> <result>
+// 4) result above should generate a callback from question in (1).  result added to global list
+// 5) global list delivered to client via GetSearchDomainList()
+// 6) client calls to enumerate domains now go over LocalOnly interface
+//    (!!!KRS may add outgoing interface in addition)
+
+mDNSlocal mStatus mDNSPlatformInit_setup(mDNS *const m)
+{
+    mStatus err;
+    m->p->CFRunLoop = CFRunLoopGetCurrent();
+
+    char HINFO_SWstring[256] = "";
+    mDNSMacOSXSystemBuildNumber(HINFO_SWstring);
+
+    err = mDNSHelperInit();
+    if (err)
+        return err;
+    
+    DynamicStoreQueue = dispatch_queue_create("com.apple.mDNSResponder.DynamicStoreQueue", NULL);
+    if (DynamicStoreQueue == NULL)
+    {
+        LogMsg("dispatch_queue_create: DynamicStoreQueue NULL!");
+        return mStatus_NoMemoryErr;
+    }
+
+    // Store mDNSResponder Platform 
+    if (OSXVers)
+    {
+        m->mDNS_plat = platform_OSX;
+    }
+    else if (iOSVers)
+    {
+        if (IsAppleTV())
+            m->mDNS_plat = platform_Atv;
+        else
+            m->mDNS_plat = platform_iOS;
+    }
+    else
+    {
+        m->mDNS_plat = platform_NonApple; 
+    }   
+        
+    // In 10.4, mDNSResponder is launched very early in the boot process, while other subsystems are still in the process of starting up.
+    // If we can't read the user's preferences, then we sleep a bit and try again, for up to five seconds before we give up.
+    int i;
+    for (i=0; i<100; i++)
+    {
+        domainlabel testlabel;
+        testlabel.c[0] = 0;
+        GetUserSpecifiedLocalHostName(&testlabel);
+        if (testlabel.c[0]) break;
+        usleep(50000);
+    }
+
+    m->hostlabel.c[0]        = 0;
+
+    int get_model[2] = { CTL_HW, HW_MODEL };
+    size_t len_model = sizeof(HINFO_HWstring_buffer);
+
+    // Normal Apple model names are of the form "iPhone2,1", and
+    // internal code names are strings containing no commas, e.g. "N88AP".
+    // We used to ignore internal code names, but Apple now uses these internal code names
+    // even in released shipping products, so we no longer ignore strings containing no commas.
+//	if (sysctl(get_model, 2, HINFO_HWstring_buffer, &len_model, NULL, 0) == 0 && strchr(HINFO_HWstring_buffer, ','))
+    if (sysctl(get_model, 2, HINFO_HWstring_buffer, &len_model, NULL, 0) == 0)
+        HINFO_HWstring = HINFO_HWstring_buffer;
+
+    // For names of the form "iPhone2,1" we use "iPhone" as the prefix for automatic name generation.
+    // For names of the form "N88AP" containg no comma, we use the entire string.
+    HINFO_HWstring_prefixlen = strchr(HINFO_HWstring_buffer, ',') ? strcspn(HINFO_HWstring, "0123456789") : strlen(HINFO_HWstring);
+
+    if (mDNSPlatformInit_CanReceiveUnicast()) 
+        m->CanReceiveUnicastOn5353 = mDNStrue;
+
+    mDNSu32 hlen = mDNSPlatformStrLen(HINFO_HWstring);
+    mDNSu32 slen = mDNSPlatformStrLen(HINFO_SWstring);
+    if (hlen + slen < 254)
+    {
+        m->HIHardware.c[0] = hlen;
+        m->HISoftware.c[0] = slen;
+        mDNSPlatformMemCopy(&m->HIHardware.c[1], HINFO_HWstring, hlen);
+        mDNSPlatformMemCopy(&m->HISoftware.c[1], HINFO_SWstring, slen);
+    }
+
+    m->p->permanentsockets.port  = MulticastDNSPort;
+    m->p->permanentsockets.m     = m;
+    m->p->permanentsockets.sktv4 = -1;
+    m->p->permanentsockets.kqsv4.KQcallback = myKQSocketCallBack;
+    m->p->permanentsockets.kqsv4.KQcontext  = &m->p->permanentsockets;
+    m->p->permanentsockets.kqsv4.KQtask     = "UDP packet reception";
+    m->p->permanentsockets.sktv6 = -1;
+    m->p->permanentsockets.kqsv6.KQcallback = myKQSocketCallBack;
+    m->p->permanentsockets.kqsv6.KQcontext  = &m->p->permanentsockets;
+    m->p->permanentsockets.kqsv6.KQtask     = "UDP packet reception";
+
+    err = SetupSocket(&m->p->permanentsockets, MulticastDNSPort, AF_INET, mDNSNULL);
+    err = SetupSocket(&m->p->permanentsockets, MulticastDNSPort, AF_INET6, mDNSNULL);
+
+    struct sockaddr_in s4;
+    socklen_t n4 = sizeof(s4);
+    if (getsockname(m->p->permanentsockets.sktv4, (struct sockaddr *)&s4, &n4) < 0) 
+        LogMsg("getsockname v4 error %d (%s)", errno, strerror(errno));
+    else 
+        m->UnicastPort4.NotAnInteger = s4.sin_port;
+
+    if (m->p->permanentsockets.sktv6 >= 0)
+    {
+        struct sockaddr_in6 s6;
+        socklen_t n6 = sizeof(s6);
+        if (getsockname(m->p->permanentsockets.sktv6, (struct sockaddr *)&s6, &n6) < 0) LogMsg("getsockname v6 error %d (%s)", errno, strerror(errno));
+        else m->UnicastPort6.NotAnInteger = s6.sin6_port;
+    }
+
+    m->p->InterfaceList      = mDNSNULL;
+    m->p->userhostlabel.c[0] = 0;
+    m->p->usernicelabel.c[0] = 0;
+    m->p->prevoldnicelabel.c[0] = 0;
+    m->p->prevnewnicelabel.c[0] = 0;
+    m->p->prevoldhostlabel.c[0] = 0;
+    m->p->prevnewhostlabel.c[0] = 0;
+    m->p->NotifyUser         = 0;
+    m->p->KeyChainTimer      = 0;
+    m->p->WakeAtUTC          = 0;
+    m->p->RequestReSleep     = 0;
+    // Assume that everything is good to begin with. If something is not working,
+    // we will detect that when we start sending questions.
+    m->p->v4answers          = 1;
+    m->p->v6answers          = 1;
+    m->p->DNSTrigger         = 0;
+    m->p->LastConfigGeneration = 0;
+
+#if APPLE_OSX_mDNSResponder
+    uuid_generate(m->asl_uuid);
+#endif
+
+    m->AutoTunnelRelayAddr = zerov6Addr;
+
+    NetworkChangedKey_IPv4         = SCDynamicStoreKeyCreateNetworkGlobalEntity(NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4);
+    NetworkChangedKey_IPv6         = SCDynamicStoreKeyCreateNetworkGlobalEntity(NULL, kSCDynamicStoreDomainState, kSCEntNetIPv6);
+    NetworkChangedKey_Hostnames    = SCDynamicStoreKeyCreateHostNames(NULL);
+    NetworkChangedKey_Computername = SCDynamicStoreKeyCreateComputerName(NULL);
+    NetworkChangedKey_DNS          = SCDynamicStoreKeyCreateNetworkGlobalEntity(NULL, kSCDynamicStoreDomainState, kSCEntNetDNS);
+    NetworkChangedKey_StateInterfacePrefix = SCDynamicStoreKeyCreateNetworkInterfaceEntity(NULL, kSCDynamicStoreDomainState, CFSTR(""), NULL);
+    if (!NetworkChangedKey_IPv4 || !NetworkChangedKey_IPv6 || !NetworkChangedKey_Hostnames || !NetworkChangedKey_Computername || !NetworkChangedKey_DNS || !NetworkChangedKey_StateInterfacePrefix)
+    { LogMsg("SCDynamicStore string setup failed"); return(mStatus_NoMemoryErr); }
+
+    err = WatchForNetworkChanges(m);
+    if (err) { LogMsg("mDNSPlatformInit_setup: WatchForNetworkChanges failed %d", err); return(err); }
+
+#if 0 // <rdar://problem/6751656>
+    err = WatchForPMChanges(m);
+    if (err) { LogMsg("mDNSPlatformInit_setup: WatchForPMChanges failed %d", err); return(err); }
+#endif
+
+    err = WatchForSysEvents(m);
+    if (err) { LogMsg("mDNSPlatformInit_setup: WatchForSysEvents failed %d", err); return(err); }
+
+    mDNSs32 utc = mDNSPlatformUTC();
+    m->SystemWakeOnLANEnabled = SystemWakeForNetworkAccess();
+    UpdateInterfaceList(m, utc);
+    SetupActiveInterfaces(m, utc);
+
+    // Explicitly ensure that our Keychain operations utilize the system domain.
+#ifndef NO_SECURITYFRAMEWORK
+    SecKeychainSetPreferenceDomain(kSecPreferencesDomainSystem);
+#endif
+
+    mDNS_Lock(m);
+    SetDomainSecrets(m);
+    SetLocalDomains();
+    mDNS_Unlock(m);
+
+#ifndef NO_SECURITYFRAMEWORK
+    err = SecKeychainAddCallback(KeychainChanged, kSecAddEventMask|kSecDeleteEventMask|kSecUpdateEventMask, m);
+    if (err) { LogMsg("mDNSPlatformInit_setup: SecKeychainAddCallback failed %d", err); return(err); }
+#endif
+
+#if !defined(kIOPMAcknowledgmentOptionSystemCapabilityRequirements) || TARGET_OS_EMBEDDED
+    LogMsg("Note: Compiled without SnowLeopard Fine-Grained Power Management support");
+#else
+    IOPMConnection c;
+    IOReturn iopmerr = IOPMConnectionCreate(CFSTR("mDNSResponder"), kIOPMSystemPowerStateCapabilityCPU, &c);
+    if (iopmerr) LogMsg("IOPMConnectionCreate failed %d", iopmerr);
+    else
+    {
+        iopmerr = IOPMConnectionSetNotification(c, m, SnowLeopardPowerChanged);
+        if (iopmerr) LogMsg("IOPMConnectionSetNotification failed %d", iopmerr);
+        else
+        {
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+            IOPMConnectionSetDispatchQueue(c, dispatch_get_main_queue());
+            LogInfo("IOPMConnectionSetDispatchQueue is now running");
+#else
+            iopmerr = IOPMConnectionScheduleWithRunLoop(c, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            if (iopmerr) LogMsg("IOPMConnectionScheduleWithRunLoop failed %d", iopmerr);
+            LogInfo("IOPMConnectionScheduleWithRunLoop is now running");
+#endif /* MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM */
+        }
+    }
+    m->p->IOPMConnection = iopmerr ? mDNSNULL : c;
+    if (iopmerr) // If IOPMConnectionCreate unavailable or failed, proceed with old-style power notification code below
+#endif // kIOPMAcknowledgmentOptionSystemCapabilityRequirements
+    {
+        m->p->PowerConnection = IORegisterForSystemPower(m, &m->p->PowerPortRef, PowerChanged, &m->p->PowerNotifier);
+        if (!m->p->PowerConnection) { LogMsg("mDNSPlatformInit_setup: IORegisterForSystemPower failed"); return(-1); }
+        else
+        {
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+            IONotificationPortSetDispatchQueue(m->p->PowerPortRef, dispatch_get_main_queue());
+#else
+            CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(m->p->PowerPortRef), kCFRunLoopDefaultMode);
+#endif /* MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM */
+        }
+    }
+
+#if APPLE_OSX_mDNSResponder
+    // Note: We use SPMetricPortability > 35 to indicate a laptop of some kind
+    // SPMetricPortability <= 35 means nominally a non-portable machine (i.e. Mac mini or better)
+    // Apple TVs, AirPort base stations, and Time Capsules do not actually weigh 3kg, but we assign them
+    // higher 'nominal' masses to indicate they should be treated as being relatively less portable than a laptop
+    if      (!strncasecmp(HINFO_HWstring, "Xserve",       6)) { SPMetricPortability = 25 /* 30kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; }
+    else if (!strncasecmp(HINFO_HWstring, "RackMac",      7)) { SPMetricPortability = 25 /* 30kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; }
+    else if (!strncasecmp(HINFO_HWstring, "MacPro",       6)) { SPMetricPortability = 27 /* 20kg */; SPMetricMarginalPower = 84 /* 250W */; SPMetricTotalPower = 85 /* 300W */; }
+    else if (!strncasecmp(HINFO_HWstring, "PowerMac",     8)) { SPMetricPortability = 27 /* 20kg */; SPMetricMarginalPower = 82 /* 160W */; SPMetricTotalPower = 83 /* 200W */; }
+    else if (!strncasecmp(HINFO_HWstring, "iMac",         4)) { SPMetricPortability = 30 /* 10kg */; SPMetricMarginalPower = 77 /*  50W */; SPMetricTotalPower = 78 /*  60W */; }
+    else if (!strncasecmp(HINFO_HWstring, "Macmini",      7)) { SPMetricPortability = 33 /*  5kg */; SPMetricMarginalPower = 73 /*  20W */; SPMetricTotalPower = 74 /*  25W */; }
+    else if (!strncasecmp(HINFO_HWstring, "TimeCapsule", 11)) { SPMetricPortability = 34 /*  4kg */; SPMetricMarginalPower = 10 /*  ~0W */; SPMetricTotalPower = 70 /*  13W */; }
+    else if (!strncasecmp(HINFO_HWstring, "AirPort",      7)) { SPMetricPortability = 35 /*  3kg */; SPMetricMarginalPower = 10 /*  ~0W */; SPMetricTotalPower = 70 /*  12W */; }
+    else if (  IsAppleTV()  )                                 { SPMetricPortability = 35 /*  3kg */; SPMetricMarginalPower = 60 /*   1W */; SPMetricTotalPower = 63 /*   2W */; }
+    else if (!strncasecmp(HINFO_HWstring, "MacBook",      7)) { SPMetricPortability = 37 /*  2kg */; SPMetricMarginalPower = 71 /*  13W */; SPMetricTotalPower = 72 /*  15W */; }
+    else if (!strncasecmp(HINFO_HWstring, "PowerBook",    9)) { SPMetricPortability = 37 /*  2kg */; SPMetricMarginalPower = 71 /*  13W */; SPMetricTotalPower = 72 /*  15W */; }
+    LogSPS("HW_MODEL: %.*s (%s) Portability %d Marginal Power %d Total Power %d Features %d",
+           HINFO_HWstring_prefixlen, HINFO_HWstring, HINFO_HWstring, SPMetricPortability, SPMetricMarginalPower, SPMetricTotalPower, SPMetricFeatures);
+#endif // APPLE_OSX_mDNSResponder
+
+    // Currently this is not defined. SSL code will eventually fix this. If it becomes
+    // critical, we will define this to workaround the bug in SSL.
+#ifdef __SSL_NEEDS_SERIALIZATION__
+    SSLqueue = dispatch_queue_create("com.apple.mDNSResponder.SSLQueue", NULL);
+#else
+    SSLqueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+#endif
+    if (SSLqueue == mDNSNULL) LogMsg("dispatch_queue_create: SSL queue NULL");
+
+    mDNSMacOSXUpdateEtcHosts(m);
+    SetupLocalHostRecords(m);
+    CUPInit(m);
+
+    return(mStatus_NoError);
+}
+
+mDNSexport mStatus mDNSPlatformInit(mDNS *const m)
+{
+#if MDNS_NO_DNSINFO
+    LogMsg("Note: Compiled without Apple-specific Split-DNS support");
+#endif
+
+    // Adding interfaces will use this flag, so set it now.
+    m->DivertMulticastAdvertisements = !m->AdvertiseLocalAddresses;
+
+#if APPLE_OSX_mDNSResponder
+    m->SPSBrowseCallback = UpdateSPSStatus;
+#endif // APPLE_OSX_mDNSResponder
+
+    mStatus result = mDNSPlatformInit_setup(m);
+
+    // We don't do asynchronous initialization on OS X, so by the time we get here the setup will already
+    // have succeeded or failed -- so if it succeeded, we should just call mDNSCoreInitComplete() immediately
+    if (result == mStatus_NoError)
+    {
+        mDNSCoreInitComplete(m, mStatus_NoError);
+
+#if !NO_D2D
+        // We only initialize if mDNSCore successfully initialized.
+        if (D2DInitialize)
+        {
+            D2DStatus ds = D2DInitialize(m->p->CFRunLoop, xD2DServiceCallback, m) ;
+            if (ds != kD2DSuccess)
+                LogMsg("D2DInitialiize failed: %d", ds);
+            else
+                LogMsg("D2DInitialize succeeded");
+        }
+#endif // ! NO_D2D
+
+    }
+    result = DNSSECCryptoInit(m);
+    return(result);
+}
+
+mDNSexport void mDNSPlatformClose(mDNS *const m)
+{
+    if (m->p->PowerConnection)
+    {
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+        IONotificationPortSetDispatchQueue(m->p->PowerPortRef, NULL);
+#else
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(m->p->PowerPortRef), kCFRunLoopDefaultMode);
+#endif
+        // According to <http://developer.apple.com/qa/qa2004/qa1340.html>, a single call
+        // to IORegisterForSystemPower creates *three* objects that need to be disposed individually:
+        IODeregisterForSystemPower(&m->p->PowerNotifier);
+        IOServiceClose            ( m->p->PowerConnection);
+        IONotificationPortDestroy ( m->p->PowerPortRef);
+        m->p->PowerConnection = 0;
+    }
+
+    if (m->p->Store)
+    {
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+        if (!SCDynamicStoreSetDispatchQueue(m->p->Store, NULL))
+            LogMsg("mDNSPlatformClose: SCDynamicStoreSetDispatchQueue failed");
+#else
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m->p->StoreRLS, kCFRunLoopDefaultMode);
+        CFRunLoopSourceInvalidate(m->p->StoreRLS);
+        CFRelease(m->p->StoreRLS);
+        m->p->StoreRLS = NULL;
+#endif
+        CFRelease(m->p->Store);
+        m->p->Store    = NULL;
+    }
+
+    if (m->p->PMRLS)
+    {
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m->p->PMRLS, kCFRunLoopDefaultMode);
+        CFRunLoopSourceInvalidate(m->p->PMRLS);
+        CFRelease(m->p->PMRLS);
+        m->p->PMRLS = NULL;
+    }
+
+    if (m->p->SysEventNotifier >= 0) { close(m->p->SysEventNotifier); m->p->SysEventNotifier = -1; }
+
+#if !NO_D2D
+    if (D2DTerminate)
+    {
+        D2DStatus ds = D2DTerminate();
+        if (ds != kD2DSuccess)
+            LogMsg("D2DTerminate failed: %d", ds);
+        else
+            LogMsg("D2DTerminate succeeded");
+    }
+#endif // ! NO_D2D
+
+    mDNSs32 utc = mDNSPlatformUTC();
+    MarkAllInterfacesInactive(m, utc);
+    ClearInactiveInterfaces(m, utc);
+    CloseSocketSet(&m->p->permanentsockets);
+
+#if APPLE_OSX_mDNSResponder
+    // clean up tunnels
+    while (m->TunnelClients)
+    {
+        ClientTunnel *cur = m->TunnelClients;
+        LogInfo("mDNSPlatformClose: removing client tunnel %p %##s from list", cur, cur->dstname.c);
+        if (cur->q.ThisQInterval >= 0) mDNS_StopQuery(m, &cur->q);
+        AutoTunnelSetKeys(cur, mDNSfalse);
+        m->TunnelClients = cur->next;
+        freeL("ClientTunnel", cur);
+    }
+
+    if (AnonymousRacoonConfig)
+    {
+        AnonymousRacoonConfig = mDNSNULL;
+        LogInfo("mDNSPlatformClose: Deconfiguring autotunnel");
+        (void)mDNSConfigureServer(kmDNSDown, mDNSNULL, mDNSNULL);
+    }
+#endif // APPLE_OSX_mDNSResponder
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Platform Support Layer functions
+#endif
+
+mDNSexport mDNSu32 mDNSPlatformRandomNumber(void)
+{
+    return(arc4random());
+}
+
+mDNSexport mDNSs32 mDNSPlatformOneSecond = 1000;
+mDNSexport mDNSu32 mDNSPlatformClockDivisor = 0;
+
+mDNSexport mStatus mDNSPlatformTimeInit(void)
+{
+    // Notes: Typical values for mach_timebase_info:
+    // tbi.numer = 1000 million
+    // tbi.denom =   33 million
+    // These are set such that (mach_absolute_time() * numer/denom) gives us nanoseconds;
+    //          numer  / denom = nanoseconds per hardware clock tick (e.g. 30);
+    //          denom  / numer = hardware clock ticks per nanosecond (e.g. 0.033)
+    // (denom*1000000) / numer = hardware clock ticks per millisecond (e.g. 33333)
+    // So: mach_absolute_time() / ((denom*1000000)/numer) = milliseconds
+    //
+    // Arithmetic notes:
+    // tbi.denom is at least 1, and not more than 2^32-1.
+    // Therefore (tbi.denom * 1000000) is at least one million, but cannot overflow a uint64_t.
+    // tbi.denom is at least 1, and not more than 2^32-1.
+    // Therefore clockdivisor should end up being a number roughly in the range 10^3 - 10^9.
+    // If clockdivisor is less than 10^3 then that means that the native clock frequency is less than 1MHz,
+    // which is unlikely on any current or future Macintosh.
+    // If clockdivisor is greater than 10^9 then that means the native clock frequency is greater than 1000GHz.
+    // When we ship Macs with clock frequencies above 1000GHz, we may have to update this code.
+    struct mach_timebase_info tbi;
+    kern_return_t result = mach_timebase_info(&tbi);
+    if (result == KERN_SUCCESS) mDNSPlatformClockDivisor = ((uint64_t)tbi.denom * 1000000) / tbi.numer;
+    return(result);
+}
+
+mDNSexport mDNSs32 mDNSPlatformRawTime(void)
+{
+    if (mDNSPlatformClockDivisor == 0) { LogMsg("mDNSPlatformRawTime called before mDNSPlatformTimeInit"); return(0); }
+
+    static uint64_t last_mach_absolute_time = 0;
+    //static uint64_t last_mach_absolute_time = 0x8000000000000000LL;	// Use this value for testing the alert display
+    uint64_t this_mach_absolute_time = mach_absolute_time();
+    if ((int64_t)this_mach_absolute_time - (int64_t)last_mach_absolute_time < 0)
+    {
+        LogMsg("mDNSPlatformRawTime: last_mach_absolute_time %08X%08X", last_mach_absolute_time);
+        LogMsg("mDNSPlatformRawTime: this_mach_absolute_time %08X%08X", this_mach_absolute_time);
+        // Update last_mach_absolute_time *before* calling NotifyOfElusiveBug()
+        last_mach_absolute_time = this_mach_absolute_time;
+        // Note: This bug happens all the time on 10.3
+        NotifyOfElusiveBug("mach_absolute_time went backwards!",
+                           "This error occurs from time to time, often on newly released hardware, "
+                           "and usually the exact cause is different in each instance.\r\r"
+                           "Please file a new Radar bug report with the title “mach_absolute_time went backwards” "
+                           "and assign it to Radar Component “Kernel” Version “X”.");
+    }
+    last_mach_absolute_time = this_mach_absolute_time;
+
+    return((mDNSs32)(this_mach_absolute_time / mDNSPlatformClockDivisor));
+}
+
+mDNSexport mDNSs32 mDNSPlatformUTC(void)
+{
+    return time(NULL);
+}
+
+// Locking is a no-op here, because we're single-threaded with a CFRunLoop, so we can never interrupt ourselves
+mDNSexport void     mDNSPlatformLock   (const mDNS *const m) { (void)m; }
+mDNSexport void     mDNSPlatformUnlock (const mDNS *const m) { (void)m; }
+mDNSexport void     mDNSPlatformStrCopy(      void *dst, const void *src)              { strcpy((char *)dst, (char *)src); }
+mDNSexport mDNSu32  mDNSPlatformStrLen (                 const void *src)              { return(strlen((char*)src)); }
+mDNSexport void     mDNSPlatformMemCopy(      void *dst, const void *src, mDNSu32 len) { memcpy(dst, src, len); }
+mDNSexport mDNSBool mDNSPlatformMemSame(const void *dst, const void *src, mDNSu32 len) { return(memcmp(dst, src, len) == 0); }
+mDNSexport int      mDNSPlatformMemCmp(const void *dst, const void *src, mDNSu32 len) { return(memcmp(dst, src, len)); }
+mDNSexport void     mDNSPlatformMemZero(      void *dst,                  mDNSu32 len) { memset(dst, 0, len); }
+mDNSexport void     mDNSPlatformQsort  (      void *base, int nel, int width, int (*compar)(const void *, const void *))
+{
+    return (qsort(base, nel, width, compar));
+}
+#if !(APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING)
+mDNSexport void *   mDNSPlatformMemAllocate(mDNSu32 len) { return(mallocL("mDNSPlatformMemAllocate", len)); }
+#endif
+mDNSexport void     mDNSPlatformMemFree    (void *mem)   { freeL("mDNSPlatformMemFree", mem); }
+
+mDNSexport void mDNSPlatformSetAllowSleep(mDNS *const m, mDNSBool allowSleep, const char *reason)
+{
+    if (allowSleep && m->p->IOPMAssertion)
+    {
+        LogInfo("%s Destroying NoIdleSleep power assertion", __FUNCTION__);
+        IOPMAssertionRelease(m->p->IOPMAssertion);
+        m->p->IOPMAssertion = 0;
+    }
+    else if (!allowSleep)
+    {
+#ifdef kIOPMAssertionTypeNoIdleSleep
+        if (m->p->IOPMAssertion)
+        {
+            IOPMAssertionRelease(m->p->IOPMAssertion);
+            m->p->IOPMAssertion = 0;
+        }
+
+        CFStringRef assertionName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%s.%d %s"), getprogname(), getpid(), reason ? reason : "");
+        IOPMAssertionCreateWithName(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, assertionName ? assertionName : CFSTR("mDNSResponder"), &m->p->IOPMAssertion);
+        if (assertionName) CFRelease(assertionName);
+        LogInfo("%s Creating NoIdleSleep power assertion", __FUNCTION__);
+#endif
+    }
+}
+
+mDNSexport void mDNSPlatformSendWakeupPacket(mDNS *const m, mDNSInterfaceID InterfaceID, char *EthAddr, char *IPAddr, int iteration)
+{
+    mDNSu32 ifindex;
+
+    // Sanity check
+    ifindex = mDNSPlatformInterfaceIndexfromInterfaceID(m, InterfaceID, mDNStrue);
+    if (ifindex <= 0)
+    {
+        LogMsg("mDNSPlatformSendWakeupPacket: ERROR!! Invalid InterfaceID %u", ifindex);
+        return;
+    }
+    mDNSSendWakeupPacket(ifindex, EthAddr, IPAddr, iteration);
+}
+
+mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID)
+{
+    NetworkInterfaceInfoOSX *info;
+
+    if (InterfaceID == mDNSInterface_P2P)
+        return mDNStrue;
+
+    if (   (InterfaceID == mDNSInterface_Any) 
+        || (InterfaceID == mDNSInterfaceMark)
+        || (InterfaceID == mDNSInterface_LocalOnly)
+        || (InterfaceID == mDNSInterface_Unicast))
+        return mDNSfalse;
+
+    info = IfindexToInterfaceInfoOSX(&mDNSStorage, InterfaceID);
+    if (info == NULL)
+    {
+        // this log message can print when operations are stopped on an interface that has gone away
+        LogInfo("mDNSPlatformInterfaceIsD2D: Invalid interface index %d", InterfaceID);
+        return mDNSfalse;
+    }
+
+    return (mDNSBool) info->D2DInterface;
+}
+
+// Filter records send over P2P (D2D) type interfaces
+// Note that the terms P2P and D2D are used synonymously in the current code and comments.
+mDNSexport mDNSBool mDNSPlatformValidRecordForInterface(AuthRecord *rr, const NetworkInterfaceInfo *intf)
+{
+    // For an explicit match to a valid interface ID, return true. 
+    if (rr->resrec.InterfaceID == intf->InterfaceID)
+        return mDNStrue;
+
+    // Only filtering records for D2D type interfaces, return true for all other interface types.
+    if (!mDNSPlatformInterfaceIsD2D(intf->InterfaceID))
+        return mDNStrue;
+    
+    // If it's an AWDL interface the record must be explicitly marked to include AWDL.
+    if (intf->InterfaceID == AWDLInterfaceID)
+    {
+        if (rr->ARType == AuthRecordAnyIncludeAWDL || rr->ARType == AuthRecordAnyIncludeAWDLandP2P)
+            return mDNStrue;
+        else
+            return mDNSfalse;
+    }
+    
+    // Send record if it is explicitly marked to include all other P2P type interfaces.
+    if (rr->ARType == AuthRecordAnyIncludeP2P || rr->ARType == AuthRecordAnyIncludeAWDLandP2P)
+        return mDNStrue;
+
+    // Don't send the record over this interface.
+    return mDNSfalse;
+}
+
+// Filter questions send over P2P (D2D) type interfaces.
+mDNSexport mDNSBool mDNSPlatformValidQuestionForInterface(DNSQuestion *q, const NetworkInterfaceInfo *intf)
+{
+    // For an explicit match to a valid interface ID, return true. 
+    if (q->InterfaceID == intf->InterfaceID)
+        return mDNStrue;
+
+    // Only filtering questions for D2D type interfaces
+    if (!mDNSPlatformInterfaceIsD2D(intf->InterfaceID))
+        return mDNStrue;
+
+    // If it's an AWDL interface the question must be explicitly marked to include AWDL.
+    if (intf->InterfaceID == AWDLInterfaceID)
+    {
+        if (q->flags & kDNSServiceFlagsIncludeAWDL)
+            return mDNStrue;
+        else
+            return mDNSfalse;
+    }
+    
+    // Sent question if it is explicitly marked to include all other P2P type interfaces.
+    if (q->flags & kDNSServiceFlagsIncludeP2P)
+        return mDNStrue;
+
+    // Don't send the question over this interface.
+    return mDNSfalse;
+}
+
+// Returns true unless record was received over the AWDL interface and
+// the question was not specific to the AWDL interface or did not specify kDNSServiceInterfaceIndexAny
+// with the kDNSServiceFlagsIncludeAWDL flag set.
+mDNSexport mDNSBool   mDNSPlatformValidRecordForQuestion(const ResourceRecord *const rr, const DNSQuestion *const q)
+{
+    if (!rr->InterfaceID || (rr->InterfaceID == q->InterfaceID))
+        return mDNStrue;
+
+    if ((rr->InterfaceID == AWDLInterfaceID) && !(q->flags & kDNSServiceFlagsIncludeAWDL))
+    {
+        LogInfo("mDNSPlatformValidRecordForQuestion: Record recieved over AWDL not returned for %s %##s query",
+                DNSTypeName(q->qtype), q->qname.c);
+        return mDNSfalse;
+    }
+
+    return mDNStrue;
+}
+
+// formating time to RFC 4034 format
+mDNSexport void mDNSPlatformFormatTime(unsigned long te, mDNSu8 *buf, int bufsize)
+{
+    struct tm tmTime;
+    time_t t = (time_t)te;
+    // Time since epoch : strftime takes "tm". Convert seconds to "tm" using
+    // gmtime_r first and then use strftime
+    gmtime_r(&t, &tmTime);
+    strftime((char *)buf, bufsize, "%Y%m%d%H%M%S", &tmTime);
+}
+
+mDNSexport mDNSs32 mDNSPlatformGetPID()
+{
+    return getpid();
+}
+
+// Schedule a function asynchronously on the main queue
+mDNSexport void mDNSPlatformDispatchAsync(mDNS *const m, void *context, AsyncDispatchFunc func)
+{
+    // KQueueLock/Unlock is used for two purposes
+    //
+    // 1. We can't be running along with the KQueue thread and hence acquiring the lock
+    //    serializes the access to the "core"
+    //
+    // 2. KQueueUnlock also sends a message wake up the KQueue thread which in turn wakes
+    //    up and calls udsserver_idle which schedules the messages across the uds socket.
+    //    If "func" delivers something to the uds socket from the dispatch thread, it will
+    //    not be delivered immediately if not for the Unlock.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        KQueueLock(m);
+        func(m, context);
+        KQueueUnlock(m, "mDNSPlatformDispatchAsync");
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+        // KQueueUnlock is a noop. Hence, we need to run kick off the idle loop
+        // to handle any message that "func" might deliver.
+        TriggerEventCompletion();
+#endif
+    });
+}
+
+// definitions for device-info record construction
+#define DEVINFO_MODEL       "model="
+#define DEVINFO_MODEL_LEN   strlen(DEVINFO_MODEL)
+
+#define OSX_VER         "osxvers="
+#define OSX_VER_LEN     strlen(OSX_VER) 
+#define VER_NUM_LEN     2  // 2 digits of version number added to base string
+
+// Bytes available in TXT record for model name after subtracting space for other 
+// fixed size strings and their length bytes.
+#define MAX_MODEL_NAME_LEN   (256 - (DEVINFO_MODEL_LEN + 1) - (OSX_VER_LEN + VER_NUM_LEN + 1))
+
+// Initialize device-info TXT record contents and return total length of record data.
+mDNSexport mDNSu32 initializeDeviceInfoTXT(mDNS *m, mDNSu8 *ptr)
+{
+    mDNSu8 *bufferStart = ptr;
+    mDNSu8 len = m->HIHardware.c[0] < MAX_MODEL_NAME_LEN ? m->HIHardware.c[0] : MAX_MODEL_NAME_LEN;
+
+    *ptr = DEVINFO_MODEL_LEN + len; // total length of DEVINFO_MODEL string plus the hardware name string
+    ptr++;
+    mDNSPlatformMemCopy(ptr, DEVINFO_MODEL, DEVINFO_MODEL_LEN);
+    ptr += DEVINFO_MODEL_LEN;
+    mDNSPlatformMemCopy(ptr, m->HIHardware.c + 1, len);
+    ptr += len;
+
+    // only include this string for OSX
+    if (OSXVers)
+    {
+        char    ver_num[VER_NUM_LEN + 1]; // version digits + null written by snprintf
+        *ptr = OSX_VER_LEN + VER_NUM_LEN; // length byte
+        ptr++;
+        mDNSPlatformMemCopy(ptr, OSX_VER, OSX_VER_LEN);
+        ptr += OSX_VER_LEN;
+        // convert version number to ASCII, add 1 for terminating null byte written by snprintf()
+        snprintf(ver_num, VER_NUM_LEN + 1, "%d", OSXVers);
+        mDNSPlatformMemCopy(ptr, ver_num, VER_NUM_LEN);
+        ptr += VER_NUM_LEN;
+    }
+
+    return (ptr - bufferStart);
+}
diff --git a/mDNSResponder/mDNSMacOSX/mDNSMacOSX.h b/mDNSResponder/mDNSMacOSX/mDNSMacOSX.h
new file mode 100644
index 00000000..00bfb87c
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSMacOSX.h
@@ -0,0 +1,295 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __mDNSMacOSX_h
+#define __mDNSMacOSX_h
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <SystemConfiguration/SystemConfiguration.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#include <IOKit/pwr_mgt/IOPMLibPrivate.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include "mDNSEmbeddedAPI.h"  // for domain name structure
+
+#include <net/if.h>
+
+//#define MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+#include <dispatch/dispatch.h>
+#include <dispatch/private.h>
+#endif
+
+#if TARGET_OS_EMBEDDED
+#define NO_SECURITYFRAMEWORK 1
+#define NO_CFUSERNOTIFICATION 1
+#include <MobileGestalt.h> // for IsAppleTV() 
+#include <SystemConfiguration/scprefs_observer.h> // for _scprefs_observer_watch()
+extern mDNSBool GetmDNSManagedPref(CFStringRef key);
+#endif
+
+#ifndef NO_SECURITYFRAMEWORK
+#include <Security/SecureTransport.h>
+#include <Security/Security.h>
+#endif /* NO_SECURITYFRAMEWORK */
+
+#if TARGET_OS_IPHONE
+#include "cellular_usage_policy.h"
+#endif
+
+#define kmDNSResponderServName "com.apple.mDNSResponder"
+
+enum mDNSDynamicStoreSetConfigKey
+{
+    kmDNSMulticastConfig = 1,
+    kmDNSDynamicConfig,
+    kmDNSPrivateConfig,
+    kmDNSBackToMyMacConfig,
+    kmDNSSleepProxyServersState,
+    kmDNSDebugState, 
+};
+
+typedef struct NetworkInterfaceInfoOSX_struct NetworkInterfaceInfoOSX;
+
+typedef void (*KQueueEventCallback)(int fd, short filter, void *context);
+typedef struct
+{
+    KQueueEventCallback KQcallback;
+    void                *KQcontext;
+    const char          *KQtask;        // For debugging messages
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    dispatch_source_t readSource;
+    dispatch_source_t writeSource;
+    mDNSBool fdClosed;
+#endif
+} KQueueEntry;
+
+typedef struct
+{
+    mDNSIPPort port; // MUST BE FIRST FIELD -- UDPSocket_struct begins with a KQSocketSet,
+    // and mDNSCore requires every UDPSocket_struct to begin with a mDNSIPPort port
+    mDNS                    *m;
+    int sktv4;
+    KQueueEntry kqsv4;
+    int sktv6;
+    KQueueEntry kqsv6;
+    int                     *closeFlag;
+    mDNSBool proxy;
+} KQSocketSet;
+
+struct UDPSocket_struct
+{
+    KQSocketSet ss;     // First field of KQSocketSet has to be mDNSIPPort -- mDNSCore requires every UDPSocket_struct to begin with mDNSIPPort port
+};
+
+// TCP socket support
+
+typedef enum
+{
+    handshake_required,
+    handshake_in_progress,
+    handshake_completed,
+    handshake_to_be_closed
+} handshakeStatus;
+
+struct TCPSocket_struct
+{
+    TCPSocketFlags flags;       // MUST BE FIRST FIELD -- mDNSCore expects every TCPSocket_struct to begin with TCPSocketFlags flags
+    TCPConnectionCallback callback;
+    int fd;
+    KQueueEntry *kqEntry;
+    KQSocketSet ss;
+#ifndef NO_SECURITYFRAMEWORK
+    SSLContextRef tlsContext;
+    pthread_t handshake_thread;
+#endif /* NO_SECURITYFRAMEWORK */
+    domainname hostname;
+    void *context;
+    mDNSBool setup;
+    mDNSBool connected;
+    handshakeStatus handshake;
+    mDNS *m; // So we can call KQueueLock from the SSLHandshake thread
+    mStatus err;
+};
+
+struct NetworkInterfaceInfoOSX_struct
+{
+    NetworkInterfaceInfo ifinfo;                // MUST be the first element in this structure
+    NetworkInterfaceInfoOSX *next;
+    mDNS                    *m;
+    mDNSu8 Exists;                              // 1 = currently exists in getifaddrs list; 0 = doesn't
+                                                // 2 = exists, but McastTxRx state changed
+    mDNSu8 Flashing;                            // Set if interface appeared for less than 60 seconds and then vanished
+    mDNSu8 Occulting;                           // Set if interface vanished for less than 60 seconds and then came back
+    mDNSu8 D2DInterface;                        // IFEF_LOCALNET_PRIVATE flag indicates we should call
+                                                // D2D plugin for operations over this interface
+    mDNSu8 DirectLink;                          // IFEF_DIRECTLINK flag is set for interface
+
+    mDNSs32 AppearanceTime;                     // Time this interface appeared most recently in getifaddrs list
+                                                // i.e. the first time an interface is seen, AppearanceTime is set.
+                                                // If an interface goes away temporarily and then comes back then
+                                                // AppearanceTime is updated to the time of the most recent appearance.
+    mDNSs32 LastSeen;                           // If Exists==0, last time this interface appeared in getifaddrs list
+    unsigned int ifa_flags;
+    struct in_addr ifa_v4addr;
+    mDNSu32 scope_id;                           // interface index / IPv6 scope ID
+    mDNSEthAddr BSSID;                          // BSSID of 802.11 base station, if applicable
+    u_short sa_family;
+    int BPF_fd;                                 // -1 uninitialized; -2 requested BPF; -3 failed
+    int BPF_mcfd;                               // Socket for our IPv6 ND group membership
+    u_int BPF_len;
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    dispatch_source_t BPF_source;
+#else
+    CFSocketRef BPF_cfs;
+    CFRunLoopSourceRef BPF_rls;
+#endif
+    NetworkInterfaceInfoOSX *Registered;        // non-NULL means registered with mDNS Core
+};
+
+struct mDNS_PlatformSupport_struct
+{
+    NetworkInterfaceInfoOSX *InterfaceList;
+    KQSocketSet permanentsockets;
+    domainlabel userhostlabel;                  // The hostlabel as it was set in System Preferences the last time we looked
+    domainlabel usernicelabel;                  // The nicelabel as it was set in System Preferences the last time we looked
+    // Following four variables are used for optimization where the helper is not
+    // invoked when not needed. It records the state of what we told helper the
+    // last time we invoked mDNSPreferencesSetName
+    domainlabel prevoldhostlabel;               // Previous m->p->userhostlabel
+    domainlabel prevnewhostlabel;               // Previous m->hostlabel
+    domainlabel prevoldnicelabel;               // Previous m->p->usernicelabel
+    domainlabel prevnewnicelabel;               // Previous m->nicelabel
+    mDNSs32 NotifyUser;
+    mDNSs32 HostNameConflict;                   // Time we experienced conflict on our link-local host name
+    mDNSs32 NetworkChanged;
+    mDNSs32 KeyChainTimer;
+
+    CFRunLoopRef CFRunLoop;
+    SCDynamicStoreRef Store;
+    CFRunLoopSourceRef StoreRLS;
+    CFRunLoopSourceRef PMRLS;
+    int SysEventNotifier;
+    KQueueEntry SysEventKQueue;
+    IONotificationPortRef PowerPortRef;
+    io_connect_t PowerConnection;
+    io_object_t PowerNotifier;
+#ifdef kIOPMAcknowledgmentOptionSystemCapabilityRequirements
+    IOPMConnection IOPMConnection;
+#endif
+    IOPMAssertionID IOPMAssertion;
+    long SleepCookie;                           // Cookie we need to pass to IOAllowPowerChange()
+    long WakeAtUTC;
+    mDNSs32 RequestReSleep;
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+    dispatch_source_t timer;
+    dispatch_source_t custom;
+#else
+    pthread_mutex_t BigMutex;
+#endif
+    mDNSs32 BigMutexStartTime;
+    int WakeKQueueLoopFD;
+    mDNSu8 v4answers;                  // non-zero if we are receiving answers
+    mDNSu8 v6answers;                  // for A/AAAA from external DNS servers
+    mDNSs32 DNSTrigger;                // Time the DNSTrigger was given
+    uint64_t LastConfigGeneration;     // DNS configuration generation number
+    UDPSocket UDPProxy;
+    TCPSocket TCPProxy;
+    ProxyCallback *UDPProxyCallback;
+    ProxyCallback *TCPProxyCallback;
+#if TARGET_OS_IPHONE
+    cellular_usage_policy_client_t handle;
+#endif
+};
+
+extern int OfferSleepProxyService;
+extern int DisableSleepProxyClient;
+extern int UseInternalSleepProxy;
+extern int OSXVers, iOSVers;
+
+extern int KQueueFD;
+
+extern void NotifyOfElusiveBug(const char *title, const char *msg); // Both strings are UTF-8 text
+extern void SetDomainSecrets(mDNS *m);
+extern void mDNSMacOSXNetworkChanged(mDNS *const m);
+extern void mDNSMacOSXSystemBuildNumber(char *HINFO_SWstring);
+extern NetworkInterfaceInfoOSX *IfindexToInterfaceInfoOSX(const mDNS *const m, mDNSInterfaceID ifindex);
+extern void mDNSUpdatePacketFilter(const ResourceRecord *const excludeRecord);
+extern void myKQSocketCallBack(int s1, short filter, void *context);
+extern void mDNSDynamicStoreSetConfig(int key, const char *subkey, CFPropertyListRef value);
+extern void UpdateDebugState(void);
+
+#ifdef MDNSRESPONDER_USES_LIB_DISPATCH_AS_PRIMARY_EVENT_LOOP_MECHANISM
+extern int KQueueSet(int fd, u_short flags, short filter, KQueueEntry *const entryRef);
+mDNSexport void TriggerEventCompletion(void);
+#else
+extern int KQueueSet(int fd, u_short flags, short filter, const KQueueEntry *const entryRef);
+#endif
+
+// When events are processed on the non-kqueue thread (i.e. CFRunLoop notifications like Sleep/Wake,
+// Interface changes, Keychain changes, etc.) they must use KQueueLock/KQueueUnlock to lock out the kqueue thread
+extern void KQueueLock(mDNS *const m);
+extern void KQueueUnlock(mDNS *const m, const char* task);
+extern void mDNSPlatformCloseFD(KQueueEntry *kq, int fd);
+extern ssize_t myrecvfrom(const int s, void *const buffer, const size_t max,
+                             struct sockaddr *const from, size_t *const fromlen, mDNSAddr *dstaddr, char *ifname, mDNSu8 *ttl);
+
+extern mDNSBool DictionaryIsEnabled(CFDictionaryRef dict);
+
+extern void CUPInit(mDNS *const m);
+extern const char *DNSScopeToString(mDNSu32 scope);
+
+// If any event takes more than WatchDogReportingThreshold milliseconds to be processed, we log a warning message
+// General event categories are:
+//  o Mach client request initiated / terminated
+//  o UDS client request
+//  o Handling UDP packets received from the network
+//  o Environmental change events:
+//    - network interface changes
+//    - sleep/wake
+//    - keychain changes
+//  o Name conflict dialog dismissal
+//  o Reception of Unix signal (e.g. SIGINFO)
+//  o Idle task processing
+// If we find that we're getting warnings for any of these categories, and it's not evident
+// what's causing the problem, we may need to subdivide some categories into finer-grained
+// sub-categories (e.g. "Idle task processing" covers a pretty broad range of sub-tasks).
+
+extern int WatchDogReportingThreshold;
+
+struct CompileTimeAssertionChecks_mDNSMacOSX
+{
+    // Check our structures are reasonable sizes. Including overly-large buffers, or embedding
+    // other overly-large structures instead of having a pointer to them, can inadvertently
+    // cause structure sizes (and therefore memory usage) to balloon unreasonably.
+
+    // Checks commented out when sizeof(DNSQuestion) change cascaded into having to change yet another
+    // set of hardcoded size values because these structures contain one or more DNSQuestion
+    // instances.
+//    char sizecheck_NetworkInterfaceInfoOSX[(sizeof(NetworkInterfaceInfoOSX) <=  7084) ? 1 : -1];
+    char sizecheck_mDNS_PlatformSupport   [(sizeof(mDNS_PlatformSupport)    <=  1378) ? 1 : -1];
+};
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/English.lproj/Localizable.strings b/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/English.lproj/Localizable.strings
new file mode 100644
index 00000000..7b88ff90
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/English.lproj/Localizable.strings
@@ -0,0 +1,13 @@
+"The name of your computer " = "The name of your computer ";
+"This computer’s local hostname " = "This computer’s local hostname ";
+"“" = "“";
+"”" = "”";
+" is already in use on this network. " = " is already in use on this network. ";
+"The name has been changed to " = "The name has been changed to ";
+"." = ".";
+
+"To change the name of your computer, open System Preferences and click Sharing, then type the name in the Computer Name field." = "To change the name of your computer, open System Preferences and click Sharing, then type the name in the Computer Name field.";
+"To change the local hostname, open System Preferences and click Sharing, then click “Edit” and type the name in the Local Hostname field." = "To change the local hostname, open System Preferences and click Sharing, then click “Edit” and type the name in the Local Hostname field.";
+
+"All attempts to find an available name by adding a number to the name were also unsuccessful." = "All attempts to find an available name by adding a number to the name were also unsuccessful.";
+"This may indicate a problem with the local network. Please inform your network administrator." = "This may indicate a problem with the local network. Please inform your network administrator.";
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/French.lproj/Localizable.strings b/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/French.lproj/Localizable.strings
new file mode 100644
index 00000000..453d5560
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder-bundle/Resources/French.lproj/Localizable.strings
@@ -0,0 +1,13 @@
+"The name of your computer " = "Le nom de l’ordinateur ";
+"This computer’s local hostname " = "Le nom d’hôte local de cet ordinateur ";
+"“" = "“";
+"”" = "”";
+" is already in use on this network. " = " est déjà utilié sur ce réseau. ";
+"The name has been changed to " = "Le nom a été changé pa ";
+"." = ".";
+
+"To change the name of your computer, open System Preferences and click Sharing, then type the name in the Computer Name field." = "Pour changer le nom de votre ordinateur, ouvrez Préférences Systèmes et cliquer Partage. Ensuite entrez le nom dans le champ Nom de l’ordinateur.";
+"To change the local hostname, open System Preferences and click Sharing, then click “Edit” and type the name in the Local Hostname field." = "Pour changer le nom d’hôte local, ouvrez Préférences Systèmes et cliquer Partage. Ensuite cliquer Modifier et entrez le nom dans le champ Nom local de l’ordinateur.";
+
+"All attempts to find an available name by adding a number to the name were also unsuccessful." = "Toutes les tentatives de trouver un nom disponible en ajoutant un nombre au nom étaient également non réussies.";
+"This may indicate a problem with the local network. Please inform your network administrator." = "Ceci peut indiquer un problème avec le réseau local. Veuillez informer votre administrateur de réseau.";
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder-entitlements.plist b/mDNSResponder/mDNSMacOSX/mDNSResponder-entitlements.plist
new file mode 100644
index 00000000..bb3f05e8
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder-entitlements.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.wifi.manager-access</key>
+    <true/>
+    <key>com.apple.SystemConfiguration.trailing-edge-agent</key>
+    <true/>
+    <key>com.apple.private.network.socket-delegate</key>
+    <true/>
+    <key>com.apple.networkd.cellular_blocked.notify</key>
+    <true/>
+    <key>com.apple.private.SCNetworkConnection-proxy-user</key>
+    <true/>
+    <key>com.apple.private.network.reserved-port</key>
+    <true/>
+    <key>com.apple.SystemConfiguration.SCDynamicStore-write-access</key>
+    <true/>
+    <key>com.apple.private.snhelper</key>
+    <true/>
+    <key>com.apple.telephony.cupolicy-monitor-access</key>
+    <true/>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.order b/mDNSResponder/mDNSMacOSX/mDNSResponder.order
new file mode 100644
index 00000000..55cfd6fe
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.order
@@ -0,0 +1,314 @@
+_start
+__start
+_dyld_stub_binding_helper
+__dyld_func_lookup
+_main
+_LogMsgWithLevel
+_mDNS_vsnprintf
+_mDNSPlatformWriteLogMsg
+_KQueueSet
+_mDNSMacOSXSystemBuildNumber
+_mDNSDaemonInitialize
+_mDNS_Init
+_mDNSPlatformTimeInit
+_mDNSRandom
+_mDNSPlatformRandomNumber
+_mDNSPlatformRawTime
+_mDNSPlatformInit
+_mDNS_snprintf
+_GetUserSpecifiedLocalHostName
+_SetupSocket
+_SystemWakeForNetworkAccess
+_UpdateInterfaceList
+_myGetIfAddrs
+_AddInterfaceToList
+_SetupAddr
+_NetWakeInterface
+_mDNS_SetFQDN
+_AppendDomainLabel
+_AppendLiteralLabelString
+_mDNS_Lock_
+_mDNSPlatformLock
+_SameDomainNameCS
+_DomainNameLengthLimit
+_mDNSPlatformMemCopy
+_mDNS_Unlock_
+_mDNSPlatformUnlock
+_SetupActiveInterfaces
+_SearchForInterfaceByName
+_mDNS_RegisterInterface
+_AdvertiseInterface
+_mDNS_SetupResourceRecord
+_MakeDomainNameFromDNSNameString
+_AppendDNSNameString
+_mDNS_Register_internal
+_InitializeLastAPTime
+_SetNextAnnounceProbeTime
+_GetRDLength
+_ValidateRData
+_DomainNameHashValue
+_RDataHashValue
+_SetTargetToHostName
+_SameDomainName
+_SetNewRData
+_CompressedDomainNameLength
+_AcknowledgeRecord
+_mDNS_StartBrowse_internal
+_ConstructServiceName
+_AppendDomainName
+_mDNS_StartQuery_internal
+_IsLocalDomain
+_CheckForSoonToExpireRecords
+_GetAuthInfoForQuestion
+_GetAuthInfoForName_internal
+_FindDuplicateQuestion
+_SetNextQueryTime
+_SetDomainSecrets
+_mDNSKeychainGetSecrets
+_getHelperPort
+_proxy_mDNSKeychainGetSecrets
+_mDNS_SetSecretForDomain
+_DNSDigest_ConstructHMACKeyfromBase64
+_mDNSPlatformMemZero
+_UpdateAutoTunnelDomainStatus
+_ConvertDomainLabelToCString_withescape
+_mDNSASLLog
+_mDNSDynamicStoreSetConfig
+_proxy_mDNSDynamicStoreSetConfig
+_ConvertDomainNameToCString_withescape
+_UpdateConfigureServer
+_TunnelServers
+_mDNSCoreInitComplete
+_mDNS_StatusCallback
+_mDNSPlatformMemSame
+_uDNS_SetupDNSConfig
+_mDNSPlatformSetDNSConfig
+_dns_configuration_copy
+___dns_initialize
+__dns_configuration_server_port
+_shared_dns_infoGet
+_CountLabels
+_SkipLeadingLabels
+_dns_configuration_free
+_mDNSPlatformGetPrimaryInterface
+_mDNS_SetPrimaryInterfaceInfo
+_udsserver_init
+_udsSupportAddFDToEventLoop
+_mDNS_GetDomains
+_mDNS_StartQuery
+_RegisterLocalOnlyDomainEnumPTR
+_mDNSPlatformMemAllocate
+_mDNS_Register
+_AddAutoBrowseDomain
+_udsserver_automatic_browse_domain_changed
+_machserver_automatic_browse_domain_changed
+_udsserver_handle_configchange
+_UpdateDeviceInfoRecord
+_AppendDNameListElem
+_SetPrefsBrowseDomains
+_udsserver_default_reg_domain_changed
+_machserver_automatic_registration_domain_changed
+_mDNSMacOSXNetworkChanged
+_mDNSSameAddress
+_ClearInactiveInterfaces
+_mDNSCoreBeSleepProxyServer
+_mDNS_ConfigChanged
+_mDNSPreferencesSetName
+_proxy_mDNSPreferencesSetName
+_SameRDataBody
+_DeregisterLocalOnlyDomainEnumPTR
+_mDNS_Deregister
+_mDNS_Deregister_internal
+_mDNSPlatformMemFree
+_RmvAutoBrowseDomain
+_KQueueLoop
+_mDNS_TimeNow
+_mDNS_Execute
+_SendQueries
+_GetFirstActiveInterface
+_InitializeDNSMessage
+_uDNS_Execute
+_mDNSv4AddrIsRFC1918
+_udsserver_idle
+_connect_callback
+_NewRequest
+_request_callback
+_ConvertHeaderBytes
+_handle_regservice_request
+_get_uint32
+_mDNSPlatformInterfaceIDfromInterfaceIndex
+_get_string
+_mDNSPlatformStrCopy
+_get_uint16
+_ChopSubTypes
+_AuthorizedDomain
+_register_service_instance
+_AllocateSubTypes
+_mDNS_RegisterService
+_ServiceCallback
+_GetServiceTarget
+_SetupLocalAutoTunnelInterface_internal
+_NetworkChanged
+_KQueueLock
+_AbortDeregistration
+_mDNS_StartNATOperation_internal
+_put_uint32
+_send_all
+_uDNS_SendNATMsg
+_KQueueUnlock
+_KQWokenFlushBytes
+_handle_queryrecord_request
+_mDNS_NewMessageID
+_GetServerForName
+_ActivateUnicastQuery
+_LastLabel
+_SameDomainLabel
+_uDNS_CheckCurrentQuestion
+_CacheGroupForName
+_MakeNegativeCacheRecord
+_CreateNewCacheEntry
+_GetCacheEntity
+_ResourceRecordAnswersQuestion
+_SetNextCacheCheckTime
+_SameNameRecordAnswersQuestion
+_CheckCacheExpiration
+_CacheRecordDeferredAdd
+_AnswerCurrentQuestionWithResourceRecord
+_queryrecord_result_callback
+_create_reply
+_mDNSPlatformInterfaceIndexfromInterfaceID
+_put_string
+_put_uint16
+_abort_request
+_queryrecord_termination_callback
+_mDNS_StopQuery
+_mDNS_StopQuery_internal
+_putQuestion
+_putDomainNameAsLabels
+_FindCompressionPointer
+_GetNextActiveInterfaceID
+_PutResourceRecordTTLWithLimit
+_putRData
+_mDNSSendDNSMessage
+_putHINFO
+_mDNSPlatformSendUDP
+_mDNSAddrIsDNSMulticast
+_myKQSocketCallBack
+_mDNSCoreReceive
+_mDNSCoreReceiveQuery
+_AddressIsLocalSubnet
+_LocateOptRR
+_LocateAdditionals
+_LocateAuthorities
+_LocateAnswers
+_skipResourceRecord
+_getQuestion
+_getDomainName
+_GetLargeResourceRecord
+_PacketRRConflict
+_AddAdditionalsToResponseList
+_mDNS_HostNameCallback
+_regservice_callback
+_GenerateNTDResponse
+_DeconstructServiceName
+_CountPeerRegistrations
+_RecordUpdatedNiceLabel
+_ClearProxyRecords
+_SendResponses
+_uDNS_recvLLQResponse
+_AnswerAllLocalQuestionsWithLocalAuthRecord
+_handle_regrecord_request
+_read_rr_from_ipc_msg
+_get_rdata
+_regrecord_callback
+_StartGetZoneData
+_GetZoneData_StartQuery
+_SetRecordRetry
+_GetZoneData_QuestionCallback
+_RecordRegistrationGotZoneData
+_SameResourceRecordSignature
+_FindIdenticalRecordInCache
+_mDNS_GrowCache
+_ShouldSuppressKnownAnswer
+_AutoTunnelNATCallback
+_RegisterAutoTunnelRecords
+_SysEventCallBack
+_UpdateSRVRecords
+_UpdateSRV
+_mDNS_DeregisterInterface
+_mDNS_PurgeCacheResourceRecord
+_DeadvertiseInterface
+_NumCacheRecordsForInterfaceID
+_AddrRequiresPPPConnection
+_mDNS_AddDNSServer
+_PurgeOrReconfirmCacheRecord
+_LNT_ClearState
+_UpdateAutoTunnelDomainStatuses
+_ReleaseCacheGroup
+_mDNS_AddDynDNSHostName
+_AdvertiseHostname
+_mDNSConfigureServer
+_mDNSPlatformStrLen
+_proxy_mDNSConfigureServer
+_CancelGetZoneData
+_mDNSPlatformUDPSocket
+_uDNS_ReceiveMsg
+_GetLLQOptData
+_ExpectingUnicastResponseForQuestion
+_UpdateSPSStatus
+_SPSStatusPutNumber
+_mDNSPlatformUDPClose
+_CloseSocketSet
+_SendRecordRegistration
+_putZone
+_putUpdateLease
+_MakeTCPConn
+_mDNSPlatformTCPSocket
+_mDNSPlatformTCPConnect
+_putDeleteRRSet
+_ServiceRegistrationGotZoneData
+_SendServiceRegistration
+_tcpKQSocketCallback
+_tlsSetupSock
+_doSSLHandshake
+_tlsWriteSock
+_tlsReadSock
+_tcpCallback
+_GetAuthInfoForName
+_DNSDigest_SignMessage
+_MD5_Update
+_md5_block_data_order
+_md5_block_host_order
+_mDNSPlatformUTC
+_MD5_Final
+_mDNSPlatformWriteTCP
+_mDNSPlatformReadTCP
+_DisposeTCPConn
+_mDNSPlatformTCPCloseConnection
+_GetPktLease
+_checkUpdateResult
+_HostnameCallback
+_AutoTunnelRecordCallback
+_handle_getproperty_request
+_AbortUnlinkAndFree
+_udsSupportRemoveFDFromEventLoop
+_handle_browse_request
+_add_domain_to_browser
+_mDNS_StartBrowse
+_ReconfirmAntecedents
+_FoundInstance
+_connection_termination
+_startLLQHandshake
+_LLQNATCallback
+_uDNS_RegisterSearchDomains
+_mDNS_AddSearchDomain
+_AnswerLocalQuestionWithLocalAuthRecord
+_enum_result_callback
+_LLQGotZoneData
+_GetLLQEventPort
+_mDNSPlatformSourceAddrForDest
+_putLLQ
+_SetLLQTimer
+_sendLLQRefresh
+_SendDelayedUnicastResponse
+_mDNS_Reconfirm_internal
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj b/mDNSResponder/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj
new file mode 100644
index 00000000..3e7df115
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.pbproj/project.pbxproj
@@ -0,0 +1,2338 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 38;
+	objects = {
+		000753D303367C1C0CCA2C71 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = mDNSMacOSX.h;
+			refType = 4;
+		};
+		00AD62A3032D799A0CCA2C71 = {
+			buildPhases = (
+				FFF7174A07614A8600E10551,
+				00AD62A4032D799A0CCA2C71,
+				00AD62AC032D799A0CCA2C71,
+				00AD62B3032D799A0CCA2C71,
+				00AD62B7032D799A0CCA2C71,
+			);
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				HEADER_SEARCH_PATHS = "../mDNSShared \"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers\" \"${CONFIGURATION_TEMP_DIR}\"";
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OPTIMIZATION_CFLAGS = "-O0";
+				OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -DmDNSResponderVersion=${MVERS} -DAPPLE_OSX_mDNSResponder=1 -D_LEGACY_NAT_TRAVERSAL_ -DMDNS_DEBUGMSGS=1";
+				OTHER_LDFLAGS = "-ldnsinfo";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = mDNSResponder.debug;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "-sectorder __TEXT __text mDNSResponder.order";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-W -Wall -Wmissing-prototypes -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+			);
+			isa = PBXToolTarget;
+			name = "mDNSResponder debug";
+			productName = mDNSResponder;
+			productReference = 00AD62B8032D799A0CCA2C71;
+		};
+		00AD62A4032D799A0CCA2C71 = {
+			buildActionMask = 2147483647;
+			files = (
+				00AD62A5032D799A0CCA2C71,
+				F5E11B5F04A28126019798ED,
+				F515E29604A37BB701CA296C,
+				F515E29704A37BB801CA296C,
+				F515E29904A37BBB01CA296C,
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		00AD62A5032D799A0CCA2C71 = {
+			fileRef = 6575FBFF022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62AC032D799A0CCA2C71 = {
+			buildActionMask = 2147483647;
+			files = (
+				00AD62AD032D799A0CCA2C71,
+				00AD62AE032D799A0CCA2C71,
+				00AD62AF032D799A0CCA2C71,
+				7F18A9FB0587CEF6001880B3,
+				7F18A9FA0587CEF6001880B3,
+				7F461DB7062DBF2900672BF3,
+				DBAAFE2E057E8F660085CAD0,
+				DBAAFE2B057E8F4D0085CAD0,
+				F525E72B04AA167A01F1CF4D,
+				F5E11B5E04A28126019798ED,
+				FFCB6D75075D595E00B8AF62,
+				00AD62B0032D799A0CCA2C71,
+				7FC8F9D606D14E66007E879D,
+				00AD62B1032D799A0CCA2C71,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		00AD62AD032D799A0CCA2C71 = {
+			fileRef = 6575FC00022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Client,
+				);
+			};
+		};
+		00AD62AE032D799A0CCA2C71 = {
+			fileRef = 6575FC01022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Server,
+					Client,
+				);
+			};
+		};
+		00AD62AF032D799A0CCA2C71 = {
+			fileRef = 6575FBE9022EAF5A00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B0032D799A0CCA2C71 = {
+			fileRef = 6575FBEB022EAF7200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B1032D799A0CCA2C71 = {
+			fileRef = 6575FBEC022EAF7200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B3032D799A0CCA2C71 = {
+			buildActionMask = 2147483647;
+			files = (
+				00AD62B4032D799A0CCA2C71,
+				00AD62B5032D799A0CCA2C71,
+				00AD62B6032D799A0CCA2C71,
+				7F869687066EE02400D2A2DC,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		00AD62B4032D799A0CCA2C71 = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B5032D799A0CCA2C71 = {
+			fileRef = 65713D46025A293200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B6032D799A0CCA2C71 = {
+			fileRef = 00CA213D02786FC30CCA2C71;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		00AD62B7032D799A0CCA2C71 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		00AD62B8032D799A0CCA2C71 = {
+			isa = PBXExecutableFileReference;
+			path = mDNSResponder.debug;
+			refType = 3;
+		};
+		00AD62BB032D7A0C0CCA2C71 = {
+			buildPhases = (
+			);
+			buildSettings = {
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Build All";
+				SECTORDER_FLAGS = "";
+			};
+			dependencies = (
+				FF25795106C9AB1D00376F7B,
+				00AD62BC032D7A160CCA2C71,
+				00AD62BD032D7A1B0CCA2C71,
+				00AD62BE032D7A1D0CCA2C71,
+				FF16238F07023BD2001AB7D7,
+				FFD41DDB0664169900F0C438,
+				FFD41DDC0664169B00F0C438,
+				FF2A870707B4481500B14068,
+			);
+			isa = PBXAggregateTarget;
+			name = "Build All";
+			productName = "Build All";
+		};
+		00AD62BC032D7A160CCA2C71 = {
+			isa = PBXTargetDependency;
+			target = 08FB779FFE84155DC02AAC07;
+		};
+		00AD62BD032D7A1B0CCA2C71 = {
+			isa = PBXTargetDependency;
+			target = 00AD62A3032D799A0CCA2C71;
+		};
+		00AD62BE032D7A1D0CCA2C71 = {
+			isa = PBXTargetDependency;
+			target = 6575FC1C022EB76000000109;
+		};
+		00B2AB0C032D7B220CCA2C71 = {
+			buildRules = (
+			);
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				MVERS = "\"mDNSResponder (Engineering Build)\"";
+			};
+			isa = PBXBuildStyle;
+			name = Development;
+		};
+		00CA213D02786FC30CCA2C71 = {
+			isa = PBXFrameworkReference;
+			name = IOKit.framework;
+			path = /System/Library/Frameworks/IOKit.framework;
+			refType = 0;
+		};
+//000
+//001
+//002
+//003
+//004
+//030
+//031
+//032
+//033
+//034
+		034768E2FF38A6DC11DB9C8B = {
+			isa = PBXExecutableFileReference;
+			path = mDNSResponder;
+			refType = 3;
+		};
+//030
+//031
+//032
+//033
+//034
+//080
+//081
+//082
+//083
+//084
+		08FB7793FE84155DC02AAC07 = {
+			buildStyles = (
+				00B2AB0C032D7B220CCA2C71,
+			);
+			hasScannedForEncodings = 1;
+			isa = PBXProject;
+			mainGroup = 08FB7794FE84155DC02AAC07;
+			projectDirPath = "";
+			targets = (
+				00AD62BB032D7A0C0CCA2C71,
+				08FB779FFE84155DC02AAC07,
+				00AD62A3032D799A0CCA2C71,
+				6575FC1C022EB76000000109,
+				FF1C919207021C84001048AB,
+				DB2CC4530662DD6800335AB3,
+				DB2CC4660662DF5C00335AB3,
+				FF25792906C9A70800376F7B,
+				FFFB0DA907B43C9100B88D48,
+				FF2609E107B440DD00CE10E5,
+			);
+		};
+		08FB7794FE84155DC02AAC07 = {
+			children = (
+				08FB7795FE84155DC02AAC07,
+				6575FC1F022EB78C00000109,
+				6575FBFE022EAFA800000109,
+				DB2CC4420662DCE500335AB3,
+				FFFB0DA407B43BED00B88D48,
+				08FB779DFE84155DC02AAC07,
+				19C28FBDFE9D53C911CA2CBB,
+			);
+			isa = PBXGroup;
+			name = mDNSResponder;
+			refType = 4;
+		};
+		08FB7795FE84155DC02AAC07 = {
+			children = (
+				7FC8F9D406D14E66007E879D,
+				7F461DB5062DBF2900672BF3,
+				F525E72804AA167501F1CF4D,
+				F5E11B5A04A28126019798ED,
+				F5E11B5B04A28126019798ED,
+				6575FBEC022EAF7200000109,
+				6575FBE9022EAF5A00000109,
+				6575FBEB022EAF7200000109,
+				654BE64F02B63B93000001D1,
+				654BE65002B63B93000001D1,
+				DBAAFE29057E8F4D0085CAD0,
+				000753D303367C1C0CCA2C71,
+				DBAAFE2C057E8F660085CAD0,
+				FFCB6D73075D539900B8AF62,
+				FF0E0B5D065ADC7600FE4D9C,
+				FF1C919D07021D77001048AB,
+				FF485D5105632E0000130380,
+				FFF4F63A06CFE4DD00459EFD,
+				7F18A9F60587CEF6001880B3,
+				7F18A9F70587CEF6001880B3,
+				FF25794606C9A8BF00376F7B,
+				FF13FFEA0A5DA44A00897C81,
+				FF13FFEC0A5DA45500897C81,
+			);
+			isa = PBXGroup;
+			name = "mDNS Server Sources";
+			path = "";
+			refType = 4;
+		};
+		08FB779DFE84155DC02AAC07 = {
+			children = (
+				7F869685066EE02400D2A2DC,
+				FFFB0DB407B43D2700B88D48,
+				09AB6884FE841BABC02AAC07,
+				65713D46025A293200000109,
+				00CA213D02786FC30CCA2C71,
+				DB2CC4680662DFF500335AB3,
+				FF2609FA07B4433800CE10E5,
+				FF260A1F07B4436900CE10E5,
+			);
+			isa = PBXGroup;
+			name = "External Frameworks and Libraries";
+			refType = 4;
+		};
+		08FB779FFE84155DC02AAC07 = {
+			buildPhases = (
+				FF37BE9207614059003C0420,
+				08FB77A0FE84155DC02AAC07,
+				08FB77A1FE84155DC02AAC07,
+				08FB77A3FE84155DC02AAC07,
+				08FB77A5FE84155DC02AAC07,
+				FF5A0AE705632EA600743C27,
+				FF5585E507790732008D1C14,
+			);
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				HEADER_SEARCH_PATHS = "../mDNSShared \"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers\" \"${CONFIGURATION_TEMP_DIR}\"";
+				INSTALL_PATH = /usr/sbin;
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -DmDNSResponderVersion=${MVERS} -DAPPLE_OSX_mDNSResponder=1 -D_LEGACY_NAT_TRAVERSAL_ -D__MigTypeCheck=1";
+				OTHER_LDFLAGS = "-ldnsinfo";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = mDNSResponder;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "-sectorder __TEXT __text mDNSResponder.order";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-W -Wall -Wmissing-prototypes -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+			);
+			isa = PBXToolTarget;
+			name = mDNSResponder;
+			productInstallPath = "${HOME}/bin";
+			productName = mDNSResponder;
+			productReference = 034768E2FF38A6DC11DB9C8B;
+		};
+		08FB77A0FE84155DC02AAC07 = {
+			buildActionMask = 2147483647;
+			files = (
+				6575FC02022EAFBA00000109,
+				F5E11B5D04A28126019798ED,
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08FB77A1FE84155DC02AAC07 = {
+			buildActionMask = 2147483647;
+			files = (
+				6575FC0D022EB18700000109,
+				6575FC0E022EB18700000109,
+				6575FBEA022EAF5A00000109,
+				7F18A9F90587CEF6001880B3,
+				7F18A9F80587CEF6001880B3,
+				7F461DB6062DBF2900672BF3,
+				DBAAFE2D057E8F660085CAD0,
+				DBAAFE2A057E8F4D0085CAD0,
+				F525E72904AA167501F1CF4D,
+				F5E11B5C04A28126019798ED,
+				FFCB6D74075D539900B8AF62,
+				6575FBED022EAF7200000109,
+				7FC8F9D506D14E66007E879D,
+				6575FBEE022EAF7200000109,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08FB77A3FE84155DC02AAC07 = {
+			buildActionMask = 2147483647;
+			files = (
+				09AB6885FE841BABC02AAC07,
+				65713D66025A293200000109,
+				6585DD640279A3B7000001D1,
+				7F869686066EE02400D2A2DC,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		08FB77A5FE84155DC02AAC07 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+//080
+//081
+//082
+//083
+//084
+//090
+//091
+//092
+//093
+//094
+		09AB6884FE841BABC02AAC07 = {
+			isa = PBXFrameworkReference;
+			name = CoreFoundation.framework;
+			path = /System/Library/Frameworks/CoreFoundation.framework;
+			refType = 0;
+		};
+		09AB6885FE841BABC02AAC07 = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//090
+//091
+//092
+//093
+//094
+//190
+//191
+//192
+//193
+//194
+		19C28FBDFE9D53C911CA2CBB = {
+			children = (
+				034768E2FF38A6DC11DB9C8B,
+				6575FC1D022EB76000000109,
+				00AD62B8032D799A0CCA2C71,
+				DB2CC4670662DF5C00335AB3,
+				FFD41DDA0664157900F0C438,
+				FF25794406C9A70800376F7B,
+				FF1C919B07021C84001048AB,
+				FFFB0DAA07B43C9100B88D48,
+				FF2609E207B440DD00CE10E5,
+			);
+			isa = PBXGroup;
+			name = Products;
+			refType = 4;
+		};
+//190
+//191
+//192
+//193
+//194
+//650
+//651
+//652
+//653
+//654
+		654BE64F02B63B93000001D1 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = mDNSEmbeddedAPI.h;
+			path = ../mDNSCore/mDNSEmbeddedAPI.h;
+			refType = 4;
+		};
+		654BE65002B63B93000001D1 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = mDNSDebug.h;
+			path = ../mDNSCore/mDNSDebug.h;
+			refType = 4;
+		};
+		65713D46025A293200000109 = {
+			isa = PBXFrameworkReference;
+			name = SystemConfiguration.framework;
+			path = /System/Library/Frameworks/SystemConfiguration.framework;
+			refType = 0;
+		};
+		65713D66025A293200000109 = {
+			fileRef = 65713D46025A293200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FBE9022EAF5A00000109 = {
+			fileEncoding = 4;
+			indentWidth = 4;
+			isa = PBXFileReference;
+			name = mDNS.c;
+			path = ../mDNSCore/mDNS.c;
+			refType = 4;
+			tabWidth = 4;
+			usesTabs = 1;
+		};
+		6575FBEA022EAF5A00000109 = {
+			fileRef = 6575FBE9022EAF5A00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FBEB022EAF7200000109 = {
+			fileEncoding = 4;
+			indentWidth = 4;
+			isa = PBXFileReference;
+			path = mDNSMacOSX.c;
+			refType = 4;
+			tabWidth = 4;
+			usesTabs = 1;
+		};
+		6575FBEC022EAF7200000109 = {
+			fileEncoding = 4;
+			indentWidth = 4;
+			isa = PBXFileReference;
+			path = daemon.c;
+			refType = 4;
+			tabWidth = 4;
+			usesTabs = 1;
+		};
+		6575FBED022EAF7200000109 = {
+			fileRef = 6575FBEB022EAF7200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FBEE022EAF7200000109 = {
+			fileRef = 6575FBEC022EAF7200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FBFE022EAFA800000109 = {
+			children = (
+				6575FBFF022EAFBA00000109,
+				6575FC00022EAFBA00000109,
+				6575FC01022EAFBA00000109,
+			);
+			isa = PBXGroup;
+			name = "DNS Service Discovery MIG files";
+			refType = 4;
+		};
+		6575FBFF022EAFBA00000109 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = DNSServiceDiscoveryDefines.h;
+			refType = 4;
+		};
+		6575FC00022EAFBA00000109 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = DNSServiceDiscoveryReply.defs;
+			refType = 4;
+		};
+		6575FC01022EAFBA00000109 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = DNSServiceDiscoveryRequest.defs;
+			refType = 4;
+		};
+		6575FC02022EAFBA00000109 = {
+			fileRef = 6575FBFF022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FC0D022EB18700000109 = {
+			fileRef = 6575FC00022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Client,
+				);
+			};
+		};
+		6575FC0E022EB18700000109 = {
+			fileRef = 6575FC01022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Server,
+					Client,
+				);
+			};
+		};
+		6575FC18022EB76000000109 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6575FC19022EB76000000109 = {
+			buildActionMask = 2147483647;
+			files = (
+				6575FC21022EB7AA00000109,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6575FC1A022EB76000000109 = {
+			buildActionMask = 2147483647;
+			files = (
+				6575FC24022EBA5D00000109,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6575FC1B022EB76000000109 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6575FC1C022EB76000000109 = {
+			buildPhases = (
+				6575FC18022EB76000000109,
+				6575FC19022EB76000000109,
+				6575FC1A022EB76000000109,
+				6575FC1B022EB76000000109,
+				FFF4F63C06CFE53300459EFD,
+			);
+			buildSettings = {
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				INSTALL_PATH = /usr/bin;
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = mDNS;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-W -Wall -Wmissing-prototypes -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+			);
+			isa = PBXToolTarget;
+			name = "mDNS command-line tool";
+			productInstallPath = /usr/bin;
+			productName = "mDNS command-line tool";
+			productReference = 6575FC1D022EB76000000109;
+		};
+		6575FC1D022EB76000000109 = {
+			isa = PBXExecutableFileReference;
+			path = mDNS;
+			refType = 3;
+		};
+		6575FC1F022EB78C00000109 = {
+			children = (
+				6575FC20022EB7AA00000109,
+				FF1C919F07021E3F001048AB,
+			);
+			isa = PBXGroup;
+			name = "Command-Line Clients";
+			refType = 4;
+		};
+		6575FC20022EB7AA00000109 = {
+			fileEncoding = 4;
+			indentWidth = 4;
+			isa = PBXFileReference;
+			path = SamplemDNSClient.c;
+			refType = 2;
+			tabWidth = 4;
+			usesTabs = 0;
+		};
+		6575FC21022EB7AA00000109 = {
+			fileRef = 6575FC20022EB7AA00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6575FC24022EBA5D00000109 = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		6585DD640279A3B7000001D1 = {
+			fileRef = 00CA213D02786FC30CCA2C71;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//650
+//651
+//652
+//653
+//654
+//7F0
+//7F1
+//7F2
+//7F3
+//7F4
+		7F18A9F60587CEF6001880B3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSCommon.c;
+			path = ../mDNSCore/DNSCommon.c;
+			refType = 2;
+		};
+		7F18A9F70587CEF6001880B3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = uDNS.c;
+			path = ../mDNSCore/uDNS.c;
+			refType = 2;
+		};
+		7F18A9F80587CEF6001880B3 = {
+			fileRef = 7F18A9F60587CEF6001880B3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F18A9F90587CEF6001880B3 = {
+			fileRef = 7F18A9F70587CEF6001880B3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F18A9FA0587CEF6001880B3 = {
+			fileRef = 7F18A9F60587CEF6001880B3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F18A9FB0587CEF6001880B3 = {
+			fileRef = 7F18A9F70587CEF6001880B3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F461DB5062DBF2900672BF3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSDigest.c;
+			path = ../mDNSCore/DNSDigest.c;
+			refType = 2;
+		};
+		7F461DB6062DBF2900672BF3 = {
+			fileRef = 7F461DB5062DBF2900672BF3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F461DB7062DBF2900672BF3 = {
+			fileRef = 7F461DB5062DBF2900672BF3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F869685066EE02400D2A2DC = {
+			isa = PBXFrameworkReference;
+			name = Security.framework;
+			path = /System/Library/Frameworks/Security.framework;
+			refType = 0;
+		};
+		7F869686066EE02400D2A2DC = {
+			fileRef = 7F869685066EE02400D2A2DC;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7F869687066EE02400D2A2DC = {
+			fileRef = 7F869685066EE02400D2A2DC;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7FC8F9D406D14E66007E879D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = LegacyNATTraversal.c;
+			refType = 2;
+		};
+		7FC8F9D506D14E66007E879D = {
+			fileRef = 7FC8F9D406D14E66007E879D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		7FC8F9D606D14E66007E879D = {
+			fileRef = 7FC8F9D406D14E66007E879D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//7F0
+//7F1
+//7F2
+//7F3
+//7F4
+//DB0
+//DB1
+//DB2
+//DB3
+//DB4
+		DB2CC4420662DCE500335AB3 = {
+			children = (
+				DB2CC4430662DD1100335AB3,
+				DB2CC4440662DD1100335AB3,
+				DB2CC4450662DD1100335AB3,
+				DB2CC4460662DD1100335AB3,
+				DB2CC4470662DD1100335AB3,
+				DB2CC4480662DD1100335AB3,
+				DB2CC4490662DD1100335AB3,
+				DB2CC44A0662DD1100335AB3,
+				DB2CC44B0662DD1100335AB3,
+				DB2CC44C0662DD1100335AB3,
+				DB2CC44D0662DD1100335AB3,
+				DB2CC44E0662DD1100335AB3,
+				DB2CC44F0662DD1100335AB3,
+				FF2C5FB00A48B8680066DA11,
+				FF2C5FB20A48B86E0066DA11,
+			);
+			isa = PBXGroup;
+			name = "Java Support";
+			refType = 4;
+		};
+		DB2CC4430662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = BaseListener.java;
+			path = ../mDNSShared/Java/BaseListener.java;
+			refType = 2;
+		};
+		DB2CC4440662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = BrowseListener.java;
+			path = ../mDNSShared/Java/BrowseListener.java;
+			refType = 2;
+		};
+		DB2CC4450662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSRecord.java;
+			path = ../mDNSShared/Java/DNSRecord.java;
+			refType = 2;
+		};
+		DB2CC4460662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSSD.java;
+			path = ../mDNSShared/Java/DNSSD.java;
+			refType = 2;
+		};
+		DB2CC4470662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSSDException.java;
+			path = ../mDNSShared/Java/DNSSDException.java;
+			refType = 2;
+		};
+		DB2CC4480662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSSDRegistration.java;
+			path = ../mDNSShared/Java/DNSSDRegistration.java;
+			refType = 2;
+		};
+		DB2CC4490662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSSDService.java;
+			path = ../mDNSShared/Java/DNSSDService.java;
+			refType = 2;
+		};
+		DB2CC44A0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DomainListener.java;
+			path = ../mDNSShared/Java/DomainListener.java;
+			refType = 2;
+		};
+		DB2CC44B0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = JNISupport.c;
+			path = ../mDNSShared/Java/JNISupport.c;
+			refType = 2;
+		};
+		DB2CC44C0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = QueryListener.java;
+			path = ../mDNSShared/Java/QueryListener.java;
+			refType = 2;
+		};
+		DB2CC44D0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = RegisterListener.java;
+			path = ../mDNSShared/Java/RegisterListener.java;
+			refType = 2;
+		};
+		DB2CC44E0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = ResolveListener.java;
+			path = ../mDNSShared/Java/ResolveListener.java;
+			refType = 2;
+		};
+		DB2CC44F0662DD1100335AB3 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = TXTRecord.java;
+			path = ../mDNSShared/Java/TXTRecord.java;
+			refType = 2;
+		};
+		DB2CC4500662DD6800335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+				DB2CC4560662DE4500335AB3,
+				DB2CC4570662DE4600335AB3,
+				DB2CC4580662DE4700335AB3,
+				DB2CC4590662DE4700335AB3,
+				DB2CC45A0662DE4800335AB3,
+				DB2CC45B0662DE4900335AB3,
+				DB2CC45C0662DE4900335AB3,
+				DB2CC45D0662DE4A00335AB3,
+				DB2CC45E0662DE4B00335AB3,
+				DB2CC45F0662DE4C00335AB3,
+				DB2CC4600662DE4C00335AB3,
+				DB2CC4610662DE4D00335AB3,
+				FF2C5FB10A48B8680066DA11,
+				FF2C5FB30A48B86E0066DA11,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4510662DD6800335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXJavaArchiveBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4520662DD6800335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4530662DD6800335AB3 = {
+			buildPhases = (
+				DB2CC4500662DD6800335AB3,
+				DB2CC4510662DD6800335AB3,
+				DB2CC4520662DD6800335AB3,
+				DB2CC4550662DE1700335AB3,
+				FFD41DDD06641B4200F0C438,
+			);
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				INSTALL_PATH = "${SYSTEM_LIBRARY_DIR}/Java/Extensions";
+				JAVA_ARCHIVE_CLASSES = YES;
+				JAVA_ARCHIVE_COMPRESSION = YES;
+				JAVA_ARCHIVE_TYPE = JAR;
+				JAVA_COMPILER_DEBUGGING_SYMBOLS = NO;
+				JAVA_COMPILER_SOURCE_VERSION = 1.4;
+				JAVA_COMPILER_TARGET_VM_VERSION = 1.4;
+				JAVA_SOURCE_SUBDIR = .;
+				LIBRARY_STYLE = STATIC;
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = dns_sd;
+				PURE_JAVA = YES;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			comments = "Multiplatform .jar file that implements Java interface to DNS-SD";
+			dependencies = (
+			);
+			isa = PBXLibraryTarget;
+			name = dns_sd.jar;
+			productInstallPath = /System/Library/Java/Extensions;
+			productName = dns_sd.jar;
+			productReference = FFD41DDA0664157900F0C438;
+		};
+		DB2CC4550662DE1700335AB3 = {
+			buildActionMask = 12;
+			files = (
+			);
+			generatedFileNames = (
+			);
+			isa = PBXShellScriptBuildPhase;
+			neededFileNames = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "javah -force -J-Xbootclasspath/p:${CONFIGURATION_TEMP_DIR}/dns_sd.jar.build/JavaClasses -o ${CONFIGURATION_TEMP_DIR}/dns_sd.jar.build/DNSSD.java.h com.apple.dnssd.AppleDNSSD com.apple.dnssd.AppleBrowser com.apple.dnssd.AppleResolver com.apple.dnssd.AppleRegistration com.apple.dnssd.AppleQuery com.apple.dnssd.AppleDomainEnum com.apple.dnssd.AppleService";
+		};
+		DB2CC4560662DE4500335AB3 = {
+			fileRef = DB2CC4430662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4570662DE4600335AB3 = {
+			fileRef = DB2CC4440662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4580662DE4700335AB3 = {
+			fileRef = DB2CC4450662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4590662DE4700335AB3 = {
+			fileRef = DB2CC4460662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45A0662DE4800335AB3 = {
+			fileRef = DB2CC4470662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45B0662DE4900335AB3 = {
+			fileRef = DB2CC4480662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45C0662DE4900335AB3 = {
+			fileRef = DB2CC4490662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45D0662DE4A00335AB3 = {
+			fileRef = DB2CC44A0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45E0662DE4B00335AB3 = {
+			fileRef = DB2CC44C0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC45F0662DE4C00335AB3 = {
+			fileRef = DB2CC44D0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4600662DE4C00335AB3 = {
+			fileRef = DB2CC44E0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4610662DE4D00335AB3 = {
+			fileRef = DB2CC44F0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC4620662DF5C00335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4630662DF5C00335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+				DB2CC46A0662E00700335AB3,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4640662DF5C00335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+				DB2CC4690662DFF500335AB3,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4650662DF5C00335AB3 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB2CC4660662DF5C00335AB3 = {
+			buildPhases = (
+				DB2CC4620662DF5C00335AB3,
+				DB2CC4630662DF5C00335AB3,
+				DB2CC4640662DF5C00335AB3,
+				DB2CC4650662DF5C00335AB3,
+			);
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				HEADER_SEARCH_PATHS = "../mDNSShared \"${SYSTEM_LIBRARY_DIR}/Frameworks/JavaVM.framework/Versions/A/Headers\" \"${SYSTEM_LIBRARY_DIR}/Frameworks/JavaVM.framework/Versions/1.3.1/Headers\" \"${CONFIGURATION_TEMP_DIR}/dns_sd.jar.build\"";
+				INSTALL_PATH = /usr/lib/java;
+				LIBRARY_STYLE = DYNAMIC;
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = libjdns_sd.jnilib;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			comments = "Platform-specific JNI library that bridges dns_sd.jar to <dns_sd.h>.";
+			dependencies = (
+				FFD41DDF06641BBB00F0C438,
+			);
+			isa = PBXLibraryTarget;
+			name = libjdns_sd.jnilib;
+			productInstallPath = /usr/lib/java;
+			productName = libjdns_sd.jnilib;
+			productReference = DB2CC4670662DF5C00335AB3;
+		};
+		DB2CC4670662DF5C00335AB3 = {
+			isa = PBXLibraryReference;
+			path = libjdns_sd.jnilib;
+			refType = 3;
+		};
+		DB2CC4680662DFF500335AB3 = {
+			isa = PBXFrameworkReference;
+			name = JavaVM.framework;
+			path = /System/Library/Frameworks/JavaVM.framework;
+			refType = 0;
+		};
+		DB2CC4690662DFF500335AB3 = {
+			fileRef = DB2CC4680662DFF500335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DB2CC46A0662E00700335AB3 = {
+			fileRef = DB2CC44B0662DD1100335AB3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DBAAFE29057E8F4D0085CAD0 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = mDNSDebug.c;
+			path = ../mDNSShared/mDNSDebug.c;
+			refType = 2;
+		};
+		DBAAFE2A057E8F4D0085CAD0 = {
+			fileRef = DBAAFE29057E8F4D0085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DBAAFE2B057E8F4D0085CAD0 = {
+			fileRef = DBAAFE29057E8F4D0085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DBAAFE2C057E8F660085CAD0 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = GenLinkedList.c;
+			path = ../mDNSShared/GenLinkedList.c;
+			refType = 2;
+		};
+		DBAAFE2D057E8F660085CAD0 = {
+			fileRef = DBAAFE2C057E8F660085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DBAAFE2E057E8F660085CAD0 = {
+			fileRef = DBAAFE2C057E8F660085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//DB0
+//DB1
+//DB2
+//DB3
+//DB4
+//F50
+//F51
+//F52
+//F53
+//F54
+		F515E29604A37BB701CA296C = {
+			fileRef = 654BE64F02B63B93000001D1;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F515E29704A37BB801CA296C = {
+			fileRef = 654BE65002B63B93000001D1;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F515E29904A37BBB01CA296C = {
+			fileRef = 000753D303367C1C0CCA2C71;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F525E72804AA167501F1CF4D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = uds_daemon.c;
+			path = ../mDNSShared/uds_daemon.c;
+			refType = 2;
+		};
+		F525E72904AA167501F1CF4D = {
+			fileRef = F525E72804AA167501F1CF4D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F525E72B04AA167A01F1CF4D = {
+			fileRef = F525E72804AA167501F1CF4D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5E11B5A04A28126019798ED = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnssd_ipc.c;
+			path = ../mDNSShared/dnssd_ipc.c;
+			refType = 2;
+		};
+		F5E11B5B04A28126019798ED = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnssd_ipc.h;
+			path = ../mDNSShared/dnssd_ipc.h;
+			refType = 2;
+		};
+		F5E11B5C04A28126019798ED = {
+			fileRef = F5E11B5A04A28126019798ED;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5E11B5D04A28126019798ED = {
+			fileRef = F5E11B5B04A28126019798ED;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5E11B5E04A28126019798ED = {
+			fileRef = F5E11B5A04A28126019798ED;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5E11B5F04A28126019798ED = {
+			fileRef = F5E11B5B04A28126019798ED;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//F50
+//F51
+//F52
+//F53
+//F54
+//FF0
+//FF1
+//FF2
+//FF3
+//FF4
+		FF08480607CEB8E800AE6769 = {
+			isa = PBXFileReference;
+			name = inprogress.tiff;
+			path = PreferencePane/Artwork/inprogress.tiff;
+			refType = 2;
+		};
+		FF08480707CEB8E800AE6769 = {
+			fileRef = FF08480607CEB8E800AE6769;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF0E0B5D065ADC7600FE4D9C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = mDNS.1;
+			path = ../mDNSShared/mDNS.1;
+			refType = 2;
+		};
+		FF13FFE90A5DA40200897C81 = {
+			fileRef = 6575FBEB022EAF7200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF13FFEA0A5DA44A00897C81 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnsextd_lexer.l;
+			path = ../mDNSShared/dnsextd_lexer.l;
+			refType = 2;
+		};
+		FF13FFEB0A5DA44A00897C81 = {
+			fileRef = FF13FFEA0A5DA44A00897C81;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF13FFEC0A5DA45500897C81 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnsextd_parser.y;
+			path = ../mDNSShared/dnsextd_parser.y;
+			refType = 2;
+		};
+		FF13FFED0A5DA45500897C81 = {
+			fileRef = FF13FFEC0A5DA45500897C81;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF13FFEE0A5DA52700897C81 = {
+			isa = PBXTargetDependency;
+			target = 08FB779FFE84155DC02AAC07;
+		};
+		FF13FFEF0A5DA6FD00897C81 = {
+			fileRef = FFCB6D73075D539900B8AF62;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF16238F07023BD2001AB7D7 = {
+			isa = PBXTargetDependency;
+			target = FF1C919207021C84001048AB;
+		};
+		FF1C919207021C84001048AB = {
+			buildPhases = (
+				FF1C919307021C84001048AB,
+				FF1C919407021C84001048AB,
+				FF1C919607021C84001048AB,
+				FF1C919807021C84001048AB,
+				FF1C919907021C84001048AB,
+			);
+			buildSettings = {
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				INSTALL_PATH = /usr/bin;
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic -I../mDNSShared";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "dns-sd";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-W -Wall -Wmissing-prototypes -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+			);
+			isa = PBXToolTarget;
+			name = "dns-sd command-line tool";
+			productInstallPath = /usr/bin;
+			productName = "dns-sd command-line tool";
+			productReference = FF1C919B07021C84001048AB;
+		};
+		FF1C919307021C84001048AB = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1C919407021C84001048AB = {
+			buildActionMask = 2147483647;
+			files = (
+				FF1C91A007021E40001048AB,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1C919607021C84001048AB = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1C919807021C84001048AB = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF1C919907021C84001048AB = {
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1;
+			dstSubfolderSpec = 0;
+			files = (
+				FF1C919E07021D78001048AB,
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		FF1C919B07021C84001048AB = {
+			isa = PBXExecutableFileReference;
+			path = "dns-sd";
+			refType = 3;
+		};
+		FF1C919D07021D77001048AB = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "dns-sd.1";
+			path = "../mDNSShared/dns-sd.1";
+			refType = 2;
+		};
+		FF1C919E07021D78001048AB = {
+			fileRef = FF1C919D07021D77001048AB;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF1C919F07021E3F001048AB = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "dns-sd.c";
+			path = "../Clients/dns-sd.c";
+			refType = 2;
+		};
+		FF1C91A007021E40001048AB = {
+			fileRef = FF1C919F07021E3F001048AB;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25792906C9A70800376F7B = {
+			buildPhases = (
+				FF25792A06C9A70800376F7B,
+				FF25792D06C9A70800376F7B,
+				FF25793A06C9A70800376F7B,
+				FF25793F06C9A70800376F7B,
+				FF25794006C9A70800376F7B,
+			);
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				HEADER_SEARCH_PATHS = "\"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers\" \"${CONFIGURATION_TEMP_DIR}\"";
+				INSTALL_PATH = /usr/sbin;
+				LEX = /usr/bin/flex;
+				LEXFLAGS = "-i";
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "-no-cpp-precomp -mdynamic-no-pic";
+				OTHER_LDFLAGS = "-ldnsinfo";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = dnsextd;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-W -Wall -Wmissing-prototypes -Wno-four-char-constants -Wno-unknown-pragmas";
+				YACC = "/usr/bin/bison -y";
+			};
+			dependencies = (
+				FF13FFEE0A5DA52700897C81,
+			);
+			isa = PBXToolTarget;
+			name = dnsextd;
+			productInstallPath = /usr/sbin;
+			productName = mDNSResponder;
+			productReference = FF25794406C9A70800376F7B;
+		};
+		FF25792A06C9A70800376F7B = {
+			buildActionMask = 2147483647;
+			files = (
+				FF25792B06C9A70800376F7B,
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF25792B06C9A70800376F7B = {
+			fileRef = 6575FBFF022EAFBA00000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25792D06C9A70800376F7B = {
+			buildActionMask = 2147483647;
+			files = (
+				FF25793606C9A70800376F7B,
+				FF25793806C9A70800376F7B,
+				FF25794706C9A8BF00376F7B,
+				FF25794A06C9A98700376F7B,
+				FF25794E06C9AA3000376F7B,
+				FF13FFE90A5DA40200897C81,
+				FF13FFEB0A5DA44A00897C81,
+				FF13FFED0A5DA45500897C81,
+				FF13FFEF0A5DA6FD00897C81,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF25793606C9A70800376F7B = {
+			fileRef = 7F18A9F60587CEF6001880B3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793806C9A70800376F7B = {
+			fileRef = 7F461DB5062DBF2900672BF3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793A06C9A70800376F7B = {
+			buildActionMask = 2147483647;
+			files = (
+				FF25793B06C9A70800376F7B,
+				FF25793C06C9A70800376F7B,
+				FF25793D06C9A70800376F7B,
+				FF25793E06C9A70800376F7B,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF25793B06C9A70800376F7B = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793C06C9A70800376F7B = {
+			fileRef = 65713D46025A293200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793D06C9A70800376F7B = {
+			fileRef = 00CA213D02786FC30CCA2C71;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793E06C9A70800376F7B = {
+			fileRef = 7F869685066EE02400D2A2DC;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25793F06C9A70800376F7B = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF25794006C9A70800376F7B = {
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man8;
+			dstSubfolderSpec = 0;
+			files = (
+				FFF4F63B06CFE4DD00459EFD,
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		FF25794406C9A70800376F7B = {
+			isa = PBXExecutableFileReference;
+			path = dnsextd;
+			refType = 3;
+		};
+		FF25794606C9A8BF00376F7B = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnsextd.c;
+			path = ../mDNSShared/dnsextd.c;
+			refType = 2;
+		};
+		FF25794706C9A8BF00376F7B = {
+			fileRef = FF25794606C9A8BF00376F7B;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25794A06C9A98700376F7B = {
+			fileRef = DBAAFE29057E8F4D0085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25794E06C9AA3000376F7B = {
+			fileRef = DBAAFE2C057E8F660085CAD0;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF25795106C9AB1D00376F7B = {
+			isa = PBXTargetDependency;
+			target = FF25792906C9A70800376F7B;
+		};
+		FF2609DC07B440DD00CE10E5 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF2609DD07B440DD00CE10E5 = {
+			buildActionMask = 2147483647;
+			files = (
+				FF260A2B07B4464B00CE10E5,
+				FF260A2C07B4464B00CE10E5,
+				FF260A2D07B4464B00CE10E5,
+				FF260A2E07B4464B00CE10E5,
+				FF260A2F07B4464B00CE10E5,
+				FF260A3007B4464B00CE10E5,
+				FF260A3107B4464B00CE10E5,
+				FF260A3407B4466900CE10E5,
+				FF260A3507B4466900CE10E5,
+				FF260A4A07B4475600CE10E5,
+				FF260A4D07B4477F00CE10E5,
+				FF2A870607B447EF00B14068,
+				FF08480707CEB8E800AE6769,
+				FF354EB208516C63007C00E1,
+			);
+			isa = PBXResourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF2609DE07B440DD00CE10E5 = {
+			buildActionMask = 2147483647;
+			files = (
+				FF2609E407B441D400CE10E5,
+				FF2609E507B441D700CE10E5,
+				FF2609E607B441DB00CE10E5,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF2609DF07B440DD00CE10E5 = {
+			buildActionMask = 2147483647;
+			files = (
+				FF2609F607B442BA00CE10E5,
+				FF2609F707B442C000CE10E5,
+				FF2609FB07B4433800CE10E5,
+				FF260A2007B4436900CE10E5,
+				FF260A2107B443B500CE10E5,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF2609E007B440DD00CE10E5 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FF2609E107B440DD00CE10E5 = {
+			buildPhases = (
+				FF2609DC07B440DD00CE10E5,
+				FF2609DD07B440DD00CE10E5,
+				FF2609DE07B440DD00CE10E5,
+				FF2609DF07B440DD00CE10E5,
+				FF2609E007B440DD00CE10E5,
+			);
+			buildSettings = {
+				EXPORTED_SYMBOLS_FILE = "";
+				INSTALL_PATH = "${SYSTEM_LIBRARY_DIR}/PreferencePanes";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "-twolevel_namespace";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = Bonjour;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+				WRAPPER_EXTENSION = prefPane;
+			};
+			dependencies = (
+				FF2609E307B440EC00CE10E5,
+			);
+			isa = PBXBundleTarget;
+			name = PreferencePane;
+			productInstallPath = "${SYSTEM_LIBRARY_DIR}/PreferencePanes";
+			productName = PreferencePane;
+			productReference = FF2609E207B440DD00CE10E5;
+			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Bonjour</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>BonjourPref</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.preference.bonjour</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>DNSServiceDiscoveryPref</string>
+	<key>NSPrefPaneIconFile</key>
+	<string>BonjourPref.tiff</string>
+	<key>NSPrefPaneIconLabel</key>
+	<string>Bonjour</string>
+	<key>NSPrincipalClass</key>
+	<string>DNSServiceDiscoveryPref</string>
+</dict>
+</plist>
+";
+		};
+		FF2609E207B440DD00CE10E5 = {
+			isa = PBXBundleReference;
+			path = Bonjour.prefPane;
+			refType = 3;
+		};
+		FF2609E307B440EC00CE10E5 = {
+			isa = PBXTargetDependency;
+			target = FFFB0DA907B43C9100B88D48;
+		};
+		FF2609E407B441D400CE10E5 = {
+			fileRef = FFFB0DAC07B43CBA00B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2609E507B441D700CE10E5 = {
+			fileRef = FFFB0DAD07B43CBA00B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2609E607B441DB00CE10E5 = {
+			fileRef = FFFB0DAE07B43CBA00B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2609F607B442BA00CE10E5 = {
+			fileRef = 65713D46025A293200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2609F707B442C000CE10E5 = {
+			fileRef = 7F869685066EE02400D2A2DC;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2609FA07B4433800CE10E5 = {
+			isa = PBXFrameworkReference;
+			name = Cocoa.framework;
+			path = /System/Library/Frameworks/Cocoa.framework;
+			refType = 0;
+		};
+		FF2609FB07B4433800CE10E5 = {
+			fileRef = FF2609FA07B4433800CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A1F07B4436900CE10E5 = {
+			isa = PBXFrameworkReference;
+			name = PreferencePanes.framework;
+			path = /System/Library/Frameworks/PreferencePanes.framework;
+			refType = 0;
+		};
+		FF260A2007B4436900CE10E5 = {
+			fileRef = FF260A1F07B4436900CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2107B443B500CE10E5 = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2207B443C500CE10E5 = {
+			fileRef = 09AB6884FE841BABC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2307B4463400CE10E5 = {
+			children = (
+				FF260A2407B4464B00CE10E5,
+				FF260A2507B4464B00CE10E5,
+				FF260A2607B4464B00CE10E5,
+				FF260A2707B4464B00CE10E5,
+				FF260A2907B4464B00CE10E5,
+				FF260A2807B4464B00CE10E5,
+				FF08480607CEB8E800AE6769,
+				FF260A2A07B4464B00CE10E5,
+				FF260A3207B4466900CE10E5,
+				FF260A3307B4466900CE10E5,
+				FF354EB108516C63007C00E1,
+				FF260A4807B4475600CE10E5,
+				FF260A4B07B4477F00CE10E5,
+			);
+			isa = PBXGroup;
+			name = Resources;
+			refType = 4;
+		};
+		FF260A2407B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = remove_idle.tiff;
+			path = PreferencePane/Artwork/remove_idle.tiff;
+			refType = 2;
+		};
+		FF260A2507B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = add_pressed.tiff;
+			path = PreferencePane/Artwork/add_pressed.tiff;
+			refType = 2;
+		};
+		FF260A2607B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = remove_disabled.tiff;
+			path = PreferencePane/Artwork/remove_disabled.tiff;
+			refType = 2;
+		};
+		FF260A2707B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = add_idle.tiff;
+			path = PreferencePane/Artwork/add_idle.tiff;
+			refType = 2;
+		};
+		FF260A2807B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = success.tiff;
+			path = PreferencePane/Artwork/success.tiff;
+			refType = 2;
+		};
+		FF260A2907B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = remove_pressed.tiff;
+			path = PreferencePane/Artwork/remove_pressed.tiff;
+			refType = 2;
+		};
+		FF260A2A07B4464B00CE10E5 = {
+			isa = PBXFileReference;
+			name = failure.tiff;
+			path = PreferencePane/Artwork/failure.tiff;
+			refType = 2;
+		};
+		FF260A2B07B4464B00CE10E5 = {
+			fileRef = FF260A2407B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2C07B4464B00CE10E5 = {
+			fileRef = FF260A2507B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2D07B4464B00CE10E5 = {
+			fileRef = FF260A2607B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2E07B4464B00CE10E5 = {
+			fileRef = FF260A2707B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A2F07B4464B00CE10E5 = {
+			fileRef = FF260A2807B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A3007B4464B00CE10E5 = {
+			fileRef = FF260A2907B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A3107B4464B00CE10E5 = {
+			fileRef = FF260A2A07B4464B00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A3207B4466900CE10E5 = {
+			isa = PBXFileReference;
+			name = BonjourPref.icns;
+			path = PreferencePane/BonjourPref.icns;
+			refType = 2;
+		};
+		FF260A3307B4466900CE10E5 = {
+			isa = PBXFileReference;
+			name = BonjourPref.tiff;
+			path = PreferencePane/BonjourPref.tiff;
+			refType = 2;
+		};
+		FF260A3407B4466900CE10E5 = {
+			fileRef = FF260A3207B4466900CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A3507B4466900CE10E5 = {
+			fileRef = FF260A3307B4466900CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A4807B4475600CE10E5 = {
+			children = (
+				FF260A4907B4475600CE10E5,
+			);
+			isa = PBXVariantGroup;
+			name = DNSServiceDiscoveryPref.nib;
+			path = PreferencePane;
+			refType = 2;
+		};
+		FF260A4907B4475600CE10E5 = {
+			isa = PBXFileReference;
+			name = English;
+			path = PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib;
+			refType = 2;
+		};
+		FF260A4A07B4475600CE10E5 = {
+			fileRef = FF260A4807B4475600CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF260A4B07B4477F00CE10E5 = {
+			children = (
+				FF260A4C07B4477F00CE10E5,
+			);
+			isa = PBXVariantGroup;
+			name = InfoPlist.strings;
+			path = PreferencePane;
+			refType = 2;
+		};
+		FF260A4C07B4477F00CE10E5 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = English;
+			path = PreferencePane/English.lproj/InfoPlist.strings;
+			refType = 2;
+		};
+		FF260A4D07B4477F00CE10E5 = {
+			fileRef = FF260A4B07B4477F00CE10E5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2A870607B447EF00B14068 = {
+			fileRef = FFFB0DAA07B43C9100B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2A870707B4481500B14068 = {
+			isa = PBXTargetDependency;
+			target = FF2609E107B440DD00CE10E5;
+		};
+		FF2C5FB00A48B8680066DA11 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSSDRecordRegistrar.java;
+			path = ../mDNSShared/Java/DNSSDRecordRegistrar.java;
+			refType = 2;
+		};
+		FF2C5FB10A48B8680066DA11 = {
+			fileRef = FF2C5FB00A48B8680066DA11;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF2C5FB20A48B86E0066DA11 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = RegisterRecordListener.java;
+			path = ../mDNSShared/Java/RegisterRecordListener.java;
+			refType = 2;
+		};
+		FF2C5FB30A48B86E0066DA11 = {
+			fileRef = FF2C5FB20A48B86E0066DA11;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF354EB108516C63007C00E1 = {
+			fileEncoding = 4;
+			isa = PBXExecutableFileReference;
+			name = installtool;
+			path = PreferencePane/installtool;
+			refType = 2;
+		};
+		FF354EB208516C63007C00E1 = {
+			fileRef = FF354EB108516C63007C00E1;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FF37BE9207614059003C0420 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			generatedFileNames = (
+			);
+			isa = PBXShellScriptBuildPhase;
+			neededFileNames = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ -e /usr/local/include/dnsinfo.h ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/dnsinfo.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nelse\necho \"#define MDNS_NO_DNSINFO 1\" > ${CONFIGURATION_TEMP_DIR}/dnsinfo.h\ntouch ${CONFIGURATION_TEMP_DIR}/empty.c\ncc ${CONFIGURATION_TEMP_DIR}/empty.c -c -o \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nrm -f ${CONFIGURATION_TEMP_DIR}/empty.c\nfi";
+		};
+		FF485D5105632E0000130380 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = mDNSResponder.8;
+			path = ../mDNSShared/mDNSResponder.8;
+			refType = 2;
+		};
+		FF5585E507790732008D1C14 = {
+			buildActionMask = 8;
+			files = (
+			);
+			generatedFileNames = (
+			);
+			isa = PBXShellScriptBuildPhase;
+			neededFileNames = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/tcsh;
+			shellScript = "# Install plist to tell launchd to start mDNSResponder\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons\ncp ${SRCROOT}/LaunchDaemonInfo.plist ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponder.plist\n\n# Install mDNSResponder.bundle containing language localizations\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices\ncp -R ${SRCROOT}/mDNSResponder-bundle ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle\n\n# Remove unwanted CVS directories\nfind ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle -depth -name CVS -exec rm -rf {} \\;\n\n# Expand UTF-8 files to UTF-16 (not necessary, but required by B&I policy)\nforeach file (`find ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle -name Localizable.strings`)\niconv -f utf-8 -t utf-16 ${file} > ${file}.new\nmv -f ${file}.new ${file}\nend\n\n# Remove French localization (not wanted for Apple B&I builds)\nrm -rf ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle/Resources/French.lproj\n";
+		};
+		FF5A0AE705632EA600743C27 = {
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man8;
+			dstSubfolderSpec = 0;
+			files = (
+				FF5A0AE805632EAE00743C27,
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		FF5A0AE805632EAE00743C27 = {
+			fileRef = FF485D5105632E0000130380;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFCB6D73075D539900B8AF62 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = PlatformCommon.c;
+			path = ../mDNSShared/PlatformCommon.c;
+			refType = 2;
+		};
+		FFCB6D74075D539900B8AF62 = {
+			fileRef = FFCB6D73075D539900B8AF62;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFCB6D75075D595E00B8AF62 = {
+			fileRef = FFCB6D73075D539900B8AF62;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFD41DDA0664157900F0C438 = {
+			includeInIndex = 0;
+			isa = PBXZipArchiveReference;
+			path = dns_sd.jar;
+			refType = 3;
+		};
+		FFD41DDB0664169900F0C438 = {
+			isa = PBXTargetDependency;
+			target = DB2CC4530662DD6800335AB3;
+		};
+		FFD41DDC0664169B00F0C438 = {
+			isa = PBXTargetDependency;
+			target = DB2CC4660662DF5C00335AB3;
+		};
+		FFD41DDD06641B4200F0C438 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			generatedFileNames = (
+			);
+			isa = PBXShellScriptBuildPhase;
+			neededFileNames = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "rm -f ${CONFIGURATION_BUILD_DIR}/dns_sd";
+		};
+		FFD41DDF06641BBB00F0C438 = {
+			isa = PBXTargetDependency;
+			target = DB2CC4530662DD6800335AB3;
+		};
+		FFE6935007C2CA7F00283007 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = ConfigurationAuthority.h;
+			path = PreferencePane/ConfigurationAuthority.h;
+			refType = 2;
+		};
+		FFE6935207C2CAA400283007 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = DNSServiceDiscoveryPref.h;
+			path = PreferencePane/DNSServiceDiscoveryPref.h;
+			refType = 2;
+		};
+		FFE6935407C2CABD00283007 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = PrivilegedOperations.h;
+			path = PreferencePane/PrivilegedOperations.h;
+			refType = 2;
+		};
+		FFF4F63A06CFE4DD00459EFD = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = dnsextd.8;
+			path = ../mDNSShared/dnsextd.8;
+			refType = 2;
+		};
+		FFF4F63B06CFE4DD00459EFD = {
+			fileRef = FFF4F63A06CFE4DD00459EFD;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFF4F63C06CFE53300459EFD = {
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1;
+			dstSubfolderSpec = 0;
+			files = (
+				FFF4F63D06CFE54300459EFD,
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		FFF4F63D06CFE54300459EFD = {
+			fileRef = FF0E0B5D065ADC7600FE4D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFF7174A07614A8600E10551 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			generatedFileNames = (
+			);
+			isa = PBXShellScriptBuildPhase;
+			neededFileNames = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ -e /usr/local/include/dnsinfo.h ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/dnsinfo.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nelse\necho \"#define MDNS_NO_DNSINFO 1\" > ${CONFIGURATION_TEMP_DIR}/dnsinfo.h\ntouch ${CONFIGURATION_TEMP_DIR}/empty.c\ncc ${CONFIGURATION_TEMP_DIR}/empty.c -c -o \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nrm -f ${CONFIGURATION_TEMP_DIR}/empty.c\nfi";
+		};
+		FFFB0DA407B43BED00B88D48 = {
+			children = (
+				FFE6935007C2CA7F00283007,
+				FFFB0DAE07B43CBA00B88D48,
+				FFE6935207C2CAA400283007,
+				FFFB0DAC07B43CBA00B88D48,
+				FFE6935407C2CABD00283007,
+				FFFB0DAD07B43CBA00B88D48,
+				FFFB0DAF07B43CBA00B88D48,
+				FF260A2307B4463400CE10E5,
+			);
+			isa = PBXGroup;
+			path = PreferencePane;
+			refType = 2;
+		};
+		FFFB0DA507B43C9100B88D48 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFFB0DA607B43C9100B88D48 = {
+			buildActionMask = 2147483647;
+			files = (
+				FFFB0DB307B43CBA00B88D48,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFFB0DA707B43C9100B88D48 = {
+			buildActionMask = 2147483647;
+			files = (
+				FFFB0DB507B43D2700B88D48,
+				FFFB0DB907B43D5F00B88D48,
+				FFFB0DBD07B43D7400B88D48,
+				FF260A2207B443C500CE10E5,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFFB0DA807B43C9100B88D48 = {
+			buildActionMask = 2147483647;
+			files = (
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFFB0DA907B43C9100B88D48 = {
+			buildPhases = (
+				FFFB0DA507B43C9100B88D48,
+				FFFB0DA607B43C9100B88D48,
+				FFFB0DA707B43C9100B88D48,
+				FFFB0DA807B43C9100B88D48,
+			);
+			buildSettings = {
+				INSTALL_PATH = "/Library/Application Support/Bonjour";
+				MACOSX_DEPLOYMENT_TARGET = 10.2;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = ddnswriteconfig;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+				STRIPFLAGS = "-S";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+			);
+			isa = PBXToolTarget;
+			name = ddnswriteconfig;
+			productInstallPath = "/Library/Application Support/Bonjour";
+			productName = ddnswriteconfig;
+			productReference = FFFB0DAA07B43C9100B88D48;
+		};
+		FFFB0DAA07B43C9100B88D48 = {
+			isa = PBXExecutableFileReference;
+			path = ddnswriteconfig;
+			refType = 3;
+		};
+		FFFB0DAC07B43CBA00B88D48 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = DNSServiceDiscoveryPref.m;
+			refType = 4;
+		};
+		FFFB0DAD07B43CBA00B88D48 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = PrivilegedOperations.c;
+			refType = 4;
+		};
+		FFFB0DAE07B43CBA00B88D48 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = ConfigurationAuthority.c;
+			refType = 4;
+		};
+		FFFB0DAF07B43CBA00B88D48 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = ddnswriteconfig.m;
+			refType = 4;
+		};
+		FFFB0DB307B43CBA00B88D48 = {
+			fileRef = FFFB0DAF07B43CBA00B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFFB0DB407B43D2700B88D48 = {
+			isa = PBXFrameworkReference;
+			name = Foundation.framework;
+			path = /System/Library/Frameworks/Foundation.framework;
+			refType = 0;
+		};
+		FFFB0DB507B43D2700B88D48 = {
+			fileRef = FFFB0DB407B43D2700B88D48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFFB0DB907B43D5F00B88D48 = {
+			fileRef = 7F869685066EE02400D2A2DC;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FFFB0DBD07B43D7400B88D48 = {
+			fileRef = 65713D46025A293200000109;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+	};
+	rootObject = 08FB7793FE84155DC02AAC07;
+}
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.plist b/mDNSResponder/mDNSMacOSX/mDNSResponder.plist
new file mode 100644
index 00000000..6150bc37
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.plist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+<dict>
+	<key>OpenSourceProject</key>
+	<string>libipsec</string>
+	<key>OpenSourceVersion</key>
+	<string>Original version number unavailable, possibly RELENG_4_9_0_RELEASE</string>
+	<key>OpenSourceWebsiteURL</key>
+	<string>http://www.freebsd.org</string>
+	<key>OpenSourceSCM</key>
+	<string>svn export http://svn.freebsd.org/base/release/4.9.0/lib/libipsec</string>
+	<key>OpenSourceImportDate</key>
+	<string>2007-07-31</string>
+	<key>OpenSourceModifications</key>
+	<array>
+		<string>Removed all files except ipsec_strerror.h libpfkey.h pfkey.c</string>
+		<string>Added Apple Computer copyright and Apache license</string>
+		<string>Removed unused include netkey/key_var.h</string>
+		<string>Fixed compiler warnings such as "unused function parameter" and "signed/unsigned comparison"</string>
+		<string>Added code to conditionally compile only on OSX</string>
+		<string>Whitespace changes</string>
+	</array>
+	<key>OpenSourceLicense</key>
+	<string>bsd</string>
+	<key>OpenSourceLicenseFile</key>
+	<string>mDNSResponder.txt</string>
+</dict>
+</array>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.sb b/mDNSResponder/mDNSMacOSX/mDNSResponder.sb
new file mode 100644
index 00000000..eee623c8
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.sb
@@ -0,0 +1,151 @@
+; -*- Mode: Scheme; tab-width: 4 -*-
+;
+; Copyright (c) 2012 Apple Inc. All rights reserved.
+;
+; Redistribution and use in source and binary forms, with or without 
+; modification, are permitted provided that the following conditions are met:
+;
+; 1.  Redistributions of source code must retain the above copyright notice, 
+;     this list of conditions and the following disclaimer. 
+; 2.  Redistributions in binary form must reproduce the above copyright notice, 
+;     this list of conditions and the following disclaimer in the documentation 
+;     and/or other materials provided with the distribution. 
+; 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its 
+;     contributors may be used to endorse or promote products derived from this 
+;     software without specific prior written permission. 
+;
+; THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 
+; EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+; DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 
+; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;
+;############################################################################
+
+
+; WARNING: The sandbox rule capabilities and syntax used in this file are currently an
+; Apple SPI (System Private Interface) and are subject to change at any time without notice.
+
+(version 1)
+; When mDNSResponder is denied access, we want to avoid symoblification of mDNSResponder
+; to get the stack trace as that can get into deadlock. no-callout will prevent
+; symbolification.
+(deny default (with no-callout))
+
+(import "system.sb")
+
+; Baseline
+(allow file-read-metadata ipc-posix-shm)
+
+; Mach communications
+; These are needed for things like getpwnam, hostname changes, & keychain
+(allow mach-lookup
+       (global-name "com.apple.bsd.dirhelper")
+       (global-name "com.apple.distributed_notifications.2")
+       (global-name "com.apple.ocspd")
+       (global-name "com.apple.PowerManagement.control")
+       (global-name "com.apple.mDNSResponderHelper")
+       (global-name "com.apple.SecurityServer")
+       (global-name "com.apple.SystemConfiguration.configd")
+       (global-name "com.apple.SystemConfiguration.SCNetworkReachability")
+       (global-name "com.apple.SystemConfiguration.DNSConfiguration")
+       (global-name "com.apple.SystemConfiguration.NetworkInformation")
+       (global-name "com.apple.system.notification_center")
+       (global-name "com.apple.system.logger")
+       (global-name "com.apple.webcontentfilter.dns")
+       (global-name "com.apple.server.bluetooth")
+       (global-name "com.apple.awacs")
+       (global-name "com.apple.networkd")
+       (global-name "com.apple.securityd")
+       (global-name "com.apple.wifi.manager")
+       (global-name "com.apple.commcenter.cupolicy.xpc")
+       (global-name "com.apple.blued")
+       (global-name "com.apple.mobilegestalt.xpc")
+       (global-name "com.apple.snhelper"))
+
+(allow mach-register
+       (global-name "com.apple.d2d.ipc"))
+
+; Networking, including Unix Domain Sockets
+(allow network*)
+
+; Raw sockets
+(if (defined? 'system-socket)
+    (allow system-socket))
+
+; Hardware model information
+(allow sysctl-read)
+
+; Syslog early in the boot process
+(allow file-read-data file-write-data (literal "/dev/console"))
+
+(allow file-read-data
+       ; /etc/hosts support
+       (literal "/private/etc/hosts")
+       (literal "/private/etc"))
+
+; Our socket
+(allow file-read* file-write* (literal "/private/var/run/mDNSResponder"))
+
+; System version, settings, and other miscellaneous necessary file system accesses
+(allow file-read-data
+       ; Needed for CFCopyVersionDictionary()
+       (literal "/usr/sbin")
+       (literal "/usr/sbin/mDNSResponder")
+
+       (literal "/Library/Preferences/SystemConfiguration/preferences.plist")
+       (literal "/Library/Preferences/SystemConfiguration/com.apple.nat.plist")
+       (regex #"^/Library/Preferences/(ByHost/)?\.GlobalPreferences\.")
+       (literal "/Library/Preferences/com.apple.crypto.plist")
+       (literal "/Library/Security/Trust Settings/Admin.plist")
+       (regex #"^/Library/Preferences/com\.apple\.security\.")
+       (literal "/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist")
+       (literal "/private/var/preferences/SystemConfiguration/preferences.plist"))
+
+; For MAC Address
+(allow system-info (info-type "net.link.addr"))
+
+; We just need access to System.keychain. But we don't want errors logged if other keychains are
+; accessed under /Library/Keychains. Other keychains may be accessed as part of setting up an SSL
+; connection. Instead of adding access to it here (to things which we don't need), we disable any
+; logging that might happen during the access
+(deny file-read-data (regex #"^/Library/Keychains/") (with no-log))
+(allow file-read-data (literal "/Library/Keychains/System.keychain"))
+
+; Access to mDNSResponder Managed Preferences profile
+; instead of using (mobile-preferences-read "com.apple.mDNSResponder") we use the lines below for OSX compatibility
+(allow file-read* (literal "/private/var/Managed Preferences/mobile"))
+(allow file-read* (literal "/private/var/Library/Preferences/"))
+(allow file-read* (literal "/Library/Managed Preferences"))
+(allow file-read* (literal "/private/var/Managed Preferences/mobile/com.apple.mDNSResponder.plist"))
+
+; Our Module Directory Services cache
+(allow file-read-data
+       (subpath "/private/var/tmp/mds")
+       (subpath "/private/var/db/mds"))
+
+(allow file-read* file-write*
+       (regex #"^/private/var/tmp/mds/[0-9]+(/|$)")
+       (regex #"^/private/var/db/mds/[0-9]+(/|$)")
+       (regex #"^/private/var/folders/[^/]+/[^/]+/C/mds(/|$)")
+
+       ; Required on 10.5 and 10.6
+       (regex #"^/private/var/folders/[^/]+/[^/]+/-Caches-/mds(/|$)"))
+
+; CRL Cache for SSL/TLS connections
+(allow file-read-data (literal "/private/var/db/crls/crlcache.db"))
+
+; For mDNS sleep proxy offload and IOPMConnectionCreate
+(if (defined? 'iokit-open)
+   (begin
+     (allow iokit-open
+        (iokit-user-client-class "NVEthernetUserClientMDNS")
+        (iokit-user-client-class "mDNSOffloadUserClient")
+        (iokit-user-client-class "wlDNSOffloadUserClient")
+        (iokit-user-client-class "RootDomainUserClient")
+        (iokit-user-client-class "AppleMobileFileIntegrityUserClient"))))
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.txt b/mDNSResponder/mDNSMacOSX/mDNSResponder.txt
new file mode 100644
index 00000000..f798e565
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.txt
@@ -0,0 +1,55 @@
+1)
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+2)
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj b/mDNSResponder/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..a5c44ef3
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponder.xcodeproj/project.pbxproj
@@ -0,0 +1,3137 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		00AD62BB032D7A0C0CCA2C71 /* Build More */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = D284BE280ADD78180027CCDF /* Build configuration list for PBXAggregateTarget "Build More" */;
+			buildPhases = (
+			);
+			dependencies = (
+				03067D860C849CC30022BE1F /* PBXTargetDependency */,
+				D284BF2C0ADD815A0027CCDF /* PBXTargetDependency */,
+				D284BF2E0ADD81600027CCDF /* PBXTargetDependency */,
+				D284BF300ADD81630027CCDF /* PBXTargetDependency */,
+			);
+			name = "Build More";
+			productName = "Build All";
+		};
+		03067D640C83A3700022BE1F /* Build Some */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 03067D730C83A3CB0022BE1F /* Build configuration list for PBXAggregateTarget "Build Some" */;
+			buildPhases = (
+				FF045B6A0C7E4AA600448140 /* ShellScript */,
+			);
+			dependencies = (
+				217A4C49138EE14C000A5BA8 /* PBXTargetDependency */,
+				03067D680C83A3830022BE1F /* PBXTargetDependency */,
+				03067D6A0C83A3890022BE1F /* PBXTargetDependency */,
+				03067D6C0C83A3920022BE1F /* PBXTargetDependency */,
+				03067D6E0C83A39C0022BE1F /* PBXTargetDependency */,
+				84C5B3411665544B00C324A8 /* PBXTargetDependency */,
+				72FB546A166D5FE40090B2D9 /* PBXTargetDependency */,
+			);
+			name = "Build Some";
+			productName = "Build Some";
+		};
+		2141DCF8123FFB5D0086D23E /* SystemLibraries */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 2141DD08123FFB830086D23E /* Build configuration list for PBXAggregateTarget "SystemLibraries" */;
+			buildPhases = (
+			);
+			dependencies = (
+				2141DD0E123FFC960086D23E /* PBXTargetDependency */,
+				2130257112400E9300AC839F /* PBXTargetDependency */,
+			);
+			name = SystemLibraries;
+			productName = SystemLibraries;
+		};
+		2141DD0B123FFC7F0086D23E /* SystemLibrariesStatic */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 2141DD18123FFC990086D23E /* Build configuration list for PBXAggregateTarget "SystemLibrariesStatic" */;
+			buildPhases = (
+			);
+			dependencies = (
+				215FFB1D124002CC00470DE1 /* PBXTargetDependency */,
+				215FFB1B124002C700470DE1 /* PBXTargetDependency */,
+				215FFB19124002C100470DE1 /* PBXTargetDependency */,
+			);
+			name = SystemLibrariesStatic;
+			productName = SystemLibrariesStatic;
+		};
+		FFA572650AF190F10055A0F1 /* SystemLibrariesDynamic */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = FFA5726E0AF191200055A0F1 /* Build configuration list for PBXAggregateTarget "SystemLibrariesDynamic" */;
+			buildPhases = (
+				1F7B473C12B82BFD00868AEF /* ShellScript */,
+			);
+			dependencies = (
+				FFA572690AF190FF0055A0F1 /* PBXTargetDependency */,
+				FFA5726B0AF191010055A0F1 /* PBXTargetDependency */,
+				FFA5726D0AF191020055A0F1 /* PBXTargetDependency */,
+			);
+			name = SystemLibrariesDynamic;
+			productName = SystemLibraries;
+		};
+		FFB7657B0AEED96B00583A2C /* Build All */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = FFB7657E0AEED99D00583A2C /* Build configuration list for PBXAggregateTarget "Build All" */;
+			buildPhases = (
+			);
+			dependencies = (
+				FFB7657D0AEED97F00583A2C /* PBXTargetDependency */,
+				2141DCFD123FFB7D0086D23E /* PBXTargetDependency */,
+			);
+			name = "Build All";
+			productName = "Build All";
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		21070E5F16486B9000A69507 /* DNSSECSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21070E5D16486B9000A69507 /* DNSSECSupport.c */; };
+		21070E6016486B9000A69507 /* DNSSECSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21070E5D16486B9000A69507 /* DNSSECSupport.c */; };
+		21070E6116486B9000A69507 /* DNSSECSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 21070E5E16486B9000A69507 /* DNSSECSupport.h */; };
+		21070E6216486B9000A69507 /* DNSSECSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 21070E5E16486B9000A69507 /* DNSSECSupport.h */; };
+		2120ABD516B71614007089B6 /* CUPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = 2120ABD416B71614007089B6 /* CUPolicy.c */; };
+		2120ABD616B71614007089B6 /* CUPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = 2120ABD416B71614007089B6 /* CUPolicy.c */; };
+		2124FA2C1471E98C0021D7BB /* nsec.h in Headers */ = {isa = PBXBuildFile; fileRef = 2124FA2B1471E98C0021D7BB /* nsec.h */; };
+		2124FA2D1471E98C0021D7BB /* nsec.h in Headers */ = {isa = PBXBuildFile; fileRef = 2124FA2B1471E98C0021D7BB /* nsec.h */; };
+		2124FA301471E9B50021D7BB /* dnssec.h in Headers */ = {isa = PBXBuildFile; fileRef = 2124FA2F1471E9B50021D7BB /* dnssec.h */; };
+		2124FA311471E9B50021D7BB /* dnssec.h in Headers */ = {isa = PBXBuildFile; fileRef = 2124FA2F1471E9B50021D7BB /* dnssec.h */; };
+		2124FA331471E9DE0021D7BB /* nsec.c in Sources */ = {isa = PBXBuildFile; fileRef = 2124FA321471E9DE0021D7BB /* nsec.c */; };
+		2124FA341471E9DE0021D7BB /* nsec.c in Sources */ = {isa = PBXBuildFile; fileRef = 2124FA321471E9DE0021D7BB /* nsec.c */; };
+		2127A47715C3C7B900A857FC /* nsec3.c in Sources */ = {isa = PBXBuildFile; fileRef = 2127A47515C3C7B900A857FC /* nsec3.c */; };
+		2127A47815C3C7B900A857FC /* nsec3.c in Sources */ = {isa = PBXBuildFile; fileRef = 2127A47515C3C7B900A857FC /* nsec3.c */; };
+		2127A47915C3C7B900A857FC /* nsec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 2127A47615C3C7B900A857FC /* nsec3.h */; };
+		2127A47A15C3C7B900A857FC /* nsec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 2127A47615C3C7B900A857FC /* nsec3.h */; };
+		213BDC6D147319F400000896 /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 213BDC6C147319F400000896 /* dnssec.c */; };
+		213BDC6E147319F400000896 /* dnssec.c in Sources */ = {isa = PBXBuildFile; fileRef = 213BDC6C147319F400000896 /* dnssec.c */; };
+		213FB23C12028C4A002B3A08 /* BonjourEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = 213FB22C12028B53002B3A08 /* BonjourEvents.c */; };
+		213FB23D12028C5A002B3A08 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		215FFAEE124000F900470DE1 /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		215FFAEF124000F900470DE1 /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		215FFAF0124000F900470DE1 /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		215FFAF1124000F900470DE1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		215FFAF2124000F900470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		215FFAF3124000F900470DE1 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		215FFAF41240011800470DE1 /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		215FFAF51240011800470DE1 /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		215FFAF61240011800470DE1 /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		215FFAF71240011800470DE1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		215FFAF81240011800470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		215FFAF91240011800470DE1 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		215FFAFA1240013400470DE1 /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		215FFAFB1240013400470DE1 /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		215FFAFC1240013400470DE1 /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		215FFAFD1240013400470DE1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		215FFAFE1240013400470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		215FFAFF1240013400470DE1 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		216D9ACE1720C9F5008066E1 /* VPNService.c in Sources */ = {isa = PBXBuildFile; fileRef = 216D9ACD1720C9F5008066E1 /* VPNService.c */; };
+		216D9ACF1720C9F5008066E1 /* VPNService.c in Sources */ = {isa = PBXBuildFile; fileRef = 216D9ACD1720C9F5008066E1 /* VPNService.c */; };
+		218E8E51156D8C0300720DA0 /* dnsproxy.c in Sources */ = {isa = PBXBuildFile; fileRef = 218E8E4F156D8C0300720DA0 /* dnsproxy.c */; };
+		218E8E52156D8C0300720DA0 /* dnsproxy.c in Sources */ = {isa = PBXBuildFile; fileRef = 218E8E4F156D8C0300720DA0 /* dnsproxy.c */; };
+		218E8E53156D8C0300720DA0 /* dnsproxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 218E8E50156D8C0300720DA0 /* dnsproxy.h */; };
+		218E8E54156D8C0300720DA0 /* dnsproxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 218E8E50156D8C0300720DA0 /* dnsproxy.h */; };
+		219D5542149ED645004464AE /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 219D5541149ED645004464AE /* libxml2.2.dylib */; };
+		219D5543149ED645004464AE /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 219D5541149ED645004464AE /* libxml2.2.dylib */; };
+		21A57F4C145B2AE100939099 /* CryptoAlg.c in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F4A145B2AE100939099 /* CryptoAlg.c */; };
+		21A57F4D145B2AE100939099 /* CryptoAlg.c in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F4A145B2AE100939099 /* CryptoAlg.c */; };
+		21A57F4E145B2AE100939099 /* CryptoAlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 21A57F4B145B2AE100939099 /* CryptoAlg.h */; };
+		21A57F4F145B2AE100939099 /* CryptoAlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 21A57F4B145B2AE100939099 /* CryptoAlg.h */; };
+		21A57F53145B2B1400939099 /* CryptoSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F51145B2B1400939099 /* CryptoSupport.c */; };
+		21A57F54145B2B1400939099 /* CryptoSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F51145B2B1400939099 /* CryptoSupport.c */; };
+		21A57F55145B2B1400939099 /* CryptoSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 21A57F52145B2B1400939099 /* CryptoSupport.h */; };
+		21A57F56145B2B1400939099 /* CryptoSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 21A57F52145B2B1400939099 /* CryptoSupport.h */; };
+		21DCD05C1461B23700702FC8 /* CryptoAlg.c in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F4A145B2AE100939099 /* CryptoAlg.c */; };
+		21DCD05D1461B23700702FC8 /* CryptoAlg.h in Sources */ = {isa = PBXBuildFile; fileRef = 21A57F4B145B2AE100939099 /* CryptoAlg.h */; };
+		21DD8FBF161E9A250033C8F8 /* anonymous.c in Sources */ = {isa = PBXBuildFile; fileRef = 21DD8FBD161E9A250033C8F8 /* anonymous.c */; };
+		21DD8FC0161E9A250033C8F8 /* anonymous.c in Sources */ = {isa = PBXBuildFile; fileRef = 21DD8FBD161E9A250033C8F8 /* anonymous.c */; };
+		21DD8FC1161E9A250033C8F8 /* anonymous.h in Headers */ = {isa = PBXBuildFile; fileRef = 21DD8FBE161E9A250033C8F8 /* anonymous.h */; };
+		21DD8FC2161E9A250033C8F8 /* anonymous.h in Headers */ = {isa = PBXBuildFile; fileRef = 21DD8FBE161E9A250033C8F8 /* anonymous.h */; };
+		21DED43515702C0F0060B6B9 /* DNSProxySupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21DED43415702C0F0060B6B9 /* DNSProxySupport.c */; };
+		21DED43615702C0F0060B6B9 /* DNSProxySupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 21DED43415702C0F0060B6B9 /* DNSProxySupport.c */; };
+		2E0405F50C3195F700F13B59 /* helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E0405F40C3195F700F13B59 /* helper.c */; };
+		2E0405F60C31961100F13B59 /* helpermsg.defs in Sources */ = {isa = PBXBuildFile; fileRef = 2E0405EB0C3190DC00F13B59 /* helpermsg.defs */; settings = {ATTRIBUTES = (Client, Server, ); COMPILER_FLAGS = "-Wno-error"; }; };
+		2E0406150C3197CB00F13B59 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E0406140C3197CB00F13B59 /* libbsm.dylib */; };
+		2E04061F0C3198B700F13B59 /* helpermsg.defs in Sources */ = {isa = PBXBuildFile; fileRef = 2E0405EB0C3190DC00F13B59 /* helpermsg.defs */; };
+		2E0406200C3198B700F13B59 /* helpermsg.defs in Sources */ = {isa = PBXBuildFile; fileRef = 2E0405EB0C3190DC00F13B59 /* helpermsg.defs */; };
+		2E04070A0C31EEEC00F13B59 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		2E04070B0C31EEEC00F13B59 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		2E3552900C3A95C100CA1CB7 /* helper-error.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E35528F0C3A95C100CA1CB7 /* helper-error.h */; };
+		2E3552910C3A95C100CA1CB7 /* helper-error.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E35528F0C3A95C100CA1CB7 /* helper-error.h */; };
+		2E3552920C3A95C100CA1CB7 /* helper-error.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E35528F0C3A95C100CA1CB7 /* helper-error.h */; };
+		2E35529D0C3A9E7600CA1CB7 /* helper-error.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E35528F0C3A95C100CA1CB7 /* helper-error.h */; };
+		2E35529E0C3A9E7600CA1CB7 /* helper-stubs.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E96A52D0C39C1A50087C4D2 /* helper-stubs.c */; };
+		2E35529F0C3A9E7600CA1CB7 /* helper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E96A5250C39BE480087C4D2 /* helper.h */; };
+		2E4D9B050C38C19500480551 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		2E8165E80C5980E300485EB2 /* libpfkey.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A8202520C56C36500DDFD48 /* libpfkey.h */; };
+		2E8165E90C5980EE00485EB2 /* pfkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A8202530C56C36600DDFD48 /* pfkey.c */; };
+		2E8165EA0C5980F700485EB2 /* ipsec_strerror.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A8202510C56C36500DDFD48 /* ipsec_strerror.h */; };
+		2E8165F90C59838100485EB2 /* libipsec.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E8165F60C59835F00485EB2 /* libipsec.dylib */; };
+		2E96A51D0C39BDAC0087C4D2 /* helper-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E0406CA0C31E9AD00F13B59 /* helper-main.c */; };
+		2E96A5260C39BE480087C4D2 /* helper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E96A5250C39BE480087C4D2 /* helper.h */; };
+		2E96A5270C39BE480087C4D2 /* helper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E96A5250C39BE480087C4D2 /* helper.h */; };
+		2E96A5300C39C1A50087C4D2 /* helper-stubs.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E96A52D0C39C1A50087C4D2 /* helper-stubs.c */; };
+		2E96A5320C39C1A50087C4D2 /* helper-stubs.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E96A52D0C39C1A50087C4D2 /* helper-stubs.c */; };
+		2EAE955A0C31F4D30021F738 /* helpermsg.defs in Sources */ = {isa = PBXBuildFile; fileRef = 2E0405EB0C3190DC00F13B59 /* helpermsg.defs */; };
+		2EC8F8EC0C39CCAC003C9C48 /* helper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E96A5250C39BE480087C4D2 /* helper.h */; };
+		2ECC11A60C4FEC3800CB1885 /* helpermsg-types.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ECC11A50C4FEC3800CB1885 /* helpermsg-types.h */; };
+		2ECC11A70C4FEC3800CB1885 /* helpermsg-types.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ECC11A50C4FEC3800CB1885 /* helpermsg-types.h */; };
+		2ECC11A80C4FEC3800CB1885 /* helpermsg-types.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ECC11A50C4FEC3800CB1885 /* helpermsg-types.h */; };
+		2EDC5E730C39EA640092701B /* helper-server.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EDC5E720C39EA640092701B /* helper-server.h */; };
+		2EDC5E740C39EA640092701B /* helper-server.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EDC5E720C39EA640092701B /* helper-server.h */; };
+		2EDC5E750C39EA640092701B /* helper-server.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EDC5E720C39EA640092701B /* helper-server.h */; };
+		4A7B9E8014FDA25000B84CC1 /* mDNSResponder.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A7B9E7E14FDA1BB00B84CC1 /* mDNSResponder.plist */; };
+		4A7B9E8214FDA26C00B84CC1 /* mDNSResponder.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A7B9E7C14FDA19F00B84CC1 /* mDNSResponder.txt */; };
+		4AAE0C9A0C68EA81003882A5 /* mDNSResponderHelper.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4AAE0C7A0C68E97F003882A5 /* mDNSResponderHelper.8 */; };
+		4BD2B63A134FE09F002B96D5 /* P2PPacketFilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BD2B638134FE09F002B96D5 /* P2PPacketFilter.c */; };
+		4BD2B63B134FE09F002B96D5 /* P2PPacketFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD2B639134FE09F002B96D5 /* P2PPacketFilter.h */; };
+		72FB5467166D5FCA0090B2D9 /* dnsctl.c in Sources */ = {isa = PBXBuildFile; fileRef = 72FB545A166D5F960090B2D9 /* dnsctl.c */; };
+		72FB5468166D5FD20090B2D9 /* libdns_services.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C5B3351665529800C324A8 /* libdns_services.dylib */; };
+		8418673E15AB8C2D00BB7F70 /* com.apple.networking.mDNSResponder in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8418673A15AB8B6900BB7F70 /* com.apple.networking.mDNSResponder */; };
+		848DA5C7165477E000D2E8B4 /* xpc_services.c in Sources */ = {isa = PBXBuildFile; fileRef = 848DA5C6165477E000D2E8B4 /* xpc_services.c */; };
+		848DA5C8165477E000D2E8B4 /* xpc_services.c in Sources */ = {isa = PBXBuildFile; fileRef = 848DA5C6165477E000D2E8B4 /* xpc_services.c */; };
+		848DA5CA165477EB00D2E8B4 /* xpc_services.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DA5C9165477EB00D2E8B4 /* xpc_services.h */; };
+		848DA5CB165477EB00D2E8B4 /* xpc_services.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DA5C9165477EB00D2E8B4 /* xpc_services.h */; };
+		848DA5D616547F7200D2E8B4 /* dns_xpc.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DA5D516547F7200D2E8B4 /* dns_xpc.h */; };
+		848DA5D716547F7200D2E8B4 /* dns_xpc.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DA5D516547F7200D2E8B4 /* dns_xpc.h */; };
+		84C5B33C166553F100C324A8 /* dns_services.c in Sources */ = {isa = PBXBuildFile; fileRef = 84C5B339166553AF00C324A8 /* dns_services.c */; };
+		84C5B33D166553F900C324A8 /* dns_services.h in Headers */ = {isa = PBXBuildFile; fileRef = 84C5B338166553A000C324A8 /* dns_services.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		D284BE530ADD80740027CCDF /* DNSServiceDiscoveryDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6575FBFF022EAFBA00000109 /* DNSServiceDiscoveryDefines.h */; };
+		D284BE540ADD80740027CCDF /* dnssd_ipc.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E11B5B04A28126019798ED /* dnssd_ipc.h */; };
+		D284BE560ADD80740027CCDF /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Client, ); }; };
+		D284BE570ADD80740027CCDF /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		D284BE580ADD80740027CCDF /* mDNS.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBE9022EAF5A00000109 /* mDNS.c */; };
+		D284BE590ADD80740027CCDF /* uDNS.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A9F70587CEF6001880B3 /* uDNS.c */; };
+		D284BE5A0ADD80740027CCDF /* DNSCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A9F60587CEF6001880B3 /* DNSCommon.c */; };
+		D284BE5B0ADD80740027CCDF /* DNSDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F461DB5062DBF2900672BF3 /* DNSDigest.c */; };
+		D284BE5D0ADD80740027CCDF /* mDNSDebug.c in Sources */ = {isa = PBXBuildFile; fileRef = DBAAFE29057E8F4D0085CAD0 /* mDNSDebug.c */; };
+		D284BE5E0ADD80740027CCDF /* uds_daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = F525E72804AA167501F1CF4D /* uds_daemon.c */; };
+		D284BE5F0ADD80740027CCDF /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		D284BE600ADD80740027CCDF /* PlatformCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FFCB6D73075D539900B8AF62 /* PlatformCommon.c */; };
+		D284BE610ADD80740027CCDF /* mDNSMacOSX.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBEB022EAF7200000109 /* mDNSMacOSX.c */; };
+		D284BE620ADD80740027CCDF /* LegacyNATTraversal.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FC8F9D406D14E66007E879D /* LegacyNATTraversal.c */; };
+		D284BE630ADD80740027CCDF /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBEC022EAF7200000109 /* daemon.c */; };
+		D284BE650ADD80740027CCDF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		D284BE660ADD80740027CCDF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		D284BE670ADD80740027CCDF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CA213D02786FC30CCA2C71 /* IOKit.framework */; };
+		D284BE680ADD80740027CCDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		D284BE6B0ADD80740027CCDF /* mDNSResponder.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FF485D5105632E0000130380 /* mDNSResponder.8 */; };
+		D284BE780ADD80800027CCDF /* DNSServiceDiscoveryDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6575FBFF022EAFBA00000109 /* DNSServiceDiscoveryDefines.h */; };
+		D284BE790ADD80800027CCDF /* dnssd_ipc.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E11B5B04A28126019798ED /* dnssd_ipc.h */; };
+		D284BE7A0ADD80800027CCDF /* mDNSEmbeddedAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 654BE64F02B63B93000001D1 /* mDNSEmbeddedAPI.h */; };
+		D284BE7B0ADD80800027CCDF /* mDNSDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 654BE65002B63B93000001D1 /* mDNSDebug.h */; };
+		D284BE7C0ADD80800027CCDF /* mDNSMacOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 000753D303367C1C0CCA2C71 /* mDNSMacOSX.h */; };
+		D284BE7E0ADD80800027CCDF /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Client, ); }; };
+		D284BE7F0ADD80800027CCDF /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		D284BE800ADD80800027CCDF /* mDNS.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBE9022EAF5A00000109 /* mDNS.c */; };
+		D284BE810ADD80800027CCDF /* uDNS.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A9F70587CEF6001880B3 /* uDNS.c */; };
+		D284BE820ADD80800027CCDF /* DNSCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A9F60587CEF6001880B3 /* DNSCommon.c */; };
+		D284BE830ADD80800027CCDF /* DNSDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F461DB5062DBF2900672BF3 /* DNSDigest.c */; };
+		D284BE850ADD80800027CCDF /* mDNSDebug.c in Sources */ = {isa = PBXBuildFile; fileRef = DBAAFE29057E8F4D0085CAD0 /* mDNSDebug.c */; };
+		D284BE860ADD80800027CCDF /* uds_daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = F525E72804AA167501F1CF4D /* uds_daemon.c */; };
+		D284BE870ADD80800027CCDF /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		D284BE880ADD80800027CCDF /* PlatformCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FFCB6D73075D539900B8AF62 /* PlatformCommon.c */; };
+		D284BE890ADD80800027CCDF /* mDNSMacOSX.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBEB022EAF7200000109 /* mDNSMacOSX.c */; };
+		D284BE8A0ADD80800027CCDF /* LegacyNATTraversal.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FC8F9D406D14E66007E879D /* LegacyNATTraversal.c */; };
+		D284BE8B0ADD80800027CCDF /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBEC022EAF7200000109 /* daemon.c */; };
+		D284BE8D0ADD80800027CCDF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		D284BE8E0ADD80800027CCDF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		D284BE8F0ADD80800027CCDF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CA213D02786FC30CCA2C71 /* IOKit.framework */; };
+		D284BE900ADD80800027CCDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		D284BEA80ADD80920027CCDF /* dns-sd.c in Sources */ = {isa = PBXBuildFile; fileRef = FF1C919F07021E3F001048AB /* dns-sd.c */; };
+		D284BEAC0ADD80920027CCDF /* dns-sd.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FF1C919D07021D77001048AB /* dns-sd.1 */; };
+		D284BEB70ADD809A0027CCDF /* JNISupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DB2CC44B0662DD1100335AB3 /* JNISupport.c */; };
+		D284BEB90ADD809A0027CCDF /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB2CC4680662DFF500335AB3 /* JavaVM.framework */; };
+		D284BEC50ADD80A20027CCDF /* DNSCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A9F60587CEF6001880B3 /* DNSCommon.c */; };
+		D284BEC60ADD80A20027CCDF /* DNSDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = 7F461DB5062DBF2900672BF3 /* DNSDigest.c */; };
+		D284BEC70ADD80A20027CCDF /* dnsextd.c in Sources */ = {isa = PBXBuildFile; fileRef = FF25794606C9A8BF00376F7B /* dnsextd.c */; };
+		D284BEC80ADD80A20027CCDF /* mDNSDebug.c in Sources */ = {isa = PBXBuildFile; fileRef = DBAAFE29057E8F4D0085CAD0 /* mDNSDebug.c */; };
+		D284BEC90ADD80A20027CCDF /* GenLinkedList.c in Sources */ = {isa = PBXBuildFile; fileRef = DBAAFE2C057E8F660085CAD0 /* GenLinkedList.c */; };
+		D284BECA0ADD80A20027CCDF /* mDNSMacOSX.c in Sources */ = {isa = PBXBuildFile; fileRef = 6575FBEB022EAF7200000109 /* mDNSMacOSX.c */; };
+		D284BECB0ADD80A20027CCDF /* dnsextd_lexer.l in Sources */ = {isa = PBXBuildFile; fileRef = FF13FFEA0A5DA44A00897C81 /* dnsextd_lexer.l */; settings = {COMPILER_FLAGS = "-Wno-error"; }; };
+		D284BECC0ADD80A20027CCDF /* dnsextd_parser.y in Sources */ = {isa = PBXBuildFile; fileRef = FF13FFEC0A5DA45500897C81 /* dnsextd_parser.y */; };
+		D284BECD0ADD80A20027CCDF /* PlatformCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FFCB6D73075D539900B8AF62 /* PlatformCommon.c */; };
+		D284BECF0ADD80A20027CCDF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		D284BED00ADD80A20027CCDF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		D284BED10ADD80A20027CCDF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CA213D02786FC30CCA2C71 /* IOKit.framework */; };
+		D284BED20ADD80A20027CCDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		D284BED50ADD80A20027CCDF /* dnsextd.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FFF4F63A06CFE4DD00459EFD /* dnsextd.8 */; };
+		D284BEDE0ADD80A70027CCDF /* ddnswriteconfig.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFB0DAF07B43CBA00B88D48 /* ddnswriteconfig.m */; };
+		D284BEE00ADD80A70027CCDF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFFB0DB407B43D2700B88D48 /* Foundation.framework */; };
+		D284BEE10ADD80A70027CCDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		D284BEE20ADD80A70027CCDF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		D284BEE30ADD80A70027CCDF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		D284BEEF0ADD80B00027CCDF /* remove_idle.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2407B4464B00CE10E5 /* remove_idle.tiff */; };
+		D284BEF00ADD80B00027CCDF /* add_pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2507B4464B00CE10E5 /* add_pressed.tiff */; };
+		D284BEF10ADD80B00027CCDF /* remove_disabled.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2607B4464B00CE10E5 /* remove_disabled.tiff */; };
+		D284BEF20ADD80B00027CCDF /* add_idle.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2707B4464B00CE10E5 /* add_idle.tiff */; };
+		D284BEF30ADD80B00027CCDF /* success.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2807B4464B00CE10E5 /* success.tiff */; };
+		D284BEF40ADD80B00027CCDF /* remove_pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2907B4464B00CE10E5 /* remove_pressed.tiff */; };
+		D284BEF50ADD80B00027CCDF /* failure.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A2A07B4464B00CE10E5 /* failure.tiff */; };
+		D284BEF60ADD80B00027CCDF /* BonjourPref.icns in Resources */ = {isa = PBXBuildFile; fileRef = FF260A3207B4466900CE10E5 /* BonjourPref.icns */; };
+		D284BEF70ADD80B00027CCDF /* BonjourPref.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF260A3307B4466900CE10E5 /* BonjourPref.tiff */; };
+		D284BEF80ADD80B00027CCDF /* DNSServiceDiscoveryPref.nib in Resources */ = {isa = PBXBuildFile; fileRef = FF260A4807B4475600CE10E5 /* DNSServiceDiscoveryPref.nib */; };
+		D284BEF90ADD80B00027CCDF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = FF260A4B07B4477F00CE10E5 /* InfoPlist.strings */; };
+		D284BEFB0ADD80B00027CCDF /* inprogress.tiff in Resources */ = {isa = PBXBuildFile; fileRef = FF08480607CEB8E800AE6769 /* inprogress.tiff */; };
+		D284BEFC0ADD80B00027CCDF /* installtool in Resources */ = {isa = PBXBuildFile; fileRef = FF354EB108516C63007C00E1 /* installtool */; };
+		D284BEFE0ADD80B00027CCDF /* DNSServiceDiscoveryPref.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFB0DAC07B43CBA00B88D48 /* DNSServiceDiscoveryPref.m */; };
+		D284BEFF0ADD80B00027CCDF /* PrivilegedOperations.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFB0DAD07B43CBA00B88D48 /* PrivilegedOperations.c */; };
+		D284BF000ADD80B00027CCDF /* ConfigurationAuthority.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFB0DAE07B43CBA00B88D48 /* ConfigurationAuthority.c */; };
+		D284BF020ADD80B00027CCDF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65713D46025A293200000109 /* SystemConfiguration.framework */; };
+		D284BF030ADD80B00027CCDF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F869685066EE02400D2A2DC /* Security.framework */; };
+		D284BF040ADD80B00027CCDF /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2609FA07B4433800CE10E5 /* Cocoa.framework */; };
+		D284BF050ADD80B00027CCDF /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF260A1F07B4436900CE10E5 /* PreferencePanes.framework */; };
+		D284BF060ADD80B00027CCDF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */; };
+		FFA572330AF18F1C0055A0F1 /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		FFA572340AF18F1C0055A0F1 /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		FFA572350AF18F1C0055A0F1 /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		FFA5723F0AF18F450055A0F1 /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		FFA572400AF18F450055A0F1 /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		FFA572410AF18F450055A0F1 /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		FFA572490AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		FFA5724A0AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		FFA5724B0AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */ = {isa = PBXBuildFile; fileRef = FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */; };
+		FFAE66F0105F0CD900162116 /* ddnswriteconfig in Resources */ = {isa = PBXBuildFile; fileRef = D284BEE80ADD80A70027CCDF /* ddnswriteconfig */; };
+		FFB437150EB165BD00E17C68 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CA213D02786FC30CCA2C71 /* IOKit.framework */; };
+		FFC22AA20B00F42A00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		FFC22AA30B00F42B00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		FFC22AA40B00F42C00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */; };
+		FFC22AA50B00F43000BAB070 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		FFC22AA60B00F43100BAB070 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		FFC22AA70B00F43100BAB070 /* DNSServiceDiscoveryReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+		FFF589B70E37F66800EF515C /* ClientCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FF5852100DD27BD300862BDF /* ClientCommon.c */; };
+		FFF589C10E37F67E00EF515C /* ClientCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = FF5852100DD27BD300862BDF /* ClientCommon.c */; };
+		FFFA38630AEEDB090065B80A /* dnssd_clientlib.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */; };
+		FFFA38650AEEDB130065B80A /* dnssd_clientstub.c in Sources */ = {isa = PBXBuildFile; fileRef = FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */; };
+		FFFA38660AEEDB2B0065B80A /* dnssd_ipc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E11B5A04A28126019798ED /* dnssd_ipc.c */; };
+		FFFF8F810C3307C400722979 /* dnsextd.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = FFFF8F800C3307AC00722979 /* dnsextd.conf */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+		D284BF750ADD850C0027CCDF /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			fileType = sourcecode.yacc;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c",
+			);
+			script = "echo NOOP yacc ${INPUT_FILE_PATH}";
+		};
+		D284BFB80ADD8E510027CCDF /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			fileType = sourcecode.lex;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c",
+			);
+			script = "/usr/bin/flex -i -o${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}.c ${INPUT_FILE_PATH}";
+		};
+/* End PBXBuildRule section */
+
+/* Begin PBXContainerItemProxy section */
+		03067D670C83A3830022BE1F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BE500ADD80740027CCDF;
+			remoteInfo = mDNSResponder;
+		};
+		03067D690C83A3890022BE1F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BE750ADD80800027CCDF;
+			remoteInfo = "mDNSResponder debug";
+		};
+		03067D6B0C83A3920022BE1F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BEA50ADD80920027CCDF;
+			remoteInfo = "dns-sd tool";
+		};
+		03067D6D0C83A39C0022BE1F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2E0405EF0C31955500F13B59;
+			remoteInfo = mDNSResponderHelper;
+		};
+		03067D850C849CC30022BE1F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 03067D640C83A3700022BE1F;
+			remoteInfo = "Build Some";
+		};
+		2130257012400E9300AC839F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FFA572650AF190F10055A0F1;
+			remoteInfo = SystemLibrariesDynamic;
+		};
+		2141DCFC123FFB7D0086D23E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2141DCF8123FFB5D0086D23E;
+			remoteInfo = SystemLibraries;
+		};
+		2141DD0D123FFC960086D23E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2141DD0B123FFC7F0086D23E;
+			remoteInfo = SystemLibrariesStatic;
+		};
+		215FFB18124002C100470DE1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2141DD1C123FFCDB0086D23E;
+			remoteInfo = libdns_sd_static;
+		};
+		215FFB1A124002C700470DE1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2141DD23123FFD0F0086D23E;
+			remoteInfo = libdns_sd_debug_static;
+		};
+		215FFB1C124002CC00470DE1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 2141DD29123FFD2C0086D23E;
+			remoteInfo = libdns_sd_profile_static;
+		};
+		217A4C48138EE14C000A5BA8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 213FB21712028A7A002B3A08;
+			remoteInfo = BonjourEvents;
+		};
+		4AE471690EAFF83800A6C5AD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4AE471670EAFF81900A6C5AD;
+			remoteInfo = dns_sd.jar;
+		};
+		72FB5469166D5FE40090B2D9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 72FB545E166D5FB00090B2D9;
+			remoteInfo = dnsctl;
+		};
+		84C5B3401665544B00C324A8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 84C5B3341665529800C324A8;
+			remoteInfo = dns_services;
+		};
+		D284BF2B0ADD815A0027CCDF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BEBF0ADD80A20027CCDF;
+			remoteInfo = dnsextd;
+		};
+		D284BF2D0ADD81600027CCDF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BEDB0ADD80A70027CCDF;
+			remoteInfo = ddnswriteconfig;
+		};
+		D284BF2F0ADD81630027CCDF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BEEA0ADD80B00027CCDF;
+			remoteInfo = PreferencePane;
+		};
+		FFA572680AF190FF0055A0F1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FFB765830AEED9C700583A2C;
+			remoteInfo = libdns_sd;
+		};
+		FFA5726A0AF191010055A0F1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FFA572300AF18F1C0055A0F1;
+			remoteInfo = "libdns_sd debug";
+		};
+		FFA5726C0AF191020055A0F1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FFA5723C0AF18F450055A0F1;
+			remoteInfo = "libdns_sd profile";
+		};
+		FFAE66F8105F0CF100162116 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D284BEDB0ADD80A70027CCDF;
+			remoteInfo = ddnswriteconfig;
+		};
+		FFB7657C0AEED97F00583A2C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 00AD62BB032D7A0C0CCA2C71;
+			remoteInfo = "Build Main";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		4A7B9E7F14FDA21B00B84CC1 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/local/OpenSourceVersions;
+			dstSubfolderSpec = 0;
+			files = (
+				4A7B9E8014FDA25000B84CC1 /* mDNSResponder.plist in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		4A7B9E8114FDA25500B84CC1 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/local/OpenSourceLicenses;
+			dstSubfolderSpec = 0;
+			files = (
+				4A7B9E8214FDA26C00B84CC1 /* mDNSResponder.txt in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		4AAE0C5A0C68E6EC003882A5 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man8;
+			dstSubfolderSpec = 0;
+			files = (
+				4AAE0C9A0C68EA81003882A5 /* mDNSResponderHelper.8 in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		72FB545D166D5FB00090B2D9 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 12;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8418673D15AB8BFF00BB7F70 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /private/etc/asl/;
+			dstSubfolderSpec = 0;
+			files = (
+				8418673E15AB8C2D00BB7F70 /* com.apple.networking.mDNSResponder in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		D284BE6A0ADD80740027CCDF /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man8;
+			dstSubfolderSpec = 0;
+			files = (
+				D284BE6B0ADD80740027CCDF /* mDNSResponder.8 in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		D284BEAB0ADD80920027CCDF /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1;
+			dstSubfolderSpec = 0;
+			files = (
+				D284BEAC0ADD80920027CCDF /* dns-sd.1 in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		D284BED40ADD80A20027CCDF /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man8;
+			dstSubfolderSpec = 0;
+			files = (
+				D284BED50ADD80A20027CCDF /* dnsextd.8 in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		FFFF8F770C32F0FD00722979 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /private/etc;
+			dstSubfolderSpec = 0;
+			files = (
+				FFFF8F810C3307C400722979 /* dnsextd.conf in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		000753D303367C1C0CCA2C71 /* mDNSMacOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mDNSMacOSX.h; sourceTree = "<group>"; };
+		00CA213D02786FC30CCA2C71 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+		09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		21070E5D16486B9000A69507 /* DNSSECSupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DNSSECSupport.c; sourceTree = "<group>"; };
+		21070E5E16486B9000A69507 /* DNSSECSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSSECSupport.h; sourceTree = "<group>"; };
+		2120ABD416B71614007089B6 /* CUPolicy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CUPolicy.c; sourceTree = "<group>"; };
+		2124FA2B1471E98C0021D7BB /* nsec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nsec.h; path = ../mDNSCore/nsec.h; sourceTree = "<group>"; };
+		2124FA2F1471E9B50021D7BB /* dnssec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dnssec.h; path = ../mDNSCore/dnssec.h; sourceTree = "<group>"; };
+		2124FA321471E9DE0021D7BB /* nsec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nsec.c; path = ../mDNSCore/nsec.c; sourceTree = "<group>"; };
+		2127A47515C3C7B900A857FC /* nsec3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nsec3.c; path = ../mDNSCore/nsec3.c; sourceTree = "<group>"; };
+		2127A47615C3C7B900A857FC /* nsec3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nsec3.h; path = ../mDNSCore/nsec3.h; sourceTree = "<group>"; };
+		213BDC6C147319F400000896 /* dnssec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnssec.c; path = ../mDNSCore/dnssec.c; sourceTree = "<group>"; };
+		213FB21812028A7A002B3A08 /* BonjourEvents.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BonjourEvents.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		213FB22C12028B53002B3A08 /* BonjourEvents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BonjourEvents.c; sourceTree = "<group>"; };
+		213FB22D12028B53002B3A08 /* BonjourEvents-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "BonjourEvents-Info.plist"; sourceTree = "<group>"; };
+		2141DD1D123FFCDB0086D23E /* libdns_sd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdns_sd.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2141DD24123FFD0F0086D23E /* libdns_sd_debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdns_sd_debug.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2141DD2A123FFD2C0086D23E /* libdns_sd_profile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdns_sd_profile.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		216D9ACD1720C9F5008066E1 /* VPNService.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VPNService.c; sourceTree = "<group>"; };
+		218E8E4F156D8C0300720DA0 /* dnsproxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnsproxy.c; path = ../mDNSCore/dnsproxy.c; sourceTree = "<group>"; };
+		218E8E50156D8C0300720DA0 /* dnsproxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dnsproxy.h; path = ../mDNSCore/dnsproxy.h; sourceTree = "<group>"; };
+		219D5541149ED645004464AE /* libxml2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.dylib; path = SDKs/MacOSX10.8.sdk/usr/lib/libxml2.2.dylib; sourceTree = DEVELOPER_DIR; };
+		21A57F4A145B2AE100939099 /* CryptoAlg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CryptoAlg.c; path = ../mDNSCore/CryptoAlg.c; sourceTree = "<group>"; };
+		21A57F4B145B2AE100939099 /* CryptoAlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptoAlg.h; path = ../mDNSCore/CryptoAlg.h; sourceTree = "<group>"; };
+		21A57F51145B2B1400939099 /* CryptoSupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CryptoSupport.c; sourceTree = "<group>"; };
+		21A57F52145B2B1400939099 /* CryptoSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoSupport.h; sourceTree = "<group>"; };
+		21DD8FBD161E9A250033C8F8 /* anonymous.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = anonymous.c; path = ../mDNSCore/anonymous.c; sourceTree = "<group>"; };
+		21DD8FBE161E9A250033C8F8 /* anonymous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anonymous.h; path = ../mDNSCore/anonymous.h; sourceTree = "<group>"; };
+		21DED43415702C0F0060B6B9 /* DNSProxySupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DNSProxySupport.c; sourceTree = "<group>"; };
+		21F432971134AA6800581B69 /* WebFilterDNS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebFilterDNS.framework; path = /System/Library/PrivateFrameworks/WebFilterDNS.framework; sourceTree = "<absolute>"; };
+		2E0405EB0C3190DC00F13B59 /* helpermsg.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = helpermsg.defs; sourceTree = "<group>"; };
+		2E0405F00C31955500F13B59 /* mDNSResponderHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mDNSResponderHelper; sourceTree = BUILT_PRODUCTS_DIR; };
+		2E0405F40C3195F700F13B59 /* helper.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = helper.c; sourceTree = "<group>"; };
+		2E0406140C3197CB00F13B59 /* libbsm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbsm.dylib; path = /usr/lib/libbsm.dylib; sourceTree = "<absolute>"; };
+		2E0406CA0C31E9AD00F13B59 /* helper-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "helper-main.c"; sourceTree = "<group>"; };
+		2E35528F0C3A95C100CA1CB7 /* helper-error.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "helper-error.h"; sourceTree = "<group>"; };
+		2E8165F60C59835F00485EB2 /* libipsec.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libipsec.dylib; path = /usr/lib/libipsec.dylib; sourceTree = "<absolute>"; };
+		2E96A5250C39BE480087C4D2 /* helper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = helper.h; sourceTree = "<group>"; };
+		2E96A52D0C39C1A50087C4D2 /* helper-stubs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "helper-stubs.c"; sourceTree = "<group>"; };
+		2ECC11A50C4FEC3800CB1885 /* helpermsg-types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "helpermsg-types.h"; sourceTree = "<group>"; };
+		2EDC5E720C39EA640092701B /* helper-server.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "helper-server.h"; sourceTree = "<group>"; };
+		4A2E69DD0F5475A3004A87B0 /* uds_daemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uds_daemon.h; path = ../mDNSShared/uds_daemon.h; sourceTree = SOURCE_ROOT; };
+		4A3600DF0F34F8CD00453EFB /* DeviceToDeviceManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DeviceToDeviceManager.framework; path = /System/Library/PrivateFrameworks/DeviceToDeviceManager.framework; sourceTree = "<absolute>"; };
+		4A7B9E7C14FDA19F00B84CC1 /* mDNSResponder.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = mDNSResponder.txt; sourceTree = "<group>"; };
+		4A7B9E7E14FDA1BB00B84CC1 /* mDNSResponder.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = mDNSResponder.plist; sourceTree = "<group>"; };
+		4A8202510C56C36500DDFD48 /* ipsec_strerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipsec_strerror.h; sourceTree = "<group>"; };
+		4A8202520C56C36500DDFD48 /* libpfkey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libpfkey.h; sourceTree = "<group>"; };
+		4A8202530C56C36600DDFD48 /* pfkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pfkey.c; sourceTree = "<group>"; };
+		4AAE0C7A0C68E97F003882A5 /* mDNSResponderHelper.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mDNSResponderHelper.8; sourceTree = SOURCE_ROOT; };
+		4ADB5F230F6AB9F400B95BF3 /* helper-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "helper-entitlements.plist"; sourceTree = "<group>"; };
+		4BD2B638134FE09F002B96D5 /* P2PPacketFilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = P2PPacketFilter.c; sourceTree = "<group>"; };
+		4BD2B639134FE09F002B96D5 /* P2PPacketFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PPacketFilter.h; sourceTree = "<group>"; };
+		654BE64F02B63B93000001D1 /* mDNSEmbeddedAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mDNSEmbeddedAPI.h; path = ../mDNSCore/mDNSEmbeddedAPI.h; sourceTree = "<group>"; };
+		654BE65002B63B93000001D1 /* mDNSDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mDNSDebug.h; path = ../mDNSCore/mDNSDebug.h; sourceTree = "<group>"; };
+		65713D46025A293200000109 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
+		6575FBE9022EAF5A00000109 /* mDNS.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = mDNS.c; path = ../mDNSCore/mDNS.c; sourceTree = "<group>"; tabWidth = 4; usesTabs = 1; };
+		6575FBEB022EAF7200000109 /* mDNSMacOSX.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = mDNSMacOSX.c; sourceTree = "<group>"; tabWidth = 4; usesTabs = 1; };
+		6575FBEC022EAF7200000109 /* daemon.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = daemon.c; sourceTree = "<group>"; tabWidth = 4; usesTabs = 1; };
+		6575FBFF022EAFBA00000109 /* DNSServiceDiscoveryDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSServiceDiscoveryDefines.h; sourceTree = "<group>"; };
+		6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = DNSServiceDiscoveryReply.defs; sourceTree = "<group>"; };
+		6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = DNSServiceDiscoveryRequest.defs; sourceTree = "<group>"; };
+		6575FC20022EB7AA00000109 /* SamplemDNSClient.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = SamplemDNSClient.c; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
+		72FB545A166D5F960090B2D9 /* dnsctl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = dnsctl.c; path = ../Clients/dnsctl.c; sourceTree = "<group>"; };
+		72FB545F166D5FB00090B2D9 /* dnsctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dnsctl; sourceTree = BUILT_PRODUCTS_DIR; };
+		7F18A9F60587CEF6001880B3 /* DNSCommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DNSCommon.c; path = ../mDNSCore/DNSCommon.c; sourceTree = SOURCE_ROOT; };
+		7F18A9F70587CEF6001880B3 /* uDNS.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = uDNS.c; path = ../mDNSCore/uDNS.c; sourceTree = SOURCE_ROOT; };
+		7F461DB5062DBF2900672BF3 /* DNSDigest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DNSDigest.c; path = ../mDNSCore/DNSDigest.c; sourceTree = SOURCE_ROOT; };
+		7F869685066EE02400D2A2DC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
+		7FC8F9D406D14E66007E879D /* LegacyNATTraversal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LegacyNATTraversal.c; sourceTree = SOURCE_ROOT; };
+		8418673A15AB8B6900BB7F70 /* com.apple.networking.mDNSResponder */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.networking.mDNSResponder; sourceTree = "<group>"; };
+		8418673C15AB8B8000BB7F70 /* mDNSResponderLogging.mobileconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = mDNSResponderLogging.mobileconfig; sourceTree = "<group>"; };
+		848DA5C6165477E000D2E8B4 /* xpc_services.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xpc_services.c; path = Private/xpc_services.c; sourceTree = "<group>"; };
+		848DA5C9165477EB00D2E8B4 /* xpc_services.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xpc_services.h; path = Private/xpc_services.h; sourceTree = "<group>"; };
+		848DA5D516547F7200D2E8B4 /* dns_xpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dns_xpc.h; path = Private/dns_xpc.h; sourceTree = "<group>"; };
+		84C5B3351665529800C324A8 /* libdns_services.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libdns_services.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		84C5B338166553A000C324A8 /* dns_services.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = dns_services.h; path = Private/dns_services.h; sourceTree = "<group>"; };
+		84C5B339166553AF00C324A8 /* dns_services.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = dns_services.c; path = Private/dns_services.c; sourceTree = "<group>"; };
+		D284BE730ADD80740027CCDF /* mDNSResponder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mDNSResponder; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BE950ADD80800027CCDF /* mDNSResponder.debug */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mDNSResponder.debug; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BEB00ADD80920027CCDF /* dns-sd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "dns-sd"; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BEBE0ADD809A0027CCDF /* libjdns_sd.jnilib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libjdns_sd.jnilib; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BED90ADD80A20027CCDF /* dnsextd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dnsextd; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BEE80ADD80A70027CCDF /* ddnswriteconfig */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ddnswriteconfig; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284BF0C0ADD80B00027CCDF /* Bonjour.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Bonjour.prefPane; sourceTree = BUILT_PRODUCTS_DIR; };
+		D284C04D0ADD95D30027CCDF /* Info-PreferencePane.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-PreferencePane.plist"; path = "PreferencePane/Info-PreferencePane.plist"; sourceTree = "<group>"; };
+		DB2CC4430662DD1100335AB3 /* BaseListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = BaseListener.java; path = ../mDNSShared/Java/BaseListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4440662DD1100335AB3 /* BrowseListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = BrowseListener.java; path = ../mDNSShared/Java/BrowseListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4450662DD1100335AB3 /* DNSRecord.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSRecord.java; path = ../mDNSShared/Java/DNSRecord.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4460662DD1100335AB3 /* DNSSD.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSSD.java; path = ../mDNSShared/Java/DNSSD.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4470662DD1100335AB3 /* DNSSDException.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSSDException.java; path = ../mDNSShared/Java/DNSSDException.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4480662DD1100335AB3 /* DNSSDRegistration.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSSDRegistration.java; path = ../mDNSShared/Java/DNSSDRegistration.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4490662DD1100335AB3 /* DNSSDService.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSSDService.java; path = ../mDNSShared/Java/DNSSDService.java; sourceTree = SOURCE_ROOT; };
+		DB2CC44A0662DD1100335AB3 /* DomainListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DomainListener.java; path = ../mDNSShared/Java/DomainListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC44B0662DD1100335AB3 /* JNISupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = JNISupport.c; path = ../mDNSShared/Java/JNISupport.c; sourceTree = SOURCE_ROOT; };
+		DB2CC44C0662DD1100335AB3 /* QueryListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = QueryListener.java; path = ../mDNSShared/Java/QueryListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC44D0662DD1100335AB3 /* RegisterListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = RegisterListener.java; path = ../mDNSShared/Java/RegisterListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC44E0662DD1100335AB3 /* ResolveListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = ResolveListener.java; path = ../mDNSShared/Java/ResolveListener.java; sourceTree = SOURCE_ROOT; };
+		DB2CC44F0662DD1100335AB3 /* TXTRecord.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = TXTRecord.java; path = ../mDNSShared/Java/TXTRecord.java; sourceTree = SOURCE_ROOT; };
+		DB2CC4680662DFF500335AB3 /* JavaVM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaVM.framework; path = /System/Library/Frameworks/JavaVM.framework; sourceTree = "<absolute>"; };
+		DBAAFE29057E8F4D0085CAD0 /* mDNSDebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mDNSDebug.c; path = ../mDNSShared/mDNSDebug.c; sourceTree = SOURCE_ROOT; };
+		DBAAFE2C057E8F660085CAD0 /* GenLinkedList.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GenLinkedList.c; path = ../mDNSShared/GenLinkedList.c; sourceTree = SOURCE_ROOT; };
+		F525E72804AA167501F1CF4D /* uds_daemon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = uds_daemon.c; path = ../mDNSShared/uds_daemon.c; sourceTree = SOURCE_ROOT; };
+		F5E11B5A04A28126019798ED /* dnssd_ipc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnssd_ipc.c; path = ../mDNSShared/dnssd_ipc.c; sourceTree = SOURCE_ROOT; };
+		F5E11B5B04A28126019798ED /* dnssd_ipc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dnssd_ipc.h; path = ../mDNSShared/dnssd_ipc.h; sourceTree = SOURCE_ROOT; };
+		FF08480607CEB8E800AE6769 /* inprogress.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = inprogress.tiff; path = PreferencePane/Artwork/inprogress.tiff; sourceTree = SOURCE_ROOT; };
+		FF13FFEA0A5DA44A00897C81 /* dnsextd_lexer.l */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = dnsextd_lexer.l; path = ../mDNSShared/dnsextd_lexer.l; sourceTree = SOURCE_ROOT; };
+		FF13FFEC0A5DA45500897C81 /* dnsextd_parser.y */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = dnsextd_parser.y; path = ../mDNSShared/dnsextd_parser.y; sourceTree = SOURCE_ROOT; };
+		FF1C919D07021D77001048AB /* dns-sd.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; name = "dns-sd.1"; path = "../mDNSShared/dns-sd.1"; sourceTree = SOURCE_ROOT; };
+		FF1C919F07021E3F001048AB /* dns-sd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "dns-sd.c"; path = "../Clients/dns-sd.c"; sourceTree = SOURCE_ROOT; };
+		FF25794606C9A8BF00376F7B /* dnsextd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnsextd.c; path = ../mDNSShared/dnsextd.c; sourceTree = SOURCE_ROOT; };
+		FF2609FA07B4433800CE10E5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		FF260A1F07B4436900CE10E5 /* PreferencePanes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PreferencePanes.framework; path = /System/Library/Frameworks/PreferencePanes.framework; sourceTree = "<absolute>"; };
+		FF260A2407B4464B00CE10E5 /* remove_idle.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove_idle.tiff; path = PreferencePane/Artwork/remove_idle.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2507B4464B00CE10E5 /* add_pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = add_pressed.tiff; path = PreferencePane/Artwork/add_pressed.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2607B4464B00CE10E5 /* remove_disabled.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove_disabled.tiff; path = PreferencePane/Artwork/remove_disabled.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2707B4464B00CE10E5 /* add_idle.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = add_idle.tiff; path = PreferencePane/Artwork/add_idle.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2807B4464B00CE10E5 /* success.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = success.tiff; path = PreferencePane/Artwork/success.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2907B4464B00CE10E5 /* remove_pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove_pressed.tiff; path = PreferencePane/Artwork/remove_pressed.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A2A07B4464B00CE10E5 /* failure.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = failure.tiff; path = PreferencePane/Artwork/failure.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A3207B4466900CE10E5 /* BonjourPref.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = BonjourPref.icns; path = PreferencePane/BonjourPref.icns; sourceTree = SOURCE_ROOT; };
+		FF260A3307B4466900CE10E5 /* BonjourPref.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BonjourPref.tiff; path = PreferencePane/BonjourPref.tiff; sourceTree = SOURCE_ROOT; };
+		FF260A4907B4475600CE10E5 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePane/English.lproj/DNSServiceDiscoveryPref.nib; sourceTree = SOURCE_ROOT; };
+		FF260A4C07B4477F00CE10E5 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = PreferencePane/English.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
+		FF2C5FB00A48B8680066DA11 /* DNSSDRecordRegistrar.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = DNSSDRecordRegistrar.java; path = ../mDNSShared/Java/DNSSDRecordRegistrar.java; sourceTree = SOURCE_ROOT; };
+		FF2C5FB20A48B86E0066DA11 /* RegisterRecordListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = RegisterRecordListener.java; path = ../mDNSShared/Java/RegisterRecordListener.java; sourceTree = SOURCE_ROOT; };
+		FF354EB108516C63007C00E1 /* installtool */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = installtool; path = PreferencePane/installtool; sourceTree = SOURCE_ROOT; };
+		FF485D5105632E0000130380 /* mDNSResponder.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mDNSResponder.8; path = ../mDNSShared/mDNSResponder.8; sourceTree = SOURCE_ROOT; };
+		FF5852100DD27BD300862BDF /* ClientCommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ClientCommon.c; path = ../Clients/ClientCommon.c; sourceTree = SOURCE_ROOT; };
+		FF85880B0BD599F40080D89F /* mDNSResponder.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mDNSResponder.sb; sourceTree = SOURCE_ROOT; };
+		FFA572390AF18F1C0055A0F1 /* libsystem_dnssd_debug.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_dnssd_debug.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		FFA572450AF18F450055A0F1 /* libsystem_dnssd_profile.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_dnssd_profile.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DNSServiceDiscovery.c; sourceTree = "<group>"; };
+		FFA572600AF1908D0055A0F1 /* DNSServiceDiscovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSServiceDiscovery.h; sourceTree = "<group>"; };
+		FFA572630AF190C20055A0F1 /* dns_sd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dns_sd.h; path = ../mDNSShared/dns_sd.h; sourceTree = SOURCE_ROOT; };
+		FFB765840AEED9C700583A2C /* libsystem_dnssd.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_dnssd.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		FFCB6D73075D539900B8AF62 /* PlatformCommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PlatformCommon.c; path = ../mDNSShared/PlatformCommon.c; sourceTree = SOURCE_ROOT; };
+		FFE6935007C2CA7F00283007 /* ConfigurationAuthority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConfigurationAuthority.h; path = PreferencePane/ConfigurationAuthority.h; sourceTree = SOURCE_ROOT; };
+		FFE6935207C2CAA400283007 /* DNSServiceDiscoveryPref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DNSServiceDiscoveryPref.h; path = PreferencePane/DNSServiceDiscoveryPref.h; sourceTree = SOURCE_ROOT; };
+		FFE6935407C2CABD00283007 /* PrivilegedOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrivilegedOperations.h; path = PreferencePane/PrivilegedOperations.h; sourceTree = SOURCE_ROOT; };
+		FFF4F63A06CFE4DD00459EFD /* dnsextd.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dnsextd.8; path = ../mDNSShared/dnsextd.8; sourceTree = SOURCE_ROOT; };
+		FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnssd_clientlib.c; path = ../mDNSShared/dnssd_clientlib.c; sourceTree = SOURCE_ROOT; };
+		FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dnssd_clientstub.c; path = ../mDNSShared/dnssd_clientstub.c; sourceTree = SOURCE_ROOT; };
+		FFFB0DAC07B43CBA00B88D48 /* DNSServiceDiscoveryPref.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DNSServiceDiscoveryPref.m; sourceTree = "<group>"; };
+		FFFB0DAD07B43CBA00B88D48 /* PrivilegedOperations.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = PrivilegedOperations.c; sourceTree = "<group>"; };
+		FFFB0DAE07B43CBA00B88D48 /* ConfigurationAuthority.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ConfigurationAuthority.c; sourceTree = "<group>"; };
+		FFFB0DAF07B43CBA00B88D48 /* ddnswriteconfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ddnswriteconfig.m; sourceTree = "<group>"; };
+		FFFB0DB407B43D2700B88D48 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		FFFF8F800C3307AC00722979 /* dnsextd.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dnsextd.conf; path = ../mDNSShared/dnsextd.conf; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		213FB21612028A7A002B3A08 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				213FB23D12028C5A002B3A08 /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD1B123FFCDB0086D23E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD22123FFD0F0086D23E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD28123FFD2C0086D23E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2E0405EE0C31955500F13B59 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FFB437150EB165BD00E17C68 /* IOKit.framework in Frameworks */,
+				2E0406150C3197CB00F13B59 /* libbsm.dylib in Frameworks */,
+				2E04070A0C31EEEC00F13B59 /* CoreFoundation.framework in Frameworks */,
+				2E04070B0C31EEEC00F13B59 /* SystemConfiguration.framework in Frameworks */,
+				2E4D9B050C38C19500480551 /* Security.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72FB545C166D5FB00090B2D9 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72FB5468166D5FD20090B2D9 /* libdns_services.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84C5B3321665529800C324A8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE640ADD80740027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE650ADD80740027CCDF /* CoreFoundation.framework in Frameworks */,
+				D284BE660ADD80740027CCDF /* SystemConfiguration.framework in Frameworks */,
+				D284BE670ADD80740027CCDF /* IOKit.framework in Frameworks */,
+				D284BE680ADD80740027CCDF /* Security.framework in Frameworks */,
+				219D5542149ED645004464AE /* libxml2.2.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE8C0ADD80800027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE8D0ADD80800027CCDF /* CoreFoundation.framework in Frameworks */,
+				D284BE8E0ADD80800027CCDF /* SystemConfiguration.framework in Frameworks */,
+				D284BE8F0ADD80800027CCDF /* IOKit.framework in Frameworks */,
+				D284BE900ADD80800027CCDF /* Security.framework in Frameworks */,
+				219D5543149ED645004464AE /* libxml2.2.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEA90ADD80920027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEB80ADD809A0027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEB90ADD809A0027CCDF /* JavaVM.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BECE0ADD80A20027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BECF0ADD80A20027CCDF /* CoreFoundation.framework in Frameworks */,
+				D284BED00ADD80A20027CCDF /* SystemConfiguration.framework in Frameworks */,
+				D284BED10ADD80A20027CCDF /* IOKit.framework in Frameworks */,
+				D284BED20ADD80A20027CCDF /* Security.framework in Frameworks */,
+				2E8165F90C59838100485EB2 /* libipsec.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEDF0ADD80A70027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEE00ADD80A70027CCDF /* Foundation.framework in Frameworks */,
+				D284BEE10ADD80A70027CCDF /* Security.framework in Frameworks */,
+				D284BEE20ADD80A70027CCDF /* SystemConfiguration.framework in Frameworks */,
+				D284BEE30ADD80A70027CCDF /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BF010ADD80B00027CCDF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BF020ADD80B00027CCDF /* SystemConfiguration.framework in Frameworks */,
+				D284BF030ADD80B00027CCDF /* Security.framework in Frameworks */,
+				D284BF040ADD80B00027CCDF /* Cocoa.framework in Frameworks */,
+				D284BF050ADD80B00027CCDF /* PreferencePanes.framework in Frameworks */,
+				D284BF060ADD80B00027CCDF /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA572360AF18F1C0055A0F1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA572420AF18F450055A0F1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFB765820AEED9C700583A2C /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		08FB7794FE84155DC02AAC07 /* mDNSResponder */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7795FE84155DC02AAC07 /* mDNS Server Sources */,
+				6575FC1F022EB78C00000109 /* Command-Line Clients */,
+				213FB20912028902002B3A08 /* Bonjour Events Plugin */,
+				6575FBFE022EAFA800000109 /* MIG files */,
+				DB2CC4420662DCE500335AB3 /* Java Support */,
+				FFFB0DA407B43BED00B88D48 /* PreferencePane */,
+				08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
+				19C28FBDFE9D53C911CA2CBB /* Products */,
+			);
+			name = mDNSResponder;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* mDNS Server Sources */ = {
+			isa = PBXGroup;
+			children = (
+				216D9ACD1720C9F5008066E1 /* VPNService.c */,
+				2120ABD416B71614007089B6 /* CUPolicy.c */,
+				84C5B338166553A000C324A8 /* dns_services.h */,
+				72FB545A166D5F960090B2D9 /* dnsctl.c */,
+				84C5B339166553AF00C324A8 /* dns_services.c */,
+				848DA5D516547F7200D2E8B4 /* dns_xpc.h */,
+				848DA5C9165477EB00D2E8B4 /* xpc_services.h */,
+				848DA5C6165477E000D2E8B4 /* xpc_services.c */,
+				21070E5D16486B9000A69507 /* DNSSECSupport.c */,
+				21070E5E16486B9000A69507 /* DNSSECSupport.h */,
+				21DD8FBD161E9A250033C8F8 /* anonymous.c */,
+				21DD8FBE161E9A250033C8F8 /* anonymous.h */,
+				2127A47515C3C7B900A857FC /* nsec3.c */,
+				2127A47615C3C7B900A857FC /* nsec3.h */,
+				8418673C15AB8B8000BB7F70 /* mDNSResponderLogging.mobileconfig */,
+				8418673A15AB8B6900BB7F70 /* com.apple.networking.mDNSResponder */,
+				21DED43415702C0F0060B6B9 /* DNSProxySupport.c */,
+				218E8E4F156D8C0300720DA0 /* dnsproxy.c */,
+				218E8E50156D8C0300720DA0 /* dnsproxy.h */,
+				213BDC6C147319F400000896 /* dnssec.c */,
+				2124FA321471E9DE0021D7BB /* nsec.c */,
+				2124FA2F1471E9B50021D7BB /* dnssec.h */,
+				2124FA2B1471E98C0021D7BB /* nsec.h */,
+				21A57F51145B2B1400939099 /* CryptoSupport.c */,
+				21A57F52145B2B1400939099 /* CryptoSupport.h */,
+				21A57F4A145B2AE100939099 /* CryptoAlg.c */,
+				21A57F4B145B2AE100939099 /* CryptoAlg.h */,
+				4ADB5F230F6AB9F400B95BF3 /* helper-entitlements.plist */,
+				4A2E69DD0F5475A3004A87B0 /* uds_daemon.h */,
+				4AAE0C7A0C68E97F003882A5 /* mDNSResponderHelper.8 */,
+				2ECC11A50C4FEC3800CB1885 /* helpermsg-types.h */,
+				2E35528F0C3A95C100CA1CB7 /* helper-error.h */,
+				2E96A52D0C39C1A50087C4D2 /* helper-stubs.c */,
+				2EDC5E720C39EA640092701B /* helper-server.h */,
+				2E96A5250C39BE480087C4D2 /* helper.h */,
+				2E0405F40C3195F700F13B59 /* helper.c */,
+				2E0406CA0C31E9AD00F13B59 /* helper-main.c */,
+				4A8202510C56C36500DDFD48 /* ipsec_strerror.h */,
+				4A8202520C56C36500DDFD48 /* libpfkey.h */,
+				4A8202530C56C36600DDFD48 /* pfkey.c */,
+				7FC8F9D406D14E66007E879D /* LegacyNATTraversal.c */,
+				7F461DB5062DBF2900672BF3 /* DNSDigest.c */,
+				F525E72804AA167501F1CF4D /* uds_daemon.c */,
+				F5E11B5A04A28126019798ED /* dnssd_ipc.c */,
+				F5E11B5B04A28126019798ED /* dnssd_ipc.h */,
+				6575FBEC022EAF7200000109 /* daemon.c */,
+				6575FBE9022EAF5A00000109 /* mDNS.c */,
+				6575FBEB022EAF7200000109 /* mDNSMacOSX.c */,
+				654BE64F02B63B93000001D1 /* mDNSEmbeddedAPI.h */,
+				654BE65002B63B93000001D1 /* mDNSDebug.h */,
+				DBAAFE29057E8F4D0085CAD0 /* mDNSDebug.c */,
+				000753D303367C1C0CCA2C71 /* mDNSMacOSX.h */,
+				DBAAFE2C057E8F660085CAD0 /* GenLinkedList.c */,
+				FFCB6D73075D539900B8AF62 /* PlatformCommon.c */,
+				FF1C919D07021D77001048AB /* dns-sd.1 */,
+				FF485D5105632E0000130380 /* mDNSResponder.8 */,
+				FFF4F63A06CFE4DD00459EFD /* dnsextd.8 */,
+				FFFF8F800C3307AC00722979 /* dnsextd.conf */,
+				FF85880B0BD599F40080D89F /* mDNSResponder.sb */,
+				4A7B9E7C14FDA19F00B84CC1 /* mDNSResponder.txt */,
+				4A7B9E7E14FDA1BB00B84CC1 /* mDNSResponder.plist */,
+				7F18A9F60587CEF6001880B3 /* DNSCommon.c */,
+				7F18A9F70587CEF6001880B3 /* uDNS.c */,
+				FF25794606C9A8BF00376F7B /* dnsextd.c */,
+				FF13FFEA0A5DA44A00897C81 /* dnsextd_lexer.l */,
+				FF13FFEC0A5DA45500897C81 /* dnsextd_parser.y */,
+				FFFA38620AEEDB090065B80A /* dnssd_clientlib.c */,
+				FFFA38640AEEDB130065B80A /* dnssd_clientstub.c */,
+				FFA572600AF1908D0055A0F1 /* DNSServiceDiscovery.h */,
+				FFA572480AF18FCC0055A0F1 /* DNSServiceDiscovery.c */,
+				FFA572630AF190C20055A0F1 /* dns_sd.h */,
+				4BD2B638134FE09F002B96D5 /* P2PPacketFilter.c */,
+				4BD2B639134FE09F002B96D5 /* P2PPacketFilter.h */,
+			);
+			name = "mDNS Server Sources";
+			sourceTree = "<group>";
+		};
+		08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				219D5541149ED645004464AE /* libxml2.2.dylib */,
+				4A3600DF0F34F8CD00453EFB /* DeviceToDeviceManager.framework */,
+				2E8165F60C59835F00485EB2 /* libipsec.dylib */,
+				65713D46025A293200000109 /* SystemConfiguration.framework */,
+				2E0406140C3197CB00F13B59 /* libbsm.dylib */,
+				7F869685066EE02400D2A2DC /* Security.framework */,
+				FFFB0DB407B43D2700B88D48 /* Foundation.framework */,
+				09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */,
+				00CA213D02786FC30CCA2C71 /* IOKit.framework */,
+				DB2CC4680662DFF500335AB3 /* JavaVM.framework */,
+				FF2609FA07B4433800CE10E5 /* Cocoa.framework */,
+				FF260A1F07B4436900CE10E5 /* PreferencePanes.framework */,
+				21F432971134AA6800581B69 /* WebFilterDNS.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		19C28FBDFE9D53C911CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				D284C04D0ADD95D30027CCDF /* Info-PreferencePane.plist */,
+				D284BE730ADD80740027CCDF /* mDNSResponder */,
+				D284BE950ADD80800027CCDF /* mDNSResponder.debug */,
+				D284BEB00ADD80920027CCDF /* dns-sd */,
+				D284BEBE0ADD809A0027CCDF /* libjdns_sd.jnilib */,
+				D284BED90ADD80A20027CCDF /* dnsextd */,
+				D284BEE80ADD80A70027CCDF /* ddnswriteconfig */,
+				D284BF0C0ADD80B00027CCDF /* Bonjour.prefPane */,
+				FFB765840AEED9C700583A2C /* libsystem_dnssd.dylib */,
+				FFA572390AF18F1C0055A0F1 /* libsystem_dnssd_debug.dylib */,
+				FFA572450AF18F450055A0F1 /* libsystem_dnssd_profile.dylib */,
+				2E0405F00C31955500F13B59 /* mDNSResponderHelper */,
+				213FB21812028A7A002B3A08 /* BonjourEvents.plugin */,
+				2141DD1D123FFCDB0086D23E /* libdns_sd.a */,
+				2141DD24123FFD0F0086D23E /* libdns_sd_debug.a */,
+				2141DD2A123FFD2C0086D23E /* libdns_sd_profile.a */,
+				84C5B3351665529800C324A8 /* libdns_services.dylib */,
+				72FB545F166D5FB00090B2D9 /* dnsctl */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		213FB20912028902002B3A08 /* Bonjour Events Plugin */ = {
+			isa = PBXGroup;
+			children = (
+				213FB22C12028B53002B3A08 /* BonjourEvents.c */,
+				213FB22D12028B53002B3A08 /* BonjourEvents-Info.plist */,
+			);
+			name = "Bonjour Events Plugin";
+			sourceTree = "<group>";
+		};
+		6575FBFE022EAFA800000109 /* MIG files */ = {
+			isa = PBXGroup;
+			children = (
+				2E0405EB0C3190DC00F13B59 /* helpermsg.defs */,
+				6575FBFF022EAFBA00000109 /* DNSServiceDiscoveryDefines.h */,
+				6575FC00022EAFBA00000109 /* DNSServiceDiscoveryReply.defs */,
+				6575FC01022EAFBA00000109 /* DNSServiceDiscoveryRequest.defs */,
+			);
+			name = "MIG files";
+			sourceTree = "<group>";
+		};
+		6575FC1F022EB78C00000109 /* Command-Line Clients */ = {
+			isa = PBXGroup;
+			children = (
+				6575FC20022EB7AA00000109 /* SamplemDNSClient.c */,
+				FF1C919F07021E3F001048AB /* dns-sd.c */,
+				FF5852100DD27BD300862BDF /* ClientCommon.c */,
+			);
+			name = "Command-Line Clients";
+			sourceTree = "<group>";
+		};
+		DB2CC4420662DCE500335AB3 /* Java Support */ = {
+			isa = PBXGroup;
+			children = (
+				DB2CC4430662DD1100335AB3 /* BaseListener.java */,
+				DB2CC4440662DD1100335AB3 /* BrowseListener.java */,
+				DB2CC4450662DD1100335AB3 /* DNSRecord.java */,
+				DB2CC4460662DD1100335AB3 /* DNSSD.java */,
+				DB2CC4470662DD1100335AB3 /* DNSSDException.java */,
+				DB2CC4480662DD1100335AB3 /* DNSSDRegistration.java */,
+				DB2CC4490662DD1100335AB3 /* DNSSDService.java */,
+				DB2CC44A0662DD1100335AB3 /* DomainListener.java */,
+				DB2CC44B0662DD1100335AB3 /* JNISupport.c */,
+				DB2CC44C0662DD1100335AB3 /* QueryListener.java */,
+				DB2CC44D0662DD1100335AB3 /* RegisterListener.java */,
+				DB2CC44E0662DD1100335AB3 /* ResolveListener.java */,
+				DB2CC44F0662DD1100335AB3 /* TXTRecord.java */,
+				FF2C5FB00A48B8680066DA11 /* DNSSDRecordRegistrar.java */,
+				FF2C5FB20A48B86E0066DA11 /* RegisterRecordListener.java */,
+			);
+			name = "Java Support";
+			sourceTree = "<group>";
+		};
+		FF260A2307B4463400CE10E5 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				FF260A2407B4464B00CE10E5 /* remove_idle.tiff */,
+				FF260A2507B4464B00CE10E5 /* add_pressed.tiff */,
+				FF260A2607B4464B00CE10E5 /* remove_disabled.tiff */,
+				FF260A2707B4464B00CE10E5 /* add_idle.tiff */,
+				FF260A2907B4464B00CE10E5 /* remove_pressed.tiff */,
+				FF260A2807B4464B00CE10E5 /* success.tiff */,
+				FF08480607CEB8E800AE6769 /* inprogress.tiff */,
+				FF260A2A07B4464B00CE10E5 /* failure.tiff */,
+				FF260A3207B4466900CE10E5 /* BonjourPref.icns */,
+				FF260A3307B4466900CE10E5 /* BonjourPref.tiff */,
+				FF354EB108516C63007C00E1 /* installtool */,
+				FF260A4807B4475600CE10E5 /* DNSServiceDiscoveryPref.nib */,
+				FF260A4B07B4477F00CE10E5 /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		FFFB0DA407B43BED00B88D48 /* PreferencePane */ = {
+			isa = PBXGroup;
+			children = (
+				FFE6935007C2CA7F00283007 /* ConfigurationAuthority.h */,
+				FFFB0DAE07B43CBA00B88D48 /* ConfigurationAuthority.c */,
+				FFE6935207C2CAA400283007 /* DNSServiceDiscoveryPref.h */,
+				FFFB0DAC07B43CBA00B88D48 /* DNSServiceDiscoveryPref.m */,
+				FFE6935407C2CABD00283007 /* PrivilegedOperations.h */,
+				FFFB0DAD07B43CBA00B88D48 /* PrivilegedOperations.c */,
+				FFFB0DAF07B43CBA00B88D48 /* ddnswriteconfig.m */,
+				FF260A2307B4463400CE10E5 /* Resources */,
+			);
+			path = PreferencePane;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		2141DD19123FFCDB0086D23E /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD20123FFD0F0086D23E /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD26123FFD2C0086D23E /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2EC8F8ED0C39CCCA003C9C48 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2EC8F8EC0C39CCAC003C9C48 /* helper.h in Headers */,
+				2EDC5E730C39EA640092701B /* helper-server.h in Headers */,
+				2E3552920C3A95C100CA1CB7 /* helper-error.h in Headers */,
+				2ECC11A80C4FEC3800CB1885 /* helpermsg-types.h in Headers */,
+				2E8165E80C5980E300485EB2 /* libpfkey.h in Headers */,
+				2E8165EA0C5980F700485EB2 /* ipsec_strerror.h in Headers */,
+				4BD2B63B134FE09F002B96D5 /* P2PPacketFilter.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84C5B3331665529800C324A8 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				84C5B33D166553F900C324A8 /* dns_services.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE520ADD80740027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE530ADD80740027CCDF /* DNSServiceDiscoveryDefines.h in Headers */,
+				D284BE540ADD80740027CCDF /* dnssd_ipc.h in Headers */,
+				2E96A5260C39BE480087C4D2 /* helper.h in Headers */,
+				2EDC5E750C39EA640092701B /* helper-server.h in Headers */,
+				2E3552900C3A95C100CA1CB7 /* helper-error.h in Headers */,
+				2ECC11A60C4FEC3800CB1885 /* helpermsg-types.h in Headers */,
+				21A57F4E145B2AE100939099 /* CryptoAlg.h in Headers */,
+				21A57F55145B2B1400939099 /* CryptoSupport.h in Headers */,
+				2124FA2C1471E98C0021D7BB /* nsec.h in Headers */,
+				2124FA301471E9B50021D7BB /* dnssec.h in Headers */,
+				218E8E53156D8C0300720DA0 /* dnsproxy.h in Headers */,
+				2127A47915C3C7B900A857FC /* nsec3.h in Headers */,
+				21DD8FC1161E9A250033C8F8 /* anonymous.h in Headers */,
+				21070E6116486B9000A69507 /* DNSSECSupport.h in Headers */,
+				848DA5CA165477EB00D2E8B4 /* xpc_services.h in Headers */,
+				848DA5D616547F7200D2E8B4 /* dns_xpc.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE770ADD80800027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE780ADD80800027CCDF /* DNSServiceDiscoveryDefines.h in Headers */,
+				D284BE790ADD80800027CCDF /* dnssd_ipc.h in Headers */,
+				D284BE7A0ADD80800027CCDF /* mDNSEmbeddedAPI.h in Headers */,
+				D284BE7B0ADD80800027CCDF /* mDNSDebug.h in Headers */,
+				D284BE7C0ADD80800027CCDF /* mDNSMacOSX.h in Headers */,
+				2E96A5270C39BE480087C4D2 /* helper.h in Headers */,
+				2EDC5E740C39EA640092701B /* helper-server.h in Headers */,
+				2E3552910C3A95C100CA1CB7 /* helper-error.h in Headers */,
+				2ECC11A70C4FEC3800CB1885 /* helpermsg-types.h in Headers */,
+				21A57F4F145B2AE100939099 /* CryptoAlg.h in Headers */,
+				21A57F56145B2B1400939099 /* CryptoSupport.h in Headers */,
+				2124FA2D1471E98C0021D7BB /* nsec.h in Headers */,
+				2124FA311471E9B50021D7BB /* dnssec.h in Headers */,
+				218E8E54156D8C0300720DA0 /* dnsproxy.h in Headers */,
+				2127A47A15C3C7B900A857FC /* nsec3.h in Headers */,
+				21DD8FC2161E9A250033C8F8 /* anonymous.h in Headers */,
+				21070E6216486B9000A69507 /* DNSSECSupport.h in Headers */,
+				848DA5CB165477EB00D2E8B4 /* xpc_services.h in Headers */,
+				848DA5D716547F7200D2E8B4 /* dns_xpc.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEA60ADD80920027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEB50ADD809A0027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEC20ADD80A20027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2E35529D0C3A9E7600CA1CB7 /* helper-error.h in Headers */,
+				2E35529F0C3A9E7600CA1CB7 /* helper.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEDC0ADD80A70027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEED0ADD80B00027CCDF /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA572310AF18F1C0055A0F1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA5723D0AF18F450055A0F1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFB765800AEED9C700583A2C /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXLegacyTarget section */
+		4AE471670EAFF81900A6C5AD /* dns_sd.jar */ = {
+			isa = PBXLegacyTarget;
+			buildArgumentsString = "-f ${SRCROOT}/../mDNSPosix/Makefile OBJDIR=${CONFIGURATION_TEMP_DIR}/dns_sd.jar.build BUILDDIR=${BUILT_PRODUCTS_DIR} SHAREDDIR=${SRCROOT}/../mDNSShared os=x JavaForXcode_$(ACTION)";
+			buildConfigurationList = 4AE471770EAFF84000A6C5AD /* Build configuration list for PBXLegacyTarget "dns_sd.jar" */;
+			buildPhases = (
+			);
+			buildToolPath = /usr/bin/make;
+			buildWorkingDirectory = "";
+			comments = "Multiplatform .jar file that implements Java interface to DNS-SD";
+			dependencies = (
+			);
+			name = dns_sd.jar;
+			passBuildSettingsInEnvironment = 1;
+			productName = dns_sd.jar;
+		};
+/* End PBXLegacyTarget section */
+
+/* Begin PBXNativeTarget section */
+		213FB21712028A7A002B3A08 /* BonjourEvents */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 213FB21B12028A7C002B3A08 /* Build configuration list for PBXNativeTarget "BonjourEvents" */;
+			buildPhases = (
+				213FB21412028A7A002B3A08 /* Resources */,
+				213FB21512028A7A002B3A08 /* Sources */,
+				213FB21612028A7A002B3A08 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = BonjourEvents;
+			productName = BonjourEvents;
+			productReference = 213FB21812028A7A002B3A08 /* BonjourEvents.plugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		2141DD1C123FFCDB0086D23E /* libdns_sd_static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2141DD1F123FFCF90086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_static" */;
+			buildPhases = (
+				2141DD19123FFCDB0086D23E /* Headers */,
+				2141DD1A123FFCDB0086D23E /* Sources */,
+				2141DD1B123FFCDB0086D23E /* Frameworks */,
+				2130256B12400DE600AC839F /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_static;
+			productName = libdns_sd_static;
+			productReference = 2141DD1D123FFCDB0086D23E /* libdns_sd.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		2141DD23123FFD0F0086D23E /* libdns_sd_debug_static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2141DD35123FFD3B0086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_debug_static" */;
+			buildPhases = (
+				2141DD20123FFD0F0086D23E /* Headers */,
+				2141DD21123FFD0F0086D23E /* Sources */,
+				2141DD22123FFD0F0086D23E /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_debug_static;
+			productName = libdns_sd_debug_static;
+			productReference = 2141DD24123FFD0F0086D23E /* libdns_sd_debug.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		2141DD29123FFD2C0086D23E /* libdns_sd_profile_static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2141DD36123FFD3B0086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_profile_static" */;
+			buildPhases = (
+				2141DD26123FFD2C0086D23E /* Headers */,
+				2141DD27123FFD2C0086D23E /* Sources */,
+				2141DD28123FFD2C0086D23E /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_profile_static;
+			productName = libdns_sd_profile_static;
+			productReference = 2141DD2A123FFD2C0086D23E /* libdns_sd_profile.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		2E0405EF0C31955500F13B59 /* mDNSResponderHelper */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2E0405F30C31956600F13B59 /* Build configuration list for PBXNativeTarget "mDNSResponderHelper" */;
+			buildPhases = (
+				030BBED60CE11EEC00472F0C /* ShellScript */,
+				2EC8F8ED0C39CCCA003C9C48 /* Headers */,
+				2E0405ED0C31955500F13B59 /* Sources */,
+				2E0405EE0C31955500F13B59 /* Frameworks */,
+				4AAE0C5A0C68E6EC003882A5 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = mDNSResponderHelper;
+			productName = mDNSResponderHelper;
+			productReference = 2E0405F00C31955500F13B59 /* mDNSResponderHelper */;
+			productType = "com.apple.product-type.tool";
+		};
+		72FB545E166D5FB00090B2D9 /* dnsctl */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 72FB5465166D5FB00090B2D9 /* Build configuration list for PBXNativeTarget "dnsctl" */;
+			buildPhases = (
+				72FB545B166D5FB00090B2D9 /* Sources */,
+				72FB545C166D5FB00090B2D9 /* Frameworks */,
+				72FB545D166D5FB00090B2D9 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dnsctl;
+			productName = dnsctl;
+			productReference = 72FB545F166D5FB00090B2D9 /* dnsctl */;
+			productType = "com.apple.product-type.tool";
+		};
+		84C5B3341665529800C324A8 /* dns_services */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 84C5B3361665529800C324A8 /* Build configuration list for PBXNativeTarget "dns_services" */;
+			buildPhases = (
+				84C5B3311665529800C324A8 /* Sources */,
+				84C5B3321665529800C324A8 /* Frameworks */,
+				84C5B3331665529800C324A8 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dns_services;
+			productName = dns_services;
+			productReference = 84C5B3351665529800C324A8 /* libdns_services.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		D284BE500ADD80740027CCDF /* mDNSResponder */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BE6D0ADD80740027CCDF /* Build configuration list for PBXNativeTarget "mDNSResponder" */;
+			buildPhases = (
+				D284BE510ADD80740027CCDF /* ShellScript */,
+				D284BE520ADD80740027CCDF /* Headers */,
+				D284BE550ADD80740027CCDF /* Sources */,
+				D284BE640ADD80740027CCDF /* Frameworks */,
+				D284BE690ADD80740027CCDF /* Rez */,
+				D284BE6A0ADD80740027CCDF /* CopyFiles */,
+				4A7B9E7F14FDA21B00B84CC1 /* CopyFiles */,
+				4A7B9E8114FDA25500B84CC1 /* CopyFiles */,
+				D284BE6C0ADD80740027CCDF /* ShellScript */,
+				8418673D15AB8BFF00BB7F70 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = mDNSResponder;
+			productInstallPath = "${HOME}/bin";
+			productName = mDNSResponder;
+			productReference = D284BE730ADD80740027CCDF /* mDNSResponder */;
+			productType = "com.apple.product-type.tool";
+		};
+		D284BE750ADD80800027CCDF /* mDNSResponder debug */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BE920ADD80800027CCDF /* Build configuration list for PBXNativeTarget "mDNSResponder debug" */;
+			buildPhases = (
+				D284BE760ADD80800027CCDF /* ShellScript */,
+				D284BE770ADD80800027CCDF /* Headers */,
+				D284BE7D0ADD80800027CCDF /* Sources */,
+				D284BE8C0ADD80800027CCDF /* Frameworks */,
+				D284BE910ADD80800027CCDF /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "mDNSResponder debug";
+			productName = mDNSResponder;
+			productReference = D284BE950ADD80800027CCDF /* mDNSResponder.debug */;
+			productType = "com.apple.product-type.tool";
+		};
+		D284BEA50ADD80920027CCDF /* dns-sd tool */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BEAD0ADD80920027CCDF /* Build configuration list for PBXNativeTarget "dns-sd tool" */;
+			buildPhases = (
+				D284BEA60ADD80920027CCDF /* Headers */,
+				D284BEA70ADD80920027CCDF /* Sources */,
+				D284BEA90ADD80920027CCDF /* Frameworks */,
+				D284BEAA0ADD80920027CCDF /* Rez */,
+				D284BEAB0ADD80920027CCDF /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "dns-sd tool";
+			productInstallPath = /usr/bin;
+			productName = "dns-sd command-line tool";
+			productReference = D284BEB00ADD80920027CCDF /* dns-sd */;
+			productType = "com.apple.product-type.tool";
+		};
+		D284BEB20ADD809A0027CCDF /* libjdns_sd.jnilib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BEBB0ADD809A0027CCDF /* Build configuration list for PBXNativeTarget "libjdns_sd.jnilib" */;
+			buildPhases = (
+				D284BEB50ADD809A0027CCDF /* Headers */,
+				D284BEB60ADD809A0027CCDF /* Sources */,
+				D284BEB80ADD809A0027CCDF /* Frameworks */,
+				D284BEBA0ADD809A0027CCDF /* Rez */,
+			);
+			buildRules = (
+			);
+			comments = "Platform-specific JNI library that bridges dns_sd.jar to <dns_sd.h>.";
+			dependencies = (
+				4AE4716A0EAFF83800A6C5AD /* PBXTargetDependency */,
+			);
+			name = libjdns_sd.jnilib;
+			productInstallPath = /usr/lib/java;
+			productName = libjdns_sd.jnilib;
+			productReference = D284BEBE0ADD809A0027CCDF /* libjdns_sd.jnilib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		D284BEBF0ADD80A20027CCDF /* dnsextd */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BED60ADD80A20027CCDF /* Build configuration list for PBXNativeTarget "dnsextd" */;
+			buildPhases = (
+				D284BEC20ADD80A20027CCDF /* Headers */,
+				4A4EE3A413CB8E82005C624B /* Build yacc file into derived source files */,
+				D284BEC40ADD80A20027CCDF /* Sources */,
+				D284BECE0ADD80A20027CCDF /* Frameworks */,
+				D284BED40ADD80A20027CCDF /* CopyFiles */,
+				FFFF8F770C32F0FD00722979 /* CopyFiles */,
+				FF37FAAD0BC581780044A5CF /* ShellScript */,
+			);
+			buildRules = (
+				D284BFB80ADD8E510027CCDF /* PBXBuildRule */,
+				D284BF750ADD850C0027CCDF /* PBXBuildRule */,
+			);
+			dependencies = (
+			);
+			name = dnsextd;
+			productInstallPath = /usr/sbin;
+			productName = mDNSResponder;
+			productReference = D284BED90ADD80A20027CCDF /* dnsextd */;
+			productType = "com.apple.product-type.tool";
+		};
+		D284BEDB0ADD80A70027CCDF /* ddnswriteconfig */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BEE50ADD80A70027CCDF /* Build configuration list for PBXNativeTarget "ddnswriteconfig" */;
+			buildPhases = (
+				D284BEDC0ADD80A70027CCDF /* Headers */,
+				D284BEDD0ADD80A70027CCDF /* Sources */,
+				D284BEDF0ADD80A70027CCDF /* Frameworks */,
+				D284BEE40ADD80A70027CCDF /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ddnswriteconfig;
+			productInstallPath = "/Library/Application Support/Bonjour";
+			productName = ddnswriteconfig;
+			productReference = D284BEE80ADD80A70027CCDF /* ddnswriteconfig */;
+			productType = "com.apple.product-type.tool";
+		};
+		D284BEEA0ADD80B00027CCDF /* PreferencePane */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D284BF080ADD80B00027CCDF /* Build configuration list for PBXNativeTarget "PreferencePane" */;
+			buildPhases = (
+				D284BEED0ADD80B00027CCDF /* Headers */,
+				D284BEEE0ADD80B00027CCDF /* Resources */,
+				D284BEFD0ADD80B00027CCDF /* Sources */,
+				D284BF010ADD80B00027CCDF /* Frameworks */,
+				D284BF070ADD80B00027CCDF /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				FFAE66F9105F0CF100162116 /* PBXTargetDependency */,
+			);
+			name = PreferencePane;
+			productInstallPath = "${SYSTEM_LIBRARY_DIR}/PreferencePanes";
+			productName = PreferencePane;
+			productReference = D284BF0C0ADD80B00027CCDF /* Bonjour.prefPane */;
+			productType = "com.apple.product-type.bundle";
+		};
+		FFA572300AF18F1C0055A0F1 /* libdns_sd_debug_dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FFA572370AF18F1C0055A0F1 /* Build configuration list for PBXNativeTarget "libdns_sd_debug_dynamic" */;
+			buildPhases = (
+				FFA572310AF18F1C0055A0F1 /* Headers */,
+				FFA572320AF18F1C0055A0F1 /* Sources */,
+				FFA572360AF18F1C0055A0F1 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_debug_dynamic;
+			productName = libdns_sd.dylib;
+			productReference = FFA572390AF18F1C0055A0F1 /* libsystem_dnssd_debug.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		FFA5723C0AF18F450055A0F1 /* libdns_sd_profile_dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FFA572430AF18F450055A0F1 /* Build configuration list for PBXNativeTarget "libdns_sd_profile_dynamic" */;
+			buildPhases = (
+				FFA5723D0AF18F450055A0F1 /* Headers */,
+				FFA5723E0AF18F450055A0F1 /* Sources */,
+				FFA572420AF18F450055A0F1 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_profile_dynamic;
+			productName = libdns_sd.dylib;
+			productReference = FFA572450AF18F450055A0F1 /* libsystem_dnssd_profile.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		FFB765830AEED9C700583A2C /* libdns_sd_dynamic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FFB765890AEED9FB00583A2C /* Build configuration list for PBXNativeTarget "libdns_sd_dynamic" */;
+			buildPhases = (
+				FFB765800AEED9C700583A2C /* Headers */,
+				FFB765810AEED9C700583A2C /* Sources */,
+				FFB765820AEED9C700583A2C /* Frameworks */,
+				21DE714D115831CB00DD4BD1 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libdns_sd_dynamic;
+			productName = libdns_sd.dylib;
+			productReference = FFB765840AEED9C700583A2C /* libsystem_dnssd.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+			};
+			buildConfigurationList = D284BE2B0ADD78180027CCDF /* Build configuration list for PBXProject "mDNSResponder" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 08FB7794FE84155DC02AAC07 /* mDNSResponder */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				00AD62BB032D7A0C0CCA2C71 /* Build More */,
+				03067D640C83A3700022BE1F /* Build Some */,
+				FFB7657B0AEED96B00583A2C /* Build All */,
+				D284BE500ADD80740027CCDF /* mDNSResponder */,
+				D284BE750ADD80800027CCDF /* mDNSResponder debug */,
+				2E0405EF0C31955500F13B59 /* mDNSResponderHelper */,
+				D284BEA50ADD80920027CCDF /* dns-sd tool */,
+				4AE471670EAFF81900A6C5AD /* dns_sd.jar */,
+				D284BEB20ADD809A0027CCDF /* libjdns_sd.jnilib */,
+				D284BEBF0ADD80A20027CCDF /* dnsextd */,
+				D284BEDB0ADD80A70027CCDF /* ddnswriteconfig */,
+				D284BEEA0ADD80B00027CCDF /* PreferencePane */,
+				FFB765830AEED9C700583A2C /* libdns_sd_dynamic */,
+				FFA572300AF18F1C0055A0F1 /* libdns_sd_debug_dynamic */,
+				FFA5723C0AF18F450055A0F1 /* libdns_sd_profile_dynamic */,
+				FFA572650AF190F10055A0F1 /* SystemLibrariesDynamic */,
+				213FB21712028A7A002B3A08 /* BonjourEvents */,
+				2141DCF8123FFB5D0086D23E /* SystemLibraries */,
+				2141DD0B123FFC7F0086D23E /* SystemLibrariesStatic */,
+				2141DD1C123FFCDB0086D23E /* libdns_sd_static */,
+				2141DD23123FFD0F0086D23E /* libdns_sd_debug_static */,
+				2141DD29123FFD2C0086D23E /* libdns_sd_profile_static */,
+				84C5B3341665529800C324A8 /* dns_services */,
+				72FB545E166D5FB00090B2D9 /* dnsctl */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		213FB21412028A7A002B3A08 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEEE0ADD80B00027CCDF /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEEF0ADD80B00027CCDF /* remove_idle.tiff in Resources */,
+				D284BEF00ADD80B00027CCDF /* add_pressed.tiff in Resources */,
+				D284BEF10ADD80B00027CCDF /* remove_disabled.tiff in Resources */,
+				D284BEF20ADD80B00027CCDF /* add_idle.tiff in Resources */,
+				D284BEF30ADD80B00027CCDF /* success.tiff in Resources */,
+				D284BEF40ADD80B00027CCDF /* remove_pressed.tiff in Resources */,
+				D284BEF50ADD80B00027CCDF /* failure.tiff in Resources */,
+				D284BEF60ADD80B00027CCDF /* BonjourPref.icns in Resources */,
+				D284BEF70ADD80B00027CCDF /* BonjourPref.tiff in Resources */,
+				D284BEF80ADD80B00027CCDF /* DNSServiceDiscoveryPref.nib in Resources */,
+				D284BEF90ADD80B00027CCDF /* InfoPlist.strings in Resources */,
+				D284BEFB0ADD80B00027CCDF /* inprogress.tiff in Resources */,
+				D284BEFC0ADD80B00027CCDF /* installtool in Resources */,
+				FFAE66F0105F0CD900162116 /* ddnswriteconfig in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		D284BE690ADD80740027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE910ADD80800027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEAA0ADD80920027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEBA0ADD809A0027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEE40ADD80A70027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BF070ADD80B00027CCDF /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		030BBED60CE11EEC00472F0C /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ -e \"${SDKROOT}/usr/include/vproc.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nelse\ntouch \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nfi\n\nif [ -e \"${SDKROOT}/usr/lib/libipsec.dylib\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/ipsec_options.h\"\ntouch \"${CONFIGURATION_TEMP_DIR}/ipsec_options.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libipsec.a\"\nelse\necho \"#define MDNS_NO_IPSEC 1\" > ${CONFIGURATION_TEMP_DIR}/ipsec_options.h\ntouch \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfor i in ${ARCHS}\ndo\nccflags=\"-arch $i $ccflags\"\ndone\ncc ${ccflags} \"${CONFIGURATION_TEMP_DIR}/empty.c\" -c -o \"${CONFIGURATION_TEMP_DIR}/libipsec.a\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfi\n";
+		};
+		1F7B473C12B82BFD00868AEF /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "# check if we're building for the simulator and patch the \"id\" of the library (as reported by otool -D) to\n# be just /usr/lib/system/libsystem_sim_dnssd.dylib etc. Also remove the usr directory as it is not needed\n# for simulator\nif [ \"${RC_ProjectName%_Sim}\" != \"${RC_ProjectName}\" ] ; then\n\tif [ -d ${DSTROOT}${SDKROOT}/usr/lib/system ] ; then\n\t\tfor lib in ${DSTROOT}${SDKROOT}/usr/lib/system/*.dylib ; do\n\t\t\tinstall_name_tool -id \"${lib#${DSTROOT}${SDKROOT}}\" \"${lib}\"\n\t\tdone\n\tfi\n\trm -rf $DSTROOT/usr\nfi\n";
+		};
+		2130256B12400DE600AC839F /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/sh;
+			shellScript = "#if we are building for simulator, change the installation path\nif [ \"${RC_ProjectName%_Sim}\" != \"${RC_ProjectName}\" ] ; then\n\tDSTROOT=${DSTROOT}${SDKROOT}\nfi\nmkdir -p \"$DSTROOT/usr/include\"\nsed 's/\\(^#define _DNS_SD_LIBDISPATCH \\)0$/\\1 1/' \"$SRCROOT/../mDNSShared/dns_sd.h\" > \"$DSTROOT/usr/include/dns_sd.h\"";
+		};
+		21DE714D115831CB00DD4BD1 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/sh;
+			shellScript = "#if we are building for simulator, change the installation path\nif [ \"${RC_ProjectName%_Sim}\" != \"${RC_ProjectName}\" ] ; then\n\tDSTROOT=${DSTROOT}${SDKROOT}\nfi\nmkdir -p \"$DSTROOT/usr/include\"\nsed 's/\\(^#define _DNS_SD_LIBDISPATCH \\)0$/\\1 1/' \"$SRCROOT/../mDNSShared/dns_sd.h\" > \"$DSTROOT/usr/include/dns_sd.h\"";
+		};
+		4A4EE3A413CB8E82005C624B /* Build yacc file into derived source files */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/../mDNSShared/dnsextd_parser.y",
+			);
+			name = "Build yacc file into derived source files";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/dnsextd_parser.c",
+				"$(DERIVED_FILE_DIR)/dnsextd_parser.h",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/bin/bison -o ${SCRIPT_OUTPUT_FILE_0} -d ${SCRIPT_INPUT_FILE_0}";
+		};
+		D284BE510ADD80740027CCDF /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ -e \"${SDKROOT}/usr/local/include/dnsinfo.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/dnsinfo.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nelse\necho \"#define MDNS_NO_DNSINFO 1\" > ${CONFIGURATION_TEMP_DIR}/dnsinfo.h\ntouch \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfor i in ${ARCHS}\ndo\nccflags=\"-arch $i $ccflags\"\ndone\ncc ${ccflags} \"${CONFIGURATION_TEMP_DIR}/empty.c\" -c -o \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfi\n\nif [ -e \"${SDKROOT}/usr/include/sandbox.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/sandbox.h\"\nelse\necho \"#define MDNS_NO_SANDBOX 1\" > \"${CONFIGURATION_TEMP_DIR}/sandbox.h\"\nfi\n\nif [ -e \"${SDKROOT}/usr/include/vproc.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nelse\ntouch \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/Frameworks/IOKit.framework/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/IOKit\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/IOKit/pwr_mgt\"\ntouch \"${CONFIGURATION_TEMP_DIR}/IOKit/pwr_mgt/IOPMLibPrivate.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/PrivateFrameworks/DeviceToDeviceManager.framework/Headers/DeviceToDeviceManager.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager\"\necho \"#define NO_D2D 1\" > \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager/DeviceToDeviceManager.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/PrivateFrameworks/WebFilterDNS.framework/Headers/WebFilterDNS.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS\"\necho \"#define NO_WCF 1\" > \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS/WebFilterDNS.h\"\nfi\n\nif [ -e \"${SDKROOT}/usr/local/include/AWACS.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/AWACS.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libAWACS.a\"\nelse\necho \"#define NO_AWACS 1\" > \"${CONFIGURATION_TEMP_DIR}/AWACS.h\"\ntouch \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\"\nfor i in ${ARCHS}\ndo\nccflags=\"-arch $i $ccflags\"\ndone\ncc ${ccflags} \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\" -c -o \"${CONFIGURATION_TEMP_DIR}/libAWACS.a\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\"\nfi\n";
+		};
+		D284BE6C0ADD80740027CCDF /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/bash;
+			shellScript = "# Install mDNSResponder.bundle containing language localizations\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices\ncp -R ${SRCROOT}/mDNSResponder-bundle ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle\n\n# Remove unwanted CVS directories\nfind ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle -depth -name CVS -exec rm -rf {} \\;\n\n# Expand UTF-8 files to UTF-16 (at one time this appeared to be necessary, but it's not, so we don't do it any more)\n#foreach file (`find ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle -name Localizable.strings`)\n#iconv -f utf-8 -t utf-16 ${file} > ${file}.new\n#mv -f ${file}.new ${file}\n#end\n\n# Remove French localization (not wanted for Apple B&I builds)\nrm -rf ${DSTROOT}${SYSTEM_LIBRARY_DIR}/CoreServices/mDNSResponder.bundle/Resources/French.lproj\n\n# Copy Sandbox profile\nif [ ! -z \"${IPHONEOS_DEPLOYMENT_TARGET}\" ] ; then\n  SANDBOXDST=\"${DSTROOT}/usr/local/share/sandbox/profiles/embedded/builtin\"\nelse\n  SANDBOXDST=\"${DSTROOT}/usr/share/sandbox\"\nfi\n(umask 022; mkdir -p -m 0755 \"$SANDBOXDST\")\ncp \"${SRCROOT}/mDNSResponder.sb\" \"${SANDBOXDST}/mDNSResponder.sb\"\n";
+		};
+		D284BE760ADD80800027CCDF /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ -e \"${SDKROOT}/usr/local/include/dnsinfo.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/dnsinfo.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nelse\necho \"#define MDNS_NO_DNSINFO 1\" > ${CONFIGURATION_TEMP_DIR}/dnsinfo.h\ntouch \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfor i in ${ARCHS}\ndo\nccflags=\"-arch $i $ccflags\"\ndone\ncc ${ccflags} \"${CONFIGURATION_TEMP_DIR}/empty.c\" -c -o \"${CONFIGURATION_TEMP_DIR}/libdnsinfo.a\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/empty.c\"\nfi\n\nif [ -e \"${SDKROOT}/usr/include/sandbox.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/sandbox.h\"\nelse\necho \"#define MDNS_NO_SANDBOX 1\" > \"${CONFIGURATION_TEMP_DIR}/sandbox.h\"\nfi\n\nif [ -e \"${SDKROOT}/usr/include/vproc.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nelse\ntouch \"${CONFIGURATION_TEMP_DIR}/vproc.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/Frameworks/IOKit.framework/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/IOKit\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/IOKit/pwr_mgt\"\ntouch \"${CONFIGURATION_TEMP_DIR}/IOKit/pwr_mgt/IOPMLibPrivate.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/PrivateFrameworks/DeviceToDeviceManager.framework/Headers/DeviceToDeviceManager.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager\"\necho \"#define NO_D2D 1\" > \"${CONFIGURATION_TEMP_DIR}/DeviceToDeviceManager/DeviceToDeviceManager.h\"\nfi\n\nif [ -e \"${SDKROOT}/System/Library/PrivateFrameworks/WebFilterDNS.framework/Headers/WebFilterDNS.h\" ]\nthen\nrm -rf \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS\"\nelse\nmkdir -p \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS\"\necho \"#define NO_WCF 1\" > \"${CONFIGURATION_TEMP_DIR}/WebFilterDNS/WebFilterDNS.h\"\nfi\n\nif [ -e \"${SDKROOT}/usr/local/include/AWACS.h\" ]\nthen\nrm -f \"${CONFIGURATION_TEMP_DIR}/AWACS.h\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/libAWACS.a\"\nelse\necho \"#define NO_AWACS 1\" > \"${CONFIGURATION_TEMP_DIR}/AWACS.h\"\ntouch \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\"\nfor i in ${ARCHS}\ndo\nccflags=\"-arch $i $ccflags\"\ndone\ncc ${ccflags} \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\" -c -o \"${CONFIGURATION_TEMP_DIR}/libAWACS.a\"\nrm -f \"${CONFIGURATION_TEMP_DIR}/AWACSempty.c\"\nfi";
+		};
+		FF045B6A0C7E4AA600448140 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/sh;
+			shellScript = "# Install plists to tell launchd how to start mDNSResponder and mDNSResponderHelper\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons\n\nif [ \"${MACOSX_DEPLOYMENT_TARGET}\" == \"10.4\" ] ; then\ncp ${SRCROOT}/LaunchDaemonInfo-Tiger.plist        ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponder.plist\ncp ${SRCROOT}/LaunchDaemonInfo-Tiger.helper.plist ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponderHelper.plist\nelse\ncp ${SRCROOT}/LaunchDaemonInfo.plist              ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponder.plist\ncp ${SRCROOT}/LaunchDaemonInfo.helper.plist       ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponderHelper.plist\nfi\n\nif [ ! -z \"${IPHONEOS_DEPLOYMENT_TARGET}\" ] ; then\nplutil -convert binary1 ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponder.plist\nplutil -convert binary1 ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.mDNSResponderHelper.plist\nfi\n";
+		};
+		FF37FAAD0BC581780044A5CF /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/tcsh;
+			shellScript = "# Install plist to tell launchd how to start dnsextd\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons\ncp ${SRCROOT}/LaunchDaemonInfo.dnsextd.plist ${DSTROOT}${SYSTEM_LIBRARY_DIR}/LaunchDaemons/com.apple.dnsextd.plist\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		213FB21512028A7A002B3A08 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				213FB23C12028C4A002B3A08 /* BonjourEvents.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD1A123FFCDB0086D23E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				215FFAEE124000F900470DE1 /* dnssd_ipc.c in Sources */,
+				215FFAEF124000F900470DE1 /* dnssd_clientlib.c in Sources */,
+				215FFAF0124000F900470DE1 /* dnssd_clientstub.c in Sources */,
+				215FFAF1124000F900470DE1 /* DNSServiceDiscovery.c in Sources */,
+				215FFAF2124000F900470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				215FFAF3124000F900470DE1 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD21123FFD0F0086D23E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				215FFAF41240011800470DE1 /* dnssd_ipc.c in Sources */,
+				215FFAF51240011800470DE1 /* dnssd_clientlib.c in Sources */,
+				215FFAF61240011800470DE1 /* dnssd_clientstub.c in Sources */,
+				215FFAF71240011800470DE1 /* DNSServiceDiscovery.c in Sources */,
+				215FFAF81240011800470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				215FFAF91240011800470DE1 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2141DD27123FFD2C0086D23E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				215FFAFA1240013400470DE1 /* dnssd_ipc.c in Sources */,
+				215FFAFB1240013400470DE1 /* dnssd_clientlib.c in Sources */,
+				215FFAFC1240013400470DE1 /* dnssd_clientstub.c in Sources */,
+				215FFAFD1240013400470DE1 /* DNSServiceDiscovery.c in Sources */,
+				215FFAFE1240013400470DE1 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				215FFAFF1240013400470DE1 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		2E0405ED0C31955500F13B59 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2E0405F50C3195F700F13B59 /* helper.c in Sources */,
+				2E0405F60C31961100F13B59 /* helpermsg.defs in Sources */,
+				2E96A51D0C39BDAC0087C4D2 /* helper-main.c in Sources */,
+				2E8165E90C5980EE00485EB2 /* pfkey.c in Sources */,
+				4BD2B63A134FE09F002B96D5 /* P2PPacketFilter.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72FB545B166D5FB00090B2D9 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72FB5467166D5FCA0090B2D9 /* dnsctl.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		84C5B3311665529800C324A8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				84C5B33C166553F100C324A8 /* dns_services.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE550ADD80740027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE560ADD80740027CCDF /* DNSServiceDiscoveryReply.defs in Sources */,
+				D284BE570ADD80740027CCDF /* DNSServiceDiscoveryRequest.defs in Sources */,
+				D284BE580ADD80740027CCDF /* mDNS.c in Sources */,
+				D284BE590ADD80740027CCDF /* uDNS.c in Sources */,
+				D284BE5A0ADD80740027CCDF /* DNSCommon.c in Sources */,
+				D284BE5B0ADD80740027CCDF /* DNSDigest.c in Sources */,
+				D284BE5D0ADD80740027CCDF /* mDNSDebug.c in Sources */,
+				D284BE5E0ADD80740027CCDF /* uds_daemon.c in Sources */,
+				D284BE5F0ADD80740027CCDF /* dnssd_ipc.c in Sources */,
+				D284BE600ADD80740027CCDF /* PlatformCommon.c in Sources */,
+				D284BE610ADD80740027CCDF /* mDNSMacOSX.c in Sources */,
+				D284BE620ADD80740027CCDF /* LegacyNATTraversal.c in Sources */,
+				D284BE630ADD80740027CCDF /* daemon.c in Sources */,
+				2E04061F0C3198B700F13B59 /* helpermsg.defs in Sources */,
+				2E96A5320C39C1A50087C4D2 /* helper-stubs.c in Sources */,
+				21A57F4C145B2AE100939099 /* CryptoAlg.c in Sources */,
+				21A57F53145B2B1400939099 /* CryptoSupport.c in Sources */,
+				2124FA331471E9DE0021D7BB /* nsec.c in Sources */,
+				213BDC6D147319F400000896 /* dnssec.c in Sources */,
+				218E8E51156D8C0300720DA0 /* dnsproxy.c in Sources */,
+				21DED43515702C0F0060B6B9 /* DNSProxySupport.c in Sources */,
+				216D9ACE1720C9F5008066E1 /* VPNService.c in Sources */,
+				2127A47715C3C7B900A857FC /* nsec3.c in Sources */,
+				21DD8FBF161E9A250033C8F8 /* anonymous.c in Sources */,
+				21070E5F16486B9000A69507 /* DNSSECSupport.c in Sources */,
+				848DA5C7165477E000D2E8B4 /* xpc_services.c in Sources */,
+				2120ABD516B71614007089B6 /* CUPolicy.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BE7D0ADD80800027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BE7E0ADD80800027CCDF /* DNSServiceDiscoveryReply.defs in Sources */,
+				D284BE7F0ADD80800027CCDF /* DNSServiceDiscoveryRequest.defs in Sources */,
+				D284BE800ADD80800027CCDF /* mDNS.c in Sources */,
+				D284BE810ADD80800027CCDF /* uDNS.c in Sources */,
+				D284BE820ADD80800027CCDF /* DNSCommon.c in Sources */,
+				D284BE830ADD80800027CCDF /* DNSDigest.c in Sources */,
+				D284BE850ADD80800027CCDF /* mDNSDebug.c in Sources */,
+				D284BE860ADD80800027CCDF /* uds_daemon.c in Sources */,
+				D284BE870ADD80800027CCDF /* dnssd_ipc.c in Sources */,
+				D284BE880ADD80800027CCDF /* PlatformCommon.c in Sources */,
+				D284BE890ADD80800027CCDF /* mDNSMacOSX.c in Sources */,
+				D284BE8A0ADD80800027CCDF /* LegacyNATTraversal.c in Sources */,
+				D284BE8B0ADD80800027CCDF /* daemon.c in Sources */,
+				2E0406200C3198B700F13B59 /* helpermsg.defs in Sources */,
+				2E96A5300C39C1A50087C4D2 /* helper-stubs.c in Sources */,
+				21A57F4D145B2AE100939099 /* CryptoAlg.c in Sources */,
+				21A57F54145B2B1400939099 /* CryptoSupport.c in Sources */,
+				2124FA341471E9DE0021D7BB /* nsec.c in Sources */,
+				213BDC6E147319F400000896 /* dnssec.c in Sources */,
+				218E8E52156D8C0300720DA0 /* dnsproxy.c in Sources */,
+				21DED43615702C0F0060B6B9 /* DNSProxySupport.c in Sources */,
+				216D9ACF1720C9F5008066E1 /* VPNService.c in Sources */,
+				2127A47815C3C7B900A857FC /* nsec3.c in Sources */,
+				21DD8FC0161E9A250033C8F8 /* anonymous.c in Sources */,
+				21070E6016486B9000A69507 /* DNSSECSupport.c in Sources */,
+				848DA5C8165477E000D2E8B4 /* xpc_services.c in Sources */,
+				2120ABD616B71614007089B6 /* CUPolicy.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEA70ADD80920027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEA80ADD80920027CCDF /* dns-sd.c in Sources */,
+				FFF589B70E37F66800EF515C /* ClientCommon.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEB60ADD809A0027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEB70ADD809A0027CCDF /* JNISupport.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEC40ADD80A20027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21DCD05C1461B23700702FC8 /* CryptoAlg.c in Sources */,
+				21DCD05D1461B23700702FC8 /* CryptoAlg.h in Sources */,
+				D284BEC50ADD80A20027CCDF /* DNSCommon.c in Sources */,
+				D284BEC60ADD80A20027CCDF /* DNSDigest.c in Sources */,
+				D284BEC70ADD80A20027CCDF /* dnsextd.c in Sources */,
+				D284BEC80ADD80A20027CCDF /* mDNSDebug.c in Sources */,
+				D284BEC90ADD80A20027CCDF /* GenLinkedList.c in Sources */,
+				D284BECA0ADD80A20027CCDF /* mDNSMacOSX.c in Sources */,
+				D284BECC0ADD80A20027CCDF /* dnsextd_parser.y in Sources */,
+				D284BECB0ADD80A20027CCDF /* dnsextd_lexer.l in Sources */,
+				D284BECD0ADD80A20027CCDF /* PlatformCommon.c in Sources */,
+				2EAE955A0C31F4D30021F738 /* helpermsg.defs in Sources */,
+				2E35529E0C3A9E7600CA1CB7 /* helper-stubs.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEDD0ADD80A70027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEDE0ADD80A70027CCDF /* ddnswriteconfig.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D284BEFD0ADD80B00027CCDF /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D284BEFE0ADD80B00027CCDF /* DNSServiceDiscoveryPref.m in Sources */,
+				D284BEFF0ADD80B00027CCDF /* PrivilegedOperations.c in Sources */,
+				D284BF000ADD80B00027CCDF /* ConfigurationAuthority.c in Sources */,
+				FFF589C10E37F67E00EF515C /* ClientCommon.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA572320AF18F1C0055A0F1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FFA572330AF18F1C0055A0F1 /* dnssd_ipc.c in Sources */,
+				FFA572340AF18F1C0055A0F1 /* dnssd_clientlib.c in Sources */,
+				FFA572350AF18F1C0055A0F1 /* dnssd_clientstub.c in Sources */,
+				FFA5724A0AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */,
+				FFC22AA40B00F42C00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				FFC22AA60B00F43100BAB070 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFA5723E0AF18F450055A0F1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FFA5723F0AF18F450055A0F1 /* dnssd_ipc.c in Sources */,
+				FFA572400AF18F450055A0F1 /* dnssd_clientlib.c in Sources */,
+				FFA572410AF18F450055A0F1 /* dnssd_clientstub.c in Sources */,
+				FFA5724B0AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */,
+				FFC22AA30B00F42B00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				FFC22AA70B00F43100BAB070 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFB765810AEED9C700583A2C /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FFFA38660AEEDB2B0065B80A /* dnssd_ipc.c in Sources */,
+				FFFA38630AEEDB090065B80A /* dnssd_clientlib.c in Sources */,
+				FFFA38650AEEDB130065B80A /* dnssd_clientstub.c in Sources */,
+				FFA572490AF18FCC0055A0F1 /* DNSServiceDiscovery.c in Sources */,
+				FFC22AA20B00F42A00BAB070 /* DNSServiceDiscoveryRequest.defs in Sources */,
+				FFC22AA50B00F43000BAB070 /* DNSServiceDiscoveryReply.defs in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		03067D680C83A3830022BE1F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BE500ADD80740027CCDF /* mDNSResponder */;
+			targetProxy = 03067D670C83A3830022BE1F /* PBXContainerItemProxy */;
+		};
+		03067D6A0C83A3890022BE1F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BE750ADD80800027CCDF /* mDNSResponder debug */;
+			targetProxy = 03067D690C83A3890022BE1F /* PBXContainerItemProxy */;
+		};
+		03067D6C0C83A3920022BE1F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BEA50ADD80920027CCDF /* dns-sd tool */;
+			targetProxy = 03067D6B0C83A3920022BE1F /* PBXContainerItemProxy */;
+		};
+		03067D6E0C83A39C0022BE1F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2E0405EF0C31955500F13B59 /* mDNSResponderHelper */;
+			targetProxy = 03067D6D0C83A39C0022BE1F /* PBXContainerItemProxy */;
+		};
+		03067D860C849CC30022BE1F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 03067D640C83A3700022BE1F /* Build Some */;
+			targetProxy = 03067D850C849CC30022BE1F /* PBXContainerItemProxy */;
+		};
+		2130257112400E9300AC839F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FFA572650AF190F10055A0F1 /* SystemLibrariesDynamic */;
+			targetProxy = 2130257012400E9300AC839F /* PBXContainerItemProxy */;
+		};
+		2141DCFD123FFB7D0086D23E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2141DCF8123FFB5D0086D23E /* SystemLibraries */;
+			targetProxy = 2141DCFC123FFB7D0086D23E /* PBXContainerItemProxy */;
+		};
+		2141DD0E123FFC960086D23E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2141DD0B123FFC7F0086D23E /* SystemLibrariesStatic */;
+			targetProxy = 2141DD0D123FFC960086D23E /* PBXContainerItemProxy */;
+		};
+		215FFB19124002C100470DE1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2141DD1C123FFCDB0086D23E /* libdns_sd_static */;
+			targetProxy = 215FFB18124002C100470DE1 /* PBXContainerItemProxy */;
+		};
+		215FFB1B124002C700470DE1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2141DD23123FFD0F0086D23E /* libdns_sd_debug_static */;
+			targetProxy = 215FFB1A124002C700470DE1 /* PBXContainerItemProxy */;
+		};
+		215FFB1D124002CC00470DE1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 2141DD29123FFD2C0086D23E /* libdns_sd_profile_static */;
+			targetProxy = 215FFB1C124002CC00470DE1 /* PBXContainerItemProxy */;
+		};
+		217A4C49138EE14C000A5BA8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 213FB21712028A7A002B3A08 /* BonjourEvents */;
+			targetProxy = 217A4C48138EE14C000A5BA8 /* PBXContainerItemProxy */;
+		};
+		4AE4716A0EAFF83800A6C5AD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4AE471670EAFF81900A6C5AD /* dns_sd.jar */;
+			targetProxy = 4AE471690EAFF83800A6C5AD /* PBXContainerItemProxy */;
+		};
+		72FB546A166D5FE40090B2D9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 72FB545E166D5FB00090B2D9 /* dnsctl */;
+			targetProxy = 72FB5469166D5FE40090B2D9 /* PBXContainerItemProxy */;
+		};
+		84C5B3411665544B00C324A8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 84C5B3341665529800C324A8 /* dns_services */;
+			targetProxy = 84C5B3401665544B00C324A8 /* PBXContainerItemProxy */;
+		};
+		D284BF2C0ADD815A0027CCDF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BEBF0ADD80A20027CCDF /* dnsextd */;
+			targetProxy = D284BF2B0ADD815A0027CCDF /* PBXContainerItemProxy */;
+		};
+		D284BF2E0ADD81600027CCDF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BEDB0ADD80A70027CCDF /* ddnswriteconfig */;
+			targetProxy = D284BF2D0ADD81600027CCDF /* PBXContainerItemProxy */;
+		};
+		D284BF300ADD81630027CCDF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BEEA0ADD80B00027CCDF /* PreferencePane */;
+			targetProxy = D284BF2F0ADD81630027CCDF /* PBXContainerItemProxy */;
+		};
+		FFA572690AF190FF0055A0F1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FFB765830AEED9C700583A2C /* libdns_sd_dynamic */;
+			targetProxy = FFA572680AF190FF0055A0F1 /* PBXContainerItemProxy */;
+		};
+		FFA5726B0AF191010055A0F1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FFA572300AF18F1C0055A0F1 /* libdns_sd_debug_dynamic */;
+			targetProxy = FFA5726A0AF191010055A0F1 /* PBXContainerItemProxy */;
+		};
+		FFA5726D0AF191020055A0F1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FFA5723C0AF18F450055A0F1 /* libdns_sd_profile_dynamic */;
+			targetProxy = FFA5726C0AF191020055A0F1 /* PBXContainerItemProxy */;
+		};
+		FFAE66F9105F0CF100162116 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D284BEDB0ADD80A70027CCDF /* ddnswriteconfig */;
+			targetProxy = FFAE66F8105F0CF100162116 /* PBXContainerItemProxy */;
+		};
+		FFB7657D0AEED97F00583A2C /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 00AD62BB032D7A0C0CCA2C71 /* Build More */;
+			targetProxy = FFB7657C0AEED97F00583A2C /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		FF260A4807B4475600CE10E5 /* DNSServiceDiscoveryPref.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				FF260A4907B4475600CE10E5 /* English */,
+			);
+			name = DNSServiceDiscoveryPref.nib;
+			path = PreferencePane;
+			sourceTree = SOURCE_ROOT;
+		};
+		FF260A4B07B4477F00CE10E5 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				FF260A4C07B4477F00CE10E5 /* English */,
+			);
+			name = InfoPlist.strings;
+			path = PreferencePane;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		03067D740C83A3CB0022BE1F /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = s;
+				PRODUCT_NAME = "Build Some";
+			};
+			name = Development;
+		};
+		213FB21A12028A7B002B3A08 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUNDLE_LOADER = /usr/libexec/UserEventAgent;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				INFOPLIST_FILE = "BonjourEvents-Info.plist";
+				INSTALL_PATH = /System/Library/UserEventPlugins/;
+				PREBINDING = NO;
+				PRODUCT_NAME = BonjourEvents;
+				PROVISIONING_PROFILE = "";
+				WRAPPER_EXTENSION = plugin;
+			};
+			name = Development;
+		};
+		2141DCF9123FFB5D0086D23E /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = SystemLibraries;
+			};
+			name = Development;
+		};
+		2141DD0C123FFC7F0086D23E /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
+				PRODUCT_NAME = SystemLibrariesStatic;
+			};
+			name = Development;
+		};
+		2141DD1E123FFCDB0086D23E /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALLHDRS_COPY_PHASE = YES;
+				INSTALLHDRS_SCRIPT_PHASE = YES;
+				INSTALL_PATH = /usr/local/lib/system;
+				PREBINDING = NO;
+				PRODUCT_NAME = dns_sd;
+			};
+			name = Development;
+		};
+		2141DD25123FFD100086D23E /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALL_PATH = /usr/local/lib/system;
+				PREBINDING = NO;
+				PRODUCT_NAME = dns_sd_debug;
+			};
+			name = Development;
+		};
+		2141DD2B123FFD2C0086D23E /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALL_PATH = /usr/local/lib/system;
+				PREBINDING = NO;
+				PRODUCT_NAME = dns_sd_profile;
+			};
+			name = Development;
+		};
+		2E0405F20C31955500F13B59 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "helper-entitlements.plist";
+				CODE_SIGN_IDENTITY = "-";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_WARN_CHECK_SWITCH_STATEMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"${CONFIGURATION_TEMP_DIR}",
+					"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
+				);
+				INSTALL_PATH = /usr/sbin;
+				LD_MAP_FILE_PATH = "$(TARGET_TEMP_DIR)/$(PRODUCT_NAME)-LinkMap-$(CURRENT_VARIANT)-$(CURRENT_ARCH).txt";
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				"OTHER_CFLAGS[sdk=iphoneos*][arch=*]" = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-lipsec",
+				);
+				"OTHER_LDFLAGS[sdk=iphoneos*] [arch=*]" = "-lipsec -Wl,-pie";
+				"OTHER_LDFLAGS[sdk=macosx*][arch=*]" = (
+					"-lipsec",
+					"-Wl,-pie",
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = mDNSResponderHelper;
+				PROVISIONING_PROFILE = "";
+			};
+			name = Development;
+		};
+		4AE471680EAFF81900A6C5AD /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = dns_sd.jar;
+			};
+			name = Development;
+		};
+		72FB5466166D5FB00090B2D9 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_ENTITLEMENTS[sdk=*]" = "dnsctl-entitlements.plist";
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_STRICT_ALIASING = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = /usr/bin;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				SDKROOT = macosx;
+			};
+			name = Development;
+		};
+		84C5B3371665529800C324A8 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = /usr/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Development;
+		};
+		D284BE290ADD78180027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Build All";
+				SECTORDER_FLAGS = "";
+			};
+			name = Development;
+		};
+		D284BE2C0ADD78180027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+				DEAD_CODE_STRIPPING = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"__APPLE_USE_RFC_3542=1",
+					"_DNS_SD_LIBDISPATCH=1",
+					"APPLE_OSX_mDNSResponder=1",
+					"__MigTypeCheck=1",
+					"mDNSResponderVersion=${MVERS}",
+					_LEGACY_NAT_TRAVERSAL_,
+					"_BUILDING_XCODE_PROJECT_=1",
+				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+				MVERS = "\"(Engineering Build)\"";
+				OTHER_CFLAGS = (
+					"-DUSE_SYSTEMCONFIGURATION_PRIVATE_HEADERS",
+					"-fwrapv",
+				);
+				"OTHER_LDFLAGS[sdk=macosx*]" = "";
+				PREBINDING = NO;
+				STRIP_STYLE = debugging;
+				WARNING_CFLAGS = (
+					"-W",
+					"-Wall",
+					"-Wmissing-prototypes",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+					"-Wshadow",
+				);
+				YACC_GENERATED_FILE_STEM = Standard;
+			};
+			name = Development;
+		};
+		D284BE6E0ADD80740027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				"CODE_SIGN_ENTITLEMENTS[sdk=*]" = "mDNSResponder-entitlements.plist";
+				CODE_SIGN_IDENTITY = "-";
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+				);
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/PrivateHeaders",
+					../mDNSShared,
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/System.framework/PrivateHeaders",
+					"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers",
+					"${CONFIGURATION_TEMP_DIR}",
+					"$(SDKROOT)/usr/include/libxml2",
+				);
+				INSTALL_PATH = /usr/sbin;
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				ORDER_FILE = "${SRCROOT}/mDNSResponder.order";
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-no-cpp-precomp",
+				);
+				"OTHER_CFLAGS[sdk=iphoneos*][arch=*]" = "$(inherited)";
+				OTHER_LDFLAGS = "";
+				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+					"-Wl,-pie",
+					"-weak_framework",
+					DeviceToDeviceManager,
+					"-lMobileGestalt",
+					"-lcupolicy",
+				);
+				"OTHER_LDFLAGS[sdk=macosx*][arch=*]" = (
+					"-Wl,-pie",
+					"-lAWACS",
+					"-weak_framework",
+					WebFilterDNS,
+					"-weak_framework",
+					DeviceToDeviceManager,
+				);
+				"OTHER_LDFLAGS[sdk=macosx10.6][arch=*]" = "-lAWACS";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = mDNSResponder;
+				PROVISIONING_PROFILE = "";
+				REZ_EXECUTABLE = YES;
+			};
+			name = Development;
+		};
+		D284BE930ADD80800027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+				);
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"MDNS_DEBUGMSGS=1",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/PrivateHeaders",
+					../mDNSShared,
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/System.framework/PrivateHeaders",
+					"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers",
+					"${CONFIGURATION_TEMP_DIR}",
+					"$(SDKROOT)/usr/include/libxml2",
+				);
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-no-cpp-precomp",
+				);
+				OTHER_LDFLAGS = "";
+				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+					"-Wl,-pie",
+					"-weak_framework",
+					DeviceToDeviceManager,
+					"-lMobileGestalt",
+					"-lcupolicy",
+				);
+				"OTHER_LDFLAGS[sdk=macosx*][arch=*]" = (
+					"-Wl,-pie",
+					"-lAWACS",
+					"-weak_framework",
+					WebFilterDNS,
+					"-weak_framework",
+					DeviceToDeviceManager,
+				);
+				"OTHER_LDFLAGS[sdk=macosx10.6][arch=*]" = "-lAWACS";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = mDNSResponder.debug;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = (
+					"-sectorder",
+					__TEXT,
+					__text,
+					mDNSResponder.order,
+				);
+				SKIP_INSTALL = YES;
+			};
+			name = Development;
+		};
+		D284BEAE0ADD80920027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				HEADER_SEARCH_PATHS = (
+					../mDNSShared,
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/System.framework/PrivateHeaders",
+				);
+				INSTALL_PATH = /usr/bin;
+				OTHER_CFLAGS = "-no-cpp-precomp";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "dns-sd";
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+			};
+			name = Development;
+		};
+		D284BEBC0ADD809A0027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_EXTENSION = jnilib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../mDNSShared,
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/JavaVM.framework/Versions/A/Headers",
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/JavaVM.framework/Versions/1.3.1/Headers",
+					"${PROJECT_DERIVED_FILE_DIR}",
+				);
+				INSTALL_PATH = /usr/lib/java;
+				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
+				OTHER_CFLAGS = "";
+				OTHER_LIBTOOL_FLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = libjdns_sd;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+			};
+			name = Development;
+		};
+		D284BED70ADD80A20027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				HEADER_SEARCH_PATHS = (
+					"${SYSTEM_LIBRARY_DIR}/Frameworks/System.framework/PrivateHeaders",
+					"${APPLE_INTERNAL_DEVELOPER_DIR}/Headers",
+					"${CONFIGURATION_TEMP_DIR}",
+					/System/Library/Frameworks/System.Framework/PrivateHeaders,
+				);
+				INSTALL_PATH = /usr/sbin;
+				LIBRARY_SEARCH_PATHS = "\"${CONFIGURATION_TEMP_DIR}\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = (
+					"-no-cpp-precomp",
+					"-UAPPLE_OSX_mDNSResponder",
+				);
+				OTHER_LDFLAGS = "";
+				"OTHER_LDFLAGS[sdk=macosx*][arch=*]" = "-Wl,-pie";
+				PRODUCT_NAME = dnsextd;
+				SECTORDER_FLAGS = "";
+			};
+			name = Development;
+		};
+		D284BEE60ADD80A70027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				INSTALL_PATH = "/Library/Application Support/Bonjour";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				"OTHER_LDFLAGS[sdk=macosx*]" = "-Wl,-pie";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = ddnswriteconfig;
+				REZ_EXECUTABLE = YES;
+				SECTORDER_FLAGS = "";
+			};
+			name = Development;
+		};
+		D284BF090ADD80B00027CCDF /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				EXPORTED_SYMBOLS_FILE = "";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_GC = supported;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "PreferencePane/Info-PreferencePane.plist";
+				INSTALL_PATH = /AppleInternal/Library/PreferencePanes;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "-twolevel_namespace";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = Bonjour;
+				SECTORDER_FLAGS = "";
+				WRAPPER_EXTENSION = prefPane;
+			};
+			name = Development;
+		};
+		FFA572380AF18F1C0055A0F1 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				DYLIB_CURRENT_VERSION = "$(RC_ProjectSourceVersion)";
+				EXECUTABLE_EXTENSION = dylib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALL_PATH = /usr/lib/system;
+				"INSTALL_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/lib/system";
+				LINK_WITH_STANDARD_LIBRARIES = NO;
+				OTHER_LDFLAGS = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld",
+					"-lcompiler_rt",
+					"-lsystem_kernel",
+					"-lsystem_platform",
+					"-lsystem_pthread",
+					"-lsystem_malloc",
+					"-lsystem_c",
+					"-lsystem_blocks",
+					"-ldispatch",
+					"-llaunch",
+					"-lsystem_asl",
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld_sim",
+					"-lcompiler_rt_sim",
+					"-lsystem_sim_c",
+					"-lsystem_sim_blocks",
+					"-ldispatch",
+					"-Wl,-upward-lSystem",
+				);
+				PRODUCT_NAME = libsystem_dnssd_debug;
+				"PRODUCT_NAME[sdk=iphonesimulator*]" = libsystem_sim_dnssd_debug;
+			};
+			name = Development;
+		};
+		FFA572440AF18F450055A0F1 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				DYLIB_CURRENT_VERSION = "$(RC_ProjectSourceVersion)";
+				EXECUTABLE_EXTENSION = dylib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				GENERATE_PROFILING_CODE = YES;
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALL_PATH = /usr/lib/system;
+				"INSTALL_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/lib/system";
+				LINK_WITH_STANDARD_LIBRARIES = NO;
+				OTHER_LDFLAGS = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld",
+					"-lcompiler_rt",
+					"-lsystem_kernel",
+					"-lsystem_platform",
+					"-lsystem_pthread",
+					"-lsystem_malloc",
+					"-lsystem_c",
+					"-lsystem_blocks",
+					"-ldispatch",
+					"-llaunch",
+					"-lsystem_asl",
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld_sim",
+					"-lcompiler_rt_sim",
+					"-lsystem_sim_c",
+					"-lsystem_sim_blocks",
+					"-ldispatch",
+					"-Wl,-upward-lSystem",
+				);
+				PRODUCT_NAME = libsystem_dnssd_profile;
+				"PRODUCT_NAME[sdk=iphonesimulator*]" = libsystem_sim_dnssd_profile;
+			};
+			name = Development;
+		};
+		FFA5726F0AF191200055A0F1 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				PRODUCT_NAME = SystemLibrariesDynamic;
+			};
+			name = Development;
+		};
+		FFB7657F0AEED99D00583A2C /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				PRODUCT_NAME = "Build All";
+			};
+			name = Development;
+		};
+		FFB7658A0AEED9FB00583A2C /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CONFIGURATION_BUILD_DIR = "${BUILD_DIR}";
+				CONFIGURATION_TEMP_DIR = "${BUILD_DIR}/mDNSResponder.build";
+				COPY_PHASE_STRIP = NO;
+				DYLIB_CURRENT_VERSION = "$(RC_ProjectSourceVersion)";
+				EXECUTABLE_EXTENSION = dylib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"__DARWIN_NON_CANCELABLE=1",
+				);
+				HEADER_SEARCH_PATHS = "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/";
+				INSTALLHDRS_COPY_PHASE = YES;
+				INSTALLHDRS_SCRIPT_PHASE = YES;
+				INSTALL_PATH = /usr/lib/system;
+				"INSTALL_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/lib/system";
+				LINK_WITH_STANDARD_LIBRARIES = NO;
+				OTHER_LDFLAGS = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld",
+					"-lcompiler_rt",
+					"-lsystem_kernel",
+					"-lsystem_platform",
+					"-lsystem_pthread",
+					"-lsystem_malloc",
+					"-lsystem_c",
+					"-lsystem_blocks",
+					"-ldispatch",
+					"-llaunch",
+					"-lsystem_asl",
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-Wl,-umbrella,System",
+					"-L/usr/lib/system",
+					"-ldyld_sim",
+					"-lcompiler_rt_sim",
+					"-lsystem_sim_c",
+					"-lsystem_sim_blocks",
+					"-ldispatch",
+					"-Wl,-upward-lSystem",
+				);
+				PRODUCT_NAME = libsystem_dnssd;
+				"PRODUCT_NAME[sdk=iphonesimulator*]" = libsystem_sim_dnssd;
+			};
+			name = Development;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		03067D730C83A3CB0022BE1F /* Build configuration list for PBXAggregateTarget "Build Some" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				03067D740C83A3CB0022BE1F /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		213FB21B12028A7C002B3A08 /* Build configuration list for PBXNativeTarget "BonjourEvents" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				213FB21A12028A7B002B3A08 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2141DD08123FFB830086D23E /* Build configuration list for PBXAggregateTarget "SystemLibraries" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2141DCF9123FFB5D0086D23E /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2141DD18123FFC990086D23E /* Build configuration list for PBXAggregateTarget "SystemLibrariesStatic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2141DD0C123FFC7F0086D23E /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2141DD1F123FFCF90086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2141DD1E123FFCDB0086D23E /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2141DD35123FFD3B0086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_debug_static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2141DD25123FFD100086D23E /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2141DD36123FFD3B0086D23E /* Build configuration list for PBXNativeTarget "libdns_sd_profile_static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2141DD2B123FFD2C0086D23E /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		2E0405F30C31956600F13B59 /* Build configuration list for PBXNativeTarget "mDNSResponderHelper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2E0405F20C31955500F13B59 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		4AE471770EAFF84000A6C5AD /* Build configuration list for PBXLegacyTarget "dns_sd.jar" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4AE471680EAFF81900A6C5AD /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		72FB5465166D5FB00090B2D9 /* Build configuration list for PBXNativeTarget "dnsctl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				72FB5466166D5FB00090B2D9 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		84C5B3361665529800C324A8 /* Build configuration list for PBXNativeTarget "dns_services" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				84C5B3371665529800C324A8 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BE280ADD78180027CCDF /* Build configuration list for PBXAggregateTarget "Build More" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BE290ADD78180027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BE2B0ADD78180027CCDF /* Build configuration list for PBXProject "mDNSResponder" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BE2C0ADD78180027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BE6D0ADD80740027CCDF /* Build configuration list for PBXNativeTarget "mDNSResponder" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BE6E0ADD80740027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BE920ADD80800027CCDF /* Build configuration list for PBXNativeTarget "mDNSResponder debug" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BE930ADD80800027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BEAD0ADD80920027CCDF /* Build configuration list for PBXNativeTarget "dns-sd tool" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BEAE0ADD80920027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BEBB0ADD809A0027CCDF /* Build configuration list for PBXNativeTarget "libjdns_sd.jnilib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BEBC0ADD809A0027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BED60ADD80A20027CCDF /* Build configuration list for PBXNativeTarget "dnsextd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BED70ADD80A20027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BEE50ADD80A70027CCDF /* Build configuration list for PBXNativeTarget "ddnswriteconfig" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BEE60ADD80A70027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		D284BF080ADD80B00027CCDF /* Build configuration list for PBXNativeTarget "PreferencePane" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D284BF090ADD80B00027CCDF /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		FFA572370AF18F1C0055A0F1 /* Build configuration list for PBXNativeTarget "libdns_sd_debug_dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFA572380AF18F1C0055A0F1 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		FFA572430AF18F450055A0F1 /* Build configuration list for PBXNativeTarget "libdns_sd_profile_dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFA572440AF18F450055A0F1 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		FFA5726E0AF191200055A0F1 /* Build configuration list for PBXAggregateTarget "SystemLibrariesDynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFA5726F0AF191200055A0F1 /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		FFB7657E0AEED99D00583A2C /* Build configuration list for PBXAggregateTarget "Build All" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFB7657F0AEED99D00583A2C /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		FFB765890AEED9FB00583A2C /* Build configuration list for PBXNativeTarget "libdns_sd_dynamic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFB7658A0AEED9FB00583A2C /* Development */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.8 b/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.8
new file mode 100644
index 00000000..6e959dbd
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.8
@@ -0,0 +1,54 @@
+.\" -*- tab-width: 4 -*-
+.\" 
+.\" Copyright (c) 2007 Apple Computer, Inc. All Rights Reserved.
+.\" 
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\" 
+.\"     http://www.apache.org/licenses/LICENSE-2.0
+.\" 
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.Dd August 2007             \" Date
+.Dt mDNSResponderHelper 8   \" Document Title
+.Os Darwin                  \" Operating System
+.\"
+.Sh NAME
+.Nm mDNSResponderHelper
+.Nd mDNS privilege separation helper  \" Name Description for whatis database
+.\" 
+.Sh SYNOPSIS
+.Nm
+.\"
+.Sh DESCRIPTION
+.Nm
+is an executable invoked by
+.Nm launchd
+to provide privilege separation
+to the
+.Nm mDNSResponder
+daemon.
+.Pp
+.Nm
+has no user-specifiable command-line arguments, and users should not run
+.Nm
+manually.
+.Sh FILES
+.Pa /usr/sbin/mDNSResponderHelper \" Pathname
+.\"
+.Sh SEE ALSO
+.Xr mDNSResponder 8
+.\"
+.Sh BUGS
+.Nm
+bugs are tracked in Apple Radar component "mDNSResponder".
+.\"
+.Sh HISTORY
+The
+.Nm
+first appeared in Mac OS X 10.5 (Leopard).
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.plist b/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.plist
new file mode 100644
index 00000000..22286d2e
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponderHelper.plist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!-- To run mDNSResponderHelper on Tiger, place this file into /etc/mach_init.d -->
+<plist version="1.0">
+<dict>
+        <key>ServiceName</key>
+        <string>com.apple.mDNSResponderHelper</string>
+        <key>Command</key>
+        <string>/usr/sbin/mDNSResponderHelper</string>
+	<key>OnDemand</key>
+	<true/>
+</dict>
+</plist>
diff --git a/mDNSResponder/mDNSMacOSX/mDNSResponderLogging.mobileconfig b/mDNSResponder/mDNSMacOSX/mDNSResponderLogging.mobileconfig
new file mode 100644
index 00000000..34ec0d9a
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/mDNSResponderLogging.mobileconfig
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>PayloadIdentifier</key>
+    <string>com.apple.mDNSResponder</string>
+    <key>PayloadUUID</key>
+    <string>6D0962E1-558A-44FB-8FE0-1F4F0BD157F4</string>
+    <key>PayloadDescription</key>
+    <string>Turns on mDNSResponder Debug Logging</string>
+    <key>PayloadDisplayName</key>
+    <string>mDNSResponder Debug Logging</string>
+    <key>PayloadOrganization</key>
+    <string>Apple, Inc</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadVersion</key>
+    <integer>2</integer>
+
+    <key>ConsentText</key>
+    <dict>
+      <key>en</key>
+      <string>English consent text</string>
+      <key>jp</key>
+      <string>Japanese consent text</string>
+      <key>default</key>
+      <string>Default consent text - used if none of the other languages match</string>
+    </dict>
+
+    <key>PayloadContent</key>
+    <array>
+        <dict>
+            <key>PayloadUUID</key>
+            <string>6D0962E1-558A-44FB-8FE0-1F4F0BD157F4</string>
+            <key>PayloadIdentifier</key>
+            <string>com.apple.defaults.1</string>
+            <key>PayloadType</key>
+            <string>com.apple.defaults.managed</string>
+            <key>PayloadVersion</key>
+            <integer>1</integer>
+            <key>PayloadContent</key>
+            <array>
+                <dict>
+                    <key>DefaultsDomainName</key>
+                    <string>com.apple.mDNSResponder</string>
+                    <key>DefaultsData</key>
+                    <dict>
+                        <key>EnableLogging</key>
+                        <true/>
+                    </dict>
+                </dict>
+            </array>
+        </dict>
+    </array>
+</dict>
+</plist>
+
diff --git a/mDNSResponder/mDNSMacOSX/pfkey.c b/mDNSResponder/mDNSMacOSX/pfkey.c
new file mode 100644
index 00000000..839c8d71
--- /dev/null
+++ b/mDNSResponder/mDNSMacOSX/pfkey.c
@@ -0,0 +1,2138 @@
+/*
+ * Copyright (c) 2003-2007 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*	$FreeBSD: src/lib/libipsec/pfkey.c,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $	*/
+/*	$KAME: pfkey.c,v 1.39 2001/03/05 18:22:17 thorpej Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <net/pfkeyv2.h>
+#include <netinet/in.h>
+#include <netinet6/ipsec.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <TargetConditionals.h>
+
+#include "ipsec_strerror.h"
+#include "libpfkey.h"
+#include "ipsec_options.h"
+
+#if TARGET_OS_EMBEDDED
+#ifndef MDNS_NO_IPSEC
+#define MDNS_NO_IPSEC 1
+#endif
+#endif
+
+#ifndef MDNS_NO_IPSEC
+
+#define CALLOC(size, cast) (cast)calloc(1, (size))
+
+static int findsupportedmap __P((int));
+static int setsupportedmap __P((struct sadb_supported *));
+static struct sadb_alg *findsupportedalg __P((u_int, u_int));
+static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *,
+                              struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
+                              u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
+                              u_int32_t, u_int32_t, u_int32_t));
+static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
+                              struct sockaddr *, struct sockaddr *, u_int32_t));
+static int pfkey_send_x3 __P((int, u_int, u_int));
+static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int,
+                              struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
+                              char *, int, u_int32_t));
+static int pfkey_send_x5 __P((int, u_int, u_int32_t));
+
+static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int,
+                                     u_int, u_int32_t, pid_t));
+static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int,
+                                    u_int, u_int, u_int32_t));
+static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int,
+                                      struct sockaddr *, u_int, u_int));
+static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int));
+static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
+                                          u_int32_t, u_int32_t, u_int32_t));
+static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
+
+/*
+ * make and search supported algorithm structure.
+ */
+static struct sadb_supported *ipsec_supported[] = { NULL, NULL, NULL, };
+
+static int supported_map[] = {
+    SADB_SATYPE_AH,
+    SADB_SATYPE_ESP,
+    SADB_X_SATYPE_IPCOMP,
+};
+
+static int
+findsupportedmap(satype)
+int satype;
+{
+    int i;
+
+    for (i = 0; (unsigned int)i < sizeof(supported_map)/sizeof(supported_map[0]); i++)
+        if (supported_map[i] == satype)
+            return i;
+    return -1;
+}
+
+static struct sadb_alg *
+findsupportedalg(satype, alg_id)
+u_int satype, alg_id;
+{
+    int algno;
+    int tlen;
+    caddr_t p;
+
+    /* validity check */
+    algno = findsupportedmap(satype);
+    if (algno == -1) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return NULL;
+    }
+    if (ipsec_supported[algno] == NULL) {
+        __ipsec_errcode = EIPSEC_DO_GET_SUPP_LIST;
+        return NULL;
+    }
+
+    tlen = ipsec_supported[algno]->sadb_supported_len
+           - sizeof(struct sadb_supported);
+    p = (caddr_t)(ipsec_supported[algno] + 1);
+    while (tlen > 0) {
+        if ((unsigned int)tlen < sizeof(struct sadb_alg)) {
+            /* invalid format */
+            break;
+        }
+        if (((struct sadb_alg *)p)->sadb_alg_id == alg_id)
+            return (struct sadb_alg *)p;
+
+        tlen -= sizeof(struct sadb_alg);
+        p += sizeof(struct sadb_alg);
+    }
+
+    __ipsec_errcode = EIPSEC_NOT_SUPPORTED;
+    return NULL;
+}
+
+static int
+setsupportedmap(sup)
+struct sadb_supported *sup;
+{
+    struct sadb_supported **ipsup;
+
+    switch (sup->sadb_supported_exttype) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_AH)];
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_ESP)];
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    if (*ipsup)
+        free(*ipsup);
+
+    *ipsup = malloc(sup->sadb_supported_len);
+    if (!*ipsup) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    memcpy(*ipsup, sup, sup->sadb_supported_len);
+
+    return 0;
+}
+
+/*
+ * check key length against algorithm specified.
+ * This function is called with SADB_EXT_SUPPORTED_{AUTH,ENCRYPT} as the
+ * augument, and only calls to ipsec_check_keylen2();
+ * keylen is the unit of bit.
+ * OUT:
+ *	-1: invalid.
+ *	 0: valid.
+ */
+int
+ipsec_check_keylen(supported, alg_id, keylen)
+u_int supported;
+u_int alg_id;
+u_int keylen;
+{
+    int satype;
+
+    /* validity check */
+    switch (supported) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        satype = SADB_SATYPE_AH;
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        satype = SADB_SATYPE_ESP;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    return ipsec_check_keylen2(satype, alg_id, keylen);
+}
+
+/*
+ * check key length against algorithm specified.
+ * satype is one of satype defined at pfkeyv2.h.
+ * keylen is the unit of bit.
+ * OUT:
+ *	-1: invalid.
+ *	 0: valid.
+ */
+int
+ipsec_check_keylen2(satype, alg_id, keylen)
+u_int satype;
+u_int alg_id;
+u_int keylen;
+{
+    struct sadb_alg *alg;
+
+    alg = findsupportedalg(satype, alg_id);
+    if (!alg)
+        return -1;
+
+    if (keylen < alg->sadb_alg_minbits || keylen > alg->sadb_alg_maxbits) {
+        __ipsec_errcode = EIPSEC_INVAL_KEYLEN;
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
+}
+
+/*
+ * get max/min key length against algorithm specified.
+ * satype is one of satype defined at pfkeyv2.h.
+ * keylen is the unit of bit.
+ * OUT:
+ *	-1: invalid.
+ *	 0: valid.
+ */
+int
+ipsec_get_keylen(supported, alg_id, alg0)
+u_int supported, alg_id;
+struct sadb_alg *alg0;
+{
+    struct sadb_alg *alg;
+    u_int satype;
+
+    /* validity check */
+    if (!alg0) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    switch (supported) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        satype = SADB_SATYPE_AH;
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        satype = SADB_SATYPE_ESP;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    alg = findsupportedalg(satype, alg_id);
+    if (!alg)
+        return -1;
+
+    memcpy(alg0, alg, sizeof(*alg0));
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
+}
+
+/*
+ * set the rate for SOFT lifetime against HARD one.
+ * If rate is more than 100 or equal to zero, then set to 100.
+ */
+static u_int soft_lifetime_allocations_rate = PFKEY_SOFT_LIFETIME_RATE;
+static u_int soft_lifetime_bytes_rate = PFKEY_SOFT_LIFETIME_RATE;
+static u_int soft_lifetime_addtime_rate = PFKEY_SOFT_LIFETIME_RATE;
+static u_int soft_lifetime_usetime_rate = PFKEY_SOFT_LIFETIME_RATE;
+
+u_int
+pfkey_set_softrate(type, rate)
+u_int type, rate;
+{
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+
+    if (rate > 100 || rate == 0)
+        rate = 100;
+
+    switch (type) {
+    case SADB_X_LIFETIME_ALLOCATIONS:
+        soft_lifetime_allocations_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_BYTES:
+        soft_lifetime_bytes_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_ADDTIME:
+        soft_lifetime_addtime_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_USETIME:
+        soft_lifetime_usetime_rate = rate;
+        return 0;
+    }
+
+    __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+    return 1;
+}
+
+/*
+ * get current rate for SOFT lifetime against HARD one.
+ * ATTENTION: ~0 is returned if invalid type was passed.
+ */
+u_int
+pfkey_get_softrate(type)
+u_int type;
+{
+    switch (type) {
+    case SADB_X_LIFETIME_ALLOCATIONS:
+        return soft_lifetime_allocations_rate;
+    case SADB_X_LIFETIME_BYTES:
+        return soft_lifetime_bytes_rate;
+    case SADB_X_LIFETIME_ADDTIME:
+        return soft_lifetime_addtime_rate;
+    case SADB_X_LIFETIME_USETIME:
+        return soft_lifetime_usetime_rate;
+    }
+
+    return ~0;
+}
+
+/*
+ * sending SADB_GETSPI message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t min, max, reqid, seq;
+{
+    struct sadb_msg *newmsg;
+    caddr_t ep;
+    int len;
+    int need_spirange = 0;
+    caddr_t p;
+    int plen;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+    if (min > max || (min > 0 && min <= 255)) {
+        __ipsec_errcode = EIPSEC_INVAL_SPI;
+        return -1;
+    }
+    switch (src->sa_family) {
+    case AF_INET:
+        plen = sizeof(struct in_addr) << 3;
+        break;
+    case AF_INET6:
+        plen = sizeof(struct in6_addr) << 3;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+        return -1;
+    }
+
+    /* create new sadb_msg to send. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_x_sa2)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if (min > (u_int32_t)255 && max < (u_int32_t) ~0) {
+        need_spirange++;
+        len += sizeof(struct sadb_spirange);
+    }
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_GETSPI,
+                         len, satype, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    p = pfkey_setsadbxsa2(p, ep, mode, reqid);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* set sadb_address for source */
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* set sadb_address for destination */
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* proccessing spi range */
+    if (need_spirange) {
+        struct sadb_spirange spirange;
+
+        if (p + sizeof(spirange) > ep) {
+            free(newmsg);
+            return -1;
+        }
+
+        memset(&spirange, 0, sizeof(spirange));
+        spirange.sadb_spirange_len = PFKEY_UNIT64(sizeof(spirange));
+        spirange.sadb_spirange_exttype = SADB_EXT_SPIRANGE;
+        spirange.sadb_spirange_min = min;
+        spirange.sadb_spirange_max = max;
+
+        memcpy(p, &spirange, sizeof(spirange));
+
+        p += sizeof(spirange);
+    }
+    if (p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/*
+ * sending SADB_UPDATE message to the kernel.
+ * The length of key material is a_keylen + e_keylen.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize,
+                  keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                  l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int satype, mode, wsize;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc;
+u_int64_t l_bytes, l_addtime, l_usetime;
+u_int32_t seq;
+{
+    int len;
+    if ((len = pfkey_send_x1(so, SADB_UPDATE, satype, mode, src, dst, spi,
+                             reqid, wsize,
+                             keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                             l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_ADD message to the kernel.
+ * The length of key material is a_keylen + e_keylen.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize,
+               keymat, e_type, e_keylen, a_type, a_keylen, flags,
+               l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int satype, mode, wsize;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc;
+u_int64_t l_bytes, l_addtime, l_usetime;
+u_int32_t seq;
+{
+    int len;
+    if ((len = pfkey_send_x1(so, SADB_ADD, satype, mode, src, dst, spi,
+                             reqid, wsize,
+                             keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                             l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_DELETE message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_delete(so, satype, mode, src, dst, spi)
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
+{
+    int len;
+    if ((len = pfkey_send_x2(so, SADB_DELETE, satype, mode, src, dst, spi)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_DELETE without spi to the kernel.  This is
+ * the "delete all" request (an extension also present in
+ * Solaris).
+ *
+ * OUT:
+ *	positive: success and return length sent
+ *	-1	: error occured, and set errno
+ */
+int
+pfkey_send_delete_all(so, satype, mode, src, dst)
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+{
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    (void)mode;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+    switch (src->sa_family) {
+    case AF_INET:
+        plen = sizeof(struct in_addr) << 3;
+        break;
+    case AF_INET6:
+        plen = sizeof(struct in6_addr) << 3;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+        return -1;
+    }
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_DELETE, len, satype, 0,
+                         getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/*
+ * sending SADB_GET message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_get(so, satype, mode, src, dst, spi)
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
+{
+    int len;
+    if ((len = pfkey_send_x2(so, SADB_GET, satype, mode, src, dst, spi)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_REGISTER message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_register(so, satype)
+int so;
+u_int satype;
+{
+    int len, algno;
+
+    if (satype == PF_UNSPEC) {
+        for (algno = 0;
+             (unsigned int)algno < sizeof(supported_map)/sizeof(supported_map[0]);
+             algno++) {
+            if (ipsec_supported[algno]) {
+                free(ipsec_supported[algno]);
+                ipsec_supported[algno] = NULL;
+            }
+        }
+    } else {
+        algno = findsupportedmap(satype);
+        if (algno == -1) {
+            __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+            return -1;
+        }
+
+        if (ipsec_supported[algno]) {
+            free(ipsec_supported[algno]);
+            ipsec_supported[algno] = NULL;
+        }
+    }
+
+    if ((len = pfkey_send_x3(so, SADB_REGISTER, satype)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * receiving SADB_REGISTER message from the kernel, and copy buffer for
+ * sadb_supported returned into ipsec_supported.
+ * OUT:
+ *	 0: success and return length sent.
+ *	-1: error occured, and set errno.
+ */
+int
+pfkey_recv_register(so)
+int so;
+{
+    pid_t pid = getpid();
+    struct sadb_msg *newmsg;
+    int error = -1;
+
+    /* receive message */
+    do {
+        if ((newmsg = pfkey_recv(so)) == NULL)
+            return -1;
+    } while (newmsg->sadb_msg_type != SADB_REGISTER
+             || (pid_t)newmsg->sadb_msg_pid != pid);
+
+    /* check and fix */
+    newmsg->sadb_msg_len = PFKEY_UNUNIT64(newmsg->sadb_msg_len);
+
+    error = pfkey_set_supported(newmsg, newmsg->sadb_msg_len);
+    free(newmsg);
+
+    if (error == 0)
+        __ipsec_errcode = EIPSEC_NO_ERROR;
+
+    return error;
+}
+
+/*
+ * receiving SADB_REGISTER message from the kernel, and copy buffer for
+ * sadb_supported returned into ipsec_supported.
+ * NOTE: sadb_msg_len must be host order.
+ * IN:
+ *	tlen: msg length, it's to makeing sure.
+ * OUT:
+ *	 0: success and return length sent.
+ *	-1: error occured, and set errno.
+ */
+int
+pfkey_set_supported(msg, tlen)
+struct sadb_msg *msg;
+int tlen;
+{
+    struct sadb_supported *sup;
+    caddr_t p;
+    caddr_t ep;
+
+    /* validity */
+    if (msg->sadb_msg_len != tlen) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    p = (caddr_t)msg;
+    ep = p + tlen;
+
+    p += sizeof(struct sadb_msg);
+
+    while (p < ep) {
+        sup = (struct sadb_supported *)p;
+        if (ep < p + sizeof(*sup) ||
+            (size_t)PFKEY_EXTLEN(sup) < sizeof(*sup) ||
+            ep < p + sup->sadb_supported_len) {
+            /* invalid format */
+            break;
+        }
+
+        switch (sup->sadb_supported_exttype) {
+        case SADB_EXT_SUPPORTED_AUTH:
+        case SADB_EXT_SUPPORTED_ENCRYPT:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+
+        /* fixed length */
+        sup->sadb_supported_len = PFKEY_EXTLEN(sup);
+
+        /* set supported map */
+        if (setsupportedmap(sup) != 0)
+            return -1;
+
+        p += sup->sadb_supported_len;
+    }
+
+    if (p != ep) {
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+
+    return 0;
+}
+
+/*
+ * sending SADB_FLUSH message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_flush(so, satype)
+int so;
+u_int satype;
+{
+    int len;
+
+    if ((len = pfkey_send_x3(so, SADB_FLUSH, satype)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_DUMP message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_dump(so, satype)
+int so;
+u_int satype;
+{
+    int len;
+
+    if ((len = pfkey_send_x3(so, SADB_DUMP, satype)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_PROMISC message to the kernel.
+ * NOTE that this function handles promisc mode toggle only.
+ * IN:
+ *	flag:	set promisc off if zero, set promisc on if non-zero.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ *	0     : error occured, and set errno.
+ *	others: a pointer to new allocated buffer in which supported
+ *	        algorithms is.
+ */
+int
+pfkey_send_promisc_toggle(so, flag)
+int so;
+int flag;
+{
+    int len;
+
+    if ((len = pfkey_send_x3(so, SADB_X_PROMISC, (flag ? 1 : 0))) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDADD message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDADD message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime,
+                   policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+u_int64_t ltime, vtime;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
+                             src, prefs, dst, prefd, proto,
+                             ltime, vtime,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDUPDATE message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDUPDATE message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime,
+                      policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+u_int64_t ltime, vtime;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
+                             src, prefs, dst, prefd, proto,
+                             ltime, vtime,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDDELETE message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if (policylen != sizeof(struct sadb_x_policy)) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDDELETE,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDDELETE message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spddelete2(so, spid)
+int so;
+u_int32_t spid;
+{
+    int len;
+
+    if ((len = pfkey_send_x5(so, SADB_X_SPDDELETE2, spid)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDGET message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdget(so, spid)
+int so;
+u_int32_t spid;
+{
+    int len;
+
+    if ((len = pfkey_send_x5(so, SADB_X_SPDGET, spid)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_X_SPDSETIDX message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
+{
+    int len;
+
+    if (policylen != sizeof(struct sadb_x_policy)) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    if ((len = pfkey_send_x4(so, SADB_X_SPDSETIDX,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_SPDFLUSH message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spdflush(so)
+int so;
+{
+    int len;
+
+    if ((len = pfkey_send_x3(so, SADB_X_SPDFLUSH, SADB_SATYPE_UNSPEC)) < 0)
+        return -1;
+
+    return len;
+}
+
+/*
+ * sending SADB_SPDDUMP message to the kernel.
+ * OUT:
+ *	positive: success and return length sent.
+ *	-1	: error occured, and set errno.
+ */
+int
+pfkey_send_spddump(so)
+int so;
+{
+    int len;
+
+    if ((len = pfkey_send_x3(so, SADB_X_SPDDUMP, SADB_SATYPE_UNSPEC)) < 0)
+        return -1;
+
+    return len;
+}
+
+/* sending SADB_ADD or SADB_UPDATE message to the kernel */
+static int
+pfkey_send_x1(so, type, satype, mode, src, dst, spi, reqid, wsize,
+              keymat, e_type, e_keylen, a_type, a_keylen, flags,
+              l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int type, satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+u_int wsize;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc, l_bytes, l_addtime, l_usetime, seq;
+{
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+    switch (src->sa_family) {
+    case AF_INET:
+        plen = sizeof(struct in_addr) << 3;
+        break;
+    case AF_INET6:
+        plen = sizeof(struct in6_addr) << 3;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+        return -1;
+    }
+
+    switch (satype) {
+    case SADB_SATYPE_ESP:
+        if (e_type == SADB_EALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_AH:
+        if (e_type != SADB_EALG_NONE) {
+            __ipsec_errcode = EIPSEC_INVAL_ALGS;
+            return -1;
+        }
+        if (a_type == SADB_AALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    case SADB_X_SATYPE_IPCOMP:
+        if (e_type == SADB_X_CALG_NONE) {
+            __ipsec_errcode = EIPSEC_INVAL_ALGS;
+            return -1;
+        }
+        if (a_type != SADB_AALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_sa)
+          + sizeof(struct sadb_x_sa2)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len)
+          + sizeof(struct sadb_lifetime)
+          + sizeof(struct sadb_lifetime);
+
+    if (e_type != SADB_EALG_NONE)
+        len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(e_keylen));
+    if (a_type != SADB_AALG_NONE)
+        len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(a_keylen));
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         satype, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbsa(p, ep, spi, wsize, a_type, e_type, flags);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbxsa2(p, ep, mode, reqid);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    if (e_type != SADB_EALG_NONE) {
+        p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_ENCRYPT,
+                             keymat, e_keylen);
+        if (!p) {
+            free(newmsg);
+            return -1;
+        }
+    }
+    if (a_type != SADB_AALG_NONE) {
+        p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_AUTH,
+                             keymat + e_keylen, a_keylen);
+        if (!p) {
+            free(newmsg);
+            return -1;
+        }
+    }
+
+    /* set sadb_lifetime for destination */
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
+                              l_alloc, l_bytes, l_addtime, l_usetime);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_SOFT,
+                              l_alloc, l_bytes, l_addtime, l_usetime);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/* sending SADB_DELETE or SADB_GET message to the kernel */
+static int
+pfkey_send_x2(so, type, satype, mode, src, dst, spi)
+int so;
+u_int type, satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
+{
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    (void)mode;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+    switch (src->sa_family) {
+    case AF_INET:
+        plen = sizeof(struct in_addr) << 3;
+        break;
+    case AF_INET6:
+        plen = sizeof(struct in6_addr) << 3;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+        return -1;
+    }
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_sa)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
+                         getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbsa(p, ep, spi, 0, 0, 0, 0);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/*
+ * sending SADB_REGISTER, SADB_FLUSH, SADB_DUMP or SADB_X_PROMISC message
+ * to the kernel
+ */
+static int
+pfkey_send_x3(so, type, satype)
+int so;
+u_int type, satype;
+{
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    caddr_t ep;
+
+    /* validity check */
+    switch (type) {
+    case SADB_X_PROMISC:
+        if (satype != 0 && satype != 1) {
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    default:
+        switch (satype) {
+        case SADB_SATYPE_UNSPEC:
+        case SADB_SATYPE_AH:
+        case SADB_SATYPE_ESP:
+        case SADB_X_SATYPE_IPCOMP:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+    }
+
+    /* create new sadb_msg to send. */
+    len = sizeof(struct sadb_msg);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
+                         getpid());
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/* sending SADB_X_SPDADD message to the kernel */
+static int
+pfkey_send_x4(so, type, src, prefs, dst, prefd, proto,
+              ltime, vtime, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int type, prefs, prefd, proto;
+u_int64_t ltime, vtime;
+char *policy;
+int policylen;
+u_int32_t seq;
+{
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+
+    switch (src->sa_family) {
+    case AF_INET:
+        plen = sizeof(struct in_addr) << 3;
+        break;
+    case AF_INET6:
+        plen = sizeof(struct in6_addr) << 3;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+        return -1;
+    }
+    if (prefs > (u_int)plen || prefd > (u_int)plen) {
+        __ipsec_errcode = EIPSEC_INVAL_PREFIXLEN;
+        return -1;
+    }
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_lifetime)
+          + policylen;
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         SADB_SATYPE_UNSPEC, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, prefs, proto);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, prefd, proto);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
+                              0, 0, ltime, vtime);
+    if (!p || p + policylen != ep) {
+        free(newmsg);
+        return -1;
+    }
+    memcpy(p, policy, policylen);
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/* sending SADB_X_SPDGET or SADB_X_SPDDELETE message to the kernel */
+static int
+pfkey_send_x5(so, type, spid)
+int so;
+u_int type;
+u_int32_t spid;
+{
+    struct sadb_msg *newmsg;
+    struct sadb_x_policy xpl;
+    int len;
+    caddr_t p;
+    caddr_t ep;
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(xpl);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         SADB_SATYPE_UNSPEC, 0, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    if (p + sizeof(xpl) != ep) {
+        free(newmsg);
+        return -1;
+    }
+    memset(&xpl, 0, sizeof(xpl));
+    xpl.sadb_x_policy_len = PFKEY_UNUNIT64(sizeof(xpl));
+    xpl.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
+    xpl.sadb_x_policy_id = spid;
+    memcpy(p, &xpl, sizeof(xpl));
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/*
+ * open a socket.
+ * OUT:
+ *	-1: fail.
+ *	others : success and return value of socket.
+ */
+int
+pfkey_open()
+{
+    int so;
+    const int bufsiz = 128 * 1024;  /*is 128K enough?*/
+
+    if ((so = socket(PF_KEY, SOCK_RAW, PF_KEY_V2)) < 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+
+    /*
+     * This is a temporary workaround for KAME PR 154.
+     * Don't really care even if it fails.
+     */
+    (void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsiz, sizeof(bufsiz));
+    (void)setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(bufsiz));
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return so;
+}
+
+/*
+ * close a socket.
+ * OUT:
+ *	 0: success.
+ *	-1: fail.
+ */
+void
+pfkey_close(so)
+int so;
+{
+    (void)close(so);
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return;
+}
+
+/*
+ * receive sadb_msg data, and return pointer to new buffer allocated.
+ * Must free this buffer later.
+ * OUT:
+ *	NULL	: error occured.
+ *	others	: a pointer to sadb_msg structure.
+ *
+ * XXX should be rewritten to pass length explicitly
+ */
+struct sadb_msg *
+pfkey_recv(so)
+int so;
+{
+    struct sadb_msg buf, *newmsg;
+    int len, reallen;
+
+    while ((len = recv(so, (caddr_t)&buf, sizeof(buf), MSG_PEEK)) < 0) {
+        if (errno == EINTR)
+            continue;
+        __ipsec_set_strerror(strerror(errno));
+        return NULL;
+    }
+
+    if ((size_t)len < sizeof(buf)) {
+        recv(so, (caddr_t)&buf, sizeof(buf), 0);
+        __ipsec_errcode = EIPSEC_MAX;
+        return NULL;
+    }
+
+    /* read real message */
+    reallen = PFKEY_UNUNIT64(buf.sadb_msg_len);
+    if ((newmsg = CALLOC(reallen, struct sadb_msg *)) == 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return NULL;
+    }
+
+    while ((len = recv(so, (caddr_t)newmsg, reallen, 0)) < 0) {
+        if (errno == EINTR)
+            continue;
+        __ipsec_set_strerror(strerror(errno));
+        free(newmsg);
+        return NULL;
+    }
+
+    if (len != reallen) {
+        __ipsec_errcode = EIPSEC_SYSTEM_ERROR;
+        free(newmsg);
+        return NULL;
+    }
+
+    /* don't trust what the kernel says, validate! */
+    if (PFKEY_UNUNIT64(newmsg->sadb_msg_len) != len) {
+        __ipsec_errcode = EIPSEC_SYSTEM_ERROR;
+        free(newmsg);
+        return NULL;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return newmsg;
+}
+
+/*
+ * send message to a socket.
+ * OUT:
+ *	 others: success and return length sent.
+ *	-1     : fail.
+ */
+int
+pfkey_send(so, msg, len)
+int so;
+struct sadb_msg *msg;
+int len;
+{
+    if ((len = send(so, (caddr_t)msg, len, 0)) < 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
+}
+
+/*
+ * %%% Utilities
+ * NOTE: These functions are derived from netkey/key.c in KAME.
+ */
+/*
+ * set the pointer to each header in this message buffer.
+ * IN:	msg: pointer to message buffer.
+ *	mhp: pointer to the buffer initialized like below:
+ *		caddr_t mhp[SADB_EXT_MAX + 1];
+ * OUT:	-1: invalid.
+ *	 0: valid.
+ *
+ * XXX should be rewritten to obtain length explicitly
+ */
+int
+pfkey_align(msg, mhp)
+struct sadb_msg *msg;
+caddr_t *mhp;
+{
+    struct sadb_ext *ext;
+    int i;
+    caddr_t p;
+    caddr_t ep; /* XXX should be passed from upper layer */
+
+    /* validity check */
+    if (msg == NULL || mhp == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    /* initialize */
+    for (i = 0; i < SADB_EXT_MAX + 1; i++)
+        mhp[i] = NULL;
+
+    mhp[0] = (caddr_t)msg;
+
+    /* initialize */
+    p = (caddr_t) msg;
+    ep = p + PFKEY_UNUNIT64(msg->sadb_msg_len);
+
+    /* skip base header */
+    p += sizeof(struct sadb_msg);
+
+    while (p < ep) {
+        ext = (struct sadb_ext *)p;
+        if (ep < p + sizeof(*ext) || (size_t)PFKEY_EXTLEN(ext) < sizeof(*ext) ||
+            ep < p + PFKEY_EXTLEN(ext)) {
+            /* invalid format */
+            break;
+        }
+
+        /* duplicate check */
+        /* XXX Are there duplication either KEY_AUTH or KEY_ENCRYPT ?*/
+        if (mhp[ext->sadb_ext_type] != NULL) {
+            __ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
+            return -1;
+        }
+
+        /* set pointer */
+        switch (ext->sadb_ext_type) {
+        case SADB_EXT_SA:
+        case SADB_EXT_LIFETIME_CURRENT:
+        case SADB_EXT_LIFETIME_HARD:
+        case SADB_EXT_LIFETIME_SOFT:
+        case SADB_EXT_ADDRESS_SRC:
+        case SADB_EXT_ADDRESS_DST:
+        case SADB_EXT_ADDRESS_PROXY:
+        case SADB_EXT_KEY_AUTH:
+        /* XXX should to be check weak keys. */
+        case SADB_EXT_KEY_ENCRYPT:
+        /* XXX should to be check weak keys. */
+        case SADB_EXT_IDENTITY_SRC:
+        case SADB_EXT_IDENTITY_DST:
+        case SADB_EXT_SENSITIVITY:
+        case SADB_EXT_PROPOSAL:
+        case SADB_EXT_SUPPORTED_AUTH:
+        case SADB_EXT_SUPPORTED_ENCRYPT:
+        case SADB_EXT_SPIRANGE:
+        case SADB_X_EXT_POLICY:
+        case SADB_X_EXT_SA2:
+            mhp[ext->sadb_ext_type] = (caddr_t)ext;
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
+            return -1;
+        }
+
+        p += PFKEY_EXTLEN(ext);
+    }
+
+    if (p != ep) {
+        __ipsec_errcode = EIPSEC_INVAL_SADBMSG;
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
+}
+
+/*
+ * check basic usage for sadb_msg,
+ * NOTE: This routine is derived from netkey/key.c in KAME.
+ * IN:	msg: pointer to message buffer.
+ *	mhp: pointer to the buffer initialized like below:
+ *
+ *		caddr_t mhp[SADB_EXT_MAX + 1];
+ *
+ * OUT:	-1: invalid.
+ *	 0: valid.
+ */
+int
+pfkey_check(mhp)
+caddr_t *mhp;
+{
+    struct sadb_msg *msg;
+
+    /* validity check */
+    if (mhp == NULL || mhp[0] == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    msg = (struct sadb_msg *)mhp[0];
+
+    /* check version */
+    if (msg->sadb_msg_version != PF_KEY_V2) {
+        __ipsec_errcode = EIPSEC_INVAL_VERSION;
+        return -1;
+    }
+
+    /* check type */
+    if (msg->sadb_msg_type > SADB_MAX) {
+        __ipsec_errcode = EIPSEC_INVAL_MSGTYPE;
+        return -1;
+    }
+
+    /* check SA type */
+    switch (msg->sadb_msg_satype) {
+    case SADB_SATYPE_UNSPEC:
+        switch (msg->sadb_msg_type) {
+        case SADB_GETSPI:
+        case SADB_UPDATE:
+        case SADB_ADD:
+        case SADB_DELETE:
+        case SADB_GET:
+        case SADB_ACQUIRE:
+        case SADB_EXPIRE:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_ESP:
+    case SADB_SATYPE_AH:
+    case SADB_X_SATYPE_IPCOMP:
+        switch (msg->sadb_msg_type) {
+        case SADB_X_SPDADD:
+        case SADB_X_SPDDELETE:
+        case SADB_X_SPDGET:
+        case SADB_X_SPDDUMP:
+        case SADB_X_SPDFLUSH:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_RSVP:
+    case SADB_SATYPE_OSPFV2:
+    case SADB_SATYPE_RIPV2:
+    case SADB_SATYPE_MIP:
+        __ipsec_errcode = EIPSEC_NOT_SUPPORTED;
+        return -1;
+    case 1: /* XXX: What does it do ? */
+        if (msg->sadb_msg_type == SADB_X_PROMISC)
+            break;
+    /*FALLTHROUGH*/
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    /* check field of upper layer protocol and address family */
+    if (mhp[SADB_EXT_ADDRESS_SRC] != NULL
+        && mhp[SADB_EXT_ADDRESS_DST] != NULL) {
+        struct sadb_address *src0, *dst0;
+
+        src0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_SRC]);
+        dst0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_DST]);
+
+        if (src0->sadb_address_proto != dst0->sadb_address_proto) {
+            __ipsec_errcode = EIPSEC_PROTO_MISMATCH;
+            return -1;
+        }
+
+        if (PFKEY_ADDR_SADDR(src0)->sa_family
+            != PFKEY_ADDR_SADDR(dst0)->sa_family) {
+            __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+            return -1;
+        }
+
+        switch (PFKEY_ADDR_SADDR(src0)->sa_family) {
+        case AF_INET:
+        case AF_INET6:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+            return -1;
+        }
+
+        /*
+         * prefixlen == 0 is valid because there must be the case
+         * all addresses are matched.
+         */
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
+}
+
+/*
+ * set data into sadb_msg.
+ * `buf' must has been allocated sufficiently.
+ */
+static caddr_t
+pfkey_setsadbmsg(buf, lim, type, tlen, satype, seq, pid)
+caddr_t buf;
+caddr_t lim;
+u_int type, satype;
+u_int tlen;
+u_int32_t seq;
+pid_t pid;
+{
+    struct sadb_msg *p;
+    u_int len;
+
+    p = (struct sadb_msg *)buf;
+    len = sizeof(struct sadb_msg);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_msg_version = PF_KEY_V2;
+    p->sadb_msg_type = type;
+    p->sadb_msg_errno = 0;
+    p->sadb_msg_satype = satype;
+    p->sadb_msg_len = PFKEY_UNIT64(tlen);
+    p->sadb_msg_reserved = 0;
+    p->sadb_msg_seq = seq;
+    p->sadb_msg_pid = (u_int32_t)pid;
+
+    return(buf + len);
+}
+
+/*
+ * copy secasvar data into sadb_address.
+ * `buf' must has been allocated sufficiently.
+ */
+static caddr_t
+pfkey_setsadbsa(buf, lim, spi, wsize, auth, enc, flags)
+caddr_t buf;
+caddr_t lim;
+u_int32_t spi, flags;
+u_int wsize, auth, enc;
+{
+    struct sadb_sa *p;
+    u_int len;
+
+    p = (struct sadb_sa *)buf;
+    len = sizeof(struct sadb_sa);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_sa_len = PFKEY_UNIT64(len);
+    p->sadb_sa_exttype = SADB_EXT_SA;
+    p->sadb_sa_spi = spi;
+    p->sadb_sa_replay = wsize;
+    p->sadb_sa_state = SADB_SASTATE_LARVAL;
+    p->sadb_sa_auth = auth;
+    p->sadb_sa_encrypt = enc;
+    p->sadb_sa_flags = flags;
+
+    return(buf + len);
+}
+
+/*
+ * set data into sadb_address.
+ * `buf' must has been allocated sufficiently.
+ * prefixlen is in bits.
+ */
+static caddr_t
+pfkey_setsadbaddr(buf, lim, exttype, saddr, prefixlen, ul_proto)
+caddr_t buf;
+caddr_t lim;
+u_int exttype;
+struct sockaddr *saddr;
+u_int prefixlen;
+u_int ul_proto;
+{
+    struct sadb_address *p;
+    u_int len;
+
+    p = (struct sadb_address *)buf;
+    len = sizeof(struct sadb_address) + PFKEY_ALIGN8(saddr->sa_len);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_address_len = PFKEY_UNIT64(len);
+    p->sadb_address_exttype = exttype & 0xffff;
+    p->sadb_address_proto = ul_proto & 0xff;
+    p->sadb_address_prefixlen = prefixlen;
+    p->sadb_address_reserved = 0;
+
+    memcpy(p + 1, saddr, saddr->sa_len);
+
+    return(buf + len);
+}
+
+/*
+ * set sadb_key structure after clearing buffer with zero.
+ * OUT: the pointer of buf + len.
+ */
+static caddr_t
+pfkey_setsadbkey(buf, lim, type, key, keylen)
+caddr_t buf;
+caddr_t lim;
+caddr_t key;
+u_int type, keylen;
+{
+    struct sadb_key *p;
+    u_int len;
+
+    p = (struct sadb_key *)buf;
+    len = sizeof(struct sadb_key) + PFKEY_ALIGN8(keylen);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_key_len = PFKEY_UNIT64(len);
+    p->sadb_key_exttype = type;
+    p->sadb_key_bits = keylen << 3;
+    p->sadb_key_reserved = 0;
+
+    memcpy(p + 1, key, keylen);
+
+    return buf + len;
+}
+
+/*
+ * set sadb_lifetime structure after clearing buffer with zero.
+ * OUT: the pointer of buf + len.
+ */
+static caddr_t
+pfkey_setsadblifetime(buf, lim, type, l_alloc, l_bytes, l_addtime, l_usetime)
+caddr_t buf;
+caddr_t lim;
+u_int type;
+u_int32_t l_alloc, l_bytes, l_addtime, l_usetime;
+{
+    struct sadb_lifetime *p;
+    u_int len;
+
+    p = (struct sadb_lifetime *)buf;
+    len = sizeof(struct sadb_lifetime);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_lifetime_len = PFKEY_UNIT64(len);
+    p->sadb_lifetime_exttype = type;
+
+    switch (type) {
+    case SADB_EXT_LIFETIME_SOFT:
+        p->sadb_lifetime_allocations
+            = (l_alloc * soft_lifetime_allocations_rate) /100;
+        p->sadb_lifetime_bytes
+            = (l_bytes * soft_lifetime_bytes_rate) /100;
+        p->sadb_lifetime_addtime
+            = (l_addtime * soft_lifetime_addtime_rate) /100;
+        p->sadb_lifetime_usetime
+            = (l_usetime * soft_lifetime_usetime_rate) /100;
+        break;
+    case SADB_EXT_LIFETIME_HARD:
+        p->sadb_lifetime_allocations = l_alloc;
+        p->sadb_lifetime_bytes = l_bytes;
+        p->sadb_lifetime_addtime = l_addtime;
+        p->sadb_lifetime_usetime = l_usetime;
+        break;
+    }
+
+    return buf + len;
+}
+
+/*
+ * copy secasvar data into sadb_address.
+ * `buf' must has been allocated sufficiently.
+ */
+static caddr_t
+pfkey_setsadbxsa2(buf, lim, mode0, reqid)
+caddr_t buf;
+caddr_t lim;
+u_int32_t mode0;
+u_int32_t reqid;
+{
+    struct sadb_x_sa2 *p;
+    u_int8_t mode = mode0 & 0xff;
+    u_int len;
+
+    p = (struct sadb_x_sa2 *)buf;
+    len = sizeof(struct sadb_x_sa2);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_x_sa2_len = PFKEY_UNIT64(len);
+    p->sadb_x_sa2_exttype = SADB_X_EXT_SA2;
+    p->sadb_x_sa2_mode = mode;
+    p->sadb_x_sa2_reqid = reqid;
+
+    return(buf + len);
+}
+
+#endif /* ndef MDNS_NO_IPSEC */
diff --git a/mDNSResponder/mDNSPosix/Client.c b/mDNSResponder/mDNSPosix/Client.c
new file mode 100755
index 00000000..c0badf43
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/Client.c
@@ -0,0 +1,223 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "mDNSEmbeddedAPI.h" // Defines the interface to the mDNS core code
+#include "mDNSPosix.h"    // Defines the specific types needed to run mDNS on this platform
+#include "ExampleClientApp.h"
+
+// Globals
+static mDNS mDNSStorage;       // mDNS core uses this to store its globals
+static mDNS_PlatformSupport PlatformStorage;  // Stores this platform's globals
+#define RR_CACHE_SIZE 500
+static CacheEntity gRRCache[RR_CACHE_SIZE];
+
+mDNSexport const char ProgramName[] = "mDNSClientPosix";
+
+static const char *gProgramName = ProgramName;
+
+static void BrowseCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+// A callback from the core mDNS code that indicates that we've received a
+// response to our query.  Note that this code runs on the main thread
+// (in fact, there is only one thread!), so we can safely printf the results.
+{
+    domainlabel name;
+    domainname type;
+    domainname domain;
+    char nameC  [MAX_DOMAIN_LABEL+1];           // Unescaped name: up to 63 bytes plus C-string terminating NULL.
+    char typeC  [MAX_ESCAPED_DOMAIN_NAME];
+    char domainC[MAX_ESCAPED_DOMAIN_NAME];
+    const char *state;
+
+    (void)m;        // Unused
+    (void)question; // Unused
+
+    assert(answer->rrtype == kDNSType_PTR);
+
+    DeconstructServiceName(&answer->rdata->u.name, &name, &type, &domain);
+
+    ConvertDomainLabelToCString_unescaped(&name, nameC);
+    ConvertDomainNameToCString(&type, typeC);
+    ConvertDomainNameToCString(&domain, domainC);
+
+    // If the TTL has hit 0, the service is no longer available.
+    if (!AddRecord) {
+        state = "Lost ";
+    } else {
+        state = "Found";
+    }
+    fprintf(stderr, "*** %s name = '%s', type = '%s', domain = '%s'\n", state, nameC, typeC, domainC);
+}
+
+static mDNSBool CheckThatServiceTypeIsUsable(const char *serviceType, mDNSBool printExplanation)
+// Checks that serviceType is a reasonable service type
+// label and, if it isn't and printExplanation is true, prints
+// an explanation of why not.
+{
+    mDNSBool result;
+
+    result = mDNStrue;
+    if (result && strlen(serviceType) > 63) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Service type specified by -t is too long (must be 63 characters or less)\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    if (result && serviceType[0] == 0) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Service type specified by -t can't be empty\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    return result;
+}
+
+static const char kDefaultServiceType[] = "_afpovertcp._tcp";
+static const char kDefaultDomain[]      = "local.";
+
+static void PrintUsage()
+{
+    fprintf(stderr,
+            "Usage: %s [-v level] [-t type] [-d domain]\n",
+            gProgramName);
+    fprintf(stderr, "          -v verbose mode, level is a number from 0 to 2\n");
+    fprintf(stderr, "             0 = no debugging info (default)\n");
+    fprintf(stderr, "             1 = standard debugging info\n");
+    fprintf(stderr, "             2 = intense debugging info\n");
+    fprintf(stderr, "          -t uses 'type' as the service type (default is '%s')\n", kDefaultServiceType);
+    fprintf(stderr, "          -d uses 'domain' as the domain to browse (default is '%s')\n", kDefaultDomain);
+}
+
+static const char *gServiceType      = kDefaultServiceType;
+static const char *gServiceDomain    = kDefaultDomain;
+
+static void ParseArguments(int argc, char **argv)
+// Parses our command line arguments into the global variables
+// listed above.
+{
+    int ch;
+
+    // Set gProgramName to the last path component of argv[0]
+
+    gProgramName = strrchr(argv[0], '/');
+    if (gProgramName == NULL) {
+        gProgramName = argv[0];
+    } else {
+        gProgramName += 1;
+    }
+
+    // Parse command line options using getopt.
+
+    do {
+        ch = getopt(argc, argv, "v:t:d:");
+        if (ch != -1) {
+            switch (ch) {
+            case 'v':
+                gMDNSPlatformPosixVerboseLevel = atoi(optarg);
+                if (gMDNSPlatformPosixVerboseLevel < 0 || gMDNSPlatformPosixVerboseLevel > 2) {
+                    fprintf(stderr,
+                            "%s: Verbose mode must be in the range 0..2\n",
+                            gProgramName);
+                    exit(1);
+                }
+                break;
+            case 't':
+                gServiceType = optarg;
+                if ( !CheckThatServiceTypeIsUsable(gServiceType, mDNStrue) ) {
+                    exit(1);
+                }
+                break;
+            case 'd':
+                gServiceDomain = optarg;
+                break;
+            case '?':
+            default:
+                PrintUsage();
+                exit(1);
+                break;
+            }
+        }
+    } while (ch != -1);
+
+    // Check for any left over command line arguments.
+
+    if (optind != argc) {
+        fprintf(stderr, "%s: Unexpected argument '%s'\n", gProgramName, argv[optind]);
+        exit(1);
+    }
+}
+
+int main(int argc, char **argv)
+// The program's main entry point.  The program does a trivial
+// mDNS query, looking for all AFP servers in the local domain.
+{
+    int result;
+    mStatus status;
+    DNSQuestion question;
+    domainname type;
+    domainname domain;
+
+    // Parse our command line arguments.  This won't come back if there's an error.
+    ParseArguments(argc, argv);
+
+    // Initialise the mDNS core.
+    status = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                       gRRCache, RR_CACHE_SIZE,
+                       mDNS_Init_DontAdvertiseLocalAddresses,
+                       mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (status == mStatus_NoError) {
+
+        // Construct and start the query.
+
+        MakeDomainNameFromDNSNameString(&type, gServiceType);
+        MakeDomainNameFromDNSNameString(&domain, gServiceDomain);
+
+        status = mDNS_StartBrowse(&mDNSStorage, &question, &type, &domain, mDNSNULL, mDNSInterface_Any, 0, mDNSfalse, mDNSfalse, BrowseCallback, NULL);
+
+        // Run the platform main event loop until the user types ^C.
+        // The BrowseCallback routine is responsible for printing
+        // any results that we find.
+
+        if (status == mStatus_NoError) {
+            fprintf(stderr, "Hit ^C when you're bored waiting for responses.\n");
+            ExampleClientEventLoop(&mDNSStorage);
+            mDNS_StopQuery(&mDNSStorage, &question);
+            mDNS_Close(&mDNSStorage);
+        }
+    }
+
+    if (status == mStatus_NoError) {
+        result = 0;
+    } else {
+        result = 2;
+    }
+    if ( (result != 0) || (gMDNSPlatformPosixVerboseLevel > 0) ) {
+        fprintf(stderr, "%s: Finished with status %d, result %d\n", gProgramName, (int)status, result);
+    }
+
+    return 0;
+}
diff --git a/mDNSResponder/mDNSPosix/ExampleClientApp.c b/mDNSResponder/mDNSPosix/ExampleClientApp.c
new file mode 100644
index 00000000..f23248b8
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/ExampleClientApp.c
@@ -0,0 +1,91 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>          // For printf()
+#include <stdlib.h>         // For exit() etc.
+#include <string.h>         // For strlen() etc.
+#include <unistd.h>         // For select()
+#include <errno.h>          // For errno, EINTR
+#include <netinet/in.h>     // For INADDR_NONE
+#include <arpa/inet.h>      // For inet_addr()
+#include <netdb.h>          // For gethostbyname()
+#include <signal.h>         // For SIGINT, etc.
+
+#include "mDNSEmbeddedAPI.h"  // Defines the interface to the client layer above
+#include "mDNSPosix.h"      // Defines the specific types needed to run mDNS on this platform
+
+//*******************************************************************************************
+// Main
+
+static volatile mDNSBool StopNow;
+
+mDNSlocal void HandleSIG(int signal)
+{
+    (void)signal;   // Unused
+    debugf("%s","");
+    debugf("HandleSIG");
+    StopNow = mDNStrue;
+}
+
+mDNSexport void ExampleClientEventLoop(mDNS *const m)
+{
+    signal(SIGINT, HandleSIG);  // SIGINT is what you get for a Ctrl-C
+    signal(SIGTERM, HandleSIG);
+
+    while (!StopNow)
+    {
+        int nfds = 0;
+        fd_set readfds;
+        struct timeval timeout;
+        int result;
+
+        // 1. Set up the fd_set as usual here.
+        // This example client has no file descriptors of its own,
+        // but a real application would call FD_SET to add them to the set here
+        FD_ZERO(&readfds);
+
+        // 2. Set up the timeout.
+        // This example client has no other work it needs to be doing,
+        // so we set an effectively infinite timeout
+        timeout.tv_sec = 0x3FFFFFFF;
+        timeout.tv_usec = 0;
+
+        // 3. Give the mDNSPosix layer a chance to add its information to the fd_set and timeout
+        mDNSPosixGetFDSet(m, &nfds, &readfds, &timeout);
+
+        // 4. Call select as normal
+        verbosedebugf("select(%d, %d.%06d)", nfds, timeout.tv_sec, timeout.tv_usec);
+        result = select(nfds, &readfds, NULL, NULL, &timeout);
+
+        if (result < 0)
+        {
+            verbosedebugf("select() returned %d errno %d", result, errno);
+            if (errno != EINTR) StopNow = mDNStrue;
+        }
+        else
+        {
+            // 5. Call mDNSPosixProcessFDSet to let the mDNSPosix layer do its work
+            mDNSPosixProcessFDSet(m, &readfds);
+
+            // 6. This example client has no other work it needs to be doing,
+            // but a real client would do its work here
+            // ... (do work) ...
+        }
+    }
+
+    debugf("Exiting");
+}
diff --git a/mDNSResponder/mDNSPosix/ExampleClientApp.h b/mDNSResponder/mDNSPosix/ExampleClientApp.h
new file mode 100644
index 00000000..53f7f171
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/ExampleClientApp.h
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+extern void ExampleClientEventLoop(mDNS *const m);
diff --git a/mDNSResponder/mDNSPosix/Identify.c b/mDNSResponder/mDNSPosix/Identify.c
new file mode 100644
index 00000000..003ac631
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/Identify.c
@@ -0,0 +1,376 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+//*************************************************************************************************************
+// Incorporate mDNS.c functionality
+
+// We want to use the functionality provided by "mDNS.c",
+// except we'll sneak a peek at the packets before forwarding them to the normal mDNSCoreReceive() routine
+#define mDNSCoreReceive __MDNS__mDNSCoreReceive
+#include "mDNS.c"
+#undef mDNSCoreReceive
+
+//*************************************************************************************************************
+// Headers
+
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>       // For n_long, required by <netinet/ip.h> below
+#include <netinet/ip.h>             // For IPTOS_LOWDELAY etc.
+#include <arpa/inet.h>
+#include <signal.h>
+
+#include "mDNSEmbeddedAPI.h" // Defines the interface to the mDNS core code
+#include "mDNSPosix.h"    // Defines the specific types needed to run mDNS on this platform
+#include "ExampleClientApp.h"
+
+//*************************************************************************************************************
+// Globals
+
+static mDNS mDNSStorage;       // mDNS core uses this to store its globals
+static mDNS_PlatformSupport PlatformStorage;  // Stores this platform's globals
+#define RR_CACHE_SIZE 500
+static CacheEntity gRRCache[RR_CACHE_SIZE];
+mDNSexport const char ProgramName[] = "mDNSIdentify";
+
+static volatile int StopNow;    // 0 means running, 1 means stop because we got an answer, 2 means stop because of Ctrl-C
+static volatile int NumAnswers, NumAddr, NumAAAA, NumHINFO;
+static char hostname[MAX_ESCAPED_DOMAIN_NAME], hardware[256], software[256];
+static mDNSAddr lastsrc, hostaddr, target;
+static mDNSOpaque16 lastid, id;
+
+//*************************************************************************************************************
+// Utilities
+
+// Special version of printf that knows how to print IP addresses, DNS-format name strings, etc.
+mDNSlocal mDNSu32 mprintf(const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(1,2);
+mDNSlocal mDNSu32 mprintf(const char *format, ...)
+{
+    mDNSu32 length;
+    unsigned char buffer[512];
+    va_list ptr;
+    va_start(ptr,format);
+    length = mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr);
+    va_end(ptr);
+    printf("%s", buffer);
+    return(length);
+}
+
+//*************************************************************************************************************
+// Main code
+
+mDNSexport void mDNSCoreReceive(mDNS *const m, DNSMessage *const msg, const mDNSu8 *const end,
+                                const mDNSAddr *const srcaddr, const mDNSIPPort srcport, const mDNSAddr *const dstaddr, const mDNSIPPort dstport,
+                                const mDNSInterfaceID InterfaceID)
+{
+    (void)dstaddr; // Unused
+    // Snag copy of header ID, then call through
+    lastid = msg->h.id;
+    lastsrc = *srcaddr;
+
+    // We *want* to allow off-net unicast responses here.
+    // For now, the simplest way to allow that is to pretend it was received via multicast so that mDNSCore doesn't reject the packet
+    __MDNS__mDNSCoreReceive(m, msg, end, srcaddr, srcport, &AllDNSLinkGroup_v4, dstport, InterfaceID);
+}
+
+mDNSlocal void NameCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    (void)m;        // Unused
+    (void)question; // Unused
+    (void)AddRecord; // Unused
+    if (!id.NotAnInteger) id = lastid;
+    if (answer->rrtype == kDNSType_PTR || answer->rrtype == kDNSType_CNAME)
+    {
+        ConvertDomainNameToCString(&answer->rdata->u.name, hostname);
+        StopNow = 1;
+        mprintf("%##s %s %##s\n", answer->name->c, DNSTypeName(answer->rrtype), answer->rdata->u.name.c);
+    }
+}
+
+mDNSlocal void InfoCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    (void)m;        // Unused
+    (void)question; // Unused
+    (void)AddRecord; // Unused
+    if (answer->rrtype == kDNSType_A)
+    {
+        if (!id.NotAnInteger) id = lastid;
+        NumAnswers++;
+        NumAddr++;
+        mprintf("%##s %s %.4a\n", answer->name->c, DNSTypeName(answer->rrtype), &answer->rdata->u.ipv4);
+        hostaddr.type = mDNSAddrType_IPv4;  // Prefer v4 target to v6 target, for now
+        hostaddr.ip.v4 = answer->rdata->u.ipv4;
+    }
+    else if (answer->rrtype == kDNSType_AAAA)
+    {
+        if (!id.NotAnInteger) id = lastid;
+        NumAnswers++;
+        NumAAAA++;
+        mprintf("%##s %s %.16a\n", answer->name->c, DNSTypeName(answer->rrtype), &answer->rdata->u.ipv6);
+        if (!hostaddr.type) // Prefer v4 target to v6 target, for now
+        {
+            hostaddr.type = mDNSAddrType_IPv6;
+            hostaddr.ip.v6 = answer->rdata->u.ipv6;
+        }
+    }
+    else if (answer->rrtype == kDNSType_HINFO)
+    {
+        mDNSu8 *p = answer->rdata->u.data;
+        strncpy(hardware, (char*)(p+1), p[0]);
+        hardware[p[0]] = 0;
+        p += 1 + p[0];
+        strncpy(software, (char*)(p+1), p[0]);
+        software[p[0]] = 0;
+        NumAnswers++;
+        NumHINFO++;
+    }
+
+    // If we've got everything we're looking for, don't need to wait any more
+    if (/*NumHINFO && */ (NumAddr || NumAAAA)) StopNow = 1;
+}
+
+mDNSlocal void ServicesCallback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    (void)m;        // Unused
+    (void)question; // Unused
+    (void)AddRecord; // Unused
+    // Right now the mDNSCore targeted-query code is incomplete --
+    // it issues targeted queries, but accepts answers from anywhere
+    // For now, we'll just filter responses here so we don't get confused by responses from someone else
+    if (answer->rrtype == kDNSType_PTR && mDNSSameAddress(&lastsrc, &target))
+    {
+        NumAnswers++;
+        mprintf("%##s %s %##s\n", answer->name->c, DNSTypeName(answer->rrtype), answer->rdata->u.name.c);
+    }
+}
+
+mDNSlocal void WaitForAnswer(mDNS *const m, int seconds)
+{
+    struct timeval end;
+    gettimeofday(&end, NULL);
+    end.tv_sec += seconds;
+    StopNow = 0;
+    NumAnswers = 0;
+    while (!StopNow)
+    {
+        int nfds = 0;
+        fd_set readfds;
+        struct timeval now, remain = end;
+        int result;
+
+        FD_ZERO(&readfds);
+        gettimeofday(&now, NULL);
+        if (remain.tv_usec < now.tv_usec) { remain.tv_usec += 1000000; remain.tv_sec--; }
+        if (remain.tv_sec < now.tv_sec)
+        {
+            if (!NumAnswers) printf("No response after %d seconds\n", seconds);
+            return;
+        }
+        remain.tv_usec -= now.tv_usec;
+        remain.tv_sec  -= now.tv_sec;
+        mDNSPosixGetFDSet(m, &nfds, &readfds, &remain);
+        result = select(nfds, &readfds, NULL, NULL, &remain);
+        if (result >= 0) mDNSPosixProcessFDSet(m, &readfds);
+        else if (errno != EINTR) StopNow = 2;
+    }
+}
+
+mDNSlocal mStatus StartQuery(DNSQuestion *q, char *qname, mDNSu16 qtype, const mDNSAddr *target, mDNSQuestionCallback callback)
+{
+    lastsrc = zeroAddr;
+    if (qname) MakeDomainNameFromDNSNameString(&q->qname, qname);
+    q->InterfaceID      = mDNSInterface_Any;
+    q->flags            = 0;
+    q->Target           = target ? *target : zeroAddr;
+    q->TargetPort       = MulticastDNSPort;
+    q->TargetQID        = zeroID;
+    q->qtype            = qtype;
+    q->qclass           = kDNSClass_IN;
+    q->LongLived        = mDNSfalse;
+    q->ExpectUnique     = mDNSfalse;    // Don't want to stop after the first response packet
+    q->ForceMCast       = mDNStrue;     // Query via multicast, even for apparently uDNS names like 1.1.1.17.in-addr.arpa.
+    q->ReturnIntermed   = mDNStrue;
+    q->SuppressUnusable = mDNSfalse;
+    q->SearchListIndex  = 0;
+    q->AppendSearchDomains = 0;
+    q->RetryWithSearchDomains = mDNSfalse;
+    q->TimeoutQuestion  = 0;
+    q->ValidationRequired = 0;
+    q->ValidatingResponse = 0;
+    q->WakeOnResolve    = 0;
+    q->UseBackgroundTrafficClass = mDNSfalse;
+    q->ProxyQuestion    = 0;
+    q->qnameOrig        = mDNSNULL;
+    q->AnonInfo         = mDNSNULL;
+    q->pid              = mDNSPlatformGetPID();
+    q->QuestionCallback = callback;
+    q->QuestionContext  = NULL;
+
+    //mprintf("%##s %s ?\n", q->qname.c, DNSTypeName(qtype));
+    return(mDNS_StartQuery(&mDNSStorage, q));
+}
+
+mDNSlocal void DoOneQuery(DNSQuestion *q, char *qname, mDNSu16 qtype, const mDNSAddr *target, mDNSQuestionCallback callback)
+{
+    mStatus status = StartQuery(q, qname, qtype, target, callback);
+    if (status != mStatus_NoError)
+        StopNow = 2;
+    else
+    {
+        WaitForAnswer(&mDNSStorage, 4);
+        mDNS_StopQuery(&mDNSStorage, q);
+    }
+}
+
+mDNSlocal int DoQuery(DNSQuestion *q, char *qname, mDNSu16 qtype, const mDNSAddr *target, mDNSQuestionCallback callback)
+{
+    DoOneQuery(q, qname, qtype, target, callback);
+    if (StopNow == 0 && NumAnswers == 0 && target && target->type)
+    {
+        mprintf("%##s %s Trying multicast\n", q->qname.c, DNSTypeName(q->qtype));
+        DoOneQuery(q, qname, qtype, NULL, callback);
+    }
+    if (StopNow == 0 && NumAnswers == 0)
+        mprintf("%##s %s *** No Answer ***\n", q->qname.c, DNSTypeName(q->qtype));
+    return(StopNow);
+}
+
+mDNSlocal void HandleSIG(int signal)
+{
+    (void)signal;   // Unused
+    debugf("%s","");
+    debugf("HandleSIG");
+    StopNow = 2;
+}
+
+mDNSexport int main(int argc, char **argv)
+{
+    const char *progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
+    int this_arg = 1;
+    mStatus status;
+    struct in_addr s4;
+#if HAVE_IPV6
+    struct in6_addr s6;
+#endif
+    char buffer[256];
+    DNSQuestion q;
+
+    if (argc < 2) goto usage;
+
+    // Since this is a special command-line tool, we want LogMsg() errors to go to stderr, not syslog
+    mDNS_DebugMode = mDNStrue;
+
+    // Initialise the mDNS core.
+    status = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                       gRRCache, RR_CACHE_SIZE,
+                       mDNS_Init_DontAdvertiseLocalAddresses,
+                       mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %d\n", (int)status); return(status); }
+
+    signal(SIGINT, HandleSIG);  // SIGINT is what you get for a Ctrl-C
+    signal(SIGTERM, HandleSIG);
+
+    while (this_arg < argc)
+    {
+        char *arg = argv[this_arg++];
+        if (this_arg > 2) printf("\n");
+
+        lastid = id = zeroID;
+        hostaddr = target = zeroAddr;
+        hostname[0] = hardware[0] = software[0] = 0;
+        NumAddr = NumAAAA = NumHINFO = 0;
+
+        if (inet_pton(AF_INET, arg, &s4) == 1)
+        {
+            mDNSu8 *p = (mDNSu8 *)&s4;
+            // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+            mDNS_snprintf(buffer, sizeof(buffer), "%d.%d.%d.%d.in-addr.arpa.", p[3], p[2], p[1], p[0]);
+            printf("%s\n", buffer);
+            target.type = mDNSAddrType_IPv4;
+            target.ip.v4.NotAnInteger = s4.s_addr;
+            DoQuery(&q, buffer, kDNSType_PTR, &target, NameCallback);
+            if (StopNow == 2) break;
+        }
+#if HAVE_IPV6
+        else if (inet_pton(AF_INET6, arg, &s6) == 1)
+        {
+            int i;
+            mDNSu8 *p = (mDNSu8 *)&s6;
+            for (i = 0; i < 16; i++)
+            {
+                static const char hexValues[] = "0123456789ABCDEF";
+                buffer[i * 4    ] = hexValues[p[15-i] & 0x0F];
+                buffer[i * 4 + 1] = '.';
+                buffer[i * 4 + 2] = hexValues[p[15-i] >> 4];
+                buffer[i * 4 + 3] = '.';
+            }
+            mDNS_snprintf(&buffer[64], sizeof(buffer)-64, "ip6.arpa.");
+            target.type = mDNSAddrType_IPv6;
+            mDNSPlatformMemCopy(&target.ip.v6, &s6, sizeof(target.ip.v6));
+            DoQuery(&q, buffer, kDNSType_PTR, &target, NameCallback);
+            if (StopNow == 2) break;
+        }
+#endif
+        else {
+            if (strlen(arg) >= sizeof(hostname)) {
+                fprintf(stderr, "hostname must be < %d characters\n", (int)sizeof(hostname));
+                goto usage;
+            }
+            strcpy(hostname, arg);
+        }
+
+        // Now we have the host name; get its A, AAAA, and HINFO
+        if (hostname[0]) DoQuery(&q, hostname, kDNSQType_ANY, &target, InfoCallback);
+        if (StopNow == 2) break;
+
+        if (hardware[0] || software[0])
+        {
+            printf("HINFO Hardware: %s\n", hardware);
+            printf("HINFO Software: %s\n", software);
+        }
+        else if (NumAnswers) printf("%s has no HINFO record\n", hostname);
+        else printf("Incorrect dot-local hostname, address, or no mDNSResponder running on that machine\n");
+
+        if (NumAnswers)
+        {
+            // Because of the way we use lastsrc in ServicesCallback, we need to clear the cache to make sure we're getting fresh answers
+            mDNS *const m = &mDNSStorage;
+            mDNSu32 slot;
+            CacheGroup *cg;
+            CacheRecord *rr;
+            FORALL_CACHERECORDS(slot, cg, rr)
+            {
+                mDNS_PurgeCacheResourceRecord(m, rr);
+            }
+            if (target.type == 0) target = hostaddr;        // Make sure the services query is targeted
+            DoQuery(&q, "_services._dns-sd._udp.local.", kDNSType_PTR, &target, ServicesCallback);
+            if (StopNow == 2) break;
+        }
+    }
+
+    mDNS_Close(&mDNSStorage);
+    return(0);
+
+usage:
+    fprintf(stderr, "Usage: %s <dot-local hostname> or <IPv4 address> or <IPv6 address> ...\n", progname);
+    return(-1);
+}
diff --git a/mDNSResponder/mDNSPosix/Makefile b/mDNSResponder/mDNSPosix/Makefile
new file mode 100755
index 00000000..d095a0f4
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/Makefile
@@ -0,0 +1,523 @@
+# -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2004, Apple Computer, Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met:
+#
+# 1.  Redistributions of source code must retain the above copyright notice, 
+#     this list of conditions and the following disclaimer. 
+# 2.  Redistributions in binary form must reproduce the above copyright notice, 
+#     this list of conditions and the following disclaimer in the documentation 
+#     and/or other materials provided with the distribution. 
+# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its 
+#     contributors may be used to endorse or promote products derived from this 
+#     software without specific prior written permission. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# IMPORTANT NOTE: This is a Makefile for *GNU make*
+# On some systems, a different program may be the default "make" command.
+# If "make os=xxx" gives lots of errors like "Missing dependency operator",
+# then try typing "gmake os=xxx" instead.
+#
+# This Makefile builds an mDNSResponder daemon and a libdns_sd.so shared library 
+# for Linux. It also builds several example programs for embedded systems. 
+#
+# Make with no arguments to build all production targets.
+# 'make DEBUG=1' to build debugging targets.
+# 'make clean' or 'make clean DEBUG=1' to delete prod/debug objects & targets
+# 'sudo make install [DEBUG=1]' to install mdnsd daemon and libdns_sd.
+#
+# Notes:
+# $@ means "The file name of the target of the rule"
+# $< means "The name of the first prerequisite"
+# $* means "The stem with which an implicit rule matches"
+# $+ means "The names of all the prerequisites, with spaces between them, exactly as given"
+# For more magic automatic variables, see
+# <http://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html>
+
+#############################################################################
+
+LIBVERS = 1
+
+COREDIR = ../mDNSCore
+SHAREDDIR ?= ../mDNSShared
+JDK = /usr/jdk
+
+CC = @cc
+BISON = @bison
+FLEX = @flex
+LD = ld -shared
+CP = cp
+RM = rm
+LN = ln -s -f
+CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
+CFLAGS_PTHREAD =
+LINKOPTS =
+LINKOPTS_PTHREAD = -lpthread
+LDSUFFIX = so
+JAVACFLAGS_OS = -fPIC -shared -ldns_sd
+
+# Set up diverging paths for debug vs. prod builds
+DEBUG=0
+ifeq ($(DEBUG),1)
+CFLAGS_DEBUG = -g -DMDNS_DEBUGMSGS=2 
+OBJDIR = objects/debug
+BUILDDIR = build/debug
+STRIP = echo 
+else
+# We use -Os for two reasons:
+# 1. We want to make small binaries, suitable for putting into hardware devices
+# 2. Some of the code analysis warnings only work when some form of optimization is enabled
+CFLAGS_DEBUG = -Os -DMDNS_DEBUGMSGS=0 
+OBJDIR ?= objects/prod
+BUILDDIR ?= build/prod
+STRIP = strip -S 
+endif
+
+# Configure per-OS peculiarities
+ifeq ($(os),solaris)
+CFLAGS_DEBUG = -O0 -DMDNS_DEBUGMSGS=0
+CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -DNOT_HAVE_SOCKLEN_T -DNOT_HAVE_IF_NAMETOINDEX \
+	 -DLOG_PERROR=0 -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -DTARGET_OS_SOLARIS
+CC = gcc
+LD = gcc -shared
+LINKOPTS = -lsocket -lnsl -lresolv
+JAVACFLAGS_OS += -I$(JDK)/include/solaris
+ifneq ($(DEBUG),1)
+STRIP = strip
+endif
+else
+
+# any target that contains the string "linux"
+ifeq ($(findstring linux,$(os)),linux)
+CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -fno-strict-aliasing
+LD = gcc -shared
+FLEXFLAGS_OS = -l
+JAVACFLAGS_OS += -I$(JDK)/include/linux
+
+# uClibc does not support Name Service Switch
+ifneq ($(os),linux-uclibc)
+OPTIONALTARG = nss_mdns
+OPTINSTALL   = InstalledNSS
+endif
+else
+
+ifeq ($(os),netbsd)
+CFLAGS_OS =
+LDCONFIG = ldconfig
+else
+
+ifeq ($(os),freebsd)
+# If not already defined, set LOCALBASE to /usr/local
+LOCALBASE?=/usr/local
+INSTBASE=$(LOCALBASE)
+CFLAGS_OS = -DHAVE_IPV6
+# FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
+# and requires that the "-lpthread" link option NOT be used
+# This appies only to FreeBSD -- "man cc" on FreeBSD says:
+#   FreeBSD SPECIFIC OPTIONS
+#     -pthread
+#       Link a user-threaded process against libc_r instead of libc.
+CFLAGS_PTHREAD   = -pthread -D_THREAD_SAFE
+LINKOPTS_PTHREAD = -pthread
+JAVACFLAGS_OS += -I$(JDK)/include/freebsd
+LDCONFIG = ldconfig
+else
+
+ifeq ($(os),openbsd)
+CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR
+LDCONFIG = ldconfig
+else
+
+ifeq ($(os),x)
+# We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard
+# we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283)
+CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
+	-D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 \
+	-D__APPLE_USE_RFC_2292 #-Wunreachable-code
+CC = gcc
+LD = $(CC) -dynamiclib
+LINKOPTS = -lSystem
+LDSUFFIX = dylib
+JDK = /System/Library/Frameworks/JavaVM.framework/Home
+JAVACFLAGS_OS = -dynamiclib -I/System/Library/Frameworks/JavaVM.framework/Headers -framework JavaVM 
+else
+
+$(error ERROR: Must specify target OS on command-line, e.g. "make os=x [target]".\
+Supported operating systems include: x, linux, linux-uclibc, netbsd, freebsd, openbsd, solaris) 
+endif
+endif
+endif
+endif
+endif
+endif
+
+NSSLIBNAME  := libnss_mdns
+NSSVERSION  := 0.2
+NSSLIBFILE  := $(NSSLIBNAME)-$(NSSVERSION).so
+NSSLINKNAME := $(NSSLIBNAME).so.2
+NSSINSTPATH := /lib
+
+# If not otherwise defined, we install into /usr/lib and /usr/include
+# and our startup script is called mdns (e.g. /etc/init.d/mdns)
+INSTBASE?=/usr
+STARTUPSCRIPTNAME?=mdns
+
+ifeq ($(HAVE_IPV6),1)
+CFLAGS_OS += -DHAVE_IPV6=1
+else
+ifeq ($(HAVE_IPV6),0)
+CFLAGS_OS += -DHAVE_IPV6=0
+endif
+endif
+
+# If directory /usr/share/man exists, then we install man pages into that, else /usr/man
+ifeq ($(wildcard /usr/share/man), /usr/share/man)
+MANPATH := /usr/share/man
+else
+MANPATH := /usr/man
+endif
+
+# If directories /etc/init.d/rc*.d exist, then we install into that (Suse)
+ifeq ($(wildcard /etc/init.d/rc2.d/), /etc/init.d/rc2.d/)
+STARTUPSCRIPTDIR = /etc/init.d
+RUNLEVELSCRIPTSDIR = /etc/init.d
+else
+# else if directory /etc/rc.d/init.d/ exists, then we install into that (old Linux)
+ifeq ($(wildcard /etc/rc.d/init.d/), /etc/rc.d/init.d/)
+STARTUPSCRIPTDIR = /etc/rc.d/init.d
+RUNLEVELSCRIPTSDIR = /etc/rc.d
+else
+# else if directory /etc/init.d/ exists, then we install into that (new Linux)
+ifeq ($(wildcard /etc/init.d/), /etc/init.d/)
+STARTUPSCRIPTDIR = /etc/init.d
+RUNLEVELSCRIPTSDIR = /etc
+else
+# else install into /etc/rc.d/ (*BSD)
+STARTUPSCRIPTDIR = $(INSTBASE)/etc/rc.d
+endif
+endif
+endif
+
+CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
+
+#############################################################################
+
+all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
+
+install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
+
+# 'setup' sets up the build directory structure the way we want
+setup:
+	@if test ! -d $(OBJDIR)   ; then mkdir -p $(OBJDIR)   ; fi
+	@if test ! -d $(BUILDDIR) ; then mkdir -p $(BUILDDIR) ; fi
+
+# clean removes targets and objects
+clean:
+	@if test -d $(OBJDIR)   ; then rm -r $(OBJDIR)   ; fi
+	@if test -d $(BUILDDIR) ; then rm -r $(BUILDDIR) ; fi
+	@$(MAKE) -C ../Clients clean
+
+#############################################################################
+
+# daemon target builds the daemon
+DAEMONOBJS = $(OBJDIR)/PosixDaemon.c.o $(OBJDIR)/mDNSPosix.c.o $(OBJDIR)/mDNSUNP.c.o $(OBJDIR)/mDNS.c.o \
+             $(OBJDIR)/DNSDigest.c.o $(OBJDIR)/uDNS.c.o $(OBJDIR)/DNSCommon.c.o $(OBJDIR)/uds_daemon.c.o \
+             $(OBJDIR)/mDNSDebug.c.o $(OBJDIR)/dnssd_ipc.c.o $(OBJDIR)/GenLinkedList.c.o $(OBJDIR)/PlatformCommon.c.o \
+			 $(OBJDIR)/CryptoAlg.c.o $(OBJDIR)/anonymous.c.o
+
+# dnsextd target build dnsextd
+DNSEXTDOBJ = $(OBJDIR)/mDNSPosix.c.o $(OBJDIR)/mDNSUNP.c.o $(OBJDIR)/mDNSDebug.c.o $(OBJDIR)/GenLinkedList.c.o $(OBJDIR)/DNSDigest.c.o \
+             $(OBJDIR)/DNSCommon.c.o $(OBJDIR)/PlatformCommon.c.o $(OBJDIR)/dnsextd_parser.y.o $(OBJDIR)/dnsextd_lexer.l.o \
+			 $(OBJDIR)/CryptoAlg.c.o
+
+Daemon: setup $(BUILDDIR)/mdnsd
+	@echo "Responder daemon done"
+
+$(BUILDDIR)/mdnsd: $(DAEMONOBJS)
+	$(CC) -o $@ $+ $(LINKOPTS)
+	@$(STRIP) $@
+
+# libdns_sd target builds the client library
+libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
+	@echo "Client library done"
+
+CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
+
+$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
+	@$(LD) $(LINKOPTS) -o $@ $+
+	@$(STRIP) $@
+
+Clients: setup libdns_sd ../Clients/build/dns-sd
+	@echo "Clients done"
+
+../Clients/build/dns-sd:
+	@$(MAKE) -C ../Clients
+
+# nss_mdns target builds the Name Service Switch module
+nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
+	@echo "Name Service Switch module done"
+
+$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
+	@$(LD) $(LINKOPTS) -o $@ $+
+	@$(STRIP) $@
+
+#############################################################################
+
+# The Install targets place built stuff in their proper places
+InstalledDaemon: $(INSTBASE)/sbin/mdnsd
+	@echo $+ " installed"
+
+InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
+	@echo $+ " installed"
+
+InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
+	@echo $+ " installed"
+
+InstalledManPages: $(MANPATH)/man8/mdnsd.8
+	@echo $+ " installed"
+
+InstalledClients: $(INSTBASE)/bin/dns-sd
+	@echo $+ " installed"
+
+InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
+	@echo $+ " installed"
+
+# Note: If daemon already installed, we make sure it's stopped before overwriting it
+$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
+	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
+	$(CP) $< $@
+
+$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
+	$(CP) $< $@
+	$(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
+ifdef LDCONFIG
+    # -m means 'merge into existing database', -R means 'rescan directories'
+	$(LDCONFIG) -mR
+endif
+
+$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
+	$(CP) $< $@
+
+# We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure
+# that the daemon is installed *before* we try to execute the command to start it.
+$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd
+	$(CP) $< $@
+	chmod ugo+x $@
+	$@ start
+ifdef RUNLEVELSCRIPTSDIR
+ifeq ($(wildcard $(RUNLEVELSCRIPTSDIR)/runlevels/default), $(RUNLEVELSCRIPTSDIR)/runlevels/default)
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/runlevels/default/mdns
+else
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc2.d/S52mdns
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc3.d/S52mdns
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc4.d/S52mdns
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc5.d/S52mdns
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc0.d/K16mdns
+	$(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc6.d/K16mdns
+endif
+endif
+
+$(MANPATH)/man5/%.5: %.5
+	cp $< $@
+	chmod 444 $@
+
+$(MANPATH)/man8/%.8: %.8
+	cp $< $@
+	chmod 444 $@
+
+$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
+	cp $< $@
+	chmod 444 $@
+
+$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
+	$(CP) $< $@
+
+$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
+	$(LN) $< $@
+	ldconfig
+
+$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
+	$(CP) $< $@
+	chmod 444 $@
+
+/etc/nss_mdns.conf: nss_mdns.conf
+	$(CP) $< $@
+	chmod 444 $@
+	# Check the nsswitch.conf file.
+	# If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
+	cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
+	sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
+
+#############################################################################
+
+# The following targets build Java wrappers for the dns-sd.h API.
+# Note that the JavaForXcode targets are used when building the project for OS X using Xcode
+
+JAVAC = $(JDK)/bin/javac
+JAVAH = $(JDK)/bin/javah
+JAVADOC = $(JDK)/bin/javadoc
+JAR = $(JDK)/bin/jar
+JAVACFLAGS = $(CFLAGS) $(JAVACFLAGS_OS) -I$(JDK)/include
+
+JavaForXcode_: setup $(BUILDDIR)/dns_sd.jar $(PROJECT_DERIVED_FILE_DIR)/DNSSD.java.h
+	@echo $@ done
+	
+$(PROJECT_DERIVED_FILE_DIR)/DNSSD.java.h: $(OBJDIR)/DNSSD.java.h
+	@if test ! -d $(PROJECT_DERIVED_FILE_DIR) ; then mkdir -p $(PROJECT_DERIVED_FILE_DIR) ; fi
+	$(CP) $< $@
+
+JavaForXcode_clean:
+	@if test -d $(OBJDIR) ; then rm -r $(OBJDIR) ; fi
+	@if test -f $(PROJECT_DERIVED_FILE_DIR)/DNSSD.java.h ; then $(RM) $(PROJECT_DERIVED_FILE_DIR)/DNSSD.java.h ; fi
+	@if test -f $(BUILDDIR)/dns_sd.jar ; then $(RM) $(BUILDDIR)/dns_sd.jar ; fi
+	@echo $@ done
+
+JavaForXcode_installhdrs:
+	@echo $@ NOOP
+
+JavaForXcode_install: JavaForXcode_ $(DSTROOT)/$(SYSTEM_LIBRARY_DIR)/Java/Extensions/dns_sd.jar
+	@echo $@ done
+
+$(DSTROOT)/$(SYSTEM_LIBRARY_DIR)/Java/Extensions/dns_sd.jar: $(BUILDDIR)/dns_sd.jar
+	@if test ! -d $(DSTROOT)/$(SYSTEM_LIBRARY_DIR)/Java/Extensions ; then mkdir -p $(DSTROOT)/$(SYSTEM_LIBRARY_DIR)/Java/Extensions ; fi
+	$(CP) $< $@
+
+Java: setup $(BUILDDIR)/dns_sd.jar $(BUILDDIR)/libjdns_sd.$(LDSUFFIX)
+	@echo "Java wrappers done"
+
+JAVASRC	= $(SHAREDDIR)/Java
+JARCONTENTS =	$(OBJDIR)/com/apple/dnssd/DNSSDService.class \
+				$(OBJDIR)/com/apple/dnssd/DNSSDException.class \
+				$(OBJDIR)/com/apple/dnssd/DNSRecord.class \
+				$(OBJDIR)/com/apple/dnssd/TXTRecord.class \
+				$(OBJDIR)/com/apple/dnssd/DNSSDRegistration.class \
+				$(OBJDIR)/com/apple/dnssd/BaseListener.class \
+				$(OBJDIR)/com/apple/dnssd/BrowseListener.class \
+				$(OBJDIR)/com/apple/dnssd/ResolveListener.class \
+				$(OBJDIR)/com/apple/dnssd/RegisterListener.class \
+				$(OBJDIR)/com/apple/dnssd/QueryListener.class \
+				$(OBJDIR)/com/apple/dnssd/DomainListener.class \
+				$(OBJDIR)/com/apple/dnssd/RegisterRecordListener.class \
+				$(OBJDIR)/com/apple/dnssd/DNSSDRecordRegistrar.class \
+				$(OBJDIR)/com/apple/dnssd/DNSSD.class
+
+$(BUILDDIR)/dns_sd.jar: $(JARCONTENTS) setup
+	$(JAR) -cf $@ -C $(OBJDIR) com
+
+$(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h setup libdns_sd
+	$(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR)
+
+$(OBJDIR)/com/apple/dnssd/%.class:	$(JAVASRC)/%.java
+	$(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $<
+
+$(OBJDIR)/DNSSD.java.h: $(OBJDIR)/com/apple/dnssd/DNSSD.class
+	$(JAVAH) -force -classpath $(OBJDIR) -o $@ \
+		com.apple.dnssd.AppleDNSSD \
+		com.apple.dnssd.AppleBrowser \
+		com.apple.dnssd.AppleResolver \
+		com.apple.dnssd.AppleRegistration \
+		com.apple.dnssd.AppleQuery \
+		com.apple.dnssd.AppleDomainEnum \
+		com.apple.dnssd.AppleService \
+		com.apple.dnssd.AppleDNSRecord \
+		com.apple.dnssd.AppleRecordRegistrar
+
+#############################################################################
+
+# The following target builds documentation for the Java wrappers.
+
+JavaDoc: Java setup
+	$(JAVADOC) $(JAVASRC)/*.java -classpath $(OBJDIR) -d $(BUILDDIR) -public
+
+#############################################################################
+
+# The following targets build embedded example programs
+SPECIALOBJ = $(OBJDIR)/mDNSPosix.c.o $(OBJDIR)/mDNSUNP.c.o $(OBJDIR)/mDNSDebug.c.o $(OBJDIR)/GenLinkedList.c.o \
+	$(OBJDIR)/DNSDigest.c.o $(OBJDIR)/uDNS.c.o $(OBJDIR)/DNSCommon.c.o $(OBJDIR)/PlatformCommon.c.o \
+	$(OBJDIR)/CryptoAlg.c.o $(OBJDIR)/anonymous.c.o
+COMMONOBJ  = $(SPECIALOBJ) $(OBJDIR)/mDNS.c.o
+APPOBJ     = $(COMMONOBJ) $(OBJDIR)/ExampleClientApp.c.o
+
+SAClient: setup $(BUILDDIR)/mDNSClientPosix
+	@echo "Embedded Standalone Client done"
+
+SAResponder: setup $(BUILDDIR)/mDNSResponderPosix
+	@echo "Embedded Standalone Responder done"
+
+SAProxyResponder: setup $(BUILDDIR)/mDNSProxyResponderPosix
+	@echo "Embedded Standalone ProxyResponder done"
+
+Identify: setup $(BUILDDIR)/mDNSIdentify
+	@echo "Identify done"
+
+NetMonitor: setup $(BUILDDIR)/mDNSNetMonitor
+	@echo "NetMonitor done"
+
+dnsextd: setup $(BUILDDIR)/dnsextd
+	@echo "dnsextd done"
+
+$(BUILDDIR)/mDNSClientPosix:         $(APPOBJ)     $(OBJDIR)/Client.c.o
+	$(CC) $+ -o $@ $(LINKOPTS)
+
+$(BUILDDIR)/mDNSResponderPosix:      $(COMMONOBJ)  $(OBJDIR)/Responder.c.o
+	$(CC) $+ -o $@ $(LINKOPTS)
+
+$(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ)  $(OBJDIR)/ProxyResponder.c.o
+	$(CC) $+ -o $@ $(LINKOPTS)
+
+$(BUILDDIR)/mDNSIdentify:            $(SPECIALOBJ) $(OBJDIR)/Identify.c.o
+	$(CC) $+ -o $@ $(LINKOPTS)
+
+$(OBJDIR)/Identify.c.o:              $(COREDIR)/mDNS.c # Note: Identify.c textually imports mDNS.c
+
+$(BUILDDIR)/mDNSNetMonitor:          $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o
+	$(CC) $+ -o $@ $(LINKOPTS)
+
+$(OBJDIR)/NetMonitor.c.o:            $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c
+
+$(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
+	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
+
+#############################################################################
+
+# Implicit rules
+$(OBJDIR)/%.c.o:	%.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.c.o:	$(COREDIR)/%.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.c.o:	$(SHAREDDIR)/%.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.c.threadsafe.o:	%.c
+	$(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
+
+$(OBJDIR)/%.c.threadsafe.o:	$(SHAREDDIR)/%.c
+	$(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
+
+$(OBJDIR)/%.c.so.o:	%.c
+	$(CC) $(CFLAGS) -c -fPIC -o $@ $<
+
+$(OBJDIR)/%.c.so.o:	$(SHAREDDIR)/%.c
+	$(CC) $(CFLAGS) -c -fPIC -o $@ $<
+
+$(OBJDIR)/%.y.o: $(SHAREDDIR)/%.y
+	$(BISON)              -o $(OBJDIR)/$*.c -d $<
+	$(CC) $(CFLAGS) -c -o $@ $(OBJDIR)/$*.c
+
+$(OBJDIR)/%.l.o: $(SHAREDDIR)/%.l
+	$(FLEX) $(FLEXFLAGS_OS) -i             -o$(OBJDIR)/$*.l.c $<
+	$(CC) $(CFLAGS) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c
diff --git a/mDNSResponder/mDNSPosix/NetMonitor.c b/mDNSResponder/mDNSPosix/NetMonitor.c
new file mode 100644
index 00000000..1354f1f8
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/NetMonitor.c
@@ -0,0 +1,1003 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+//*************************************************************************************************************
+// Incorporate mDNS.c functionality
+
+// We want to use much of the functionality provided by "mDNS.c",
+// except we'll steal the packets that would be sent to normal mDNSCoreReceive() routine
+#define mDNSCoreReceive __NOT__mDNSCoreReceive__NOT__
+#include "mDNS.c"
+#undef mDNSCoreReceive
+
+//*************************************************************************************************************
+// Headers
+
+#include <stdio.h>          // For printf()
+#include <stdlib.h>         // For malloc()
+#include <string.h>         // For strrchr(), strcmp()
+#include <time.h>           // For "struct tm" etc.
+#include <signal.h>         // For SIGINT, SIGTERM
+#if defined(WIN32)
+// Both mDNS.c and mDNSWin32.h declare UDPSocket_struct type resulting in a compile-time error, so
+// trick the compiler when including mDNSWin32.h
+#   define UDPSocket_struct _UDPSocket_struct
+#   include <mDNSEmbeddedAPI.h>
+#   include <mDNSWin32.h>
+#   include <PosixCompat.h>
+#   include <Poll.h>
+#   define IFNAMSIZ 256
+static HANDLE gStopEvent = INVALID_HANDLE_VALUE;
+static mDNSBool gRunning;
+static void CALLBACK StopNotification( HANDLE event, void *context ) { gRunning = mDNSfalse; }
+static BOOL WINAPI ConsoleControlHandler( DWORD inControlEvent ) { SetEvent( gStopEvent ); return TRUE; }
+void setlinebuf( FILE * fp ) {}
+#else
+#   include <netdb.h>           // For gethostbyname()
+#   include <sys/socket.h>      // For AF_INET, AF_INET6, etc.
+#   include <net/if.h>          // For IF_NAMESIZE
+#   include <netinet/in.h>      // For INADDR_NONE
+#   include <arpa/inet.h>       // For inet_addr()
+#   include "mDNSPosix.h"      // Defines the specific types needed to run mDNS on this platform
+#endif
+#include "ExampleClientApp.h"
+
+//*************************************************************************************************************
+// Types and structures
+
+enum
+{
+    // Primitive operations
+    OP_probe        = 0,
+    OP_goodbye      = 1,
+
+    // These are meta-categories;
+    // Query and Answer operations are actually subdivided into two classes:
+    // Browse  query/answer and
+    // Resolve query/answer
+    OP_query        = 2,
+    OP_answer       = 3,
+
+    // The "Browse" variants of query/answer
+    OP_browsegroup  = 2,
+    OP_browseq      = 2,
+    OP_browsea      = 3,
+
+    // The "Resolve" variants of query/answer
+    OP_resolvegroup = 4,
+    OP_resolveq     = 4,
+    OP_resolvea     = 5,
+
+    OP_NumTypes = 6
+};
+
+typedef struct ActivityStat_struct ActivityStat;
+struct ActivityStat_struct
+{
+    ActivityStat *next;
+    domainname srvtype;
+    int printed;
+    int totalops;
+    int stat[OP_NumTypes];
+};
+
+typedef struct FilterList_struct FilterList;
+struct FilterList_struct
+{
+    FilterList *next;
+    mDNSAddr FilterAddr;
+};
+
+//*************************************************************************************************************
+// Constants
+
+#define kReportTopServices 15
+#define kReportTopHosts    15
+
+//*************************************************************************************************************
+// Globals
+
+mDNS mDNSStorage;                       // mDNS core uses this to store its globals
+static mDNS_PlatformSupport PlatformStorage;    // Stores this platform's globals
+mDNSexport const char ProgramName[] = "mDNSNetMonitor";
+
+struct timeval tv_start, tv_end, tv_interval;
+static int FilterInterface = 0;
+static FilterList *Filters;
+#define ExactlyOneFilter (Filters && !Filters->next)
+
+static int NumPktQ, NumPktL, NumPktR, NumPktB;  // Query/Legacy/Response/Bad
+static int NumProbes, NumGoodbyes, NumQuestions, NumLegacy, NumAnswers, NumAdditionals;
+
+static ActivityStat *stats;
+
+#define OPBanner "Total Ops   Probe   Goodbye  BrowseQ  BrowseA ResolveQ ResolveA"
+
+//*************************************************************************************************************
+// Utilities
+
+// Special version of printf that knows how to print IP addresses, DNS-format name strings, etc.
+mDNSlocal mDNSu32 mprintf(const char *format, ...) IS_A_PRINTF_STYLE_FUNCTION(1,2);
+mDNSlocal mDNSu32 mprintf(const char *format, ...)
+{
+    mDNSu32 length;
+    unsigned char buffer[512];
+    va_list ptr;
+    va_start(ptr,format);
+    length = mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr);
+    va_end(ptr);
+    printf("%s", buffer);
+    return(length);
+}
+
+//*************************************************************************************************************
+// Host Address List
+//
+// Would benefit from a hash
+
+typedef enum
+{
+    HostPkt_Q        = 0,       // Query
+    HostPkt_L        = 1,       // Legacy Query
+    HostPkt_R        = 2,       // Response
+    HostPkt_B        = 3,       // Bad
+    HostPkt_NumTypes = 4
+} HostPkt_Type;
+
+typedef struct
+{
+    mDNSAddr addr;
+    unsigned long pkts[HostPkt_NumTypes];
+    unsigned long totalops;
+    unsigned long stat[OP_NumTypes];
+    domainname hostname;
+    domainname revname;
+    UTF8str255 HIHardware;
+    UTF8str255 HISoftware;
+    mDNSu32 NumQueries;
+    mDNSs32 LastQuery;
+} HostEntry;
+
+#define HostEntryTotalPackets(H) ((H)->pkts[HostPkt_Q] + (H)->pkts[HostPkt_L] + (H)->pkts[HostPkt_R] + (H)->pkts[HostPkt_B])
+
+typedef struct
+{
+    long num;
+    long max;
+    HostEntry   *hosts;
+} HostList;
+
+static HostList IPv4HostList = { 0, 0, 0 };
+static HostList IPv6HostList = { 0, 0, 0 };
+
+mDNSlocal HostEntry *FindHost(const mDNSAddr *addr, HostList *list)
+{
+    long i;
+
+    for (i = 0; i < list->num; i++)
+    {
+        HostEntry *entry = list->hosts + i;
+        if (mDNSSameAddress(addr, &entry->addr))
+            return entry;
+    }
+
+    return NULL;
+}
+
+mDNSlocal HostEntry *AddHost(const mDNSAddr *addr, HostList *list)
+{
+    int i;
+    HostEntry *entry;
+    if (list->num >= list->max)
+    {
+        long newMax = list->max + 64;
+        HostEntry *newHosts = realloc(list->hosts, newMax * sizeof(HostEntry));
+        if (newHosts == NULL)
+            return NULL;
+        list->max = newMax;
+        list->hosts = newHosts;
+    }
+
+    entry = list->hosts + list->num++;
+
+    entry->addr = *addr;
+    for (i=0; i<HostPkt_NumTypes; i++) entry->pkts[i] = 0;
+    entry->totalops = 0;
+    for (i=0; i<OP_NumTypes;      i++) entry->stat[i] = 0;
+    entry->hostname.c[0] = 0;
+    entry->revname.c[0] = 0;
+    entry->HIHardware.c[0] = 0;
+    entry->HISoftware.c[0] = 0;
+    entry->NumQueries = 0;
+
+    if (entry->addr.type == mDNSAddrType_IPv4)
+    {
+        mDNSv4Addr ip = entry->addr.ip.v4;
+        char buffer[32];
+        // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+        mDNS_snprintf(buffer, sizeof(buffer), "%d.%d.%d.%d.in-addr.arpa.", ip.b[3], ip.b[2], ip.b[1], ip.b[0]);
+        MakeDomainNameFromDNSNameString(&entry->revname, buffer);
+    }
+
+    return(entry);
+}
+
+mDNSlocal HostEntry *GotPacketFromHost(const mDNSAddr *addr, HostPkt_Type t, mDNSOpaque16 id)
+{
+    if (ExactlyOneFilter) return(NULL);
+    else
+    {
+        HostList *list = (addr->type == mDNSAddrType_IPv4) ? &IPv4HostList : &IPv6HostList;
+        HostEntry *entry = FindHost(addr, list);
+        if (!entry) entry = AddHost(addr, list);
+        if (!entry) return(NULL);
+        // Don't count our own interrogation packets
+        if (id.NotAnInteger != 0xFFFF) entry->pkts[t]++;
+        return(entry);
+    }
+}
+
+mDNSlocal void RecordHostInfo(HostEntry *entry, const ResourceRecord *const pktrr)
+{
+    if (!entry->hostname.c[0])
+    {
+        if (pktrr->rrtype == kDNSType_A || pktrr->rrtype == kDNSType_AAAA)
+        {
+            // Should really check that the rdata in the address record matches the source address of this packet
+            entry->NumQueries = 0;
+            AssignDomainName(&entry->hostname, pktrr->name);
+        }
+
+        if (pktrr->rrtype == kDNSType_PTR)
+            if (SameDomainName(&entry->revname, pktrr->name))
+            {
+                entry->NumQueries = 0;
+                AssignDomainName(&entry->hostname, &pktrr->rdata->u.name);
+            }
+    }
+    else if (pktrr->rrtype == kDNSType_HINFO)
+    {
+        RDataBody *rd = &pktrr->rdata->u;
+        mDNSu8 *rdend = (mDNSu8 *)rd + pktrr->rdlength;
+        mDNSu8 *hw = rd->txt.c;
+        mDNSu8 *sw = hw + 1 + (mDNSu32)hw[0];
+        if (sw + 1 + sw[0] <= rdend)
+        {
+            AssignDomainName(&entry->hostname, pktrr->name);
+            mDNSPlatformMemCopy(entry->HIHardware.c, hw, 1 + (mDNSu32)hw[0]);
+            mDNSPlatformMemCopy(entry->HISoftware.c, sw, 1 + (mDNSu32)sw[0]);
+        }
+    }
+}
+
+mDNSlocal void SendUnicastQuery(mDNS *const m, HostEntry *entry, domainname *name, mDNSu16 rrtype, mDNSInterfaceID InterfaceID)
+{
+    const mDNSOpaque16 id = { { 0xFF, 0xFF } };
+    DNSMessage query;
+    mDNSu8       *qptr        = query.data;
+    const mDNSu8 *const limit = query.data + sizeof(query.data);
+    const mDNSAddr *target    = &entry->addr;
+    InitializeDNSMessage(&query.h, id, QueryFlags);
+    qptr = putQuestion(&query, qptr, limit, name, rrtype, kDNSClass_IN);
+    entry->LastQuery = m->timenow;
+    entry->NumQueries++;
+
+    // Note: When there are multiple mDNSResponder agents running on a single machine
+    // (e.g. Apple mDNSResponder plus a SliMP3 server with embedded mDNSResponder)
+    // it is possible that unicast queries may not go to the primary system responder.
+    // We try the first query using unicast, but if that doesn't work we try again via multicast.
+    if (entry->NumQueries > 2)
+    {
+        target = &AllDNSLinkGroup_v4;
+    }
+    else
+    {
+        //mprintf("%#a Q\n", target);
+        InterfaceID = mDNSInterface_Any;    // Send query from our unicast reply socket
+    }
+
+    mDNSSendDNSMessage(&mDNSStorage, &query, qptr, InterfaceID, mDNSNULL, target, MulticastDNSPort, mDNSNULL, mDNSNULL, mDNSfalse);
+}
+
+mDNSlocal void AnalyseHost(mDNS *const m, HostEntry *entry, const mDNSInterfaceID InterfaceID)
+{
+    // If we've done four queries without answer, give up
+    if (entry->NumQueries >= 4) return;
+
+    // If we've done a query in the last second, give the host a chance to reply before trying again
+    if (entry->NumQueries && m->timenow - entry->LastQuery < mDNSPlatformOneSecond) return;
+
+    // If we don't know the host name, try to find that first
+    if (!entry->hostname.c[0])
+    {
+        if (entry->revname.c[0])
+        {
+            SendUnicastQuery(m, entry, &entry->revname, kDNSType_PTR, InterfaceID);
+            //mprintf("%##s PTR %d\n", entry->revname.c, entry->NumQueries);
+        }
+    }
+    // If we have the host name but no HINFO, now ask for that
+    else if (!entry->HIHardware.c[0])
+    {
+        SendUnicastQuery(m, entry, &entry->hostname, kDNSType_HINFO, InterfaceID);
+        //mprintf("%##s HINFO %d\n", entry->hostname.c, entry->NumQueries);
+    }
+}
+
+mDNSlocal int CompareHosts(const void *p1, const void *p2)
+{
+    return (int)(HostEntryTotalPackets((HostEntry *)p2) - HostEntryTotalPackets((HostEntry *)p1));
+}
+
+mDNSlocal void ShowSortedHostList(HostList *list, int max)
+{
+    HostEntry *e, *end = &list->hosts[(max < list->num) ? max : list->num];
+    qsort(list->hosts, list->num, sizeof(HostEntry), CompareHosts);
+    if (list->num) mprintf("\n%-25s%s%s\n", "Source Address", OPBanner, "    Pkts    Query   LegacyQ Response");
+    for (e = &list->hosts[0]; e < end; e++)
+    {
+        int len = mprintf("%#-25a", &e->addr);
+        if (len > 25) mprintf("\n%25s", "");
+        mprintf("%8lu %8lu %8lu %8lu %8lu %8lu %8lu", e->totalops,
+                e->stat[OP_probe], e->stat[OP_goodbye],
+                e->stat[OP_browseq], e->stat[OP_browsea],
+                e->stat[OP_resolveq], e->stat[OP_resolvea]);
+        mprintf(" %8lu %8lu %8lu %8lu",
+                HostEntryTotalPackets(e), e->pkts[HostPkt_Q], e->pkts[HostPkt_L], e->pkts[HostPkt_R]);
+        if (e->pkts[HostPkt_B]) mprintf("Bad: %8lu", e->pkts[HostPkt_B]);
+        mprintf("\n");
+        if (!e->HISoftware.c[0] && e->NumQueries > 2)
+            mDNSPlatformMemCopy(&e->HISoftware, "\x27*** Unknown (Jaguar, Windows, etc.) ***", 0x28);
+        if (e->hostname.c[0] || e->HIHardware.c[0] || e->HISoftware.c[0])
+            mprintf("%##-45s %#-14s %#s\n", e->hostname.c, e->HIHardware.c, e->HISoftware.c);
+    }
+}
+
+//*************************************************************************************************************
+// Receive and process packets
+
+mDNSexport mDNSBool ExtractServiceType(const domainname *const fqdn, domainname *const srvtype)
+{
+    int i, len;
+    const mDNSu8 *src = fqdn->c;
+    mDNSu8 *dst = srvtype->c;
+
+    len = *src;
+    if (len == 0 || len >= 0x40) return(mDNSfalse);
+    if (src[1] != '_') src += 1 + len;
+
+    len = *src;
+    if (len == 0 || len >= 0x40 || src[1] != '_') return(mDNSfalse);
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    len = *src;
+    if (len == 0 || len >= 0x40 || src[1] != '_') return(mDNSfalse);
+    for (i=0; i<=len; i++) *dst++ = *src++;
+
+    *dst++ = 0;     // Put the null root label on the end of the service type
+
+    return(mDNStrue);
+}
+
+mDNSlocal void recordstat(HostEntry *entry, const domainname *fqdn, int op, mDNSu16 rrtype)
+{
+    ActivityStat **s = &stats;
+    domainname srvtype;
+
+    if (op != OP_probe)
+    {
+        if (rrtype == kDNSType_SRV || rrtype == kDNSType_TXT) op = op - OP_browsegroup + OP_resolvegroup;
+        else if (rrtype != kDNSType_PTR) return;
+    }
+
+    if (!ExtractServiceType(fqdn, &srvtype)) return;
+
+    while (*s && !SameDomainName(&(*s)->srvtype, &srvtype)) s = &(*s)->next;
+    if (!*s)
+    {
+        int i;
+        *s = malloc(sizeof(ActivityStat));
+        if (!*s) exit(-1);
+        (*s)->next     = NULL;
+        (*s)->srvtype  = srvtype;
+        (*s)->printed  = 0;
+        (*s)->totalops = 0;
+        for (i=0; i<OP_NumTypes; i++) (*s)->stat[i] = 0;
+    }
+
+    (*s)->totalops++;
+    (*s)->stat[op]++;
+    if (entry)
+    {
+        entry->totalops++;
+        entry->stat[op]++;
+    }
+}
+
+mDNSlocal void printstats(int max)
+{
+    int i;
+    if (!stats) return;
+    for (i=0; i<max; i++)
+    {
+        int max = 0;
+        ActivityStat *s, *m = NULL;
+        for (s = stats; s; s=s->next)
+            if (!s->printed && max < s->totalops)
+            { m = s; max = s->totalops; }
+        if (!m) return;
+        m->printed = mDNStrue;
+        if (i==0) mprintf("%-25s%s\n", "Service Type", OPBanner);
+        mprintf("%##-25s%8d %8d %8d %8d %8d %8d %8d\n", m->srvtype.c, m->totalops, m->stat[OP_probe],
+                m->stat[OP_goodbye], m->stat[OP_browseq], m->stat[OP_browsea], m->stat[OP_resolveq], m->stat[OP_resolvea]);
+    }
+}
+
+mDNSlocal const mDNSu8 *FindUpdate(mDNS *const m, const DNSMessage *const query, const mDNSu8 *ptr, const mDNSu8 *const end,
+                                   DNSQuestion *q, LargeCacheRecord *pkt)
+{
+    int i;
+    for (i = 0; i < query->h.numAuthorities; i++)
+    {
+        const mDNSu8 *p2 = ptr;
+        ptr = GetLargeResourceRecord(m, query, ptr, end, q->InterfaceID, kDNSRecordTypePacketAuth, pkt);
+        if (!ptr) break;
+        if (m->rec.r.resrec.RecordType != kDNSRecordTypePacketNegative && ResourceRecordAnswersQuestion(&pkt->r.resrec, q)) return(p2);
+    }
+    return(mDNSNULL);
+}
+
+mDNSlocal void DisplayPacketHeader(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end, const mDNSAddr *srcaddr, mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSInterfaceID InterfaceID)
+{
+    const char *const ptype =   (msg->h.flags.b[0] & kDNSFlag0_QR_Response)             ? "-R- " :
+                              (srcport.NotAnInteger == MulticastDNSPort.NotAnInteger) ? "-Q- " : "-LQ-";
+
+    struct timeval tv;
+    struct tm tm;
+    const mDNSu32 index = mDNSPlatformInterfaceIndexfromInterfaceID(m, InterfaceID, mDNSfalse);
+    char if_name[IFNAMSIZ];     // Older Linux distributions don't define IF_NAMESIZE
+    if_indextoname(index, if_name);
+    gettimeofday(&tv, NULL);
+    localtime_r((time_t*)&tv.tv_sec, &tm);
+    mprintf("\n%d:%02d:%02d.%06d Interface %d/%s\n", tm.tm_hour, tm.tm_min, tm.tm_sec, tv.tv_usec, index, if_name);
+
+    mprintf("%#-16a %s             Q:%3d  Ans:%3d  Auth:%3d  Add:%3d  Size:%5d bytes",
+            srcaddr, ptype, msg->h.numQuestions, msg->h.numAnswers, msg->h.numAuthorities, msg->h.numAdditionals, end - (mDNSu8 *)msg);
+
+    if (msg->h.id.NotAnInteger) mprintf("  ID:%u", mDNSVal16(msg->h.id));
+
+    if (!mDNSAddrIsDNSMulticast(dstaddr)) mprintf("   To: %#a", dstaddr);
+
+    if (msg->h.flags.b[0] & kDNSFlag0_TC)
+    {
+        if (msg->h.flags.b[0] & kDNSFlag0_QR_Response) mprintf("   Truncated");
+        else mprintf("   Truncated (KA list continues in next packet)");
+    }
+    mprintf("\n");
+}
+
+mDNSlocal void DisplayResourceRecord(const mDNSAddr *const srcaddr, const char *const op, const ResourceRecord *const pktrr)
+{
+    static const char hexchars[16] = "0123456789ABCDEF";
+    #define MaxWidth 132
+    char buffer[MaxWidth+8];
+    char *p = buffer;
+
+    RDataBody *rd = &pktrr->rdata->u;
+    mDNSu8 *rdend = (mDNSu8 *)rd + pktrr->rdlength;
+    int n = mprintf("%#-16a %-5s %-5s%5lu %##s -> ", srcaddr, op, DNSTypeName(pktrr->rrtype), pktrr->rroriginalttl, pktrr->name->c);
+
+    if (pktrr->RecordType == kDNSRecordTypePacketNegative) { mprintf("**** ERROR: FAILED TO READ RDATA ****\n"); return; }
+
+    // The kDNSType_OPT case below just calls GetRRDisplayString_rdb
+    // Perhaps more (or all?) of the cases should do that?
+    switch(pktrr->rrtype)
+    {
+    case kDNSType_A:    n += mprintf("%.4a", &rd->ipv4); break;
+    case kDNSType_PTR:  n += mprintf("%##.*s", MaxWidth - n, rd->name.c); break;
+    case kDNSType_HINFO:    // same as kDNSType_TXT below
+    case kDNSType_TXT:  {
+        mDNSu8 *t = rd->txt.c;
+        while (t < rdend && t[0] && p < buffer+MaxWidth)
+        {
+            int i;
+            for (i=1; i<=t[0] && p < buffer+MaxWidth; i++)
+            {
+                if (t[i] == '\\') *p++ = '\\';
+                if (t[i] >= ' ') *p++ = t[i];
+                else
+                {
+                    *p++ = '\\';
+                    *p++ = '0';
+                    *p++ = 'x';
+                    *p++ = hexchars[t[i] >> 4];
+                    *p++ = hexchars[t[i] & 0xF];
+                }
+            }
+            t += 1+t[0];
+            if (t < rdend && t[0]) { *p++ = '\\'; *p++ = ' '; }
+        }
+        *p++ = 0;
+        n += mprintf("%.*s", MaxWidth - n, buffer);
+    } break;
+    case kDNSType_AAAA: n += mprintf("%.16a", &rd->ipv6); break;
+    case kDNSType_SRV:  n += mprintf("%##s:%d", rd->srv.target.c, mDNSVal16(rd->srv.port)); break;
+    case kDNSType_OPT:  {
+        char b[MaxMsg];
+        // Quick hack: we don't want the prefix that GetRRDisplayString_rdb puts at the start of its
+        // string, because it duplicates the name and rrtype we already display, so we compute the
+        // length of that prefix and strip that many bytes off the beginning of the string we display.
+        mDNSu32 striplen = mDNS_snprintf(b, MaxMsg-1, "%4d %##s %s ", pktrr->rdlength, pktrr->name->c, DNSTypeName(pktrr->rrtype));
+        GetRRDisplayString_rdb(pktrr, &pktrr->rdata->u, b);
+        n += mprintf("%.*s", MaxWidth - n, b + striplen);
+    } break;
+    case kDNSType_NSEC: {
+        char b[MaxMsg];
+        // See the quick hack above
+        mDNSu32 striplen = mDNS_snprintf(b, MaxMsg-1, "%4d %##s %s ", pktrr->rdlength, pktrr->name->c, DNSTypeName(pktrr->rrtype));
+        GetRRDisplayString_rdb(pktrr, &pktrr->rdata->u, b);
+        n += mprintf("%s", b+striplen);
+    } break;
+    default:            {
+        mDNSu8 *s = rd->data;
+        while (s < rdend && p < buffer+MaxWidth)
+        {
+            if (*s == '\\') *p++ = '\\';
+            if (*s >= ' ') *p++ = *s;
+            else
+            {
+                *p++ = '\\';
+                *p++ = '0';
+                *p++ = 'x';
+                *p++ = hexchars[*s >> 4];
+                *p++ = hexchars[*s & 0xF];
+            }
+            s++;
+        }
+        *p++ = 0;
+        n += mprintf("%.*s", MaxWidth - n, buffer);
+    } break;
+    }
+
+    mprintf("\n");
+}
+
+mDNSlocal void HexDump(const mDNSu8 *ptr, const mDNSu8 *const end)
+{
+    while (ptr < end)
+    {
+        int i;
+        for (i=0; i<16; i++)
+            if (&ptr[i] < end) mprintf("%02X ", ptr[i]);
+            else mprintf("   ");
+        for (i=0; i<16; i++)
+            if (&ptr[i] < end) mprintf("%c", ptr[i] <= ' ' || ptr[i] >= 126 ? '.' : ptr[i]);
+        ptr += 16;
+        mprintf("\n");
+    }
+}
+
+mDNSlocal void DisplayError(const mDNSAddr *srcaddr, const mDNSu8 *ptr, const mDNSu8 *const end, char *msg)
+{
+    mprintf("%#-16a **** ERROR: FAILED TO READ %s **** \n", srcaddr, msg);
+    HexDump(ptr, end);
+}
+
+mDNSlocal void DisplayQuery(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *const end,
+                            const mDNSAddr *srcaddr, mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    const mDNSu8 *ptr = msg->data;
+    const mDNSu8 *auth = LocateAuthorities(msg, end);
+    mDNSBool MQ = (srcport.NotAnInteger == MulticastDNSPort.NotAnInteger);
+    HostEntry *entry = GotPacketFromHost(srcaddr, MQ ? HostPkt_Q : HostPkt_L, msg->h.id);
+    LargeCacheRecord pkt;
+
+    DisplayPacketHeader(m, msg, end, srcaddr, srcport, dstaddr, InterfaceID);
+    if (msg->h.id.NotAnInteger != 0xFFFF)
+    {
+        if (MQ) NumPktQ++;else NumPktL++;
+    }
+
+    for (i=0; i<msg->h.numQuestions; i++)
+    {
+        DNSQuestion q;
+        mDNSu8 *p2 = (mDNSu8 *)getQuestion(msg, ptr, end, InterfaceID, &q);
+        mDNSu16 ucbit = q.qclass & kDNSQClass_UnicastResponse;
+        q.qclass &= ~kDNSQClass_UnicastResponse;
+        if (!p2) { DisplayError(srcaddr, ptr, end, "QUESTION"); return; }
+        ptr = p2;
+        p2 = (mDNSu8 *)FindUpdate(m, msg, auth, end, &q, &pkt);
+        if (p2)
+        {
+            NumProbes++;
+            DisplayResourceRecord(srcaddr, ucbit ? "(PU)" : "(PM)", &pkt.r.resrec);
+            recordstat(entry, &q.qname, OP_probe, q.qtype);
+            p2 = (mDNSu8 *)skipDomainName(msg, p2, end);
+            // Having displayed this update record, clear type and class so we don't display the same one again.
+            p2[0] = p2[1] = p2[2] = p2[3] = 0;
+        }
+        else
+        {
+            const char *ptype = ucbit ? "(QU)" : "(QM)";
+            if (srcport.NotAnInteger == MulticastDNSPort.NotAnInteger) NumQuestions++;
+            else { NumLegacy++; ptype = "(LQ)"; }
+            mprintf("%#-16a %-5s %-5s      %##s\n", srcaddr, ptype, DNSTypeName(q.qtype), q.qname.c);
+            if (msg->h.id.NotAnInteger != 0xFFFF) recordstat(entry, &q.qname, OP_query, q.qtype);
+        }
+    }
+
+    for (i=0; i<msg->h.numAnswers; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAns, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "KNOWN ANSWER"); return; }
+        DisplayResourceRecord(srcaddr, "(KA)", &pkt.r.resrec);
+
+        // In the case of queries with long multi-packet KA lists, we count each subsequent KA packet
+        // the same as a single query, to more accurately reflect the burden on the network
+        // (A query with a six-packet KA list is *at least* six times the burden on the network as a single-packet query.)
+        if (msg->h.numQuestions == 0 && i == 0)
+            recordstat(entry, pkt.r.resrec.name, OP_query, pkt.r.resrec.rrtype);
+    }
+
+    for (i=0; i<msg->h.numAuthorities; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAuth, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "AUTHORITY"); return; }
+        // After we display an Update record with its matching question (above) we zero out its type and class
+        // If any remain that haven't been zero'd out, display them here
+        if (pkt.r.resrec.rrtype || pkt.r.resrec.rrclass) DisplayResourceRecord(srcaddr, "(AU)", &pkt.r.resrec);
+    }
+
+    for (i=0; i<msg->h.numAdditionals; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAdd, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "ADDITIONAL"); return; }
+        DisplayResourceRecord(srcaddr, pkt.r.resrec.rrtype == kDNSType_OPT ? "(OP)" : "(AD)", &pkt.r.resrec);
+    }
+
+    if (entry) AnalyseHost(m, entry, InterfaceID);
+}
+
+mDNSlocal void DisplayResponse(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *end,
+                               const mDNSAddr *srcaddr, mDNSIPPort srcport, const mDNSAddr *dstaddr, const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    const mDNSu8 *ptr = msg->data;
+    HostEntry *entry = GotPacketFromHost(srcaddr, HostPkt_R, msg->h.id);
+    LargeCacheRecord pkt;
+
+    DisplayPacketHeader(m, msg, end, srcaddr, srcport, dstaddr, InterfaceID);
+    if (msg->h.id.NotAnInteger != 0xFFFF) NumPktR++;
+
+    for (i=0; i<msg->h.numQuestions; i++)
+    {
+        DNSQuestion q;
+        const mDNSu8 *ep = ptr;
+        ptr = getQuestion(msg, ptr, end, InterfaceID, &q);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "QUESTION"); return; }
+        if (mDNSAddrIsDNSMulticast(dstaddr))
+            mprintf("%#-16a (?)   **** ERROR: SHOULD NOT HAVE Q IN mDNS RESPONSE **** %-5s %##s\n", srcaddr, DNSTypeName(q.qtype), q.qname.c);
+        else
+            mprintf("%#-16a (Q)   %-5s      %##s\n", srcaddr, DNSTypeName(q.qtype), q.qname.c);
+    }
+
+    for (i=0; i<msg->h.numAnswers; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAns, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "ANSWER"); return; }
+        if (pkt.r.resrec.rroriginalttl)
+        {
+            NumAnswers++;
+            DisplayResourceRecord(srcaddr, (pkt.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask) ? "(AN)" : "(AN+)", &pkt.r.resrec);
+            if (msg->h.id.NotAnInteger != 0xFFFF) recordstat(entry, pkt.r.resrec.name, OP_answer, pkt.r.resrec.rrtype);
+            if (entry) RecordHostInfo(entry, &pkt.r.resrec);
+        }
+        else
+        {
+            NumGoodbyes++;
+            DisplayResourceRecord(srcaddr, "(DE)", &pkt.r.resrec);
+            recordstat(entry, pkt.r.resrec.name, OP_goodbye, pkt.r.resrec.rrtype);
+        }
+    }
+
+    for (i=0; i<msg->h.numAuthorities; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAuth, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "AUTHORITY"); return; }
+        if (pkt.r.resrec.rrtype != kDNSType_NSEC3)
+            mprintf("%#-16a (?)  **** ERROR: SHOULD NOT HAVE AUTHORITY IN mDNS RESPONSE **** %-5s %##s\n",
+                    srcaddr, DNSTypeName(pkt.r.resrec.rrtype), pkt.r.resrec.name->c);
+    }
+
+    for (i=0; i<msg->h.numAdditionals; i++)
+    {
+        const mDNSu8 *ep = ptr;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAdd, &pkt);
+        if (!ptr) { DisplayError(srcaddr, ep, end, "ADDITIONAL"); return; }
+        NumAdditionals++;
+        DisplayResourceRecord(srcaddr,
+                              pkt.r.resrec.rrtype == kDNSType_OPT ? "(OP)" : (pkt.r.resrec.RecordType & kDNSRecordTypePacketUniqueMask) ? "(AD)" : "(AD+)",
+                              &pkt.r.resrec);
+        if (entry) RecordHostInfo(entry, &pkt.r.resrec);
+    }
+
+    if (entry) AnalyseHost(m, entry, InterfaceID);
+}
+
+mDNSlocal void ProcessUnicastResponse(mDNS *const m, const DNSMessage *const msg, const mDNSu8 *end, const mDNSAddr *srcaddr, const mDNSInterfaceID InterfaceID)
+{
+    int i;
+    const mDNSu8 *ptr = LocateAnswers(msg, end);
+    HostEntry *entry = GotPacketFromHost(srcaddr, HostPkt_R, msg->h.id);
+    //mprintf("%#a R\n", srcaddr);
+
+    for (i=0; i<msg->h.numAnswers + msg->h.numAuthorities + msg->h.numAdditionals; i++)
+    {
+        LargeCacheRecord pkt;
+        ptr = GetLargeResourceRecord(m, msg, ptr, end, InterfaceID, kDNSRecordTypePacketAns, &pkt);
+        if (ptr && pkt.r.resrec.rroriginalttl && entry) RecordHostInfo(entry, &pkt.r.resrec);
+    }
+}
+
+mDNSlocal mDNSBool AddressMatchesFilterList(const mDNSAddr *srcaddr)
+{
+    FilterList *f;
+    if (!Filters) return(srcaddr->type == mDNSAddrType_IPv4);
+    for (f=Filters; f; f=f->next) if (mDNSSameAddress(srcaddr, &f->FilterAddr)) return(mDNStrue);
+    return(mDNSfalse);
+}
+
+mDNSexport void mDNSCoreReceive(mDNS *const m, DNSMessage *const msg, const mDNSu8 *const end,
+                                const mDNSAddr *srcaddr, mDNSIPPort srcport, const mDNSAddr *dstaddr, mDNSIPPort dstport, const mDNSInterfaceID InterfaceID)
+{
+    const mDNSu8 StdQ = kDNSFlag0_QR_Query    | kDNSFlag0_OP_StdQuery;
+    const mDNSu8 StdR = kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery;
+    const mDNSu8 QR_OP = (mDNSu8)(msg->h.flags.b[0] & kDNSFlag0_QROP_Mask);
+    mDNSu8 *ptr = (mDNSu8 *)&msg->h.numQuestions;
+    int goodinterface = (FilterInterface == 0);
+
+    (void)dstaddr;  // Unused
+    (void)dstport;  // Unused
+
+    // Read the integer parts which are in IETF byte-order (MSB first, LSB second)
+    msg->h.numQuestions   = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+    msg->h.numAnswers     = (mDNSu16)((mDNSu16)ptr[2] <<  8 | ptr[3]);
+    msg->h.numAuthorities = (mDNSu16)((mDNSu16)ptr[4] <<  8 | ptr[5]);
+    msg->h.numAdditionals = (mDNSu16)((mDNSu16)ptr[6] <<  8 | ptr[7]);
+
+    // For now we're only interested in monitoring IPv4 traffic.
+    // All IPv6 packets should just be duplicates of the v4 packets.
+    if (!goodinterface) goodinterface = (FilterInterface == (int)mDNSPlatformInterfaceIndexfromInterfaceID(m, InterfaceID, mDNSfalse));
+    if (goodinterface && AddressMatchesFilterList(srcaddr))
+    {
+        mDNS_Lock(m);
+        if (!mDNSAddrIsDNSMulticast(dstaddr))
+        {
+            if      (QR_OP == StdQ) mprintf("Unicast query from %#a\n", srcaddr);
+            else if (QR_OP == StdR) ProcessUnicastResponse(m, msg, end, srcaddr,                   InterfaceID);
+        }
+        else
+        {
+            if      (QR_OP == StdQ) DisplayQuery          (m, msg, end, srcaddr, srcport, dstaddr, InterfaceID);
+            else if (QR_OP == StdR) DisplayResponse       (m, msg, end, srcaddr, srcport, dstaddr, InterfaceID);
+            else
+            {
+                debugf("Unknown DNS packet type %02X%02X (ignored)", msg->h.flags.b[0], msg->h.flags.b[1]);
+                GotPacketFromHost(srcaddr, HostPkt_B, msg->h.id);
+                NumPktB++;
+            }
+        }
+        mDNS_Unlock(m);
+    }
+}
+
+mDNSlocal mStatus mDNSNetMonitor(void)
+{
+    struct tm tm;
+    int h, m, s, mul, div, TotPkt;
+#if !defined(WIN32)
+    sigset_t signals;
+#endif
+
+    mStatus status = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                               mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
+                               mDNS_Init_DontAdvertiseLocalAddresses,
+                               mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (status) return(status);
+
+    gettimeofday(&tv_start, NULL);
+
+#if defined( WIN32 )
+    status = SetupInterfaceList(&mDNSStorage);
+    if (status) return(status);
+    gStopEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    if (gStopEvent == INVALID_HANDLE_VALUE) return mStatus_UnknownErr;
+    mDNSPollRegisterEvent( gStopEvent, StopNotification, NULL );
+    if (!SetConsoleCtrlHandler(ConsoleControlHandler, TRUE)) return mStatus_UnknownErr;
+    gRunning = mDNStrue; while (gRunning) mDNSPoll( INFINITE );
+    if (!SetConsoleCtrlHandler(ConsoleControlHandler, FALSE)) return mStatus_UnknownErr;
+    CloseHandle(gStopEvent);
+#else
+    mDNSPosixListenForSignalInEventLoop(SIGINT);
+    mDNSPosixListenForSignalInEventLoop(SIGTERM);
+
+    do
+    {
+        struct timeval timeout = { 0x3FFFFFFF, 0 };     // wait until SIGINT or SIGTERM
+        mDNSBool gotSomething;
+        mDNSPosixRunEventLoopOnce(&mDNSStorage, &timeout, &signals, &gotSomething);
+    }
+    while ( !( sigismember( &signals, SIGINT) || sigismember( &signals, SIGTERM)));
+#endif
+
+    // Now display final summary
+    TotPkt = NumPktQ + NumPktL + NumPktR;
+    gettimeofday(&tv_end, NULL);
+    tv_interval = tv_end;
+    if (tv_start.tv_usec > tv_interval.tv_usec)
+    { tv_interval.tv_usec += 1000000; tv_interval.tv_sec--; }
+    tv_interval.tv_sec  -= tv_start.tv_sec;
+    tv_interval.tv_usec -= tv_start.tv_usec;
+    h = (tv_interval.tv_sec / 3600);
+    m = (tv_interval.tv_sec % 3600) / 60;
+    s = (tv_interval.tv_sec % 60);
+    if (tv_interval.tv_sec > 10)
+    {
+        mul = 60;
+        div = tv_interval.tv_sec;
+    }
+    else
+    {
+        mul = 60000;
+        div = tv_interval.tv_sec * 1000 + tv_interval.tv_usec / 1000;
+        if (div == 0) div=1;
+    }
+
+    mprintf("\n\n");
+    localtime_r((time_t*)&tv_start.tv_sec, &tm);
+    mprintf("Started      %3d:%02d:%02d.%06d\n", tm.tm_hour, tm.tm_min, tm.tm_sec, tv_start.tv_usec);
+    localtime_r((time_t*)&tv_end.tv_sec, &tm);
+    mprintf("End          %3d:%02d:%02d.%06d\n", tm.tm_hour, tm.tm_min, tm.tm_sec, tv_end.tv_usec);
+    mprintf("Captured for %3d:%02d:%02d.%06d\n", h, m, s, tv_interval.tv_usec);
+    if (!Filters)
+    {
+        mprintf("Unique source addresses seen on network:");
+        if (IPv4HostList.num) mprintf(" %ld (IPv4)", IPv4HostList.num);
+        if (IPv6HostList.num) mprintf(" %ld (IPv6)", IPv6HostList.num);
+        if (!IPv4HostList.num && !IPv6HostList.num) mprintf(" None");
+        mprintf("\n");
+    }
+    mprintf("\n");
+    mprintf("Modern Query        Packets:      %7d   (avg%5d/min)\n", NumPktQ,        NumPktQ        * mul / div);
+    mprintf("Legacy Query        Packets:      %7d   (avg%5d/min)\n", NumPktL,        NumPktL        * mul / div);
+    mprintf("Multicast Response  Packets:      %7d   (avg%5d/min)\n", NumPktR,        NumPktR        * mul / div);
+    mprintf("Total     Multicast Packets:      %7d   (avg%5d/min)\n", TotPkt,         TotPkt         * mul / div);
+    mprintf("\n");
+    mprintf("Total New Service Probes:         %7d   (avg%5d/min)\n", NumProbes,      NumProbes      * mul / div);
+    mprintf("Total Goodbye Announcements:      %7d   (avg%5d/min)\n", NumGoodbyes,    NumGoodbyes    * mul / div);
+    mprintf("Total Query Questions:            %7d   (avg%5d/min)\n", NumQuestions,   NumQuestions   * mul / div);
+    mprintf("Total Queries from Legacy Clients:%7d   (avg%5d/min)\n", NumLegacy,      NumLegacy      * mul / div);
+    mprintf("Total Answers/Announcements:      %7d   (avg%5d/min)\n", NumAnswers,     NumAnswers     * mul / div);
+    mprintf("Total Additional Records:         %7d   (avg%5d/min)\n", NumAdditionals, NumAdditionals * mul / div);
+    mprintf("\n");
+    printstats(kReportTopServices);
+
+    if (!ExactlyOneFilter)
+    {
+        ShowSortedHostList(&IPv4HostList, kReportTopHosts);
+        ShowSortedHostList(&IPv6HostList, kReportTopHosts);
+    }
+
+    mDNS_Close(&mDNSStorage);
+    return(0);
+}
+
+mDNSexport int main(int argc, char **argv)
+{
+    const char *progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
+    int i;
+    mStatus status;
+
+#if defined(WIN32)
+    HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+#endif
+
+    setlinebuf(stdout);             // Want to see lines as they appear, not block buffered
+
+    for (i=1; i<argc; i++)
+    {
+        if (i+1 < argc && !strcmp(argv[i], "-i") && atoi(argv[i+1]))
+        {
+            FilterInterface = atoi(argv[i+1]);
+            i += 2;
+            printf("Monitoring interface %d\n", FilterInterface);
+        }
+        else
+        {
+            struct in_addr s4;
+            struct in6_addr s6;
+            FilterList *f;
+            mDNSAddr a;
+            a.type = mDNSAddrType_IPv4;
+
+            if (inet_pton(AF_INET, argv[i], &s4) == 1)
+                a.ip.v4.NotAnInteger = s4.s_addr;
+            else if (inet_pton(AF_INET6, argv[i], &s6) == 1)
+            {
+                a.type = mDNSAddrType_IPv6;
+                mDNSPlatformMemCopy(&a.ip.v6, &s6, sizeof(a.ip.v6));
+            }
+            else
+            {
+                struct hostent *h = gethostbyname(argv[i]);
+                if (h) a.ip.v4.NotAnInteger = *(long*)h->h_addr;
+                else goto usage;
+            }
+
+            f = malloc(sizeof(*f));
+            f->FilterAddr = a;
+            f->next = Filters;
+            Filters = f;
+        }
+    }
+
+    status = mDNSNetMonitor();
+    if (status) { fprintf(stderr, "%s: mDNSNetMonitor failed %d\n", progname, (int)status); return(status); }
+    return(0);
+
+usage:
+    fprintf(stderr, "\nmDNS traffic monitor\n");
+    fprintf(stderr, "Usage: %s [-i index] [host]\n", progname);
+    fprintf(stderr, "Optional [-i index] parameter displays only packets from that interface index\n");
+    fprintf(stderr, "Optional [host] parameter displays only packets from that host\n");
+
+    fprintf(stderr, "\nPer-packet header output:\n");
+    fprintf(stderr, "-Q-            Multicast Query from mDNS client that accepts multicast responses\n");
+    fprintf(stderr, "-R-            Multicast Response packet containing answers/announcements\n");
+    fprintf(stderr, "-LQ-           Multicast Query from legacy client that does *not* listen for multicast responses\n");
+    fprintf(stderr, "Q/Ans/Auth/Add Number of questions, answers, authority records and additional records in packet\n");
+
+    fprintf(stderr, "\nPer-record display:\n");
+    fprintf(stderr, "(PM)           Probe Question (new service starting), requesting multicast response\n");
+    fprintf(stderr, "(PU)           Probe Question (new service starting), requesting unicast response\n");
+    fprintf(stderr, "(DE)           Deletion/Goodbye (service going away)\n");
+    fprintf(stderr, "(LQ)           Legacy Query Question\n");
+    fprintf(stderr, "(QM)           Query Question, requesting multicast response\n");
+    fprintf(stderr, "(QU)           Query Question, requesting unicast response\n");
+    fprintf(stderr, "(KA)           Known Answer (information querier already knows)\n");
+    fprintf(stderr, "(AN)           Unique Answer to question (or periodic announcment) (entire RR Set)\n");
+    fprintf(stderr, "(AN+)          Answer to question (or periodic announcment) (add to existing RR Set members)\n");
+    fprintf(stderr, "(AD)           Unique Additional Record Set (entire RR Set)\n");
+    fprintf(stderr, "(AD+)          Additional records (add to existing RR Set members)\n");
+
+    fprintf(stderr, "\nFinal summary, sorted by service type:\n");
+    fprintf(stderr, "Probe          Probes for this service type starting up\n");
+    fprintf(stderr, "Goodbye        Goodbye (deletion) packets for this service type shutting down\n");
+    fprintf(stderr, "BrowseQ        Browse questions from clients browsing to find a list of instances of this service\n");
+    fprintf(stderr, "BrowseA        Browse answers/announcments advertising instances of this service\n");
+    fprintf(stderr, "ResolveQ       Resolve questions from clients actively connecting to an instance of this service\n");
+    fprintf(stderr, "ResolveA       Resolve answers/announcments giving connection information for an instance of this service\n");
+    fprintf(stderr, "\n");
+    return(-1);
+}
diff --git a/mDNSResponder/mDNSPosix/PosixDaemon.c b/mDNSResponder/mDNSPosix/PosixDaemon.c
new file mode 100644
index 00000000..88b3292c
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/PosixDaemon.c
@@ -0,0 +1,258 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    File:		daemon.c
+
+    Contains:	main & associated Application layer for mDNSResponder on Linux.
+
+ */
+
+#if __APPLE__
+// In Mac OS X 10.5 and later trying to use the daemon function gives a “‘daemon’ is deprecated”
+// error, which prevents compilation because we build with "-Werror".
+// Since this is supposed to be portable cross-platform code, we don't care that daemon is
+// deprecated on Mac OS X 10.5, so we use this preprocessor trick to eliminate the error message.
+#define daemon yes_we_know_that_daemon_is_deprecated_in_os_x_10_5_thankyou
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <sys/types.h>
+
+#if __APPLE__
+#undef daemon
+extern int daemon(int, int);
+#endif
+
+#include "mDNSEmbeddedAPI.h"
+#include "mDNSPosix.h"
+#include "mDNSUNP.h"        // For daemon()
+#include "uds_daemon.h"
+#include "PlatformCommon.h"
+
+#define CONFIG_FILE "/etc/mdnsd.conf"
+static domainname DynDNSZone;                // Default wide-area zone for service registration
+static domainname DynDNSHostname;
+
+#define RR_CACHE_SIZE 500
+static CacheEntity gRRCache[RR_CACHE_SIZE];
+static mDNS_PlatformSupport PlatformStorage;
+
+mDNSlocal void mDNS_StatusCallback(mDNS *const m, mStatus result)
+{
+    (void)m; // Unused
+    if (result == mStatus_NoError)
+    {
+        // On successful registration of dot-local mDNS host name, daemon may want to check if
+        // any name conflict and automatic renaming took place, and if so, record the newly negotiated
+        // name in persistent storage for next time. It should also inform the user of the name change.
+        // On Mac OS X we store the current dot-local mDNS host name in the SCPreferences store,
+        // and notify the user with a CFUserNotification.
+    }
+    else if (result == mStatus_ConfigChanged)
+    {
+        udsserver_handle_configchange(m);
+    }
+    else if (result == mStatus_GrowCache)
+    {
+        // Allocate another chunk of cache storage
+        CacheEntity *storage = malloc(sizeof(CacheEntity) * RR_CACHE_SIZE);
+        if (storage) mDNS_GrowCache(m, storage, RR_CACHE_SIZE);
+    }
+}
+
+// %%% Reconfigure() probably belongs in the platform support layer (mDNSPosix.c), not the daemon cde
+// -- all client layers running on top of mDNSPosix.c need to handle network configuration changes,
+// not only the Unix Domain Socket Daemon
+
+static void Reconfigure(mDNS *m)
+{
+    mDNSAddr DynDNSIP;
+    const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
+    mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
+    if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)
+        LogMsg("Unable to parse DNS server list. Unicast DNS-SD unavailable");
+    ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, &DynDNSHostname, &DynDNSZone, NULL);
+    mDNSPlatformSourceAddrForDest(&DynDNSIP, &dummy);
+    if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, &DynDNSHostname, NULL, NULL);
+    if (DynDNSIP.type) mDNS_SetPrimaryInterfaceInfo(m, &DynDNSIP, NULL, NULL);
+    mDNS_ConfigChanged(m);
+}
+
+// Do appropriate things at startup with command line arguments. Calls exit() if unhappy.
+mDNSlocal void ParseCmdLinArgs(int argc, char **argv)
+{
+    if (argc > 1)
+    {
+        if (0 == strcmp(argv[1], "-debug")) mDNS_DebugMode = mDNStrue;
+        else printf("Usage: %s [-debug]\n", argv[0]);
+    }
+
+    if (!mDNS_DebugMode)
+    {
+        int result = daemon(0, 0);
+        if (result != 0) { LogMsg("Could not run as daemon - exiting"); exit(result); }
+#if __APPLE__
+        LogMsg("The POSIX mdnsd should only be used on OS X for testing - exiting");
+        exit(-1);
+#endif
+    }
+}
+
+mDNSlocal void DumpStateLog(mDNS *const m)
+// Dump a little log of what we've been up to.
+{
+    LogMsg("---- BEGIN STATE LOG ----");
+    udsserver_info(m);
+    LogMsg("----  END STATE LOG  ----");
+}
+
+mDNSlocal mStatus MainLoop(mDNS *m) // Loop until we quit.
+{
+    sigset_t signals;
+    mDNSBool gotData = mDNSfalse;
+
+    mDNSPosixListenForSignalInEventLoop(SIGINT);
+    mDNSPosixListenForSignalInEventLoop(SIGTERM);
+    mDNSPosixListenForSignalInEventLoop(SIGUSR1);
+    mDNSPosixListenForSignalInEventLoop(SIGPIPE);
+    mDNSPosixListenForSignalInEventLoop(SIGHUP) ;
+
+    for (; ;)
+    {
+        // Work out how long we expect to sleep before the next scheduled task
+        struct timeval timeout;
+        mDNSs32 ticks;
+
+        // Only idle if we didn't find any data the last time around
+        if (!gotData)
+        {
+            mDNSs32 nextTimerEvent = mDNS_Execute(m);
+            nextTimerEvent = udsserver_idle(nextTimerEvent);
+            ticks = nextTimerEvent - mDNS_TimeNow(m);
+            if (ticks < 1) ticks = 1;
+        }
+        else    // otherwise call EventLoop again with 0 timemout
+            ticks = 0;
+
+        timeout.tv_sec = ticks / mDNSPlatformOneSecond;
+        timeout.tv_usec = (ticks % mDNSPlatformOneSecond) * 1000000 / mDNSPlatformOneSecond;
+
+        (void) mDNSPosixRunEventLoopOnce(m, &timeout, &signals, &gotData);
+
+        if (sigismember(&signals, SIGHUP )) Reconfigure(m);
+        if (sigismember(&signals, SIGUSR1)) DumpStateLog(m);
+        // SIGPIPE happens when we try to write to a dead client; death should be detected soon in request_callback() and cleaned up.
+        if (sigismember(&signals, SIGPIPE)) LogMsg("Received SIGPIPE - ignoring");
+        if (sigismember(&signals, SIGINT) || sigismember(&signals, SIGTERM)) break;
+    }
+    return EINTR;
+}
+
+int main(int argc, char **argv)
+{
+    mStatus err;
+
+    ParseCmdLinArgs(argc, argv);
+
+    LogMsg("%s starting", mDNSResponderVersionString);
+
+    err = mDNS_Init(&mDNSStorage, &PlatformStorage, gRRCache, RR_CACHE_SIZE, mDNS_Init_AdvertiseLocalAddresses,
+                    mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
+
+    if (mStatus_NoError == err)
+        err = udsserver_init(mDNSNULL, 0);
+
+    Reconfigure(&mDNSStorage);
+
+    // Now that we're finished with anything privileged, switch over to running as "nobody"
+    if (mStatus_NoError == err)
+    {
+        const struct passwd *pw = getpwnam("nobody");
+        if (pw != NULL)
+            setuid(pw->pw_uid);
+        else
+            LogMsg("WARNING: mdnsd continuing as root because user \"nobody\" does not exist");
+    }
+
+    if (mStatus_NoError == err)
+        err = MainLoop(&mDNSStorage);
+
+    LogMsg("%s stopping", mDNSResponderVersionString);
+
+    mDNS_Close(&mDNSStorage);
+
+    if (udsserver_exit() < 0)
+        LogMsg("ExitCallback: udsserver_exit failed");
+
+ #if MDNS_DEBUGMSGS > 0
+    printf("mDNSResponder exiting normally with %ld\n", err);
+ #endif
+
+    return err;
+}
+
+//		uds_daemon support		////////////////////////////////////////////////////////////
+
+mStatus udsSupportAddFDToEventLoop(int fd, udsEventCallback callback, void *context, void **platform_data)
+/* Support routine for uds_daemon.c */
+{
+    // Depends on the fact that udsEventCallback == mDNSPosixEventCallback
+    (void) platform_data;
+    return mDNSPosixAddFDToEventLoop(fd, callback, context);
+}
+
+int udsSupportReadFD(dnssd_sock_t fd, char *buf, int len, int flags, void *platform_data)
+{
+    (void) platform_data;
+    return recv(fd, buf, len, flags);
+}
+
+mStatus udsSupportRemoveFDFromEventLoop(int fd, void *platform_data)        // Note: This also CLOSES the file descriptor
+{
+    mStatus err = mDNSPosixRemoveFDFromEventLoop(fd);
+    (void) platform_data;
+    close(fd);
+    return err;
+}
+
+mDNSexport void RecordUpdatedNiceLabel(mDNS *const m, mDNSs32 delay)
+{
+    (void)m;
+    (void)delay;
+    // No-op, for now
+}
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = mDNSResponderVersionString_SCCS + 5;
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
+
+// For convenience when using the "strings" command, this is the last thing in the file
+#if mDNSResponderVersion > 1
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder-" STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+#elif MDNS_VERSIONSTR_NODTS
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build)";
+#else
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build) (" __DATE__ " " __TIME__ ")";
+#endif
diff --git a/mDNSResponder/mDNSPosix/ProxyResponder.c b/mDNSResponder/mDNSPosix/ProxyResponder.c
new file mode 100644
index 00000000..3982161d
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/ProxyResponder.c
@@ -0,0 +1,300 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>              // For printf()
+#include <stdlib.h>             // For exit() etc.
+#include <string.h>             // For strlen() etc.
+#include <unistd.h>             // For select()
+#include <signal.h>             // For SIGINT, SIGTERM
+#include <errno.h>              // For errno, EINTR
+#include <netinet/in.h>         // For INADDR_NONE
+#include <arpa/inet.h>          // For inet_addr()
+#include <netdb.h>              // For gethostbyname()
+
+#include "mDNSEmbeddedAPI.h"    // Defines the interface to the client layer above
+#include "mDNSPosix.h"          // Defines the specific types needed to run mDNS on this platform
+#include "ExampleClientApp.h"
+
+// Compatibility workaround: Solaris 2.5 has no INADDR_NONE
+#ifndef INADDR_NONE
+#define INADDR_NONE (mDNSu32)0xffffffff
+#endif
+
+//*************************************************************************************************************
+// Globals
+static mDNS mDNSStorage;       // mDNS core uses this to store its globals
+static mDNS_PlatformSupport PlatformStorage;  // Stores this platform's globals
+mDNSexport const char ProgramName[] = "mDNSProxyResponderPosix";
+
+//*************************************************************************************************************
+// Proxy Host Registration
+
+typedef struct
+{
+    mDNSv4Addr ip;
+    domainlabel hostlabel;      // Conforms to standard DNS letter-digit-hyphen host name rules
+    AuthRecord RR_A;        // 'A' (address) record for our ".local" name
+    AuthRecord RR_PTR;      // PTR (reverse lookup) record
+} ProxyHost;
+
+mDNSlocal void HostNameCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    ProxyHost *f = (ProxyHost*)rr->RecordContext;
+    if (result == mStatus_NoError)
+        debugf("Host name successfully registered: %##s", rr->resrec.name->c);
+    else
+    {
+        debugf("Host name conflict for %##s", rr->resrec.name->c);
+        mDNS_Deregister(m, &f->RR_A);
+        mDNS_Deregister(m, &f->RR_PTR);
+        exit(-1);
+    }
+}
+
+mDNSlocal mStatus mDNS_RegisterProxyHost(mDNS *m, ProxyHost *p)
+{
+    char buffer[32];
+
+    mDNS_SetupResourceRecord(&p->RR_A,   mDNSNULL, mDNSInterface_Any, kDNSType_A,   60, kDNSRecordTypeUnique,      AuthRecordAny, HostNameCallback, p);
+    mDNS_SetupResourceRecord(&p->RR_PTR, mDNSNULL, mDNSInterface_Any, kDNSType_PTR, 60, kDNSRecordTypeKnownUnique, AuthRecordAny, HostNameCallback, p);
+
+    p->RR_A.namestorage.c[0] = 0;
+    AppendDomainLabel(&p->RR_A.namestorage, &p->hostlabel);
+    AppendLiteralLabelString(&p->RR_A.namestorage, "local");
+
+    // Note: This is reverse order compared to a normal dotted-decimal IP address, so we can't use our customary "%.4a" format code
+    mDNS_snprintf(buffer, sizeof(buffer), "%d.%d.%d.%d.in-addr.arpa.", p->ip.b[3], p->ip.b[2], p->ip.b[1], p->ip.b[0]);
+    MakeDomainNameFromDNSNameString(&p->RR_PTR.namestorage, buffer);
+    p->RR_PTR.ForceMCast = mDNStrue; // This PTR points to our dot-local name, so don't ever try to write it into a uDNS server
+
+    p->RR_A.resrec.rdata->u.ipv4 = p->ip;
+    AssignDomainName(&p->RR_PTR.resrec.rdata->u.name, p->RR_A.resrec.name);
+
+    mDNS_Register(m, &p->RR_A);
+    mDNS_Register(m, &p->RR_PTR);
+
+    debugf("Made Proxy Host Records for %##s", p->RR_A.resrec.name->c);
+
+    return(mStatus_NoError);
+}
+
+//*************************************************************************************************************
+// Service Registration
+
+// This sample ServiceCallback just calls mDNS_RenameAndReregisterService to automatically pick a new
+// unique name for the service. For a device such as a printer, this may be appropriate.
+// For a device with a user interface, and a screen, and a keyboard, the appropriate
+// response may be to prompt the user and ask them to choose a new name for the service.
+mDNSlocal void ServiceCallback(mDNS *const m, ServiceRecordSet *const sr, mStatus result)
+{
+    switch (result)
+    {
+    case mStatus_NoError:      debugf("Callback: %##s Name Registered",    sr->RR_SRV.resrec.name->c); break;
+    case mStatus_NameConflict: debugf("Callback: %##s Name Conflict",      sr->RR_SRV.resrec.name->c); break;
+    case mStatus_MemFree:      debugf("Callback: %##s Memory Free",        sr->RR_SRV.resrec.name->c); break;
+    default:                   debugf("Callback: %##s Unknown Result %ld", sr->RR_SRV.resrec.name->c, result); break;
+    }
+
+    if (result == mStatus_NoError)
+    {
+        char buffer[MAX_ESCAPED_DOMAIN_NAME];
+        ConvertDomainNameToCString(sr->RR_SRV.resrec.name, buffer);
+        printf("Service %s now registered and active\n", buffer);
+    }
+
+    if (result == mStatus_NameConflict)
+    {
+        char buffer1[MAX_ESCAPED_DOMAIN_NAME], buffer2[MAX_ESCAPED_DOMAIN_NAME];
+        ConvertDomainNameToCString(sr->RR_SRV.resrec.name, buffer1);
+        mDNS_RenameAndReregisterService(m, sr, mDNSNULL);
+        ConvertDomainNameToCString(sr->RR_SRV.resrec.name, buffer2);
+        printf("Name Conflict! %s renamed as %s\n", buffer1, buffer2);
+    }
+}
+
+// RegisterService() is a simple wrapper function which takes C string
+// parameters, converts them to domainname parameters, and calls mDNS_RegisterService()
+mDNSlocal void RegisterService(mDNS *m, ServiceRecordSet *recordset,
+                               const char name[], const char type[], const char domain[],
+                               const domainname *host, mDNSu16 PortAsNumber, int argc, char **argv)
+{
+    domainlabel n;
+    domainname t, d;
+    unsigned char txtbuffer[1024], *bptr = txtbuffer;
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+
+    MakeDomainLabelFromLiteralString(&n, name);
+    MakeDomainNameFromDNSNameString(&t, type);
+    MakeDomainNameFromDNSNameString(&d, domain);
+    while (argc)
+    {
+        int len = strlen(argv[0]);
+        if (len > 255 || bptr + 1 + len >= txtbuffer + sizeof(txtbuffer)) break;
+        printf("STR: %s\n", argv[0]);
+        bptr[0] = len;
+        strcpy((char*)(bptr+1), argv[0]);
+        bptr += 1 + len;
+        argc--;
+        argv++;
+    }
+
+    mDNS_RegisterService(m, recordset,
+                         &n, &t, &d, // Name, type, domain
+                         host, mDNSOpaque16fromIntVal(PortAsNumber),
+                         txtbuffer, bptr-txtbuffer, // TXT data, length
+                         mDNSNULL, 0, // Subtypes
+                         mDNSInterface_Any, // Interface ID
+                         ServiceCallback, mDNSNULL, 0); // Callback, context, flags
+
+    ConvertDomainNameToCString(recordset->RR_SRV.resrec.name, buffer);
+    printf("Made Service Records for %s\n", buffer);
+}
+
+//*************************************************************************************************************
+// Service non-existence assertion
+// (claiming a service name without actually providing a service at that name, to prevent anyone else using that name)
+// This is useful to avoid confusion between similar services
+// e.g. A printer that implements IPP printing service using the name "My Printer", but doesn't implement LPR service,
+// should also claim the LPR service name "My Printer" to stop a different printer offering LPR service under the same name,
+// since it would be confusing to users to have two equivalent services with the same name.
+
+mDNSlocal void NoSuchServiceCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    const domainname *proxyhostname = (const domainname *)rr->RecordContext;
+    switch (result)
+    {
+    case mStatus_NoError:      debugf("Callback: %##s Name Registered",    rr->resrec.name->c); break;
+    case mStatus_NameConflict: debugf("Callback: %##s Name Conflict",      rr->resrec.name->c); break;
+    case mStatus_MemFree:      debugf("Callback: %##s Memory Free",        rr->resrec.name->c); break;
+    default:                   debugf("Callback: %##s Unknown Result %ld", rr->resrec.name->c, result); break;
+    }
+
+    if (result == mStatus_NoError)
+    {
+        char buffer[MAX_ESCAPED_DOMAIN_NAME];
+        ConvertDomainNameToCString(rr->resrec.name, buffer);
+        printf("Non-existence assertion %s now registered and active\n", buffer);
+    }
+
+    if (result == mStatus_NameConflict)
+    {
+        domainlabel n;
+        domainname t, d;
+        char buffer1[MAX_ESCAPED_DOMAIN_NAME], buffer2[MAX_ESCAPED_DOMAIN_NAME];
+        ConvertDomainNameToCString(rr->resrec.name, buffer1);
+        DeconstructServiceName(rr->resrec.name, &n, &t, &d);
+        IncrementLabelSuffix(&n, mDNStrue);
+        mDNS_RegisterNoSuchService(m, rr, &n, &t, &d, proxyhostname, mDNSInterface_Any, NoSuchServiceCallback, mDNSNULL, 0);
+        ConvertDomainNameToCString(rr->resrec.name, buffer2);
+        printf("Name Conflict! %s renamed as %s\n", buffer1, buffer2);
+    }
+}
+
+mDNSlocal void RegisterNoSuchService(mDNS *m, AuthRecord *const rr, domainname *proxyhostname,
+                                     const char name[], const char type[], const char domain[])
+{
+    domainlabel n;
+    domainname t, d;
+    char buffer[MAX_ESCAPED_DOMAIN_NAME];
+    MakeDomainLabelFromLiteralString(&n, name);
+    MakeDomainNameFromDNSNameString(&t, type);
+    MakeDomainNameFromDNSNameString(&d, domain);
+    mDNS_RegisterNoSuchService(m, rr, &n, &t, &d, proxyhostname, mDNSInterface_Any, NoSuchServiceCallback, proxyhostname, 0);
+    ConvertDomainNameToCString(rr->resrec.name, buffer);
+    printf("Made Non-existence Record for %s\n", buffer);
+}
+
+//*************************************************************************************************************
+// Main
+
+mDNSexport int main(int argc, char **argv)
+{
+    mStatus status;
+    sigset_t signals;
+
+    if (argc < 3) goto usage;
+
+    status = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                       mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
+                       mDNS_Init_DontAdvertiseLocalAddresses,
+                       mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %d\n", (int)status); return(status); }
+
+    mDNSPosixListenForSignalInEventLoop(SIGINT);
+    mDNSPosixListenForSignalInEventLoop(SIGTERM);
+
+    if (!strcmp(argv[1], "-"))
+    {
+        domainname proxyhostname;
+        AuthRecord proxyrecord;
+        if (argc < 5) goto usage;
+        proxyhostname.c[0] = 0;
+        AppendLiteralLabelString(&proxyhostname, argv[2]);
+        AppendLiteralLabelString(&proxyhostname, "local");
+        RegisterNoSuchService(&mDNSStorage, &proxyrecord, &proxyhostname, argv[3], argv[4], "local.");
+    }
+    else
+    {
+        ProxyHost proxyhost;
+        ServiceRecordSet proxyservice;
+
+        proxyhost.ip.NotAnInteger = inet_addr(argv[1]);
+        if (proxyhost.ip.NotAnInteger == INADDR_NONE)   // INADDR_NONE is 0xFFFFFFFF
+        {
+            struct hostent *h = gethostbyname(argv[1]);
+            if (h) proxyhost.ip.NotAnInteger = *(long*)h->h_addr;
+        }
+        if (proxyhost.ip.NotAnInteger == INADDR_NONE)   // INADDR_NONE is 0xFFFFFFFF
+        {
+            fprintf(stderr, "%s is not valid host address\n", argv[1]);
+            return(-1);
+        }
+
+        MakeDomainLabelFromLiteralString(&proxyhost.hostlabel, argv[2]);
+
+        mDNS_RegisterProxyHost(&mDNSStorage, &proxyhost);
+
+        if (argc >=6)
+            RegisterService(&mDNSStorage, &proxyservice, argv[3], argv[4], "local.",
+                            proxyhost.RR_A.resrec.name, atoi(argv[5]), argc-6, &argv[6]);
+    }
+
+    do
+    {
+        struct timeval timeout = { 0x3FFFFFFF, 0 };     // wait until SIGINT or SIGTERM
+        mDNSBool gotSomething;
+        mDNSPosixRunEventLoopOnce(&mDNSStorage, &timeout, &signals, &gotSomething);
+    }
+    while ( !( sigismember( &signals, SIGINT) || sigismember( &signals, SIGTERM)));
+
+    mDNS_Close(&mDNSStorage);
+
+    return(0);
+
+usage:
+    fprintf(stderr, "%s ip hostlabel [srvname srvtype port txt [txt ...]]\n", argv[0]);
+    fprintf(stderr, "ip        Real IP address (or valid host name) of the host where the service actually resides\n");
+    fprintf(stderr, "hostlabel First label of the dot-local host name to create for this host, e.g. \"foo\" for \"foo.local.\"\n");
+    fprintf(stderr, "srvname   Descriptive name of service, e.g. \"Stuart's Ink Jet Printer\"\n");
+    fprintf(stderr, "srvtype   IANA service type, e.g. \"_ipp._tcp\" or \"_ssh._tcp\", etc.\n");
+    fprintf(stderr, "port      Port number where the service resides (1-65535)\n");
+    fprintf(stderr, "txt       Additional name/value pairs specified in service definition, e.g. \"pdl=application/postscript\"\n");
+    fprintf(stderr, "e.g. %s 169.254.12.34 thehost                                (just create a dot-local host name)\n", argv[0]);
+    fprintf(stderr, "or   %s 169.254.12.34 thehost \"My Printer\" _printer._tcp. 515 rp=lpt1 pdl=application/postscript\n", argv[0]);
+    fprintf(stderr, "or   %s -             thehost \"My Printer\" _printer._tcp.           (assertion of non-existence)\n", argv[0]);
+    return(-1);
+}
diff --git a/mDNSResponder/mDNSPosix/ReadMe.txt b/mDNSResponder/mDNSPosix/ReadMe.txt
new file mode 100755
index 00000000..c2f56412
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/ReadMe.txt
@@ -0,0 +1,314 @@
+ReadMe About mDNSPosix
+----------------------
+
+mDNSPosix is a port of Apple's Multicast DNS and DNS Service Discovery
+code to Posix platforms.
+
+Multicast DNS and DNS Service Discovery are technologies that allow you
+to register IP-based services and browse the network for those services.
+For more information about mDNS, see the mDNS web site.
+
+  <http://www.multicastdns.org/>
+
+Multicast DNS is part of a family of technologies resulting from the
+efforts of the IETF Zeroconf working group.  For information about
+other Zeroconf technologies, see the Zeroconf web site.
+
+  <http://www.zeroconf.org/>
+
+Apple uses the trade mark "Bonjour" to describe our implementation of
+Zeroconf technologies.  This sample is designed to show how easy it is
+to make a device "Bonjour compatible".
+
+The "Bonjour" trade mark can also be licensed at no charge for
+inclusion on your own products, packaging, manuals, promotional
+materials, or web site. For details and licensing terms, see
+
+  <http://developer.apple.com/bonjour/>
+
+The code in this sample was compiled and tested on Mac OS X (10.1.x,
+10.2, 10.3), Solaris (SunOS 5.8), Linux (Redhat 2.4.9-21, Fedora Core 1), 
+and OpenBSD (2.9). YMMV.
+
+
+Packing List
+------------
+
+The sample uses the following directories:
+
+o mDNSCore -- A directory containing the core mDNS code.  This code
+  is written in pure ANSI C and has proved to be very portable.
+  Every platform needs this core protocol engine code.
+
+o mDNSShared -- A directory containing useful code that's not core to
+  the main protocol engine itself, but nonetheless useful, and used by
+  more than one (but not necessarily all) platforms.
+
+o mDNSPosix -- The files that are specific to Posix platforms: Linux,
+  Solaris, FreeBSD, NetBSD, OpenBSD, etc. This code will also work on
+  OS X, though that's not its primary purpose.
+
+o Clients -- Example client code showing how to use the API to the
+  services provided by the daemon.
+
+
+Building the Code
+-----------------
+
+The sample does not use autoconf technology, primarily because I didn't
+want to delay shipping while I learnt how to use it.  Thus the code
+builds using a very simple make file.  To build the sample you should
+cd to the mDNSPosix directory and type "make os=myos", e.g.
+
+    make os=panther
+
+For Linux you would change that to:
+
+    make os=linux
+
+There are definitions for each of the platforms I ported to.  If you're
+porting to any other platform please add appropriate definitions for it
+and send us the diffs so they can be incorporated into the main
+distribution.
+
+
+Using the Sample
+----------------
+When you compile, you will get:
+
+o Main products for general-purpose use (e.g. on a desktop computer):
+  - mdnsd
+  - libmdns
+  - nss_mdns (See nss_ReadMe.txt for important information about nss_mdns)
+
+o Standalone products for dedicated devices (printer, network camera, etc.)
+  - mDNSClientPosix
+  - mDNSResponderPosix
+  - mDNSProxyResponderPosix
+
+o Testing and Debugging tools
+  - dns-sd command-line tool (from the "Clients" folder)
+  - mDNSNetMonitor
+  - mDNSIdentify
+
+As root type "make install" to install eight things:
+o mdnsd                   (usually in /usr/sbin)
+o libmdns                 (usually in /usr/lib)
+o dns_sd.h                (usually in /usr/include)
+o startup scripts         (e.g. in /etc/rc.d)
+o manual pages            (usually in /usr/share/man)
+o dns-sd tool             (usually in /usr/bin)
+o nss_mdns                (usually in /lib)
+o nss configuration files (usually in /etc)
+
+The "make install" concludes by executing the startup script
+(usually "/etc/init.d/mdns start") to start the daemon running.
+You shouldn't need to reboot unless you really want to.
+
+Once the daemon is running, you can use the dns-sd test tool
+to exercise all the major functionality of the daemon. Running
+"dns-sd" with no arguments gives a summary of the available options.
+This test tool is also described in detail, with several examples,
+in Chapter 6 of the O'Reilly "Zero Configuration Networking" book.
+
+
+How It Works
+------------
+                                                   +--------------------+
+                                                   | Client Application |
+   +----------------+                              +--------------------+
+   |  uds_daemon.c  | <--- Unix Domain Socket ---> |      libmdns       |
+   +----------------+                              +--------------------+
+   |    mDNSCore    |
+   +----------------+
+   |  mDNSPosix.c   |
+   +----------------+
+
+mdnsd is divided into three sections.
+
+o mDNSCore is the main protocol engine
+o mDNSPosix.c provides the glue it needs to run on a Posix OS
+o uds_daemon.c exports a Unix Domain Socket interface to
+  the services provided by mDNSCore
+
+Client applications link with the libmdns, which implements the functions
+defined in the dns_sd.h header file, and implements the IPC protocol
+used to communicate over the Unix Domain Socket interface to the daemon.
+
+Note that, strictly speaking, nss_mdns could be just another client of
+mdnsd, linking with libmdns just like any other client. However, because
+of its central role in the normal operation of multicast DNS, it is built
+and installed along with the other essential system support components.
+
+
+Clients for Embedded Systems
+----------------------------
+
+For small devices with very constrained resources, with a single address
+space and (typically) no virtual memory, the uds_daemon.c/UDS/libmdns
+layer may be eliminated, and the Client Application may live directly
+on top of mDNSCore:
+
+    +--------------------+
+    | Client Application |
+    +--------------------+
+    |      mDNSCore      |
+    +--------------------+
+    |    mDNSPosix.c     |
+    +--------------------+
+
+Programming to this model is more work, so using the daemon and its
+library is recommended if your platform is capable of that.
+
+The runtime behaviour when using the embedded model is as follows:
+
+1. The application calls mDNS_Init, which in turns calls the platform
+   (mDNSPlatformInit).
+
+2. mDNSPlatformInit gets a list of interfaces (get_ifi_info) and registers
+   each one with the core (mDNS_RegisterInterface).  For each interface
+   it also creates a multicast socket (SetupSocket).
+
+3. The application then calls select() repeatedly to handle file descriptor
+   events. Before calling select() each time, the application calls
+   mDNSPosixGetFDSet() to give mDNSPosix.c a chance to add its own file
+   descriptors to the set, and then after select() returns, it calls
+   mDNSPosixProcessFDSet() to give mDNSPosix.c a chance to receive and
+   process any packets that may have arrived.
+
+4. When the core needs to send a UDP packet it calls
+   mDNSPlatformSendUDP.  That routines finds the interface that
+   corresponds to the source address requested by the core, and
+   sends the datagram using the UDP socket created for the
+   interface.  If the socket is flow send-side controlled it just
+   drops the packet.
+
+5. When SocketDataReady runs it uses a complex routine,
+   "recvfrom_flags", to actually receive the packet.  This is required
+   because the core needs information about the packet that is
+   only available via the "recvmsg" call, and that call is complex
+   to implement in a portable way.  I got my implementation of
+   "recvfrom_flags" from Stevens' "UNIX Network Programming", but
+   I had to modify it further to work with Linux.
+
+One thing to note is that the Posix platform code is very deliberately
+not multi-threaded.  I do everything from a main loop that calls
+"select()".  This is good because it avoids all the problems that often
+accompany multi-threaded code. If you decide to use threads in your
+platform, you will have to implement the mDNSPlatformLock() and
+mDNSPlatformUnlock() calls which are currently no-ops in mDNSPosix.c.
+
+
+Once you've built the embedded samples you can test them by first
+running the client, as shown below.
+
+  quinn% build/mDNSClientPosix
+  Hit ^C when you're bored waiting for responses.
+
+By default the client starts a search for AppleShare servers and then
+sits and waits, printing a message when services appear and disappear.
+
+To continue with the test you should start the responder in another
+shell window.
+
+  quinn% build/mDNSResponderPosix -n Foo
+
+This will start the responder and tell it to advertise a AppleShare
+service "Foo".  In the client window you will see the client print out
+the following as the service shows up on the network.
+
+  quinn% build/mDNSClientPosix
+  Hit ^C when you're bored waiting for responses.
+  *** Found name = 'Foo', type = '_afpovertcp._tcp.', domain = 'local.'
+
+Back in the responder window you can quit the responder cleanly using
+SIGINT (typically ^C).
+
+  quinn% build/mDNSResponderPosix -n Foo
+  ^C
+  quinn%
+
+As the responder quits it will multicast that the "Foo" service is
+disappearing and the client will see that notification and print a
+message to that effect (shown below).  Finally, when you're done with
+the client you can use SIGINT to quit it.
+
+  quinn% build/mDNSClientPosix
+  Hit ^C when you're bored waiting for responses.
+  *** Found name = 'Foo', type = '_afpovertcp._tcp.', domain = 'local.'
+  *** Lost  name = 'Foo', type = '_afpovertcp._tcp.', domain = 'local.'
+  ^C
+  quinn%
+
+If things don't work, try starting each program in verbose mode (using
+the "-v 1" option, or very verbose mode with "-v 2") to see if there's
+an obvious cause.
+
+That's it for the core functionality.  Each program supports a variety
+of other options.  For example, you can advertise and browse for a
+different service type using the "-t type" option.  Use the "-?" option
+on each program for more user-level information.
+
+
+Caveats
+-------
+Currently the program uses a simple make file.
+
+The Multicast DNS protocol can also operate locally over the loopback
+interface, but this exposed some problems with the underlying network
+stack in early versions of Mac OS X and may expose problems with other
+network stacks too.
+
+o On Mac OS X 10.1.x the code failed to start on the loopback interface
+  because the IP_ADD_MEMBERSHIP option returns ENOBUFS.
+
+o On Mac OS X 10.2 the loopback-only case failed because
+  "sendto" calls fails with error EHOSTUNREACH. (3016042)
+
+Consequently, the code will attempt service discovery on the loopback
+interface only if no other interfaces are available.
+
+I haven't been able to test the loopback-only case on other platforms
+because I don't have access to the physical machine.
+
+
+Licencing
+---------
+This source code is Open Source; for details see the "LICENSE" file.
+
+Credits and Version History
+---------------------------
+If you find any problems with this sample, mail <dts@apple.com> and I
+will try to fix them up.
+
+1.0a1 (Jul 2002) was a prerelease version that was distributed
+internally at Apple.
+
+1.0a2 (Jul 2002) was a prerelease version that was distributed
+internally at Apple.
+
+1.0a3 (Aug 2002) was the first shipping version.  The core mDNS code is
+the code from Mac OS 10.2 (Jaguar) GM.
+
+Share and Enjoy
+
+Apple Developer Technical Support
+Networking, Communications, Hardware
+
+6 Aug 2002
+
+Impact: A local network user may cause a denial of the Bonjour service
+Description: An error handling issue exists in the Bonjour Namespace
+Provider. A local network user may send a maliciously crafted multicast
+DNS packet leading to an unexpected termination of the Bonjour service.
+This update addresses the issue by performing additional validation of
+multicast DNS packets. This issue does not affect systems running Mac OS
+X or Windows.
+CVE-ID
+CVE-2011-0220 : JaeSeung Song of the Department of Computing at Imperial
+College London
+
+To Do List
+----------
+• port to a System V that's not Solaris
+• use sig_atomic_t for signal to main thread flags
diff --git a/mDNSResponder/mDNSPosix/Responder.c b/mDNSResponder/mDNSPosix/Responder.c
new file mode 100755
index 00000000..3996b7b9
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/Responder.c
@@ -0,0 +1,788 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if __APPLE__
+// In Mac OS X 10.5 and later trying to use the daemon function gives a “‘daemon’ is deprecated”
+// error, which prevents compilation because we build with "-Werror".
+// Since this is supposed to be portable cross-platform code, we don't care that daemon is
+// deprecated on Mac OS X 10.5, so we use this preprocessor trick to eliminate the error message.
+#define daemon yes_we_know_that_daemon_is_deprecated_in_os_x_10_5_thankyou
+#endif
+
+#include <assert.h>
+#include <stdio.h>          // For printf()
+#include <stdlib.h>         // For exit() etc.
+#include <string.h>         // For strlen() etc.
+#include <unistd.h>         // For select()
+#include <errno.h>          // For errno, EINTR
+#include <signal.h>
+#include <fcntl.h>
+
+#if __APPLE__
+#undef daemon
+extern int daemon(int, int);
+#endif
+
+#include "mDNSEmbeddedAPI.h" // Defines the interface to the client layer above
+#include "mDNSPosix.h"      // Defines the specific types needed to run mDNS on this platform
+#include "mDNSUNP.h"        // For daemon()
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Globals
+#endif
+
+static mDNS mDNSStorage;       // mDNS core uses this to store its globals
+static mDNS_PlatformSupport PlatformStorage;  // Stores this platform's globals
+
+mDNSexport const char ProgramName[] = "mDNSResponderPosix";
+
+static const char *gProgramName = ProgramName;
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Signals
+#endif
+
+static volatile mDNSBool gReceivedSigUsr1;
+static volatile mDNSBool gReceivedSigHup;
+static volatile mDNSBool gStopNow;
+
+// We support 4 signals.
+//
+// o SIGUSR1 toggles verbose mode on and off in debug builds
+// o SIGHUP  triggers the program to re-read its preferences.
+// o SIGINT  causes an orderly shutdown of the program.
+// o SIGQUIT causes a somewhat orderly shutdown (direct but dangerous)
+// o SIGKILL kills us dead (easy to implement :-)
+//
+// There are fatal race conditions in our signal handling, but there's not much
+// we can do about them while remaining within the Posix space.  Specifically,
+// if a signal arrives after we test the globals its sets but before we call
+// select, the signal will be dropped.  The user will have to send the signal
+// again.  Unfortunately, Posix does not have a "sigselect" to atomically
+// modify the signal mask and start a select.
+
+static void HandleSigUsr1(int sigraised)
+// If we get a SIGUSR1 we toggle the state of the
+// verbose mode.
+{
+    assert(sigraised == SIGUSR1);
+    gReceivedSigUsr1 = mDNStrue;
+}
+
+static void HandleSigHup(int sigraised)
+// A handler for SIGHUP that causes us to break out of the
+// main event loop when the user kill 1's us.  This has the
+// effect of triggered the main loop to deregister the
+// current services and re-read the preferences.
+{
+    assert(sigraised == SIGHUP);
+    gReceivedSigHup = mDNStrue;
+}
+
+static void HandleSigInt(int sigraised)
+// A handler for SIGINT that causes us to break out of the
+// main event loop when the user types ^C.  This has the
+// effect of quitting the program.
+{
+    assert(sigraised == SIGINT);
+
+    if (gMDNSPlatformPosixVerboseLevel > 0) {
+        fprintf(stderr, "\nSIGINT\n");
+    }
+    gStopNow = mDNStrue;
+}
+
+static void HandleSigQuit(int sigraised)
+// If we get a SIGQUIT the user is desperate and we
+// just call mDNS_Close directly.  This is definitely
+// not safe (because it could reenter mDNS), but
+// we presume that the user has already tried the safe
+// alternatives.
+{
+    assert(sigraised == SIGQUIT);
+
+    if (gMDNSPlatformPosixVerboseLevel > 0) {
+        fprintf(stderr, "\nSIGQUIT\n");
+    }
+    mDNS_Close(&mDNSStorage);
+    exit(0);
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Parameter Checking
+#endif
+
+static mDNSBool CheckThatRichTextNameIsUsable(const char *richTextName, mDNSBool printExplanation)
+// Checks that richTextName is reasonable
+// label and, if it isn't and printExplanation is true, prints
+// an explanation of why not.
+{
+    mDNSBool result = mDNStrue;
+    if (result && strlen(richTextName) > 63) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Service name is too long (must be 63 characters or less)\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    if (result && richTextName[0] == 0) {
+        if (printExplanation) {
+            fprintf(stderr, "%s: Service name can't be empty\n", gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    return result;
+}
+
+static mDNSBool CheckThatServiceTypeIsUsable(const char *serviceType, mDNSBool printExplanation)
+// Checks that serviceType is a reasonable service type
+// label and, if it isn't and printExplanation is true, prints
+// an explanation of why not.
+{
+    mDNSBool result;
+
+    result = mDNStrue;
+    if (result && strlen(serviceType) > 63) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Service type is too long (must be 63 characters or less)\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    if (result && serviceType[0] == 0) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Service type can't be empty\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    return result;
+}
+
+static mDNSBool CheckThatPortNumberIsUsable(long portNumber, mDNSBool printExplanation)
+// Checks that portNumber is a reasonable port number
+// and, if it isn't and printExplanation is true, prints
+// an explanation of why not.
+{
+    mDNSBool result;
+
+    result = mDNStrue;
+    if (result && (portNumber <= 0 || portNumber > 65535)) {
+        if (printExplanation) {
+            fprintf(stderr,
+                    "%s: Port number specified by -p must be in range 1..65535\n",
+                    gProgramName);
+        }
+        result = mDNSfalse;
+    }
+    return result;
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Command Line Arguments
+#endif
+
+static const char kDefaultPIDFile[]     = "/var/run/mDNSResponder.pid";
+static const char kDefaultServiceType[] = "_afpovertcp._tcp.";
+static const char kDefaultServiceDomain[] = "local.";
+enum {
+    kDefaultPortNumber = 548
+};
+
+static void PrintUsage()
+{
+    fprintf(stderr,
+            "Usage: %s [-v level ] [-r] [-n name] [-t type] [-d domain] [-p port] [-f file] [-b] [-P pidfile] [-x name=val ...]\n",
+            gProgramName);
+    fprintf(stderr, "          -v verbose mode, level is a number from 0 to 2\n");
+    fprintf(stderr, "             0 = no debugging info (default)\n");
+    fprintf(stderr, "             1 = standard debugging info\n");
+    fprintf(stderr, "             2 = intense debugging info\n");
+    fprintf(stderr, "             can be cycled kill -USR1\n");
+    fprintf(stderr, "          -r also bind to port 53 (port 5353 is always bound)\n");
+    fprintf(stderr, "          -n uses 'name' as the service name (required)\n");
+    fprintf(stderr, "          -t uses 'type' as the service type (default is '%s')\n", kDefaultServiceType);
+    fprintf(stderr, "          -d uses 'domain' as the service domain (default is '%s')\n", kDefaultServiceDomain);
+    fprintf(stderr, "          -p uses 'port' as the port number (default is '%d')\n",  kDefaultPortNumber);
+    fprintf(stderr, "          -f reads a service list from 'file'\n");
+    fprintf(stderr, "          -b forces daemon (background) mode\n");
+    fprintf(stderr, "          -P uses 'pidfile' as the PID file\n");
+    fprintf(stderr, "             (default is '%s')\n",  kDefaultPIDFile);
+    fprintf(stderr, "             only meaningful if -b also specified\n");
+    fprintf(stderr, "          -x stores name=val in TXT record (default is empty).\n");
+    fprintf(stderr, "             MUST be the last command-line argument;\n");
+    fprintf(stderr, "             all subsequent arguments after -x are treated as name=val pairs.\n");
+}
+
+static mDNSBool gAvoidPort53      = mDNStrue;
+static const char *gServiceName      = "";
+static const char *gServiceType      = kDefaultServiceType;
+static const char *gServiceDomain    = kDefaultServiceDomain;
+static mDNSu8 gServiceText[sizeof(RDataBody)];
+static mDNSu16 gServiceTextLen   = 0;
+static int gPortNumber       = kDefaultPortNumber;
+static const char *gServiceFile      = "";
+static mDNSBool gDaemon           = mDNSfalse;
+static const char *gPIDFile          = kDefaultPIDFile;
+
+static void ParseArguments(int argc, char **argv)
+// Parses our command line arguments into the global variables
+// listed above.
+{
+    int ch;
+
+    // Set gProgramName to the last path component of argv[0]
+
+    gProgramName = strrchr(argv[0], '/');
+    if (gProgramName == NULL) {
+        gProgramName = argv[0];
+    } else {
+        gProgramName += 1;
+    }
+
+    // Parse command line options using getopt.
+
+    do {
+        ch = getopt(argc, argv, "v:rn:t:d:p:f:dP:bx");
+        if (ch != -1) {
+            switch (ch) {
+            case 'v':
+                gMDNSPlatformPosixVerboseLevel = atoi(optarg);
+                if (gMDNSPlatformPosixVerboseLevel < 0 || gMDNSPlatformPosixVerboseLevel > 2) {
+                    fprintf(stderr,
+                            "%s: Verbose mode must be in the range 0..2\n",
+                            gProgramName);
+                    exit(1);
+                }
+                break;
+            case 'r':
+                gAvoidPort53 = mDNSfalse;
+                break;
+            case 'n':
+                gServiceName = optarg;
+                if ( !CheckThatRichTextNameIsUsable(gServiceName, mDNStrue) ) {
+                    exit(1);
+                }
+                break;
+            case 't':
+                gServiceType = optarg;
+                if ( !CheckThatServiceTypeIsUsable(gServiceType, mDNStrue) ) {
+                    exit(1);
+                }
+                break;
+            case 'd':
+                gServiceDomain = optarg;
+                break;
+            case 'p':
+                gPortNumber = atol(optarg);
+                if ( !CheckThatPortNumberIsUsable(gPortNumber, mDNStrue) ) {
+                    exit(1);
+                }
+                break;
+            case 'f':
+                gServiceFile = optarg;
+                break;
+            case 'b':
+                gDaemon = mDNStrue;
+                break;
+            case 'P':
+                gPIDFile = optarg;
+                break;
+            case 'x':
+                while (optind < argc)
+                {
+                    gServiceText[gServiceTextLen] = strlen(argv[optind]);
+                    mDNSPlatformMemCopy(gServiceText+gServiceTextLen+1, argv[optind], gServiceText[gServiceTextLen]);
+                    gServiceTextLen += 1 + gServiceText[gServiceTextLen];
+                    optind++;
+                }
+                ch = -1;
+                break;
+            case '?':
+            default:
+                PrintUsage();
+                exit(1);
+                break;
+            }
+        }
+    } while (ch != -1);
+
+    // Check for any left over command line arguments.
+
+    if (optind != argc) {
+        PrintUsage();
+        fprintf(stderr, "%s: Unexpected argument '%s'\n", gProgramName, argv[optind]);
+        exit(1);
+    }
+
+    // Check for inconsistency between the arguments.
+
+    if ( (gServiceName[0] == 0) && (gServiceFile[0] == 0) ) {
+        PrintUsage();
+        fprintf(stderr, "%s: You must specify a service name to register (-n) or a service file (-f).\n", gProgramName);
+        exit(1);
+    }
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Registration
+#endif
+
+typedef struct PosixService PosixService;
+
+struct PosixService {
+    ServiceRecordSet coreServ;
+    PosixService *next;
+    int serviceID;
+};
+
+static PosixService *gServiceList = NULL;
+
+static void RegistrationCallback(mDNS *const m, ServiceRecordSet *const thisRegistration, mStatus status)
+// mDNS core calls this routine to tell us about the status of
+// our registration.  The appropriate action to take depends
+// entirely on the value of status.
+{
+    switch (status) {
+
+    case mStatus_NoError:
+        debugf("Callback: %##s Name Registered",   thisRegistration->RR_SRV.resrec.name->c);
+        // Do nothing; our name was successfully registered.  We may
+        // get more call backs in the future.
+        break;
+
+    case mStatus_NameConflict:
+        debugf("Callback: %##s Name Conflict",     thisRegistration->RR_SRV.resrec.name->c);
+
+        // In the event of a conflict, this sample RegistrationCallback
+        // just calls mDNS_RenameAndReregisterService to automatically
+        // pick a new unique name for the service. For a device such as a
+        // printer, this may be appropriate.  For a device with a user
+        // interface, and a screen, and a keyboard, the appropriate response
+        // may be to prompt the user and ask them to choose a new name for
+        // the service.
+        //
+        // Also, what do we do if mDNS_RenameAndReregisterService returns an
+        // error.  Right now I have no place to send that error to.
+
+        status = mDNS_RenameAndReregisterService(m, thisRegistration, mDNSNULL);
+        assert(status == mStatus_NoError);
+        break;
+
+    case mStatus_MemFree:
+        debugf("Callback: %##s Memory Free",       thisRegistration->RR_SRV.resrec.name->c);
+
+        // When debugging is enabled, make sure that thisRegistration
+        // is not on our gServiceList.
+
+            #if !defined(NDEBUG)
+        {
+            PosixService *cursor;
+
+            cursor = gServiceList;
+            while (cursor != NULL) {
+                assert(&cursor->coreServ != thisRegistration);
+                cursor = cursor->next;
+            }
+        }
+            #endif
+        free(thisRegistration);
+        break;
+
+    default:
+        debugf("Callback: %##s Unknown Status %ld", thisRegistration->RR_SRV.resrec.name->c, status);
+        break;
+    }
+}
+
+static int gServiceID = 0;
+
+static mStatus RegisterOneService(const char *  richTextName,
+                                  const char *  serviceType,
+                                  const char *  serviceDomain,
+                                  const mDNSu8 text[],
+                                  mDNSu16 textLen,
+                                  long portNumber)
+{
+    mStatus status;
+    PosixService *      thisServ;
+    domainlabel name;
+    domainname type;
+    domainname domain;
+
+    status = mStatus_NoError;
+    thisServ = (PosixService *) malloc(sizeof(*thisServ));
+    if (thisServ == NULL) {
+        status = mStatus_NoMemoryErr;
+    }
+    if (status == mStatus_NoError) {
+        MakeDomainLabelFromLiteralString(&name,  richTextName);
+        MakeDomainNameFromDNSNameString(&type, serviceType);
+        MakeDomainNameFromDNSNameString(&domain, serviceDomain);
+        status = mDNS_RegisterService(&mDNSStorage, &thisServ->coreServ,
+                                      &name, &type, &domain, // Name, type, domain
+                                      NULL, mDNSOpaque16fromIntVal(portNumber),
+                                      text, textLen, // TXT data, length
+                                      NULL, 0,      // Subtypes
+                                      mDNSInterface_Any, // Interface ID
+                                      RegistrationCallback, thisServ, 0); // Callback, context, flags
+    }
+    if (status == mStatus_NoError) {
+        thisServ->serviceID = gServiceID;
+        gServiceID += 1;
+
+        thisServ->next = gServiceList;
+        gServiceList = thisServ;
+
+        if (gMDNSPlatformPosixVerboseLevel > 0) {
+            fprintf(stderr,
+                    "%s: Registered service %d, name \"%s\", type \"%s\", domain \"%s\",  port %ld\n",
+                    gProgramName,
+                    thisServ->serviceID,
+                    richTextName,
+                    serviceType,
+                    serviceDomain,
+                    portNumber);
+        }
+    } else {
+        if (thisServ != NULL) {
+            free(thisServ);
+        }
+    }
+    return status;
+}
+
+static mDNSBool ReadALine(char *buf, size_t bufSize, FILE *fp, mDNSBool skipBlankLines)
+{
+    size_t len;
+    mDNSBool readNextLine;
+
+    do {
+        readNextLine = mDNSfalse;
+
+        if (fgets(buf, bufSize, fp) == NULL)
+            return mDNSfalse;   // encountered EOF or an error condition
+
+        // These first characters indicate a blank line.
+        if (buf[0] == ' ' || buf[0] == '\t' || buf[0] == '\r' || buf[0] == '\n') {
+            if (!skipBlankLines)
+                return mDNSfalse;
+            readNextLine = mDNStrue;
+        }
+        // always skip comment lines
+        if (buf[0] == '#')
+            readNextLine = mDNStrue;
+
+    } while (readNextLine);
+
+    len = strlen( buf);
+    if ( buf[len - 1] == '\r' || buf[len - 1] == '\n')
+        buf[len - 1] = '\0';
+
+    return mDNStrue;
+}
+
+static mStatus RegisterServicesInFile(const char *filePath)
+{
+    mStatus status = mStatus_NoError;
+    FILE *      fp = fopen(filePath, "r");
+
+    if (fp == NULL) {
+        return mStatus_UnknownErr;
+    }
+
+    if (gMDNSPlatformPosixVerboseLevel > 1)
+        fprintf(stderr, "Parsing %s for services\n", filePath);
+
+    do {
+        char nameBuf[256];
+        char * name = nameBuf;
+        char type[256];
+        const char *dom = kDefaultServiceDomain;
+        char rawText[1024];
+        mDNSu8 text[sizeof(RDataBody)];
+        unsigned int textLen = 0;
+        char port[256];
+        char *p;
+
+        // Read the service name, type, port, and optional text record fields.
+        // Skip blank lines while looking for the next service name.
+        if (!ReadALine(name, sizeof(nameBuf), fp, mDNStrue))
+            break;
+
+        // Special case that allows service name to begin with a '#'
+        // character by escaping it with a '\' to distiguish it from
+        // a comment line.  Remove the leading '\' here before
+        // registering the service.
+        if (name[0] == '\\' && name[1] == '#')
+            name++;
+
+        if (gMDNSPlatformPosixVerboseLevel > 1)
+            fprintf(stderr, "Service name: \"%s\"\n", name);
+
+        // Don't skip blank lines in calls to ReadAline() after finding the
+        // service name since the next blank line indicates the end
+        // of this service record.
+        if (!ReadALine(type, sizeof(type), fp, mDNSfalse))
+            break;
+
+        // see if a domain name is specified
+        p = type;
+        while (*p && *p != ' ' && *p != '\t') p++;
+        if (*p) {
+            *p = 0; // NULL terminate the <type>.<protocol> string
+            // skip any leading whitespace before domain name
+            p++;
+            while (*p && (*p == ' ' || *p == '\t')) p++;
+            if (*p)
+                dom = p;
+        }
+        if (gMDNSPlatformPosixVerboseLevel > 1) {
+            fprintf(stderr, "Service type: \"%s\"\n", type);
+            fprintf(stderr, "Service domain: \"%s\"\n", dom);
+        }
+
+        if (!ReadALine(port, sizeof(port), fp, mDNSfalse))
+            break;
+        if (gMDNSPlatformPosixVerboseLevel > 1)
+            fprintf(stderr, "Service port: %s\n", port);
+
+        if (   !CheckThatRichTextNameIsUsable(name, mDNStrue)
+               || !CheckThatServiceTypeIsUsable(type, mDNStrue)
+               || !CheckThatPortNumberIsUsable(atol(port), mDNStrue))
+            break;
+
+        // read the TXT record fields
+        while (1) {
+            int len;
+            if (!ReadALine(rawText, sizeof(rawText), fp, mDNSfalse)) break;
+            if (gMDNSPlatformPosixVerboseLevel > 1)
+                fprintf(stderr, "Text string: \"%s\"\n", rawText);
+            len = strlen(rawText);
+            if (len <= 255)
+            {
+                unsigned int newlen = textLen + 1 + len;
+                if (len == 0 || newlen >= sizeof(text)) break;
+                text[textLen] = len;
+                mDNSPlatformMemCopy(text + textLen + 1, rawText, len);
+                textLen = newlen;
+            }
+            else
+                fprintf(stderr, "%s: TXT attribute too long for name = %s, type = %s, port = %s\n",
+                        gProgramName, name, type, port);
+        }
+
+        status = RegisterOneService(name, type, dom, text, textLen, atol(port));
+        if (status != mStatus_NoError) {
+            // print error, but try to read and register other services in the file
+            fprintf(stderr, "%s: Failed to register service, name \"%s\", type \"%s\", domain \"%s\", port %s\n",
+                    gProgramName, name, type, dom, port);
+        }
+
+    } while (!feof(fp));
+
+    if (!feof(fp)) {
+        fprintf(stderr, "%s: Error reading service file %s\n", gProgramName, filePath);
+        status = mStatus_UnknownErr;
+    }
+
+    assert(0 == fclose(fp));
+
+    return status;
+}
+
+static mStatus RegisterOurServices(void)
+{
+    mStatus status;
+
+    status = mStatus_NoError;
+    if (gServiceName[0] != 0) {
+        status = RegisterOneService(gServiceName,
+                                    gServiceType,
+                                    gServiceDomain,
+                                    gServiceText, gServiceTextLen,
+                                    gPortNumber);
+    }
+    if (status == mStatus_NoError && gServiceFile[0] != 0) {
+        status = RegisterServicesInFile(gServiceFile);
+    }
+    return status;
+}
+
+static void DeregisterOurServices(void)
+{
+    PosixService *thisServ;
+    int thisServID;
+
+    while (gServiceList != NULL) {
+        thisServ = gServiceList;
+        gServiceList = thisServ->next;
+
+        thisServID = thisServ->serviceID;
+
+        mDNS_DeregisterService(&mDNSStorage, &thisServ->coreServ);
+
+        if (gMDNSPlatformPosixVerboseLevel > 0) {
+            fprintf(stderr,
+                    "%s: Deregistered service %d\n",
+                    gProgramName,
+                    thisServ->serviceID);
+        }
+    }
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark **** Main
+#endif
+
+int main(int argc, char **argv)
+{
+    mStatus status;
+    int result;
+
+    // Parse our command line arguments.  This won't come back if there's an error.
+
+    ParseArguments(argc, argv);
+
+    // If we're told to run as a daemon, then do that straight away.
+    // Note that we don't treat the inability to create our PID
+    // file as an error.  Also note that we assign getpid to a long
+    // because printf has no format specified for pid_t.
+
+    if (gDaemon) {
+        int result;
+        if (gMDNSPlatformPosixVerboseLevel > 0) {
+            fprintf(stderr, "%s: Starting in daemon mode\n", gProgramName);
+        }
+        result = daemon(0,0);
+        if (result == 0) {
+            FILE *fp;
+            int junk;
+
+            fp = fopen(gPIDFile, "w");
+            if (fp != NULL) {
+                fprintf(fp, "%ld\n", (long) getpid());
+                junk = fclose(fp);
+                assert(junk == 0);
+            }
+        } else {
+            fprintf(stderr, "%s: Could not run as daemon - exiting\n", gProgramName);
+            exit(result);
+        }
+    } else {
+        if (gMDNSPlatformPosixVerboseLevel > 0) {
+            fprintf(stderr, "%s: Starting in foreground mode, PID %ld\n", gProgramName, (long) getpid());
+        }
+    }
+
+    status = mDNS_Init(&mDNSStorage, &PlatformStorage,
+                       mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
+                       mDNS_Init_AdvertiseLocalAddresses,
+                       mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
+    if (status != mStatus_NoError) return(2);
+
+    status = RegisterOurServices();
+    if (status != mStatus_NoError) return(2);
+
+    signal(SIGHUP,  HandleSigHup);      // SIGHUP has to be sent by kill -HUP <pid>
+    signal(SIGINT,  HandleSigInt);      // SIGINT is what you get for a Ctrl-C
+    signal(SIGQUIT, HandleSigQuit);     // SIGQUIT is what you get for a Ctrl-\ (indeed)
+    signal(SIGUSR1, HandleSigUsr1);     // SIGUSR1 has to be sent by kill -USR1 <pid>
+
+    while (!gStopNow)
+    {
+        int nfds = 0;
+        fd_set readfds;
+        struct timeval timeout;
+        int result;
+
+        // 1. Set up the fd_set as usual here.
+        // This example client has no file descriptors of its own,
+        // but a real application would call FD_SET to add them to the set here
+        FD_ZERO(&readfds);
+
+        // 2. Set up the timeout.
+        // This example client has no other work it needs to be doing,
+        // so we set an effectively infinite timeout
+        timeout.tv_sec = 0x3FFFFFFF;
+        timeout.tv_usec = 0;
+
+        // 3. Give the mDNSPosix layer a chance to add its information to the fd_set and timeout
+        mDNSPosixGetFDSet(&mDNSStorage, &nfds, &readfds, &timeout);
+
+        // 4. Call select as normal
+        verbosedebugf("select(%d, %d.%06d)", nfds, timeout.tv_sec, timeout.tv_usec);
+        result = select(nfds, &readfds, NULL, NULL, &timeout);
+
+        if (result < 0)
+        {
+            verbosedebugf("select() returned %d errno %d", result, errno);
+            if (errno != EINTR) gStopNow = mDNStrue;
+            else
+            {
+                if (gReceivedSigUsr1)
+                {
+                    gReceivedSigUsr1 = mDNSfalse;
+                    gMDNSPlatformPosixVerboseLevel += 1;
+                    if (gMDNSPlatformPosixVerboseLevel > 2)
+                        gMDNSPlatformPosixVerboseLevel = 0;
+                    if ( gMDNSPlatformPosixVerboseLevel > 0 )
+                        fprintf(stderr, "\nVerbose level %d\n", gMDNSPlatformPosixVerboseLevel);
+                }
+                if (gReceivedSigHup)
+                {
+                    if (gMDNSPlatformPosixVerboseLevel > 0)
+                        fprintf(stderr, "\nSIGHUP\n");
+                    gReceivedSigHup = mDNSfalse;
+                    DeregisterOurServices();
+                    status = mDNSPlatformPosixRefreshInterfaceList(&mDNSStorage);
+                    if (status != mStatus_NoError) break;
+                    status = RegisterOurServices();
+                    if (status != mStatus_NoError) break;
+                }
+            }
+        }
+        else
+        {
+            // 5. Call mDNSPosixProcessFDSet to let the mDNSPosix layer do its work
+            mDNSPosixProcessFDSet(&mDNSStorage, &readfds);
+
+            // 6. This example client has no other work it needs to be doing,
+            // but a real client would do its work here
+            // ... (do work) ...
+        }
+    }
+
+    debugf("Exiting");
+
+    DeregisterOurServices();
+    mDNS_Close(&mDNSStorage);
+
+    if (status == mStatus_NoError) {
+        result = 0;
+    } else {
+        result = 2;
+    }
+    if ( (result != 0) || (gMDNSPlatformPosixVerboseLevel > 0) ) {
+        fprintf(stderr, "%s: Finished with status %d, result %d\n", gProgramName, (int)status, result);
+    }
+
+    return result;
+}
diff --git a/mDNSResponder/mDNSPosix/Services.txt b/mDNSResponder/mDNSPosix/Services.txt
new file mode 100755
index 00000000..f8d69786
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/Services.txt
@@ -0,0 +1,36 @@
+#
+# Example services file parsed by mDNSResponderPosix.
+# 
+# Lines beginning with '#' are comments/ignored.
+# Blank lines indicate the end of a service record specification.
+# The first character of the service name can be a '#' if you escape it with 
+# backslash to distinguish if from a comment line.
+# ie, "\#serviceName" will be registered as "#serviceName".
+# Note that any line beginning with white space is considered a blank line.
+#
+# The record format is:
+# 
+# <service name>
+# <type>.<protocol> <optional domain>
+# <port number>
+# <zero or more strings for the text record, one string per line>
+#
+# <One or more blank lines between records>
+# 
+# Examples shown below.
+
+serviceName1
+_afpovertcp._tcp.
+548
+name=val1
+
+serviceName2
+_afpovertcp._tcp. local.
+548
+name=val2
+name2=anotherattribute
+
+serviceName3
+_afpovertcp._tcp.
+548
+name=val3
diff --git a/mDNSResponder/mDNSPosix/libnss_mdns.8 b/mDNSResponder/mDNSPosix/libnss_mdns.8
new file mode 100755
index 00000000..9c00d4fb
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/libnss_mdns.8
@@ -0,0 +1,148 @@
+.\"
+.\" See section LICENSE for license information.
+.\"
+.Dd June 15, 2004
+.Dt LIBNSS_MDNS 8
+.Os
+.Sh NAME
+.Nm libnss_mdns
+.Nd name service switch module to support Apple mdnsd
+.Sh DESCRIPTION
+The
+.Nm
+shared library implements a name service switch module to interface with Apple
+mdnsd.  It is enabled by adding
+.Ql mdns
+to the
+.Ql hosts:
+line of
+.Xr nsswitch.conf 5 .
+This will cause calls to
+.Xr gethostbyname 3 ,
+.Xr gethostbyname2 3
+and
+.Xr gethostbyaddr 3
+to include mdnsd in their lookup path.
+.Pp
+The
+.Nm
+shared library should be installed in the system library paths, typically in
+.Pa /lib .
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /etc/nss_mdns.conf
+configuration options
+.El
+.Sh EXAMPLES
+In
+.Pa /etc/nsswitch.conf :
+.Dl hosts: files mdns dns
+.Pp
+This will cause the name service switch to lookup hostnames first using
+.Pa /etc/hosts ,
+then mdns and finally via DNS.
+.Sh DIAGNOSTICS
+.Nm
+dumps status information via
+.Xr syslog 3 .
+.Sh SEE ALSO
+.\" Cross-references should be ordered by section (low to high), then in
+.\"     alphabetical order.
+.Xr nsswitch.conf 5 ,
+.Xr nss_mdns.conf 5 ,
+.Xr ldconfig 8
+.Pp
+.Li info libc Qq Name Service Switch
+.\" .Sh STANDARDS
+.Sh HISTORY
+.Nm
+was originally written for
+.An NICTA Bq http://www.nicta.com.au/ .
+.Sh AUTHORS
+.An "Andrew White" Bq Andrew.White@nicta.com.au
+.Sh BUGS
+Return values for obscure error conditions may not match those expected by nsswitch code.
+.Pp
+Version 0.62 of mdnsd does not support an option to force link-local multicast lookups.
+.Ql PTR
+reverse lookups for non-link-local domains will not function correctly.
+.Sh LICENSE
+This software is licensed under the NICTA Public Source License version 1.0
+.Ss NICTA Public Software Licence
+Version 1.0
+.Pp
+Copyright 2004 National ICT Australia Ltd
+.Pp
+All rights reserved.
+.Pp
+By this licence, National ICT Australia Ltd (NICTA) grants permission,
+free of charge, to any person who obtains a copy of this software
+and any associated documentation files ("the Software") to use and
+deal with the Software in source code and binary forms without
+restriction, with or without modification, and to permit persons
+to whom the Software is furnished to do so, provided that the
+following conditions are met:
+.Bl -bullet
+.It
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimers.
+.It
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimers in
+the documentation and/or other materials provided with the
+distribution.
+.It
+The name of NICTA may not be used to endorse or promote products
+derived from this Software without specific prior written permission.
+.El
+.Pp
+EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
+PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS" AND
+NICTA MAKES NO REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY
+REPRESENTATIONS, WARRANTIES OR CONDITIONS REGARDING THE CONTENTS
+OR ACCURACY OF THE SOFTWARE, OR OF TITLE, MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, THE ABSENCE OF LATENT
+OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR
+NOT DISCOVERABLE.
+.Pp
+TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+NICTA BE LIABLE ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+NEGLIGENCE) FOR ANY LOSS OR DAMAGE WHATSOEVER, INCLUDING (WITHOUT
+LIMITATION) LOSS OF PRODUCTION OR OPERATION TIME, LOSS, DAMAGE OR
+CORRUPTION OF DATA OR RECORDS; OR LOSS OF ANTICIPATED SAVINGS,
+OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR OTHER ECONOMIC LOSS;
+OR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
+EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS LICENCE,
+THE SOFTWARE OR THE USE OF THE SOFTWARE, EVEN IF NICTA HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+.Pp
+If applicable legislation implies warranties or conditions, or
+imposes obligations or liability on NICTA in respect of the Software
+that cannot be wholly or partly excluded, restricted or modified,
+NICTA's liability is limited, to the full extent permitted by the
+applicable legislation, at its option, to:
+.Pp
+.Bl -tag -width "a." -compact
+.It a.
+in the case of goods, any one or more of the following:
+.Bl -tag -width "iii." -compact
+.It i.
+the replacement of the goods or the supply of equivalent goods;
+.It ii.
+the repair of the goods;
+.It iii.
+the payment of the cost of replacing the goods or of acquiring
+equivalent goods;
+.It iv.
+the payment of the cost of having the goods repaired; or
+.El
+.It b.
+in the case of services:
+.Bl -tag -width "iii." -compact
+.It i.
+the supplying of the services again; or 
+.It ii.
+the payment of the cost of having the services supplied again.
+.El
+.El
diff --git a/mDNSResponder/mDNSPosix/mDNSPosix.c b/mDNSResponder/mDNSPosix/mDNSPosix.c
new file mode 100755
index 00000000..953bf64f
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/mDNSPosix.c
@@ -0,0 +1,1789 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "mDNSEmbeddedAPI.h"           // Defines the interface provided to the client layer above
+#include "DNSCommon.h"
+#include "mDNSPosix.h"               // Defines the specific types needed to run mDNS on this platform
+#include "dns_sd.h"
+#include "dnssec.h"
+#include "nsec.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <time.h>                   // platform support for UTC time
+
+#if USES_NETLINK
+#include <asm/types.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#else // USES_NETLINK
+#include <net/route.h>
+#include <net/if.h>
+#endif // USES_NETLINK
+
+#include "mDNSUNP.h"
+#include "GenLinkedList.h"
+
+// ***************************************************************************
+// Structures
+
+// We keep a list of client-supplied event sources in PosixEventSource records
+struct PosixEventSource
+{
+    mDNSPosixEventCallback Callback;
+    void                        *Context;
+    int fd;
+    struct  PosixEventSource    *Next;
+};
+typedef struct PosixEventSource PosixEventSource;
+
+// Context record for interface change callback
+struct IfChangeRec
+{
+    int NotifySD;
+    mDNS *mDNS;
+};
+typedef struct IfChangeRec IfChangeRec;
+
+// Note that static data is initialized to zero in (modern) C.
+static fd_set gEventFDs;
+static int gMaxFD;                              // largest fd in gEventFDs
+static GenLinkedList gEventSources;             // linked list of PosixEventSource's
+static sigset_t gEventSignalSet;                // Signals which event loop listens for
+static sigset_t gEventSignals;                  // Signals which were received while inside loop
+
+// ***************************************************************************
+// Globals (for debugging)
+
+static int num_registered_interfaces = 0;
+static int num_pkts_accepted = 0;
+static int num_pkts_rejected = 0;
+
+// ***************************************************************************
+// Functions
+
+int gMDNSPlatformPosixVerboseLevel = 0;
+
+#define PosixErrorToStatus(errNum) ((errNum) == 0 ? mStatus_NoError : mStatus_UnknownErr)
+
+mDNSlocal void SockAddrTomDNSAddr(const struct sockaddr *const sa, mDNSAddr *ipAddr, mDNSIPPort *ipPort)
+{
+    switch (sa->sa_family)
+    {
+    case AF_INET:
+    {
+        struct sockaddr_in *sin          = (struct sockaddr_in*)sa;
+        ipAddr->type                     = mDNSAddrType_IPv4;
+        ipAddr->ip.v4.NotAnInteger       = sin->sin_addr.s_addr;
+        if (ipPort) ipPort->NotAnInteger = sin->sin_port;
+        break;
+    }
+
+#if HAVE_IPV6
+    case AF_INET6:
+    {
+        struct sockaddr_in6 *sin6        = (struct sockaddr_in6*)sa;
+#ifndef NOT_HAVE_SA_LEN
+        assert(sin6->sin6_len == sizeof(*sin6));
+#endif
+        ipAddr->type                     = mDNSAddrType_IPv6;
+        ipAddr->ip.v6                    = *(mDNSv6Addr*)&sin6->sin6_addr;
+        if (ipPort) ipPort->NotAnInteger = sin6->sin6_port;
+        break;
+    }
+#endif
+
+    default:
+        verbosedebugf("SockAddrTomDNSAddr: Uknown address family %d\n", sa->sa_family);
+        ipAddr->type = mDNSAddrType_None;
+        if (ipPort) ipPort->NotAnInteger = 0;
+        break;
+    }
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Send and Receive
+#endif
+
+// mDNS core calls this routine when it needs to send a packet.
+mDNSexport mStatus mDNSPlatformSendUDP(const mDNS *const m, const void *const msg, const mDNSu8 *const end,
+                                       mDNSInterfaceID InterfaceID, UDPSocket *src, const mDNSAddr *dst, 
+                                       mDNSIPPort dstPort, mDNSBool useBackgroundTrafficClass)
+{
+    int err = 0;
+    struct sockaddr_storage to;
+    PosixNetworkInterface * thisIntf = (PosixNetworkInterface *)(InterfaceID);
+    int sendingsocket = -1;
+
+    (void)src;  // Will need to use this parameter once we implement mDNSPlatformUDPSocket/mDNSPlatformUDPClose
+    (void) useBackgroundTrafficClass;
+
+    assert(m != NULL);
+    assert(msg != NULL);
+    assert(end != NULL);
+    assert((((char *) end) - ((char *) msg)) > 0);
+
+    if (dstPort.NotAnInteger == 0)
+    {
+        LogMsg("mDNSPlatformSendUDP: Invalid argument -dstPort is set to 0");
+        return PosixErrorToStatus(EINVAL);
+    }
+    if (dst->type == mDNSAddrType_IPv4)
+    {
+        struct sockaddr_in *sin = (struct sockaddr_in*)&to;
+#ifndef NOT_HAVE_SA_LEN
+        sin->sin_len            = sizeof(*sin);
+#endif
+        sin->sin_family         = AF_INET;
+        sin->sin_port           = dstPort.NotAnInteger;
+        sin->sin_addr.s_addr    = dst->ip.v4.NotAnInteger;
+        sendingsocket           = thisIntf ? thisIntf->multicastSocket4 : m->p->unicastSocket4;
+    }
+
+#if HAVE_IPV6
+    else if (dst->type == mDNSAddrType_IPv6)
+    {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&to;
+        mDNSPlatformMemZero(sin6, sizeof(*sin6));
+#ifndef NOT_HAVE_SA_LEN
+        sin6->sin6_len            = sizeof(*sin6);
+#endif
+        sin6->sin6_family         = AF_INET6;
+        sin6->sin6_port           = dstPort.NotAnInteger;
+        sin6->sin6_addr           = *(struct in6_addr*)&dst->ip.v6;
+        sendingsocket             = thisIntf ? thisIntf->multicastSocket6 : m->p->unicastSocket6;
+    }
+#endif
+
+    if (sendingsocket >= 0)
+        err = sendto(sendingsocket, msg, (char*)end - (char*)msg, 0, (struct sockaddr *)&to, GET_SA_LEN(to));
+
+    if      (err > 0) err = 0;
+    else if (err < 0)
+    {
+        static int MessageCount = 0;
+        // Don't report EHOSTDOWN (i.e. ARP failure), ENETDOWN, or no route to host for unicast destinations
+        if (!mDNSAddressIsAllDNSLinkGroup(dst))
+            if (errno == EHOSTDOWN || errno == ENETDOWN || errno == EHOSTUNREACH || errno == ENETUNREACH) return(mStatus_TransientErr);
+
+        if (MessageCount < 1000)
+        {
+            MessageCount++;
+            if (thisIntf)
+                LogMsg("mDNSPlatformSendUDP got error %d (%s) sending packet to %#a on interface %#a/%s/%d",
+                       errno, strerror(errno), dst, &thisIntf->coreIntf.ip, thisIntf->intfName, thisIntf->index);
+            else
+                LogMsg("mDNSPlatformSendUDP got error %d (%s) sending packet to %#a", errno, strerror(errno), dst);
+        }
+    }
+
+    return PosixErrorToStatus(err);
+}
+
+// This routine is called when the main loop detects that data is available on a socket.
+mDNSlocal void SocketDataReady(mDNS *const m, PosixNetworkInterface *intf, int skt)
+{
+    mDNSAddr senderAddr, destAddr;
+    mDNSIPPort senderPort;
+    ssize_t packetLen;
+    DNSMessage packet;
+    struct my_in_pktinfo packetInfo;
+    struct sockaddr_storage from;
+    socklen_t fromLen;
+    int flags;
+    mDNSu8 ttl;
+    mDNSBool reject;
+    const mDNSInterfaceID InterfaceID = intf ? intf->coreIntf.InterfaceID : NULL;
+
+    assert(m    != NULL);
+    assert(skt  >= 0);
+
+    fromLen = sizeof(from);
+    flags   = 0;
+    packetLen = recvfrom_flags(skt, &packet, sizeof(packet), &flags, (struct sockaddr *) &from, &fromLen, &packetInfo, &ttl);
+
+    if (packetLen >= 0)
+    {
+        SockAddrTomDNSAddr((struct sockaddr*)&from, &senderAddr, &senderPort);
+        SockAddrTomDNSAddr((struct sockaddr*)&packetInfo.ipi_addr, &destAddr, NULL);
+
+        // If we have broken IP_RECVDSTADDR functionality (so far
+        // I've only seen this on OpenBSD) then apply a hack to
+        // convince mDNS Core that this isn't a spoof packet.
+        // Basically what we do is check to see whether the
+        // packet arrived as a multicast and, if so, set its
+        // destAddr to the mDNS address.
+        //
+        // I must admit that I could just be doing something
+        // wrong on OpenBSD and hence triggering this problem
+        // but I'm at a loss as to how.
+        //
+        // If this platform doesn't have IP_PKTINFO or IP_RECVDSTADDR, then we have
+        // no way to tell the destination address or interface this packet arrived on,
+        // so all we can do is just assume it's a multicast
+
+        #if HAVE_BROKEN_RECVDSTADDR || (!defined(IP_PKTINFO) && !defined(IP_RECVDSTADDR))
+        if ((destAddr.NotAnInteger == 0) && (flags & MSG_MCAST))
+        {
+            destAddr.type = senderAddr.type;
+            if      (senderAddr.type == mDNSAddrType_IPv4) destAddr.ip.v4 = AllDNSLinkGroup_v4.ip.v4;
+            else if (senderAddr.type == mDNSAddrType_IPv6) destAddr.ip.v6 = AllDNSLinkGroup_v6.ip.v6;
+        }
+        #endif
+
+        // We only accept the packet if the interface on which it came
+        // in matches the interface associated with this socket.
+        // We do this match by name or by index, depending on which
+        // information is available.  recvfrom_flags sets the name
+        // to "" if the name isn't available, or the index to -1
+        // if the index is available.  This accomodates the various
+        // different capabilities of our target platforms.
+
+        reject = mDNSfalse;
+        if (!intf)
+        {
+            // Ignore multicasts accidentally delivered to our unicast receiving socket
+            if (mDNSAddrIsDNSMulticast(&destAddr)) packetLen = -1;
+        }
+        else
+        {
+            if      (packetInfo.ipi_ifname[0] != 0) reject = (strcmp(packetInfo.ipi_ifname, intf->intfName) != 0);
+            else if (packetInfo.ipi_ifindex != -1) reject = (packetInfo.ipi_ifindex != intf->index);
+
+            if (reject)
+            {
+                verbosedebugf("SocketDataReady ignored a packet from %#a to %#a on interface %s/%d expecting %#a/%s/%d/%d",
+                              &senderAddr, &destAddr, packetInfo.ipi_ifname, packetInfo.ipi_ifindex,
+                              &intf->coreIntf.ip, intf->intfName, intf->index, skt);
+                packetLen = -1;
+                num_pkts_rejected++;
+                if (num_pkts_rejected > (num_pkts_accepted + 1) * (num_registered_interfaces + 1) * 2)
+                {
+                    fprintf(stderr,
+                            "*** WARNING: Received %d packets; Accepted %d packets; Rejected %d packets because of interface mismatch\n",
+                            num_pkts_accepted + num_pkts_rejected, num_pkts_accepted, num_pkts_rejected);
+                    num_pkts_accepted = 0;
+                    num_pkts_rejected = 0;
+                }
+            }
+            else
+            {
+                verbosedebugf("SocketDataReady got a packet from %#a to %#a on interface %#a/%s/%d/%d",
+                              &senderAddr, &destAddr, &intf->coreIntf.ip, intf->intfName, intf->index, skt);
+                num_pkts_accepted++;
+            }
+        }
+    }
+
+    if (packetLen >= 0)
+        mDNSCoreReceive(m, &packet, (mDNSu8 *)&packet + packetLen,
+                        &senderAddr, senderPort, &destAddr, MulticastDNSPort, InterfaceID);
+}
+
+mDNSexport mDNSBool mDNSPlatformPeekUDP(mDNS *const m, UDPSocket *src)
+{
+    (void)m;    // unused
+    (void)src;  // unused
+    return mDNSfalse;
+}
+
+mDNSexport TCPSocket *mDNSPlatformTCPSocket(mDNS * const m, TCPSocketFlags flags, mDNSIPPort * port, mDNSBool useBackgroundTrafficClass)
+{
+    (void)m;            // Unused
+    (void)flags;        // Unused
+    (void)port;         // Unused
+    (void)useBackgroundTrafficClass; // Unused
+    return NULL;
+}
+
+mDNSexport TCPSocket *mDNSPlatformTCPAccept(TCPSocketFlags flags, int sd)
+{
+    (void)flags;        // Unused
+    (void)sd;           // Unused
+    return NULL;
+}
+
+mDNSexport int mDNSPlatformTCPGetFD(TCPSocket *sock)
+{
+    (void)sock;         // Unused
+    return -1;
+}
+
+mDNSexport mStatus mDNSPlatformTCPConnect(TCPSocket *sock, const mDNSAddr *dst, mDNSOpaque16 dstport, domainname *hostname, mDNSInterfaceID InterfaceID,
+                                          TCPConnectionCallback callback, void *context)
+{
+    (void)sock;         // Unused
+    (void)dst;          // Unused
+    (void)dstport;      // Unused
+    (void)hostname;     // Unused
+    (void)InterfaceID;  // Unused
+    (void)callback;     // Unused
+    (void)context;      // Unused
+    return(mStatus_UnsupportedErr);
+}
+
+mDNSexport void mDNSPlatformTCPCloseConnection(TCPSocket *sock)
+{
+    (void)sock;         // Unused
+}
+
+mDNSexport long mDNSPlatformReadTCP(TCPSocket *sock, void *buf, unsigned long buflen, mDNSBool * closed)
+{
+    (void)sock;         // Unused
+    (void)buf;          // Unused
+    (void)buflen;       // Unused
+    (void)closed;       // Unused
+    return 0;
+}
+
+mDNSexport long mDNSPlatformWriteTCP(TCPSocket *sock, const char *msg, unsigned long len)
+{
+    (void)sock;         // Unused
+    (void)msg;          // Unused
+    (void)len;          // Unused
+    return 0;
+}
+
+mDNSexport UDPSocket *mDNSPlatformUDPSocket(mDNS * const m, mDNSIPPort port)
+{
+    (void)m;            // Unused
+    (void)port;         // Unused
+    return NULL;
+}
+
+mDNSexport void           mDNSPlatformUDPClose(UDPSocket *sock)
+{
+    (void)sock;         // Unused
+}
+
+mDNSexport void mDNSPlatformUpdateProxyList(mDNS *const m, const mDNSInterfaceID InterfaceID)
+{
+    (void)m;            // Unused
+    (void)InterfaceID;          // Unused
+}
+
+mDNSexport void mDNSPlatformSendRawPacket(const void *const msg, const mDNSu8 *const end, mDNSInterfaceID InterfaceID)
+{
+    (void)msg;          // Unused
+    (void)end;          // Unused
+    (void)InterfaceID;          // Unused
+}
+
+mDNSexport void mDNSPlatformSetLocalAddressCacheEntry(mDNS *const m, const mDNSAddr *const tpa, const mDNSEthAddr *const tha, mDNSInterfaceID InterfaceID)
+{
+    (void)m;            // Unused
+    (void)tpa;          // Unused
+    (void)tha;          // Unused
+    (void)InterfaceID;          // Unused
+}
+
+mDNSexport mStatus mDNSPlatformTLSSetupCerts(void)
+{
+    return(mStatus_UnsupportedErr);
+}
+
+mDNSexport void mDNSPlatformTLSTearDownCerts(void)
+{
+}
+
+mDNSexport void mDNSPlatformSetAllowSleep(mDNS *const m, mDNSBool allowSleep, const char *reason)
+{
+    (void) m;
+    (void) allowSleep;
+    (void) reason;
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - /etc/hosts support
+#endif
+
+mDNSexport void FreeEtcHosts(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;  // unused
+    (void)rr;
+    (void)result;
+}
+
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** DDNS Config Platform Functions
+#endif
+
+mDNSexport mDNSBool mDNSPlatformSetDNSConfig(mDNS *const m, mDNSBool setservers, mDNSBool setsearch, domainname *const fqdn, DNameListElem **RegDomains,
+    DNameListElem **BrowseDomains, mDNSBool ackConfig)
+{
+    (void) m;
+    (void) setservers;
+    (void) fqdn;
+    (void) setsearch;
+    (void) RegDomains;
+    (void) BrowseDomains;
+    (void) ackConfig;
+
+    return mDNStrue;
+}
+
+mDNSexport mStatus mDNSPlatformGetPrimaryInterface(mDNS * const m, mDNSAddr * v4, mDNSAddr * v6, mDNSAddr * router)
+{
+    (void) m;
+    (void) v4;
+    (void) v6;
+    (void) router;
+
+    return mStatus_UnsupportedErr;
+}
+
+mDNSexport void mDNSPlatformDynDNSHostNameStatusChanged(const domainname *const dname, const mStatus status)
+{
+    (void) dname;
+    (void) status;
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Init and Term
+#endif
+
+// This gets the current hostname, truncating it at the first dot if necessary
+mDNSlocal void GetUserSpecifiedRFC1034ComputerName(domainlabel *const namelabel)
+{
+    int len = 0;
+    gethostname((char *)(&namelabel->c[1]), MAX_DOMAIN_LABEL);
+    while (len < MAX_DOMAIN_LABEL && namelabel->c[len+1] && namelabel->c[len+1] != '.') len++;
+    namelabel->c[0] = len;
+}
+
+// On OS X this gets the text of the field labelled "Computer Name" in the Sharing Prefs Control Panel
+// Other platforms can either get the information from the appropriate place,
+// or they can alternatively just require all registering services to provide an explicit name
+mDNSlocal void GetUserSpecifiedFriendlyComputerName(domainlabel *const namelabel)
+{
+    // On Unix we have no better name than the host name, so we just use that.
+    GetUserSpecifiedRFC1034ComputerName(namelabel);
+}
+
+mDNSexport int ParseDNSServers(mDNS *m, const char *filePath)
+{
+    char line[256];
+    char nameserver[16];
+    char keyword[11];
+    int numOfServers = 0;
+    FILE *fp = fopen(filePath, "r");
+    if (fp == NULL) return -1;
+    while (fgets(line,sizeof(line),fp))
+    {
+        struct in_addr ina;
+        line[255]='\0';     // just to be safe
+        if (sscanf(line,"%10s %15s", keyword, nameserver) != 2) continue;   // it will skip whitespaces
+        if (strncasecmp(keyword,"nameserver",10)) continue;
+        if (inet_aton(nameserver, (struct in_addr *)&ina) != 0)
+        {
+            mDNSAddr DNSAddr;
+            DNSAddr.type = mDNSAddrType_IPv4;
+            DNSAddr.ip.v4.NotAnInteger = ina.s_addr;
+            mDNS_AddDNSServer(m, NULL, mDNSInterface_Any, 0, &DNSAddr, UnicastDNSPort, kScopeNone, 0, mDNSfalse, 0, mDNStrue, mDNStrue, mDNSfalse);
+            numOfServers++;
+        }
+    }
+    return (numOfServers > 0) ? 0 : -1;
+}
+
+// Searches the interface list looking for the named interface.
+// Returns a pointer to if it found, or NULL otherwise.
+mDNSlocal PosixNetworkInterface *SearchForInterfaceByName(mDNS *const m, const char *intfName)
+{
+    PosixNetworkInterface *intf;
+
+    assert(m != NULL);
+    assert(intfName != NULL);
+
+    intf = (PosixNetworkInterface*)(m->HostInterfaces);
+    while ((intf != NULL) && (strcmp(intf->intfName, intfName) != 0))
+        intf = (PosixNetworkInterface *)(intf->coreIntf.next);
+
+    return intf;
+}
+
+mDNSexport mDNSInterfaceID mDNSPlatformInterfaceIDfromInterfaceIndex(mDNS *const m, mDNSu32 index)
+{
+    PosixNetworkInterface *intf;
+
+    assert(m != NULL);
+
+    if (index == kDNSServiceInterfaceIndexLocalOnly) return(mDNSInterface_LocalOnly);
+    if (index == kDNSServiceInterfaceIndexP2P      ) return(mDNSInterface_P2P);
+    if (index == kDNSServiceInterfaceIndexAny      ) return(mDNSInterface_Any);
+
+    intf = (PosixNetworkInterface*)(m->HostInterfaces);
+    while ((intf != NULL) && (mDNSu32) intf->index != index)
+        intf = (PosixNetworkInterface *)(intf->coreIntf.next);
+
+    return (mDNSInterfaceID) intf;
+}
+
+mDNSexport mDNSu32 mDNSPlatformInterfaceIndexfromInterfaceID(mDNS *const m, mDNSInterfaceID id, mDNSBool suppressNetworkChange)
+{
+    PosixNetworkInterface *intf;
+    (void) suppressNetworkChange; // Unused
+
+    assert(m != NULL);
+
+    if (id == mDNSInterface_LocalOnly) return(kDNSServiceInterfaceIndexLocalOnly);
+    if (id == mDNSInterface_P2P      ) return(kDNSServiceInterfaceIndexP2P);
+    if (id == mDNSInterface_Any      ) return(kDNSServiceInterfaceIndexAny);
+
+    intf = (PosixNetworkInterface*)(m->HostInterfaces);
+    while ((intf != NULL) && (mDNSInterfaceID) intf != id)
+        intf = (PosixNetworkInterface *)(intf->coreIntf.next);
+
+    return intf ? intf->index : 0;
+}
+
+// Frees the specified PosixNetworkInterface structure. The underlying
+// interface must have already been deregistered with the mDNS core.
+mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf)
+{
+    assert(intf != NULL);
+    if (intf->intfName != NULL) free((void *)intf->intfName);
+    if (intf->multicastSocket4 != -1) assert(close(intf->multicastSocket4) == 0);
+#if HAVE_IPV6
+    if (intf->multicastSocket6 != -1) assert(close(intf->multicastSocket6) == 0);
+#endif
+    free(intf);
+}
+
+// Grab the first interface, deregister it, free it, and repeat until done.
+mDNSlocal void ClearInterfaceList(mDNS *const m)
+{
+    assert(m != NULL);
+
+    while (m->HostInterfaces)
+    {
+        PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces);
+        mDNS_DeregisterInterface(m, &intf->coreIntf, mDNSfalse);
+        if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName);
+        FreePosixNetworkInterface(intf);
+    }
+    num_registered_interfaces = 0;
+    num_pkts_accepted = 0;
+    num_pkts_rejected = 0;
+}
+
+// Sets up a send/receive socket.
+// If mDNSIPPort port is non-zero, then it's a multicast socket on the specified interface
+// If mDNSIPPort port is zero, then it's a randomly assigned port number, used for sending unicast queries
+mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interfaceIndex, int *sktPtr)
+{
+    int err = 0;
+    static const int kOn = 1;
+    static const int kIntTwoFiveFive = 255;
+    static const unsigned char kByteTwoFiveFive = 255;
+    const mDNSBool JoinMulticastGroup = (port.NotAnInteger != 0);
+
+    (void) interfaceIndex;  // This parameter unused on plaforms that don't have IPv6
+    assert(intfAddr != NULL);
+    assert(sktPtr != NULL);
+    assert(*sktPtr == -1);
+
+    // Open the socket...
+    if      (intfAddr->sa_family == AF_INET) *sktPtr = socket(PF_INET,  SOCK_DGRAM, IPPROTO_UDP);
+#if HAVE_IPV6
+    else if (intfAddr->sa_family == AF_INET6) *sktPtr = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+#endif
+    else return EINVAL;
+
+    if (*sktPtr < 0) { err = errno; perror((intfAddr->sa_family == AF_INET) ? "socket AF_INET" : "socket AF_INET6"); }
+
+    // ... with a shared UDP port, if it's for multicast receiving
+    if (err == 0 && port.NotAnInteger)
+    {
+        #if defined(SO_REUSEPORT)
+        err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEPORT, &kOn, sizeof(kOn));
+        #elif defined(SO_REUSEADDR)
+        err = setsockopt(*sktPtr, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+        #else
+            #error This platform has no way to avoid address busy errors on multicast.
+        #endif
+        if (err < 0) { err = errno; perror("setsockopt - SO_REUSExxxx"); }
+    }
+
+    // We want to receive destination addresses and interface identifiers.
+    if (intfAddr->sa_family == AF_INET)
+    {
+        struct ip_mreq imr;
+        struct sockaddr_in bindAddr;
+        if (err == 0)
+        {
+            #if defined(IP_PKTINFO)                                 // Linux
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_PKTINFO, &kOn, sizeof(kOn));
+            if (err < 0) { err = errno; perror("setsockopt - IP_PKTINFO"); }
+            #elif defined(IP_RECVDSTADDR) || defined(IP_RECVIF)     // BSD and Solaris
+                #if defined(IP_RECVDSTADDR)
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_RECVDSTADDR, &kOn, sizeof(kOn));
+            if (err < 0) { err = errno; perror("setsockopt - IP_RECVDSTADDR"); }
+                #endif
+                #if defined(IP_RECVIF)
+            if (err == 0)
+            {
+                err = setsockopt(*sktPtr, IPPROTO_IP, IP_RECVIF, &kOn, sizeof(kOn));
+                if (err < 0) { err = errno; perror("setsockopt - IP_RECVIF"); }
+            }
+                #endif
+            #else
+                #warning This platform has no way to get the destination interface information -- will only work for single-homed hosts
+            #endif
+        }
+    #if defined(IP_RECVTTL)                                 // Linux
+        if (err == 0)
+        {
+            setsockopt(*sktPtr, IPPROTO_IP, IP_RECVTTL, &kOn, sizeof(kOn));
+            // We no longer depend on being able to get the received TTL, so don't worry if the option fails
+        }
+    #endif
+
+        // Add multicast group membership on this interface
+        if (err == 0 && JoinMulticastGroup)
+        {
+            imr.imr_multiaddr.s_addr = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+            imr.imr_interface        = ((struct sockaddr_in*)intfAddr)->sin_addr;
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof(imr));
+            if (err < 0) { err = errno; perror("setsockopt - IP_ADD_MEMBERSHIP"); }
+        }
+
+        // Specify outgoing interface too
+        if (err == 0 && JoinMulticastGroup)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_MULTICAST_IF, &((struct sockaddr_in*)intfAddr)->sin_addr, sizeof(struct in_addr));
+            if (err < 0) { err = errno; perror("setsockopt - IP_MULTICAST_IF"); }
+        }
+
+        // Per the mDNS spec, send unicast packets with TTL 255
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_TTL, &kIntTwoFiveFive, sizeof(kIntTwoFiveFive));
+            if (err < 0) { err = errno; perror("setsockopt - IP_TTL"); }
+        }
+
+        // and multicast packets with TTL 255 too
+        // There's some debate as to whether IP_MULTICAST_TTL is an int or a byte so we just try both.
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IP, IP_MULTICAST_TTL, &kByteTwoFiveFive, sizeof(kByteTwoFiveFive));
+            if (err < 0 && errno == EINVAL)
+                err = setsockopt(*sktPtr, IPPROTO_IP, IP_MULTICAST_TTL, &kIntTwoFiveFive, sizeof(kIntTwoFiveFive));
+            if (err < 0) { err = errno; perror("setsockopt - IP_MULTICAST_TTL"); }
+        }
+
+        // And start listening for packets
+        if (err == 0)
+        {
+            bindAddr.sin_family      = AF_INET;
+            bindAddr.sin_port        = port.NotAnInteger;
+            bindAddr.sin_addr.s_addr = INADDR_ANY; // Want to receive multicasts AND unicasts on this socket
+            err = bind(*sktPtr, (struct sockaddr *) &bindAddr, sizeof(bindAddr));
+            if (err < 0) { err = errno; perror("bind"); fflush(stderr); }
+        }
+    }     // endif (intfAddr->sa_family == AF_INET)
+
+#if HAVE_IPV6
+    else if (intfAddr->sa_family == AF_INET6)
+    {
+        struct ipv6_mreq imr6;
+        struct sockaddr_in6 bindAddr6;
+    #if defined(IPV6_PKTINFO)
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); }
+        }
+    #else
+        #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
+    #endif
+    #if defined(IPV6_HOPLIMIT)
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_HOPLIMIT, &kOn, sizeof(kOn));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_HOPLIMIT"); }
+        }
+    #endif
+
+        // Add multicast group membership on this interface
+        if (err == 0 && JoinMulticastGroup)
+        {
+            imr6.ipv6mr_multiaddr       = *(const struct in6_addr*)&AllDNSLinkGroup_v6.ip.v6;
+            imr6.ipv6mr_interface       = interfaceIndex;
+            //LogMsg("Joining %.16a on %d", &imr6.ipv6mr_multiaddr, imr6.ipv6mr_interface);
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_JOIN_GROUP, &imr6, sizeof(imr6));
+            if (err < 0)
+            {
+                err = errno;
+                verbosedebugf("IPV6_JOIN_GROUP %.16a on %d failed.\n", &imr6.ipv6mr_multiaddr, imr6.ipv6mr_interface);
+                perror("setsockopt - IPV6_JOIN_GROUP");
+            }
+        }
+
+        // Specify outgoing interface too
+        if (err == 0 && JoinMulticastGroup)
+        {
+            u_int multicast_if = interfaceIndex;
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_MULTICAST_IF, &multicast_if, sizeof(multicast_if));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_MULTICAST_IF"); }
+        }
+
+        // We want to receive only IPv6 packets on this socket.
+        // Without this option, we may get IPv4 addresses as mapped addresses.
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_V6ONLY, &kOn, sizeof(kOn));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_V6ONLY"); }
+        }
+
+        // Per the mDNS spec, send unicast packets with TTL 255
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &kIntTwoFiveFive, sizeof(kIntTwoFiveFive));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_UNICAST_HOPS"); }
+        }
+
+        // and multicast packets with TTL 255 too
+        // There's some debate as to whether IPV6_MULTICAST_HOPS is an int or a byte so we just try both.
+        if (err == 0)
+        {
+            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &kByteTwoFiveFive, sizeof(kByteTwoFiveFive));
+            if (err < 0 && errno == EINVAL)
+                err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &kIntTwoFiveFive, sizeof(kIntTwoFiveFive));
+            if (err < 0) { err = errno; perror("setsockopt - IPV6_MULTICAST_HOPS"); }
+        }
+
+        // And start listening for packets
+        if (err == 0)
+        {
+            mDNSPlatformMemZero(&bindAddr6, sizeof(bindAddr6));
+#ifndef NOT_HAVE_SA_LEN
+            bindAddr6.sin6_len         = sizeof(bindAddr6);
+#endif
+            bindAddr6.sin6_family      = AF_INET6;
+            bindAddr6.sin6_port        = port.NotAnInteger;
+            bindAddr6.sin6_flowinfo    = 0;
+            bindAddr6.sin6_addr        = in6addr_any; // Want to receive multicasts AND unicasts on this socket
+            bindAddr6.sin6_scope_id    = 0;
+            err = bind(*sktPtr, (struct sockaddr *) &bindAddr6, sizeof(bindAddr6));
+            if (err < 0) { err = errno; perror("bind"); fflush(stderr); }
+        }
+    }     // endif (intfAddr->sa_family == AF_INET6)
+#endif
+
+    // Set the socket to non-blocking.
+    if (err == 0)
+    {
+        err = fcntl(*sktPtr, F_GETFL, 0);
+        if (err < 0) err = errno;
+        else
+        {
+            err = fcntl(*sktPtr, F_SETFL, err | O_NONBLOCK);
+            if (err < 0) err = errno;
+        }
+    }
+
+    // Clean up
+    if (err != 0 && *sktPtr != -1) { assert(close(*sktPtr) == 0); *sktPtr = -1; }
+    assert((err == 0) == (*sktPtr != -1));
+    return err;
+}
+
+// Creates a PosixNetworkInterface for the interface whose IP address is
+// intfAddr and whose name is intfName and registers it with mDNS core.
+mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, const char *intfName, int intfIndex)
+{
+    int err = 0;
+    PosixNetworkInterface *intf;
+    PosixNetworkInterface *alias = NULL;
+
+    assert(m != NULL);
+    assert(intfAddr != NULL);
+    assert(intfName != NULL);
+    assert(intfMask != NULL);
+
+    // Allocate the interface structure itself.
+    intf = (PosixNetworkInterface*)malloc(sizeof(*intf));
+    if (intf == NULL) { assert(0); err = ENOMEM; }
+
+    // And make a copy of the intfName.
+    if (err == 0)
+    {
+        intf->intfName = strdup(intfName);
+        if (intf->intfName == NULL) { assert(0); err = ENOMEM; }
+    }
+
+    if (err == 0)
+    {
+        // Set up the fields required by the mDNS core.
+        SockAddrTomDNSAddr(intfAddr, &intf->coreIntf.ip, NULL);
+        SockAddrTomDNSAddr(intfMask, &intf->coreIntf.mask, NULL);
+
+        //LogMsg("SetupOneInterface: %#a %#a",  &intf->coreIntf.ip,  &intf->coreIntf.mask);
+        strncpy(intf->coreIntf.ifname, intfName, sizeof(intf->coreIntf.ifname));
+        intf->coreIntf.ifname[sizeof(intf->coreIntf.ifname)-1] = 0;
+        intf->coreIntf.Advertise = m->AdvertiseLocalAddresses;
+        intf->coreIntf.McastTxRx = mDNStrue;
+
+        // Set up the extra fields in PosixNetworkInterface.
+        assert(intf->intfName != NULL);         // intf->intfName already set up above
+        intf->index                = intfIndex;
+        intf->multicastSocket4     = -1;
+#if HAVE_IPV6
+        intf->multicastSocket6     = -1;
+#endif
+        alias                      = SearchForInterfaceByName(m, intf->intfName);
+        if (alias == NULL) alias   = intf;
+        intf->coreIntf.InterfaceID = (mDNSInterfaceID)alias;
+
+        if (alias != intf)
+            debugf("SetupOneInterface: %s %#a is an alias of %#a", intfName, &intf->coreIntf.ip, &alias->coreIntf.ip);
+    }
+
+    // Set up the multicast socket
+    if (err == 0)
+    {
+        if (alias->multicastSocket4 == -1 && intfAddr->sa_family == AF_INET)
+            err = SetupSocket(intfAddr, MulticastDNSPort, intf->index, &alias->multicastSocket4);
+#if HAVE_IPV6
+        else if (alias->multicastSocket6 == -1 && intfAddr->sa_family == AF_INET6)
+            err = SetupSocket(intfAddr, MulticastDNSPort, intf->index, &alias->multicastSocket6);
+#endif
+    }
+
+    // If interface is a direct link, address record will be marked as kDNSRecordTypeKnownUnique
+    // and skip the probe phase of the probe/announce packet sequence.
+    intf->coreIntf.DirectLink = mDNSfalse;
+
+    // The interface is all ready to go, let's register it with the mDNS core.
+    if (err == 0)
+        err = mDNS_RegisterInterface(m, &intf->coreIntf, mDNSfalse);
+
+    // Clean up.
+    if (err == 0)
+    {
+        num_registered_interfaces++;
+        debugf("SetupOneInterface: %s %#a Registered", intf->intfName, &intf->coreIntf.ip);
+        if (gMDNSPlatformPosixVerboseLevel > 0)
+            fprintf(stderr, "Registered interface %s\n", intf->intfName);
+    }
+    else
+    {
+        // Use intfName instead of intf->intfName in the next line to avoid dereferencing NULL.
+        debugf("SetupOneInterface: %s %#a failed to register %d", intfName, &intf->coreIntf.ip, err);
+        if (intf) { FreePosixNetworkInterface(intf); intf = NULL; }
+    }
+
+    assert((err == 0) == (intf != NULL));
+
+    return err;
+}
+
+// Call get_ifi_info() to obtain a list of active interfaces and call SetupOneInterface() on each one.
+mDNSlocal int SetupInterfaceList(mDNS *const m)
+{
+    mDNSBool foundav4       = mDNSfalse;
+    int err            = 0;
+    struct ifi_info *intfList      = get_ifi_info(AF_INET, mDNStrue);
+    struct ifi_info *firstLoopback = NULL;
+
+    assert(m != NULL);
+    debugf("SetupInterfaceList");
+
+    if (intfList == NULL) err = ENOENT;
+
+#if HAVE_IPV6
+    if (err == 0)       /* Link the IPv6 list to the end of the IPv4 list */
+    {
+        struct ifi_info **p = &intfList;
+        while (*p) p = &(*p)->ifi_next;
+        *p = get_ifi_info(AF_INET6, mDNStrue);
+    }
+#endif
+
+    if (err == 0)
+    {
+        struct ifi_info *i = intfList;
+        while (i)
+        {
+            if (     ((i->ifi_addr->sa_family == AF_INET)
+#if HAVE_IPV6
+                      || (i->ifi_addr->sa_family == AF_INET6)
+#endif
+                      ) &&  (i->ifi_flags & IFF_UP) && !(i->ifi_flags & IFF_POINTOPOINT))
+            {
+                if (i->ifi_flags & IFF_LOOPBACK)
+                {
+                    if (firstLoopback == NULL)
+                        firstLoopback = i;
+                }
+                else
+                {
+                    if (SetupOneInterface(m, i->ifi_addr, i->ifi_netmask, i->ifi_name, i->ifi_index) == 0)
+                        if (i->ifi_addr->sa_family == AF_INET)
+                            foundav4 = mDNStrue;
+                }
+            }
+            i = i->ifi_next;
+        }
+
+        // If we found no normal interfaces but we did find a loopback interface, register the
+        // loopback interface.  This allows self-discovery if no interfaces are configured.
+        // Temporary workaround: Multicast loopback on IPv6 interfaces appears not to work.
+        // In the interim, we skip loopback interface only if we found at least one v4 interface to use
+        // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL))
+        if (!foundav4 && firstLoopback)
+            (void) SetupOneInterface(m, firstLoopback->ifi_addr, firstLoopback->ifi_netmask, firstLoopback->ifi_name, firstLoopback->ifi_index);
+    }
+
+    // Clean up.
+    if (intfList != NULL) free_ifi_info(intfList);
+    return err;
+}
+
+#if USES_NETLINK
+
+// See <http://www.faqs.org/rfcs/rfc3549.html> for a description of NetLink
+
+// Open a socket that will receive interface change notifications
+mDNSlocal mStatus OpenIfNotifySocket(int *pFD)
+{
+    mStatus err = mStatus_NoError;
+    struct sockaddr_nl snl;
+    int sock;
+    int ret;
+
+    sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+    if (sock < 0)
+        return errno;
+
+    // Configure read to be non-blocking because inbound msg size is not known in advance
+    (void) fcntl(sock, F_SETFL, O_NONBLOCK);
+
+    /* Subscribe the socket to Link & IP addr notifications. */
+    mDNSPlatformMemZero(&snl, sizeof snl);
+    snl.nl_family = AF_NETLINK;
+    snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
+    ret = bind(sock, (struct sockaddr *) &snl, sizeof snl);
+    if (0 == ret)
+        *pFD = sock;
+    else
+        err = errno;
+
+    return err;
+}
+
+#if MDNS_DEBUGMSGS
+mDNSlocal void      PrintNetLinkMsg(const struct nlmsghdr *pNLMsg)
+{
+    const char *kNLMsgTypes[] = { "", "NLMSG_NOOP", "NLMSG_ERROR", "NLMSG_DONE", "NLMSG_OVERRUN" };
+    const char *kNLRtMsgTypes[] = { "RTM_NEWLINK", "RTM_DELLINK", "RTM_GETLINK", "RTM_NEWADDR", "RTM_DELADDR", "RTM_GETADDR" };
+
+    printf("nlmsghdr len=%d, type=%s, flags=0x%x\n", pNLMsg->nlmsg_len,
+           pNLMsg->nlmsg_type < RTM_BASE ? kNLMsgTypes[pNLMsg->nlmsg_type] : kNLRtMsgTypes[pNLMsg->nlmsg_type - RTM_BASE],
+           pNLMsg->nlmsg_flags);
+
+    if (RTM_NEWLINK <= pNLMsg->nlmsg_type && pNLMsg->nlmsg_type <= RTM_GETLINK)
+    {
+        struct ifinfomsg    *pIfInfo = (struct ifinfomsg*) NLMSG_DATA(pNLMsg);
+        printf("ifinfomsg family=%d, type=%d, index=%d, flags=0x%x, change=0x%x\n", pIfInfo->ifi_family,
+               pIfInfo->ifi_type, pIfInfo->ifi_index, pIfInfo->ifi_flags, pIfInfo->ifi_change);
+
+    }
+    else if (RTM_NEWADDR <= pNLMsg->nlmsg_type && pNLMsg->nlmsg_type <= RTM_GETADDR)
+    {
+        struct ifaddrmsg    *pIfAddr = (struct ifaddrmsg*) NLMSG_DATA(pNLMsg);
+        printf("ifaddrmsg family=%d, index=%d, flags=0x%x\n", pIfAddr->ifa_family,
+               pIfAddr->ifa_index, pIfAddr->ifa_flags);
+    }
+    printf("\n");
+}
+#endif
+
+mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
+// Read through the messages on sd and if any indicate that any interface records should
+// be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0.
+{
+    ssize_t readCount;
+    char buff[4096];
+    struct nlmsghdr         *pNLMsg = (struct nlmsghdr*) buff;
+    mDNSu32 result = 0;
+
+    // The structure here is more complex than it really ought to be because,
+    // unfortunately, there's no good way to size a buffer in advance large
+    // enough to hold all pending data and so avoid message fragmentation.
+    // (Note that FIONREAD is not supported on AF_NETLINK.)
+
+    readCount = read(sd, buff, sizeof buff);
+    while (1)
+    {
+        // Make sure we've got an entire nlmsghdr in the buffer, and payload, too.
+        // If not, discard already-processed messages in buffer and read more data.
+        if (((char*) &pNLMsg[1] > (buff + readCount)) ||    // i.e. *pNLMsg extends off end of buffer
+            ((char*) pNLMsg + pNLMsg->nlmsg_len > (buff + readCount)))
+        {
+            if (buff < (char*) pNLMsg)      // we have space to shuffle
+            {
+                // discard processed data
+                readCount -= ((char*) pNLMsg - buff);
+                memmove(buff, pNLMsg, readCount);
+                pNLMsg = (struct nlmsghdr*) buff;
+
+                // read more data
+                readCount += read(sd, buff + readCount, sizeof buff - readCount);
+                continue;                   // spin around and revalidate with new readCount
+            }
+            else
+                break;  // Otherwise message does not fit in buffer
+        }
+
+#if MDNS_DEBUGMSGS
+        PrintNetLinkMsg(pNLMsg);
+#endif
+
+        // Process the NetLink message
+        if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK)
+            result |= 1 << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index;
+        else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR)
+            result |= 1 << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index;
+
+        // Advance pNLMsg to the next message in the buffer
+        if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE)
+        {
+            ssize_t len = readCount - ((char*)pNLMsg - buff);
+            pNLMsg = NLMSG_NEXT(pNLMsg, len);
+        }
+        else
+            break;  // all done!
+    }
+
+    return result;
+}
+
+#else // USES_NETLINK
+
+// Open a socket that will receive interface change notifications
+mDNSlocal mStatus OpenIfNotifySocket(int *pFD)
+{
+    *pFD = socket(AF_ROUTE, SOCK_RAW, 0);
+
+    if (*pFD < 0)
+        return mStatus_UnknownErr;
+
+    // Configure read to be non-blocking because inbound msg size is not known in advance
+    (void) fcntl(*pFD, F_SETFL, O_NONBLOCK);
+
+    return mStatus_NoError;
+}
+
+#if MDNS_DEBUGMSGS
+mDNSlocal void      PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg)
+{
+    const char *kRSMsgTypes[] = { "", "RTM_ADD", "RTM_DELETE", "RTM_CHANGE", "RTM_GET", "RTM_LOSING",
+                                  "RTM_REDIRECT", "RTM_MISS", "RTM_LOCK", "RTM_OLDADD", "RTM_OLDDEL", "RTM_RESOLVE",
+                                  "RTM_NEWADDR", "RTM_DELADDR", "RTM_IFINFO", "RTM_NEWMADDR", "RTM_DELMADDR" };
+
+    int index = pRSMsg->ifam_type == RTM_IFINFO ? ((struct if_msghdr*) pRSMsg)->ifm_index : pRSMsg->ifam_index;
+
+    printf("ifa_msghdr len=%d, type=%s, index=%d\n", pRSMsg->ifam_msglen, kRSMsgTypes[pRSMsg->ifam_type], index);
+}
+#endif
+
+mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
+// Read through the messages on sd and if any indicate that any interface records should
+// be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0.
+{
+    ssize_t readCount;
+    char buff[4096];
+    struct ifa_msghdr       *pRSMsg = (struct ifa_msghdr*) buff;
+    mDNSu32 result = 0;
+
+    readCount = read(sd, buff, sizeof buff);
+    if (readCount < (ssize_t) sizeof(struct ifa_msghdr))
+        return mStatus_UnsupportedErr;      // cannot decipher message
+
+#if MDNS_DEBUGMSGS
+    PrintRoutingSocketMsg(pRSMsg);
+#endif
+
+    // Process the message
+    if (pRSMsg->ifam_type == RTM_NEWADDR || pRSMsg->ifam_type == RTM_DELADDR ||
+        pRSMsg->ifam_type == RTM_IFINFO)
+    {
+        if (pRSMsg->ifam_type == RTM_IFINFO)
+            result |= 1 << ((struct if_msghdr*) pRSMsg)->ifm_index;
+        else
+            result |= 1 << pRSMsg->ifam_index;
+    }
+
+    return result;
+}
+
+#endif // USES_NETLINK
+
+// Called when data appears on interface change notification socket
+mDNSlocal void InterfaceChangeCallback(int fd, short filter, void *context)
+{
+    IfChangeRec     *pChgRec = (IfChangeRec*) context;
+    fd_set readFDs;
+    mDNSu32 changedInterfaces = 0;
+    struct timeval zeroTimeout = { 0, 0 };
+
+    (void)fd; // Unused
+    (void)filter; // Unused
+
+    FD_ZERO(&readFDs);
+    FD_SET(pChgRec->NotifySD, &readFDs);
+
+    do
+    {
+        changedInterfaces |= ProcessRoutingNotification(pChgRec->NotifySD);
+    }
+    while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout));
+
+    // Currently we rebuild the entire interface list whenever any interface change is
+    // detected. If this ever proves to be a performance issue in a multi-homed
+    // configuration, more care should be paid to changedInterfaces.
+    if (changedInterfaces)
+        mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS);
+}
+
+// Register with either a Routing Socket or RtNetLink to listen for interface changes.
+mDNSlocal mStatus WatchForInterfaceChange(mDNS *const m)
+{
+    mStatus err;
+    IfChangeRec *pChgRec;
+
+    pChgRec = (IfChangeRec*) mDNSPlatformMemAllocate(sizeof *pChgRec);
+    if (pChgRec == NULL)
+        return mStatus_NoMemoryErr;
+
+    pChgRec->mDNS = m;
+    err = OpenIfNotifySocket(&pChgRec->NotifySD);
+    if (err == 0)
+        err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec);
+
+    return err;
+}
+
+// Test to see if we're the first client running on UDP port 5353, by trying to bind to 5353 without using SO_REUSEPORT.
+// If we fail, someone else got here first. That's not a big problem; we can share the port for multicast responses --
+// we just need to be aware that we shouldn't expect to successfully receive unicast UDP responses.
+mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void)
+{
+    int err;
+    int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    struct sockaddr_in s5353;
+    s5353.sin_family      = AF_INET;
+    s5353.sin_port        = MulticastDNSPort.NotAnInteger;
+    s5353.sin_addr.s_addr = 0;
+    err = bind(s, (struct sockaddr *)&s5353, sizeof(s5353));
+    close(s);
+    if (err) debugf("No unicast UDP responses");
+    else debugf("Unicast UDP responses okay");
+    return(err == 0);
+}
+
+// mDNS core calls this routine to initialise the platform-specific data.
+mDNSexport mStatus mDNSPlatformInit(mDNS *const m)
+{
+    int err = 0;
+    struct sockaddr sa;
+    assert(m != NULL);
+
+    if (mDNSPlatformInit_CanReceiveUnicast()) m->CanReceiveUnicastOn5353 = mDNStrue;
+
+    // Tell mDNS core the names of this machine.
+
+    // Set up the nice label
+    m->nicelabel.c[0] = 0;
+    GetUserSpecifiedFriendlyComputerName(&m->nicelabel);
+    if (m->nicelabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->nicelabel, "Computer");
+
+    // Set up the RFC 1034-compliant label
+    m->hostlabel.c[0] = 0;
+    GetUserSpecifiedRFC1034ComputerName(&m->hostlabel);
+    if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer");
+
+    mDNS_SetFQDN(m);
+
+    sa.sa_family = AF_INET;
+    m->p->unicastSocket4 = -1;
+    if (err == mStatus_NoError) err = SetupSocket(&sa, zeroIPPort, 0, &m->p->unicastSocket4);
+#if HAVE_IPV6
+    sa.sa_family = AF_INET6;
+    m->p->unicastSocket6 = -1;
+    if (err == mStatus_NoError) err = SetupSocket(&sa, zeroIPPort, 0, &m->p->unicastSocket6);
+#endif
+
+    // Tell mDNS core about the network interfaces on this machine.
+    if (err == mStatus_NoError) err = SetupInterfaceList(m);
+
+    // Tell mDNS core about DNS Servers
+    mDNS_Lock(m);
+    if (err == mStatus_NoError) ParseDNSServers(m, uDNS_SERVERS_FILE);
+    mDNS_Unlock(m);
+
+    if (err == mStatus_NoError)
+    {
+        err = WatchForInterfaceChange(m);
+        // Failure to observe interface changes is non-fatal.
+        if (err != mStatus_NoError)
+        {
+            fprintf(stderr, "mDNS(%d) WARNING: Unable to detect interface changes (%d).\n", getpid(), err);
+            err = mStatus_NoError;
+        }
+    }
+
+    // We don't do asynchronous initialization on the Posix platform, so by the time
+    // we get here the setup will already have succeeded or failed.  If it succeeded,
+    // we should just call mDNSCoreInitComplete() immediately.
+    if (err == mStatus_NoError)
+        mDNSCoreInitComplete(m, mStatus_NoError);
+
+    return PosixErrorToStatus(err);
+}
+
+// mDNS core calls this routine to clean up the platform-specific data.
+// In our case all we need to do is to tear down every network interface.
+mDNSexport void mDNSPlatformClose(mDNS *const m)
+{
+    assert(m != NULL);
+    ClearInterfaceList(m);
+    if (m->p->unicastSocket4 != -1) assert(close(m->p->unicastSocket4) == 0);
+#if HAVE_IPV6
+    if (m->p->unicastSocket6 != -1) assert(close(m->p->unicastSocket6) == 0);
+#endif
+}
+
+mDNSexport mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m)
+{
+    int err;
+    ClearInterfaceList(m);
+    err = SetupInterfaceList(m);
+    return PosixErrorToStatus(err);
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Locking
+#endif
+
+// On the Posix platform, locking is a no-op because we only ever enter
+// mDNS core on the main thread.
+
+// mDNS core calls this routine when it wants to prevent
+// the platform from reentering mDNS core code.
+mDNSexport void    mDNSPlatformLock   (const mDNS *const m)
+{
+    (void) m;   // Unused
+}
+
+// mDNS core calls this routine when it release the lock taken by
+// mDNSPlatformLock and allow the platform to reenter mDNS core code.
+mDNSexport void    mDNSPlatformUnlock (const mDNS *const m)
+{
+    (void) m;   // Unused
+}
+
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark ***** Strings
+#endif
+
+// mDNS core calls this routine to copy C strings.
+// On the Posix platform this maps directly to the ANSI C strcpy.
+mDNSexport void    mDNSPlatformStrCopy(void *dst, const void *src)
+{
+    strcpy((char *)dst, (char *)src);
+}
+
+// mDNS core calls this routine to get the length of a C string.
+// On the Posix platform this maps directly to the ANSI C strlen.
+mDNSexport mDNSu32  mDNSPlatformStrLen (const void *src)
+{
+    return strlen((char*)src);
+}
+
+// mDNS core calls this routine to copy memory.
+// On the Posix platform this maps directly to the ANSI C memcpy.
+mDNSexport void    mDNSPlatformMemCopy(void *dst, const void *src, mDNSu32 len)
+{
+    memcpy(dst, src, len);
+}
+
+// mDNS core calls this routine to test whether blocks of memory are byte-for-byte
+// identical. On the Posix platform this is a simple wrapper around ANSI C memcmp.
+mDNSexport mDNSBool mDNSPlatformMemSame(const void *dst, const void *src, mDNSu32 len)
+{
+    return memcmp(dst, src, len) == 0;
+}
+
+// If the caller wants to know the exact return of memcmp, then use this instead
+// of mDNSPlatformMemSame
+mDNSexport int mDNSPlatformMemCmp(const void *dst, const void *src, mDNSu32 len)
+{
+    return (memcmp(dst, src, len));
+}
+
+mDNSexport void mDNSPlatformQsort(void *base, int nel, int width, int (*compar)(const void *, const void *))
+{
+    return (qsort(base, nel, width, compar));
+}
+
+// DNSSEC stub functions
+mDNSexport void VerifySignature(mDNS *const m, DNSSECVerifier *dv, DNSQuestion *q)
+{
+    (void)m;
+    (void)dv;
+    (void)q;
+}
+
+mDNSexport mDNSBool AddNSECSForCacheRecord(mDNS *const m, CacheRecord *crlist, CacheRecord *negcr, mDNSu8 rcode)
+{
+    (void)m;
+    (void)crlist;
+    (void)negcr;
+    (void)rcode;
+    return mDNSfalse;
+}
+
+mDNSexport void BumpDNSSECStats(mDNS *const m, DNSSECStatsAction action, DNSSECStatsType type, mDNSu32 value)
+{
+    (void)m;
+    (void)action;
+    (void)type;
+    (void)value;
+}
+
+// Proxy stub functions
+mDNSexport mDNSu8 *DNSProxySetAttributes(DNSQuestion *q, DNSMessageHeader *h, DNSMessage *msg, mDNSu8 *ptr, mDNSu8 *limit)
+{
+    (void) q;
+    (void) h;
+    (void) msg;
+    (void) ptr;
+    (void) limit;
+
+    return ptr;
+}
+
+mDNSexport void DNSProxyInit(mDNS *const m, mDNSu32 IpIfArr[], mDNSu32 OpIf)
+{
+    (void) m;
+    (void) IpIfArr;
+    (void) OpIf;
+}
+
+mDNSexport void DNSProxyTerminate(mDNS *const m)
+{
+    (void) m;
+}
+
+// mDNS core calls this routine to clear blocks of memory.
+// On the Posix platform this is a simple wrapper around ANSI C memset.
+mDNSexport void    mDNSPlatformMemZero(void *dst, mDNSu32 len)
+{
+    memset(dst, 0, len);
+}
+
+mDNSexport void *  mDNSPlatformMemAllocate(mDNSu32 len) { return(malloc(len)); }
+mDNSexport void    mDNSPlatformMemFree    (void *mem)   { free(mem); }
+
+mDNSexport mDNSu32 mDNSPlatformRandomSeed(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return(tv.tv_usec);
+}
+
+mDNSexport mDNSs32 mDNSPlatformOneSecond = 1024;
+
+mDNSexport mStatus mDNSPlatformTimeInit(void)
+{
+    // No special setup is required on Posix -- we just use gettimeofday();
+    // This is not really safe, because gettimeofday can go backwards if the user manually changes the date or time
+    // We should find a better way to do this
+    return(mStatus_NoError);
+}
+
+mDNSexport mDNSs32  mDNSPlatformRawTime()
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    // tv.tv_sec is seconds since 1st January 1970 (GMT, with no adjustment for daylight savings time)
+    // tv.tv_usec is microseconds since the start of this second (i.e. values 0 to 999999)
+    // We use the lower 22 bits of tv.tv_sec for the top 22 bits of our result
+    // and we multiply tv.tv_usec by 16 / 15625 to get a value in the range 0-1023 to go in the bottom 10 bits.
+    // This gives us a proper modular (cyclic) counter that has a resolution of roughly 1ms (actually 1/1024 second)
+    // and correctly cycles every 2^22 seconds (4194304 seconds = approx 48 days).
+    return((tv.tv_sec << 10) | (tv.tv_usec * 16 / 15625));
+}
+
+mDNSexport mDNSs32 mDNSPlatformUTC(void)
+{
+    return time(NULL);
+}
+
+mDNSexport void mDNSPlatformSendWakeupPacket(mDNS *const m, mDNSInterfaceID InterfaceID, char *EthAddr, char *IPAddr, int iteration)
+{
+    (void) m;
+    (void) InterfaceID;
+    (void) EthAddr;
+    (void) IPAddr;
+    (void) iteration;
+}
+
+mDNSexport mDNSBool mDNSPlatformValidRecordForInterface(AuthRecord *rr, const NetworkInterfaceInfo *intf)
+{
+    (void) rr;
+    (void) intf;
+
+    return 1;
+}
+
+mDNSexport mDNSBool mDNSPlatformValidQuestionForInterface(DNSQuestion *q, const NetworkInterfaceInfo *intf)
+{
+    (void) q;
+    (void) intf;
+
+    return 1;
+}
+
+// Used for debugging purposes. For now, just set the buffer to zero
+mDNSexport void mDNSPlatformFormatTime(unsigned long te, mDNSu8 *buf, int bufsize)
+{
+    (void) te;
+    if (bufsize) buf[0] = 0;
+}
+
+mDNSexport void mDNSPlatformSendKeepalive(mDNSAddr *sadd, mDNSAddr *dadd, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu32 seq, mDNSu32 ack, mDNSu16 win)
+{
+    (void) sadd;    // Unused
+    (void) dadd;    // Unused
+    (void) lport;   // Unused
+    (void) rport;   // Unused
+    (void) seq;     // Unused
+    (void) ack;     // Unused
+    (void) win;     // Unused
+}
+
+mDNSexport mStatus mDNSPlatformRetrieveTCPInfo(mDNS *const m, mDNSAddr *laddr, mDNSIPPort *lport, mDNSAddr *raddr, mDNSIPPort *rport, mDNSTCPInfo *mti)
+{
+    (void) m;       // Unused
+    (void) laddr;   // Unused
+    (void) raddr;   // Unused
+    (void) lport;   // Unused
+    (void) rport;   // Unused
+    (void) mti;     // Unused
+
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus mDNSPlatformGetRemoteMacAddr(mDNS *const m, mDNSAddr *raddr)
+{
+    (void) raddr; // Unused
+    (void) m;     // Unused
+
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus    mDNSPlatformStoreSPSMACAddr(mDNSAddr *spsaddr, char *ifname)
+{
+    (void) spsaddr; // Unused
+    (void) ifname;  // Unused
+
+    return mStatus_NoError;
+}
+
+mDNSexport mStatus    mDNSPlatformClearSPSMACAddr(void)
+{
+    return mStatus_NoError;
+}
+
+mDNSexport mDNSu16 mDNSPlatformGetUDPPort(UDPSocket *sock)
+{
+    (void) sock; // unused
+ 
+    return (mDNSu16)-1;
+}
+
+mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID)
+{
+    (void) InterfaceID; // unused
+    
+    return mDNSfalse;
+}
+
+mDNSexport mDNSBool mDNSPlatformAllowPID(mDNS *const m, DNSQuestion *q)
+{
+    (void) m;
+    (void) q;
+    return mDNStrue;
+}
+
+mDNSexport mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q)
+{
+    (void) m;
+    (void) q;
+    return -1;
+}
+
+mDNSexport void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)
+{
+    (void) src;
+    (void) dst;
+    (void) q;
+}
+
+mDNSexport mDNSs32 mDNSPlatformGetPID()
+{
+    return 0;
+}
+
+mDNSlocal void mDNSPosixAddToFDSet(int *nfds, fd_set *readfds, int s)
+{
+    if (*nfds < s + 1) *nfds = s + 1;
+    FD_SET(s, readfds);
+}
+
+mDNSexport void mDNSPosixGetFDSet(mDNS *m, int *nfds, fd_set *readfds, struct timeval *timeout)
+{
+    mDNSs32 ticks;
+    struct timeval interval;
+
+    // 1. Call mDNS_Execute() to let mDNSCore do what it needs to do
+    mDNSs32 nextevent = mDNS_Execute(m);
+
+    // 2. Build our list of active file descriptors
+    PosixNetworkInterface *info = (PosixNetworkInterface *)(m->HostInterfaces);
+    if (m->p->unicastSocket4 != -1) mDNSPosixAddToFDSet(nfds, readfds, m->p->unicastSocket4);
+#if HAVE_IPV6
+    if (m->p->unicastSocket6 != -1) mDNSPosixAddToFDSet(nfds, readfds, m->p->unicastSocket6);
+#endif
+    while (info)
+    {
+        if (info->multicastSocket4 != -1) mDNSPosixAddToFDSet(nfds, readfds, info->multicastSocket4);
+#if HAVE_IPV6
+        if (info->multicastSocket6 != -1) mDNSPosixAddToFDSet(nfds, readfds, info->multicastSocket6);
+#endif
+        info = (PosixNetworkInterface *)(info->coreIntf.next);
+    }
+
+    // 3. Calculate the time remaining to the next scheduled event (in struct timeval format)
+    ticks = nextevent - mDNS_TimeNow(m);
+    if (ticks < 1) ticks = 1;
+    interval.tv_sec  = ticks >> 10;                     // The high 22 bits are seconds
+    interval.tv_usec = ((ticks & 0x3FF) * 15625) / 16;  // The low 10 bits are 1024ths
+
+    // 4. If client's proposed timeout is more than what we want, then reduce it
+    if (timeout->tv_sec > interval.tv_sec ||
+        (timeout->tv_sec == interval.tv_sec && timeout->tv_usec > interval.tv_usec))
+        *timeout = interval;
+}
+
+mDNSexport void mDNSPosixProcessFDSet(mDNS *const m, fd_set *readfds)
+{
+    PosixNetworkInterface *info;
+    assert(m       != NULL);
+    assert(readfds != NULL);
+    info = (PosixNetworkInterface *)(m->HostInterfaces);
+
+    if (m->p->unicastSocket4 != -1 && FD_ISSET(m->p->unicastSocket4, readfds))
+    {
+        FD_CLR(m->p->unicastSocket4, readfds);
+        SocketDataReady(m, NULL, m->p->unicastSocket4);
+    }
+#if HAVE_IPV6
+    if (m->p->unicastSocket6 != -1 && FD_ISSET(m->p->unicastSocket6, readfds))
+    {
+        FD_CLR(m->p->unicastSocket6, readfds);
+        SocketDataReady(m, NULL, m->p->unicastSocket6);
+    }
+#endif
+
+    while (info)
+    {
+        if (info->multicastSocket4 != -1 && FD_ISSET(info->multicastSocket4, readfds))
+        {
+            FD_CLR(info->multicastSocket4, readfds);
+            SocketDataReady(m, info, info->multicastSocket4);
+        }
+#if HAVE_IPV6
+        if (info->multicastSocket6 != -1 && FD_ISSET(info->multicastSocket6, readfds))
+        {
+            FD_CLR(info->multicastSocket6, readfds);
+            SocketDataReady(m, info, info->multicastSocket6);
+        }
+#endif
+        info = (PosixNetworkInterface *)(info->coreIntf.next);
+    }
+}
+
+// update gMaxFD
+mDNSlocal void  DetermineMaxEventFD(void)
+{
+    PosixEventSource    *iSource;
+
+    gMaxFD = 0;
+    for (iSource=(PosixEventSource*)gEventSources.Head; iSource; iSource = iSource->Next)
+        if (gMaxFD < iSource->fd)
+            gMaxFD = iSource->fd;
+}
+
+// Add a file descriptor to the set that mDNSPosixRunEventLoopOnce() listens to.
+mStatus mDNSPosixAddFDToEventLoop(int fd, mDNSPosixEventCallback callback, void *context)
+{
+    PosixEventSource    *newSource;
+
+    if (gEventSources.LinkOffset == 0)
+        InitLinkedList(&gEventSources, offsetof(PosixEventSource, Next));
+
+    if (fd >= (int) FD_SETSIZE || fd < 0)
+        return mStatus_UnsupportedErr;
+    if (callback == NULL)
+        return mStatus_BadParamErr;
+
+    newSource = (PosixEventSource*) malloc(sizeof *newSource);
+    if (NULL == newSource)
+        return mStatus_NoMemoryErr;
+
+    newSource->Callback = callback;
+    newSource->Context = context;
+    newSource->fd = fd;
+
+    AddToTail(&gEventSources, newSource);
+    FD_SET(fd, &gEventFDs);
+
+    DetermineMaxEventFD();
+
+    return mStatus_NoError;
+}
+
+// Remove a file descriptor from the set that mDNSPosixRunEventLoopOnce() listens to.
+mStatus mDNSPosixRemoveFDFromEventLoop(int fd)
+{
+    PosixEventSource    *iSource;
+
+    for (iSource=(PosixEventSource*)gEventSources.Head; iSource; iSource = iSource->Next)
+    {
+        if (fd == iSource->fd)
+        {
+            FD_CLR(fd, &gEventFDs);
+            RemoveFromList(&gEventSources, iSource);
+            free(iSource);
+            DetermineMaxEventFD();
+            return mStatus_NoError;
+        }
+    }
+    return mStatus_NoSuchNameErr;
+}
+
+// Simply note the received signal in gEventSignals.
+mDNSlocal void  NoteSignal(int signum)
+{
+    sigaddset(&gEventSignals, signum);
+}
+
+// Tell the event package to listen for signal and report it in mDNSPosixRunEventLoopOnce().
+mStatus mDNSPosixListenForSignalInEventLoop(int signum)
+{
+    struct sigaction action;
+    mStatus err;
+
+    mDNSPlatformMemZero(&action, sizeof action);        // more portable than member-wise assignment
+    action.sa_handler = NoteSignal;
+    err = sigaction(signum, &action, (struct sigaction*) NULL);
+
+    sigaddset(&gEventSignalSet, signum);
+
+    return err;
+}
+
+// Tell the event package to stop listening for signal in mDNSPosixRunEventLoopOnce().
+mStatus mDNSPosixIgnoreSignalInEventLoop(int signum)
+{
+    struct sigaction action;
+    mStatus err;
+
+    mDNSPlatformMemZero(&action, sizeof action);        // more portable than member-wise assignment
+    action.sa_handler = SIG_DFL;
+    err = sigaction(signum, &action, (struct sigaction*) NULL);
+
+    sigdelset(&gEventSignalSet, signum);
+
+    return err;
+}
+
+// Do a single pass through the attendent event sources and dispatch any found to their callbacks.
+// Return as soon as internal timeout expires, or a signal we're listening for is received.
+mStatus mDNSPosixRunEventLoopOnce(mDNS *m, const struct timeval *pTimeout,
+                                  sigset_t *pSignalsReceived, mDNSBool *pDataDispatched)
+{
+    fd_set listenFDs = gEventFDs;
+    int fdMax = 0, numReady;
+    struct timeval timeout = *pTimeout;
+
+    // Include the sockets that are listening to the wire in our select() set
+    mDNSPosixGetFDSet(m, &fdMax, &listenFDs, &timeout); // timeout may get modified
+    if (fdMax < gMaxFD)
+        fdMax = gMaxFD;
+
+    numReady = select(fdMax + 1, &listenFDs, (fd_set*) NULL, (fd_set*) NULL, &timeout);
+
+    // If any data appeared, invoke its callback
+    if (numReady > 0)
+    {
+        PosixEventSource    *iSource;
+
+        (void) mDNSPosixProcessFDSet(m, &listenFDs);    // call this first to process wire data for clients
+
+        for (iSource=(PosixEventSource*)gEventSources.Head; iSource; iSource = iSource->Next)
+        {
+            if (FD_ISSET(iSource->fd, &listenFDs))
+            {
+                iSource->Callback(iSource->fd, 0, iSource->Context);
+                break;  // in case callback removed elements from gEventSources
+            }
+        }
+        *pDataDispatched = mDNStrue;
+    }
+    else
+        *pDataDispatched = mDNSfalse;
+
+    (void) sigprocmask(SIG_BLOCK, &gEventSignalSet, (sigset_t*) NULL);
+    *pSignalsReceived = gEventSignals;
+    sigemptyset(&gEventSignals);
+    (void) sigprocmask(SIG_UNBLOCK, &gEventSignalSet, (sigset_t*) NULL);
+
+    return mStatus_NoError;
+}
diff --git a/mDNSResponder/mDNSPosix/mDNSPosix.h b/mDNSResponder/mDNSPosix/mDNSPosix.h
new file mode 100755
index 00000000..f9fcea78
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/mDNSPosix.h
@@ -0,0 +1,85 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __mDNSPlatformPosix_h
+#define __mDNSPlatformPosix_h
+
+#include <signal.h>
+#include <sys/time.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+// PosixNetworkInterface is a record extension of the core NetworkInterfaceInfo
+// type that supports extra fields needed by the Posix platform.
+//
+// IMPORTANT: coreIntf must be the first field in the structure because
+// we cast between pointers to the two different types regularly.
+
+typedef struct PosixNetworkInterface PosixNetworkInterface;
+
+struct PosixNetworkInterface
+{
+    NetworkInterfaceInfo coreIntf;
+    const char *            intfName;
+    PosixNetworkInterface * aliasIntf;
+    int index;
+    int multicastSocket4;
+#if HAVE_IPV6
+    int multicastSocket6;
+#endif
+};
+
+// This is a global because debugf_() needs to be able to check its value
+extern int gMDNSPlatformPosixVerboseLevel;
+
+struct mDNS_PlatformSupport_struct
+{
+    int unicastSocket4;
+#if HAVE_IPV6
+    int unicastSocket6;
+#endif
+};
+
+#define uDNS_SERVERS_FILE "/etc/resolv.conf"
+extern int ParseDNSServers(mDNS *m, const char *filePath);
+extern mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m);
+// See comment in implementation.
+
+// Call mDNSPosixGetFDSet before calling select(), to update the parameters
+// as may be necessary to meet the needs of the mDNSCore code.
+// The timeout pointer MUST NOT be NULL.
+// Set timeout->tv_sec to 0x3FFFFFFF if you want to have effectively no timeout
+// After calling mDNSPosixGetFDSet(), call select(nfds, &readfds, NULL, NULL, &timeout); as usual
+// After select() returns, call mDNSPosixProcessFDSet() to let mDNSCore do its work
+extern void mDNSPosixGetFDSet(mDNS *m, int *nfds, fd_set *readfds, struct timeval *timeout);
+extern void mDNSPosixProcessFDSet(mDNS *const m, fd_set *readfds);
+
+typedef void (*mDNSPosixEventCallback)(int fd, short filter, void *context);
+
+extern mStatus mDNSPosixAddFDToEventLoop( int fd, mDNSPosixEventCallback callback, void *context);
+extern mStatus mDNSPosixRemoveFDFromEventLoop( int fd);
+extern mStatus mDNSPosixListenForSignalInEventLoop( int signum);
+extern mStatus mDNSPosixIgnoreSignalInEventLoop( int signum);
+extern mStatus mDNSPosixRunEventLoopOnce( mDNS *m, const struct timeval *pTimeout, sigset_t *pSignalsReceived, mDNSBool *pDataDispatched);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/mDNSResponder/mDNSPosix/mDNSUNP.c b/mDNSResponder/mDNSPosix/mDNSUNP.c
new file mode 100755
index 00000000..b392fc74
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/mDNSUNP.c
@@ -0,0 +1,719 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mDNSUNP.h"
+
+#include <errno.h>
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/uio.h>
+#include <sys/ioctl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdio.h>
+
+/* Some weird platforms derived from 4.4BSD Lite (e.g. EFI) need the ALIGN(P)
+   macro, usually defined in <sys/param.h> or someplace like that, to make sure the
+   CMSG_NXTHDR macro is well-formed. On such platforms, the symbol NEED_ALIGN_MACRO
+   should be set to the name of the header to include to get the ALIGN(P) macro.
+ */
+#ifdef NEED_ALIGN_MACRO
+#include NEED_ALIGN_MACRO
+#endif
+
+/* Solaris defined SIOCGIFCONF etc in <sys/sockio.h> but
+   other platforms don't even have that include file.  So,
+   if we haven't yet got a definition, let's try to find
+   <sys/sockio.h>.
+ */
+
+#ifndef SIOCGIFCONF
+    #include <sys/sockio.h>
+#endif
+
+/* sockaddr_dl is only referenced if we're using IP_RECVIF,
+   so only include the header in that case.
+ */
+
+#ifdef  IP_RECVIF
+    #include <net/if_dl.h>
+#endif
+
+#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX
+#include <net/if_var.h>
+#include <netinet/in_var.h>
+// Note: netinet/in_var.h implicitly includes netinet6/in6_var.h for us
+#endif
+
+#if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
+#include <netdb.h>
+#include <arpa/inet.h>
+
+/* Converts a prefix length to IPv6 network mask */
+void plen_to_mask(int plen, char *addr) {
+    int i;
+    int colons=7; /* Number of colons in IPv6 address */
+    int bits_in_block=16; /* Bits per IPv6 block */
+    for(i=0; i<=colons; i++) {
+        int block, ones=0xffff, ones_in_block;
+        if (plen>bits_in_block) ones_in_block=bits_in_block;
+        else ones_in_block=plen;
+        block = ones & (ones << (bits_in_block-ones_in_block));
+        i==0 ? sprintf(addr, "%x", block) : sprintf(addr, "%s:%x", addr, block);
+        plen -= ones_in_block;
+    }
+}
+
+/* Gets IPv6 interface information from the /proc filesystem in linux*/
+struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases)
+{
+    struct ifi_info *ifi, *ifihead, **ifipnext, *ifipold, **ifiptr;
+    FILE *fp;
+    char addr[8][5];
+    int flags, myflags, index, plen, scope;
+    char ifname[9], lastname[IFNAMSIZ];
+    char addr6[32+7+1]; /* don't forget the seven ':' */
+    struct addrinfo hints, *res0;
+    struct sockaddr_in6 *sin6;
+    struct in6_addr *addrptr;
+    int err;
+    int sockfd = -1;
+    struct ifreq ifr;
+
+    res0=NULL;
+    ifihead = NULL;
+    ifipnext = &ifihead;
+    lastname[0] = 0;
+
+    if ((fp = fopen(PROC_IFINET6_PATH, "r")) != NULL) {
+        sockfd = socket(AF_INET6, SOCK_DGRAM, 0);
+        if (sockfd < 0) {
+            goto gotError;
+        }
+        while (fscanf(fp,
+                      "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %8s\n",
+                      addr[0],addr[1],addr[2],addr[3],
+                      addr[4],addr[5],addr[6],addr[7],
+                      &index, &plen, &scope, &flags, ifname) != EOF) {
+
+            myflags = 0;
+            if (strncmp(lastname, ifname, IFNAMSIZ) == 0) {
+                if (doaliases == 0)
+                    continue;   /* already processed this interface */
+                myflags = IFI_ALIAS;
+            }
+            memcpy(lastname, ifname, IFNAMSIZ);
+            ifi = (struct ifi_info*)calloc(1, sizeof(struct ifi_info));
+            if (ifi == NULL) {
+                goto gotError;
+            }
+
+            ifipold   = *ifipnext;       /* need this later */
+            ifiptr    = ifipnext;
+            *ifipnext = ifi;            /* prev points to this new one */
+            ifipnext = &ifi->ifi_next;  /* pointer to next one goes here */
+
+            sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s",
+                    addr[0],addr[1],addr[2],addr[3],
+                    addr[4],addr[5],addr[6],addr[7]);
+
+            /* Add address of the interface */
+            memset(&hints, 0, sizeof(hints));
+            hints.ai_family = AF_INET6;
+            hints.ai_flags = AI_NUMERICHOST;
+            err = getaddrinfo(addr6, NULL, &hints, &res0);
+            if (err) {
+                goto gotError;
+            }
+            ifi->ifi_addr = calloc(1, sizeof(struct sockaddr_in6));
+            if (ifi->ifi_addr == NULL) {
+                goto gotError;
+            }
+            memcpy(ifi->ifi_addr, res0->ai_addr, sizeof(struct sockaddr_in6));
+
+            /* Add netmask of the interface */
+            char ipv6addr[INET6_ADDRSTRLEN];
+            plen_to_mask(plen, ipv6addr);
+            ifi->ifi_netmask = calloc(1, sizeof(struct sockaddr_in6));
+            if (ifi->ifi_addr == NULL) {
+                goto gotError;
+            }
+            sin6=calloc(1, sizeof(struct sockaddr_in6));
+            addrptr=calloc(1, sizeof(struct in6_addr));
+            inet_pton(family, ipv6addr, addrptr);
+            sin6->sin6_family=family;
+            sin6->sin6_addr=*addrptr;
+            sin6->sin6_scope_id=scope;
+            memcpy(ifi->ifi_netmask, sin6, sizeof(struct sockaddr_in6));
+            free(sin6);
+
+
+            /* Add interface name */
+            memcpy(ifi->ifi_name, ifname, IFI_NAME);
+
+            /* Add interface index */
+            ifi->ifi_index = index;
+
+            /* Add interface flags*/
+            memcpy(ifr.ifr_name, ifname, IFNAMSIZ);
+            if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
+                if (errno == EADDRNOTAVAIL) {
+                    /*
+                     * If the main interface is configured with no IP address but
+                     * an alias interface exists with an IP address, you get
+                     * EADDRNOTAVAIL for the main interface
+                     */
+                    free(ifi->ifi_addr);
+                    free(ifi);
+                    ifipnext  = ifiptr;
+                    *ifipnext = ifipold;
+                    continue;
+                } else {
+                    goto gotError;
+                }
+            }
+            ifi->ifi_flags = ifr.ifr_flags;
+            freeaddrinfo(res0);
+            res0=NULL;
+        }
+    }
+    goto done;
+
+gotError:
+    if (ifihead != NULL) {
+        free_ifi_info(ifihead);
+        ifihead = NULL;
+    }
+    if (res0 != NULL) {
+        freeaddrinfo(res0);
+        res0=NULL;
+    }
+done:
+    if (sockfd != -1) {
+        assert(close(sockfd) == 0);
+    }
+    return(ifihead);    /* pointer to first structure in linked list */
+}
+#endif // defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
+
+struct ifi_info *get_ifi_info(int family, int doaliases)
+{
+    int junk;
+    struct ifi_info     *ifi, *ifihead, **ifipnext, *ifipold, **ifiptr;
+    int sockfd, sockf6, len, lastlen, flags, myflags;
+#ifdef NOT_HAVE_IF_NAMETOINDEX
+    int index = 200;
+#endif
+    char                *ptr, *buf, lastname[IFNAMSIZ], *cptr;
+    struct ifconf ifc;
+    struct ifreq        *ifr, ifrcopy;
+    struct sockaddr_in  *sinptr;
+
+#if defined(AF_INET6) && HAVE_IPV6
+    struct sockaddr_in6 *sinptr6;
+#endif
+
+#if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
+    if (family == AF_INET6) return get_ifi_info_linuxv6(family, doaliases);
+#endif
+
+    sockfd = -1;
+    sockf6 = -1;
+    buf = NULL;
+    ifihead = NULL;
+
+    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sockfd < 0) {
+        goto gotError;
+    }
+
+    lastlen = 0;
+    len = 100 * sizeof(struct ifreq);   /* initial buffer size guess */
+    for ( ; ; ) {
+        buf = (char*)malloc(len);
+        if (buf == NULL) {
+            goto gotError;
+        }
+        ifc.ifc_len = len;
+        ifc.ifc_buf = buf;
+        if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) {
+            if (errno != EINVAL || lastlen != 0) {
+                goto gotError;
+            }
+        } else {
+            if (ifc.ifc_len == lastlen)
+                break;      /* success, len has not changed */
+            lastlen = ifc.ifc_len;
+        }
+        len += 10 * sizeof(struct ifreq);   /* increment */
+        free(buf);
+    }
+    ifihead = NULL;
+    ifipnext = &ifihead;
+    lastname[0] = 0;
+/* end get_ifi_info1 */
+
+/* include get_ifi_info2 */
+    for (ptr = buf; ptr < buf + ifc.ifc_len; ) {
+        ifr = (struct ifreq *) ptr;
+
+        /* Advance to next one in buffer */
+        if (sizeof(struct ifreq) > sizeof(ifr->ifr_name) + GET_SA_LEN(ifr->ifr_addr))
+            ptr += sizeof(struct ifreq);
+        else
+            ptr += sizeof(ifr->ifr_name) + GET_SA_LEN(ifr->ifr_addr);
+
+//      fprintf(stderr, "intf %p name=%s AF=%d\n", index, ifr->ifr_name, ifr->ifr_addr.sa_family);
+
+        if (ifr->ifr_addr.sa_family != family)
+            continue;   /* ignore if not desired address family */
+
+        myflags = 0;
+        if ( (cptr = strchr(ifr->ifr_name, ':')) != NULL)
+            *cptr = 0;      /* replace colon will null */
+        if (strncmp(lastname, ifr->ifr_name, IFNAMSIZ) == 0) {
+            if (doaliases == 0)
+                continue;   /* already processed this interface */
+            myflags = IFI_ALIAS;
+        }
+        memcpy(lastname, ifr->ifr_name, IFNAMSIZ);
+
+        ifrcopy = *ifr;
+        if (ioctl(sockfd, SIOCGIFFLAGS, &ifrcopy) < 0) {
+            goto gotError;
+        }
+
+        flags = ifrcopy.ifr_flags;
+        if ((flags & IFF_UP) == 0)
+            continue;   /* ignore if interface not up */
+
+        ifi = (struct ifi_info*)calloc(1, sizeof(struct ifi_info));
+        if (ifi == NULL) {
+            goto gotError;
+        }
+        ifipold   = *ifipnext;       /* need this later */
+        ifiptr    = ifipnext;
+        *ifipnext = ifi;             /* prev points to this new one */
+        ifipnext  = &ifi->ifi_next;  /* pointer to next one goes here */
+
+        ifi->ifi_flags = flags;     /* IFF_xxx values */
+        ifi->ifi_myflags = myflags; /* IFI_xxx values */
+#ifndef NOT_HAVE_IF_NAMETOINDEX
+        ifi->ifi_index = if_nametoindex(ifr->ifr_name);
+#else
+        ifrcopy = *ifr;
+#ifdef SIOCGIFINDEX
+        if ( 0 >= ioctl(sockfd, SIOCGIFINDEX, &ifrcopy))
+            ifi->ifi_index = ifrcopy.ifr_index;
+        else
+#endif
+        ifi->ifi_index = index++;       /* SIOCGIFINDEX is broken on Solaris 2.5ish, so fake it */
+#endif
+        memcpy(ifi->ifi_name, ifr->ifr_name, IFI_NAME);
+        ifi->ifi_name[IFI_NAME-1] = '\0';
+/* end get_ifi_info2 */
+/* include get_ifi_info3 */
+        switch (ifr->ifr_addr.sa_family) {
+        case AF_INET:
+            sinptr = (struct sockaddr_in *) &ifr->ifr_addr;
+            if (ifi->ifi_addr == NULL) {
+                ifi->ifi_addr = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in));
+                if (ifi->ifi_addr == NULL) {
+                    goto gotError;
+                }
+                memcpy(ifi->ifi_addr, sinptr, sizeof(struct sockaddr_in));
+
+#ifdef  SIOCGIFNETMASK
+                if (ioctl(sockfd, SIOCGIFNETMASK, &ifrcopy) < 0) {
+                    if (errno == EADDRNOTAVAIL) {
+                        /*
+                         * If the main interface is configured with no IP address but
+                         * an alias interface exists with an IP address, you get
+                         * EADDRNOTAVAIL for the main interface
+                         */
+                        free(ifi->ifi_addr);
+                        free(ifi);
+                        ifipnext  = ifiptr;
+                        *ifipnext = ifipold;
+                        continue;
+                    } else {
+                        goto gotError;
+                    }
+                }
+
+                ifi->ifi_netmask = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in));
+                if (ifi->ifi_netmask == NULL) goto gotError;
+                sinptr = (struct sockaddr_in *) &ifrcopy.ifr_addr;
+                /* The BSD ioctls (including Mac OS X) stick some weird values in for sin_len and sin_family */
+#ifndef NOT_HAVE_SA_LEN
+                sinptr->sin_len    = sizeof(struct sockaddr_in);
+#endif
+                sinptr->sin_family = AF_INET;
+                memcpy(ifi->ifi_netmask, sinptr, sizeof(struct sockaddr_in));
+#endif
+
+#ifdef  SIOCGIFBRDADDR
+                if (flags & IFF_BROADCAST) {
+                    if (ioctl(sockfd, SIOCGIFBRDADDR, &ifrcopy) < 0) {
+                        goto gotError;
+                    }
+                    sinptr = (struct sockaddr_in *) &ifrcopy.ifr_broadaddr;
+                    /* The BSD ioctls (including Mac OS X) stick some weird values in for sin_len and sin_family */
+#ifndef NOT_HAVE_SA_LEN
+                    sinptr->sin_len    = sizeof( struct sockaddr_in );
+#endif
+                    sinptr->sin_family = AF_INET;
+                    ifi->ifi_brdaddr = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in));
+                    if (ifi->ifi_brdaddr == NULL) {
+                        goto gotError;
+                    }
+                    memcpy(ifi->ifi_brdaddr, sinptr, sizeof(struct sockaddr_in));
+                }
+#endif
+
+#ifdef  SIOCGIFDSTADDR
+                if (flags & IFF_POINTOPOINT) {
+                    if (ioctl(sockfd, SIOCGIFDSTADDR, &ifrcopy) < 0) {
+                        goto gotError;
+                    }
+                    sinptr = (struct sockaddr_in *) &ifrcopy.ifr_dstaddr;
+                    /* The BSD ioctls (including Mac OS X) stick some weird values in for sin_len and sin_family */
+#ifndef NOT_HAVE_SA_LEN
+                    sinptr->sin_len    = sizeof( struct sockaddr_in );
+#endif
+                    sinptr->sin_family = AF_INET;
+                    ifi->ifi_dstaddr = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in));
+                    if (ifi->ifi_dstaddr == NULL) {
+                        goto gotError;
+                    }
+                    memcpy(ifi->ifi_dstaddr, sinptr, sizeof(struct sockaddr_in));
+                }
+#endif
+            }
+            break;
+
+#if defined(AF_INET6) && HAVE_IPV6
+        case AF_INET6:
+            sinptr6 = (struct sockaddr_in6 *) &ifr->ifr_addr;
+            if (ifi->ifi_addr == NULL) {
+                ifi->ifi_addr = calloc(1, sizeof(struct sockaddr_in6));
+                if (ifi->ifi_addr == NULL) {
+                    goto gotError;
+                }
+
+                /* Some platforms (*BSD) inject the prefix in IPv6LL addresses */
+                /* We need to strip that out */
+                if (IN6_IS_ADDR_LINKLOCAL(&sinptr6->sin6_addr))
+                    sinptr6->sin6_addr.s6_addr[2] = sinptr6->sin6_addr.s6_addr[3] = 0;
+                memcpy(ifi->ifi_addr, sinptr6, sizeof(struct sockaddr_in6));
+
+#ifdef  SIOCGIFNETMASK_IN6
+                {
+                    struct in6_ifreq ifr6;
+                    if (sockf6 == -1)
+                        sockf6 = socket(AF_INET6, SOCK_DGRAM, 0);
+                    memset(&ifr6, 0, sizeof(ifr6));
+                    memcpy(&ifr6.ifr_name,           &ifr->ifr_name, sizeof(ifr6.ifr_name          ));
+                    memcpy(&ifr6.ifr_ifru.ifru_addr, &ifr->ifr_addr, sizeof(ifr6.ifr_ifru.ifru_addr));
+                    if (ioctl(sockf6, SIOCGIFNETMASK_IN6, &ifr6) < 0) {
+                        if (errno == EADDRNOTAVAIL) {
+                            /*
+                             * If the main interface is configured with no IP address but
+                             * an alias interface exists with an IP address, you get
+                             * EADDRNOTAVAIL for the main interface
+                             */
+                            free(ifi->ifi_addr);
+                            free(ifi);
+                            ifipnext  = ifiptr;
+                            *ifipnext = ifipold;
+                            continue;
+                        } else {
+                            goto gotError;
+                        }
+                    }
+                    ifi->ifi_netmask = (struct sockaddr*)calloc(1, sizeof(struct sockaddr_in6));
+                    if (ifi->ifi_netmask == NULL) goto gotError;
+                    sinptr6 = (struct sockaddr_in6 *) &ifr6.ifr_ifru.ifru_addr;
+                    memcpy(ifi->ifi_netmask, sinptr6, sizeof(struct sockaddr_in6));
+                }
+#endif
+            }
+            break;
+#endif
+
+        default:
+            break;
+        }
+    }
+    goto done;
+
+gotError:
+    if (ifihead != NULL) {
+        free_ifi_info(ifihead);
+        ifihead = NULL;
+    }
+
+done:
+    if (buf != NULL) {
+        free(buf);
+    }
+    if (sockfd != -1) {
+        junk = close(sockfd);
+        assert(junk == 0);
+    }
+    if (sockf6 != -1) {
+        junk = close(sockf6);
+        assert(junk == 0);
+    }
+    return(ifihead);    /* pointer to first structure in linked list */
+}
+/* end get_ifi_info3 */
+
+/* include free_ifi_info */
+void
+free_ifi_info(struct ifi_info *ifihead)
+{
+    struct ifi_info *ifi, *ifinext;
+
+    for (ifi = ifihead; ifi != NULL; ifi = ifinext) {
+        if (ifi->ifi_addr != NULL)
+            free(ifi->ifi_addr);
+        if (ifi->ifi_netmask != NULL)
+            free(ifi->ifi_netmask);
+        if (ifi->ifi_brdaddr != NULL)
+            free(ifi->ifi_brdaddr);
+        if (ifi->ifi_dstaddr != NULL)
+            free(ifi->ifi_dstaddr);
+        ifinext = ifi->ifi_next;    /* can't fetch ifi_next after free() */
+        free(ifi);                  /* the ifi_info{} itself */
+    }
+}
+/* end free_ifi_info */
+
+ssize_t
+recvfrom_flags(int fd, void *ptr, size_t nbytes, int *flagsp,
+               struct sockaddr *sa, socklen_t *salenptr, struct my_in_pktinfo *pktp, u_char *ttl)
+{
+    struct msghdr msg;
+    struct iovec iov[1];
+    ssize_t n;
+
+#ifdef CMSG_FIRSTHDR
+    struct cmsghdr  *cmptr;
+    union {
+        struct cmsghdr cm;
+        char control[1024];
+    } control_un;
+
+    *ttl = 255;         // If kernel fails to provide TTL data then assume the TTL was 255 as it should be
+
+    msg.msg_control = control_un.control;
+    msg.msg_controllen = sizeof(control_un.control);
+    msg.msg_flags = 0;
+#else
+    memset(&msg, 0, sizeof(msg));   /* make certain msg_accrightslen = 0 */
+#endif /* CMSG_FIRSTHDR */
+
+    msg.msg_name = (char *) sa;
+    msg.msg_namelen = *salenptr;
+    iov[0].iov_base = (char *)ptr;
+    iov[0].iov_len = nbytes;
+    msg.msg_iov = iov;
+    msg.msg_iovlen = 1;
+
+    if ( (n = recvmsg(fd, &msg, *flagsp)) < 0)
+        return(n);
+
+    *salenptr = msg.msg_namelen;    /* pass back results */
+    if (pktp) {
+        /* 0.0.0.0, i/f = -1 */
+        /* We set the interface to -1 so that the caller can
+           tell whether we returned a meaningful value or
+           just some default.  Previously this code just
+           set the value to 0, but I'm concerned that 0
+           might be a valid interface value.
+         */
+        memset(pktp, 0, sizeof(struct my_in_pktinfo));
+        pktp->ipi_ifindex = -1;
+    }
+/* end recvfrom_flags1 */
+
+/* include recvfrom_flags2 */
+#ifndef CMSG_FIRSTHDR
+    #warning CMSG_FIRSTHDR not defined. Will not be able to determine destination address, received interface, etc.
+    *flagsp = 0;                    /* pass back results */
+    return(n);
+#else
+
+    *flagsp = msg.msg_flags;        /* pass back results */
+    if (msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr) ||
+        (msg.msg_flags & MSG_CTRUNC) || pktp == NULL)
+        return(n);
+
+    for (cmptr = CMSG_FIRSTHDR(&msg); cmptr != NULL;
+         cmptr = CMSG_NXTHDR(&msg, cmptr)) {
+
+#ifdef  IP_PKTINFO
+#if in_pktinfo_definition_is_missing
+        struct in_pktinfo
+        {
+            int ipi_ifindex;
+            struct in_addr ipi_spec_dst;
+            struct in_addr ipi_addr;
+        };
+#endif
+        if (cmptr->cmsg_level == IPPROTO_IP &&
+            cmptr->cmsg_type == IP_PKTINFO) {
+            struct in_pktinfo *tmp;
+            struct sockaddr_in *sin = (struct sockaddr_in*)&pktp->ipi_addr;
+
+            tmp = (struct in_pktinfo *) CMSG_DATA(cmptr);
+            sin->sin_family = AF_INET;
+            sin->sin_addr = tmp->ipi_addr;
+            sin->sin_port = 0;
+            pktp->ipi_ifindex = tmp->ipi_ifindex;
+            continue;
+        }
+#endif
+
+#ifdef  IP_RECVDSTADDR
+        if (cmptr->cmsg_level == IPPROTO_IP &&
+            cmptr->cmsg_type == IP_RECVDSTADDR) {
+            struct sockaddr_in *sin = (struct sockaddr_in*)&pktp->ipi_addr;
+
+            sin->sin_family = AF_INET;
+            sin->sin_addr = *(struct in_addr*)CMSG_DATA(cmptr);
+            sin->sin_port = 0;
+            continue;
+        }
+#endif
+
+#ifdef  IP_RECVIF
+        if (cmptr->cmsg_level == IPPROTO_IP &&
+            cmptr->cmsg_type == IP_RECVIF) {
+            struct sockaddr_dl  *sdl = (struct sockaddr_dl *) CMSG_DATA(cmptr);
+#ifndef HAVE_BROKEN_RECVIF_NAME
+            int nameLen = (sdl->sdl_nlen < IFI_NAME - 1) ? sdl->sdl_nlen : (IFI_NAME - 1);
+            strncpy(pktp->ipi_ifname, sdl->sdl_data, nameLen);
+#endif
+            pktp->ipi_ifindex = sdl->sdl_index;
+#ifdef HAVE_BROKEN_RECVIF_NAME
+            if (sdl->sdl_index == 0) {
+                pktp->ipi_ifindex = *(uint_t*)sdl;
+            }
+#endif
+            assert(pktp->ipi_ifname[IFI_NAME - 1] == 0);
+            // null terminated because of memset above
+            continue;
+        }
+#endif
+
+#ifdef  IP_RECVTTL
+        if (cmptr->cmsg_level == IPPROTO_IP &&
+            cmptr->cmsg_type == IP_RECVTTL) {
+            *ttl = *(u_char*)CMSG_DATA(cmptr);
+            continue;
+        }
+        else if (cmptr->cmsg_level == IPPROTO_IP &&
+                 cmptr->cmsg_type == IP_TTL) {  // some implementations seem to send IP_TTL instead of IP_RECVTTL
+            *ttl = *(int*)CMSG_DATA(cmptr);
+            continue;
+        }
+#endif
+
+#if defined(IPV6_PKTINFO) && HAVE_IPV6
+        if (cmptr->cmsg_level == IPPROTO_IPV6 &&
+            cmptr->cmsg_type  == IPV6_2292_PKTINFO) {
+            struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&pktp->ipi_addr;
+            struct in6_pktinfo *ip6_info = (struct in6_pktinfo*)CMSG_DATA(cmptr);
+
+            sin6->sin6_family   = AF_INET6;
+#ifndef NOT_HAVE_SA_LEN
+            sin6->sin6_len      = sizeof(*sin6);
+#endif
+            sin6->sin6_addr     = ip6_info->ipi6_addr;
+            sin6->sin6_flowinfo = 0;
+            sin6->sin6_scope_id = 0;
+            sin6->sin6_port     = 0;
+            pktp->ipi_ifindex   = ip6_info->ipi6_ifindex;
+            continue;
+        }
+#endif
+
+#if defined(IPV6_HOPLIMIT) && HAVE_IPV6
+        if (cmptr->cmsg_level == IPPROTO_IPV6 &&
+            cmptr->cmsg_type == IPV6_2292_HOPLIMIT) {
+            *ttl = *(int*)CMSG_DATA(cmptr);
+            continue;
+        }
+#endif
+        assert(0);  // unknown ancillary data
+    }
+    return(n);
+#endif /* CMSG_FIRSTHDR */
+}
+
+// **********************************************************************************************
+
+// daemonize the process. Adapted from "Unix Network Programming" vol 1 by Stevens, section 12.4.
+// Returns 0 on success, -1 on failure.
+
+#ifdef NOT_HAVE_DAEMON
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/signal.h>
+
+int daemon(int nochdir, int noclose)
+{
+    switch (fork())
+    {
+    case -1: return (-1);       // Fork failed
+    case 0:  break;             // Child -- continue
+    default: _exit(0);          // Parent -- exit
+    }
+
+    if (setsid() == -1) return(-1);
+
+    signal(SIGHUP, SIG_IGN);
+
+    switch (fork())             // Fork again, primarily for reasons of Unix trivia
+    {
+    case -1: return (-1);       // Fork failed
+    case 0:  break;             // Child -- continue
+    default: _exit(0);          // Parent -- exit
+    }
+
+    if (!nochdir) (void)chdir("/");
+    umask(0);
+
+    if (!noclose)
+    {
+        int fd = open("/dev/null", O_RDWR, 0);
+        if (fd != -1)
+        {
+            // Avoid unnecessarily duplicating a file descriptor to itself
+            if (fd != STDIN_FILENO) (void)dup2(fd, STDIN_FILENO);
+            if (fd != STDOUT_FILENO) (void)dup2(fd, STDOUT_FILENO);
+            if (fd != STDERR_FILENO) (void)dup2(fd, STDERR_FILENO);
+            if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO)
+                (void)close (fd);
+        }
+    }
+    return (0);
+}
+#endif /* NOT_HAVE_DAEMON */
diff --git a/mDNSResponder/mDNSPosix/mDNSUNP.h b/mDNSResponder/mDNSPosix/mDNSUNP.h
new file mode 100755
index 00000000..cc81b7d3
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/mDNSUNP.h
@@ -0,0 +1,130 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __mDNSUNP_h
+#define __mDNSUNP_h
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+#ifdef HAVE_LINUX
+#include <linux/socket.h>
+#define IPV6_2292_PKTINFO  IPV6_2292PKTINFO
+#define IPV6_2292_HOPLIMIT IPV6_2292HOPLIMIT
+#else
+// The following are the supported non-linux posix OSes -
+// netbsd, freebsd and openbsd.
+#if HAVE_IPV6
+#define IPV6_2292_PKTINFO  19
+#define IPV6_2292_HOPLIMIT 20
+#endif
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef NOT_HAVE_SOCKLEN_T
+typedef unsigned int socklen_t;
+#endif
+
+#if !defined(_SS_MAXSIZE)
+#if HAVE_IPV6
+#define sockaddr_storage sockaddr_in6
+#else
+#define sockaddr_storage sockaddr
+#endif // HAVE_IPV6
+#endif // !defined(_SS_MAXSIZE)
+
+#ifndef NOT_HAVE_SA_LEN
+#define GET_SA_LEN(X) (sizeof(struct sockaddr) > ((struct sockaddr*)&(X))->sa_len ? \
+                       sizeof(struct sockaddr) : ((struct sockaddr*)&(X))->sa_len   )
+#elif HAVE_IPV6
+#define GET_SA_LEN(X) (((struct sockaddr*)&(X))->sa_family == AF_INET  ? sizeof(struct sockaddr_in) : \
+                       ((struct sockaddr*)&(X))->sa_family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr))
+#else
+#define GET_SA_LEN(X) (((struct sockaddr*)&(X))->sa_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr))
+#endif
+
+#define IFI_NAME    16          /* same as IFNAMSIZ in <net/if.h> */
+#define IFI_HADDR    8          /* allow for 64-bit EUI-64 in future */
+
+// Renamed from my_in_pktinfo because in_pktinfo is used by Linux.
+
+struct my_in_pktinfo {
+    struct sockaddr_storage ipi_addr;
+    int ipi_ifindex;                                /* received interface index */
+    char ipi_ifname[IFI_NAME];                      /* received interface name  */
+};
+
+/* From the text (Stevens, section 20.2): */
+/* 'As an example of recvmsg we will write a function named recvfrom_flags that */
+/* is similar to recvfrom but also returns: */
+/*	1. the returned msg_flags value, */
+/*	2. the destination addres of the received datagram (from the IP_RECVDSTADDR socket option, and */
+/*	3. the index of the interface on which the datagram was received (the IP_RECVIF socket option).' */
+extern ssize_t recvfrom_flags(int fd, void *ptr, size_t nbytes, int *flagsp,
+                              struct sockaddr *sa, socklen_t *salenptr, struct my_in_pktinfo *pktp, u_char *ttl);
+
+struct ifi_info {
+    char ifi_name[IFI_NAME];    /* interface name, null terminated */
+    u_char ifi_haddr[IFI_HADDR]; /* hardware address */
+    u_short ifi_hlen;           /* #bytes in hardware address: 0, 6, 8 */
+    short ifi_flags;            /* IFF_xxx constants from <net/if.h> */
+    short ifi_myflags;          /* our own IFI_xxx flags */
+    int ifi_index;              /* interface index */
+    struct sockaddr  *ifi_addr; /* primary address */
+    struct sockaddr  *ifi_netmask;
+    struct sockaddr  *ifi_brdaddr; /* broadcast address */
+    struct sockaddr  *ifi_dstaddr; /* destination address */
+    struct ifi_info  *ifi_next; /* next of these structures */
+};
+
+#if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
+#define PROC_IFINET6_PATH "/proc/net/if_inet6"
+extern struct ifi_info  *get_ifi_info_linuxv6(int family, int doaliases);
+#endif
+
+#if defined(AF_INET6) && HAVE_IPV6
+#define INET6_ADDRSTRLEN 46 /*Maximum length of IPv6 address */
+#endif
+
+
+
+#define IFI_ALIAS   1           /* ifi_addr is an alias */
+
+/* From the text (Stevens, section 16.6): */
+/* 'Since many programs need to know all the interfaces on a system, we will develop a */
+/* function of our own named get_ifi_info that returns a linked list of structures, one */
+/* for each interface that is currently "up."' */
+extern struct ifi_info  *get_ifi_info(int family, int doaliases);
+
+/* 'The free_ifi_info function, which takes a pointer that was */
+/* returned by get_ifi_info and frees all the dynamic memory.' */
+extern void             free_ifi_info(struct ifi_info *);
+
+#ifdef NOT_HAVE_DAEMON
+extern int daemon(int nochdir, int noclose);
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/mDNSResponder/mDNSPosix/mdnsd.sh b/mDNSResponder/mDNSPosix/mdnsd.sh
new file mode 100644
index 00000000..14fef9b4
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/mdnsd.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Emacs settings: -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2006 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Linux /etc/init.d script to start/stop the mdnsd daemon.
+#
+# The following lines are used by the *BSD rcorder system to decide
+# the order it's going to run the rc.d scripts at startup time.
+# PROVIDE: mdnsd
+# REQUIRE: NETWORKING
+
+if [ -r /usr/sbin/mdnsd ]; then
+    DAEMON=/usr/sbin/mdnsd
+else
+    DAEMON=/usr/local/sbin/mdnsd
+fi
+
+test -r $DAEMON || exit 0
+
+# Some systems have start-stop-daemon, some don't. 
+if [ -r /sbin/start-stop-daemon ]; then
+	START="start-stop-daemon --start --quiet --exec"
+	# Suse Linux doesn't work with symbolic signal names, but we really don't need
+	# to specify "-s TERM" since SIGTERM (15) is the default stop signal anway
+	# STOP="start-stop-daemon --stop -s TERM --quiet --oknodo --exec"
+	STOP="start-stop-daemon --stop --quiet --oknodo --exec"
+else
+	killmdnsd() {
+		kill -TERM `cat /var/run/mdnsd.pid`
+	}
+	START=
+	STOP=killmdnsd
+fi
+
+case "$1" in
+    start)
+	echo -n "Starting Apple Darwin Multicast DNS / DNS Service Discovery daemon:"
+	echo -n " mdnsd"
+        $START $DAEMON
+	echo "."
+	;;
+    stop)
+        echo -n "Stopping Apple Darwin Multicast DNS / DNS Service Discovery daemon:"
+        echo -n " mdnsd" ; $STOP $DAEMON
+        echo "."
+	;;
+    reload|restart|force-reload)
+		echo -n "Restarting Apple Darwin Multicast DNS / DNS Service Discovery daemon:"
+		$STOP $DAEMON
+		sleep 1
+		$START $DAEMON
+		echo -n " mdnsd"
+	;;
+    *)
+	echo "Usage: /etc/init.d/mDNS {start|stop|reload|restart}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/mDNSResponder/mDNSPosix/nss_ReadMe.txt b/mDNSResponder/mDNSPosix/nss_ReadMe.txt
new file mode 100755
index 00000000..2e3023c0
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/nss_ReadMe.txt
@@ -0,0 +1,125 @@
+# Readme for libnss_mdns
+
+Andrew White <Andrew.White@nicta.com.au>
+June 2004
+
+Before using this software, see "Licensing" at bottom of this file.
+
+
+# Introduction
+
+This code implements a module for the Name Service Switch to perform
+hostname lookups using the Darwin mDNSResponder / mdnsd.  This code has
+been tested on Debian and Redhat Linux.  It may work on other platforms. 
+It *will not* work on Darwin or Mac OS X - the necessary functionality is
+already built into the operation system.
+
+
+# Building and Installing:
+
+See "ReadMe.txt" for instructions on building and installing.
+
+When you run "make install" as described in that file:
+o libnss_mdns-0.2.so and libnss_mdns.so.2 are installed in /lib,
+o manual pages libnss_mdns(8) and nss_mdns.conf(5) are installed,
+o nss_mdns.conf is installed in /etc, and
+o /etc/nsswitch.conf is modified to add "mdns" on the "hosts:" line
+
+This will cause dns lookups to be passed via mdnsd before trying the dns.
+
+
+# Testing
+
+For most purposes, 'ping myhostname.local' will tell you if mdns is
+working.  If MDNS_VERBOSE was set in nss_mdns.c during compilation then
+lots of chatty debug messages will be dumped to LOG_DEBUG in syslog. 
+Otherwise, nss_mdns will only log if something isn't behaving quite right.
+
+
+# Implementation details
+
+libnss_mdns provides alternative back-end implementations of the libc
+functions gethostbyname, gethostbyname2 and gethostbyaddr, using the Name
+Service Switch mechanism.  More information on writing nsswitch modules
+can be found via 'info libc "Name Service Switch"', if installed.
+
+
+# Licensing
+
+This software is licensed under the NICTA Public Software License, version
+1.0, printed below:
+
+NICTA Public Software Licence
+Version 1.0
+
+Copyright © 2004 National ICT Australia Ltd
+
+All rights reserved.
+
+By this licence, National ICT Australia Ltd (NICTA) grants permission,
+free of charge, to any person who obtains a copy of this software
+and any associated documentation files ("the Software") to use and
+deal with the Software in source code and binary forms without
+restriction, with or without modification, and to permit persons
+to whom the Software is furnished to do so, provided that the
+following conditions are met:
+
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimers.
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimers in
+  the documentation and/or other materials provided with the
+  distribution.
+- The name of NICTA may not be used to endorse or promote products
+  derived from this Software without specific prior written permission.
+
+EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
+PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS" AND
+NICTA MAKES NO REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY
+REPRESENTATIONS, WARRANTIES OR CONDITIONS REGARDING THE CONTENTS
+OR ACCURACY OF THE SOFTWARE, OR OF TITLE, MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, THE ABSENCE OF LATENT
+OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR
+NOT DISCOVERABLE.
+
+TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+NICTA BE LIABLE ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+NEGLIGENCE) FOR ANY LOSS OR DAMAGE WHATSOEVER, INCLUDING (WITHOUT
+LIMITATION) LOSS OF PRODUCTION OR OPERATION TIME, LOSS, DAMAGE OR
+CORRUPTION OF DATA OR RECORDS; OR LOSS OF ANTICIPATED SAVINGS,
+OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR OTHER ECONOMIC LOSS;
+OR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
+EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS LICENCE,
+THE SOFTWARE OR THE USE OF THE SOFTWARE, EVEN IF NICTA HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+If applicable legislation implies warranties or conditions, or
+imposes obligations or liability on NICTA in respect of the Software
+that cannot be wholly or partly excluded, restricted or modified,
+NICTA's liability is limited, to the full extent permitted by the
+applicable legislation, at its option, to:
+
+a. in the case of goods, any one or more of the following:
+  i.   the replacement of the goods or the supply of equivalent goods;
+  ii.  the repair of the goods;
+  iii. the payment of the cost of replacing the goods or of acquiring
+       equivalent goods;
+  iv.  the payment of the cost of having the goods repaired; or
+b. in the case of services:
+  i.   the supplying of the services again; or 
+  ii.  the payment of the cost of having the services supplied
+       again.
+
+
+# Links:
+
+NICTA
+	http://www.nicta.com.au/
+Darwin
+	http://developer.apple.com/darwin/
+DNS service discovery and link-local
+	http://http://zeroconf.org/
+	http://http://multicastdns.org/
+	http://http://dns-sd.org/
+	http://http://dotlocal.org/
diff --git a/mDNSResponder/mDNSPosix/nss_mdns.c b/mDNSResponder/mDNSPosix/nss_mdns.c
new file mode 100755
index 00000000..afadb3c6
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/nss_mdns.c
@@ -0,0 +1,2723 @@
+/*
+   NICTA Public Software Licence
+   Version 1.0
+
+   Copyright © 2004 National ICT Australia Ltd
+
+   All rights reserved.
+
+   By this licence, National ICT Australia Ltd (NICTA) grants permission,
+   free of charge, to any person who obtains a copy of this software
+   and any associated documentation files ("the Software") to use and
+   deal with the Software in source code and binary forms without
+   restriction, with or without modification, and to permit persons
+   to whom the Software is furnished to do so, provided that the
+   following conditions are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimers.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimers in
+   the documentation and/or other materials provided with the
+   distribution.
+   - The name of NICTA may not be used to endorse or promote products
+   derived from this Software without specific prior written permission.
+
+   EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
+   PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS" AND
+   NICTA MAKES NO REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY
+   KIND, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY
+   REPRESENTATIONS, WARRANTIES OR CONDITIONS REGARDING THE CONTENTS
+   OR ACCURACY OF THE SOFTWARE, OR OF TITLE, MERCHANTABILITY, FITNESS
+   FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, THE ABSENCE OF LATENT
+   OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR
+   NOT DISCOVERABLE.
+
+   TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+   NICTA BE LIABLE ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+   NEGLIGENCE) FOR ANY LOSS OR DAMAGE WHATSOEVER, INCLUDING (WITHOUT
+   LIMITATION) LOSS OF PRODUCTION OR OPERATION TIME, LOSS, DAMAGE OR
+   CORRUPTION OF DATA OR RECORDS; OR LOSS OF ANTICIPATED SAVINGS,
+   OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR OTHER ECONOMIC LOSS;
+   OR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
+   EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS LICENCE,
+   THE SOFTWARE OR THE USE OF THE SOFTWARE, EVEN IF NICTA HAS BEEN
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+   If applicable legislation implies warranties or conditions, or
+   imposes obligations or liability on NICTA in respect of the Software
+   that cannot be wholly or partly excluded, restricted or modified,
+   NICTA's liability is limited, to the full extent permitted by the
+   applicable legislation, at its option, to:
+
+   a. in the case of goods, any one or more of the following:
+   i.   the replacement of the goods or the supply of equivalent goods;
+   ii.  the repair of the goods;
+   iii. the payment of the cost of replacing the goods or of acquiring
+       equivalent goods;
+   iv.  the payment of the cost of having the goods repaired; or
+   b. in the case of services:
+   i.   the supplying of the services again; or
+   ii.  the payment of the cost of having the services supplied
+       again.
+ */
+
+/*
+    NSSwitch Implementation of mDNS interface.
+
+    Andrew White (Andrew.White@nicta.com.au)
+    May 2004
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+#include <pthread.h>
+#include <ctype.h>
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <arpa/inet.h>
+#define BIND_8_COMPAT 1
+#include <arpa/nameser.h>
+
+#include <dns_sd.h>
+
+
+//----------
+// Public functions
+
+/*
+    Count the number of dots in a name string.
+ */
+int
+count_dots (const char * name);
+
+
+/*
+    Test whether a domain name is local.
+
+    Returns
+        1 if name ends with ".local" or ".local."
+        0 otherwise
+ */
+int
+islocal (const char * name);
+
+
+/*
+    Format an address structure as a string appropriate for DNS reverse (PTR)
+    lookup, based on address type.
+
+    Parameters
+        prefixlen
+            Prefix length, in bits.  When formatting, this will be rounded up
+            to the nearest appropriate size.  If -1, assume maximum.
+        buf
+            Output buffer.  Must be long enough to hold largest possible
+            output.
+    Returns
+        Pointer to (first character of) output buffer,
+        or NULL on error.
+ */
+char *
+format_reverse_addr (int af, const void * addr, int prefixlen, char * buf);
+
+
+/*
+    Format an address structure as a string appropriate for DNS reverse (PTR)
+    lookup for AF_INET.  Output is in .in-addr.arpa domain.
+
+    Parameters
+        prefixlen
+            Prefix length, in bits.  When formatting, this will be rounded up
+            to the nearest byte (8).  If -1, assume 32.
+        buf
+            Output buffer.  Must be long enough to hold largest possible
+            output.  For AF_INET, this is 29 characters (including null).
+    Returns
+        Pointer to (first character of) output buffer,
+        or NULL on error.
+ */
+char *
+format_reverse_addr_in (
+    const struct in_addr * addr,
+    int prefixlen,
+    char * buf
+    );
+#define DNS_PTR_AF_INET_SIZE 29
+
+/*
+    Format an address structure as a string appropriate for DNS reverse (PTR)
+    lookup for AF_INET6.  Output is in .ip6.arpa domain.
+
+    Parameters
+        prefixlen
+            Prefix length, in bits.  When formatting, this will be rounded up
+            to the nearest nibble (4).  If -1, assume 128.
+        buf
+            Output buffer.  Must be long enough to hold largest possible
+            output.  For AF_INET6, this is 72 characters (including null).
+    Returns
+        Pointer to (first character of) output buffer,
+        or NULL on error.
+ */
+char *
+format_reverse_addr_in6 (
+    const struct in6_addr * addr,
+    int prefixlen,
+    char * buf
+    );
+#define DNS_PTR_AF_INET6_SIZE 72
+
+
+/*
+    Compare whether the given dns name has the given domain suffix.
+    A single leading '.' on the name or leading or trailing '.' on the
+    domain is ignored for the purposes of the comparison.
+    Multiple leading or trailing '.'s are an error.  Other DNS syntax
+    errors are not checked for.  The comparison is case insensitive.
+
+    Returns
+        1 on success (match)
+        0 on failure (no match)
+        < 0 on error
+ */
+int
+cmp_dns_suffix (const char * name, const char * domain);
+enum
+{
+    CMP_DNS_SUFFIX_SUCCESS = 1,
+    CMP_DNS_SUFFIX_FAILURE = 0,
+    CMP_DNS_SUFFIX_BAD_NAME = 1,
+    CMP_DNS_SUFFIX_BAD_DOMAIN = -2
+};
+
+typedef int ns_type_t;
+typedef int ns_class_t;
+
+/*
+    Convert a DNS resource record (RR) code to an address family (AF) code.
+
+    Parameters
+        rrtype
+            resource record type (from nameser.h)
+
+    Returns
+        Appropriate AF code (from socket.h), or AF_UNSPEC if an appropriate
+        mapping couldn't be determined
+ */
+int
+rr_to_af (ns_type_t rrtype);
+
+
+/*
+    Convert an address family (AF) code to a DNS resource record (RR) code.
+
+    Parameters
+        int
+            address family code (from socket.h)
+    Returns
+        Appropriate RR code (from nameser.h), or ns_t_invalid if an appropriate
+        mapping couldn't be determined
+ */
+ns_type_t
+af_to_rr (int af);
+
+
+/*
+    Convert a string to an address family (case insensitive).
+
+    Returns
+        Matching AF code, or AF_UNSPEC if no match found.
+ */
+int
+str_to_af (const char * str);
+
+
+/*
+    Convert a string to an ns_class_t (case insensitive).
+
+    Returns
+        Matching ns_class_t, or ns_c_invalid if no match found.
+ */
+ns_class_t
+str_to_ns_class (const char * str);
+
+
+/*
+    Convert a string to an ns_type_t (case insensitive).
+
+    Returns
+        Matching ns_type_t, or ns_t_invalid if no match found.
+ */
+ns_type_t
+str_to_ns_type (const char * str);
+
+
+/*
+    Convert an address family code to a string.
+
+    Returns
+        String representation of AF,
+        or NULL if address family unrecognised or invalid.
+ */
+const char *
+af_to_str (int in);
+
+
+/*
+    Convert an ns_class_t code to a string.
+
+    Returns
+        String representation of ns_class_t,
+        or NULL if ns_class_t unrecognised or invalid.
+ */
+const char *
+ns_class_to_str (ns_class_t in);
+
+
+/*
+    Convert an ns_type_t code to a string.
+
+    Returns
+        String representation of ns_type_t,
+        or NULL if ns_type_t unrecognised or invalid.
+ */
+const char *
+ns_type_to_str (ns_type_t in);
+
+
+/*
+    Convert DNS rdata in label format (RFC1034, RFC1035) to a name.
+
+    On error, partial data is written to name (as much as was successfully
+    processed) and an error code is returned.  Errors include a name too
+    long for the buffer and a pointer in the label (which cannot be
+    resolved).
+
+    Parameters
+        rdata
+            Rdata formatted as series of labels.
+        rdlen
+            Length of rdata buffer.
+        name
+            Buffer to store fully qualified result in.
+            By RFC1034 section 3.1, a 255 character buffer (256 characters
+            including null) is long enough for any legal name.
+        name_len
+            Number of characters available in name buffer, not including
+            trailing null.
+
+    Returns
+        Length of name buffer (not including trailing null).
+        < 0 on error.
+        A return of 0 implies the empty domain.
+ */
+static int
+dns_rdata_to_name (const unsigned char * rdata, int rdlen, char * name, unsigned int name_len);
+enum
+{
+    DNS_RDATA_TO_NAME_BAD_FORMAT = -1,
+    // Format is broken.  Usually because we ran out of data
+    // (according to rdata) before the labels said we should.
+    DNS_RDATA_TO_NAME_TOO_LONG = -2,
+    // The converted rdata is longer than the name buffer.
+    DNS_RDATA_TO_NAME_PTR = -3,
+    // The rdata contains a pointer.
+};
+
+#define DNS_LABEL_MAXLEN 63
+// Maximum length of a single DNS label
+#define DNS_NAME_MAXLEN 256
+// Maximum length of a DNS name
+
+//----------
+// Public types
+
+typedef int errcode_t;
+// Used for 0 = success, non-zero = error code functions
+
+
+//----------
+// Public functions
+
+/*
+    Test whether a domain name is in a domain covered by nss_mdns.
+    The name is assumed to be fully qualified (trailing dot optional);
+    unqualified names will be processed but may return unusual results
+    if the unqualified prefix happens to match a domain suffix.
+
+    Returns
+         1 success
+         0 failure
+        -1 error, check errno
+ */
+int
+config_is_mdns_suffix (const char * name);
+
+
+/*
+    Loads all relevant data from configuration file.  Other code should
+    rarely need to call this function, since all other public configuration
+    functions do so implicitly.  Once loaded, configuration info doesn't
+    change.
+
+    Returns
+        0 configuration ready
+        non-zero configuration error code
+ */
+errcode_t
+init_config ();
+
+#define ENTNAME  hostent
+#define DATABASE "hosts"
+
+#include <nss.h>
+// For nss_status
+#include <netdb.h>
+// For hostent
+#include <sys/types.h>
+// For size_t
+
+typedef enum nss_status nss_status;
+typedef struct hostent hostent;
+
+/*
+   gethostbyname implementation
+
+    name:
+        name to look up
+    result_buf:
+        resulting entry
+    buf:
+        auxillary buffer
+    buflen:
+        length of auxillary buffer
+    errnop:
+        pointer to errno
+    h_errnop:
+        pointer to h_errno
+ */
+nss_status
+_nss_mdns_gethostbyname_r (
+    const char *name,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    );
+
+
+/*
+   gethostbyname2 implementation
+
+    name:
+        name to look up
+    af:
+        address family
+    result_buf:
+        resulting entry
+    buf:
+        auxillary buffer
+    buflen:
+        length of auxillary buffer
+    errnop:
+        pointer to errno
+    h_errnop:
+        pointer to h_errno
+ */
+nss_status
+_nss_mdns_gethostbyname2_r (
+    const char *name,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    );
+
+
+/*
+   gethostbyaddr implementation
+
+    addr:
+        address structure to look up
+    len:
+        length of address structure
+    af:
+        address family
+    result_buf:
+        resulting entry
+    buf:
+        auxillary buffer
+    buflen:
+        length of auxillary buffer
+    errnop:
+        pointer to errno
+    h_errnop:
+        pointer to h_errno
+ */
+nss_status
+_nss_mdns_gethostbyaddr_r (
+    const void *addr,
+    socklen_t len,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    );
+
+
+//----------
+// Types and Constants
+
+const int MDNS_VERBOSE = 0;
+// This enables verbose syslog messages
+// If zero, only "imporant" messages will appear in syslog
+
+#define k_hostname_maxlen 256
+// As per RFC1034 and RFC1035
+#define k_aliases_max 15
+#define k_addrs_max 15
+
+typedef struct buf_header
+{
+    char hostname [k_hostname_maxlen + 1];
+    char * aliases [k_aliases_max + 1];
+    char * addrs [k_addrs_max + 1];
+} buf_header_t;
+
+typedef struct result_map
+{
+    int done;
+    nss_status status;
+    hostent * hostent;
+    buf_header_t * header;
+    int aliases_count;
+    int addrs_count;
+    char * buffer;
+    int addr_idx;
+    // Index for addresses - grow from low end
+    // Index points to first empty space
+    int alias_idx;
+    // Index for aliases - grow from high end
+    // Index points to lowest entry
+    int r_errno;
+    int r_h_errno;
+} result_map_t;
+
+static const struct timeval
+k_select_time = { 0, 500000 };
+// 0 seconds, 500 milliseconds
+
+//----------
+// Local prototypes
+
+static nss_status
+mdns_gethostbyname2 (
+    const char *name,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    );
+
+
+/*
+    Lookup name using mDNS server
+ */
+static nss_status
+mdns_lookup_name (
+    const char * fullname,
+    int af,
+    result_map_t * result
+    );
+
+/*
+    Lookup address using mDNS server
+ */
+static nss_status
+mdns_lookup_addr (
+    const void * addr,
+    socklen_t len,
+    int af,
+    const char * addr_str,
+    result_map_t * result
+    );
+
+
+/*
+    Handle incoming MDNS events
+ */
+static nss_status
+handle_events (DNSServiceRef sdref, result_map_t * result, const char * str);
+
+
+// Callback for mdns_lookup operations
+//DNSServiceQueryRecordReply mdns_lookup_callback;
+typedef void
+mdns_lookup_callback_t
+(
+    DNSServiceRef sdref,
+    DNSServiceFlags flags,
+    uint32_t interface_index,
+    DNSServiceErrorType error_code,
+    const char          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void          *rdata,
+    uint32_t ttl,
+    void                *context
+);
+
+mdns_lookup_callback_t mdns_lookup_callback;
+
+
+static int
+init_result (
+    result_map_t * result,
+    hostent * result_buf,
+    char * buf,
+    size_t buflen
+    );
+
+static int
+callback_body_ptr (
+    const char * fullname,
+    result_map_t * result,
+    int rdlen,
+    const void * rdata
+    );
+
+static void *
+add_address_to_buffer (result_map_t * result, const void * data, int len);
+static char *
+add_alias_to_buffer (result_map_t * result, const char * data, int len);
+static char *
+add_hostname_len (result_map_t * result, const char * fullname, int len);
+static char *
+add_hostname_or_alias (result_map_t * result, const char * data, int len);
+
+static void *
+contains_address (result_map_t * result, const void * data, int len);
+static char *
+contains_alias (result_map_t * result, const char * data);
+
+
+static const char *
+is_applicable_name (
+    result_map_t * result,
+    const char * name,
+    char * lookup_name
+    );
+
+static const char *
+is_applicable_addr (
+    result_map_t * result,
+    const void * addr,
+    int af,
+    char * addr_str
+    );
+
+
+// Error code functions
+
+static nss_status
+set_err (result_map_t * result, nss_status status, int err, int herr);
+
+static nss_status set_err_notfound (result_map_t * result);
+static nss_status set_err_bad_hostname (result_map_t * result);
+static nss_status set_err_buf_too_small (result_map_t * result);
+static nss_status set_err_internal_resource_full (result_map_t * result);
+static nss_status set_err_system (result_map_t * result);
+static nss_status set_err_mdns_failed (result_map_t * result);
+static nss_status set_err_success (result_map_t * result);
+
+
+//----------
+// Global variables
+
+
+//----------
+// NSS functions
+
+nss_status
+_nss_mdns_gethostbyname_r (
+    const char *name,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    )
+{
+    if (MDNS_VERBOSE)
+        syslog (LOG_DEBUG,
+                "mdns: Called nss_mdns_gethostbyname with %s",
+                name
+                );
+
+    return
+        mdns_gethostbyname2 (
+            name, AF_INET, result_buf, buf, buflen, errnop, h_errnop
+            );
+}
+
+
+nss_status
+_nss_mdns_gethostbyname2_r (
+    const char *name,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    )
+{
+    if (MDNS_VERBOSE)
+        syslog (LOG_DEBUG,
+                "mdns: Called nss_mdns_gethostbyname2 with %s",
+                name
+                );
+
+    return
+        mdns_gethostbyname2 (
+            name, af, result_buf, buf, buflen, errnop, h_errnop
+            );
+}
+
+
+nss_status
+_nss_mdns_gethostbyaddr_r (
+    const void *addr,
+    socklen_t len,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    )
+{
+    char addr_str [NI_MAXHOST + 1];
+    result_map_t result;
+    int err_status;
+
+    if (inet_ntop (af, addr, addr_str, NI_MAXHOST) == NULL)
+    {
+        const char * family = af_to_str (af);
+        if (family == NULL)
+        {
+            family = "Unknown";
+        }
+
+        syslog (LOG_WARNING,
+                "mdns: Couldn't covert address, family %d (%s) in nss_mdns_gethostbyaddr: %s",
+                af,
+                family,
+                strerror (errno)
+                );
+
+        // This address family never applicable to us, so return NOT_FOUND
+
+        *errnop = ENOENT;
+        *h_errnop = HOST_NOT_FOUND;
+        return NSS_STATUS_NOTFOUND;
+    }
+    if (MDNS_VERBOSE)
+    {
+        syslog (LOG_DEBUG,
+                "mdns: Called nss_mdns_gethostbyaddr with %s",
+                addr_str
+                );
+    }
+
+    // Initialise result
+    err_status = init_result (&result, result_buf, buf, buflen);
+    if (err_status)
+    {
+        *errnop = err_status;
+        *h_errnop = NETDB_INTERNAL;
+        return NSS_STATUS_TRYAGAIN;
+    }
+
+    if (is_applicable_addr (&result, addr, af, addr_str))
+    {
+        nss_status rv;
+
+        rv = mdns_lookup_addr (addr, len, af, addr_str, &result);
+        if (rv == NSS_STATUS_SUCCESS)
+        {
+            return rv;
+        }
+    }
+
+    // Return current error status (defaults to NOT_FOUND)
+
+    *errnop = result.r_errno;
+    *h_errnop = result.r_h_errno;
+    return result.status;
+}
+
+
+//----------
+// Local functions
+
+nss_status
+mdns_gethostbyname2 (
+    const char *name,
+    int af,
+    hostent * result_buf,
+    char *buf,
+    size_t buflen,
+    int *errnop,
+    int *h_errnop
+    )
+{
+    char lookup_name [k_hostname_maxlen + 1];
+    result_map_t result;
+    int err_status;
+
+    // Initialise result
+    err_status = init_result (&result, result_buf, buf, buflen);
+    if (err_status)
+    {
+        *errnop = err_status;
+        *h_errnop = NETDB_INTERNAL;
+        return NSS_STATUS_TRYAGAIN;
+    }
+
+    if (is_applicable_name (&result, name, lookup_name))
+    {
+        // Try using mdns
+        nss_status rv;
+
+        if (MDNS_VERBOSE)
+            syslog (LOG_DEBUG,
+                    "mdns: Local name: %s",
+                    name
+                    );
+
+        rv = mdns_lookup_name (name, af, &result);
+        if (rv == NSS_STATUS_SUCCESS)
+        {
+            return rv;
+        }
+    }
+
+    // Return current error status (defaults to NOT_FOUND)
+
+    *errnop = result.r_errno;
+    *h_errnop = result.r_h_errno;
+    return result.status;
+}
+
+
+/*
+    Lookup a fully qualified hostname using the default record type
+    for the specified address family.
+
+    Parameters
+        fullname
+            Fully qualified hostname.  If not fully qualified the code will
+            still 'work', but the lookup is unlikely to succeed.
+        af
+            Either AF_INET or AF_INET6.  Other families are not supported.
+        result
+            Initialised 'result' data structure.
+ */
+static nss_status
+mdns_lookup_name (
+    const char * fullname,
+    int af,
+    result_map_t * result
+    )
+{
+    // Lookup using mDNS.
+    DNSServiceErrorType errcode;
+    DNSServiceRef sdref;
+    ns_type_t rrtype;
+    nss_status status;
+
+    if (MDNS_VERBOSE)
+        syslog (LOG_DEBUG,
+                "mdns: Attempting lookup of %s",
+                fullname
+                );
+
+    switch (af)
+    {
+    case AF_INET:
+        rrtype = kDNSServiceType_A;
+        result->hostent->h_length = 4;
+        // Length of an A record
+        break;
+
+    case AF_INET6:
+        rrtype = kDNSServiceType_AAAA;
+        result->hostent->h_length = 16;
+        // Length of an AAAA record
+        break;
+
+    default:
+        syslog (LOG_WARNING,
+                "mdns: Unsupported address family %d",
+                af
+                );
+        return set_err_bad_hostname (result);
+    }
+    result->hostent->h_addrtype = af;
+
+    errcode =
+        DNSServiceQueryRecord (
+            &sdref,
+            kDNSServiceFlagsForceMulticast,     // force multicast query
+            kDNSServiceInterfaceIndexAny,   // all interfaces
+            fullname,   // full name to query for
+            rrtype,     // resource record type
+            kDNSServiceClass_IN,    // internet class records
+            mdns_lookup_callback,   // callback
+            result      // Context - result buffer
+            );
+
+    if (errcode)
+    {
+        syslog (LOG_WARNING,
+                "mdns: Failed to initialise lookup, error %d",
+                errcode
+                );
+        return set_err_mdns_failed (result);
+    }
+
+    status = handle_events (sdref, result, fullname);
+    DNSServiceRefDeallocate (sdref);
+    return status;
+}
+
+
+/*
+    Reverse (PTR) lookup for the specified address.
+
+    Parameters
+        addr
+            Either a struct in_addr or a struct in6_addr
+        addr_len
+            size of the address
+        af
+            Either AF_INET or AF_INET6.  Other families are not supported.
+            Must match addr
+        addr_str
+            Address in format suitable for PTR lookup.
+            AF_INET: a.b.c.d -> d.c.b.a.in-addr.arpa
+            AF_INET6: reverse nibble format, x.x.x...x.ip6.arpa
+        result
+            Initialised 'result' data structure.
+ */
+static nss_status
+mdns_lookup_addr (
+    const void * addr,
+    socklen_t addr_len,
+    int af,
+    const char * addr_str,
+    result_map_t * result
+    )
+{
+    DNSServiceErrorType errcode;
+    DNSServiceRef sdref;
+    nss_status status;
+
+    if (MDNS_VERBOSE)
+        syslog (LOG_DEBUG,
+                "mdns: Attempting lookup of %s",
+                addr_str
+                );
+
+    result->hostent->h_addrtype = af;
+    result->hostent->h_length = addr_len;
+
+    // Query address becomes "address" in result.
+    if (!add_address_to_buffer (result, addr, addr_len))
+    {
+        return result->status;
+    }
+
+    result->hostent->h_name [0] = 0;
+
+    errcode =
+        DNSServiceQueryRecord (
+            &sdref,
+            kDNSServiceFlagsForceMulticast,     // force multicast query
+            kDNSServiceInterfaceIndexAny,   // all interfaces
+            addr_str,   // address string to query for
+            kDNSServiceType_PTR,    // pointer RRs
+            kDNSServiceClass_IN,    // internet class records
+            mdns_lookup_callback,   // callback
+            result      // Context - result buffer
+            );
+
+    if (errcode)
+    {
+        syslog (LOG_WARNING,
+                "mdns: Failed to initialise mdns lookup, error %d",
+                errcode
+                );
+        return set_err_mdns_failed (result);
+    }
+
+    status = handle_events (sdref, result, addr_str);
+    DNSServiceRefDeallocate (sdref);
+    return status;
+}
+
+
+/*
+    Wait on result of callback, and process it when it arrives.
+
+    Parameters
+        sdref
+            dns-sd reference
+        result
+            Initialised 'result' data structure.
+        str
+            lookup string, used for status/error reporting.
+ */
+static nss_status
+handle_events (DNSServiceRef sdref, result_map_t * result, const char * str)
+{
+    int dns_sd_fd = DNSServiceRefSockFD(sdref);
+    int nfds = dns_sd_fd + 1;
+    fd_set readfds;
+    struct timeval tv;
+    int select_result;
+
+    while (!result->done)
+    {
+        FD_ZERO(&readfds);
+        FD_SET(dns_sd_fd, &readfds);
+
+        tv = k_select_time;
+
+        select_result =
+            select (nfds, &readfds, (fd_set*)NULL, (fd_set*)NULL, &tv);
+        if (select_result > 0)
+        {
+            if (FD_ISSET(dns_sd_fd, &readfds))
+            {
+                if (MDNS_VERBOSE)
+                    syslog (LOG_DEBUG,
+                            "mdns: Reply received for %s",
+                            str
+                            );
+                DNSServiceProcessResult(sdref);
+            }
+            else
+            {
+                syslog (LOG_WARNING,
+                        "mdns: Unexpected return from select on lookup of %s",
+                        str
+                        );
+            }
+        }
+        else
+        {
+            // Terminate loop due to timer expiry
+            if (MDNS_VERBOSE)
+                syslog (LOG_DEBUG,
+                        "mdns: %s not found - timer expired",
+                        str
+                        );
+            set_err_notfound (result);
+            break;
+        }
+    }
+
+    return result->status;
+}
+
+
+/*
+    Examine incoming data and add to relevant fields in result structure.
+    This routine is called from DNSServiceProcessResult where appropriate.
+ */
+void
+mdns_lookup_callback
+(
+    DNSServiceRef sdref,
+    DNSServiceFlags flags,
+    uint32_t interface_index,
+    DNSServiceErrorType error_code,
+    const char          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void          *rdata,
+    uint32_t ttl,
+    void                *context
+)
+{
+    // A single record is received
+
+    result_map_t * result = (result_map_t *) context;
+
+    (void)sdref; // Unused
+    (void)interface_index; // Unused
+    (void)ttl; // Unused
+
+    if (!(flags & kDNSServiceFlagsMoreComing) )
+    {
+        result->done = 1;
+    }
+
+    if (error_code == kDNSServiceErr_NoError)
+    {
+        ns_type_t expected_rr_type =
+            af_to_rr (result->hostent->h_addrtype);
+
+        // Idiot check class
+        if (rrclass != C_IN)
+        {
+            syslog (LOG_WARNING,
+                    "mdns: Received bad RR class: expected %d (%s),"
+                    " got %d (%s), RR type %d (%s)",
+                    C_IN,
+                    ns_class_to_str (C_IN),
+                    rrclass,
+                    ns_class_to_str (rrclass),
+                    rrtype,
+                    ns_type_to_str (rrtype)
+                    );
+            return;
+        }
+
+        // If a PTR
+        if (rrtype == kDNSServiceType_PTR)
+        {
+            if (callback_body_ptr (fullname, result, rdlen, rdata) < 0)
+                return;
+        }
+        else if (rrtype == expected_rr_type)
+        {
+            if (!
+                add_hostname_or_alias (
+                    result,
+                    fullname,
+                    strlen (fullname)
+                    )
+                )
+            {
+                result->done = 1;
+                return;
+                // Abort on error
+            }
+
+            if (!add_address_to_buffer (result, rdata, rdlen) )
+            {
+                result->done = 1;
+                return;
+                // Abort on error
+            }
+        }
+        else
+        {
+            syslog (LOG_WARNING,
+                    "mdns: Received bad RR type: expected %d (%s),"
+                    " got %d (%s)",
+                    expected_rr_type,
+                    ns_type_to_str (expected_rr_type),
+                    rrtype,
+                    ns_type_to_str (rrtype)
+                    );
+            return;
+        }
+
+        if (result->status != NSS_STATUS_SUCCESS)
+            set_err_success (result);
+    }
+    else
+    {
+        // For now, dump message to syslog and continue
+        syslog (LOG_WARNING,
+                "mdns: callback returned error %d",
+                error_code
+                );
+    }
+}
+
+static int
+callback_body_ptr (
+    const char * fullname,
+    result_map_t * result,
+    int rdlen,
+    const void * rdata
+    )
+{
+    char result_name [k_hostname_maxlen + 1];
+    int rv;
+
+    // Fullname should be .in-addr.arpa or equivalent, which we're
+    // not interested in.  Ignore it.
+
+    rv = dns_rdata_to_name (rdata, rdlen, result_name, k_hostname_maxlen);
+    if (rv < 0)
+    {
+        const char * errmsg;
+
+        switch (rv)
+        {
+        case DNS_RDATA_TO_NAME_BAD_FORMAT:
+            errmsg = "mdns: PTR '%s' result badly formatted ('%s...')";
+            break;
+
+        case DNS_RDATA_TO_NAME_TOO_LONG:
+            errmsg = "mdns: PTR '%s' result too long ('%s...')";
+            break;
+
+        case DNS_RDATA_TO_NAME_PTR:
+            errmsg = "mdns: PTR '%s' result contained pointer ('%s...')";
+            break;
+
+        default:
+            errmsg = "mdns: PTR '%s' result conversion failed ('%s...')";
+        }
+
+        syslog (LOG_WARNING,
+                errmsg,
+                fullname,
+                result_name
+                );
+
+        return -1;
+    }
+
+    if (MDNS_VERBOSE)
+    {
+        syslog (LOG_DEBUG,
+                "mdns: PTR '%s' resolved to '%s'",
+                fullname,
+                result_name
+                );
+    }
+
+    // Data should be a hostname
+    if (!
+        add_hostname_or_alias (
+            result,
+            result_name,
+            rv
+            )
+        )
+    {
+        result->done = 1;
+        return -1;
+    }
+
+    return 0;
+}
+
+
+/*
+    Add an address to the buffer.
+
+    Parameter
+        result
+            Result structure to write to
+        data
+            Incoming address data buffer
+            Must be 'int' aligned
+        len
+            Length of data buffer (in bytes)
+            Must match data alignment
+
+    Result
+        Pointer to start of newly written data,
+        or NULL on error.
+        If address already exists in buffer, returns pointer to that instead.
+ */
+static void *
+add_address_to_buffer (result_map_t * result, const void * data, int len)
+{
+    int new_addr;
+    void * start;
+    void * temp;
+
+    if ((temp = contains_address (result, data, len)))
+    {
+        return temp;
+    }
+
+    if (result->addrs_count >= k_addrs_max)
+    {
+        // Not enough addr slots
+        set_err_internal_resource_full (result);
+        syslog (LOG_ERR,
+                "mdns: Internal address buffer full; increase size"
+                );
+        return NULL;
+    }
+
+    // Idiot check
+    if (len != result->hostent->h_length)
+    {
+        syslog (LOG_WARNING,
+                "mdns: Unexpected rdata length for address.  Expected %d, got %d",
+                result->hostent->h_length,
+                len
+                );
+        // XXX And continue for now.
+    }
+
+    new_addr = result->addr_idx + len;
+
+    if (new_addr > result->alias_idx)
+    {
+        // Not enough room
+        set_err_buf_too_small (result);
+        if (MDNS_VERBOSE)
+            syslog (LOG_DEBUG,
+                    "mdns: Ran out of buffer when adding address %d",
+                    result->addrs_count + 1
+                    );
+        return NULL;
+    }
+
+    start = result->buffer + result->addr_idx;
+    memcpy (start, data, len);
+    result->addr_idx = new_addr;
+    result->header->addrs [result->addrs_count] = start;
+    result->addrs_count++;
+    result->header->addrs [result->addrs_count] = NULL;
+
+    return start;
+}
+
+
+static void *
+contains_address (result_map_t * result, const void * data, int len)
+{
+    int i;
+
+    // Idiot check
+    if (len != result->hostent->h_length)
+    {
+        syslog (LOG_WARNING,
+                "mdns: Unexpected rdata length for address.  Expected %d, got %d",
+                result->hostent->h_length,
+                len
+                );
+        // XXX And continue for now.
+    }
+
+    for (i = 0; result->header->addrs [i]; i++)
+    {
+        if (memcmp (result->header->addrs [i], data, len) == 0)
+        {
+            return result->header->addrs [i];
+        }
+    }
+
+    return NULL;
+}
+
+
+/*
+    Add an alias to the buffer.
+
+    Parameter
+        result
+            Result structure to write to
+        data
+            Incoming alias (null terminated)
+        len
+            Length of data buffer (in bytes), including trailing null
+
+    Result
+        Pointer to start of newly written data,
+        or NULL on error
+        If alias already exists in buffer, returns pointer to that instead.
+ */
+static char *
+add_alias_to_buffer (result_map_t * result, const char * data, int len)
+{
+    int new_alias;
+    char * start;
+    char * temp;
+
+    if ((temp = contains_alias (result, data)))
+    {
+        return temp;
+    }
+
+    if (result->aliases_count >= k_aliases_max)
+    {
+        // Not enough alias slots
+        set_err_internal_resource_full (result);
+        syslog (LOG_ERR,
+                "mdns: Internal alias buffer full; increase size"
+                );
+        return NULL;
+    }
+
+    new_alias = result->alias_idx - len;
+
+    if (new_alias < result->addr_idx)
+    {
+        // Not enough room
+        set_err_buf_too_small (result);
+        if (MDNS_VERBOSE)
+            syslog (LOG_DEBUG,
+                    "mdns: Ran out of buffer when adding alias %d",
+                    result->aliases_count + 1
+                    );
+        return NULL;
+    }
+
+    start = result->buffer + new_alias;
+    memcpy (start, data, len);
+    result->alias_idx = new_alias;
+    result->header->aliases [result->aliases_count] = start;
+    result->aliases_count++;
+    result->header->aliases [result->aliases_count] = NULL;
+
+    return start;
+}
+
+
+static char *
+contains_alias (result_map_t * result, const char * alias)
+{
+    int i;
+
+    for (i = 0; result->header->aliases [i]; i++)
+    {
+        if (strcmp (result->header->aliases [i], alias) == 0)
+        {
+            return result->header->aliases [i];
+        }
+    }
+
+    return NULL;
+}
+
+
+/*
+    Add fully qualified hostname to result.
+
+    Parameter
+        result
+            Result structure to write to
+        fullname
+            Fully qualified hostname
+
+    Result
+        Pointer to start of hostname buffer,
+        or NULL on error (usually hostname too long)
+ */
+
+static char *
+add_hostname_len (result_map_t * result, const char * fullname, int len)
+{
+    if (len >= k_hostname_maxlen)
+    {
+        set_err_bad_hostname (result);
+        syslog (LOG_WARNING,
+                "mdns: Hostname too long '%.*s': len %d, max %d",
+                len,
+                fullname,
+                len,
+                k_hostname_maxlen
+                );
+        return NULL;
+    }
+
+    result->hostent->h_name =
+        strcpy (result->header->hostname, fullname);
+
+    return result->header->hostname;
+}
+
+
+/*
+    Add fully qualified name as hostname or alias.
+
+    If hostname is not fully qualified this is not an error, but the data
+    returned may be not what the application wanted.
+
+    Parameter
+        result
+            Result structure to write to
+        data
+            Incoming alias (null terminated)
+        len
+            Length of data buffer (in bytes), including trailing null
+
+    Result
+        Pointer to start of newly written data,
+        or NULL on error
+        If alias or hostname already exists, returns pointer to that instead.
+ */
+static char *
+add_hostname_or_alias (result_map_t * result, const char * data, int len)
+{
+    char * hostname = result->hostent->h_name;
+
+    if (*hostname)
+    {
+        if (strcmp (hostname, data) == 0)
+        {
+            return hostname;
+        }
+        else
+        {
+            return add_alias_to_buffer (result, data, len);
+        }
+    }
+    else
+    {
+        return add_hostname_len (result, data, len);
+    }
+}
+
+
+static int
+init_result (
+    result_map_t * result,
+    hostent * result_buf,
+    char * buf,
+    size_t buflen
+    )
+{
+    if (buflen < sizeof (buf_header_t))
+    {
+        return ERANGE;
+    }
+
+    result->hostent = result_buf;
+    result->header = (buf_header_t *) buf;
+    result->header->hostname[0] = 0;
+    result->aliases_count = 0;
+    result->header->aliases[0] = NULL;
+    result->addrs_count = 0;
+    result->header->addrs[0] = NULL;
+    result->buffer = buf + sizeof (buf_header_t);
+    result->addr_idx = 0;
+    result->alias_idx = buflen - sizeof (buf_header_t);
+    result->done = 0;
+    set_err_notfound (result);
+
+    // Point hostent to the right buffers
+    result->hostent->h_name = result->header->hostname;
+    result->hostent->h_aliases = result->header->aliases;
+    result->hostent->h_addr_list = result->header->addrs;
+
+    return 0;
+}
+
+/*
+    Set the status in the result.
+
+    Parameters
+        result
+            Result structure to update
+        status
+            New nss_status value
+        err
+            New errno value
+        herr
+            New h_errno value
+
+    Returns
+        New status value
+ */
+static nss_status
+set_err (result_map_t * result, nss_status status, int err, int herr)
+{
+    result->status = status;
+    result->r_errno = err;
+    result->r_h_errno = herr;
+
+    return status;
+}
+
+static nss_status
+set_err_notfound (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_NOTFOUND, ENOENT, HOST_NOT_FOUND);
+}
+
+static nss_status
+set_err_bad_hostname (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_TRYAGAIN, ENOENT, NO_RECOVERY);
+}
+
+static nss_status
+set_err_buf_too_small (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_TRYAGAIN, ERANGE, NETDB_INTERNAL);
+}
+
+static nss_status
+set_err_internal_resource_full (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_RETURN, ERANGE, NO_RECOVERY);
+}
+
+static nss_status
+set_err_system (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_UNAVAIL, errno, NETDB_INTERNAL);
+}
+
+static nss_status
+set_err_mdns_failed (result_map_t * result)
+{
+    return set_err (result, NSS_STATUS_TRYAGAIN, EAGAIN, TRY_AGAIN);
+}
+
+static nss_status
+set_err_success (result_map_t * result)
+{
+    result->status = NSS_STATUS_SUCCESS;
+    return result->status;
+}
+
+
+/*
+    Test whether name is applicable for mdns to process, and if so copy into
+    lookup_name buffer (if non-NULL).
+
+    Returns
+        Pointer to name to lookup up, if applicable, or NULL otherwise.
+ */
+static const char *
+is_applicable_name (
+    result_map_t * result,
+    const char * name,
+    char * lookup_name
+    )
+{
+    int match = config_is_mdns_suffix (name);
+    if (match > 0)
+    {
+        if (lookup_name)
+        {
+            strncpy (lookup_name, name, k_hostname_maxlen + 1);
+            return lookup_name;
+        }
+        else
+        {
+            return name;
+        }
+    }
+    else
+    {
+        if (match < 0)
+        {
+            set_err_system (result);
+        }
+        return NULL;
+    }
+}
+
+/*
+    Test whether address is applicable for mdns to process, and if so copy into
+    addr_str buffer as an address suitable for ptr lookup.
+
+    Returns
+        Pointer to name to lookup up, if applicable, or NULL otherwise.
+ */
+static const char *
+is_applicable_addr (
+    result_map_t * result,
+    const void * addr,
+    int af,
+    char * addr_str
+    )
+{
+    int match;
+
+    if (!format_reverse_addr (af, addr, -1, addr_str))
+    {
+        if (MDNS_VERBOSE)
+            syslog (LOG_DEBUG,
+                    "mdns: Failed to create reverse address"
+                    );
+        return NULL;
+    }
+
+    if (MDNS_VERBOSE)
+        syslog (LOG_DEBUG,
+                "mdns: Reverse address: %s",
+                addr_str
+                );
+
+    match = config_is_mdns_suffix (addr_str);
+    if (match > 0)
+    {
+        return addr_str;
+    }
+    else
+    {
+        if (match < 0)
+        {
+            set_err_system (result);
+        }
+        return NULL;
+    }
+}
+
+//----------
+// Types and Constants
+
+const char * k_conf_file = "/etc/nss_mdns.conf";
+#define CONF_LINE_SIZE 1024
+
+const char k_comment_char = '#';
+
+const char * k_keyword_domain = "domain";
+
+const char * k_default_domains [] =
+{
+    "local",
+    "254.169.in-addr.arpa",
+    "8.e.f.ip6.int",
+    "8.e.f.ip6.arpa",
+    "9.e.f.ip6.int",
+    "9.e.f.ip6.arpa",
+    "a.e.f.ip6.int",
+    "a.e.f.ip6.arpa",
+    "b.e.f.ip6.int",
+    "b.e.f.ip6.arpa",
+    NULL
+    // Always null terminated
+};
+
+// Linked list of domains
+typedef struct domain_entry
+{
+    char * domain;
+    struct domain_entry * next;
+} domain_entry_t;
+
+
+// Config
+typedef struct
+{
+    domain_entry_t * domains;
+} config_t;
+
+const config_t k_empty_config =
+{
+    NULL
+};
+
+
+// Context - tracks position in config file, used for error reporting
+typedef struct
+{
+    const char * filename;
+    int linenum;
+} config_file_context_t;
+
+
+//----------
+// Local prototypes
+
+static errcode_t
+load_config (config_t * conf);
+
+static errcode_t
+process_config_line (
+    config_t * conf,
+    char * line,
+    config_file_context_t * context
+    );
+
+static char *
+get_next_word (char * input, char **next);
+
+static errcode_t
+default_config (config_t * conf);
+
+static errcode_t
+add_domain (config_t * conf, const char * domain);
+
+static int
+contains_domain (const config_t * conf, const char * domain);
+
+static int
+contains_domain_suffix (const config_t * conf, const char * addr);
+
+
+//----------
+// Global variables
+
+static config_t * g_config = NULL;
+// Configuration info
+
+pthread_mutex_t g_config_mutex =
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+    PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
+#else
+    PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+
+//----------
+// Configuration functions
+
+
+/*
+    Initialise the configuration from the config file.
+
+    Returns
+        0 success
+        non-zero error code on failure
+ */
+errcode_t
+init_config ()
+{
+    if (g_config)
+    {
+        /*
+            Safe to test outside mutex.
+            If non-zero, initialisation is complete and g_config can be
+            safely used read-only.  If zero, then we do proper mutex
+            testing before initialisation.
+         */
+        return 0;
+    }
+    else
+    {
+        int errcode = -1;
+        int presult;
+        config_t * temp_config;
+
+        // Acquire mutex
+        presult = pthread_mutex_lock (&g_config_mutex);
+        if (presult)
+        {
+            syslog (LOG_ERR,
+                    "mdns: Fatal mutex lock error in nss_mdns:init_config, %s:%d: %d: %s",
+                    __FILE__, __LINE__, presult, strerror (presult)
+                    );
+            return presult;
+        }
+
+        // Test again now we have mutex, in case initialisation occurred while
+        // we were waiting
+        if (!g_config)
+        {
+            temp_config = (config_t *) malloc (sizeof (config_t));
+            if (temp_config)
+            {
+                // Note: This code will leak memory if initialisation fails
+                // repeatedly.  This should only happen in the case of a memory
+                // error, so I'm not sure if it's a meaningful problem. - AW
+                *temp_config = k_empty_config;
+                errcode = load_config (temp_config);
+
+                if (!errcode)
+                {
+                    g_config = temp_config;
+                }
+            }
+            else
+            {
+                syslog (LOG_ERR,
+                        "mdns: Can't allocate memory in nss_mdns:init_config, %s:%d",
+                        __FILE__, __LINE__
+                        );
+                errcode = errno;
+            }
+        }
+
+        presult = pthread_mutex_unlock (&g_config_mutex);
+        if (presult)
+        {
+            syslog (LOG_ERR,
+                    "mdns: Fatal mutex unlock error in nss_mdns:init_config, %s:%d: %d: %s",
+                    __FILE__, __LINE__, presult, strerror (presult)
+                    );
+            errcode = presult;
+        }
+
+        return errcode;
+    }
+}
+
+
+int
+config_is_mdns_suffix (const char * name)
+{
+    int errcode = init_config ();
+    if (!errcode)
+    {
+        return contains_domain_suffix (g_config, name);
+    }
+    else
+    {
+        errno = errcode;
+        return -1;
+    }
+}
+
+
+//----------
+// Local functions
+
+static errcode_t
+load_config (config_t * conf)
+{
+    FILE * cf;
+    char line [CONF_LINE_SIZE];
+    config_file_context_t context;
+
+    context.filename = k_conf_file;
+    context.linenum = 0;
+
+
+    cf = fopen (context.filename, "r");
+    if (!cf)
+    {
+        syslog (LOG_INFO,
+                "mdns: Couldn't open nss_mdns configuration file %s, using default.",
+                context.filename
+                );
+        return default_config (conf);
+    }
+
+    while (fgets (line, CONF_LINE_SIZE, cf))
+    {
+        int errcode;
+        context.linenum++;
+        errcode = process_config_line (conf, line, &context);
+        if (errcode)
+        {
+            // Critical error, give up
+            fclose(cf);
+            return errcode;
+        }
+    }
+
+    fclose (cf);
+
+    return 0;
+}
+
+
+/*
+    Parse a line of the configuration file.
+    For each keyword recognised, perform appropriate handling.
+    If the keyword is not recognised, print a message to syslog
+    and continue.
+
+    Returns
+        0 success, or recoverable config file error
+        non-zero serious system error, processing aborted
+ */
+static errcode_t
+process_config_line (
+    config_t * conf,
+    char * line,
+    config_file_context_t * context
+    )
+{
+    char * curr = line;
+    char * word;
+
+    word = get_next_word (curr, &curr);
+    if (!word || word [0] == k_comment_char)
+    {
+        // Nothing interesting on this line
+        return 0;
+    }
+
+    if (strcmp (word, k_keyword_domain) == 0)
+    {
+        word = get_next_word (curr, &curr);
+        if (word)
+        {
+            int errcode = add_domain (conf, word);
+            if (errcode)
+            {
+                // something badly wrong, bail
+                return errcode;
+            }
+
+            if (get_next_word (curr, NULL))
+            {
+                syslog (LOG_WARNING,
+                        "%s, line %d: ignored extra text found after domain",
+                        context->filename,
+                        context->linenum
+                        );
+            }
+        }
+        else
+        {
+            syslog (LOG_WARNING,
+                    "%s, line %d: no domain specified",
+                    context->filename,
+                    context->linenum
+                    );
+        }
+    }
+    else
+    {
+        syslog (LOG_WARNING,
+                "%s, line %d: unknown keyword %s - skipping",
+                context->filename,
+                context->linenum,
+                word
+                );
+    }
+
+    return 0;
+}
+
+
+/*
+    Get next word (whitespace separated) from input string.
+    A null character is written into the first whitespace character following
+    the word.
+
+    Parameters
+        input
+            Input string.  This string is modified by get_next_word.
+        next
+            If non-NULL and the result is non-NULL, a pointer to the
+            character following the end of the word (after the null)
+            is written to 'next'.
+            If no word is found, the original value is unchanged.
+            If the word extended to the end of the string, 'next' points
+            to the trailling NULL.
+            It is safe to pass 'str' as 'input' and '&str' as 'next'.
+    Returns
+        Pointer to the first non-whitespace character (and thus word) found.
+        if no word is found, returns NULL.
+ */
+static char *
+get_next_word (char * input, char **next)
+{
+    char * curr = input;
+    char * result;
+
+    while (isspace (*curr))
+    {
+        curr++;
+    }
+
+    if (*curr == 0)
+    {
+        return NULL;
+    }
+
+    result = curr;
+    while (*curr && !isspace (*curr))
+    {
+        curr++;
+    }
+    if (*curr)
+    {
+        *curr = 0;
+        if (next)
+        {
+            *next = curr+1;
+        }
+    }
+    else
+    {
+        if (next)
+        {
+            *next = curr;
+        }
+    }
+
+    return result;
+}
+
+
+static errcode_t
+default_config (config_t * conf)
+{
+    int i;
+    for (i = 0; k_default_domains [i]; i++)
+    {
+        int errcode =
+            add_domain (conf, k_default_domains [i]);
+        if (errcode)
+        {
+            // Something has gone (badly) wrong - let's bail
+            return errcode;
+        }
+    }
+
+    return 0;
+}
+
+
+static errcode_t
+add_domain (config_t * conf, const char * domain)
+{
+    if (!contains_domain (conf, domain))
+    {
+        domain_entry_t * d =
+            (domain_entry_t *) malloc (sizeof (domain_entry_t));
+        if (!d)
+        {
+            syslog (LOG_ERR,
+                    "mdns: Can't allocate memory in nss_mdns:init_config, %s:%d",
+                    __FILE__, __LINE__
+                    );
+            return ENOMEM;
+        }
+
+        d->domain = strdup (domain);
+        if (!d->domain)
+        {
+            syslog (LOG_ERR,
+                    "mdns: Can't allocate memory in nss_mdns:init_config, %s:%d",
+                    __FILE__, __LINE__
+                    );
+            free (d);
+            return ENOMEM;
+        }
+        d->next = conf->domains;
+        conf->domains = d;
+    }
+
+    return 0;
+}
+
+
+static int
+contains_domain (const config_t * conf, const char * domain)
+{
+    const domain_entry_t * curr = conf->domains;
+
+    while (curr != NULL)
+    {
+        if (strcasecmp (curr->domain, domain) == 0)
+        {
+            return 1;
+        }
+
+        curr = curr->next;
+    }
+
+    return 0;
+}
+
+
+static int
+contains_domain_suffix (const config_t * conf, const char * addr)
+{
+    const domain_entry_t * curr = conf->domains;
+
+    while (curr != NULL)
+    {
+        if (cmp_dns_suffix (addr, curr->domain) > 0)
+        {
+            return 1;
+        }
+
+        curr = curr->next;
+    }
+
+    return 0;
+}
+
+//----------
+// Types and Constants
+
+static const char * k_local_suffix = "local";
+static const char k_dns_separator = '.';
+
+static const unsigned int k_label_maxlen = DNS_LABEL_MAXLEN;
+// Label entries longer than this are actually pointers.
+
+typedef struct
+{
+    int value;
+    const char * name;
+    const char * comment;
+} table_entry_t;
+
+static const table_entry_t k_table_af [] =
+{
+    { AF_UNSPEC, NULL, NULL },
+    { AF_LOCAL, "LOCAL", NULL },
+    { AF_UNIX, "UNIX", NULL },
+    { AF_INET, "INET", NULL },
+    { AF_INET6, "INET6", NULL }
+};
+static const int k_table_af_size =
+    sizeof (k_table_af) / sizeof (*k_table_af);
+
+static const char * k_table_ns_class [] =
+{
+    NULL,
+    "IN"
+};
+static const int k_table_ns_class_size =
+    sizeof (k_table_ns_class) / sizeof (*k_table_ns_class);
+
+static const char * k_table_ns_type [] =
+{
+    NULL,
+    "A",
+    "NS",
+    "MD",
+    "MF",
+    "CNAME",
+    "SOA",
+    "MB",
+    "MG",
+    "MR",
+    "NULL",
+    "WKS",
+    "PTR",
+    "HINFO",
+    "MINFO",
+    "MX",
+    "TXT",
+    "RP",
+    "AFSDB",
+    "X25",
+    "ISDN",
+    "RT",
+    "NSAP",
+    NULL,
+    "SIG",
+    "KEY",
+    "PX",
+    "GPOS",
+    "AAAA",
+    "LOC",
+    "NXT",
+    "EID",
+    "NIMLOC",
+    "SRV",
+    "ATMA",
+    "NAPTR",
+    "KX",
+    "CERT",
+    "A6",
+    "DNAME",
+    "SINK",
+    "OPT"
+};
+static const int k_table_ns_type_size =
+    sizeof (k_table_ns_type) / sizeof (*k_table_ns_type);
+
+
+//----------
+// Local prototypes
+
+static int
+simple_table_index (const char * table [], int size, const char * str);
+
+static int
+table_index_name (const table_entry_t table [], int size, const char * str);
+
+static int
+table_index_value (const table_entry_t table [], int size, int n);
+
+
+//----------
+// Global variables
+
+
+//----------
+// Util functions
+
+int
+count_dots (const char * name)
+{
+    int count = 0;
+    int i;
+    for (i = 0; name[i]; i++)
+    {
+        if (name [i] == k_dns_separator)
+            count++;
+    }
+
+    return count;
+}
+
+
+int
+islocal (const char * name)
+{
+    return cmp_dns_suffix (name, k_local_suffix) > 0;
+}
+
+
+int
+rr_to_af (ns_type_t rrtype)
+{
+    switch (rrtype)
+    {
+    case kDNSServiceType_A:
+        return AF_INET;
+
+    case kDNSServiceType_AAAA:
+        return AF_INET6;
+
+    default:
+        return AF_UNSPEC;
+    }
+}
+
+
+ns_type_t
+af_to_rr (int af)
+{
+    switch (af)
+    {
+    case AF_INET:
+        return kDNSServiceType_A;
+
+    case AF_INET6:
+        return kDNSServiceType_AAAA;
+
+    default:
+        //return ns_t_invalid;
+        return 0;
+    }
+}
+
+
+int
+str_to_af (const char * str)
+{
+    int result =
+        table_index_name (k_table_af, k_table_af_size, str);
+    if (result < 0)
+        result = 0;
+
+    return k_table_af [result].value;
+}
+
+
+ns_class_t
+str_to_ns_class (const char * str)
+{
+    return (ns_class_t)
+           simple_table_index (k_table_ns_class, k_table_ns_class_size, str);
+}
+
+
+ns_type_t
+str_to_ns_type (const char * str)
+{
+    return (ns_type_t)
+           simple_table_index (k_table_ns_type, k_table_ns_type_size, str);
+}
+
+
+const char *
+af_to_str (int in)
+{
+    int result =
+        table_index_value (k_table_af, k_table_af_size, in);
+    if (result < 0)
+        result = 0;
+
+    return k_table_af [result].name;
+}
+
+
+const char *
+ns_class_to_str (ns_class_t in)
+{
+    if (in < k_table_ns_class_size)
+        return k_table_ns_class [in];
+    else
+        return NULL;
+}
+
+
+const char *
+ns_type_to_str (ns_type_t in)
+{
+    if (in < k_table_ns_type_size)
+        return k_table_ns_type [in];
+    else
+        return NULL;
+}
+
+
+char *
+format_reverse_addr_in (
+    const struct in_addr * addr,
+    int prefixlen,
+    char * buf
+    )
+{
+    char * curr = buf;
+    int i;
+
+    const uint8_t * in_addr_a = (uint8_t *) addr;
+
+    if (prefixlen > 32)
+        return NULL;
+    if (prefixlen < 0)
+        prefixlen = 32;
+
+    i = (prefixlen + 7) / 8;
+    // divide prefixlen into bytes, rounding up
+
+    while (i > 0)
+    {
+        i--;
+        curr += sprintf (curr, "%d.", in_addr_a [i]);
+    }
+    sprintf (curr, "in-addr.arpa");
+
+    return buf;
+}
+
+
+char *
+format_reverse_addr_in6 (
+    const struct in6_addr * addr,
+    int prefixlen,
+    char * buf
+    )
+{
+    char * curr = buf;
+    int i;
+
+    const uint8_t * in_addr_a = (uint8_t *) addr;
+
+    if (prefixlen > 128)
+        return NULL;
+    if (prefixlen < 0)
+        prefixlen = 128;
+
+    i = (prefixlen + 3) / 4;
+    // divide prefixlen into nibbles, rounding up
+
+    // Special handling for first
+    if (i % 2)
+    {
+        curr += sprintf (curr, "%d.", (in_addr_a [i/2] >> 4) & 0x0F);
+    }
+    i >>= 1;
+    // Convert i to bytes (divide by 2)
+
+    while (i > 0)
+    {
+        uint8_t val;
+
+        i--;
+        val = in_addr_a [i];
+        curr += sprintf (curr, "%x.%x.", val & 0x0F, (val >> 4) & 0x0F);
+    }
+    sprintf (curr, "ip6.arpa");
+
+    return buf;
+}
+
+
+char *
+format_reverse_addr (
+    int af,
+    const void * addr,
+    int prefixlen,
+    char * buf
+    )
+{
+    switch (af)
+    {
+    case AF_INET:
+        return
+            format_reverse_addr_in (
+                (struct in_addr *) addr, prefixlen, buf
+                );
+        break;
+
+    case AF_INET6:
+        return
+            format_reverse_addr_in6 (
+                (struct in6_addr *) addr, prefixlen, buf
+                );
+        break;
+
+    default:
+        return NULL;
+    }
+}
+
+
+int
+cmp_dns_suffix (const char * name, const char * domain)
+{
+    const char * nametail;
+    const char * domaintail;
+
+    // Idiot checks
+    if (*name == 0 || *name == k_dns_separator)
+    {
+        // Name can't be empty or start with separator
+        return CMP_DNS_SUFFIX_BAD_NAME;
+    }
+
+    if (*domain == 0)
+    {
+        return CMP_DNS_SUFFIX_SUCCESS;
+        // trivially true
+    }
+
+    if (*domain == k_dns_separator)
+    {
+        // drop leading separator from domain
+        domain++;
+        if (*domain == k_dns_separator)
+        {
+            return CMP_DNS_SUFFIX_BAD_DOMAIN;
+        }
+    }
+
+    // Find ends of strings
+    for (nametail = name; *nametail; nametail++)
+        ;
+    for (domaintail = domain; *domaintail; domaintail++)
+        ;
+
+    // Shuffle back to last real character, and drop any trailing '.'
+    // while we're at it.
+    nametail--;
+    if (*nametail == k_dns_separator)
+    {
+        nametail--;
+        if (*nametail == k_dns_separator)
+        {
+            return CMP_DNS_SUFFIX_BAD_NAME;
+        }
+    }
+    domaintail--;
+    if (*domaintail == k_dns_separator)
+    {
+        domaintail--;
+        if (*domaintail == k_dns_separator)
+        {
+            return CMP_DNS_SUFFIX_BAD_DOMAIN;
+        }
+    }
+
+    // Compare.
+    while (
+        nametail >= name
+        && domaintail >= domain
+        && tolower(*nametail) == tolower(*domaintail))
+    {
+        nametail--;
+        domaintail--;
+    }
+
+    /* A successful finish will be one of the following:
+        (leading and trailing . ignored)
+
+        name  :  domain2.domain1
+        domain:  domain2.domain1
+                ^
+
+        name  : domain3.domain2.domain1
+        domain:         domain2.domain1
+                       ^
+     */
+    if (
+        domaintail < domain
+        && (nametail < name || *nametail == k_dns_separator)
+        )
+    {
+        return CMP_DNS_SUFFIX_SUCCESS;
+    }
+    else
+    {
+        return CMP_DNS_SUFFIX_FAILURE;
+    }
+}
+
+
+static int
+dns_rdata_to_name (const unsigned char * rdata, int rdlen, char * name, unsigned int name_len)
+{
+    int i = 0;
+    // Index into 'name'
+    const unsigned char * rdata_curr = rdata;
+
+    if (rdlen == 0) return DNS_RDATA_TO_NAME_BAD_FORMAT;
+
+    /*
+        In RDATA, a DNS name is stored as a series of labels.
+        Each label consists of a length octet (max value 63)
+        followed by the data for that label.
+        The series is terminated with a length 0 octet.
+        A length octet beginning with bits 11 is a pointer to
+        somewhere else in the payload, but we don't support these
+        since we don't have access to the entire payload.
+
+        See RFC1034 section 3.1 and RFC1035 section 3.1.
+     */
+    while (1)
+    {
+        unsigned int term_len = *rdata_curr;
+        rdata_curr++;
+
+        if (term_len == 0)
+        {
+            break;
+            // 0 length record terminates label
+        }
+        else if (term_len > k_label_maxlen)
+        {
+            name [i] = 0;
+            return DNS_RDATA_TO_NAME_PTR;
+        }
+        else if (rdata_curr + term_len > rdata + rdlen)
+        {
+            name [i] = 0;
+            return DNS_RDATA_TO_NAME_BAD_FORMAT;
+        }
+
+        if (name_len < i + term_len + 1)
+        // +1 is separator
+        {
+            name [i] = 0;
+            return DNS_RDATA_TO_NAME_TOO_LONG;
+        }
+
+        memcpy (name + i, rdata_curr, term_len);
+
+        i += term_len;
+        rdata_curr += term_len;
+
+        name [i] = k_dns_separator;
+        i++;
+    }
+
+    name [i] = 0;
+    return i;
+}
+
+
+//----------
+// Local functions
+
+/*
+    Find the index of an string entry in a table.  A case insenitive match
+    is performed.  If no entry is found, 0 is returned.
+
+    Parameters
+        table
+            Lookup table
+            Table entries may be NULL.  NULL entries will never match.
+        size
+            number of entries in table
+        str
+            lookup string
+
+    Result
+        index of first matching entry, or 0 if no matches
+ */
+static int
+simple_table_index (const char * table [], int size, const char * str)
+{
+    int i;
+    for (i = 0; i < size; i++)
+    {
+        if (
+            table [i]
+            && (strcasecmp (table [i], str) == 0)
+            )
+        {
+            return i;
+        }
+    }
+
+    return 0;
+}
+
+
+/*
+    Find the index of a name in a table.
+
+    Parameters
+        table
+            array of table_entry_t records.  The name field is compared
+            (ignoring case) to the input string.
+        size
+            number of entries in table
+        str
+            lookup string
+
+    Result
+        index of first matching entry, or -1 if no matches
+ */
+static int
+table_index_name (const table_entry_t table [], int size, const char * str)
+{
+    int i;
+    for (i = 0; i < size; i++)
+    {
+        if (
+            table [i].name
+            && (strcasecmp (table [i].name, str) == 0)
+            )
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+
+/*
+    Find the index of a value a table.
+
+    Parameters
+        table
+            array of table_entry_t records.  The value field is compared to
+            the input value
+        size
+            number of entries in table
+        n
+            lookup value
+
+    Result
+        index of first matching entry, or -1 if no matches
+ */
+static int
+table_index_value (const table_entry_t table [], int size, int n)
+{
+    int i;
+    for (i = 0; i < size; i++)
+    {
+        if (table [i].value == n)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
diff --git a/mDNSResponder/mDNSPosix/nss_mdns.conf b/mDNSResponder/mDNSPosix/nss_mdns.conf
new file mode 100755
index 00000000..bdcdad7c
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/nss_mdns.conf
@@ -0,0 +1,13 @@
+# Defaut configuration file for nss_mdns
+
+# Applicable domains
+domain local
+domain 254.169.in-addr.arpa
+domain 8.e.f.ip6.int
+domain 9.e.f.ip6.int
+domain a.e.f.ip6.int
+domain b.e.f.ip6.int
+domain 8.e.f.ip6.arpa
+domain 9.e.f.ip6.arpa
+domain a.e.f.ip6.arpa
+domain b.e.f.ip6.arpa
diff --git a/mDNSResponder/mDNSPosix/nss_mdns.conf.5 b/mDNSResponder/mDNSPosix/nss_mdns.conf.5
new file mode 100755
index 00000000..7dbefa22
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/nss_mdns.conf.5
@@ -0,0 +1,135 @@
+.\"
+.\" See section LICENSE for license information.
+.\"
+.Dd June 15, 2004
+.Dt NSS_MDNS.CONF 5
+.Os
+.Sh NAME
+.Nm nss_mdns.conf
+.Nd configuration file for
+.Xr libnss_mdns 8 .
+.Sh DESCRIPTION
+This file describes the domains that
+.Xr libnss_mdns 8
+is to support.  If a lookup domain is not in this list, then
+.Li NSS_STATUS_NOTFOUND
+will be returned to libc and processing will continue according to
+.Xr nsswitch.conf 5 .
+.Ss Configuration file format
+Lines containing only whitespace or lines whose first non-whitespace character is
+.Ql #
+are ignored.  No single line may be greater than 1023 characters plus end-of-line.
+.Pp
+.D1 Ic domain Ar x.y.z
+.Pp
+Enable use of
+.Xr libnss_mdns 8
+to lookup DNS entries in the
+.Ql x.y.z
+domain.  Leading and trailing dots are dropped.
+.Pp
+Reverse (PTR) lookups are enabled using their DNS names.  IPv6 names use
+.Qq nibble format .
+.Pp
+.Dl domain 254.169.in-addr.arpa
+.Dl domain 0.8.e.f.ip6.arpa
+.Ss Default configuration
+If the configuration file cannot be found then the following is assumed.
+.Bd -literal -offset indent
+domain local
+domain 0.8.e.f.ip6.int
+domain 0.8.e.f.ip6.arpa
+domain 254.169.in-addr.arpa
+.Ed
+.Sh SEE ALSO
+.\" Cross-references should be ordered by section (low to high), then in
+.\"     alphabetical order.
+.Xr nsswitch.conf 5 ,
+.Xr libnss_mdns 8
+.\" .Sh STANDARDS
+.Sh HISTORY
+.Xr libnss_mdns 8
+was originally written for
+.An NICTA Bq http://www.nicta.com.au/ .
+.Sh AUTHORS
+.An "Andrew White" Bq Andrew.White@nicta.com.au
+.Sh LICENSE
+This software is licensed under the NICTA Public Source License version 1.0
+.Ss NICTA Public Software Licence
+Version 1.0
+.Pp
+Copyright 2004 National ICT Australia Ltd
+.Pp
+All rights reserved.
+.Pp
+By this licence, National ICT Australia Ltd (NICTA) grants permission,
+free of charge, to any person who obtains a copy of this software
+and any associated documentation files ("the Software") to use and
+deal with the Software in source code and binary forms without
+restriction, with or without modification, and to permit persons
+to whom the Software is furnished to do so, provided that the
+following conditions are met:
+.Bl -bullet
+.It
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimers.
+.It
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimers in
+the documentation and/or other materials provided with the
+distribution.
+.It
+The name of NICTA may not be used to endorse or promote products
+derived from this Software without specific prior written permission.
+.El
+.Pp
+EXCEPT AS EXPRESSLY STATED IN THIS LICENCE AND TO THE FULL EXTENT
+PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS" AND
+NICTA MAKES NO REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY
+REPRESENTATIONS, WARRANTIES OR CONDITIONS REGARDING THE CONTENTS
+OR ACCURACY OF THE SOFTWARE, OR OF TITLE, MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, THE ABSENCE OF LATENT
+OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR
+NOT DISCOVERABLE.
+.Pp
+TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+NICTA BE LIABLE ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+NEGLIGENCE) FOR ANY LOSS OR DAMAGE WHATSOEVER, INCLUDING (WITHOUT
+LIMITATION) LOSS OF PRODUCTION OR OPERATION TIME, LOSS, DAMAGE OR
+CORRUPTION OF DATA OR RECORDS; OR LOSS OF ANTICIPATED SAVINGS,
+OPPORTUNITY, REVENUE, PROFIT OR GOODWILL, OR OTHER ECONOMIC LOSS;
+OR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
+EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS LICENCE,
+THE SOFTWARE OR THE USE OF THE SOFTWARE, EVEN IF NICTA HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+.Pp
+If applicable legislation implies warranties or conditions, or
+imposes obligations or liability on NICTA in respect of the Software
+that cannot be wholly or partly excluded, restricted or modified,
+NICTA's liability is limited, to the full extent permitted by the
+applicable legislation, at its option, to:
+.Pp
+.Bl -tag -width "a." -compact
+.It a.
+in the case of goods, any one or more of the following:
+.Bl -tag -width "iii." -compact
+.It i.
+the replacement of the goods or the supply of equivalent goods;
+.It ii.
+the repair of the goods;
+.It iii.
+the payment of the cost of replacing the goods or of acquiring
+equivalent goods;
+.It iv.
+the payment of the cost of having the goods repaired; or
+.El
+.It b.
+in the case of services:
+.Bl -tag -width "iii." -compact
+.It i.
+the supplying of the services again; or 
+.It ii.
+the payment of the cost of having the services supplied again.
+.El
+.El
diff --git a/mDNSResponder/mDNSPosix/parselog.py b/mDNSResponder/mDNSPosix/parselog.py
new file mode 100755
index 00000000..f39d0f23
--- /dev/null
+++ b/mDNSResponder/mDNSPosix/parselog.py
@@ -0,0 +1,247 @@
+#!/usr/bin/python
+# Emacs settings: -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# parselog.py, written and contributed by Kevin Marks
+#
+# Requires OS X 10.3 Panther or later, for Python and Core Graphics Python APIs
+# Invoke from the command line with "parselog.py fname" where fname is a log file made by mDNSNetMonitor
+#
+# Caveats:
+# It expects plain ASCII, and doesn't handle spaces in record names very well right now
+# There's a procedure you can follow to 'sanitize' an mDNSNetMonitor log file to make it more paletable to parselog.py:
+# 1. Run mDNSNetMonitor in a terminal window.
+#    When you have enough traffic, type Ctrl-C and save the content of the terminal window to disk.
+#    Alternatively, you can use "mDNSNetMonitor > logfile" to write the text directly to a file.
+#    You now have a UTF-8 text file.
+# 2. Open the UTF-8 text file using BBEdit or some other text editor.
+#    (These instructions are for BBEdit, which I highly recommend you use when doing this.)
+# 3. Make sure BBEdit correctly interprets the file as UTF-8.
+#    Either set your "Text Files Opening" preference to "UTF-8 no BOM", and drop the file onto BBEdit,
+#    or manually open the File using "File -> Open" and make sure the "Read As" setting is set to "UTF-8 no BOM"
+#    Check in the document pulldown menu in the window toolbar to make sure that it says "Encoding: UTF-8 no BOM"
+# 4. Use "Tools -> Convert to ASCII" to replace all special characters with their seven-bit ascii equivalents.
+#    (e.g. curly quotes are converted to straight quotes)
+# 5. Do a grep search and replace. (Cmd-F; make sure Grep checkbox is turned on.)
+#    Enter this search text     : ^(.................\(................\S*) (.* -> .*)$
+#    Enter this replacement text: \1-\2
+#    Click "Replace All"
+#    Press Cmd-Opt-= repeatedly until there are no more instances to be replaced.
+#    You now have text file with all spaces in names changed to hyphens
+# 6. Save the new file. You can save it as "UTF-8 no BOM", or as "Mac Roman". It really doesn't matter which --
+#    the file now contains only seven-bit ascii, so it's all the same no matter how you save it.
+# 7. Run "parselog.py fname"
+# 8. Open the resulting fname.pdf file with a PDF viewer like Preview on OS X
+#
+# Key to what you see:
+# Time is on the horizontal axis
+# Individual machines are shown on the vertical axis
+# Filled red    circle: Normal query              Hollow red    circle: Query requesting unicast reply
+# Filled orange circle: Probe (service starting)  Hollow orange circle: First probe (requesting unicast reply)
+# Filled green  circle: Normal answer             Hollow green  circle: Goodbye message (record going away)
+#                                                 Hollow blue   circle: Legacy query (from old client)
+
+from CoreGraphics import *
+import math   # for pi
+
+import string
+import sys, os
+import re
+
+def parselog(inFile):
+	f = open(inFile)
+	hunt = 'getTime'
+	ipList = {}
+	querySource = {}
+	plotPoints = []
+	maxTime=0
+	minTime = 36*60*60
+	spaceExp = re.compile(r'\s+')
+	print "Reading " + inFile
+	while 1:
+		lines = f.readlines(100000)
+		if not lines:
+			break
+		for line in lines:
+			if (hunt == 'skip'):
+				if (line == '\n' or line == '\r' or line ==''): 
+					hunt = 'getTime'
+#				else:
+#					msg = ("skipped" , line)
+#					print msg
+			elif (hunt == 'getTime'):
+				if (line == "^C\n" ):
+					break
+				time = line.split(' ')[0].split(':')
+				if (len(time)<3):
+					#print "bad time, skipping",time
+					hunt = 'skip'
+				else:
+					hunt = 'getIP'
+				#print (("getTime:%s" % (line)), time)
+			elif (hunt == 'getIP'):
+				ip = line.split(' ',1)
+				ip = ip[0]
+				secs=0
+				for t in time:
+					secs = secs*60 +float(t)
+				if (secs>maxTime):
+					maxTime=secs
+				if (secs<minTime):
+					minTime=secs
+				if (not ip in ipList):
+					ipList[ip] = [len(ipList), "", ""]
+				#print (("getIP:%s" % (line)), time, secs)
+				hunt = 'getQA'
+			elif (hunt == 'getQA'):
+				qaList = spaceExp.split(line)
+				# qaList[0] Source Address
+				# qaList[1] Operation type (PU/PM/QU/QM/AN etc.)
+				# qaList[2] Record type (PTR/SRV/TXT etc.)
+				# For QU/QM/LQ:
+				# qaList[3] RR name
+				# For PU/PM/AN/AN+/AD/AD+/KA:
+				# qaList[3] TTL
+				# qaList[4] RR name
+				# qaList[5...] "->" symbol and following rdata
+				#print qaList
+				if (qaList[0] == ip):
+					if (qaList[1] == '(QU)' or qaList[1] == '(LQ)' or qaList[1] == '(PU)'):
+						plotPoints.append([secs, ipList[ip][0], (qaList[1])[1:-1]])
+					elif (qaList[1] == '(QM)'):
+						plotPoints.append([secs, ipList[ip][0], (qaList[1])[1:-1]])
+						querySource[qaList[3]] = len(plotPoints)-1
+					elif (qaList[1] == '(PM)'):
+						plotPoints.append([secs, ipList[ip][0], (qaList[1])[1:-1]])
+						querySource[qaList[4]] = len(plotPoints)-1
+					elif (qaList[1] == '(AN)' or qaList[1] == '(AN+)' or qaList[1] == '(DE)'):
+						plotPoints.append([secs, ipList[ip][0], (qaList[1])[1:-1]])
+						try:
+							theQuery = querySource[qaList[4]]
+							theDelta = secs - plotPoints[theQuery][0]
+							if (theDelta < 1.0):
+								plotPoints[-1].append(querySource[qaList[4]])
+							#print "Answer AN+ %s points to %d" % (qaList[4],querySource[qaList[4]])
+						except:
+							#print "Couldn't find any preceeding question for", qaList
+							pass
+					elif (qaList[1] != '(KA)' and qaList[1] != '(AD)' and qaList[1] != '(AD+)'):
+						print "Operation unknown", qaList
+
+					if (qaList[1] == '(AN)' or qaList[1] == '(AN+)' or qaList[1] == '(AD)' or qaList[1] == '(AD+)'):
+						if (qaList[2] == 'HINFO'):
+							ipList[ip][1] = qaList[4]
+							ipList[ip][2] = string.join(qaList[6:])
+							#print ipList[ip][1]
+						elif (qaList[2] == 'AAAA'):
+							if (ipList[ip][1] == ""):
+								ipList[ip][1] = qaList[4]
+								ipList[ip][2] = "Panther"
+						elif (qaList[2] == 'Addr'):
+							if (ipList[ip][1] == ""):
+								ipList[ip][1] = qaList[4]
+								ipList[ip][2] = "Jaguar"
+				else:
+					if (line == '\n'): 
+						hunt = 'getTime'
+					else:
+						hunt = 'skip'
+	f.close()
+	#print plotPoints
+	#print querySource
+	#width=20.0*(maxTime-minTime)
+	if (maxTime < minTime + 10.0):
+		maxTime = minTime + 10.0
+	typesize = 12
+	width=20.0*(maxTime-minTime)
+	pageHeight=(len(ipList)+1) * typesize
+	scale = width/(maxTime-minTime)
+	leftMargin = typesize * 60
+	bottomMargin = typesize
+	pageRect = CGRectMake (-leftMargin, -bottomMargin,  leftMargin + width, bottomMargin + pageHeight)   #  landscape
+	outFile = "%s.pdf" % (".".join(inFile.split('.')[:-1]))
+	c = CGPDFContextCreateWithFilename (outFile, pageRect)
+	print "Writing " + outFile
+	ourColourSpace = c.getColorSpace()
+	# QM/QU red    solid/hollow
+	# PM/PU orange solid/hollow
+	# LQ    blue         hollow
+	# AN/DA green  solid/hollow
+	#colourLookup = {"L":(0.0,0.0,.75), "Q":(.75,0.0,0.0), "P":(.75,0.5,0.0), "A":(0.0,0.75,0.0), "D":(0.0,0.75,0.0), "?":(.25,0.25,0.25)}
+	colourLookup = {"L":(0.0,0.0,1.0), "Q":(1.0,0.0,0.0), "P":(1.0,0.8,0.0), "A":(0.0,1.0,0.0), "D":(0.0,1.0,0.0), "?":(1.0,1.0,1.0)}
+	c.beginPage (pageRect)
+	c.setRGBFillColor(.75,0.0,0.0,1.0)
+	c.setRGBStrokeColor(.25,0.75,0.25,1.0)
+	c.setLineWidth(0.25)
+	for point in plotPoints:
+		#c.addArc((point[0]-minTime)*scale,point[1]*typesize+6,5,0,2*math.pi,1)
+		c.addArc((point[0]-minTime)*scale,point[1]*typesize+6,typesize/4,0,2*math.pi,1)
+		theColour = colourLookup[(point[2])[0]]
+		if (((point[2])[0]) != "L") and (((point[2])[0]) != "Q") and (((point[2])[0]) != "P") and (((point[2])[0]) != "A") and (((point[2])[0]) != "D"):
+			print "Unknown", point
+		if ((point[2])[-1] == "M" or (point[2])[0]== "A"):
+			c.setRGBFillColor(theColour[0],theColour[1],theColour[2],.5)
+			c.fillPath()
+		else:
+			c.setRGBStrokeColor(theColour[0],theColour[1],theColour[2],.5)
+			c.setLineWidth(1.0)
+			c.strokePath()
+		c.setRGBStrokeColor(.25,0.75,0.25,1.0)
+		c.setLineWidth(0.25)
+		for index in point[3:]:
+			c.beginPath()
+			c.moveToPoint((point[0]-minTime)*scale,point[1]*typesize+6)
+			c.addLineToPoint(((plotPoints[index])[0]-minTime)*scale,(plotPoints[index])[1]*typesize+6)
+			c.closePath()
+			c.strokePath()
+	c.setRGBFillColor (0,0,0, 1)
+	c.setTextDrawingMode (kCGTextFill)
+	c.setTextMatrix (CGAffineTransformIdentity)
+	c.selectFont ('Gill Sans', typesize, kCGEncodingMacRoman)
+	c.setRGBStrokeColor(0.25,0.0,0.0,1.0)
+	c.setLineWidth(0.1)
+	for ip,[height,hname,hinfo] in ipList.items():
+		c.beginPath()
+		c.moveToPoint(pageRect.origin.x,height*typesize+6)
+		c.addLineToPoint(width,height*typesize+6)
+		c.closePath()
+		c.strokePath()
+		c.showTextAtPoint(pageRect.origin.x + 2,               height*typesize + 2, ip,    len(ip))
+		c.showTextAtPoint(pageRect.origin.x + 2 + typesize*8,  height*typesize + 2, hname, len(hname))
+		c.showTextAtPoint(pageRect.origin.x + 2 + typesize*25, height*typesize + 2, hinfo, len(hinfo))
+	for time in range (int(minTime),int(maxTime)+1):
+		c.beginPath()
+		c.moveToPoint((time-minTime)*scale,pageRect.origin.y)
+		c.addLineToPoint((time-minTime)*scale,pageHeight)
+		c.closePath()
+		if (int(time) % 10 == 0):
+			theHours = time/3600
+			theMinutes = time/60 % 60
+			theSeconds = time % 60
+			theTimeString = '%d:%02d:%02d' % (theHours, theMinutes, theSeconds)
+			# Should measure string width, but don't know how to do that
+			theStringWidth = typesize * 3.5
+			c.showTextAtPoint((time-minTime)*scale - theStringWidth/2, pageRect.origin.y + 2, theTimeString, len(theTimeString))
+			c.setLineWidth(0.3)
+		else:
+			c.setLineWidth(0.1)
+		c.strokePath()
+	c.endPage()
+	c.finish()
+
+			
+for arg in sys.argv[1:]:
+	parselog(arg)
diff --git a/mDNSResponder/mDNSResponder.sln b/mDNSResponder/mDNSResponder.sln
new file mode 100755
index 00000000..8cd5bf74
--- /dev/null
+++ b/mDNSResponder/mDNSResponder.sln
@@ -0,0 +1,361 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DLL", "mDNSWindows\DLL\dnssd.vcxproj", "{AB581101-18F0-46F6-B56A-83A6B1EA657E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder", "mDNSWindows\SystemService\Service.vcxproj", "{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSPTool", "mDNSWindows\NSPTool\NSPTool.vcxproj", "{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdnsNSP", "mDNSWindows\mdnsNSP\mdnsNSP.vcxproj", "{F4F15529-F0EB-402F-8662-73C5797EE557}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplorerPlugin", "Clients\ExplorerPlugin\ExplorerPlugin.vcxproj", "{BB8AC1B5-6587-4163-BDC6-788B157705CA}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrinterSetupWizard", "Clients\PrinterSetupWizard\PrinterSetupWizard.vcxproj", "{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrinterSetupWizardLocRes", "Clients\PrinterSetupWizard\PrinterSetupWizardLocRes.vcxproj", "{967F5375-0176-43D3-ADA3-22EE25551C37}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrinterSetupWizardRes", "Clients\PrinterSetupWizard\PrinterSetupWizardRes.vcxproj", "{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplorerPluginLocRes", "Clients\ExplorerPlugin\ExplorerPluginLocRes.vcxproj", "{1643427B-F226-4AD6-B413-97DA64D5C6B4}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplorerPluginRes", "Clients\ExplorerPlugin\ExplorerPluginRes.vcxproj", "{871B1492-B4A4-4B57-9237-FA798484D7D7}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns-sd", "Clients\DNS-SD.VisualStudio\dns-sd.vcxproj", "{AA230639-E115-4A44-AA5A-44A61235BA50}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Java", "mDNSWindows\Java\Java.vcxproj", "{9CE2568A-3170-41C6-9F20-A0188A9EC114}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaSamples", "Clients\Java\JavaSamples.vcxproj", "{A987A0C1-344F-475C-869C-F082EB11EEBA}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DLLStub", "mDNSWindows\DLLStub\DLLStub.vcxproj", "{3A2B6325-3053-4236-84BD-AA9BE2E323E5}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DLLX", "mDNSWindows\DLLX\DLLX.vcxproj", "{78FBFCC5-2873-4AE2-9114-A08082F71124}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNSServiceBrowser.NET", "Clients\DNSServiceBrowser.NET\DNSServiceBrowser.NET.csproj", "{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}"

+EndProject

+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DNSServiceBrowser.VB", "Clients\DNSServiceBrowser.VB\DNSServiceBrowser.VB.vbproj", "{FB79E297-5703-435C-A829-51AA51CD71C2}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSNetMonitor", "Clients\mDNSNetMonitor.VisualStudio\mDNSNetMonitor.vcxproj", "{AF35C285-528D-46A1-8A0E-47B0733DC718}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlPanelLocRes", "mDNSWindows\ControlPanel\ControlPanelLocRes.vcxproj", "{4490229E-025A-478F-A2CF-51154DA83E39}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlPanelRes", "mDNSWindows\ControlPanel\ControlPanelRes.vcxproj", "{5254AA9C-3D2E-4539-86D9-5EB0F4151215}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlPanel", "mDNSWindows\ControlPanel\ControlPanel.vcxproj", "{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FirefoxExtension", "Clients\FirefoxExtension\FirefoxExtension.vcxproj", "{7826EA27-D4CC-4FAA-AD23-DF813823227B}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Any CPU = Debug|Any CPU

+		Debug|Mixed Platforms = Debug|Mixed Platforms

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Any CPU = Release|Any CPU

+		Release|Mixed Platforms = Release|Mixed Platforms

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Win32.Build.0 = Debug|Win32

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|x64.ActiveCfg = Debug|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|x64.Build.0 = Debug|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Any CPU.ActiveCfg = Release|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Mixed Platforms.Build.0 = Release|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Win32.ActiveCfg = Release|Win32

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Win32.Build.0 = Release|Win32

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|x64.ActiveCfg = Release|x64

+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|x64.Build.0 = Release|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Win32.Build.0 = Debug|Win32

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|x64.ActiveCfg = Debug|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|x64.Build.0 = Debug|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Any CPU.ActiveCfg = Release|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Mixed Platforms.Build.0 = Release|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Win32.ActiveCfg = Release|Win32

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Win32.Build.0 = Release|Win32

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|x64.ActiveCfg = Release|x64

+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|x64.Build.0 = Release|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|Win32.ActiveCfg = Debug|Win32

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|Win32.Build.0 = Debug|Win32

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|x64.ActiveCfg = Debug|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Debug|x64.Build.0 = Debug|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|Any CPU.ActiveCfg = Release|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|Mixed Platforms.Build.0 = Release|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|Win32.ActiveCfg = Release|Win32

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|Win32.Build.0 = Release|Win32

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|x64.ActiveCfg = Release|x64

+		{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}.Release|x64.Build.0 = Release|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Win32.Build.0 = Debug|Win32

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|x64.ActiveCfg = Debug|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|x64.Build.0 = Debug|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Any CPU.ActiveCfg = Release|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Mixed Platforms.Build.0 = Release|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Win32.ActiveCfg = Release|Win32

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Win32.Build.0 = Release|Win32

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|x64.ActiveCfg = Release|x64

+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|x64.Build.0 = Release|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|Win32.Build.0 = Debug|Win32

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|x64.ActiveCfg = Debug|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Debug|x64.Build.0 = Debug|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|Any CPU.ActiveCfg = Release|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|Mixed Platforms.Build.0 = Release|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|Win32.ActiveCfg = Release|Win32

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|Win32.Build.0 = Release|Win32

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|x64.ActiveCfg = Release|x64

+		{BB8AC1B5-6587-4163-BDC6-788B157705CA}.Release|x64.Build.0 = Release|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|Win32.Build.0 = Debug|Win32

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|x64.ActiveCfg = Debug|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Debug|x64.Build.0 = Debug|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|Any CPU.ActiveCfg = Release|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|Mixed Platforms.Build.0 = Release|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|Win32.ActiveCfg = Release|Win32

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|Win32.Build.0 = Release|Win32

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|x64.ActiveCfg = Release|x64

+		{B1D2CDA2-CC8F-45D5-A694-2EE45B0308CF}.Release|x64.Build.0 = Release|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|Win32.ActiveCfg = Debug|Win32

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|Win32.Build.0 = Debug|Win32

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|x64.ActiveCfg = Debug|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Debug|x64.Build.0 = Debug|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|Any CPU.ActiveCfg = Release|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|Mixed Platforms.Build.0 = Release|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|Win32.ActiveCfg = Release|Win32

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|Win32.Build.0 = Release|Win32

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|x64.ActiveCfg = Release|x64

+		{967F5375-0176-43D3-ADA3-22EE25551C37}.Release|x64.Build.0 = Release|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|Win32.Build.0 = Debug|Win32

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|x64.ActiveCfg = Debug|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Debug|x64.Build.0 = Debug|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|Any CPU.ActiveCfg = Release|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|Mixed Platforms.Build.0 = Release|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|Win32.ActiveCfg = Release|Win32

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|Win32.Build.0 = Release|Win32

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|x64.ActiveCfg = Release|x64

+		{CFCCB176-6CAA-472B-B0A2-90511C8E2E52}.Release|x64.Build.0 = Release|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|Win32.Build.0 = Debug|Win32

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|x64.ActiveCfg = Debug|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Debug|x64.Build.0 = Debug|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|Any CPU.ActiveCfg = Release|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|Mixed Platforms.Build.0 = Release|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|Win32.ActiveCfg = Release|Win32

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|Win32.Build.0 = Release|Win32

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|x64.ActiveCfg = Release|x64

+		{1643427B-F226-4AD6-B413-97DA64D5C6B4}.Release|x64.Build.0 = Release|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|Win32.Build.0 = Debug|Win32

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|x64.ActiveCfg = Debug|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Debug|x64.Build.0 = Debug|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|Any CPU.ActiveCfg = Release|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|Mixed Platforms.Build.0 = Release|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|Win32.ActiveCfg = Release|Win32

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|Win32.Build.0 = Release|Win32

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|x64.ActiveCfg = Release|x64

+		{871B1492-B4A4-4B57-9237-FA798484D7D7}.Release|x64.Build.0 = Release|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Win32.Build.0 = Debug|Win32

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|x64.ActiveCfg = Debug|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|x64.Build.0 = Debug|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Any CPU.ActiveCfg = Release|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Mixed Platforms.Build.0 = Release|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Win32.ActiveCfg = Release|Win32

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Win32.Build.0 = Release|Win32

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|x64.ActiveCfg = Release|x64

+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|x64.Build.0 = Release|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|Win32.Build.0 = Debug|Win32

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|x64.ActiveCfg = Debug|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Debug|x64.Build.0 = Debug|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|Any CPU.ActiveCfg = Release|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|Mixed Platforms.Build.0 = Release|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|Win32.ActiveCfg = Release|Win32

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|Win32.Build.0 = Release|Win32

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|x64.ActiveCfg = Release|x64

+		{9CE2568A-3170-41C6-9F20-A0188A9EC114}.Release|x64.Build.0 = Release|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|Win32.Build.0 = Debug|Win32

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Debug|x64.ActiveCfg = Debug|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|Any CPU.ActiveCfg = Release|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|Mixed Platforms.Build.0 = Release|x64

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|Win32.ActiveCfg = Release|Win32

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|Win32.Build.0 = Release|Win32

+		{A987A0C1-344F-475C-869C-F082EB11EEBA}.Release|x64.ActiveCfg = Release|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|Win32.Build.0 = Debug|Win32

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|x64.ActiveCfg = Debug|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Debug|x64.Build.0 = Debug|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|Any CPU.ActiveCfg = Release|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|Mixed Platforms.Build.0 = Release|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|Win32.ActiveCfg = Release|Win32

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|Win32.Build.0 = Release|Win32

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|x64.ActiveCfg = Release|x64

+		{3A2B6325-3053-4236-84BD-AA9BE2E323E5}.Release|x64.Build.0 = Release|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|Win32.ActiveCfg = Debug|Win32

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|Win32.Build.0 = Debug|Win32

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|x64.ActiveCfg = Debug|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Debug|x64.Build.0 = Debug|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|Any CPU.ActiveCfg = Release|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|Mixed Platforms.Build.0 = Release|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|Win32.ActiveCfg = Release|Win32

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|Win32.Build.0 = Release|Win32

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|x64.ActiveCfg = Release|x64

+		{78FBFCC5-2873-4AE2-9114-A08082F71124}.Release|x64.Build.0 = Release|x64

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|Win32.ActiveCfg = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|Any CPU.Build.0 = Release|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|Win32.ActiveCfg = Release|Any CPU

+		{DE8DB97E-37A3-43ED-9A5E-CCC5F6DE9CB4}.Release|x64.ActiveCfg = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|Win32.ActiveCfg = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Debug|x64.ActiveCfg = Debug|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|Win32.ActiveCfg = Release|Any CPU

+		{FB79E297-5703-435C-A829-51AA51CD71C2}.Release|x64.ActiveCfg = Release|Any CPU

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|Any CPU.ActiveCfg = Debug|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|Mixed Platforms.Build.0 = Debug|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|Win32.Build.0 = Debug|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Debug|x64.ActiveCfg = Debug|x64

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|Any CPU.ActiveCfg = Release|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|Mixed Platforms.ActiveCfg = Release|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|Mixed Platforms.Build.0 = Release|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|Win32.ActiveCfg = Release|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|Win32.Build.0 = Release|Win32

+		{AF35C285-528D-46A1-8A0E-47B0733DC718}.Release|x64.ActiveCfg = Release|Win32

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|Win32.Build.0 = Debug|Win32

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|x64.ActiveCfg = Debug|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Debug|x64.Build.0 = Debug|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|Any CPU.ActiveCfg = Release|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|Mixed Platforms.Build.0 = Release|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|Win32.ActiveCfg = Release|Win32

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|Win32.Build.0 = Release|Win32

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|x64.ActiveCfg = Release|x64

+		{4490229E-025A-478F-A2CF-51154DA83E39}.Release|x64.Build.0 = Release|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|Win32.Build.0 = Debug|Win32

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|x64.ActiveCfg = Debug|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Debug|x64.Build.0 = Debug|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|Any CPU.ActiveCfg = Release|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|Mixed Platforms.Build.0 = Release|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|Win32.ActiveCfg = Release|Win32

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|Win32.Build.0 = Release|Win32

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|x64.ActiveCfg = Release|x64

+		{5254AA9C-3D2E-4539-86D9-5EB0F4151215}.Release|x64.Build.0 = Release|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|Any CPU.ActiveCfg = Debug|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|Mixed Platforms.Build.0 = Debug|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|Win32.Build.0 = Debug|Win32

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|x64.ActiveCfg = Debug|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Debug|x64.Build.0 = Debug|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|Any CPU.ActiveCfg = Release|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|Mixed Platforms.ActiveCfg = Release|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|Mixed Platforms.Build.0 = Release|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|Win32.ActiveCfg = Release|Win32

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|Win32.Build.0 = Release|Win32

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|x64.ActiveCfg = Release|x64

+		{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}.Release|x64.Build.0 = Release|x64

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Any CPU.ActiveCfg = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Mixed Platforms.Build.0 = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|Win32.Build.0 = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Debug|x64.ActiveCfg = Debug|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Any CPU.ActiveCfg = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Mixed Platforms.ActiveCfg = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Mixed Platforms.Build.0 = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Win32.ActiveCfg = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|Win32.Build.0 = Release|Win32

+		{7826EA27-D4CC-4FAA-AD23-DF813823227B}.Release|x64.ActiveCfg = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/mDNSResponder/mDNSShared/CommonServices.h b/mDNSResponder/mDNSShared/CommonServices.h
new file mode 100644
index 00000000..342479b9
--- /dev/null
+++ b/mDNSResponder/mDNSShared/CommonServices.h
@@ -0,0 +1,1537 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@header		CommonServices
+
+    Common Services for Mac OS X, Linux, Palm, VxWorks, Windows, and Windows CE.
+ */
+
+#ifndef __COMMON_SERVICES__
+#define __COMMON_SERVICES__
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#if 0
+#pragma mark == Target ==
+#endif
+
+//===========================================================================================================================
+//	 Target
+//===========================================================================================================================
+
+// Macintosh
+
+#if ( !defined( TARGET_OS_MAC ) )
+    #if ( ( macintosh || __MACH__ ) && !KERNEL )
+// ConditionalMacros.h in CoreServices will define this TARGET_* flag.
+    #else
+        #define TARGET_OS_MAC           0
+    #endif
+#endif
+
+#if ( !defined( TARGET_API_MAC_OSX_KERNEL ) )
+    #if ( __MACH__ && KERNEL )
+        #define TARGET_API_MAC_OSX_KERNEL       1
+    #else
+        #define TARGET_API_MAC_OSX_KERNEL       0
+    #endif
+#endif
+
+// FreeBSD
+
+#if ( !defined( TARGET_OS_FREEBSD ) )
+    #if ( defined( __FreeBSD__ ) )
+        #define TARGET_OS_FREEBSD       1
+    #else
+        #define TARGET_OS_FREEBSD       0
+    #endif
+#endif
+
+// Linux
+
+#if ( !defined( TARGET_OS_LINUX ) )
+    #if ( defined( __linux__ ) )
+        #define TARGET_OS_LINUX         1
+    #else
+        #define TARGET_OS_LINUX         0
+    #endif
+#endif
+
+// Solaris
+
+#if ( !defined( TARGET_OS_SOLARIS ) )
+    #if ( defined(solaris) || (defined(__SVR4) && defined(sun)) )
+        #define TARGET_OS_SOLARIS       1
+    #else
+        #define TARGET_OS_SOLARIS       0
+    #endif
+#endif
+
+// Palm
+
+#if ( !defined( TARGET_OS_PALM ) )
+    #if ( defined( __PALMOS_TRAPS__ ) || defined( __PALMOS_ARMLET__ ) )
+        #define TARGET_OS_PALM          1
+    #else
+        #define TARGET_OS_PALM          0
+    #endif
+#endif
+
+// VxWorks
+
+#if ( !defined( TARGET_OS_VXWORKS ) )
+
+// No predefined macro for VxWorks so just assume VxWorks if nothing else is set.
+
+    #if ( !macintosh && !__MACH__  && !defined( __FreeBSD__ ) && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
+        #define TARGET_OS_VXWORKS       1
+    #else
+        #define TARGET_OS_VXWORKS       0
+    #endif
+#endif
+
+// Windows
+
+#if ( !defined( TARGET_OS_WIN32 ) )
+    #if ( macintosh || __MACH__ )
+// ConditionalMacros.h in CoreServices will define this TARGET_* flag.
+    #else
+        #if ( defined( _WIN32 ) )
+            #define TARGET_OS_WIN32     1
+        #else
+            #define TARGET_OS_WIN32     0
+        #endif
+    #endif
+#endif
+
+// Windows CE
+
+#if ( !defined( TARGET_OS_WINDOWS_CE ) )
+    #if ( defined( _WIN32_WCE ) )
+        #define TARGET_OS_WINDOWS_CE    1
+    #else
+        #define TARGET_OS_WINDOWS_CE    0
+    #endif
+#endif
+
+#if 0
+#pragma mark == Includes ==
+#endif
+
+//===========================================================================================================================
+//	 Includes
+//===========================================================================================================================
+
+#if ( !KERNEL )
+    #if defined(WIN32) && !defined(_WSPIAPI_COUNTOF)
+        #define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+    #endif
+    #include    <stddef.h>
+#endif
+
+#if ( ( macintosh || __MACH__ ) && !KERNEL )
+
+    #if ( defined( __MWERKS__ ) )
+        #if ( __option( c9x ) )
+            #include    <stdbool.h>
+        #endif
+    #else
+        #include    <stdbool.h>
+    #endif
+
+    #include    <stdint.h>
+
+    #if ( __MACH__ )
+
+// Mac OS X
+
+        #include    <sys/types.h>
+        #include    <netinet/in.h>
+        #include    <arpa/inet.h>
+        #include    <fcntl.h>
+        #include    <pthread.h>
+        #include    <sys/ioctl.h>
+        #include    <sys/socket.h>
+        #include    <unistd.h>
+
+    #else
+
+// Classic Mac OS
+
+        #include    <ConditionalMacros.h>
+        #include    <MacTypes.h>
+
+    #endif
+
+#elif ( KERNEL )
+
+// Mac OS X Kernel
+
+    #include    <stdint.h>
+
+    #include    <libkern/OSTypes.h>
+    #include    <sys/types.h>
+
+#elif ( TARGET_OS_FREEBSD )
+
+// FreeBSD
+    #include    <stdint.h>
+    #include    <pthread.h>
+    #include    <netinet/in.h>
+    #include    <arpa/inet.h>
+    #include    <sys/socket.h>
+
+#elif ( TARGET_OS_LINUX )
+
+// Linux
+
+    #include    <stdint.h>
+    #include    <arpa/inet.h>
+
+#elif ( TARGET_OS_SOLARIS )
+
+// Solaris
+
+    #include    <stdint.h>
+
+    #include    <arpa/inet.h>
+    #include    <arpa/nameser.h>
+
+    #if ( defined( BYTE_ORDER ) && defined( LITTLE_ENDIAN ) && ( BYTE_ORDER == LITTLE_ENDIAN ) )
+        #define TARGET_RT_LITTLE_ENDIAN     1
+    #endif
+    #if ( defined( BYTE_ORDER ) && defined( BIG_ENDIAN ) && ( BYTE_ORDER == BIG_ENDIAN ) )
+        #define TARGET_RT_BIG_ENDIAN        1
+    #endif
+
+#elif ( TARGET_OS_PALM )
+
+// Palm (no special includes yet).
+
+#elif ( TARGET_OS_VXWORKS )
+
+// VxWorks
+
+    #include    "vxWorks.h"
+
+#elif ( TARGET_OS_WIN32 )
+
+// Windows
+
+    #if ( !defined( WIN32_WINDOWS ) )
+        #define WIN32_WINDOWS       0x0401
+    #endif
+
+    #if ( !defined( _WIN32_WINDOWS ) )
+        #define _WIN32_WINDOWS      0x0401
+    #endif
+
+    #if ( !defined( WIN32_LEAN_AND_MEAN ) )
+        #define WIN32_LEAN_AND_MEAN         // Needed to avoid redefinitions by Windows interfaces.
+    #endif
+
+    #if ( defined( __MWERKS__ ) )
+
+        #if ( __option( c9x ) )
+            #include    <stdbool.h>
+        #endif
+
+        #include    <stdint.h>
+
+    #elif ( defined( _MSC_VER ) )
+
+        #pragma warning( disable:4127 ) // Disable "conditional expression is constant" warning for debug macros.
+        #pragma warning( disable:4706 ) // Disable "assignment within conditional expression" for Microsoft headers.
+
+    #endif
+
+    #include    <windows.h>
+    #include    <winsock2.h>
+    #include    <Ws2tcpip.h>
+
+    #if ( defined( _MSC_VER ) )
+        #pragma warning( default:4706 )
+    #endif
+
+#else
+    #error unknown OS - update this file to support your OS
+#endif
+
+#if ( !defined( TARGET_BUILD_MAIN ) )
+    #if ( !TARGET_OS_VXWORKS )
+        #define TARGET_BUILD_MAIN       1
+    #endif
+#endif
+
+#if ( __GNUC__ || !TARGET_OS_VXWORKS )
+    #define TARGET_LANGUAGE_C_LIKE      1
+#else
+    #define TARGET_LANGUAGE_C_LIKE      0
+#endif
+
+#if 0
+#pragma mark == CPU ==
+#endif
+
+//===========================================================================================================================
+//	CPU
+//===========================================================================================================================
+
+// PowerPC
+
+#if ( !defined( TARGET_CPU_PPC ) )
+    #if ( defined( __ppc__ ) || defined( __PPC__ ) || defined( powerpc ) || defined( ppc ) || defined( _M_MPPC ) )
+        #define TARGET_CPU_PPC              1
+    #else
+        #define TARGET_CPU_PPC              0
+    #endif
+#endif
+
+// x86
+
+#if ( !defined( TARGET_CPU_X86 ) )
+    #if ( __INTEL__ || defined( __i386__ ) || defined( i386 ) || defined( intel ) || defined( _M_IX86 ) )
+        #define TARGET_CPU_X86              1
+    #else
+        #define TARGET_CPU_X86              0
+    #endif
+#endif
+
+// MIPS
+
+#if ( !defined( TARGET_CPU_MIPS ) )
+    #if ( __MIPS__ || defined( MIPS32 ) || defined( R3000 ) || defined( R4000 ) || defined( R4650 ) || defined( _M_MRX000 ) )
+        #define TARGET_CPU_MIPS             1
+    #else
+        #define TARGET_CPU_MIPS             0
+    #endif
+#endif
+
+#if ( !defined( TARGET_CPU_PPC ) && !defined( TARGET_CPU_X86 ) && !defined( TARGET_CPU_MIPS ) )
+    #error unknown CPU - update this file to support your CPU
+#endif
+
+#if 0
+#pragma mark == Byte Order ==
+#endif
+
+//===========================================================================================================================
+//	Byte Order
+//===========================================================================================================================
+
+// TARGET_RT_LITTLE_ENDIAN
+
+#if ( !defined( TARGET_RT_LITTLE_ENDIAN ) )
+    #if ( MIPSEL || IL_LITTLE_ENDIAN || defined( __LITTLE_ENDIAN__ )                                         || \
+    ( defined(   BYTE_ORDER ) && defined(   LITTLE_ENDIAN ) && (   BYTE_ORDER ==   LITTLE_ENDIAN ) )   || \
+    ( defined(  _BYTE_ORDER ) && defined(  _LITTLE_ENDIAN ) && (  _BYTE_ORDER ==  _LITTLE_ENDIAN ) )   || \
+    ( defined( __BYTE_ORDER ) && defined( __LITTLE_ENDIAN ) && ( __BYTE_ORDER == __LITTLE_ENDIAN ) )   || \
+    TARGET_CPU_X86 || ( defined( TARGET_RT_BIG_ENDIAN ) && !TARGET_RT_BIG_ENDIAN ) )
+        #define TARGET_RT_LITTLE_ENDIAN     1
+    #else
+        #define TARGET_RT_LITTLE_ENDIAN     0
+    #endif
+#endif
+
+// TARGET_RT_BIG_ENDIAN
+
+#if ( !defined( TARGET_RT_BIG_ENDIAN ) )
+    #if ( MIPSEB || IL_BIG_ENDIAN || defined( __BIG_ENDIAN__ )                                       || \
+    ( defined(   BYTE_ORDER ) && defined(   BIG_ENDIAN ) && (   BYTE_ORDER ==   BIG_ENDIAN ) ) || \
+    ( defined(  _BYTE_ORDER ) && defined(  _BIG_ENDIAN ) && (  _BYTE_ORDER ==  _BIG_ENDIAN ) ) || \
+    ( defined( __BYTE_ORDER ) && defined( __BIG_ENDIAN ) && ( __BYTE_ORDER == __BIG_ENDIAN ) ) || \
+    ( defined( TARGET_RT_LITTLE_ENDIAN ) && !TARGET_RT_LITTLE_ENDIAN ) )
+        #define TARGET_RT_BIG_ENDIAN        1
+    #else
+        #define TARGET_RT_BIG_ENDIAN        0
+    #endif
+#endif
+
+#if ( defined( TARGET_RT_LITTLE_ENDIAN ) && !defined( TARGET_RT_BIG_ENDIAN ) )
+    #if ( TARGET_RT_LITTLE_ENDIAN )
+        #define TARGET_RT_BIG_ENDIAN        0
+    #else
+        #define TARGET_RT_BIG_ENDIAN        1
+    #endif
+#endif
+
+#if ( defined( TARGET_RT_BIG_ENDIAN ) && !defined( TARGET_RT_LITTLE_ENDIAN ) )
+    #if ( TARGET_RT_BIG_ENDIAN )
+        #define TARGET_RT_LITTLE_ENDIAN     0
+    #else
+        #define TARGET_RT_LITTLE_ENDIAN     1
+    #endif
+#endif
+
+#if ( !defined( TARGET_RT_LITTLE_ENDIAN ) || !defined( TARGET_RT_BIG_ENDIAN ) )
+    #error unknown byte order - update this file to support your byte order
+#endif
+
+// TARGET_RT_BYTE_ORDER
+
+#if ( !defined( TARGET_RT_BYTE_ORDER_BIG_ENDIAN ) )
+    #define TARGET_RT_BYTE_ORDER_BIG_ENDIAN         1234
+#endif
+
+#if ( !defined( TARGET_RT_BYTE_ORDER_LITTLE_ENDIAN ) )
+    #define TARGET_RT_BYTE_ORDER_LITTLE_ENDIAN      4321
+#endif
+
+#if ( !defined( TARGET_RT_BYTE_ORDER ) )
+    #if ( TARGET_RT_LITTLE_ENDIAN )
+        #define TARGET_RT_BYTE_ORDER                TARGET_RT_BYTE_ORDER_LITTLE_ENDIAN
+    #else
+        #define TARGET_RT_BYTE_ORDER                TARGET_RT_BYTE_ORDER_BIG_ENDIAN
+    #endif
+#endif
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#if ( !TARGET_OS_MAC )
+    #define CR      '\r'
+#endif
+
+#define LF          '\n'
+#define CRSTR       "\r"
+#define LFSTR       "\n"
+#define CRLF        "\r\n"
+#define CRCR        "\r\r"
+
+#if 0
+#pragma mark == Compatibility ==
+#endif
+
+//===========================================================================================================================
+//	Compatibility
+//===========================================================================================================================
+
+// Macros to allow the same code to work on Windows and other sockets API-compatible platforms.
+
+#if ( TARGET_OS_WIN32 )
+    #define close_compat( X )       closesocket( X )
+    #define errno_compat()          (int) GetLastError()
+    #define set_errno_compat( X )   SetLastError( X )
+    #define EWOULDBLOCK_compat      WSAEWOULDBLOCK
+    #define ETIMEDOUT_compat        WSAETIMEDOUT
+    #define ENOTCONN_compat         WSAENOTCONN
+    #define IsValidSocket( X )      ( ( X ) != INVALID_SOCKET )
+    #define kInvalidSocketRef       INVALID_SOCKET
+    #if ( TARGET_LANGUAGE_C_LIKE )
+typedef SOCKET SocketRef;
+    #endif
+#else
+    #define close_compat( X )       close( X )
+    #define errno_compat()          errno
+    #define set_errno_compat( X )   do { errno = ( X ); } while( 0 )
+    #define EWOULDBLOCK_compat      EWOULDBLOCK
+    #define ETIMEDOUT_compat        ETIMEDOUT
+    #define ENOTCONN_compat         ENOTCONN
+    #define IsValidSocket( X )      ( ( X ) >= 0 )
+    #define kInvalidSocketRef       -1
+    #if ( TARGET_LANGUAGE_C_LIKE )
+typedef int SocketRef;
+    #endif
+#endif
+
+// socklen_t is not defined on the following platforms so emulate it if not defined:
+//
+// - Pre-Panther Mac OS X. Panther defines SO_NOADDRERR so trigger off that.
+// - Windows SDK prior to 2003. 2003+ SDK's define EAI_AGAIN so trigger off that.
+// - VxWorks
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( ( TARGET_OS_MAC && !defined( SO_NOADDRERR ) ) || ( TARGET_OS_WIN32 && !defined( EAI_AGAIN ) ) || TARGET_OS_VXWORKS )
+typedef int socklen_t;
+    #endif
+#endif
+
+// ssize_t is not defined on the following platforms so emulate it if not defined:
+//
+// - Mac OS X when not building with BSD headers
+// - Windows
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_FREEBSD && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
+typedef int ssize_t;
+    #endif
+#endif
+
+// sockaddr_storage is not supported on non-IPv6 machines so alias it to an IPv4-compatible structure.
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( !defined( AF_INET6 ) )
+        #define sockaddr_storage        sockaddr_in
+        #define ss_family               sin_family
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	SOCKADDR_IS_IP_LOOPBACK
+
+    @abstract	Determines if a sockaddr is an IPv4 or IPv6 loopback address (if IPv6 is supported).
+ */
+
+#if ( defined( AF_INET6 ) )
+    #define SOCKADDR_IS_IP_LOOPBACK( SA )                                                           \
+    ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET )                               \
+    ? ( ( (const struct sockaddr_in *)( SA ) )->sin_addr.s_addr == htonl( INADDR_LOOPBACK ) )   \
+    : ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET6 )                            \
+    ? IN6_IS_ADDR_LOOPBACK( &( (const struct sockaddr_in6 *)( SA ) )->sin6_addr )           \
+    : 0
+#else
+    #define SOCKADDR_IS_IP_LOOPBACK( SA )                                                           \
+    ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET )                               \
+    ? ( ( (const struct sockaddr_in *)( SA ) )->sin_addr.s_addr == htonl( INADDR_LOOPBACK ) )   \
+    : 0
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	SOCKADDR_IS_IP_LINK_LOCAL
+
+    @abstract	Determines if a sockaddr is an IPv4 or IPv6 link-local address (if IPv6 is supported).
+ */
+
+#if ( defined( AF_INET6 ) )
+    #define SOCKADDR_IS_IP_LINK_LOCAL( SA )                                                             \
+    ( ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET )                                 \
+      ? ( ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 0 ] == 169 ) &&   \
+          ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 1 ] == 254 ) )    \
+      : IN6_IS_ADDR_LOOPBACK( &( (const struct sockaddr_in6 *)( SA ) )->sin6_addr ) )
+#else
+    #define SOCKADDR_IS_IP_LINK_LOCAL( SA )                                                             \
+    ( ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET )                                 \
+      ? ( ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 0 ] == 169 ) &&   \
+          ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 1 ] == 254 ) )    \
+      : 0 )
+#endif
+
+// _beginthreadex and _endthreadex are not supported on Windows CE 2.1 or later (the C runtime issues with leaking
+// resources have apparently been resolved and they seem to have just ripped out support for the API) so map it to
+// CreateThread on Windows CE.
+
+#if ( TARGET_OS_WINDOWS_CE )
+    #define _beginthreadex_compat( SECURITY_PTR, STACK_SIZE, START_ADDRESS, ARG_LIST, FLAGS, THREAD_ID_PTR )            \
+    (uintptr_t) CreateThread( SECURITY_PTR, STACK_SIZE, (LPTHREAD_START_ROUTINE) START_ADDRESS, ARG_LIST, FLAGS,    \
+                              (LPDWORD) THREAD_ID_PTR )
+
+    #define _endthreadex_compat( RESULT )       ExitThread( (DWORD) RESULT )
+#elif ( TARGET_OS_WIN32 )
+    #define _beginthreadex_compat               _beginthreadex
+    #define _endthreadex_compat                 _endthreadex
+#endif
+
+// The C99 "inline" keyword is not supported by Microsoft compilers, but they do support __inline so map it when needed.
+
+#if ( defined( _MSC_VER ) )
+    #define inline_compat       __inline
+#else
+    #define inline_compat       inline
+#endif
+
+// Calling conventions
+
+#if ( !defined( CALLBACK_COMPAT ) )
+    #if ( TARGET_OS_WIN32 || TARGET_OS_WINDOWS_CE )
+        #define CALLBACK_COMPAT     CALLBACK
+    #else
+        #define CALLBACK_COMPAT
+    #endif
+#endif
+
+#if 0
+#pragma mark == Macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	kSizeCString
+
+    @abstract	A meta-value to pass to supported routines to indicate the size should be calculated with strlen.
+ */
+
+#define kSizeCString        ( (size_t) -1 )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	sizeof_array
+
+    @abstract	Determines the number of elements in an array.
+ */
+
+#define sizeof_array( X )       ( sizeof( X ) / sizeof( X[ 0 ] ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	sizeof_element
+
+    @abstract	Determines the size of an array element.
+ */
+
+#define sizeof_element( X )     sizeof( X[ 0 ] )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	sizeof_string
+
+    @abstract	Determines the size of a constant C string, excluding the null terminator.
+ */
+
+#define sizeof_string( X )      ( sizeof( ( X ) ) - 1 )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	sizeof_field
+
+    @abstract	Determines the size of a field of a type.
+ */
+
+#define sizeof_field( TYPE, FIELD )     sizeof( ( ( (TYPE *) 0 )->FIELD ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	RoundUp
+
+    @abstract	Rounds X up to a multiple of Y.
+ */
+
+#define RoundUp( X, Y )     ( ( X ) + ( ( Y ) -( ( X ) % ( Y ) ) ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	IsAligned
+
+    @abstract	Returns non-zero if X is aligned to a Y byte boundary and 0 if not. Y must be a power of 2.
+ */
+
+#define IsAligned( X, Y )       ( ( ( X ) &( ( Y ) -1 ) ) == 0 )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	IsFieldAligned
+
+    @abstract	Returns non-zero if FIELD of type TYPE is aligned to a Y byte boundary and 0 if not. Y must be a power of 2.
+ */
+
+#define IsFieldAligned( X, TYPE, FIELD, Y )     IsAligned( ( (uintptr_t)( X ) ) + offsetof( TYPE, FIELD ), ( Y ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	AlignDown
+
+    @abstract	Aligns X down to a Y byte boundary. Y must be a power of 2.
+ */
+
+#define AlignDown( X, Y )       ( ( X ) &~( ( Y ) -1 ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	AlignUp
+
+    @abstract	Aligns X up to a Y byte boundary. Y must be a power of 2.
+ */
+
+#define AlignUp( X, Y )     ( ( ( X ) + ( ( Y ) -1 ) ) & ~( ( Y ) -1 ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	Min
+
+    @abstract	Returns the lesser of X and Y.
+ */
+
+#if ( !defined( Min ) )
+    #define Min( X, Y )     ( ( ( X ) < ( Y ) ) ? ( X ) : ( Y ) )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	Max
+
+    @abstract	Returns the greater of X and Y.
+ */
+
+#if ( !defined( Max ) )
+    #define Max( X, Y )     ( ( ( X ) > ( Y ) ) ? ( X ) : ( Y ) )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	InsertBits
+
+    @abstract	Inserts BITS (both 0 and 1 bits) into X, controlled by MASK and SHIFT, and returns the result.
+
+    @discussion
+
+    MASK is the bitmask of the bits in the final position.
+    SHIFT is the number of bits to shift left for 1 to reach the first bit position of MASK.
+
+    For example, if you wanted to insert 0x3 into the leftmost 4 bits of a 32-bit value:
+
+    InsertBits( 0, 0x3, 0xF0000000U, 28 ) == 0x30000000
+ */
+
+#define InsertBits( X, BITS, MASK, SHIFT )      ( ( ( X ) &~( MASK ) ) | ( ( ( BITS ) << ( SHIFT ) ) & ( MASK ) ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	ExtractBits
+
+    @abstract	Extracts bits from X, controlled by MASK and SHIFT, and returns the result.
+
+    @discussion
+
+    MASK is the bitmask of the bits in the final position.
+    SHIFT is the number of bits to shift right to right justify MASK.
+
+    For example, if you had a 32-bit value (e.g. 0x30000000) wanted the left-most 4 bits (e.g. 3 in this example):
+
+    ExtractBits( 0x30000000U, 0xF0000000U, 28 ) == 0x3
+ */
+
+#define ExtractBits( X, MASK, SHIFT )           ( ( ( X ) >> ( SHIFT ) ) & ( ( MASK ) >> ( SHIFT ) ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	Stringify
+
+    @abstract	Stringify's an expression.
+
+    @discussion
+
+    Stringify macros to process raw text passed via -D options to C string constants. The double-wrapping is necessary
+    because the C preprocessor doesn't perform its normal argument expansion pre-scan with stringified macros so the
+    -D macro needs to be expanded once via the wrapper macro then stringified so the raw text is stringified. Otherwise,
+    the replacement value would be used instead of the symbolic name (only for preprocessor symbols like #defines).
+
+    For example:
+
+ #define	kMyConstant		1
+
+        printf( "%s", Stringify( kMyConstant ) );			// Prints "kMyConstant"
+        printf( "%s", StringifyExpansion( kMyConstant ) );	// Prints "1"
+
+    Non-preprocessor symbols do not have this issue. For example:
+
+        enum
+        {
+            kMyConstant = 1
+        };
+
+        printf( "%s", Stringify( kMyConstant ) );			// Prints "kMyConstant"
+        printf( "%s", StringifyExpansion( kMyConstant ) );	// Prints "kMyConstant"
+
+    See <http://gcc.gnu.org/onlinedocs/cpp/Argument-Prescan.html> for more info on C preprocessor pre-scanning.
+ */
+
+#define Stringify( X )              # X
+#define StringifyExpansion( X )     Stringify( X )
+
+#if 0
+#pragma mark == Types ==
+#endif
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+//===========================================================================================================================
+//	 Standard Types
+//===========================================================================================================================
+
+#if ( !defined( INT8_MIN ) )
+
+    #define INT8_MIN                    SCHAR_MIN
+
+    #if ( defined( _MSC_VER ) )
+
+// C99 stdint.h not supported in VC++/VS.NET yet.
+
+typedef INT8 int8_t;
+typedef UINT8 uint8_t;
+typedef INT16 int16_t;
+typedef UINT16 uint16_t;
+typedef INT32 int32_t;
+typedef UINT32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+
+    #elif ( TARGET_OS_VXWORKS && ( TORNADO_VERSION < 220 ) )
+typedef long long int64_t;
+typedef unsigned long long uint64_t;
+    #endif
+
+typedef int8_t int_least8_t;
+typedef int16_t int_least16_t;
+typedef int32_t int_least32_t;
+typedef int64_t int_least64_t;
+
+typedef uint8_t uint_least8_t;
+typedef uint16_t uint_least16_t;
+typedef uint32_t uint_least32_t;
+typedef uint64_t uint_least64_t;
+
+typedef int8_t int_fast8_t;
+typedef int16_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef int64_t int_fast64_t;
+
+typedef uint8_t uint_fast8_t;
+typedef uint16_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+typedef uint64_t uint_fast64_t;
+
+    #if ( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE )
+typedef long int intptr_t;
+typedef unsigned long int uintptr_t;
+    #endif
+
+#endif
+
+// Macros for minimum-width integer constants
+
+#if ( !defined( INT8_C ) )
+    #define INT8_C( value )         value
+#endif
+
+#if ( !defined( INT16_C ) )
+    #define INT16_C( value )        value
+#endif
+
+#if ( !defined( INT32_C ) )
+    #define INT32_C( value )        value ## L
+#endif
+
+#if ( !defined( INT64_C ) )
+    #if ( defined( _MSC_VER ) )
+        #define INT64_C( value )    value ## i64
+    #else
+        #define INT64_C( value )    value ## LL
+    #endif
+#endif
+
+#if ( !defined( UINT8_C ) )
+    #define UINT8_C( value )        value ## U
+#endif
+
+#if ( !defined( UINT16_C ) )
+    #define UINT16_C( value )       value ## U
+#endif
+
+#if ( !defined( UINT32_C ) )
+    #define UINT32_C( value )       value ## UL
+#endif
+
+#if ( !defined( UINT64_C ) )
+    #if ( defined( _MSC_VER ) )
+        #define UINT64_C( value )   value ## UI64
+    #else
+        #define UINT64_C( value )   value ## ULL
+    #endif
+#endif
+
+#if 0
+#pragma mark == bool ==
+#endif
+
+//===========================================================================================================================
+//	 Boolean Constants and Types
+//===========================================================================================================================
+
+// C++ defines bool, true, and false. Metrowerks allows this to be controlled by the "bool" option though.
+// C99 defines __bool_true_false_are_defined when bool, true, and false are defined.
+// MacTypes.h defines true and false (Mac builds only).
+//
+// Note: The Metrowerks has to be in its own block because Microsoft Visual Studio .NET does not completely
+// short-circuit and gets confused by the option( bool ) portion of the conditional.
+
+#if ( defined( __MWERKS__ ) )
+
+// Note: The following test is done on separate lines because CodeWarrior doesn't like it all on one line.
+
+    #if ( !__bool_true_false_are_defined && ( !defined( __cplusplus ) || !__option( bool ) ) )
+        #define COMMON_SERVICES_NEEDS_BOOL      1
+    #else
+        #define COMMON_SERVICES_NEEDS_BOOL      0
+    #endif
+
+// Workaround when building with CodeWarrior, but using the Apple stdbool.h header, which uses _Bool.
+
+    #if ( __bool_true_false_are_defined && !defined( __cplusplus ) && !__option( c9x ) )
+        #define _Bool int
+    #endif
+
+// Workaround when building with CodeWarrior for C++ with bool disabled and using the Apple stdbool.h header,
+// which defines true and false to map to C++ true and false (which are not enabled). Serenity Now!
+
+    #if ( __bool_true_false_are_defined && defined( __cplusplus ) && !__option( bool ) )
+        #define true    1
+        #define false   0
+    #endif
+#else
+    #define COMMON_SERVICES_NEEDS_BOOL          ( !defined( __cplusplus ) && !__bool_true_false_are_defined )
+#endif
+
+#if ( COMMON_SERVICES_NEEDS_BOOL )
+
+typedef int bool;
+
+    #define bool bool
+
+    #if ( !defined( __MACTYPES__ ) && !defined( true ) && !defined( false ) )
+        #define true    1
+        #define false   0
+    #endif
+
+    #define __bool_true_false_are_defined       1
+#endif
+
+// IOKit IOTypes.h typedef's bool if TYPE_BOOL is not defined so define it here to prevent redefinition by IOTypes.h.
+
+#if ( TARGET_API_MAC_OSX_KERNEL )
+    #define TYPE_BOOL       1
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	CStr255
+
+    @abstract	255 character null-terminated (C-style) string.
+ */
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+typedef char CStr255[ 256 ];
+#endif
+
+#endif  // TARGET_LANGUAGE_C_LIKE
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	TYPE_LONGLONG_NATIVE
+
+    @abstract	Defines whether long long (or its equivalent) is natively supported or requires special libraries.
+ */
+
+#if ( !defined( TYPE_LONGLONG_NATIVE ) )
+    #if ( !TARGET_OS_VXWORKS )
+        #define TYPE_LONGLONG_NATIVE            1
+    #else
+        #define TYPE_LONGLONG_NATIVE            0
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	long_long_compat
+
+    @abstract	Compatibility type to map to the closest thing to long long and unsigned long long.
+
+    @discussion
+
+    Neither long long nor unsigned long long are supported by Microsoft compilers, but they do support proprietary
+    "__int64" and "unsigned __int64" equivalents so map to those types if the real long long is not supported.
+ */
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( TARGET_OS_WIN32 )
+typedef __int64 long_long_compat;
+typedef unsigned __int64 unsigned_long_long_compat;
+    #else
+typedef signed long long long_long_compat;
+typedef unsigned long long unsigned_long_long_compat;
+    #endif
+#endif
+
+#if 0
+#pragma mark == Errors ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@enum		OSStatus
+
+    @abstract	Status Code
+
+    @constant	kNoErr						    0 No error occurred.
+    @constant	kInProgressErr				    1 Operation in progress.
+    @constant	kUnknownErr					-6700 Unknown error occurred.
+    @constant	kOptionErr					-6701 Option was not acceptable.
+    @constant	kSelectorErr				-6702 Selector passed in is invalid or unknown.
+    @constant	kExecutionStateErr			-6703 Call made in the wrong execution state (e.g. called at interrupt time).
+    @constant	kPathErr					-6704 Path is invalid, too long, or otherwise not usable.
+    @constant	kParamErr					-6705 Parameter is incorrect, missing, or not appropriate.
+    @constant	kParamCountErr				-6706 Incorrect or unsupported number of parameters.
+    @constant	kCommandErr					-6707 Command invalid or not supported.
+    @constant	kIDErr						-6708 Unknown, invalid, or inappropriate identifier.
+    @constant	kStateErr					-6709 Not in appropriate state to perform operation.
+    @constant	kRangeErr					-6710 Index is out of range or not valid.
+    @constant	kRequestErr					-6711 Request was improperly formed or not appropriate.
+    @constant	kResponseErr				-6712 Response was incorrect or out of sequence.
+    @constant	kChecksumErr				-6713 Checksum does not match the actual data.
+    @constant	kNotHandledErr				-6714 Operation was not handled (or not handled completely).
+    @constant	kVersionErr					-6715 Version is not incorrect or not compatibile.
+    @constant	kSignatureErr				-6716 Signature did not match what was expected.
+    @constant	kFormatErr					-6717 Unknown, invalid, or inappropriate file/data format.
+    @constant	kNotInitializedErr			-6718 Action request before needed services were initialized.
+    @constant	kAlreadyInitializedErr		-6719 Attempt made to initialize when already initialized.
+    @constant	kNotInUseErr				-6720 Object not in use (e.g. cannot abort if not already in use).
+    @constant	kInUseErr					-6721 Object is in use (e.g. cannot reuse active param blocks).
+    @constant	kTimeoutErr					-6722 Timeout occurred.
+    @constant	kCanceledErr				-6723 Operation canceled (successful cancel).
+    @constant	kAlreadyCanceledErr			-6724 Operation has already been canceled.
+    @constant	kCannotCancelErr			-6725 Operation could not be canceled (maybe already done or invalid).
+    @constant	kDeletedErr					-6726 Object has already been deleted.
+    @constant	kNotFoundErr				-6727 Something was not found.
+    @constant	kNoMemoryErr				-6728 Not enough memory was available to perform the operation.
+    @constant	kNoResourcesErr				-6729 Resources unavailable to perform the operation.
+    @constant	kDuplicateErr				-6730 Duplicate found or something is a duplicate.
+    @constant	kImmutableErr				-6731 Entity is not changeable.
+    @constant	kUnsupportedDataErr			-6732 Data is unknown or not supported.
+    @constant	kIntegrityErr				-6733 Data is corrupt.
+    @constant	kIncompatibleErr			-6734 Data is not compatible or it is in an incompatible format.
+    @constant	kUnsupportedErr				-6735 Feature or option is not supported.
+    @constant	kUnexpectedErr				-6736 Error occurred that was not expected.
+    @constant	kValueErr					-6737 Value is not appropriate.
+    @constant	kNotReadableErr				-6738 Could not read or reading is not allowed.
+    @constant	kNotWritableErr				-6739 Could not write or writing is not allowed.
+    @constant	kBadReferenceErr			-6740 An invalid or inappropriate reference was specified.
+    @constant	kFlagErr					-6741 An invalid, inappropriate, or unsupported flag was specified.
+    @constant	kMalformedErr				-6742 Something was not formed correctly.
+    @constant	kSizeErr					-6743 Size was too big, too small, or not appropriate.
+    @constant	kNameErr					-6744 Name was not correct, allowed, or appropriate.
+    @constant	kNotReadyErr				-6745 Device or service is not ready.
+    @constant	kReadErr					-6746 Could not read.
+    @constant	kWriteErr					-6747 Could not write.
+    @constant	kMismatchErr				-6748 Something does not match.
+    @constant	kDateErr					-6749 Date is invalid or out-of-range.
+    @constant	kUnderrunErr				-6750 Less data than expected.
+    @constant	kOverrunErr					-6751 More data than expected.
+    @constant	kEndingErr					-6752 Connection, session, or something is ending.
+    @constant	kConnectionErr				-6753 Connection failed or could not be established.
+    @constant	kAuthenticationErr			-6754 Authentication failed or is not supported.
+    @constant	kOpenErr					-6755 Could not open file, pipe, device, etc.
+    @constant	kTypeErr					-6756 Incorrect or incompatible type (e.g. file, data, etc.).
+    @constant	kSkipErr					-6757 Items should be or was skipped.
+    @constant	kNoAckErr					-6758 No acknowledge.
+    @constant	kCollisionErr				-6759 Collision occurred (e.g. two on bus at same time).
+    @constant	kBackoffErr					-6760 Backoff in progress and operation intentionally failed.
+    @constant	kNoAddressAckErr			-6761 No acknowledge of address.
+    @constant	kBusyErr					-6762 Cannot perform because something is busy.
+    @constant	kNoSpaceErr					-6763 Not enough space to perform operation.
+ */
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( !TARGET_OS_MAC && !TARGET_API_MAC_OSX_KERNEL )
+typedef int32_t OSStatus;
+    #endif
+#endif
+
+#define kNoErr                      0
+#define kInProgressErr              1
+
+// Generic error codes are in the range -6700 to -6779.
+
+#define kGenericErrorBase           -6700   // Starting error code for all generic errors.
+
+#define kUnknownErr                 -6700
+#define kOptionErr                  -6701
+#define kSelectorErr                -6702
+#define kExecutionStateErr          -6703
+#define kPathErr                    -6704
+#define kParamErr                   -6705
+#define kParamCountErr              -6706
+#define kCommandErr                 -6707
+#define kIDErr                      -6708
+#define kStateErr                   -6709
+#define kRangeErr                   -6710
+#define kRequestErr                 -6711
+#define kResponseErr                -6712
+#define kChecksumErr                -6713
+#define kNotHandledErr              -6714
+#define kVersionErr                 -6715
+#define kSignatureErr               -6716
+#define kFormatErr                  -6717
+#define kNotInitializedErr          -6718
+#define kAlreadyInitializedErr      -6719
+#define kNotInUseErr                -6720
+#define kInUseErr                   -6721
+#define kTimeoutErr                 -6722
+#define kCanceledErr                -6723
+#define kAlreadyCanceledErr         -6724
+#define kCannotCancelErr            -6725
+#define kDeletedErr                 -6726
+#define kNotFoundErr                -6727
+#define kNoMemoryErr                -6728
+#define kNoResourcesErr             -6729
+#define kDuplicateErr               -6730
+#define kImmutableErr               -6731
+#define kUnsupportedDataErr         -6732
+#define kIntegrityErr               -6733
+#define kIncompatibleErr            -6734
+#define kUnsupportedErr             -6735
+#define kUnexpectedErr              -6736
+#define kValueErr                   -6737
+#define kNotReadableErr             -6738
+#define kNotWritableErr             -6739
+#define kBadReferenceErr            -6740
+#define kFlagErr                    -6741
+#define kMalformedErr               -6742
+#define kSizeErr                    -6743
+#define kNameErr                    -6744
+#define kNotReadyErr                -6745
+#define kReadErr                    -6746
+#define kWriteErr                   -6747
+#define kMismatchErr                -6748
+#define kDateErr                    -6749
+#define kUnderrunErr                -6750
+#define kOverrunErr                 -6751
+#define kEndingErr                  -6752
+#define kConnectionErr              -6753
+#define kAuthenticationErr          -6754
+#define kOpenErr                    -6755
+#define kTypeErr                    -6756
+#define kSkipErr                    -6757
+#define kNoAckErr                   -6758
+#define kCollisionErr               -6759
+#define kBackoffErr                 -6760
+#define kNoAddressAckErr            -6761
+#define kBusyErr                    -6762
+#define kNoSpaceErr                 -6763
+
+#define kGenericErrorEnd            -6779   // Last generic error code (inclusive)
+
+#if 0
+#pragma mark == Mac Compatibility ==
+#endif
+
+//===========================================================================================================================
+//	Mac Compatibility
+//===========================================================================================================================
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@enum		Duration
+
+    @abstract	Type used to specify a duration of time.
+
+    @constant	kDurationImmediate			Indicates no delay/wait time.
+    @constant	kDurationMicrosecond		Microsecond units.
+    @constant	kDurationMillisecond		Millisecond units.
+    @constant	kDurationSecond				Second units.
+    @constant	kDurationMinute				Minute units.
+    @constant	kDurationHour				Hour units.
+    @constant	kDurationDay				Day units.
+    @constant	kDurationForever			Infinite period of time (no timeout).
+
+    @discussion
+
+    Duration values are intended to be multiplied by the specific interval to achieve an actual duration. For example,
+    to wait for 5 seconds you would use "5 * kDurationSecond".
+ */
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+    #if ( !TARGET_OS_MAC )
+typedef int32_t Duration;
+    #endif
+#endif
+
+#define kDurationImmediate              0L
+#define kDurationMicrosecond            -1L
+#define kDurationMillisecond            1L
+#define kDurationSecond                 ( 1000L * kDurationMillisecond )
+#define kDurationMinute                 ( 60L * kDurationSecond )
+#define kDurationHour                   ( 60L * kDurationMinute )
+#define kDurationDay                    ( 24L * kDurationHour )
+#define kDurationForever                0x7FFFFFFFL
+
+// Seconds <-> Minutes <-> Hours <-> Days <-> Weeks <-> Months <-> Years conversions
+
+#define kNanosecondsPerMicrosecond      1000
+#define kNanosecondsPerMillisecond      1000000
+#define kNanosecondsPerSecond           1000000000
+#define kMicrosecondsPerSecond          1000000
+#define kMicrosecondsPerMillisecond     1000
+#define kMillisecondsPerSecond          1000
+#define kSecondsPerMinute               60
+#define kSecondsPerHour                 ( 60 * 60 )             // 3600
+#define kSecondsPerDay                  ( 60 * 60 * 24 )        // 86400
+#define kSecondsPerWeek                 ( 60 * 60 * 24 * 7 )    // 604800
+#define kMinutesPerHour                 60
+#define kMinutesPerDay                  ( 60 * 24 )             // 1440
+#define kHoursPerDay                    24
+#define kDaysPerWeek                    7
+#define kWeeksPerYear                   52
+#define kMonthsPerYear                  12
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	VersionStages
+
+    @abstract	NumVersion-style version stages.
+ */
+
+#define kVersionStageDevelopment        0x20
+#define kVersionStageAlpha              0x40
+#define kVersionStageBeta               0x60
+#define kVersionStageFinal              0x80
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	NumVersionBuild
+
+    @abstract	Builds a 32-bit Mac-style NumVersion value (e.g. NumVersionBuild( 1, 2, 3, kVersionStageBeta, 4 ) -> 1.2.3b4).
+ */
+
+#define NumVersionBuild( MAJOR, MINOR, BUGFIX, STAGE, REV ) \
+    ( ( ( ( MAJOR )  & 0xFF ) << 24 ) |                     \
+      ( ( ( MINOR )  & 0x0F ) << 20 ) |                     \
+      ( ( ( BUGFIX ) & 0x0F ) << 16 ) |                     \
+      ( ( ( STAGE )  & 0xFF ) <<  8 ) |                     \
+      ( ( ( REV )    & 0xFF )       ) )
+
+#define NumVersionExtractMajor( VERSION )               ( (uint8_t)( ( ( VERSION ) >> 24 ) & 0xFF ) )
+#define NumVersionExtractMinorAndBugFix( VERSION )      ( (uint8_t)( ( ( VERSION ) >> 16 ) & 0xFF ) )
+#define NumVersionExtractMinor( VERSION )               ( (uint8_t)( ( ( VERSION ) >> 20 ) & 0x0F ) )
+#define NumVersionExtractBugFix( VERSION )              ( (uint8_t)( ( ( VERSION ) >> 16 ) & 0x0F ) )
+#define NumVersionExtractStage( VERSION )               ( (uint8_t)( ( ( VERSION ) >>  8 ) & 0xFF ) )
+#define NumVersionExtractRevision( VERSION )            ( (uint8_t)(   ( VERSION )         & 0xFF ) )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	NumVersionCompare
+
+    @abstract	Compares two NumVersion values and returns the following values:
+
+        left < right -> -1
+        left > right ->  1
+        left = right ->  0
+ */
+
+#if ( TARGET_LANGUAGE_C_LIKE )
+int NumVersionCompare( uint32_t inLeft, uint32_t inRight );
+#endif
+
+#if 0
+#pragma mark == Binary Constants ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	binary_4
+
+    @abstract	Macro to generate an 4-bit constant using binary notation (e.g. binary_4( 1010 ) == 0xA).
+ */
+
+#define binary_4( a )                       binary_4_hex_wrap( hex_digit4( a ) )
+#define binary_4_hex_wrap( a )              binary_4_hex( a )
+#define binary_4_hex( a )                   ( 0x ## a )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	binary_8
+
+    @abstract	Macro to generate an 8-bit constant using binary notation (e.g. binary_8( 01111011 ) == 0x7B).
+ */
+
+#define binary_8( a )                       binary_8_hex_wrap( hex_digit8( a ) )
+#define binary_8_hex_wrap( a )              binary_8_hex( a )
+#define binary_8_hex( a )                   ( 0x ## a )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	binary_16
+
+    @abstract	Macro to generate an 16-bit constant using binary notation (e.g. binary_16( 01111011, 01111011 ) == 0x7B7B).
+ */
+
+#define binary_16( a, b )                   binary_16_hex_wrap( hex_digit8( a ), hex_digit8( b ) )
+#define binary_16_hex_wrap( a, b )          binary_16_hex( a, b )
+#define binary_16_hex( a, b )               ( 0x ## a ## b )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	binary_32
+
+    @abstract	Macro to generate an 32-bit constant using binary notation
+                (e.g. binary_32( 01111011, 01111011, 01111011, 01111011 ) == 0x7B7B7B7B).
+ */
+
+#define binary_32( a, b, c, d )             binary_32_hex_wrap( hex_digit8( a ), hex_digit8( b ), hex_digit8( c ), hex_digit8( d ) )
+#define binary_32_hex_wrap( a, b, c, d )    binary_32_hex( a, b, c, d )
+#define binary_32_hex( a, b, c, d )         ( 0x ## a ## b ## c ## d )
+
+// Binary Constant Helpers
+
+#define hex_digit8( a )                     HEX_DIGIT_ ## a
+#define hex_digit4( a )                     HEX_DIGIT_ ## 0000 ## a
+
+#define HEX_DIGIT_00000000                  00
+#define HEX_DIGIT_00000001                  01
+#define HEX_DIGIT_00000010                  02
+#define HEX_DIGIT_00000011                  03
+#define HEX_DIGIT_00000100                  04
+#define HEX_DIGIT_00000101                  05
+#define HEX_DIGIT_00000110                  06
+#define HEX_DIGIT_00000111                  07
+#define HEX_DIGIT_00001000                  08
+#define HEX_DIGIT_00001001                  09
+#define HEX_DIGIT_00001010                  0A
+#define HEX_DIGIT_00001011                  0B
+#define HEX_DIGIT_00001100                  0C
+#define HEX_DIGIT_00001101                  0D
+#define HEX_DIGIT_00001110                  0E
+#define HEX_DIGIT_00001111                  0F
+#define HEX_DIGIT_00010000                  10
+#define HEX_DIGIT_00010001                  11
+#define HEX_DIGIT_00010010                  12
+#define HEX_DIGIT_00010011                  13
+#define HEX_DIGIT_00010100                  14
+#define HEX_DIGIT_00010101                  15
+#define HEX_DIGIT_00010110                  16
+#define HEX_DIGIT_00010111                  17
+#define HEX_DIGIT_00011000                  18
+#define HEX_DIGIT_00011001                  19
+#define HEX_DIGIT_00011010                  1A
+#define HEX_DIGIT_00011011                  1B
+#define HEX_DIGIT_00011100                  1C
+#define HEX_DIGIT_00011101                  1D
+#define HEX_DIGIT_00011110                  1E
+#define HEX_DIGIT_00011111                  1F
+#define HEX_DIGIT_00100000                  20
+#define HEX_DIGIT_00100001                  21
+#define HEX_DIGIT_00100010                  22
+#define HEX_DIGIT_00100011                  23
+#define HEX_DIGIT_00100100                  24
+#define HEX_DIGIT_00100101                  25
+#define HEX_DIGIT_00100110                  26
+#define HEX_DIGIT_00100111                  27
+#define HEX_DIGIT_00101000                  28
+#define HEX_DIGIT_00101001                  29
+#define HEX_DIGIT_00101010                  2A
+#define HEX_DIGIT_00101011                  2B
+#define HEX_DIGIT_00101100                  2C
+#define HEX_DIGIT_00101101                  2D
+#define HEX_DIGIT_00101110                  2E
+#define HEX_DIGIT_00101111                  2F
+#define HEX_DIGIT_00110000                  30
+#define HEX_DIGIT_00110001                  31
+#define HEX_DIGIT_00110010                  32
+#define HEX_DIGIT_00110011                  33
+#define HEX_DIGIT_00110100                  34
+#define HEX_DIGIT_00110101                  35
+#define HEX_DIGIT_00110110                  36
+#define HEX_DIGIT_00110111                  37
+#define HEX_DIGIT_00111000                  38
+#define HEX_DIGIT_00111001                  39
+#define HEX_DIGIT_00111010                  3A
+#define HEX_DIGIT_00111011                  3B
+#define HEX_DIGIT_00111100                  3C
+#define HEX_DIGIT_00111101                  3D
+#define HEX_DIGIT_00111110                  3E
+#define HEX_DIGIT_00111111                  3F
+#define HEX_DIGIT_01000000                  40
+#define HEX_DIGIT_01000001                  41
+#define HEX_DIGIT_01000010                  42
+#define HEX_DIGIT_01000011                  43
+#define HEX_DIGIT_01000100                  44
+#define HEX_DIGIT_01000101                  45
+#define HEX_DIGIT_01000110                  46
+#define HEX_DIGIT_01000111                  47
+#define HEX_DIGIT_01001000                  48
+#define HEX_DIGIT_01001001                  49
+#define HEX_DIGIT_01001010                  4A
+#define HEX_DIGIT_01001011                  4B
+#define HEX_DIGIT_01001100                  4C
+#define HEX_DIGIT_01001101                  4D
+#define HEX_DIGIT_01001110                  4E
+#define HEX_DIGIT_01001111                  4F
+#define HEX_DIGIT_01010000                  50
+#define HEX_DIGIT_01010001                  51
+#define HEX_DIGIT_01010010                  52
+#define HEX_DIGIT_01010011                  53
+#define HEX_DIGIT_01010100                  54
+#define HEX_DIGIT_01010101                  55
+#define HEX_DIGIT_01010110                  56
+#define HEX_DIGIT_01010111                  57
+#define HEX_DIGIT_01011000                  58
+#define HEX_DIGIT_01011001                  59
+#define HEX_DIGIT_01011010                  5A
+#define HEX_DIGIT_01011011                  5B
+#define HEX_DIGIT_01011100                  5C
+#define HEX_DIGIT_01011101                  5D
+#define HEX_DIGIT_01011110                  5E
+#define HEX_DIGIT_01011111                  5F
+#define HEX_DIGIT_01100000                  60
+#define HEX_DIGIT_01100001                  61
+#define HEX_DIGIT_01100010                  62
+#define HEX_DIGIT_01100011                  63
+#define HEX_DIGIT_01100100                  64
+#define HEX_DIGIT_01100101                  65
+#define HEX_DIGIT_01100110                  66
+#define HEX_DIGIT_01100111                  67
+#define HEX_DIGIT_01101000                  68
+#define HEX_DIGIT_01101001                  69
+#define HEX_DIGIT_01101010                  6A
+#define HEX_DIGIT_01101011                  6B
+#define HEX_DIGIT_01101100                  6C
+#define HEX_DIGIT_01101101                  6D
+#define HEX_DIGIT_01101110                  6E
+#define HEX_DIGIT_01101111                  6F
+#define HEX_DIGIT_01110000                  70
+#define HEX_DIGIT_01110001                  71
+#define HEX_DIGIT_01110010                  72
+#define HEX_DIGIT_01110011                  73
+#define HEX_DIGIT_01110100                  74
+#define HEX_DIGIT_01110101                  75
+#define HEX_DIGIT_01110110                  76
+#define HEX_DIGIT_01110111                  77
+#define HEX_DIGIT_01111000                  78
+#define HEX_DIGIT_01111001                  79
+#define HEX_DIGIT_01111010                  7A
+#define HEX_DIGIT_01111011                  7B
+#define HEX_DIGIT_01111100                  7C
+#define HEX_DIGIT_01111101                  7D
+#define HEX_DIGIT_01111110                  7E
+#define HEX_DIGIT_01111111                  7F
+#define HEX_DIGIT_10000000                  80
+#define HEX_DIGIT_10000001                  81
+#define HEX_DIGIT_10000010                  82
+#define HEX_DIGIT_10000011                  83
+#define HEX_DIGIT_10000100                  84
+#define HEX_DIGIT_10000101                  85
+#define HEX_DIGIT_10000110                  86
+#define HEX_DIGIT_10000111                  87
+#define HEX_DIGIT_10001000                  88
+#define HEX_DIGIT_10001001                  89
+#define HEX_DIGIT_10001010                  8A
+#define HEX_DIGIT_10001011                  8B
+#define HEX_DIGIT_10001100                  8C
+#define HEX_DIGIT_10001101                  8D
+#define HEX_DIGIT_10001110                  8E
+#define HEX_DIGIT_10001111                  8F
+#define HEX_DIGIT_10010000                  90
+#define HEX_DIGIT_10010001                  91
+#define HEX_DIGIT_10010010                  92
+#define HEX_DIGIT_10010011                  93
+#define HEX_DIGIT_10010100                  94
+#define HEX_DIGIT_10010101                  95
+#define HEX_DIGIT_10010110                  96
+#define HEX_DIGIT_10010111                  97
+#define HEX_DIGIT_10011000                  98
+#define HEX_DIGIT_10011001                  99
+#define HEX_DIGIT_10011010                  9A
+#define HEX_DIGIT_10011011                  9B
+#define HEX_DIGIT_10011100                  9C
+#define HEX_DIGIT_10011101                  9D
+#define HEX_DIGIT_10011110                  9E
+#define HEX_DIGIT_10011111                  9F
+#define HEX_DIGIT_10100000                  A0
+#define HEX_DIGIT_10100001                  A1
+#define HEX_DIGIT_10100010                  A2
+#define HEX_DIGIT_10100011                  A3
+#define HEX_DIGIT_10100100                  A4
+#define HEX_DIGIT_10100101                  A5
+#define HEX_DIGIT_10100110                  A6
+#define HEX_DIGIT_10100111                  A7
+#define HEX_DIGIT_10101000                  A8
+#define HEX_DIGIT_10101001                  A9
+#define HEX_DIGIT_10101010                  AA
+#define HEX_DIGIT_10101011                  AB
+#define HEX_DIGIT_10101100                  AC
+#define HEX_DIGIT_10101101                  AD
+#define HEX_DIGIT_10101110                  AE
+#define HEX_DIGIT_10101111                  AF
+#define HEX_DIGIT_10110000                  B0
+#define HEX_DIGIT_10110001                  B1
+#define HEX_DIGIT_10110010                  B2
+#define HEX_DIGIT_10110011                  B3
+#define HEX_DIGIT_10110100                  B4
+#define HEX_DIGIT_10110101                  B5
+#define HEX_DIGIT_10110110                  B6
+#define HEX_DIGIT_10110111                  B7
+#define HEX_DIGIT_10111000                  B8
+#define HEX_DIGIT_10111001                  B9
+#define HEX_DIGIT_10111010                  BA
+#define HEX_DIGIT_10111011                  BB
+#define HEX_DIGIT_10111100                  BC
+#define HEX_DIGIT_10111101                  BD
+#define HEX_DIGIT_10111110                  BE
+#define HEX_DIGIT_10111111                  BF
+#define HEX_DIGIT_11000000                  C0
+#define HEX_DIGIT_11000001                  C1
+#define HEX_DIGIT_11000010                  C2
+#define HEX_DIGIT_11000011                  C3
+#define HEX_DIGIT_11000100                  C4
+#define HEX_DIGIT_11000101                  C5
+#define HEX_DIGIT_11000110                  C6
+#define HEX_DIGIT_11000111                  C7
+#define HEX_DIGIT_11001000                  C8
+#define HEX_DIGIT_11001001                  C9
+#define HEX_DIGIT_11001010                  CA
+#define HEX_DIGIT_11001011                  CB
+#define HEX_DIGIT_11001100                  CC
+#define HEX_DIGIT_11001101                  CD
+#define HEX_DIGIT_11001110                  CE
+#define HEX_DIGIT_11001111                  CF
+#define HEX_DIGIT_11010000                  D0
+#define HEX_DIGIT_11010001                  D1
+#define HEX_DIGIT_11010010                  D2
+#define HEX_DIGIT_11010011                  D3
+#define HEX_DIGIT_11010100                  D4
+#define HEX_DIGIT_11010101                  D5
+#define HEX_DIGIT_11010110                  D6
+#define HEX_DIGIT_11010111                  D7
+#define HEX_DIGIT_11011000                  D8
+#define HEX_DIGIT_11011001                  D9
+#define HEX_DIGIT_11011010                  DA
+#define HEX_DIGIT_11011011                  DB
+#define HEX_DIGIT_11011100                  DC
+#define HEX_DIGIT_11011101                  DD
+#define HEX_DIGIT_11011110                  DE
+#define HEX_DIGIT_11011111                  DF
+#define HEX_DIGIT_11100000                  E0
+#define HEX_DIGIT_11100001                  E1
+#define HEX_DIGIT_11100010                  E2
+#define HEX_DIGIT_11100011                  E3
+#define HEX_DIGIT_11100100                  E4
+#define HEX_DIGIT_11100101                  E5
+#define HEX_DIGIT_11100110                  E6
+#define HEX_DIGIT_11100111                  E7
+#define HEX_DIGIT_11101000                  E8
+#define HEX_DIGIT_11101001                  E9
+#define HEX_DIGIT_11101010                  EA
+#define HEX_DIGIT_11101011                  EB
+#define HEX_DIGIT_11101100                  EC
+#define HEX_DIGIT_11101101                  ED
+#define HEX_DIGIT_11101110                  EE
+#define HEX_DIGIT_11101111                  EF
+#define HEX_DIGIT_11110000                  F0
+#define HEX_DIGIT_11110001                  F1
+#define HEX_DIGIT_11110010                  F2
+#define HEX_DIGIT_11110011                  F3
+#define HEX_DIGIT_11110100                  F4
+#define HEX_DIGIT_11110101                  F5
+#define HEX_DIGIT_11110110                  F6
+#define HEX_DIGIT_11110111                  F7
+#define HEX_DIGIT_11111000                  F8
+#define HEX_DIGIT_11111001                  F9
+#define HEX_DIGIT_11111010                  FA
+#define HEX_DIGIT_11111011                  FB
+#define HEX_DIGIT_11111100                  FC
+#define HEX_DIGIT_11111101                  FD
+#define HEX_DIGIT_11111110                  FE
+#define HEX_DIGIT_11111111                  FF
+
+#if 0
+#pragma mark == Debugging ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	CommonServicesTest
+
+    @abstract	Unit test.
+ */
+
+#if ( DEBUG )
+    #if ( TARGET_LANGUAGE_C_LIKE )
+OSStatus    CommonServicesTest( void );
+    #endif
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // __COMMON_SERVICES__
diff --git a/mDNSResponder/mDNSShared/DebugServices.c b/mDNSResponder/mDNSShared/DebugServices.c
new file mode 100644
index 00000000..98f876a4
--- /dev/null
+++ b/mDNSResponder/mDNSShared/DebugServices.c
@@ -0,0 +1,3075 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    To Do:
+
+    - Use StackWalk on Windows to optionally print stack frames.
+ */
+
+#if 0
+#pragma mark == Includes ==
+#endif
+
+//===========================================================================================================================
+//	Includes
+//===========================================================================================================================
+
+#if ( !KERNEL )
+    #include    <ctype.h>
+    #include    <stdio.h>
+    #include    <string.h>
+#endif
+
+#include    "CommonServices.h"
+
+#include    "DebugServices.h"
+
+#if ( DEBUG )
+
+#if ( TARGET_OS_VXWORKS )
+    #include    "intLib.h"
+#endif
+
+#if ( TARGET_OS_WIN32 )
+    #include    <time.h>
+
+    #if ( !TARGET_OS_WINDOWS_CE )
+        #include    <fcntl.h>
+        #include    <io.h>
+    #endif
+#endif
+
+#if ( DEBUG_IDEBUG_ENABLED && TARGET_API_MAC_OSX_KERNEL )
+    #include    <IOKit/IOLib.h>
+#endif
+
+// If MDNS_DEBUGMSGS is defined (even if defined 0), it is aware of mDNS and it is probably safe to include mDNSEmbeddedAPI.h.
+
+#if ( defined( MDNS_DEBUGMSGS ) )
+    #include    "mDNSEmbeddedAPI.h"
+#endif
+
+#if 0
+#pragma mark == Macros ==
+#endif
+
+//===========================================================================================================================
+//	Macros
+//===========================================================================================================================
+
+#define DebugIsPrint( C )       ( ( ( C ) >= 0x20 ) && ( ( C ) <= 0x7E ) )
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize );
+
+// fprintf
+
+#if ( DEBUG_FPRINTF_ENABLED )
+static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename );
+static void     DebugFPrintFPrint( char *inData, size_t inSize );
+#endif
+
+// iDebug (Mac OS X user and kernel)
+
+#if ( DEBUG_IDEBUG_ENABLED )
+static OSStatus DebugiDebugInit( void );
+static void     DebugiDebugPrint( char *inData, size_t inSize );
+#endif
+
+// kprintf (Mac OS X Kernel)
+
+#if ( DEBUG_KPRINTF_ENABLED )
+static void DebugKPrintFPrint( char *inData, size_t inSize );
+#endif
+
+// Mac OS X IOLog (Mac OS X Kernel)
+
+#if ( DEBUG_MAC_OS_X_IOLOG_ENABLED )
+static void DebugMacOSXIOLogPrint( char *inData, size_t inSize );
+#endif
+
+// Mac OS X Log
+
+#if ( TARGET_OS_MAC )
+static OSStatus DebugMacOSXLogInit( void );
+static void     DebugMacOSXLogPrint( char *inData, size_t inSize );
+#endif
+
+// Windows Debugger
+
+#if ( TARGET_OS_WIN32 )
+static void DebugWindowsDebuggerPrint( char *inData, size_t inSize );
+#endif
+
+// Windows Event Log
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule );
+static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize );
+#endif
+
+// DebugLib support
+
+#if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED )
+static pascal void
+DebugAssertOutputHandler(
+    OSType inComponentSignature,
+    UInt32 inOptions,
+    const char *        inAssertionString,
+    const char *        inExceptionString,
+    const char *        inErrorString,
+    const char *        inFileName,
+    long inLineNumber,
+    void *              inValue,
+    ConstStr255Param inOutputMsg );
+#endif
+
+// Utilities
+
+static char *   DebugNumVersionToString( uint32_t inVersion, char *inString );
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+static void DebugWinEnableConsole( void );
+#endif
+
+#if ( TARGET_OS_WIN32 )
+static TCHAR *
+DebugWinCharToTCharString(
+    const char *    inCharString,
+    size_t inCharCount,
+    TCHAR *         outTCharString,
+    size_t inTCharCountMax,
+    size_t *        outTCharCount );
+#endif
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Private Globals
+//===========================================================================================================================
+
+#if ( TARGET_OS_VXWORKS )
+// TCP States for inetstatShow.
+
+extern char **  pTcpstates;         // defined in tcpLib.c
+
+const char *        kDebugTCPStates[] =
+{
+    "(0)  TCPS_CLOSED",
+    "(1)  TCPS_LISTEN",
+    "(2)  TCPS_SYN_SENT",
+    "(3)  TCPS_SYN_RECEIVED",
+    "(4)  TCPS_ESTABLISHED",
+    "(5)  TCPS_CLOSE_WAIT",
+    "(6)  TCPS_FIN_WAIT_1",
+    "(7)  TCPS_CLOSING",
+    "(8)  TCPS_LAST_ACK",
+    "(9)  TCPS_FIN_WAIT_2",
+    "(10) TCPS_TIME_WAIT",
+};
+#endif
+
+// General
+
+static bool gDebugInitialized               = false;
+static DebugOutputType gDebugOutputType                = kDebugOutputTypeNone;
+static DebugLevel gDebugPrintLevelMin             = kDebugLevelInfo;
+static DebugLevel gDebugPrintLevelMax             = kDebugLevelMax;
+static DebugLevel gDebugBreakLevel                = kDebugLevelAssert;
+#if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED )
+static DebugAssertOutputHandlerUPP gDebugAssertOutputHandlerUPP    = NULL;
+#endif
+
+// Custom
+
+static DebugOutputFunctionPtr gDebugCustomOutputFunction      = NULL;
+static void *                               gDebugCustomOutputContext       = NULL;
+
+// fprintf
+
+#if ( DEBUG_FPRINTF_ENABLED )
+static FILE *                           gDebugFPrintFFile               = NULL;
+#endif
+
+// MacOSXLog
+
+#if ( TARGET_OS_MAC )
+typedef int ( *DebugMacOSXLogFunctionPtr )( const char *inFormat, ... );
+
+static DebugMacOSXLogFunctionPtr gDebugMacOSXLogFunction         = NULL;
+#endif
+
+// WindowsEventLog
+
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+static HANDLE gDebugWindowsEventLogEventSource = NULL;
+#endif
+
+#if 0
+#pragma mark -
+#pragma mark == General ==
+#endif
+
+//===========================================================================================================================
+//	DebugInitialize
+//===========================================================================================================================
+
+DEBUG_EXPORT OSStatus   DebugInitialize( DebugOutputType inType, ... )
+{
+    OSStatus err;
+    DebugOutputType type;
+    va_list args;
+
+    va_start( args, inType );
+
+#if ( TARGET_OS_VXWORKS )
+    // Set up the TCP state strings if they are not already set up by VxWorks (normally not set up for some reason).
+
+    if( !pTcpstates )
+    {
+        pTcpstates = (char **) kDebugTCPStates;
+    }
+#endif
+
+    // Set up DebugLib stuff (if building with Debugging.h).
+
+#if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED )
+    if( !gDebugAssertOutputHandlerUPP )
+    {
+        gDebugAssertOutputHandlerUPP = NewDebugAssertOutputHandlerUPP( DebugAssertOutputHandler );
+        check( gDebugAssertOutputHandlerUPP );
+        if( gDebugAssertOutputHandlerUPP )
+        {
+            InstallDebugAssertOutputHandler( gDebugAssertOutputHandlerUPP );
+        }
+    }
+#endif
+
+    // Pre-process meta-output kind to pick an appropriate output kind for the platform.
+
+    type = inType;
+    if( type == kDebugOutputTypeMetaConsole )
+    {
+        #if ( TARGET_OS_MAC )
+        type = kDebugOutputTypeMacOSXLog;
+        #elif ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+            #if ( DEBUG_FPRINTF_ENABLED )
+        type = kDebugOutputTypeFPrintF;
+            #else
+        type = kDebugOutputTypeWindowsDebugger;
+            #endif
+        #elif ( TARGET_API_MAC_OSX_KERNEL )
+            #if ( DEBUG_MAC_OS_X_IOLOG_ENABLED )
+        type = kDebugOutputTypeMacOSXIOLog;
+            #elif ( DEBUG_IDEBUG_ENABLED )
+        type = kDebugOutputTypeiDebug;
+            #elif ( DEBUG_KPRINTF_ENABLED )
+        type = kDebugOutputTypeKPrintF;
+            #endif
+        #elif ( TARGET_OS_VXWORKS )
+            #if ( DEBUG_FPRINTF_ENABLED )
+        type = kDebugOutputTypeFPrintF;
+            #else
+                #error target is VxWorks, but fprintf output is disabled
+            #endif
+        #else
+            #if ( DEBUG_FPRINTF_ENABLED )
+        type = kDebugOutputTypeFPrintF;
+            #endif
+        #endif
+    }
+
+    // Process output kind.
+
+    gDebugOutputType = type;
+    switch( type )
+    {
+    case kDebugOutputTypeNone:
+        err = kNoErr;
+        break;
+
+    case kDebugOutputTypeCustom:
+        gDebugCustomOutputFunction = va_arg( args, DebugOutputFunctionPtr );
+        gDebugCustomOutputContext  = va_arg( args, void * );
+        err = kNoErr;
+        break;
+
+#if ( DEBUG_FPRINTF_ENABLED )
+    case kDebugOutputTypeFPrintF:
+        if( inType == kDebugOutputTypeMetaConsole )
+        {
+            err = DebugFPrintFInit( kDebugOutputTypeFlagsStdErr, NULL );
+        }
+        else
+        {
+            DebugOutputTypeFlags flags;
+            const char *                filename;
+
+            flags = (DebugOutputTypeFlags) va_arg( args, unsigned int );
+            if( ( flags & kDebugOutputTypeFlagsTypeMask ) == kDebugOutputTypeFlagsFile )
+            {
+                filename = va_arg( args, const char * );
+            }
+            else
+            {
+                filename = NULL;
+            }
+            err = DebugFPrintFInit( flags, filename );
+        }
+        break;
+#endif
+
+#if ( DEBUG_IDEBUG_ENABLED )
+    case kDebugOutputTypeiDebug:
+        err = DebugiDebugInit();
+        break;
+#endif
+
+#if ( DEBUG_KPRINTF_ENABLED )
+    case kDebugOutputTypeKPrintF:
+        err = kNoErr;
+        break;
+#endif
+
+#if ( DEBUG_MAC_OS_X_IOLOG_ENABLED )
+    case kDebugOutputTypeMacOSXIOLog:
+        err = kNoErr;
+        break;
+#endif
+
+#if ( TARGET_OS_MAC )
+    case kDebugOutputTypeMacOSXLog:
+        err = DebugMacOSXLogInit();
+        break;
+#endif
+
+#if ( TARGET_OS_WIN32 )
+    case kDebugOutputTypeWindowsDebugger:
+        err = kNoErr;
+        break;
+#endif
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+    case kDebugOutputTypeWindowsEventLog:
+    {
+        const char *        name;
+        HMODULE module;
+
+        name   = va_arg( args, const char * );
+        module = va_arg( args, HMODULE );
+        err = DebugWindowsEventLogInit( name, module );
+    }
+    break;
+#endif
+
+    default:
+        err = kParamErr;
+        goto exit;
+    }
+    gDebugInitialized = true;
+
+exit:
+    va_end( args );
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugFinalize
+//===========================================================================================================================
+
+DEBUG_EXPORT void       DebugFinalize( void )
+{
+#if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED )
+    check( gDebugAssertOutputHandlerUPP );
+    if( gDebugAssertOutputHandlerUPP )
+    {
+        InstallDebugAssertOutputHandler( NULL );
+        DisposeDebugAssertOutputHandlerUPP( gDebugAssertOutputHandlerUPP );
+        gDebugAssertOutputHandlerUPP = NULL;
+    }
+#endif
+}
+
+//===========================================================================================================================
+//	DebugGetProperty
+//===========================================================================================================================
+
+DEBUG_EXPORT OSStatus   DebugGetProperty( DebugPropertyTag inTag, ... )
+{
+    OSStatus err;
+    va_list args;
+    DebugLevel *        level;
+
+    va_start( args, inTag );
+    switch( inTag )
+    {
+    case kDebugPropertyTagPrintLevelMin:
+        level  = va_arg( args, DebugLevel * );
+        *level = gDebugPrintLevelMin;
+        err = kNoErr;
+        break;
+
+    case kDebugPropertyTagPrintLevelMax:
+        level  = va_arg( args, DebugLevel * );
+        *level = gDebugPrintLevelMax;
+        err = kNoErr;
+        break;
+
+    case kDebugPropertyTagBreakLevel:
+        level  = va_arg( args, DebugLevel * );
+        *level = gDebugBreakLevel;
+        err = kNoErr;
+        break;
+
+    default:
+        err = kUnsupportedErr;
+        break;
+    }
+    va_end( args );
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugSetProperty
+//===========================================================================================================================
+
+DEBUG_EXPORT OSStatus   DebugSetProperty( DebugPropertyTag inTag, ... )
+{
+    OSStatus err;
+    va_list args;
+    DebugLevel level;
+
+    va_start( args, inTag );
+    switch( inTag )
+    {
+    case kDebugPropertyTagPrintLevelMin:
+        level  = va_arg( args, DebugLevel );
+        gDebugPrintLevelMin = level;
+        err = kNoErr;
+        break;
+
+    case kDebugPropertyTagPrintLevelMax:
+        level  = va_arg( args, DebugLevel );
+        gDebugPrintLevelMax = level;
+        err = kNoErr;
+        break;
+
+    case kDebugPropertyTagBreakLevel:
+        level  = va_arg( args, DebugLevel );
+        gDebugBreakLevel = level;
+        err = kNoErr;
+        break;
+
+    default:
+        err = kUnsupportedErr;
+        break;
+    }
+    va_end( args );
+    return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Output ==
+#endif
+
+//===========================================================================================================================
+//	DebugPrintF
+//===========================================================================================================================
+
+DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... )
+{
+    va_list args;
+    size_t n;
+
+    // Skip if the level is not in the enabled range..
+
+    if( ( inLevel < gDebugPrintLevelMin ) || ( inLevel > gDebugPrintLevelMax ) )
+    {
+        n = 0;
+        goto exit;
+    }
+
+    va_start( args, inFormat );
+    n = DebugPrintFVAList( inLevel, inFormat, args );
+    va_end( args );
+
+exit:
+    return( n );
+}
+
+//===========================================================================================================================
+//	DebugPrintFVAList
+//===========================================================================================================================
+
+DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs )
+{
+    size_t n;
+    char buffer[ 512 ];
+
+    // Skip if the level is not in the enabled range..
+
+    if( ( inLevel < gDebugPrintLevelMin ) || ( inLevel > gDebugPrintLevelMax ) )
+    {
+        n = 0;
+        goto exit;
+    }
+
+    n = DebugSNPrintFVAList( buffer, sizeof( buffer ), inFormat, inArgs );
+    DebugPrint( inLevel, buffer, (size_t) n );
+
+exit:
+    return( n );
+}
+
+//===========================================================================================================================
+//	DebugPrint
+//===========================================================================================================================
+
+static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize )
+{
+    OSStatus err;
+
+    // Skip if the level is not in the enabled range..
+
+    if( ( inLevel < gDebugPrintLevelMin ) || ( inLevel > gDebugPrintLevelMax ) )
+    {
+        err = kRangeErr;
+        goto exit;
+    }
+
+    // Printing is not safe at interrupt time so check for this and warn with an interrupt safe mechanism (if available).
+
+    if( DebugTaskLevel() & kDebugInterruptLevelMask )
+    {
+        #if ( TARGET_OS_VXWORKS )
+        logMsg( "\ncannot print at interrupt time\n\n", 1, 2, 3, 4, 5, 6 );
+        #endif
+
+        err = kExecutionStateErr;
+        goto exit;
+    }
+
+    // Initialize the debugging library if it hasn't already been initialized (allows for zero-config usage).
+
+    if( !gDebugInitialized )
+    {
+        debug_initialize( kDebugOutputTypeMetaConsole );
+    }
+
+    // Print based on the current output type.
+
+    switch( gDebugOutputType )
+    {
+    case kDebugOutputTypeNone:
+        break;
+
+    case kDebugOutputTypeCustom:
+        if( gDebugCustomOutputFunction )
+        {
+            gDebugCustomOutputFunction( inData, inSize, gDebugCustomOutputContext );
+        }
+        break;
+
+#if ( DEBUG_FPRINTF_ENABLED )
+    case kDebugOutputTypeFPrintF:
+        DebugFPrintFPrint( inData, inSize );
+        break;
+#endif
+
+#if ( DEBUG_IDEBUG_ENABLED )
+    case kDebugOutputTypeiDebug:
+        DebugiDebugPrint( inData, inSize );
+        break;
+#endif
+
+#if ( DEBUG_KPRINTF_ENABLED )
+    case kDebugOutputTypeKPrintF:
+        DebugKPrintFPrint( inData, inSize );
+        break;
+#endif
+
+#if ( DEBUG_MAC_OS_X_IOLOG_ENABLED )
+    case kDebugOutputTypeMacOSXIOLog:
+        DebugMacOSXIOLogPrint( inData, inSize );
+        break;
+#endif
+
+#if ( TARGET_OS_MAC )
+    case kDebugOutputTypeMacOSXLog:
+        DebugMacOSXLogPrint( inData, inSize );
+        break;
+#endif
+
+#if ( TARGET_OS_WIN32 )
+    case kDebugOutputTypeWindowsDebugger:
+        DebugWindowsDebuggerPrint( inData, inSize );
+        break;
+#endif
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+    case kDebugOutputTypeWindowsEventLog:
+        DebugWindowsEventLogPrint( inLevel, inData, inSize );
+        break;
+#endif
+
+    default:
+        break;
+    }
+    err = kNoErr;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugPrintAssert
+//
+//	Warning: This routine relies on several of the strings being string constants that will exist forever because the
+//           underlying logMsg API that does the printing is asynchronous so it cannot use temporary/stack-based
+//           pointer variables (e.g. local strings). The debug macros that invoke this function only use constant
+//           constant strings, but if this function is invoked directly from other places, it must use constant strings.
+//===========================================================================================================================
+
+DEBUG_EXPORT void
+DebugPrintAssert(
+    int_least32_t inErrorCode,
+    const char *    inAssertString,
+    const char *    inMessage,
+    const char *    inFilename,
+    int_least32_t inLineNumber,
+    const char *    inFunction )
+{
+    // Skip if the level is not in the enabled range..
+
+    if( ( kDebugLevelAssert < gDebugPrintLevelMin ) || ( kDebugLevelAssert > gDebugPrintLevelMax ) )
+    {
+        return;
+    }
+
+    if( inErrorCode != 0 )
+    {
+        DebugPrintF(
+            kDebugLevelAssert,
+            "\n"
+            "[ASSERT] error:  %ld (%m)\n"
+            "[ASSERT] where:  \"%s\", line %ld, \"%s\"\n"
+            "\n",
+            inErrorCode, inErrorCode,
+            inFilename ? inFilename : "",
+            inLineNumber,
+            inFunction ? inFunction : "" );
+    }
+    else
+    {
+        DebugPrintF(
+            kDebugLevelAssert,
+            "\n"
+            "[ASSERT] assert: \"%s\" %s\n"
+            "[ASSERT] where:  \"%s\", line %ld, \"%s\"\n"
+            "\n",
+            inAssertString ? inAssertString : "",
+            inMessage ? inMessage : "",
+            inFilename ? inFilename : "",
+            inLineNumber,
+            inFunction ? inFunction : "" );
+    }
+
+    // Break into the debugger if enabled.
+
+    #if ( TARGET_OS_WIN32 )
+    if( gDebugBreakLevel <= kDebugLevelAssert )
+    {
+        if( IsDebuggerPresent() )
+        {
+            DebugBreak();
+        }
+    }
+    #endif
+}
+
+#if 0
+#pragma mark -
+#endif
+
+#if ( DEBUG_FPRINTF_ENABLED )
+//===========================================================================================================================
+//	DebugFPrintFInit
+//===========================================================================================================================
+
+static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename )
+{
+    OSStatus err;
+    DebugOutputTypeFlags typeFlags;
+
+    typeFlags = inFlags & kDebugOutputTypeFlagsTypeMask;
+    if( typeFlags == kDebugOutputTypeFlagsStdOut )
+    {
+        #if ( TARGET_OS_WIN32 )
+        DebugWinEnableConsole();
+        #endif
+
+        gDebugFPrintFFile = stdout;
+    }
+    else if( typeFlags == kDebugOutputTypeFlagsStdErr )
+    {
+        #if ( TARGET_OS_WIN32 )
+        DebugWinEnableConsole();
+        #endif
+
+        gDebugFPrintFFile = stdout;
+    }
+    else if( typeFlags == kDebugOutputTypeFlagsFile )
+    {
+        require_action_quiet( inFilename && ( *inFilename != '\0' ), exit, err = kOpenErr );
+
+        gDebugFPrintFFile = fopen( inFilename, "a" );
+        require_action_quiet( gDebugFPrintFFile, exit, err = kOpenErr );
+    }
+    else
+    {
+        err = kParamErr;
+        goto exit;
+    }
+    err = kNoErr;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugFPrintFPrint
+//===========================================================================================================================
+
+static void DebugFPrintFPrint( char *inData, size_t inSize )
+{
+    char *      p;
+    char *      q;
+
+    // Convert \r to \n. fprintf will interpret \n and convert to whatever is appropriate for the platform.
+
+    p = inData;
+    q = p + inSize;
+    while( p < q )
+    {
+        if( *p == '\r' )
+        {
+            *p = '\n';
+        }
+        ++p;
+    }
+
+    // Write the data and flush.
+
+    if( gDebugFPrintFFile )
+    {
+        fprintf( gDebugFPrintFFile, "%.*s", (int) inSize, inData );
+        fflush( gDebugFPrintFFile );
+    }
+}
+#endif  // DEBUG_FPRINTF_ENABLED
+
+#if ( DEBUG_IDEBUG_ENABLED )
+//===========================================================================================================================
+//	DebugiDebugInit
+//===========================================================================================================================
+
+static OSStatus DebugiDebugInit( void )
+{
+    OSStatus err;
+
+    #if ( TARGET_API_MAC_OSX_KERNEL )
+
+    extern uint32_t *       _giDebugReserved1;
+
+    // Emulate the iDebugSetOutputType macro in iDebugServices.h.
+    // Note: This is not thread safe, but neither is iDebugServices.h nor iDebugKext.
+
+    if( !_giDebugReserved1 )
+    {
+        _giDebugReserved1 = (uint32_t *) IOMalloc( sizeof( uint32_t ) );
+        require_action_quiet( _giDebugReserved1, exit, err = kNoMemoryErr );
+    }
+    *_giDebugReserved1 = 0x00010000U;
+    err = kNoErr;
+exit:
+    #else
+
+    __private_extern__ void iDebugSetOutputTypeInternal( uint32_t inType );
+
+    iDebugSetOutputTypeInternal( 0x00010000U );
+    err = kNoErr;
+
+    #endif
+
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugiDebugPrint
+//===========================================================================================================================
+
+static void DebugiDebugPrint( char *inData, size_t inSize )
+{
+    #if ( TARGET_API_MAC_OSX_KERNEL )
+
+    // Locally declared here so we do not need to include iDebugKext.h.
+    // Note: IOKit uses a global namespace for all code and only a partial link occurs at build time. When the
+    // KEXT is loaded, the runtime linker will link in this extern'd symbol (assuming iDebug is present).
+    // _giDebugLogInternal is actually part of IOKit proper so this should link even if iDebug is not present.
+
+    typedef void ( *iDebugLogFunctionPtr )( uint32_t inLevel, uint32_t inTag, const char *inFormat, ... );
+
+    extern iDebugLogFunctionPtr _giDebugLogInternal;
+
+    if( _giDebugLogInternal )
+    {
+        _giDebugLogInternal( 0, 0, "%.*s", (int) inSize, inData );
+    }
+
+    #else
+
+    __private_extern__ void iDebugLogInternal( uint32_t inLevel, uint32_t inTag, const char *inFormat, ... );
+
+    iDebugLogInternal( 0, 0, "%.*s", (int) inSize, inData );
+
+    #endif
+}
+#endif
+
+#if ( DEBUG_KPRINTF_ENABLED )
+//===========================================================================================================================
+//	DebugKPrintFPrint
+//===========================================================================================================================
+
+static void DebugKPrintFPrint( char *inData, size_t inSize )
+{
+    extern void kprintf( const char *inFormat, ... );
+
+    kprintf( "%.*s", (int) inSize, inData );
+}
+#endif
+
+#if ( DEBUG_MAC_OS_X_IOLOG_ENABLED )
+//===========================================================================================================================
+//	DebugMacOSXIOLogPrint
+//===========================================================================================================================
+
+static void DebugMacOSXIOLogPrint( char *inData, size_t inSize )
+{
+    extern void IOLog( const char *inFormat, ... );
+
+    IOLog( "%.*s", (int) inSize, inData );
+}
+#endif
+
+#if ( TARGET_OS_MAC )
+//===========================================================================================================================
+//	DebugMacOSXLogInit
+//===========================================================================================================================
+
+static OSStatus DebugMacOSXLogInit( void )
+{
+    OSStatus err;
+    CFStringRef path;
+    CFURLRef url;
+    CFBundleRef bundle;
+    CFStringRef functionName;
+    void *          functionPtr;
+
+    bundle = NULL;
+
+    // Create a bundle reference for System.framework.
+
+    path = CFSTR( "/System/Library/Frameworks/System.framework" );
+    url = CFURLCreateWithFileSystemPath( NULL, path, kCFURLPOSIXPathStyle, true );
+    require_action_quiet( url, exit, err = memFullErr );
+
+    bundle = CFBundleCreate( NULL, url );
+    CFRelease( url );
+    require_action_quiet( bundle, exit, err = memFullErr );
+
+    // Get a ptr to the system's "printf" function from System.framework.
+
+    functionName = CFSTR( "printf" );
+    functionPtr = CFBundleGetFunctionPointerForName( bundle, functionName );
+    require_action_quiet( functionPtr, exit, err = memFullErr );
+
+    // Success! Note: The bundle cannot be released because it would invalidate the function ptr.
+
+    gDebugMacOSXLogFunction = (DebugMacOSXLogFunctionPtr) functionPtr;
+    bundle = NULL;
+    err = noErr;
+
+exit:
+    if( bundle )
+    {
+        CFRelease( bundle );
+    }
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugMacOSXLogPrint
+//===========================================================================================================================
+
+static void DebugMacOSXLogPrint( char *inData, size_t inSize )
+{
+    if( gDebugMacOSXLogFunction )
+    {
+        gDebugMacOSXLogFunction( "%.*s", (int) inSize, inData );
+    }
+}
+#endif
+
+#if ( TARGET_OS_WIN32 )
+//===========================================================================================================================
+//	DebugWindowsDebuggerPrint
+//===========================================================================================================================
+
+void    DebugWindowsDebuggerPrint( char *inData, size_t inSize )
+{
+    TCHAR buffer[ 512 ];
+    const char *        src;
+    const char *        end;
+    TCHAR *             dst;
+    char c;
+
+    // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are
+    // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process.
+
+    src = inData;
+    if( inSize >= sizeof_array( buffer ) )
+    {
+        inSize = sizeof_array( buffer ) - 1;
+    }
+    end = src + inSize;
+    dst = buffer;
+    while( src < end )
+    {
+        c = *src++;
+        if( c == '\r' )
+        {
+            c = '\n';
+        }
+        *dst++ = (TCHAR) c;
+    }
+    *dst = 0;
+
+    // Print out the string to the debugger.
+
+    OutputDebugString( buffer );
+}
+#endif
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+//===========================================================================================================================
+//	DebugWindowsEventLogInit
+//===========================================================================================================================
+
+static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule )
+{
+    OSStatus err;
+    HKEY key;
+    TCHAR name[ 128 ];
+    const char *        src;
+    TCHAR path[ MAX_PATH ];
+    size_t size;
+    DWORD typesSupported;
+    DWORD n;
+
+    key = NULL;
+
+    // Use a default name if needed then convert the name to TCHARs so it works on ANSI or Unicode builds.
+
+    if( !inName || ( *inName == '\0' ) )
+    {
+        inName = "DefaultApp";
+    }
+    DebugWinCharToTCharString( inName, kSizeCString, name, sizeof( name ), NULL );
+
+    // Build the path string using the fixed registry path and app name.
+
+    src = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\";
+    DebugWinCharToTCharString( src, kSizeCString, path, sizeof_array( path ), &size );
+    DebugWinCharToTCharString( inName, kSizeCString, path + size, sizeof_array( path ) - size, NULL );
+
+    // Add/Open the source name as a sub-key under the Application key in the EventLog registry key.
+
+    err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL );
+    require_noerr_quiet( err, exit );
+
+    // Set the path in the EventMessageFile subkey. Add 1 to the TCHAR count to include the null terminator.
+
+    n = GetModuleFileName( inModule, path, sizeof_array( path ) );
+    err = translate_errno( n > 0, (OSStatus) GetLastError(), kParamErr );
+    require_noerr_quiet( err, exit );
+    n += 1;
+    n *= sizeof( TCHAR );
+
+    err = RegSetValueEx( key, TEXT( "EventMessageFile" ), 0, REG_EXPAND_SZ, (const LPBYTE) path, n );
+    require_noerr_quiet( err, exit );
+
+    // Set the supported event types in the TypesSupported subkey.
+
+    typesSupported = EVENTLOG_SUCCESS | EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE |
+                     EVENTLOG_AUDIT_SUCCESS | EVENTLOG_AUDIT_FAILURE;
+    err = RegSetValueEx( key, TEXT( "TypesSupported" ), 0, REG_DWORD, (const LPBYTE) &typesSupported, sizeof( DWORD ) );
+    require_noerr_quiet( err, exit );
+
+    // Set up the event source.
+
+    gDebugWindowsEventLogEventSource = RegisterEventSource( NULL, name );
+    err = translate_errno( gDebugWindowsEventLogEventSource, (OSStatus) GetLastError(), kParamErr );
+    require_noerr_quiet( err, exit );
+
+exit:
+    if( key )
+    {
+        RegCloseKey( key );
+    }
+    return( err );
+}
+
+//===========================================================================================================================
+//	DebugWindowsEventLogPrint
+//===========================================================================================================================
+
+static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize )
+{
+    WORD type;
+    TCHAR buffer[ 512 ];
+    const char *        src;
+    const char *        end;
+    TCHAR *             dst;
+    char c;
+    const TCHAR *       array[ 1 ];
+
+    // Map the debug level to a Windows EventLog type.
+
+    if( inLevel <= kDebugLevelNotice )
+    {
+        type = EVENTLOG_INFORMATION_TYPE;
+    }
+    else if( inLevel <= kDebugLevelWarning )
+    {
+        type = EVENTLOG_WARNING_TYPE;
+    }
+    else
+    {
+        type = EVENTLOG_ERROR_TYPE;
+    }
+
+    // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are
+    // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process.
+
+    src = inData;
+    if( inSize >= sizeof_array( buffer ) )
+    {
+        inSize = sizeof_array( buffer ) - 1;
+    }
+    end = src + inSize;
+    dst = buffer;
+    while( src < end )
+    {
+        c = *src++;
+        if( c == '\r' )
+        {
+            c = '\n';
+        }
+        *dst++ = (TCHAR) c;
+    }
+    *dst = 0;
+
+    // Add the the string to the event log.
+
+    array[ 0 ] = buffer;
+    if( gDebugWindowsEventLogEventSource )
+    {
+        ReportEvent( gDebugWindowsEventLogEventSource, type, 0, 0x20000001L, NULL, 1, 0, array, NULL );
+    }
+}
+#endif  // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE
+
+#if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED )
+//===========================================================================================================================
+//	DebugAssertOutputHandler
+//===========================================================================================================================
+
+static pascal void
+DebugAssertOutputHandler(
+    OSType inComponentSignature,
+    UInt32 inOptions,
+    const char *        inAssertString,
+    const char *        inExceptionString,
+    const char *        inErrorString,
+    const char *        inFileName,
+    long inLineNumber,
+    void *              inValue,
+    ConstStr255Param inOutputMsg )
+{
+    DEBUG_UNUSED( inComponentSignature );
+    DEBUG_UNUSED( inOptions );
+    DEBUG_UNUSED( inExceptionString );
+    DEBUG_UNUSED( inValue );
+    DEBUG_UNUSED( inOutputMsg );
+
+    DebugPrintAssert( 0, inAssertString, inErrorString, inFileName, (int_least32_t) inLineNumber, "" );
+}
+#endif
+
+#if 0
+#pragma mark -
+#pragma mark == Utilities ==
+#endif
+
+//===========================================================================================================================
+//	DebugSNPrintF
+//
+//	Stolen from mDNS.c's mDNS_snprintf/mDNS_vsnprintf with the following changes:
+//
+//	Changed names to avoid name collisions with the mDNS versions.
+//	Changed types to standard C types since mDNSEmbeddedAPI.h may not be available.
+//	Conditionalized mDNS stuff so it can be used with or with mDNSEmbeddedAPI.h.
+//	Added 64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb).
+//	Added %@   - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription.
+//	Added %.8a - FIbre Channel address. Arg=ptr to address.
+//	Added %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr.
+//	Added %b   - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc.
+//	Added %C   - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode.
+//	Added %H   - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size.
+//	Added %#H  - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size.
+//	Added %m   - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code args are the same as %d, %x, etc.
+//	Added %S   - UTF-16 string. Host order if no BOM. Precision is UTF-16 char count. BOM counts in any precision. Arg=ptr.
+//	Added %#S  - Big Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S.
+//	Added %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S.
+//	Added %U   - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID.
+//===========================================================================================================================
+
+DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...)
+{
+    size_t length;
+
+    va_list ptr;
+    va_start(ptr,fmt);
+    length = DebugSNPrintFVAList(sbuffer, buflen, fmt, ptr);
+    va_end(ptr);
+
+    return(length);
+}
+
+//===========================================================================================================================
+//	DebugSNPrintFVAList	- va_list version of DebugSNPrintF. See DebugSNPrintF for more info.
+//===========================================================================================================================
+
+DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg)
+{
+    static const struct DebugSNPrintF_format
+    {
+        unsigned leftJustify : 1;
+        unsigned forceSign : 1;
+        unsigned zeroPad : 1;
+        unsigned havePrecision : 1;
+        unsigned hSize : 1;
+        char lSize;
+        char altForm;
+        char sign;              // +, - or space
+        unsigned int fieldWidth;
+        unsigned int precision;
+    } DebugSNPrintF_format_default = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+    size_t nwritten = 0;
+    int c;
+    if (buflen == 0) return(0);
+    buflen--;       // Pre-reserve one space in the buffer for the terminating nul
+    if (buflen == 0) goto exit;
+
+    for (c = *fmt; c != 0; c = *++fmt)
+    {
+        if (c != '%')
+        {
+            *sbuffer++ = (char)c;
+            if (++nwritten >= buflen) goto exit;
+        }
+        else
+        {
+            size_t i=0, j;
+            // The mDNS Vsprintf Argument Conversion Buffer is used as a temporary holding area for
+            // generating decimal numbers, hexdecimal numbers, IP addresses, domain name strings, etc.
+            // The size needs to be enough for a 256-byte domain name plus some error text.
+            #define mDNS_VACB_Size 300
+            char mDNS_VACB[mDNS_VACB_Size];
+            #define mDNS_VACB_Lim (&mDNS_VACB[mDNS_VACB_Size])
+            #define mDNS_VACB_Remain(s) ((size_t)(mDNS_VACB_Lim - s))
+            char *s = mDNS_VACB_Lim;
+            const char *digits = "0123456789ABCDEF";
+            struct DebugSNPrintF_format F = DebugSNPrintF_format_default;
+
+            for(;;) //  decode flags
+            {
+                c = *++fmt;
+                if      (c == '-') F.leftJustify = 1;
+                else if (c == '+') F.forceSign = 1;
+                else if (c == ' ') F.sign = ' ';
+                else if (c == '#') F.altForm++;
+                else if (c == '0') F.zeroPad = 1;
+                else break;
+            }
+
+            if (c == '*')   //  decode field width
+            {
+                int f = va_arg(arg, int);
+                if (f < 0) { f = -f; F.leftJustify = 1; }
+                F.fieldWidth = (unsigned int)f;
+                c = *++fmt;
+            }
+            else
+            {
+                for (; c >= '0' && c <= '9'; c = *++fmt)
+                    F.fieldWidth = (10 * F.fieldWidth) + (c - '0');
+            }
+
+            if (c == '.')   //  decode precision
+            {
+                if ((c = *++fmt) == '*')
+                { F.precision = va_arg(arg, unsigned int); c = *++fmt; }
+                else for (; c >= '0' && c <= '9'; c = *++fmt)
+                        F.precision = (10 * F.precision) + (c - '0');
+                F.havePrecision = 1;
+            }
+
+            if (F.leftJustify) F.zeroPad = 0;
+
+conv:
+            switch (c)  //  perform appropriate conversion
+            {
+                #if TYPE_LONGLONG_NATIVE
+                unsigned_long_long_compat n;
+                unsigned_long_long_compat base;
+                #else
+                unsigned long n;
+                unsigned long base;
+                #endif
+            case 'h':  F.hSize = 1; c = *++fmt; goto conv;
+            case 'l':       // fall through
+            case 'L':  F.lSize++; c = *++fmt; goto conv;
+            case 'd':
+            case 'i':  base = 10;
+                goto canBeSigned;
+            case 'u':  base = 10;
+                goto notSigned;
+            case 'o':  base = 8;
+                goto notSigned;
+            case 'b':  base = 2;
+                goto notSigned;
+            case 'p':  n = va_arg(arg, uintptr_t);
+                F.havePrecision = 1;
+                F.precision = (sizeof(uintptr_t) == 4) ? 8 : 16;
+                F.sign = 0;
+                base = 16;
+                c = 'x';
+                goto number;
+            case 'x':  digits = "0123456789abcdef";
+            case 'X':  base = 16;
+                goto notSigned;
+canBeSigned:
+                            #if TYPE_LONGLONG_NATIVE
+                if (F.lSize == 1) n = (unsigned_long_long_compat)va_arg(arg, long);
+                else if (F.lSize == 2) n = (unsigned_long_long_compat)va_arg(arg, long_long_compat);
+                else n = (unsigned_long_long_compat)va_arg(arg, int);
+                            #else
+                if (F.lSize == 1) n = (unsigned long)va_arg(arg, long);
+                else if (F.lSize == 2) goto exit;
+                else n = (unsigned long)va_arg(arg, int);
+                            #endif
+                if (F.hSize) n = (short) n;
+                            #if TYPE_LONGLONG_NATIVE
+                if ((long_long_compat) n < 0) { n = (unsigned_long_long_compat)-(long_long_compat)n; F.sign = '-'; }
+                            #else
+                if ((long) n < 0) { n = (unsigned long)-(long)n; F.sign = '-'; }
+                            #endif
+                else if (F.forceSign) F.sign = '+';
+                goto number;
+
+notSigned:  if (F.lSize == 1) n = va_arg(arg, unsigned long);
+                else if (F.lSize == 2)
+                {
+                                #if TYPE_LONGLONG_NATIVE
+                    n = va_arg(arg, unsigned_long_long_compat);
+                                #else
+                    goto exit;
+                                #endif
+                }
+                else n = va_arg(arg, unsigned int);
+                if (F.hSize) n = (unsigned short) n;
+                F.sign = 0;
+                goto number;
+
+number:     if (!F.havePrecision)
+                {
+                    if (F.zeroPad)
+                    {
+                        F.precision = F.fieldWidth;
+                        if (F.altForm) F.precision -= 2;
+                        if (F.sign) --F.precision;
+                    }
+                    if (F.precision < 1) F.precision = 1;
+                }
+                if (F.precision > mDNS_VACB_Size - 1)
+                    F.precision = mDNS_VACB_Size - 1;
+                for (i = 0; n; n /= base, i++) *--s = (char)(digits[n % base]);
+                for (; i < F.precision; i++) *--s = '0';
+                if (F.altForm) { *--s = (char)c; *--s = '0'; i += 2; }
+                if (F.sign) { *--s = F.sign; i++; }
+                break;
+
+            case 'a':  {
+                unsigned char *a = va_arg(arg, unsigned char *);
+                char pre[4] = "";
+                char post[32] = "";
+                if (!a) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                else
+                {
+                    s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                    if (F.altForm == 1)
+                    {
+                                    #if (defined(MDNS_DEBUGMSGS))
+                        mDNSAddr *ip = (mDNSAddr*)a;
+                        switch (ip->type)
+                        {
+                        case mDNSAddrType_IPv4: F.precision =  4; a = (unsigned char *)&ip->ip.v4; break;
+                        case mDNSAddrType_IPv6: F.precision = 16; a = (unsigned char *)&ip->ip.v6; break;
+                        default:                F.precision =  0; break;
+                        }
+                                    #else
+                        F.precision = 0;                    // mDNSEmbeddedAPI.h not included so no mDNSAddr support
+                                    #endif
+                    }
+                    else if (F.altForm == 2)
+                    {
+                                    #ifdef AF_INET
+                        const struct sockaddr *sa;
+                        unsigned char *port;
+                        sa = (const struct sockaddr*)a;
+                        switch (sa->sa_family)
+                        {
+                        case AF_INET:  F.precision =  4; a = (unsigned char*)&((const struct sockaddr_in *)a)->sin_addr;
+                            port = (unsigned char*)&((const struct sockaddr_in *)sa)->sin_port;
+                            DebugSNPrintF(post, sizeof(post), ":%d", (port[0] << 8) | port[1]); break;
+                                            #ifdef AF_INET6
+                        case AF_INET6: F.precision = 16; a = (unsigned char*)&((const struct sockaddr_in6 *)a)->sin6_addr;
+                            pre[0] = '['; pre[1] = '\0';
+                            port = (unsigned char*)&((const struct sockaddr_in6 *)sa)->sin6_port;
+                            DebugSNPrintF(post, sizeof(post), "%%%d]:%d",
+                                          (int)((const struct sockaddr_in6 *)sa)->sin6_scope_id,
+                                          (port[0] << 8) | port[1]); break;
+                                            #endif
+                        default:       F.precision =  0; break;
+                        }
+                                    #else
+                        F.precision = 0;                    // socket interfaces not included so no sockaddr support
+                                    #endif
+                    }
+                    switch (F.precision)
+                    {
+                    case  4: i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%d.%d.%d.%d%s",
+                                               a[0], a[1], a[2], a[3], post); break;
+                    case  6: i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%02X:%02X:%02X:%02X:%02X:%02X",
+                                               a[0], a[1], a[2], a[3], a[4], a[5]); break;
+                    case  8: i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
+                                               a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7]); break;
+                    case 16: i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB),
+                                               "%s%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X%s",
+                                               pre, a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8],
+                                               a[9], a[10], a[11], a[12], a[13], a[14], a[15], post); break;
+                    default: i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%s", "<< ERROR: Must specify address size "
+                                               "(i.e. %.4a=IPv4, %.6a=Ethernet, %.8a=Fibre Channel %.16a=IPv6) >>"); break;
+                    }
+                }
+            }
+            break;
+
+            case 'U':  {
+                unsigned char *a = va_arg(arg, unsigned char *);
+                if (!a) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                else
+                {
+                    s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                    i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                                      *((uint32_t*) &a[0]), *((uint16_t*) &a[4]), *((uint16_t*) &a[6]),
+                                      a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]); break;
+                }
+            }
+            break;
+
+            case 'c':  *--s = (char)va_arg(arg, int); i = 1; break;
+
+            case 'C':  if (F.lSize) n = va_arg(arg, unsigned long);
+                else n = va_arg(arg, unsigned int);
+                if (F.hSize) n = (unsigned short) n;
+                c = (int)( n        & 0xFF); *--s = (char)(DebugIsPrint(c) ? c : '^');
+                c = (int)((n >>  8) & 0xFF); *--s = (char)(DebugIsPrint(c) ? c : '^');
+                c = (int)((n >> 16) & 0xFF); *--s = (char)(DebugIsPrint(c) ? c : '^');
+                c = (int)((n >> 24) & 0xFF); *--s = (char)(DebugIsPrint(c) ? c : '^');
+                i = 4;
+                break;
+
+            case 's':  s = va_arg(arg, char *);
+                if (!s) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                else switch (F.altForm)
+                    {
+                    case 0: i=0;
+                        if (F.havePrecision)                                // C string
+                        {
+                            while((i < F.precision) && s[i]) i++;
+                            // Make sure we don't truncate in the middle of a UTF-8 character.
+                            // If the last character is part of a multi-byte UTF-8 character, back up to the start of it.
+                            j=0;
+                            while((i > 0) && ((c = s[i-1]) & 0x80)) { j++; i--; if((c & 0xC0) != 0x80) break;}
+                            // If the actual count of UTF-8 characters matches the encoded UTF-8 count, add it back.
+                            if((j > 1) && (j <= 6))
+                            {
+                                int test = (0xFF << (8-j)) & 0xFF;
+                                int mask = test | (1 << ((8-j)-1));
+                                if((c & mask) == test) i += j;
+                            }
+                        }
+                        else
+                            while(s[i]) i++;
+                        break;
+                    case 1: i = (unsigned char) *s++; break;                // Pascal string
+                    case 2: {                                               // DNS label-sequence name
+                        unsigned char *a = (unsigned char *)s;
+                        s = mDNS_VACB;                  // Adjust s to point to the start of the buffer, not the end
+                        if (*a == 0) *s++ = '.';                    // Special case for root DNS name
+                        while (*a)
+                        {
+                            if (*a > 63) { s += DebugSNPrintF(s, mDNS_VACB_Remain(s), "<<INVALID LABEL LENGTH %u>>", *a); break; }
+                            if (s + *a >= &mDNS_VACB[254]) { s += DebugSNPrintF(s, mDNS_VACB_Remain(s), "<<NAME TOO LONG>>"); break; }
+                            s += DebugSNPrintF(s, mDNS_VACB_Remain(s), "%#s.", a);
+                            a += 1 + *a;
+                        }
+                        i = (size_t)(s - mDNS_VACB);
+                        s = mDNS_VACB;                  // Reset s back to the start of the buffer
+                        break;
+                    }
+                    }
+                if (F.havePrecision && i > F.precision)                 // Make sure we don't truncate in the middle of a UTF-8 character
+                { i = F.precision; while (i>0 && (s[i] & 0xC0) == 0x80) i--;}
+                break;
+
+            case 'S':   {       // UTF-16 string
+                unsigned char *a = va_arg(arg, unsigned char *);
+                uint16_t      *u = (uint16_t*)a;
+                if (!u) { static char emsg[] = "<<NULL>>"; s = emsg; i = sizeof(emsg)-1; }
+                if ((!F.havePrecision || F.precision))
+                {
+                    if      ((a[0] == 0xFE) && (a[1] == 0xFF)) { F.altForm = 1; u += 1; a += 2; F.precision--; }                // Big Endian
+                    else if ((a[0] == 0xFF) && (a[1] == 0xFE)) { F.altForm = 2; u += 1; a += 2; F.precision--; }                // Little Endian
+                }
+                s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                switch (F.altForm)
+                {
+                case 0: while ((!F.havePrecision || (i < F.precision)) && u[i] && mDNS_VACB_Remain(s))                  // Host Endian
+                    { c = u[i]; *s++ = (char)(DebugIsPrint(c) ? c : '^'); i++; }
+                    break;
+                case 1: while ((!F.havePrecision || (i < F.precision)) && u[i] && mDNS_VACB_Remain(s))                  // Big Endian
+                    { c = ((a[0] << 8) | a[1]) & 0xFF; *s++ = (char)(DebugIsPrint(c) ? c : '^'); i++; a += 2; }
+                    break;
+                case 2: while ((!F.havePrecision || (i < F.precision)) && u[i] && mDNS_VACB_Remain(s))                  // Little Endian
+                    { c = ((a[1] << 8) | a[0]) & 0xFF; *s++ = (char)(DebugIsPrint(c) ? c : '^'); i++; a += 2; }
+                    break;
+                }
+            }
+                s = mDNS_VACB;              // Reset s back to the start of the buffer
+                break;
+
+            #if TARGET_OS_MAC
+            case '@':   {       // Cocoa/CoreFoundation object
+                CFTypeRef cfObj;
+                CFStringRef cfStr;
+                cfObj = (CFTypeRef) va_arg(arg, void *);
+                cfStr = (CFGetTypeID(cfObj) == CFStringGetTypeID()) ? (CFStringRef)CFRetain(cfObj) : CFCopyDescription(cfObj);
+                s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                if (cfStr)
+                {
+                    CFRange range;
+                    CFIndex m;
+                    range = CFRangeMake(0, CFStringGetLength(cfStr));
+                    m = 0;
+                    CFStringGetBytes(cfStr, range, kCFStringEncodingUTF8, '^', false, (UInt8*)mDNS_VACB, (CFIndex)sizeof(mDNS_VACB), &m);
+                    CFRelease(cfStr);
+                    i = (size_t) m;
+                }
+                else
+                {
+                    i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "%s", "ERROR: <invalid CF object>" );
+                }
+            }
+                if (F.havePrecision && i > F.precision)                 // Make sure we don't truncate in the middle of a UTF-8 character
+                { i = F.precision; while (i>0 && (s[i] & 0xC0) == 0x80) i--;}
+                break;
+            #endif
+
+            case 'm':  {        // Error Message
+                long err;
+                if (F.lSize) err = va_arg(arg, long);
+                else err = va_arg(arg, int);
+                if (F.hSize) err = (short)err;
+                DebugGetErrorString(err, mDNS_VACB, sizeof(mDNS_VACB));
+                s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                for(i=0; s[i]; i++) {}
+            }
+            break;
+
+            case 'H':  {        // Hex Dump
+                void *a = va_arg(arg, void *);
+                size_t size = (size_t)va_arg(arg, int);
+                size_t max = (size_t)va_arg(arg, int);
+                DebugFlags flags =
+                    kDebugFlagsNoAddress | kDebugFlagsNoOffset | kDebugFlagsNoNewLine |
+                    kDebugFlags8BitSeparator | kDebugFlagsNo32BitSeparator |
+                    kDebugFlagsNo16ByteHexPad | kDebugFlagsNoByteCount;
+                if (F.altForm == 0) flags |= kDebugFlagsNoASCII;
+                size = (max < size) ? max : size;
+                s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                i = DebugHexDump(kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, a, a, size, flags, mDNS_VACB, sizeof(mDNS_VACB));
+            }
+            break;
+
+            case 'v':  {        // Version
+                uint32_t version;
+                version = va_arg(arg, unsigned int);
+                DebugNumVersionToString(version, mDNS_VACB);
+                s = mDNS_VACB;              // Adjust s to point to the start of the buffer, not the end
+                for(i=0; s[i]; i++) {}
+            }
+            break;
+
+            case 'n':  s = va_arg(arg, char *);
+                if      (F.hSize) *(short *) s = (short)nwritten;
+                else if (F.lSize) *(long  *) s = (long)nwritten;
+                else *(int   *) s = (int)nwritten;
+                continue;
+
+            default:    s = mDNS_VACB;
+                i = DebugSNPrintF(mDNS_VACB, sizeof(mDNS_VACB), "<<UNKNOWN FORMAT CONVERSION CODE %%%c>>", c);
+
+            case '%':  *sbuffer++ = (char)c;
+                if (++nwritten >= buflen) goto exit;
+                break;
+            }
+
+            if (i < F.fieldWidth && !F.leftJustify)         // Pad on the left
+                do  {
+                    *sbuffer++ = ' ';
+                    if (++nwritten >= buflen) goto exit;
+                } while (i < --F.fieldWidth);
+
+            if (i > buflen - nwritten)  // Make sure we don't truncate in the middle of a UTF-8 character
+            { i = buflen - nwritten; while (i>0 && (s[i] & 0xC0) == 0x80) i--;}
+            for (j=0; j<i; j++) *sbuffer++ = *s++;          // Write the converted result
+            nwritten += i;
+            if (nwritten >= buflen) goto exit;
+
+            for (; i < F.fieldWidth; i++)                   // Pad on the right
+            {
+                *sbuffer++ = ' ';
+                if (++nwritten >= buflen) goto exit;
+            }
+        }
+    }
+exit:
+    *sbuffer++ = 0;
+    return(nwritten);
+}
+
+//===========================================================================================================================
+//	DebugGetErrorString
+//===========================================================================================================================
+
+DEBUG_EXPORT const char *   DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize )
+{
+    const char *        s;
+    char *              dst;
+    char *              end;
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+    char buffer[ 256 ];
+#endif
+
+    switch( inErrorCode )
+    {
+        #define CaseErrorString( X, STR )                   case X: s = STR; break
+        #define CaseErrorStringify( X )                     case X: s = # X; break
+        #define CaseErrorStringifyHardCode( VALUE, X )      case VALUE: s = # X; break
+
+        // General Errors
+
+        CaseErrorString( 0,  "no error" );
+        CaseErrorString( 1,  "in-progress/waiting" );
+        CaseErrorString( -1, "catch-all unknown error" );
+
+        // ACP Errors
+
+        CaseErrorStringifyHardCode( -2,  kACPBadRequestErr );
+        CaseErrorStringifyHardCode( -3,  kACPNoMemoryErr );
+        CaseErrorStringifyHardCode( -4,  kACPBadParamErr );
+        CaseErrorStringifyHardCode( -5,  kACPNotFoundErr );
+        CaseErrorStringifyHardCode( -6,  kACPBadChecksumErr );
+        CaseErrorStringifyHardCode( -7,  kACPCommandNotHandledErr );
+        CaseErrorStringifyHardCode( -8,  kACPNetworkErr );
+        CaseErrorStringifyHardCode( -9,  kACPDuplicateCommandHandlerErr );
+        CaseErrorStringifyHardCode( -10, kACPUnknownPropertyErr );
+        CaseErrorStringifyHardCode( -11, kACPImmutablePropertyErr );
+        CaseErrorStringifyHardCode( -12, kACPBadPropertyValueErr );
+        CaseErrorStringifyHardCode( -13, kACPNoResourcesErr );
+        CaseErrorStringifyHardCode( -14, kACPBadOptionErr );
+        CaseErrorStringifyHardCode( -15, kACPBadSizeErr );
+        CaseErrorStringifyHardCode( -16, kACPBadPasswordErr );
+        CaseErrorStringifyHardCode( -17, kACPNotInitializedErr );
+        CaseErrorStringifyHardCode( -18, kACPNonReadablePropertyErr );
+        CaseErrorStringifyHardCode( -19, kACPBadVersionErr );
+        CaseErrorStringifyHardCode( -20, kACPBadSignatureErr );
+        CaseErrorStringifyHardCode( -21, kACPBadIndexErr );
+        CaseErrorStringifyHardCode( -22, kACPUnsupportedErr );
+        CaseErrorStringifyHardCode( -23, kACPInUseErr );
+        CaseErrorStringifyHardCode( -24, kACPParamCountErr );
+        CaseErrorStringifyHardCode( -25, kACPIDErr );
+        CaseErrorStringifyHardCode( -26, kACPFormatErr );
+        CaseErrorStringifyHardCode( -27, kACPUnknownUserErr );
+        CaseErrorStringifyHardCode( -28, kACPAccessDeniedErr );
+        CaseErrorStringifyHardCode( -29, kACPIncorrectFWErr );
+
+        // Common Services Errors
+
+        CaseErrorStringify( kUnknownErr );
+        CaseErrorStringify( kOptionErr );
+        CaseErrorStringify( kSelectorErr );
+        CaseErrorStringify( kExecutionStateErr );
+        CaseErrorStringify( kPathErr );
+        CaseErrorStringify( kParamErr );
+        CaseErrorStringify( kParamCountErr );
+        CaseErrorStringify( kCommandErr );
+        CaseErrorStringify( kIDErr );
+        CaseErrorStringify( kStateErr );
+        CaseErrorStringify( kRangeErr );
+        CaseErrorStringify( kRequestErr );
+        CaseErrorStringify( kResponseErr );
+        CaseErrorStringify( kChecksumErr );
+        CaseErrorStringify( kNotHandledErr );
+        CaseErrorStringify( kVersionErr );
+        CaseErrorStringify( kSignatureErr );
+        CaseErrorStringify( kFormatErr );
+        CaseErrorStringify( kNotInitializedErr );
+        CaseErrorStringify( kAlreadyInitializedErr );
+        CaseErrorStringify( kNotInUseErr );
+        CaseErrorStringify( kInUseErr );
+        CaseErrorStringify( kTimeoutErr );
+        CaseErrorStringify( kCanceledErr );
+        CaseErrorStringify( kAlreadyCanceledErr );
+        CaseErrorStringify( kCannotCancelErr );
+        CaseErrorStringify( kDeletedErr );
+        CaseErrorStringify( kNotFoundErr );
+        CaseErrorStringify( kNoMemoryErr );
+        CaseErrorStringify( kNoResourcesErr );
+        CaseErrorStringify( kDuplicateErr );
+        CaseErrorStringify( kImmutableErr );
+        CaseErrorStringify( kUnsupportedDataErr );
+        CaseErrorStringify( kIntegrityErr );
+        CaseErrorStringify( kIncompatibleErr );
+        CaseErrorStringify( kUnsupportedErr );
+        CaseErrorStringify( kUnexpectedErr );
+        CaseErrorStringify( kValueErr );
+        CaseErrorStringify( kNotReadableErr );
+        CaseErrorStringify( kNotWritableErr );
+        CaseErrorStringify( kBadReferenceErr );
+        CaseErrorStringify( kFlagErr );
+        CaseErrorStringify( kMalformedErr );
+        CaseErrorStringify( kSizeErr );
+        CaseErrorStringify( kNameErr );
+        CaseErrorStringify( kNotReadyErr );
+        CaseErrorStringify( kReadErr );
+        CaseErrorStringify( kWriteErr );
+        CaseErrorStringify( kMismatchErr );
+        CaseErrorStringify( kDateErr );
+        CaseErrorStringify( kUnderrunErr );
+        CaseErrorStringify( kOverrunErr );
+        CaseErrorStringify( kEndingErr );
+        CaseErrorStringify( kConnectionErr );
+        CaseErrorStringify( kAuthenticationErr );
+        CaseErrorStringify( kOpenErr );
+        CaseErrorStringify( kTypeErr );
+        CaseErrorStringify( kSkipErr );
+        CaseErrorStringify( kNoAckErr );
+        CaseErrorStringify( kCollisionErr );
+        CaseErrorStringify( kBackoffErr );
+        CaseErrorStringify( kNoAddressAckErr );
+        CaseErrorStringify( kBusyErr );
+        CaseErrorStringify( kNoSpaceErr );
+
+        // mDNS/DNS-SD Errors
+
+        CaseErrorStringifyHardCode( -65537, mStatus_UnknownErr );
+        CaseErrorStringifyHardCode( -65538, mStatus_NoSuchNameErr );
+        CaseErrorStringifyHardCode( -65539, mStatus_NoMemoryErr );
+        CaseErrorStringifyHardCode( -65540, mStatus_BadParamErr );
+        CaseErrorStringifyHardCode( -65541, mStatus_BadReferenceErr );
+        CaseErrorStringifyHardCode( -65542, mStatus_BadStateErr );
+        CaseErrorStringifyHardCode( -65543, mStatus_BadFlagsErr );
+        CaseErrorStringifyHardCode( -65544, mStatus_UnsupportedErr );
+        CaseErrorStringifyHardCode( -65545, mStatus_NotInitializedErr );
+        CaseErrorStringifyHardCode( -65546, mStatus_NoCache );
+        CaseErrorStringifyHardCode( -65547, mStatus_AlreadyRegistered );
+        CaseErrorStringifyHardCode( -65548, mStatus_NameConflict );
+        CaseErrorStringifyHardCode( -65549, mStatus_Invalid );
+        CaseErrorStringifyHardCode( -65550, mStatus_GrowCache );
+        CaseErrorStringifyHardCode( -65551, mStatus_BadInterfaceErr );
+        CaseErrorStringifyHardCode( -65552, mStatus_Incompatible );
+        CaseErrorStringifyHardCode( -65791, mStatus_ConfigChanged );
+        CaseErrorStringifyHardCode( -65792, mStatus_MemFree );
+
+        // RSP Errors
+
+        CaseErrorStringifyHardCode( -400000, kRSPUnknownErr );
+        CaseErrorStringifyHardCode( -400050, kRSPParamErr );
+        CaseErrorStringifyHardCode( -400108, kRSPNoMemoryErr );
+        CaseErrorStringifyHardCode( -405246, kRSPRangeErr );
+        CaseErrorStringifyHardCode( -409057, kRSPSizeErr );
+        CaseErrorStringifyHardCode( -400200, kRSPHardwareErr );
+        CaseErrorStringifyHardCode( -401712, kRSPTimeoutErr );
+        CaseErrorStringifyHardCode( -402053, kRSPUnsupportedErr );
+        CaseErrorStringifyHardCode( -402419, kRSPIDErr );
+        CaseErrorStringifyHardCode( -403165, kRSPFlagErr );
+        CaseErrorString(            -200000, "kRSPControllerStatusBase - 0x50" );
+        CaseErrorString(            -200080, "kRSPCommandSucceededErr - 0x50" );
+        CaseErrorString(            -200001, "kRSPCommandFailedErr - 0x01" );
+        CaseErrorString(            -200051, "kRSPChecksumErr - 0x33" );
+        CaseErrorString(            -200132, "kRSPCommandTimeoutErr - 0x84" );
+        CaseErrorString(            -200034, "kRSPPasswordRequiredErr - 0x22 OBSOLETE" );
+        CaseErrorString(            -200128, "kRSPCanceledErr - 0x02 Async" );
+
+        // XML Errors
+
+        CaseErrorStringifyHardCode( -100043, kXMLNotFoundErr );
+        CaseErrorStringifyHardCode( -100050, kXMLParamErr );
+        CaseErrorStringifyHardCode( -100108, kXMLNoMemoryErr );
+        CaseErrorStringifyHardCode( -100206, kXMLFormatErr );
+        CaseErrorStringifyHardCode( -100586, kXMLNoRootElementErr );
+        CaseErrorStringifyHardCode( -101703, kXMLWrongDataTypeErr );
+        CaseErrorStringifyHardCode( -101726, kXMLKeyErr );
+        CaseErrorStringifyHardCode( -102053, kXMLUnsupportedErr );
+        CaseErrorStringifyHardCode( -102063, kXMLMissingElementErr );
+        CaseErrorStringifyHardCode( -103026, kXMLParseErr );
+        CaseErrorStringifyHardCode( -103159, kXMLBadDataErr );
+        CaseErrorStringifyHardCode( -103170, kXMLBadNameErr );
+        CaseErrorStringifyHardCode( -105246, kXMLRangeErr );
+        CaseErrorStringifyHardCode( -105251, kXMLUnknownElementErr );
+        CaseErrorStringifyHardCode( -108739, kXMLMalformedInputErr );
+        CaseErrorStringifyHardCode( -109057, kXMLBadSizeErr );
+        CaseErrorStringifyHardCode( -101730, kXMLMissingChildElementErr );
+        CaseErrorStringifyHardCode( -102107, kXMLMissingParentElementErr );
+        CaseErrorStringifyHardCode( -130587, kXMLNonRootElementErr );
+        CaseErrorStringifyHardCode( -102015, kXMLDateErr );
+
+    #if ( __MACH__ )
+
+        // Mach Errors
+
+        CaseErrorStringifyHardCode( 0x00002000, MACH_MSG_IPC_SPACE );
+        CaseErrorStringifyHardCode( 0x00001000, MACH_MSG_VM_SPACE );
+        CaseErrorStringifyHardCode( 0x00000800, MACH_MSG_IPC_KERNEL );
+        CaseErrorStringifyHardCode( 0x00000400, MACH_MSG_VM_KERNEL );
+        CaseErrorStringifyHardCode( 0x10000001, MACH_SEND_IN_PROGRESS );
+        CaseErrorStringifyHardCode( 0x10000002, MACH_SEND_INVALID_DATA );
+        CaseErrorStringifyHardCode( 0x10000003, MACH_SEND_INVALID_DEST );
+        CaseErrorStringifyHardCode( 0x10000004, MACH_SEND_TIMED_OUT );
+        CaseErrorStringifyHardCode( 0x10000007, MACH_SEND_INTERRUPTED );
+        CaseErrorStringifyHardCode( 0x10000008, MACH_SEND_MSG_TOO_SMALL );
+        CaseErrorStringifyHardCode( 0x10000009, MACH_SEND_INVALID_REPLY );
+        CaseErrorStringifyHardCode( 0x1000000A, MACH_SEND_INVALID_RIGHT );
+        CaseErrorStringifyHardCode( 0x1000000B, MACH_SEND_INVALID_NOTIFY );
+        CaseErrorStringifyHardCode( 0x1000000C, MACH_SEND_INVALID_MEMORY );
+        CaseErrorStringifyHardCode( 0x1000000D, MACH_SEND_NO_BUFFER );
+        CaseErrorStringifyHardCode( 0x1000000E, MACH_SEND_TOO_LARGE );
+        CaseErrorStringifyHardCode( 0x1000000F, MACH_SEND_INVALID_TYPE );
+        CaseErrorStringifyHardCode( 0x10000010, MACH_SEND_INVALID_HEADER );
+        CaseErrorStringifyHardCode( 0x10000011, MACH_SEND_INVALID_TRAILER );
+        CaseErrorStringifyHardCode( 0x10000015, MACH_SEND_INVALID_RT_OOL_SIZE );
+        CaseErrorStringifyHardCode( 0x10004001, MACH_RCV_IN_PROGRESS );
+        CaseErrorStringifyHardCode( 0x10004002, MACH_RCV_INVALID_NAME );
+        CaseErrorStringifyHardCode( 0x10004003, MACH_RCV_TIMED_OUT );
+        CaseErrorStringifyHardCode( 0x10004004, MACH_RCV_TOO_LARGE );
+        CaseErrorStringifyHardCode( 0x10004005, MACH_RCV_INTERRUPTED );
+        CaseErrorStringifyHardCode( 0x10004006, MACH_RCV_PORT_CHANGED );
+        CaseErrorStringifyHardCode( 0x10004007, MACH_RCV_INVALID_NOTIFY );
+        CaseErrorStringifyHardCode( 0x10004008, MACH_RCV_INVALID_DATA );
+        CaseErrorStringifyHardCode( 0x10004009, MACH_RCV_PORT_DIED );
+        CaseErrorStringifyHardCode( 0x1000400A, MACH_RCV_IN_SET );
+        CaseErrorStringifyHardCode( 0x1000400B, MACH_RCV_HEADER_ERROR );
+        CaseErrorStringifyHardCode( 0x1000400C, MACH_RCV_BODY_ERROR );
+        CaseErrorStringifyHardCode( 0x1000400D, MACH_RCV_INVALID_TYPE );
+        CaseErrorStringifyHardCode( 0x1000400E, MACH_RCV_SCATTER_SMALL );
+        CaseErrorStringifyHardCode( 0x1000400F, MACH_RCV_INVALID_TRAILER );
+        CaseErrorStringifyHardCode( 0x10004011, MACH_RCV_IN_PROGRESS_TIMED );
+
+        // Mach OSReturn Errors
+
+        CaseErrorStringifyHardCode( 0xDC000001, kOSReturnError );
+        CaseErrorStringifyHardCode( 0xDC004001, kOSMetaClassInternal );
+        CaseErrorStringifyHardCode( 0xDC004002, kOSMetaClassHasInstances );
+        CaseErrorStringifyHardCode( 0xDC004003, kOSMetaClassNoInit );
+        CaseErrorStringifyHardCode( 0xDC004004, kOSMetaClassNoTempData );
+        CaseErrorStringifyHardCode( 0xDC004005, kOSMetaClassNoDicts );
+        CaseErrorStringifyHardCode( 0xDC004006, kOSMetaClassNoKModSet );
+        CaseErrorStringifyHardCode( 0xDC004007, kOSMetaClassNoInsKModSet );
+        CaseErrorStringifyHardCode( 0xDC004008, kOSMetaClassNoSuper );
+        CaseErrorStringifyHardCode( 0xDC004009, kOSMetaClassInstNoSuper );
+        CaseErrorStringifyHardCode( 0xDC00400A, kOSMetaClassDuplicateClass );
+
+        // IOKit Errors
+
+        CaseErrorStringifyHardCode( 0xE00002BC, kIOReturnError );
+        CaseErrorStringifyHardCode( 0xE00002BD, kIOReturnNoMemory );
+        CaseErrorStringifyHardCode( 0xE00002BE, kIOReturnNoResources );
+        CaseErrorStringifyHardCode( 0xE00002BF, kIOReturnIPCError );
+        CaseErrorStringifyHardCode( 0xE00002C0, kIOReturnNoDevice );
+        CaseErrorStringifyHardCode( 0xE00002C1, kIOReturnNotPrivileged );
+        CaseErrorStringifyHardCode( 0xE00002C2, kIOReturnBadArgument );
+        CaseErrorStringifyHardCode( 0xE00002C3, kIOReturnLockedRead );
+        CaseErrorStringifyHardCode( 0xE00002C4, kIOReturnLockedWrite );
+        CaseErrorStringifyHardCode( 0xE00002C5, kIOReturnExclusiveAccess );
+        CaseErrorStringifyHardCode( 0xE00002C6, kIOReturnBadMessageID );
+        CaseErrorStringifyHardCode( 0xE00002C7, kIOReturnUnsupported );
+        CaseErrorStringifyHardCode( 0xE00002C8, kIOReturnVMError );
+        CaseErrorStringifyHardCode( 0xE00002C9, kIOReturnInternalError );
+        CaseErrorStringifyHardCode( 0xE00002CA, kIOReturnIOError );
+        CaseErrorStringifyHardCode( 0xE00002CC, kIOReturnCannotLock );
+        CaseErrorStringifyHardCode( 0xE00002CD, kIOReturnNotOpen );
+        CaseErrorStringifyHardCode( 0xE00002CE, kIOReturnNotReadable );
+        CaseErrorStringifyHardCode( 0xE00002CF, kIOReturnNotWritable );
+        CaseErrorStringifyHardCode( 0xE00002D0, kIOReturnNotAligned );
+        CaseErrorStringifyHardCode( 0xE00002D1, kIOReturnBadMedia );
+        CaseErrorStringifyHardCode( 0xE00002D2, kIOReturnStillOpen );
+        CaseErrorStringifyHardCode( 0xE00002D3, kIOReturnRLDError );
+        CaseErrorStringifyHardCode( 0xE00002D4, kIOReturnDMAError );
+        CaseErrorStringifyHardCode( 0xE00002D5, kIOReturnBusy );
+        CaseErrorStringifyHardCode( 0xE00002D6, kIOReturnTimeout );
+        CaseErrorStringifyHardCode( 0xE00002D7, kIOReturnOffline );
+        CaseErrorStringifyHardCode( 0xE00002D8, kIOReturnNotReady );
+        CaseErrorStringifyHardCode( 0xE00002D9, kIOReturnNotAttached );
+        CaseErrorStringifyHardCode( 0xE00002DA, kIOReturnNoChannels );
+        CaseErrorStringifyHardCode( 0xE00002DB, kIOReturnNoSpace );
+        CaseErrorStringifyHardCode( 0xE00002DD, kIOReturnPortExists );
+        CaseErrorStringifyHardCode( 0xE00002DE, kIOReturnCannotWire );
+        CaseErrorStringifyHardCode( 0xE00002DF, kIOReturnNoInterrupt );
+        CaseErrorStringifyHardCode( 0xE00002E0, kIOReturnNoFrames );
+        CaseErrorStringifyHardCode( 0xE00002E1, kIOReturnMessageTooLarge );
+        CaseErrorStringifyHardCode( 0xE00002E2, kIOReturnNotPermitted );
+        CaseErrorStringifyHardCode( 0xE00002E3, kIOReturnNoPower );
+        CaseErrorStringifyHardCode( 0xE00002E4, kIOReturnNoMedia );
+        CaseErrorStringifyHardCode( 0xE00002E5, kIOReturnUnformattedMedia );
+        CaseErrorStringifyHardCode( 0xE00002E6, kIOReturnUnsupportedMode );
+        CaseErrorStringifyHardCode( 0xE00002E7, kIOReturnUnderrun );
+        CaseErrorStringifyHardCode( 0xE00002E8, kIOReturnOverrun );
+        CaseErrorStringifyHardCode( 0xE00002E9, kIOReturnDeviceError     );
+        CaseErrorStringifyHardCode( 0xE00002EA, kIOReturnNoCompletion    );
+        CaseErrorStringifyHardCode( 0xE00002EB, kIOReturnAborted     );
+        CaseErrorStringifyHardCode( 0xE00002EC, kIOReturnNoBandwidth     );
+        CaseErrorStringifyHardCode( 0xE00002ED, kIOReturnNotResponding   );
+        CaseErrorStringifyHardCode( 0xE00002EE, kIOReturnIsoTooOld   );
+        CaseErrorStringifyHardCode( 0xE00002EF, kIOReturnIsoTooNew   );
+        CaseErrorStringifyHardCode( 0xE00002F0, kIOReturnNotFound );
+        CaseErrorStringifyHardCode( 0xE0000001, kIOReturnInvalid );
+
+        // IOKit FireWire Errors
+
+        CaseErrorStringifyHardCode( 0xE0008010, kIOFireWireResponseBase );
+        CaseErrorStringifyHardCode( 0xE0008020, kIOFireWireBusReset );
+        CaseErrorStringifyHardCode( 0xE0008001, kIOConfigNoEntry );
+        CaseErrorStringifyHardCode( 0xE0008002, kIOFireWirePending );
+        CaseErrorStringifyHardCode( 0xE0008003, kIOFireWireLastDCLToken );
+        CaseErrorStringifyHardCode( 0xE0008004, kIOFireWireConfigROMInvalid );
+        CaseErrorStringifyHardCode( 0xE0008005, kIOFireWireAlreadyRegistered );
+        CaseErrorStringifyHardCode( 0xE0008006, kIOFireWireMultipleTalkers );
+        CaseErrorStringifyHardCode( 0xE0008007, kIOFireWireChannelActive );
+        CaseErrorStringifyHardCode( 0xE0008008, kIOFireWireNoListenerOrTalker );
+        CaseErrorStringifyHardCode( 0xE0008009, kIOFireWireNoChannels );
+        CaseErrorStringifyHardCode( 0xE000800A, kIOFireWireChannelNotAvailable );
+        CaseErrorStringifyHardCode( 0xE000800B, kIOFireWireSeparateBus );
+        CaseErrorStringifyHardCode( 0xE000800C, kIOFireWireBadSelfIDs );
+        CaseErrorStringifyHardCode( 0xE000800D, kIOFireWireLowCableVoltage );
+        CaseErrorStringifyHardCode( 0xE000800E, kIOFireWireInsufficientPower );
+        CaseErrorStringifyHardCode( 0xE000800F, kIOFireWireOutOfTLabels );
+        CaseErrorStringifyHardCode( 0xE0008101, kIOFireWireBogusDCLProgram );
+        CaseErrorStringifyHardCode( 0xE0008102, kIOFireWireTalkingAndListening );
+        CaseErrorStringifyHardCode( 0xE0008103, kIOFireWireHardwareSlept );
+        CaseErrorStringifyHardCode( 0xE00087D0, kIOFWMessageServiceIsRequestingClose );
+        CaseErrorStringifyHardCode( 0xE00087D1, kIOFWMessagePowerStateChanged );
+        CaseErrorStringifyHardCode( 0xE00087D2, kIOFWMessageTopologyChanged );
+
+        // IOKit USB Errors
+
+        CaseErrorStringifyHardCode( 0xE0004061, kIOUSBUnknownPipeErr );
+        CaseErrorStringifyHardCode( 0xE0004060, kIOUSBTooManyPipesErr );
+        CaseErrorStringifyHardCode( 0xE000405F, kIOUSBNoAsyncPortErr );
+        CaseErrorStringifyHardCode( 0xE000405E, kIOUSBNotEnoughPipesErr );
+        CaseErrorStringifyHardCode( 0xE000405D, kIOUSBNotEnoughPowerErr );
+        CaseErrorStringifyHardCode( 0xE0004057, kIOUSBEndpointNotFound );
+        CaseErrorStringifyHardCode( 0xE0004056, kIOUSBConfigNotFound );
+        CaseErrorStringifyHardCode( 0xE0004051, kIOUSBTransactionTimeout );
+        CaseErrorStringifyHardCode( 0xE0004050, kIOUSBTransactionReturned );
+        CaseErrorStringifyHardCode( 0xE000404F, kIOUSBPipeStalled );
+        CaseErrorStringifyHardCode( 0xE000404E, kIOUSBInterfaceNotFound );
+        CaseErrorStringifyHardCode( 0xE000404D, kIOUSBLowLatencyBufferNotPreviouslyAllocated );
+        CaseErrorStringifyHardCode( 0xE000404C, kIOUSBLowLatencyFrameListNotPreviouslyAllocated );
+        CaseErrorStringifyHardCode( 0xE000404B, kIOUSBHighSpeedSplitError );
+        CaseErrorStringifyHardCode( 0xE0004010, kIOUSBLinkErr );
+        CaseErrorStringifyHardCode( 0xE000400F, kIOUSBNotSent2Err );
+        CaseErrorStringifyHardCode( 0xE000400E, kIOUSBNotSent1Err );
+        CaseErrorStringifyHardCode( 0xE000400D, kIOUSBBufferUnderrunErr );
+        CaseErrorStringifyHardCode( 0xE000400C, kIOUSBBufferOverrunErr );
+        CaseErrorStringifyHardCode( 0xE000400B, kIOUSBReserved2Err );
+        CaseErrorStringifyHardCode( 0xE000400A, kIOUSBReserved1Err );
+        CaseErrorStringifyHardCode( 0xE0004007, kIOUSBWrongPIDErr );
+        CaseErrorStringifyHardCode( 0xE0004006, kIOUSBPIDCheckErr );
+        CaseErrorStringifyHardCode( 0xE0004003, kIOUSBDataToggleErr );
+        CaseErrorStringifyHardCode( 0xE0004002, kIOUSBBitstufErr );
+        CaseErrorStringifyHardCode( 0xE0004001, kIOUSBCRCErr );
+
+    #endif  // __MACH__
+
+    // Other Errors
+
+    default:
+        s = NULL;
+            #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+        if( inBuffer && ( inBufferSize > 0 ) )
+        {
+            DWORD n;
+
+            n = FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, (DWORD) inErrorCode,
+                                MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ), buffer, sizeof( buffer ), NULL );
+            if( n > 0 )
+            {
+                // Remove any trailing CR's or LF's since some messages have them.
+
+                while( ( n > 0 ) && isspace( ( (unsigned char *) buffer )[ n - 1 ] ) )
+                {
+                    buffer[ --n ] = '\0';
+                }
+                s = buffer;
+            }
+        }
+            #endif
+
+        if( !s )
+        {
+                #if ( !TARGET_API_MAC_OSX_KERNEL && !TARGET_OS_WINDOWS_CE )
+            s = strerror( inErrorCode );
+                #endif
+            if( !s )
+            {
+                s = "<unknown error code>";
+            }
+        }
+        break;
+    }
+
+    // Copy the string to the output buffer. If no buffer is supplied or it is empty, return an empty string.
+
+    if( inBuffer && ( inBufferSize > 0 ) )
+    {
+        dst = inBuffer;
+        end = dst + ( inBufferSize - 1 );
+        while( ( ( end - dst ) > 0 ) && ( *s != '\0' ) )
+        {
+            *dst++ = *s++;
+        }
+        *dst = '\0';
+        s = inBuffer;
+    }
+    return( s );
+}
+
+//===========================================================================================================================
+//	DebugHexDump
+//===========================================================================================================================
+
+DEBUG_EXPORT size_t
+DebugHexDump(
+    DebugLevel inLevel,
+    int inIndent,
+    const char *    inLabel,
+    size_t inLabelSize,
+    int inLabelMinWidth,
+    const char *    inType,
+    size_t inTypeSize,
+    const void *    inDataStart,
+    const void *    inData,
+    size_t inDataSize,
+    DebugFlags inFlags,
+    char *          outBuffer,
+    size_t inBufferSize )
+{
+    static const char kHexChars[] = "0123456789ABCDEF";
+    const uint8_t *         start;
+    const uint8_t *         src;
+    char *                  dst;
+    char *                  end;
+    size_t n;
+    int offset;
+    int width;
+    const char *            newline;
+    char separator[ 8 ];
+    char *                  s;
+
+    DEBUG_UNUSED( inType );
+    DEBUG_UNUSED( inTypeSize );
+
+    // Set up the function-wide variables.
+
+    if( inLabelSize == kSizeCString )
+    {
+        inLabelSize = strlen( inLabel );
+    }
+    start   = (const uint8_t *) inData;
+    src     = start;
+    dst     = outBuffer;
+    end     = dst + inBufferSize;
+    offset  = (int)( (intptr_t) inData - (intptr_t) inDataStart );
+    width   = ( (int) inLabelSize > inLabelMinWidth ) ? (int) inLabelSize : inLabelMinWidth;
+    newline = ( inFlags & kDebugFlagsNoNewLine ) ? "" : "\n";
+
+    // Set up the separator string. This is used to insert spaces on subsequent "lines" when not using newlines.
+
+    s = separator;
+    if( inFlags & kDebugFlagsNoNewLine )
+    {
+        if( inFlags & kDebugFlags8BitSeparator )
+        {
+            *s++ = ' ';
+        }
+        if( inFlags & kDebugFlags16BitSeparator )
+        {
+            *s++ = ' ';
+        }
+        if( !( inFlags & kDebugFlagsNo32BitSeparator ) )
+        {
+            *s++ = ' ';
+        }
+        check( ( (size_t)( s - separator ) ) < sizeof( separator ) );
+    }
+    *s = '\0';
+
+    for( ;; )
+    {
+        char prefixString[ 32 ];
+        char hexString[ 64 ];
+        char asciiString[ 32 ];
+        char byteCountString[ 32 ];
+        int c;
+        size_t chunkSize;
+        size_t i;
+
+        // If this is a label-only item (i.e. no data), print the label (accounting for prefix string spacing) and exit.
+
+        if( inDataSize == 0 )
+        {
+            if( inLabel && ( inLabelSize > 0 ) )
+            {
+                width = 0;
+                if( !( inFlags & kDebugFlagsNoAddress ) )
+                {
+                    width += 8;         // "00000000"
+                    if( !( inFlags & kDebugFlagsNoOffset ) )
+                    {
+                        width += 1;     // "+"
+                    }
+                }
+                if( inFlags & kDebugFlags32BitOffset )
+                {
+                    width += 8;         // "00000000"
+                }
+                else if( !( inFlags & kDebugFlagsNoOffset ) )
+                {
+                    width += 4;         // "0000"
+                }
+
+                if( outBuffer )
+                {
+                    dst += DebugSNPrintF( dst, (size_t)( end - dst ), "%*s" "%-*.*s" "%.*s" "%s",
+                                          width, "",
+                                          ( width > 0 ) ? ": " : "",
+                                          width, (int) inLabelSize, inLabel,
+                                          newline );
+                }
+                else
+                {
+                    dst += DebugPrintF( inLevel, "%*s" "%-*.*s" "%.*s" "%s",
+                                        width, "",
+                                        ( width > 0 ) ? ": " : "",
+                                        width, (int) inLabelSize, inLabel,
+                                        newline );
+                }
+            }
+            break;
+        }
+
+        // Build the prefix string. It will be in one of the following formats:
+        //
+        // 1) "00000000+0000[0000]"	(address and offset)
+        // 2) "00000000"			(address only)
+        // 3) "0000[0000]"			(offset only)
+        // 4) ""					(no address or offset)
+        //
+        // Note: If we're printing multiple "lines", but not printing newlines, a space is used to separate.
+
+        s = prefixString;
+        if( !( inFlags & kDebugFlagsNoAddress ) )
+        {
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >> 28 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >> 24 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >> 20 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >> 16 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >> 12 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >>  8 ) & 0xF ];
+            *s++ = kHexChars[ ( ( (uintptr_t) src ) >>  4 ) & 0xF ];
+            *s++ = kHexChars[   ( (uintptr_t) src )         & 0xF ];
+
+            if( !( inFlags & kDebugFlagsNoOffset ) )
+            {
+                *s++ = '+';
+            }
+        }
+        if( !( inFlags & kDebugFlagsNoOffset ) )
+        {
+            if( inFlags & kDebugFlags32BitOffset )
+            {
+                *s++ = kHexChars[ ( offset >> 28 ) & 0xF ];
+                *s++ = kHexChars[ ( offset >> 24 ) & 0xF ];
+                *s++ = kHexChars[ ( offset >> 20 ) & 0xF ];
+                *s++ = kHexChars[ ( offset >> 16 ) & 0xF ];
+            }
+            *s++ = kHexChars[ ( offset >> 12 ) & 0xF ];
+            *s++ = kHexChars[ ( offset >>  8 ) & 0xF ];
+            *s++ = kHexChars[ ( offset >>  4 ) & 0xF ];
+            *s++ = kHexChars[   offset         & 0xF ];
+        }
+        if( s != prefixString )
+        {
+            *s++ = ':';
+            *s++ = ' ';
+        }
+        check( ( (size_t)( s - prefixString ) ) < sizeof( prefixString ) );
+        *s = '\0';
+
+        // Build a hex string with a optional spaces after every 1, 2, and/or 4 bytes to make it easier to read.
+        // Optionally pads the hex string with space to fill the full 16 byte range (so it lines up).
+
+        s = hexString;
+        chunkSize = ( inDataSize < 16 ) ? inDataSize : 16;
+        n = ( inFlags & kDebugFlagsNo16ByteHexPad ) ? chunkSize : 16;
+        for( i = 0; i < n; ++i )
+        {
+            if( ( inFlags & kDebugFlags8BitSeparator ) && ( i > 0 ) )
+            {
+                *s++ = ' ';
+            }
+            if( ( inFlags & kDebugFlags16BitSeparator ) && ( i > 0 ) && ( ( i % 2 ) == 0 ) )
+            {
+                *s++ = ' ';
+            }
+            if( !( inFlags & kDebugFlagsNo32BitSeparator ) && ( i > 0 ) && ( ( i % 4 ) == 0 ) )
+            {
+                *s++ = ' ';
+            }
+            if( i < chunkSize )
+            {
+                *s++ = kHexChars[ src[ i ] >> 4   ];
+                *s++ = kHexChars[ src[ i ] &  0xF ];
+            }
+            else
+            {
+                *s++ = ' ';
+                *s++ = ' ';
+            }
+        }
+        check( ( (size_t)( s - hexString ) ) < sizeof( hexString ) );
+        *s = '\0';
+
+        // Build a string with the ASCII version of the data (replaces non-printable characters with '^').
+        // Optionally pads the string with '`' to fill the full 16 byte range (so it lines up).
+
+        s = asciiString;
+        if( !( inFlags & kDebugFlagsNoASCII ) )
+        {
+            *s++ = ' ';
+            *s++ = '|';
+            for( i = 0; i < n; ++i )
+            {
+                if( i < chunkSize )
+                {
+                    c = src[ i ];
+                    if( !DebugIsPrint( c ) )
+                    {
+                        c = '^';
+                    }
+                }
+                else
+                {
+                    c = '`';
+                }
+                *s++ = (char) c;
+            }
+            *s++ = '|';
+            check( ( (size_t)( s - asciiString ) ) < sizeof( asciiString ) );
+        }
+        *s = '\0';
+
+        // Build a string indicating how bytes are in the hex dump. Only printed on the first line.
+
+        s = byteCountString;
+        if( !( inFlags & kDebugFlagsNoByteCount ) )
+        {
+            if( src == start )
+            {
+                s += DebugSNPrintF( s, sizeof( byteCountString ), " (%d bytes)", (int) inDataSize );
+            }
+        }
+        check( ( (size_t)( s - byteCountString ) ) < sizeof( byteCountString ) );
+        *s = '\0';
+
+        // Build the entire line from all the pieces we've previously built.
+
+        if( outBuffer )
+        {
+            if( src == start )
+            {
+                dst += DebugSNPrintF( dst, (size_t)( end - dst ),
+                                      "%*s" // Indention
+                                      "%s" // Separator (only if needed)
+                                      "%s" // Prefix
+                                      "%-*.*s" // Label
+                                      "%s" // Separator
+                                      "%s" // Hex
+                                      "%s" // ASCII
+                                      "%s" // Byte Count
+                                      "%s", // Newline
+                                      inIndent, "",
+                                      ( src != start ) ? separator : "",
+                                      prefixString,
+                                      width, (int) inLabelSize, inLabel ? inLabel : "",
+                                      ( width > 0 ) ? " " : "",
+                                      hexString,
+                                      asciiString,
+                                      byteCountString,
+                                      newline );
+            }
+            else
+            {
+                dst += DebugSNPrintF( dst, (size_t)( end - dst ),
+                                      "%*s" // Indention
+                                      "%s" // Separator (only if needed)
+                                      "%s" // Prefix
+                                      "%*s" // Label Spacing
+                                      "%s" // Separator
+                                      "%s" // Hex
+                                      "%s" // ASCII
+                                      "%s" // Byte Count
+                                      "%s", // Newline
+                                      inIndent, "",
+                                      ( src != start ) ? separator : "",
+                                      prefixString,
+                                      width, "",
+                                      ( width > 0 ) ? " " : "",
+                                      hexString,
+                                      asciiString,
+                                      byteCountString,
+                                      newline );
+            }
+        }
+        else
+        {
+            if( src == start )
+            {
+                dst += DebugPrintF( inLevel,
+                                    "%*s" // Indention
+                                    "%s" // Separator (only if needed)
+                                    "%s" // Prefix
+                                    "%-*.*s" // Label
+                                    "%s" // Separator
+                                    "%s" // Hex
+                                    "%s" // ASCII
+                                    "%s" // Byte Count
+                                    "%s", // Newline
+                                    inIndent, "",
+                                    ( src != start ) ? separator : "",
+                                    prefixString,
+                                    width, (int) inLabelSize, inLabel,
+                                    ( width > 0 ) ? " " : "",
+                                    hexString,
+                                    asciiString,
+                                    byteCountString,
+                                    newline );
+            }
+            else
+            {
+                dst += DebugPrintF( inLevel,
+                                    "%*s" // Indention
+                                    "%s" // Separator (only if needed)
+                                    "%s" // Prefix
+                                    "%*s" // Label Spacing
+                                    "%s" // Separator
+                                    "%s" // Hex
+                                    "%s" // ASCII
+                                    "%s" // Byte Count
+                                    "%s", // Newline
+                                    inIndent, "",
+                                    ( src != start ) ? separator : "",
+                                    prefixString,
+                                    width, "",
+                                    ( width > 0 ) ? " " : "",
+                                    hexString,
+                                    asciiString,
+                                    byteCountString,
+                                    newline );
+            }
+        }
+
+        // Move to the next chunk. Exit if there is no more data.
+
+        offset      += (int) chunkSize;
+        src         += chunkSize;
+        inDataSize  -= chunkSize;
+        if( inDataSize == 0 )
+        {
+            break;
+        }
+    }
+
+    // Note: The "dst - outBuffer" size calculation works even if "outBuffer" is NULL because it's all relative.
+
+    return( (size_t)( dst - outBuffer ) );
+}
+
+//===========================================================================================================================
+//	DebugNumVersionToString
+//===========================================================================================================================
+
+static char *   DebugNumVersionToString( uint32_t inVersion, char *inString )
+{
+    char *      s;
+    uint8_t majorRev;
+    uint8_t minor;
+    uint8_t bugFix;
+    uint8_t stage;
+    uint8_t revision;
+
+    check( inString );
+
+    majorRev    = (uint8_t)( ( inVersion >> 24 ) & 0xFF );
+    minor       = (uint8_t)( ( inVersion >> 20 ) & 0x0F );
+    bugFix      = (uint8_t)( ( inVersion >> 16 ) & 0x0F );
+    stage       = (uint8_t)( ( inVersion >>  8 ) & 0xFF );
+    revision    = (uint8_t)(   inVersion         & 0xFF );
+
+    // Convert the major, minor, and bugfix numbers.
+
+    s  = inString;
+    s += sprintf( s, "%u", majorRev );
+    s += sprintf( s, ".%u", minor );
+    if( bugFix != 0 )
+    {
+        s += sprintf( s, ".%u", bugFix );
+    }
+
+    // Convert the version stage and non-release revision number.
+
+    switch( stage )
+    {
+    case kVersionStageDevelopment:
+        s += sprintf( s, "d%u", revision );
+        break;
+
+    case kVersionStageAlpha:
+        s += sprintf( s, "a%u", revision );
+        break;
+
+    case kVersionStageBeta:
+        s += sprintf( s, "b%u", revision );
+        break;
+
+    case kVersionStageFinal:
+
+        // A non-release revision of zero is a special case indicating the software is GM (at the golden master
+        // stage) and therefore, the non-release revision should not be added to the string.
+
+        if( revision != 0 )
+        {
+            s += sprintf( s, "f%u", revision );
+        }
+        break;
+
+    default:
+        dlog( kDebugLevelError, "invalid NumVersion stage (0x%02X)\n", stage );
+        break;
+    }
+    return( inString );
+}
+
+//===========================================================================================================================
+//	DebugTaskLevel
+//===========================================================================================================================
+
+DEBUG_EXPORT uint32_t   DebugTaskLevel( void )
+{
+    uint32_t level;
+
+    level = 0;
+
+#if ( TARGET_OS_VXWORKS )
+    if( intContext() )
+    {
+        level |= ( ( 1 << kDebugInterruptLevelShift ) & kDebugInterruptLevelMask );
+    }
+#endif
+
+    return( level );
+}
+
+#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
+//===========================================================================================================================
+//	DebugWinEnableConsole
+//===========================================================================================================================
+
+#pragma warning( disable:4311 )
+
+static void DebugWinEnableConsole( void )
+{
+    static bool sConsoleEnabled = false;
+    BOOL result;
+    int fileHandle;
+    FILE *          file;
+    int err;
+
+    if( sConsoleEnabled )
+    {
+        goto exit;
+    }
+
+    // Create console window.
+
+    result = AllocConsole();
+    require_quiet( result, exit );
+
+    // Redirect stdin to the console stdin.
+
+    fileHandle = _open_osfhandle( (long) GetStdHandle( STD_INPUT_HANDLE ), _O_TEXT );
+
+    #if ( defined( __MWERKS__ ) )
+    file = __handle_reopen( (unsigned long) fileHandle, "r", stdin );
+    require_quiet( file, exit );
+    #else
+    file = _fdopen( fileHandle, "r" );
+    require_quiet( file, exit );
+
+    *stdin = *file;
+    #endif
+
+    err = setvbuf( stdin, NULL, _IONBF, 0 );
+    require_noerr_quiet( err, exit );
+
+    // Redirect stdout to the console stdout.
+
+    fileHandle = _open_osfhandle( (long) GetStdHandle( STD_OUTPUT_HANDLE ), _O_TEXT );
+
+    #if ( defined( __MWERKS__ ) )
+    file = __handle_reopen( (unsigned long) fileHandle, "w", stdout );
+    require_quiet( file, exit );
+    #else
+    file = _fdopen( fileHandle, "w" );
+    require_quiet( file, exit );
+
+    *stdout = *file;
+    #endif
+
+    err = setvbuf( stdout, NULL, _IONBF, 0 );
+    require_noerr_quiet( err, exit );
+
+    // Redirect stderr to the console stdout.
+
+    fileHandle = _open_osfhandle( (long) GetStdHandle( STD_OUTPUT_HANDLE ), _O_TEXT );
+
+    #if ( defined( __MWERKS__ ) )
+    file = __handle_reopen( (unsigned long) fileHandle, "w", stderr );
+    require_quiet( file, exit );
+    #else
+    file = _fdopen( fileHandle, "w" );
+    require_quiet( file, exit );
+
+    *stderr = *file;
+    #endif
+
+    err = setvbuf( stderr, NULL, _IONBF, 0 );
+    require_noerr_quiet( err, exit );
+
+    sConsoleEnabled = true;
+
+exit:
+    return;
+}
+
+#pragma warning( default:4311 )
+
+#endif  // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE
+
+#if ( TARGET_OS_WIN32 )
+//===========================================================================================================================
+//	DebugWinCharToTCharString
+//===========================================================================================================================
+
+static TCHAR *
+DebugWinCharToTCharString(
+    const char *    inCharString,
+    size_t inCharCount,
+    TCHAR *         outTCharString,
+    size_t inTCharCountMax,
+    size_t *        outTCharCount )
+{
+    const char *        src;
+    TCHAR *             dst;
+    TCHAR *             end;
+
+    if( inCharCount == kSizeCString )
+    {
+        inCharCount = strlen( inCharString );
+    }
+    src = inCharString;
+    dst = outTCharString;
+    if( inTCharCountMax > 0 )
+    {
+        inTCharCountMax -= 1;
+        if( inTCharCountMax > inCharCount )
+        {
+            inTCharCountMax = inCharCount;
+        }
+
+        end = dst + inTCharCountMax;
+        while( dst < end )
+        {
+            *dst++ = (TCHAR) *src++;
+        }
+        *dst = 0;
+    }
+    if( outTCharCount )
+    {
+        *outTCharCount = (size_t)( dst - outTCharString );
+    }
+    return( outTCharString );
+}
+#endif
+
+#if 0
+#pragma mark -
+#pragma mark == Debugging ==
+#endif
+
+//===========================================================================================================================
+//	DebugServicesTest
+//===========================================================================================================================
+
+DEBUG_EXPORT OSStatus   DebugServicesTest( void )
+{
+    OSStatus err;
+    char s[ 512 ];
+    uint8_t *       p;
+    uint8_t data[] =
+    {
+        0x11, 0x22, 0x33, 0x44,
+        0x55, 0x66,
+        0x77, 0x88, 0x99, 0xAA,
+        0xBB, 0xCC, 0xDD,
+        0xEE,
+        0xFF,
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+        0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90, 0xA0,
+        0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71, 0x81, 0x91, 0xA1
+    };
+
+    debug_initialize( kDebugOutputTypeMetaConsole );
+
+    // check's
+
+    check( 0 && "SHOULD SEE: check" );
+    check( 1 && "SHOULD *NOT* SEE: check (valid)" );
+    check_string( 0, "SHOULD SEE: check_string" );
+    check_string( 1, "SHOULD *NOT* SEE: check_string (valid)" );
+    check_noerr( -123 );
+    check_noerr( 10038 );
+    check_noerr( 22 );
+    check_noerr( 0 );
+    check_noerr_string( -6712, "SHOULD SEE: check_noerr_string" );
+    check_noerr_string( 0, "SHOULD *NOT* SEE: check_noerr_string (valid)" );
+    check_translated_errno( 0 >= 0 && "SHOULD *NOT* SEE", -384, -999 );
+    check_translated_errno( -1 >= 0 && "SHOULD SEE", -384, -999 );
+    check_translated_errno( -1 >= 0 && "SHOULD SEE", 0, -999 );
+    check_ptr_overlap( "SHOULD *NOT* SEE" ? 10 : 0, 10, 22, 10 );
+    check_ptr_overlap( "SHOULD SEE" ? 10 : 0, 10,  5, 10 );
+    check_ptr_overlap( "SHOULD SEE" ? 10 : 0, 10, 12,  6 );
+    check_ptr_overlap( "SHOULD SEE" ? 12 : 0,  6, 10, 10 );
+    check_ptr_overlap( "SHOULD SEE" ? 12 : 0, 10, 10, 10 );
+    check_ptr_overlap( "SHOULD *NOT* SEE" ? 22 : 0, 10, 10, 10 );
+    check_ptr_overlap( "SHOULD *NOT* SEE" ? 10 : 0, 10, 20, 10 );
+    check_ptr_overlap( "SHOULD *NOT* SEE" ? 20 : 0, 10, 10, 10 );
+
+    // require's
+
+    require( 0 && "SHOULD SEE", require1 );
+    { err = kResponseErr; goto exit; }
+require1:
+    require( 1 && "SHOULD *NOT* SEE", require2 );
+    goto require2Good;
+require2:
+    { err = kResponseErr; goto exit; }
+require2Good:
+    require_string( 0 && "SHOULD SEE", require3, "SHOULD SEE: require_string" );
+    { err = kResponseErr; goto exit; }
+require3:
+    require_string( 1 && "SHOULD *NOT* SEE", require4, "SHOULD *NOT* SEE: require_string (valid)" );
+    goto require4Good;
+require4:
+    { err = kResponseErr; goto exit; }
+require4Good:
+    require_quiet( 0 && "SHOULD SEE", require5 );
+    { err = kResponseErr; goto exit; }
+require5:
+    require_quiet( 1 && "SHOULD *NOT* SEE", require6 );
+    goto require6Good;
+require6:
+    { err = kResponseErr; goto exit; }
+require6Good:
+    require_noerr( -1, require7 );
+    { err = kResponseErr; goto exit; }
+require7:
+    require_noerr( 0, require8 );
+    goto require8Good;
+require8:
+    { err = kResponseErr; goto exit; }
+require8Good:
+    require_noerr_string( -2, require9, "SHOULD SEE: require_noerr_string");
+    { err = kResponseErr; goto exit; }
+require9:
+    require_noerr_string( 0, require10, "SHOULD *NOT* SEE: require_noerr_string (valid)" );
+    goto require10Good;
+require10:
+    { err = kResponseErr; goto exit; }
+require10Good:
+    require_noerr_action_string( -3, require11, dlog( kDebugLevelMax, "action 1 (expected)\n" ), "require_noerr_action_string" );
+    { err = kResponseErr; goto exit; }
+require11:
+    require_noerr_action_string( 0, require12, dlog( kDebugLevelMax, "action 2\n" ), "require_noerr_action_string (valid)" );
+    goto require12Good;
+require12:
+    { err = kResponseErr; goto exit; }
+require12Good:
+    require_noerr_quiet( -4, require13 );
+    { err = kResponseErr; goto exit; }
+require13:
+    require_noerr_quiet( 0, require14 );
+    goto require14Good;
+require14:
+    { err = kResponseErr; goto exit; }
+require14Good:
+    require_noerr_action( -5, require15, dlog( kDebugLevelMax, "SHOULD SEE: action 3 (expected)\n" ) );
+    { err = kResponseErr; goto exit; }
+require15:
+    require_noerr_action( 0, require16, dlog( kDebugLevelMax, "SHOULD *NOT* SEE: action 4\n" ) );
+    goto require16Good;
+require16:
+    { err = kResponseErr; goto exit; }
+require16Good:
+    require_noerr_action_quiet( -4, require17, dlog( kDebugLevelMax, "SHOULD SEE: action 5 (expected)\n" ) );
+    { err = kResponseErr; goto exit; }
+require17:
+    require_noerr_action_quiet( 0, require18, dlog( kDebugLevelMax, "SHOULD *NOT* SEE: action 6\n" ) );
+    goto require18Good;
+require18:
+    { err = kResponseErr; goto exit; }
+require18Good:
+    require_action( 0 && "SHOULD SEE", require19, dlog( kDebugLevelMax, "SHOULD SEE: action 7 (expected)\n" ) );
+    { err = kResponseErr; goto exit; }
+require19:
+    require_action( 1 && "SHOULD *NOT* SEE", require20, dlog( kDebugLevelMax, "SHOULD *NOT* SEE: action 8\n" ) );
+    goto require20Good;
+require20:
+    { err = kResponseErr; goto exit; }
+require20Good:
+    require_action_quiet( 0, require21, dlog( kDebugLevelMax, "SHOULD SEE: action 9 (expected)\n" ) );
+    { err = kResponseErr; goto exit; }
+require21:
+    require_action_quiet( 1, require22, dlog( kDebugLevelMax, "SHOULD *NOT* SEE: action 10\n" ) );
+    goto require22Good;
+require22:
+    { err = kResponseErr; goto exit; }
+require22Good:
+    require_action_string( 0, require23, dlog( kDebugLevelMax, "SHOULD SEE: action 11 (expected)\n" ), "SHOULD SEE: require_action_string" );
+    { err = kResponseErr; goto exit; }
+require23:
+    require_action_string( 1, require24, dlog( kDebugLevelMax, "SHOULD *NOT* SEE: action 12\n" ), "SHOULD *NOT* SEE: require_action_string" );
+    goto require24Good;
+require24:
+    { err = kResponseErr; goto exit; }
+require24Good:
+
+#if ( defined( __MWERKS__ )  )
+    #if ( defined( __cplusplus ) && __option( exceptions ) )
+        #define COMPILER_HAS_EXCEPTIONS     1
+    #else
+        #define COMPILER_HAS_EXCEPTIONS     0
+    #endif
+#else
+    #if ( defined( __cplusplus ) )
+        #define COMPILER_HAS_EXCEPTIONS     1
+    #else
+        #define COMPILER_HAS_EXCEPTIONS     0
+    #endif
+#endif
+
+#if ( COMPILER_HAS_EXCEPTIONS )
+    try
+    {
+        require_throw( 1 && "SHOULD *NOT* SEE" );
+        require_throw( 0 && "SHOULD SEE" );
+    }
+    catch(... )
+    {
+        goto require26Good;
+    }
+    { err = kResponseErr; goto exit; }
+require26Good:
+#endif
+
+    // translate_errno
+
+    err = translate_errno( 1 != -1, -123, -567 );
+    require( ( err == 0 ) && "SHOULD *NOT* SEE", exit );
+
+    err = translate_errno( -1 != -1, -123, -567 );
+    require( ( err == -123 ) && "SHOULD *NOT* SEE", exit );
+
+    err = translate_errno( -1 != -1, 0, -567 );
+    require( ( err == -567 ) && "SHOULD *NOT* SEE", exit );
+
+    // debug_string
+
+    debug_string( "debug_string" );
+
+    // DebugSNPrintF
+
+    DebugSNPrintF( s, sizeof( s ), "%d", 1234 );
+    require_action( strcmp( s, "1234" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%X", 0x2345 );
+    require_action( strcmp( s, "2345" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%#s", "\05test" );
+    require_action( strcmp( s, "test" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%##s", "\03www\05apple\03com" );
+    require_action( strcmp( s, "www.apple.com." ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%ld", (long) INT32_C( 2147483647 ) );
+    require_action( strcmp( s, "2147483647" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%lu", (unsigned long) UINT32_C( 4294967295 ) );
+    require_action( strcmp( s, "4294967295" ) == 0, exit, err = -1 );
+
+    #if ( TYPE_LONGLONG_NATIVE )
+    DebugSNPrintF( s, sizeof( s ), "%lld", (long_long_compat) INT64_C( 9223372036854775807 ) );
+    require_action( strcmp( s, "9223372036854775807" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%lld", (long_long_compat) INT64_C( -9223372036854775807 ) );
+    require_action( strcmp( s, "-9223372036854775807" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%llu", (unsigned_long_long_compat) UINT64_C( 18446744073709551615 ) );
+    require_action( strcmp( s, "18446744073709551615" ) == 0, exit, err = -1 );
+    #endif
+
+    DebugSNPrintF( s, sizeof( s ), "%lb", (unsigned long) binary_32( 01111011, 01111011, 01111011, 01111011 ) );
+    require_action( strcmp( s, "1111011011110110111101101111011" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%C", 0x41624364 );  // 'AbCd'
+    require_action( strcmp( s, "AbCd" ) == 0, exit, err = -1 );
+
+    #if ( defined( MDNS_DEBUGMSGS ) )
+    {
+        mDNSAddr maddr;
+
+        memset( &maddr, 0, sizeof( maddr ) );
+        maddr.type = mDNSAddrType_IPv4;
+        maddr.ip.v4.b[ 0 ] = 127;
+        maddr.ip.v4.b[ 1 ] = 0;
+        maddr.ip.v4.b[ 2 ] = 0;
+        maddr.ip.v4.b[ 3 ] = 1;
+        DebugSNPrintF( s, sizeof( s ), "%#a", &maddr );
+        require_action( strcmp( s, "127.0.0.1" ) == 0, exit, err = -1 );
+
+        memset( &maddr, 0, sizeof( maddr ) );
+        maddr.type = mDNSAddrType_IPv6;
+        maddr.ip.v6.b[  0 ] = 0xFE;
+        maddr.ip.v6.b[  1 ] = 0x80;
+        maddr.ip.v6.b[ 15 ] = 0x01;
+        DebugSNPrintF( s, sizeof( s ), "%#a", &maddr );
+        require_action( strcmp( s, "FE80:0000:0000:0000:0000:0000:0000:0001" ) == 0, exit, err = -1 );
+    }
+    #endif
+
+    #if ( AF_INET )
+    {
+        struct sockaddr_in sa4;
+
+        memset( &sa4, 0, sizeof( sa4 ) );
+        sa4.sin_family      = AF_INET;
+        p                   = (uint8_t *) &sa4.sin_port;
+        p[ 0 ]              = (uint8_t)( ( 80 >> 8 ) & 0xFF );
+        p[ 1 ]              = (uint8_t)(   80        & 0xFF );
+        p                   = (uint8_t *) &sa4.sin_addr.s_addr;
+        p[ 0 ]              = (uint8_t)( ( INADDR_LOOPBACK >> 24 ) & 0xFF );
+        p[ 1 ]              = (uint8_t)( ( INADDR_LOOPBACK >> 16 ) & 0xFF );
+        p[ 2 ]              = (uint8_t)( ( INADDR_LOOPBACK >>  8 ) & 0xFF );
+        p[ 3 ]              = (uint8_t)(   INADDR_LOOPBACK         & 0xFF );
+        DebugSNPrintF( s, sizeof( s ), "%##a", &sa4 );
+        require_action( strcmp( s, "127.0.0.1:80" ) == 0, exit, err = -1 );
+    }
+    #endif
+
+    #if ( AF_INET6 )
+    {
+        struct sockaddr_in6 sa6;
+
+        memset( &sa6, 0, sizeof( sa6 ) );
+        sa6.sin6_family             = AF_INET6;
+        p                           = (uint8_t *) &sa6.sin6_port;
+        p[ 0 ]                      = (uint8_t)( ( 80 >> 8 ) & 0xFF );
+        p[ 1 ]                      = (uint8_t)(   80        & 0xFF );
+        sa6.sin6_addr.s6_addr[  0 ] = 0xFE;
+        sa6.sin6_addr.s6_addr[  1 ] = 0x80;
+        sa6.sin6_addr.s6_addr[ 15 ] = 0x01;
+        sa6.sin6_scope_id           = 2;
+        DebugSNPrintF( s, sizeof( s ), "%##a", &sa6 );
+        require_action( strcmp( s, "[FE80:0000:0000:0000:0000:0000:0000:0001%2]:80" ) == 0, exit, err = -1 );
+    }
+    #endif
+
+    // Unicode
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "tes" );
+    require_action( strcmp( s, "tes" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "test" );
+    require_action( strcmp( s, "test" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "testing" );
+    require_action( strcmp( s, "test" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "te\xC3\xA9" );
+    require_action( strcmp( s, "te\xC3\xA9" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "te\xC3\xA9ing" );
+    require_action( strcmp( s, "te\xC3\xA9" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "tes\xC3\xA9ing" );
+    require_action( strcmp( s, "tes" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "t\xed\x9f\xbf" );
+    require_action( strcmp( s, "t\xed\x9f\xbf" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "t\xed\x9f\xbfing" );
+    require_action( strcmp( s, "t\xed\x9f\xbf" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "te\xed\x9f\xbf" );
+    require_action( strcmp( s, "te" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 4, "te\xed\x9f\xbfing" );
+    require_action( strcmp( s, "te" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 7, "te\xC3\xA9\xed\x9f\xbfing" );
+    require_action( strcmp( s, "te\xC3\xA9\xed\x9f\xbf" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 6, "te\xC3\xA9\xed\x9f\xbfing" );
+    require_action( strcmp( s, "te\xC3\xA9" ) == 0, exit, err = kResponseErr );
+
+    DebugSNPrintF(s, sizeof(s), "%.*s", 5, "te\xC3\xA9\xed\x9f\xbfing" );
+    require_action( strcmp( s, "te\xC3\xA9" ) == 0, exit, err = kResponseErr );
+
+    #if ( TARGET_RT_BIG_ENDIAN )
+    DebugSNPrintF( s, sizeof( s ), "%S", "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" );
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+    #else
+    DebugSNPrintF( s, sizeof( s ), "%S", "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" "\x00" );
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+    #endif
+
+    DebugSNPrintF( s, sizeof( s ), "%S",
+                   "\xFE\xFF" "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" ); // Big Endian BOM
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%S",
+                   "\xFF\xFE" "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" "\x00" ); // Little Endian BOM
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%#S", "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" );  // Big Endian
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%##S", "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" "\x00" "\x00" ); // Little Endian
+    require_action( strcmp( s, "abcd" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%.*S",
+                   4, "\xFE\xFF" "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" ); // Big Endian BOM
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%.*S",
+                   4, "\xFF\xFE" "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" ); // Little Endian BOM
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+
+    #if ( TARGET_RT_BIG_ENDIAN )
+    DebugSNPrintF( s, sizeof( s ), "%.*S", 3, "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" );
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+    #else
+    DebugSNPrintF( s, sizeof( s ), "%.*S", 3, "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" );
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+    #endif
+
+    DebugSNPrintF( s, sizeof( s ), "%#.*S", 3, "\x00" "a" "\x00" "b" "\x00" "c" "\x00" "d" );   // Big Endian
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%##.*S", 3, "a" "\x00" "b" "\x00" "c" "\x00" "d" "\x00" );  // Little Endian
+    require_action( strcmp( s, "abc" ) == 0, exit, err = -1 );
+
+    // Misc
+
+    DebugSNPrintF( s, sizeof( s ), "%U", "\x10\xb8\xa7\x6b" "\xad\x9d" "\xd1\x11" "\x80\xb4" "\x00\xc0\x4f\xd4\x30\xc8" );
+    require_action( strcmp( s, "6ba7b810-9dad-11d1-80b4-00c04fd430c8" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%m", 0 );
+    require_action( strcmp( s, "no error" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "%lm", (long) 0 );
+    require_action( strcmp( s, "no error" ) == 0, exit, err = -1 );
+
+    DebugSNPrintF( s, sizeof( s ), "\"%H\"", "\x6b\xa7\xb8\x10\x9d\xad\x11\xd1\x80\xb4\x00\xc0\x4f\xd4\x30\xc8", 16, 16 );
+    DebugPrintF( kDebugLevelMax, "%s\n\n", s );
+
+    DebugSNPrintF( s, sizeof( s ), "\"%H\"",
+                   "\x6b\xa7\xb8\x10\x9d\xad\x11\xd1\x80\xb4\x00\xc0\x4f\xd4\x30\xc8"
+                   "\x6b\xa7\xb8\x10\x9d\xad\x11\xd1\x80\xb4\x00\xc0\x4f\xd4\x30\xc8",
+                   32, 32 );
+    DebugPrintF( kDebugLevelMax, "%s\n\n", s );
+
+    DebugSNPrintF( s, sizeof( s ), "\"%H\"", "\x6b\xa7", 2, 2 );
+    DebugPrintF( kDebugLevelMax, "%s\n\n", s );
+
+    // Hex Dumps
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, "My Label", kSizeCString, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNone, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoAddress | kDebugFlagsNoOffset, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, "My Label", kSizeCString, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoAddress | kDebugFlagsNoOffset, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, "My Label", kSizeCString, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoAddress, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoOffset, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoAddress, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoOffset, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoByteCount, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, "\x41\x62\x43\x64", "\x41\x62\x43\x64", 4,    // 'AbCd'
+                  kDebugFlagsNoAddress | kDebugFlagsNoOffset | kDebugFlagsNoNewLine |
+                  kDebugFlagsNo32BitSeparator | kDebugFlagsNo16ByteHexPad | kDebugFlagsNoByteCount,
+                  s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 0, NULL, 0, 0, NULL, 0, data, data, sizeof( data ),
+                  kDebugFlagsNoAddress | kDebugFlagsNoOffset | kDebugFlagsNoASCII | kDebugFlagsNoNewLine |
+                  kDebugFlags16BitSeparator | kDebugFlagsNo32BitSeparator |
+                  kDebugFlagsNo16ByteHexPad | kDebugFlagsNoByteCount, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    s[ 0 ] = '\0';
+    DebugHexDump( kDebugLevelMax, 8, NULL, 0, 0, NULL, 0, data, data, sizeof( data ), kDebugFlagsNone, s, sizeof( s ) );
+    DebugPrintF( kDebugLevelMax, "%s\n", s );
+
+    // dlog's
+
+    dlog( kDebugLevelNotice, "dlog\n" );
+    dlog( kDebugLevelNotice, "dlog integer: %d\n", 123 );
+    dlog( kDebugLevelNotice, "dlog string:  \"%s\"\n", "test string" );
+    dlogmem( kDebugLevelNotice, data, sizeof( data ) );
+
+    // Done
+
+    DebugPrintF( kDebugLevelMax, "\n\nALL TESTS DONE\n\n" );
+    err = kNoErr;
+
+exit:
+    if( err )
+    {
+        DebugPrintF( kDebugLevelMax, "\n\n### TEST FAILED ###\n\n" );
+    }
+    return( err );
+}
+
+#endif  // DEBUG
diff --git a/mDNSResponder/mDNSShared/DebugServices.h b/mDNSResponder/mDNSShared/DebugServices.h
new file mode 100644
index 00000000..108f7f5f
--- /dev/null
+++ b/mDNSResponder/mDNSShared/DebugServices.h
@@ -0,0 +1,1607 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@header		DebugServices
+
+    Debugging Library
+ */
+
+#ifndef __DEBUG_SERVICES__
+#define __DEBUG_SERVICES__
+
+#include    <stdarg.h>
+
+#include    "CommonServices.h"
+
+#if ( TARGET_OS_VXWORKS )
+    #include    "logLib.h"
+#endif
+
+#if 0
+#pragma mark == Settings ==
+#endif
+
+//===========================================================================================================================
+//	Settings
+//===========================================================================================================================
+
+// General
+
+#if ( !defined( DEBUG ) )
+    #define DEBUG       0
+#endif
+
+#if ( defined( NDEBUG ) && DEBUG )
+    #error NDEBUG defined and DEBUG is also enabled...they need to be in-sync
+#endif
+
+// AssertMacros.h/Debugging.h overrides.
+
+#if ( !defined( DEBUG_OVERRIDE_APPLE_MACROS ) )
+    #define DEBUG_OVERRIDE_APPLE_MACROS     1
+#endif
+
+// Routine name. Uses ISO __func__ where possible. Otherwise, uses the best thing that is available (if anything).
+
+#if ( defined( __MWERKS__ ) || ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 9 ) ) )
+    #define __ROUTINE__                 __func__
+#elif ( defined( __GNUC__ ) )
+    #define __ROUTINE__                 __PRETTY_FUNCTION__
+#elif ( defined( _MSC_VER ) && !defined( _WIN32_WCE ) )
+    #define __ROUTINE__                 __FUNCTION__
+#else
+    #define __ROUTINE__                 ""
+#endif
+
+// Variable argument macro support. Use ANSI C99 __VA_ARGS__ where possible. Otherwise, use the next best thing.
+
+#if ( defined( __GNUC__ ) )
+    #if ( ( __GNUC__ > 3 ) || ( ( __GNUC__ == 3 ) && ( __GNUC_MINOR__ >= 3) ) )
+        #define DEBUG_C99_VA_ARGS       1
+        #define DEBUG_GNU_VA_ARGS       0
+    #else
+        #define DEBUG_C99_VA_ARGS       0
+        #define DEBUG_GNU_VA_ARGS       1
+    #endif
+#elif ( defined( __MWERKS__ ) )
+    #define DEBUG_C99_VA_ARGS           1
+    #define DEBUG_GNU_VA_ARGS           0
+#else
+    #define DEBUG_C99_VA_ARGS           0
+    #define DEBUG_GNU_VA_ARGS           0
+#endif
+
+#if 0
+#pragma mark == Output ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_FPRINTF_ENABLED
+
+    @abstract	Enables ANSI C fprintf output.
+ */
+
+#if ( !defined( DEBUG_FPRINTF_ENABLED ) )
+    #if ( !TARGET_API_MAC_OSX_KERNEL && !TARGET_OS_WINDOWS_CE )
+        #define DEBUG_FPRINTF_ENABLED           1
+    #else
+        #define DEBUG_FPRINTF_ENABLED           0
+    #endif
+#else
+    #if ( TARGET_API_MAC_OSX_KERNEL || TARGET_OS_WINDOWS_CE )
+        #error fprintf enabled, but not supported on Mac OS X kernel or Windows CE
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_MAC_OS_X_IOLOG_ENABLED
+
+    @abstract	Enables IOLog (Mac OS X Kernel) output.
+ */
+
+#if ( !defined( DEBUG_MAC_OS_X_IOLOG_ENABLED ) )
+    #define DEBUG_MAC_OS_X_IOLOG_ENABLED        TARGET_API_MAC_OSX_KERNEL
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_KPRINTF_ENABLED
+
+    @abstract	Enables kprintf (Mac OS X Kernel) output.
+ */
+
+#if ( !defined( DEBUG_KPRINTF_ENABLED ) )
+    #define DEBUG_KPRINTF_ENABLED               TARGET_API_MAC_OSX_KERNEL
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_IDEBUG_ENABLED
+
+    @abstract	Enables iDebug (Mac OS X user and Kernel) output.
+
+    @discussion
+
+    For Mac OS X kernel development, iDebug is enabled by default because we can dynamically check for the presence
+    of iDebug via some exported IOKit symbols. Mac OS X app usage doesn't allow dynamic detection because it relies
+    on statically linking to the iDebugServices.cp file so for Mac OS X app usage, you have to manually enable iDebug.
+ */
+
+#if ( !defined( DEBUG_IDEBUG_ENABLED ) )
+    #define DEBUG_IDEBUG_ENABLED                TARGET_API_MAC_OSX_KERNEL
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_CORE_SERVICE_ASSERTS_ENABLED
+
+    @abstract	Controls whether Core Services assert handling is enabled. Enabling requires CoreServices framework.
+ */
+
+#if ( !defined( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) )
+    #if ( defined( __DEBUGGING__ ) )
+        #define DEBUG_CORE_SERVICE_ASSERTS_ENABLED      1
+    #else
+        #define DEBUG_CORE_SERVICE_ASSERTS_ENABLED      0
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugOutputType
+
+    @abstract	Type of debug output (i.e. where the output goes).
+ */
+
+typedef uint32_t DebugOutputType;
+
+#define kDebugOutputTypeNone                0x6E6F6E65U // 'none' - no params
+#define kDebugOutputTypeCustom              0x63757374U // 'cust' - 1st param = function ptr, 2nd param = context
+#define kDebugOutputTypeFPrintF             0x66707269U // 'fpri' - 1st param = DebugOutputTypeFlags [, 2nd param = filename]
+#define kDebugOutputTypeiDebug              0x69646267U // 'idbg' - no params
+#define kDebugOutputTypeKPrintF             0x6B707266U // 'kprf' - no params
+#define kDebugOutputTypeMacOSXIOLog         0x696C6F67U // 'ilog' - no params
+#define kDebugOutputTypeMacOSXLog           0x786C6F67U // 'xlog' - no params
+#define kDebugOutputTypeWindowsDebugger     0x77696E64U // 'wind' - no params
+#define kDebugOutputTypeWindowsEventLog     0x7765766CU // 'wevl' - 1st param = C-string name, 2nd param = HMODULE or NULL.
+
+// Console meta output kind - Any kind of Console output (in horizontal order of preference):
+//
+// Mac OS X			= ANSI printf (viewable in Console.app)
+// Mac OS X Kernel	= IOLog (/var/log/system.log) or kprintf (serial).
+// Windows			= ANSI printf (Console window) or OutputDebugString (debugger).
+// Other			= ANSI printf (viewer varies).
+
+#define kDebugOutputTypeMetaConsole         0x434F4E53U // 'CONS' - no params
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugOutputTypeFlags
+
+    @abstract	Flags controlling how the output type is configured.
+
+    @constant	kDebugOutputTypeFlagsTypeMask	Bit mask for the output type (e.g. stdout, stderr, file, etc.).
+    @constant	kDebugOutputTypeFlagsStdOut		fprintf should go to stdout.
+    @constant	kDebugOutputTypeFlagsStdErr		fprintf should go to stderr.
+    @constant	kDebugOutputTypeFlagsFile		fprintf should go to a specific file (filename passed as va_arg).
+ */
+
+typedef unsigned int DebugOutputTypeFlags;
+
+#define kDebugOutputTypeFlagsTypeMask   0xF
+#define kDebugOutputTypeFlagsStdOut     1
+#define kDebugOutputTypeFlagsStdErr     2
+#define kDebugOutputTypeFlagsFile       10
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugOutputFunctionPtr
+
+    @abstract	Function ptr for a custom callback to print debug output.
+ */
+
+typedef void ( *DebugOutputFunctionPtr )( char *inData, size_t inSize, void *inContext );
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#if 0
+#pragma mark == Flags ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugFlags
+
+    @abstract	Flags controlling how output is printed.
+ */
+
+typedef uint32_t DebugFlags;
+
+#define kDebugFlagsNone                 0
+#define kDebugFlagsNoAddress            ( 1 << 0 )
+#define kDebugFlagsNoOffset             ( 1 << 1 )
+#define kDebugFlags32BitOffset          ( 1 << 2 )
+#define kDebugFlagsNoASCII              ( 1 << 3 )
+#define kDebugFlagsNoNewLine            ( 1 << 4 )
+#define kDebugFlags8BitSeparator        ( 1 << 5 )
+#define kDebugFlags16BitSeparator       ( 1 << 6 )
+#define kDebugFlagsNo32BitSeparator     ( 1 << 7 )
+#define kDebugFlagsNo16ByteHexPad       ( 1 << 8 )
+#define kDebugFlagsNoByteCount          ( 1 << 9 )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@enum		DebugTaskLevelFlags
+
+    @abstract	Flags indicating the task level.
+ */
+
+enum
+{
+    kDebugInterruptLevelShift               = 0,
+    kDebugInterruptLevelMask                = 0x00000007,
+    kDebugInVBLTaskMask                     = 0x00000010,
+    kDebugInDeferredTaskMask                = 0x00000020,
+    kDebugInSecondaryInterruptHandlerMask   = 0x00000040,
+    kDebugPageFaultFatalMask                = 0x00000100,   // There should be a "kPageFaultFatalMask" in Debugging.h.
+    kDebugMPTaskLevelMask                   = 0x00000200,   // There should be a "kMPTaskLevelMask" in Debugging.h.
+    kDebugInterruptDepthShift               = 16,
+    kDebugInterruptDepthMask                = 0x00FF0000
+};
+
+#define DebugExtractTaskLevelInterruptLevel( LEVEL )    \
+    ( ( ( LEVEL ) &kDebugInterruptLevelMask ) >> kDebugInterruptLevelShift )
+
+#define DebugExtractTaskLevelInterruptDepth( LEVEL )    \
+    ( ( ( LEVEL ) &kDebugInterruptDepthMask ) >> kDebugInterruptDepthShift )
+
+#if 0
+#pragma mark == Levels ==
+#endif
+
+//===========================================================================================================================
+//	Constants & Types - Levels
+//===========================================================================================================================
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugLevel
+
+    @abstract	Level used to control debug logging.
+ */
+
+typedef int32_t DebugLevel;
+
+// Levels
+
+#define kDebugLevelMask                 0x0000FFFF
+#define kDebugLevelChatty               100
+#define kDebugLevelVerbose              500
+#define kDebugLevelTrace                800
+#define kDebugLevelInfo                 1000
+#define kDebugLevelNotice               3000
+#define kDebugLevelWarning              5000
+#define kDebugLevelAssert               6000
+#define kDebugLevelRequire              7000
+#define kDebugLevelError                8000
+#define kDebugLevelCritical             9000
+#define kDebugLevelAlert                10000
+#define kDebugLevelEmergency            11000
+#define kDebugLevelTragic               12000
+#define kDebugLevelMax                  0x0000FFFF
+
+// Level Flags
+
+#define kDebugLevelFlagMask             0xFFFF0000
+#define kDebugLevelFlagStackTrace       0x00010000
+#define kDebugLevelFlagDebugBreak       0x00020000
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	LogLevel
+
+    @abstract	Level used to control which events are logged.
+ */
+
+typedef int32_t LogLevel;
+
+#define kLogLevelUninitialized      -1L
+#define kLogLevelAll                0L
+#define kLogLevelChatty             100L
+#define kLogLevelVerbose            500L
+#define kLogLevelTrace              800L
+#define kLogLevelInfo               1000L
+#define kLogLevelNotice             3000L
+#define kLogLevelWarning            4000L
+#define kLogLevelAssert             6000L
+#define kLogLevelRequire            7000L
+#define kLogLevelError              8000L
+#define kLogLevelCritical           9000L
+#define kLogLevelAlert              10000L
+#define kLogLevelEmergency          11000L
+#define kLogLevelTragic             12000L
+#define kLogLevelOff                0x0000FFFEL
+
+#if 0
+#pragma mark == Properties ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	DebugPropertyTag
+
+    @abstract	Tag for properties.
+ */
+
+typedef uint32_t DebugPropertyTag;
+
+#define kDebugPropertyTagPrintLevelMin      0x6D696E70U     // 'minp'	Get: 1st param = DebugLevel *
+                                                            //			Set: 1st param = DebugLevel
+
+#define kDebugPropertyTagPrintLevel         kDebugPropertyTagPrintLevelMin
+
+#define kDebugPropertyTagPrintLevelMax      0x706D786CU     // 'maxp'	Get: 1st param = DebugLevel *
+                                                            //			Set: 1st param = DebugLevel
+
+#define kDebugPropertyTagBreakLevel         0x62726B6CU     // 'brkl'	Get: 1st param = DebugLevel *
+                                                            //			Set: 1st param = DebugLevel
+#if 0
+#pragma mark == General macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_UNUSED
+
+    @abstract	Macro to mark a paramter as unused to avoid unused parameter warnings.
+
+    @discussion
+
+    There is no universally supported pragma/attribute for indicating a variable is unused. DEBUG_UNUSED lets us
+    indicate a variable is unused in a manner that is supported by most compilers.
+ */
+
+#define DEBUG_UNUSED( X )           (void)( X )
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_USE_ONLY
+
+    @abstract	Macro to mark a variable as used only when debugging is enabled.
+
+    @discussion
+
+    Variables are sometimes needed only for debugging. When debugging is turned off, these debug-only variables generate
+    compiler warnings about unused variables. To eliminate these warnings, use these macros to indicate variables that
+    are only used for debugging.
+ */
+
+#if ( DEBUG )
+    #define DEBUG_USE_ONLY( X )
+#else
+    #define DEBUG_USE_ONLY( X )     (void)( X )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_LOCAL
+
+    @abstract	Macros to make variables and functions static when debugging is off, but extern when debugging is on.
+
+    @discussion
+
+    Rather than using "static" directly, using this macros allows you to access these variables external while
+    debugging without being penalized for production builds.
+ */
+
+#if ( DEBUG )
+    #define DEBUG_LOCAL
+#else
+    #define DEBUG_LOCAL         static
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_STATIC
+
+    @abstract	Macros to make variables and functions static when debugging is off, but extern when debugging is on.
+
+    @discussion
+
+    Rather than using "static" directly, using this macros allows you to access these variables external while
+    debugging without being penalized for production builds.
+ */
+
+#if ( DEBUG )
+    #define DEBUG_STATIC
+#else
+    #define DEBUG_STATIC    static
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DEBUG_EXPORT
+
+    @abstract	Macros to export variables.
+
+    @discussion
+
+    "__private_extern__" is a hack for IOKit to allow symbols to be exported from compilation units, but
+    // not exported outside a driver (IOKit uses a lame global namespace for symbols). This still does not
+    // solve the problem of multiple drivers in the same dependency chain since they share symbols.
+ */
+
+#if ( TARGET_API_MAC_OSX_KERNEL )
+    #define DEBUG_EXPORT        __private_extern__
+#else
+    #define DEBUG_EXPORT        extern
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	debug_add
+
+    @abstract	Macro to add (or subtract if negative) a value when debugging is on. Does nothing if debugging is off.
+ */
+
+#if ( DEBUG )
+    #define debug_add( A, B )       ( A ) += ( B )
+#else
+    #define debug_add( A, B )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	debug_perform
+
+    @abstract	Macro to perform something in debug-only builds.
+ */
+
+#if ( DEBUG )
+    #define debug_perform( X )      do { X; } while( 0 )
+#else
+    #define debug_perform( X )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	translate_errno
+
+    @abstract	Returns 0 if the test success. If the test fails, returns errno if non-zero and othewise the alternate error.
+ */
+
+#define translate_errno( TEST, ERRNO, ALTERNATE_ERROR )     ( ( TEST ) ? 0 : ( ERRNO ) ? ( ERRNO ) : ( ALTERNATE_ERROR ) )
+
+#if 0
+#pragma mark == Compile Time macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_compile_time
+
+    @abstract	Performs a compile-time check of something such as the size of an int.
+
+    @discussion
+
+    This declares an array with a size that is determined by a compile-time expression. If the expression evaluates
+    to 0, the array has a size of -1, which is illegal and generates a compile-time error.
+
+    For example:
+
+    check_compile_time( sizeof( int ) == 4 );
+
+    Note: This only works with compile-time expressions.
+    Note: This only works in places where extern declarations are allowed (e.g. global scope).
+
+    References:
+
+    <http://www.jaggersoft.com/pubs/CVu11_3.html>
+    <http://www.jaggersoft.com/pubs/CVu11_5.html>
+
+    Note: The following macros differ from the macros on the www.jaggersoft.com web site because those versions do not
+    work with GCC due to GCC allow a zero-length array. Using a -1 condition turned out to be more portable.
+ */
+
+#define check_compile_time( X )     extern int debug_compile_time_name[ ( X ) ? 1 : -1 ]
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_compile_time_code
+
+    @abstract	Perform a compile-time check, suitable for placement in code, of something such as the size of an int.
+
+    @discussion
+
+    This creates a switch statement with an existing case for 0 and an additional case using the result of a
+    compile-time expression. A switch statement cannot have two case labels with the same constant so if the
+    compile-time expression evaluates to 0, it is illegal and generates a compile-time error. If the compile-time
+    expression does not evaluate to 0, the resulting value is used as the case label and it compiles without error.
+
+    For example:
+
+    check_compile_time_code( sizeof( int ) == 4 );
+
+    Note: This only works with compile-time expressions.
+    Note: This does not work in a global scope so it must be inside a function.
+
+    References:
+
+    <http://www.jaggersoft.com/pubs/CVu11_3.html>
+    <http://www.jaggersoft.com/pubs/CVu11_5.html>
+ */
+
+#define check_compile_time_code( X )    switch( 0 ) { case 0: case X:; }
+
+#if 0
+#pragma mark == check macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check
+
+    @abstract	Check that an expression is true (non-zero).
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method.
+
+    Code inside check() statements is not compiled into production builds.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef check
+#endif
+#if ( !defined( check ) )
+    #if ( DEBUG )
+        #define check( X )                                                                                  \
+    do                                                                                              \
+    {                                                                                               \
+        if( !( X ) )                                                                                \
+        {                                                                                           \
+            debug_print_assert( 0, # X, NULL, __FILE__, __LINE__, __ROUTINE__ );                     \
+        }                                                                                           \
+    } while( 0 )
+    #else
+        #define check( X )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_string
+
+    @abstract	Check that an expression is true (non-zero) with an explanation.
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) and a custom explanation string using the default debugging output method.
+
+    Code inside check_string() statements is not compiled into production builds.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef check_string
+#endif
+#if ( !defined( check_string ) )
+    #if ( DEBUG )
+        #define check_string( X, STR )                                                                      \
+    do                                                                                              \
+    {                                                                                               \
+        if( !( X ) )                                                                                \
+        {                                                                                           \
+            debug_print_assert( 0, # X, STR, __FILE__, __LINE__, __ROUTINE__ );                      \
+        }                                                                                           \
+                                                                                                            \
+    }   while( 0 )
+    #else
+        #define check_string( X, STR )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_noerr
+
+    @abstract	Check that an error code is noErr (0).
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method.
+
+    Code inside check_noerr() statements is not compiled into production builds.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef check_noerr
+#endif
+#if ( !defined( check_noerr ) )
+    #if ( DEBUG )
+        #define check_noerr( ERR )                                                                          \
+    do                                                                                              \
+    {                                                                                               \
+        int_least32_t localErr;                                                               \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                          \
+        if( localErr != 0 )                                                                         \
+        {                                                                                           \
+            debug_print_assert( localErr, NULL, NULL, __FILE__, __LINE__, __ROUTINE__ );            \
+        }                                                                                           \
+                                                                                                            \
+    }   while( 0 )
+    #else
+        #define check_noerr( ERR )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_noerr_string
+
+    @abstract	Check that an error code is noErr (0) with an explanation.
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) and a custom explanation string using the default debugging output method.
+
+    Code inside check_noerr_string() statements is not compiled into production builds.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef check_noerr_string
+#endif
+#if ( !defined( check_noerr_string ) )
+    #if ( DEBUG )
+        #define check_noerr_string( ERR, STR )                                                              \
+    do                                                                                              \
+    {                                                                                               \
+        int_least32_t localErr;                                                               \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                          \
+        if( localErr != 0 )                                                                         \
+        {                                                                                           \
+            debug_print_assert( localErr, NULL, STR, __FILE__, __LINE__, __ROUTINE__ );             \
+        }                                                                                           \
+                                                                                                            \
+    }   while( 0 )
+    #else
+        #define check_noerr_string( ERR, STR )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_translated_errno
+
+    @abstract	Check a condition and prints errno (if non-zero) to the log.
+
+    @discussion
+
+    Code inside check_translated_errno() statements is not compiled into production builds.
+ */
+
+#if ( !defined( check_translated_errno ) )
+    #if ( DEBUG )
+        #define check_translated_errno( TEST, ERRNO, ALTERNATE_ERROR )                                      \
+    do                                                                                              \
+    {                                                                                               \
+        if( !( TEST ) )                                                                             \
+        {                                                                                           \
+            int_least32_t localErr;                                                           \
+                                                                                                            \
+            localErr = (int_least32_t)( ERRNO );                                                    \
+            localErr = ( localErr != 0 ) ? localErr : (int_least32_t)( ALTERNATE_ERROR );           \
+            debug_print_assert( localErr, # TEST, NULL, __FILE__, __LINE__, __ROUTINE__ );           \
+        }                                                                                           \
+                                                                                                            \
+    }   while( 0 )
+    #else
+        #define check_translated_errno( TEST, ERRNO, ALTERNATE_ERROR )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	check_ptr_overlap
+
+    @abstract	Checks that two ptrs do not overlap.
+ */
+
+#define check_ptr_overlap( P1, P1_SIZE, P2, P2_SIZE )                                       \
+    do                                                                                      \
+    {                                                                                       \
+        check( !( ( (uintptr_t)( P1 ) >=     (uintptr_t)( P2 ) ) &&                         \
+                  ( (uintptr_t)( P1 ) <  ( ( (uintptr_t)( P2 ) ) + ( P2_SIZE ) ) ) ) );     \
+        check( !( ( (uintptr_t)( P2 ) >=     (uintptr_t)( P1 ) ) &&                         \
+                  ( (uintptr_t)( P2 ) <  ( ( (uintptr_t)( P1 ) ) + ( P1_SIZE ) ) ) ) );     \
+                                                                                            \
+    }   while( 0 )
+
+#if 0
+#pragma mark == require macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require
+
+    @abstract	Requires that an expression evaluate to true.
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method then jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require
+#endif
+#if ( !defined( require ) )
+    #define require( X, LABEL )                                                                             \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            debug_print_assert( 0, # X, NULL, __FILE__, __LINE__, __ROUTINE__ );                         \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_string
+
+    @abstract	Requires that an expression evaluate to true with an explanation.
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) and a custom explanation string using the default debugging output method then jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_string
+#endif
+#if ( !defined( require_string ) )
+    #define require_string( X, LABEL, STR )                                                                 \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            debug_print_assert( 0, # X, STR, __FILE__, __LINE__, __ROUTINE__ );                          \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_quiet
+
+    @abstract	Requires that an expression evaluate to true.
+
+    @discussion
+
+    If expression evalulates to false, this jumps to a label. No debugging information is printed.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_quiet
+#endif
+#if ( !defined( require_quiet ) )
+    #define require_quiet( X, LABEL )                                                                       \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr
+
+    @abstract	Require that an error code is noErr (0).
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method then jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr
+#endif
+#if ( !defined( require_noerr ) )
+    #define require_noerr( ERR, LABEL )                                                                     \
+    do                                                                                                  \
+    {                                                                                                   \
+        int_least32_t localErr;                                                                   \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                              \
+        if( localErr != 0 )                                                                             \
+        {                                                                                               \
+            debug_print_assert( localErr, NULL, NULL, __FILE__, __LINE__, __ROUTINE__ );                \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr_string
+
+    @abstract	Require that an error code is noErr (0).
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.), and a custom explanation string using the default debugging output method using the
+    default debugging output method then jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr_string
+#endif
+#if ( !defined( require_noerr_string ) )
+    #define require_noerr_string( ERR, LABEL, STR )                                                         \
+    do                                                                                                  \
+    {                                                                                                   \
+        int_least32_t localErr;                                                                   \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                              \
+        if( localErr != 0 )                                                                             \
+        {                                                                                               \
+            debug_print_assert( localErr, NULL, STR, __FILE__, __LINE__, __ROUTINE__ );                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr_action_string
+
+    @abstract	Require that an error code is noErr (0).
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.), and a custom explanation string using the default debugging output method using the
+    default debugging output method then executes an action and jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr_action_string
+#endif
+#if ( !defined( require_noerr_action_string ) )
+    #define require_noerr_action_string( ERR, LABEL, ACTION, STR )                                          \
+    do                                                                                                  \
+    {                                                                                                   \
+        int_least32_t localErr;                                                                   \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                              \
+        if( localErr != 0 )                                                                             \
+        {                                                                                               \
+            debug_print_assert( localErr, NULL, STR, __FILE__, __LINE__, __ROUTINE__ );                 \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr_quiet
+
+    @abstract	Require that an error code is noErr (0).
+
+    @discussion
+
+    If the error code is non-0, this jumps to a label. No debugging information is printed.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr_quiet
+#endif
+#if ( !defined( require_noerr_quiet ) )
+    #define require_noerr_quiet( ERR, LABEL )                                                               \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( ( ERR ) != 0 )                                                                              \
+        {                                                                                               \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr_action
+
+    @abstract	Require that an error code is noErr (0) with an action to execute otherwise.
+
+    @discussion
+
+    If the error code is non-0, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method then executes an action and jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr_action
+#endif
+#if ( !defined( require_noerr_action ) )
+    #define require_noerr_action( ERR, LABEL, ACTION )                                                      \
+    do                                                                                                  \
+    {                                                                                                   \
+        int_least32_t localErr;                                                                   \
+                                                                                                            \
+        localErr = (int_least32_t)( ERR );                                                              \
+        if( localErr != 0 )                                                                             \
+        {                                                                                               \
+            debug_print_assert( localErr, NULL, NULL, __FILE__, __LINE__, __ROUTINE__ );                \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_noerr_action_quiet
+
+    @abstract	Require that an error code is noErr (0) with an action to execute otherwise.
+
+    @discussion
+
+    If the error code is non-0, this executes an action and jumps to a label. No debugging information is printed.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_noerr_action_quiet
+#endif
+#if ( !defined( require_noerr_action_quiet ) )
+    #define require_noerr_action_quiet( ERR, LABEL, ACTION )                                                \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( ( ERR ) != 0 )                                                                              \
+        {                                                                                               \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_action
+
+    @abstract	Requires that an expression evaluate to true with an action to execute otherwise.
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) using the default debugging output method then executes an action and jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_action
+#endif
+#if ( !defined( require_action ) )
+    #define require_action( X, LABEL, ACTION )                                                              \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            debug_print_assert( 0, # X, NULL, __FILE__, __LINE__, __ROUTINE__ );                         \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_action_quiet
+
+    @abstract	Requires that an expression evaluate to true with an action to execute otherwise.
+
+    @discussion
+
+    If expression evalulates to false, this executes an action and jumps to a label. No debugging information is printed.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_action_quiet
+#endif
+#if ( !defined( require_action_quiet ) )
+    #define require_action_quiet( X, LABEL, ACTION )                                                        \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_action_string
+
+    @abstract	Requires that an expression evaluate to true with an explanation and action to execute otherwise.
+
+    @discussion
+
+    If expression evalulates to false, this prints debugging information (actual expression string, file, line number,
+    function name, etc.) and a custom explanation string using the default debugging output method then executes an
+    action and jumps to a label.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef require_action_string
+#endif
+#if ( !defined( require_action_string ) )
+    #define require_action_string( X, LABEL, ACTION, STR )                                                  \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            debug_print_assert( 0, # X, STR, __FILE__, __LINE__, __ROUTINE__ );                      \
+            { ACTION; }                                                                                 \
+            goto LABEL;                                                                                 \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	require_throw
+
+    @abstract	Requires that an expression evaluates to true or an exception is thrown.
+
+    @discussion
+
+    If the expression evaluates to false, this prints debugging information (actual expression string, file,
+    line number, function name, etc.) using the default debugging output method then throws an exception.
+ */
+
+#if ( defined( __cplusplus ) )
+    #define require_throw( X )                                                                              \
+    do                                                                                                  \
+    {                                                                                                   \
+        if( !( X ) )                                                                                    \
+        {                                                                                               \
+            debug_print_assert( 0, # X, NULL, __FILE__, __LINE__, __ROUTINE__ );                         \
+            throw kUnknownErr;                                                                          \
+        }                                                                                               \
+                                                                                                            \
+    }   while( 0 )
+#endif
+
+#if 0
+#pragma mark == Design-By-Contract macros ==
+#endif
+
+//===========================================================================================================================
+//	Design-By-Contract macros
+//===========================================================================================================================
+
+#define ensure( X )                                                 check( X )
+#define ensure_string( X, STR )                                     check_string( X, STR )
+#define ensure_noerr( ERR )                                         check_noerr( ERR )
+#define ensure_noerr_string( ERR, STR )                             check_noerr_string( ERR, STR )
+#define ensure_translated_errno( TEST, ERRNO, ALTERNATE_ERROR )     check_translated_errno( TEST, ERRNO, ALTERNATE_ERROR )
+
+// Note: Design-By-Contract "require" macros are already defined elsewhere.
+
+#if 0
+#pragma mark == Expect macros ==
+#endif
+
+//===========================================================================================================================
+//	Expect macros
+//===========================================================================================================================
+
+// Expect macros allow code to include runtime checking of things that should not happen in shipping code (e.g. internal
+// programmer errors, such as a NULL parameter where it is not allowed). Once the code has been verified to work correctly
+// without asserting, the DEBUG_EXPECT_VERIFIED conditional can be set to eliminate the error checking entirely. It can
+// also be useful to measure the cost of error checking code by profiling with it enable and with it disabled.
+
+#if ( DEBUG_EXPECT_VERIFIED )
+    #define require_expect
+    #define require_string_expect
+    #define require_quiet_expect
+    #define require_noerr_expect
+    #define require_noerr_string_expect
+    #define require_noerr_action_string_expect
+    #define require_noerr_quiet_expect
+    #define require_noerr_action_expect
+    #define require_noerr_action_quiet_expect
+    #define require_action_expect
+    #define require_action_quiet_expect
+    #define require_action_string_expect
+#else
+    #define require_expect                          require
+    #define require_string_expect                   require_string
+    #define require_quiet_expect                    require_quiet
+    #define require_noerr_expect                    require_noerr
+    #define require_noerr_string_expect             require_noerr_string
+    #define require_noerr_action_string_expect      require_noerr_action_string
+    #define require_noerr_quiet_expect              require_noerr_quiet
+    #define require_noerr_action_expect             require_noerr_action
+    #define require_noerr_action_quiet_expect       require_noerr_action_quiet
+    #define require_action_expect                   require_action
+    #define require_action_quiet_expect             require_action_quiet
+    #define require_action_string_expect            require_action_string
+#endif
+
+#if 0
+#pragma mark == Output macros ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	debug_string
+
+    @abstract	Prints a debugging C string.
+ */
+
+#if ( DEBUG_OVERRIDE_APPLE_MACROS )
+    #undef debug_string
+#endif
+#if ( !defined( debug_string ) )
+    #if ( DEBUG )
+        #define debug_string( STR )                                                                     \
+    do                                                                                          \
+    {                                                                                           \
+        debug_print_assert( 0, NULL, STR, __FILE__, __LINE__, __ROUTINE__ );                    \
+                                                                                                        \
+    }   while( 0 )
+    #else
+        #define debug_string( STR )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	debug_print_assert
+
+    @abstract	Prints an assertion.
+ */
+
+#if ( DEBUG )
+    #define debug_print_assert( ERROR_CODE, ASSERT_STRING, MESSAGE, FILENAME, LINE_NUMBER, FUNCTION )   \
+    DebugPrintAssert( ERROR_CODE, ASSERT_STRING, MESSAGE, FILENAME, LINE_NUMBER, FUNCTION )
+#else
+    #define debug_print_assert( ERROR_CODE, ASSERT_STRING, MESSAGE, FILENAME, LINE_NUMBER, FUNCTION )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	dlog
+
+    @abstract	Prints a debug-only message.
+ */
+
+#if ( DEBUG )
+    #if ( DEBUG_C99_VA_ARGS )
+        #define dlog(... )         DebugPrintF( __VA_ARGS__ )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define dlog( ARGS... )     DebugPrintF( ## ARGS )
+    #else
+        #define dlog                DebugPrintF
+    #endif
+#else
+    #if ( DEBUG_C99_VA_ARGS )
+        #define dlog(... )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define dlog( ARGS... )
+    #else
+        #define dlog                while( 0 )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	dlogv
+
+    @abstract	Prints a debug-only message.
+ */
+
+#if ( DEBUG )
+    #define dlogv( LEVEL, FORMAT, LIST )        DebugPrintFVAList( ( LEVEL ), ( FORMAT ), ( LIST ) )
+#else
+    #define dlogv( LEVEL, FORMAT, LIST )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	dlogmem
+
+    @abstract	Prints a debug-only dump of memory.
+ */
+
+#if ( DEBUG )
+    #define dlogmem( LEVEL, PTR, SIZE )     \
+    DebugHexDump( ( LEVEL ), 0, NULL, 0, 0, NULL, 0, ( PTR ), ( PTR ), ( SIZE ), kDebugFlagsNone, NULL, 0 )
+#else
+    #define dlogmem( LEVEL, PTR, SIZE )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DebugNSLog
+
+    @abstract	Debug-only macro for the Cocoa NSLog function.
+ */
+
+#if ( DEBUG )
+    #if ( DEBUG_C99_VA_ARGS )
+        #define DebugNSLog(... )           NSLog( __VA_ARGS__ )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define DebugNSLog( ARGS... )       NSLog( ## ARGS )
+    #else
+        #define DebugNSLog                  NSLog
+    #endif
+#else
+    #if ( DEBUG_C99_VA_ARGS )
+        #define DebugNSLog(... )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define DebugNSLog( ARGS... )
+    #else
+        #define DebugNSLog                  while( 0 )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@defined	DebugLogMsg
+
+    @abstract	Debug-only macro for the VxWorks logMsg function.
+ */
+
+#if ( TARGET_OS_VXWORKS )
+    #if ( DEBUG )
+        #define DebugLogMsg( LEVEL, FORMAT, P1, P2, P3, P4, P5, P6 )                            \
+    do                                                                                  \
+    {                                                                                   \
+        if( ( inLevel >= gDebugPrintLevelMin ) || ( inLevel <= gDebugPrintLevelMax ) )  \
+        {                                                                               \
+            logMsg( ( FORMAT ), ( P1 ), ( P2 ), ( P3 ), ( P4 ), ( P5 ), ( P6 ) );       \
+        }                                                                               \
+                                                                                                \
+    }   while( 0 )
+    #else
+        #define DebugLogMsg( LEVEL, FORMAT, P1, P2, P3, P4, P5, P6 )
+    #endif
+#else
+    #define DebugLogMsg     dlog
+#endif
+
+#if 0
+#pragma mark == Routines - General ==
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugInitialize
+
+    @abstract	Initializes the debugging library for a specific kind of output.
+
+    @param		inType
+    @param		varArg		Variable number parameters, controlled by the "inType" parameter.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT OSStatus   DebugInitialize( DebugOutputType inType, ... );
+#endif
+
+#if ( DEBUG )
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_initialize(... )         DebugInitialize( __VA_ARGS__ )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_initialize( ARGS... )     DebugInitialize( ## ARGS )
+    #else
+        #define debug_initialize                DebugInitialize
+    #endif
+#else
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_initialize(... )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_initialize( ARGS... )
+    #else
+        #define debug_initialize                while( 0 )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugFinalize
+
+    @abstract	Releases any resources used by the debugging library
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT void       DebugFinalize( void );
+#endif
+
+#if ( DEBUG )
+    #define debug_terminate()   DebugFinalize()
+#else
+    #define debug_terminate()
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugGetProperty
+
+    @abstract	Gets the specified property from the debugging library.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT OSStatus   DebugGetProperty( DebugPropertyTag inTag, ... );
+#endif
+
+#if ( DEBUG )
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_get_property(... )           DebugGetProperty( __VA_ARGS__ )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_get_property( ARGS... )       DebugGetProperty( ## ARGS )
+    #else
+        #define debug_get_property                  DebugGetProperty
+    #endif
+#else
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_get_property(... )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_get_property( ARGS... )
+    #else
+        #define debug_get_property                  while( 0 )
+    #endif
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugSetProperty
+
+    @abstract	Sets the specified property from the debugging library.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT OSStatus   DebugSetProperty( DebugPropertyTag inTag, ... );
+#endif
+
+#if ( DEBUG )
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_set_property(... )           DebugSetProperty( __VA_ARGS__ )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_set_property( ARGS... )       DebugSetProperty( ## ARGS )
+    #else
+        #define debug_set_property                  DebugSetProperty
+    #endif
+#else
+    #if ( DEBUG_C99_VA_ARGS )
+        #define debug_set_property(... )
+    #elif ( DEBUG_GNU_VA_ARGS )
+        #define debug_set_property( ARGS... )
+    #else
+        #define debug_set_property                  while( 0 )
+    #endif
+#endif
+
+#if 0
+#pragma mark == Routines - Debugging Output ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugPrintF
+
+    @abstract	Prints a debug message with printf-style formatting.
+
+    @param		inLevel	Error that generated this assert or noErr.
+
+    @param		inFormatString
+                    C string containing assertion text.
+
+    @param		VAR_ARG
+                    Variable number of arguments depending on the format string.
+
+    @result		Number of bytes printed or -1 on error.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT size_t     DebugPrintF( DebugLevel inLevel, const char *inFormat, ... );
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugPrintFVAList
+
+    @abstract	va_list version of DebugPrintF. See DebugPrintF for more info.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT size_t     DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs );
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugPrintAssert
+
+    @abstract	Prints a message describing the reason the (e.g. an assert failed), an optional error message,
+                an optional source filename, an optional source line number.
+
+    @param		inErrorCode			Error that generated this assert or noErr.
+    @param		inAssertString		C string containing assertion text.
+    @param		inMessage			C string containing a message about the assert.
+    @param		inFileName			C string containing path of file where the error occurred.
+    @param		inLineNumber		Line number in source file where the error occurred.
+    @param		inFunction			C string containing name of function where assert occurred.
+
+    @discussion
+
+    Example output:
+
+    [ASSERT] assert: "dataPtr != NULL" allocate memory for object failed
+    [ASSERT] where:  "MyFile.c", line 123, ("MyFunction")
+
+    OR
+
+    [ASSERT] error:  -6728 (kNoMemoryErr)
+    [ASSERT] where:  "MyFile.c", line 123, ("MyFunction")
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT void
+DebugPrintAssert(
+    int_least32_t inErrorCode,
+    const char *    inAssertString,
+    const char *    inMessage,
+    const char *    inFilename,
+    int_least32_t inLineNumber,
+    const char *    inFunction );
+#endif
+
+#if 0
+#pragma mark == Routines - Utilities ==
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugSNPrintF
+
+    @abstract	Debugging versions of standard C snprintf with extra features.
+
+    @param		sbuffer		Buffer to receive result. Null terminated unless the buffer size is 0.
+    @param		buflen		Size of the buffer including space for the null terminator.
+    @param		fmt			printf-style format string.
+    @param		VAR_ARG		Variable number of arguments depending on the format string.
+
+    @result		Number of characters written (minus the null terminator).
+
+    @discussion
+
+    Extra features over the standard C snprintf:
+    <pre>
+        64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb).
+        %@   - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription.
+        %a   - Network Address: %.4a=IPv4, %.6a=Ethernet, %.8a Fibre Channel, %.16a=IPv6. Arg=ptr to network address.
+        %#a  - IPv4 or IPv6 mDNSAddr. Arg=ptr to mDNSAddr.
+        %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr.
+        %b   - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc.
+        %C   - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode.
+        %H   - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size.
+        %#H  - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size.
+        %m   - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code arg=the same as %d, %x, etc.
+        %#s  - Pascal-style length-prefixed string. Arg=ptr to string.
+        %##s - DNS label-sequence name. Arg=ptr to name.
+        %S   - UTF-16 string, 0x0000 terminated. Host order if no BOM. Precision is UTF-16 count. Precision includes BOM.
+        %#S  - Big Endian UTF-16 string (unless BOM overrides). Otherwise, the same as %S.
+        %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise, the same as %S.
+        %U   - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID.
+    </pre>
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...);
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugSNPrintFVAList
+
+    @abstract	va_list version of DebugSNPrintF. See DebugSNPrintF for more info.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg);
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugGetErrorString
+
+    @abstract	Gets an error string from an error code.
+
+    @param		inStatus		Error code to get the string for.
+    @param		inBuffer		Optional buffer to copy the string to for non-static strings. May be null.
+    @param		inBufferSize	Size of optional buffer. May be 0.
+
+    @result		C string containing error string for the error code. Guaranteed to be a valid, static string. If a
+                buffer is supplied, the return value will always be a pointer to the supplied buffer, which will
+                contain the best available description of the error code. If a buffer is not supplied, the return
+                value will be the best available description of the error code that can be represented as a static
+                string. This allows code that cannot use a temporary buffer to hold the result to still get a useful
+                error string in most cases, but also allows code that can use a temporary buffer to get the best
+                available description.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT const char *   DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize );
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugHexDump
+
+    @abstract	Hex dumps data to a string or to the output device.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT size_t
+DebugHexDump(
+    DebugLevel inLevel,
+    int inIndent,
+    const char *    inLabel,
+    size_t inLabelSize,
+    int inLabelMinWidth,
+    const char *    inType,
+    size_t inTypeSize,
+    const void *    inDataStart,
+    const void *    inData,
+    size_t inDataSize,
+    DebugFlags inFlags,
+    char *          outBuffer,
+    size_t inBufferSize );
+#endif
+
+#if ( DEBUG )
+    #define dloghex( LEVEL, INDENT, LABEL, LABEL_SIZE, LABEL_MIN_SIZE, TYPE, TYPE_SIZE, DATA_START, DATA, DATA_SIZE, FLAGS, BUFFER, BUFFER_SIZE )   \
+    DebugHexDump( ( LEVEL ), (INDENT), ( LABEL ), ( LABEL_SIZE ), ( LABEL_MIN_SIZE ), ( TYPE ), ( TYPE_SIZE ),                              \
+                  ( DATA_START ), ( DATA ), ( DATA_SIZE ), ( FLAGS ), ( BUFFER ), ( BUFFER_SIZE ) )
+#else
+    #define dloghex( LEVEL, INDENT, LABEL, LABEL_SIZE, LABEL_MIN_SIZE, TYPE, TYPE_SIZE, DATA_START, DATA, DATA_SIZE, FLAGS, BUFFER, BUFFER_SIZE )
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugTaskLevel
+
+    @abstract	Returns the current task level.
+
+    @result		Current task level
+
+    @discussion
+
+    Bit masks to isolate portions of the result (note that some masks may also need bit shifts to right justify):
+    <pre>
+        kDebugInterruptLevelMask				- Indicates the current interrupt level (> 0 means interrupt time).
+        kDebugInVBLTaskMask						- Indicates if a VBL task is currently being executed.
+        kDebugInDeferredTaskMask				- Indicates if a Deferred Task is currently being executed.
+        kDebugInSecondaryInterruptHandlerMask	- Indicates if a Secondary Interrupt Handler is currently being executed.
+        kDebugPageFaultFatalMask				- Indicates if it is unsafe to cause a page fault (worse than interrupt time).
+        kDebugMPTaskLevelMask					- Indicates if being called from an MP task.
+        kDebugInterruptDepthMask				- 0 means task level, 1 means in interrupt, > 1 means in nested interrupt.
+    </pre>
+
+    Helpers:
+    <pre>
+        DebugExtractTaskLevelInterruptDepth()   - Macro to extract interrupt depth from task level value.
+    </pre>
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT uint32_t   DebugTaskLevel( void );
+#endif
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	DebugServicesTest
+
+    @abstract	Unit test.
+ */
+
+#if ( DEBUG )
+DEBUG_EXPORT OSStatus   DebugServicesTest( void );
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // __DEBUG_SERVICES__
diff --git a/mDNSResponder/mDNSShared/GenLinkedList.c b/mDNSResponder/mDNSShared/GenLinkedList.c
new file mode 100644
index 00000000..45dbb7cb
--- /dev/null
+++ b/mDNSResponder/mDNSShared/GenLinkedList.c
@@ -0,0 +1,319 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    File:		GenLinkedList.c
+
+    Contains:	implementation of generic linked lists.
+
+    Version:	1.0
+    Tabs:		4 spaces
+ */
+
+#include "GenLinkedList.h"
+
+
+// Return the link pointer contained within element e at offset o.
+#define     GETLINK( e, o)          ( *(void**)((char*) (e) + (o)) )
+
+// Assign the link pointer l to element e at offset o.
+#define     ASSIGNLINK( e, l, o)    ( *((void**)((char*) (e) + (o))) = (l))
+
+
+//		GenLinkedList		/////////////////////////////////////////////////////////////
+
+void        InitLinkedList( GenLinkedList *pList, size_t linkOffset)
+/* Initialize the block of memory pointed to by pList as a linked list. */
+{
+    pList->Head = NULL;
+    pList->Tail = NULL;
+    pList->LinkOffset = linkOffset;
+}
+
+
+void        AddToTail( GenLinkedList *pList, void *elem)
+/* Add a linked list element to the tail of the list. */
+{
+    if ( pList->Tail) {
+        ASSIGNLINK( pList->Tail, elem, pList->LinkOffset);
+    } else
+        pList->Head = elem;
+    ASSIGNLINK( elem, NULL, pList->LinkOffset);
+
+    pList->Tail = elem;
+}
+
+
+void        AddToHead( GenLinkedList *pList, void *elem)
+/* Add a linked list element to the head of the list. */
+{
+    ASSIGNLINK( elem, pList->Head, pList->LinkOffset);
+    if ( pList->Tail == NULL)
+        pList->Tail = elem;
+
+    pList->Head = elem;
+}
+
+
+int     RemoveFromList( GenLinkedList *pList, void *elem)
+/* Remove a linked list element from the list. Return 0 if it was not found. */
+/* If the element is removed, its link will be set to NULL. */
+{
+    void    *iElem, *lastElem;
+
+    for ( iElem = pList->Head, lastElem = NULL; iElem; iElem = GETLINK( iElem, pList->LinkOffset)) {
+        if ( iElem == elem) {
+            if ( lastElem) {        // somewhere past the head
+                ASSIGNLINK( lastElem, GETLINK( elem, pList->LinkOffset), pList->LinkOffset);
+            } else {                // at the head
+                pList->Head = GETLINK( elem, pList->LinkOffset);
+            }
+            if ( pList->Tail == elem)
+                pList->Tail = lastElem ? lastElem : NULL;
+            ASSIGNLINK( elem, NULL, pList->LinkOffset);         // maybe catch a stale reference bug.
+            return 1;
+        }
+        lastElem = iElem;
+    }
+
+    return 0;
+}
+
+
+int         ReplaceElem( GenLinkedList *pList, void *elemInList, void *newElem)
+/* Replace an element in the list with a new element, in the same position. */
+{
+    void    *iElem, *lastElem;
+
+    if ( elemInList == NULL || newElem == NULL)
+        return 0;
+
+    for ( iElem = pList->Head, lastElem = NULL; iElem; iElem = GETLINK( iElem, pList->LinkOffset))
+    {
+        if ( iElem == elemInList)
+        {
+            ASSIGNLINK( newElem, GETLINK( elemInList, pList->LinkOffset), pList->LinkOffset);
+            if ( lastElem)      // somewhere past the head
+            {
+                ASSIGNLINK( lastElem, newElem, pList->LinkOffset);
+            }
+            else                // at the head
+            {
+                pList->Head = newElem;
+            }
+            if ( pList->Tail == elemInList)
+                pList->Tail = newElem;
+            return 1;
+        }
+        lastElem = iElem;
+    }
+
+    return 0;
+}
+
+
+//		GenDoubleLinkedList		/////////////////////////////////////////////////////////
+
+void        InitDoubleLinkedList( GenDoubleLinkedList *pList, size_t fwdLinkOffset,
+                                  size_t backLinkOffset)
+/* Initialize the block of memory pointed to by pList as a double linked list. */
+{
+    pList->Head = NULL;
+    pList->Tail = NULL;
+    pList->FwdLinkOffset = fwdLinkOffset;
+    pList->BackLinkOffset = backLinkOffset;
+}
+
+
+void            DLLAddToHead( GenDoubleLinkedList *pList, void *elem)
+/* Add a linked list element to the head of the list. */
+{
+    void        *pNext;
+
+    pNext = pList->Head;
+
+    // fix up the forward links
+    ASSIGNLINK( elem, pList->Head, pList->FwdLinkOffset);
+    pList->Head = elem;
+
+    // fix up the backward links
+    if ( pNext) {
+        ASSIGNLINK( pNext, elem, pList->BackLinkOffset);
+    } else
+        pList->Tail = elem;
+    ASSIGNLINK( elem, NULL, pList->BackLinkOffset);
+}
+
+
+void            DLLRemoveFromList( GenDoubleLinkedList *pList, void *elem)
+/* Remove a linked list element from the list. */
+/* When the element is removed, its link will be set to NULL. */
+{
+    void        *pNext, *pPrev;
+
+    pNext = GETLINK( elem, pList->FwdLinkOffset);
+    pPrev = GETLINK( elem, pList->BackLinkOffset);
+
+    // fix up the forward links
+    if ( pPrev)
+        ASSIGNLINK( pPrev, pNext, pList->FwdLinkOffset);
+    else
+        pList->Head = pNext;
+
+    // fix up the backward links
+    if ( pNext)
+        ASSIGNLINK( pNext, pPrev, pList->BackLinkOffset);
+    else
+        pList->Tail = pPrev;
+
+    ASSIGNLINK( elem, NULL, pList->FwdLinkOffset);
+    ASSIGNLINK( elem, NULL, pList->BackLinkOffset);
+}
+
+
+//		GenLinkedOffsetList		/////////////////////////////////////////////////////
+
+// Extract the Next offset from element
+#define     GETOFFSET( e, o)    ( *(size_t*)((char*) (e) + (o)) )
+
+static void     AssignOffsetLink( void *elem, void *link, size_t linkOffset);
+
+
+static void AssignOffsetLink( void *elem, void *link, size_t linkOffset)
+// Assign link to elem as an offset from elem. Assign 0 to elem if link is NULL.
+{
+    GETOFFSET( elem, linkOffset) = link ? (size_t) link - (size_t) elem : 0;
+}
+
+
+void        *GetHeadPtr( GenLinkedOffsetList *pList)
+/* Return a pointer to the head element of a list, or NULL if none. */
+{
+    return pList->Head ? ( (char*) (pList) + pList->Head) : NULL;
+}
+
+
+void        *GetTailPtr( GenLinkedOffsetList *pList)
+/* Return a pointer to the tail element of a list, or NULL if none. */
+{
+    return pList->Tail ? ( (char*) (pList) + pList->Tail) : NULL;
+}
+
+
+void        *GetOffsetLink( GenLinkedOffsetList *pList, void *elem)
+/* Return the link pointer contained within element e for pList, or NULL if it is 0. */
+{
+    size_t nextOffset;
+
+    nextOffset = GETOFFSET( elem, pList->LinkOffset);
+
+    return nextOffset ? (char*) elem + nextOffset : NULL;
+}
+
+
+void        InitLinkedOffsetList( GenLinkedOffsetList *pList, size_t linkOffset)
+/* Initialize the block of memory pointed to by pList as a linked list. */
+{
+    pList->Head = 0;
+    pList->Tail = 0;
+    pList->LinkOffset = linkOffset;
+}
+
+
+void        OffsetAddToTail( GenLinkedOffsetList *pList, void *elem)
+/* Add a linked list element to the tail of the list. */
+{
+    if ( pList->Tail) {
+        AssignOffsetLink( GetTailPtr( pList), elem, pList->LinkOffset);
+    } else
+        pList->Head = (size_t) elem - (size_t) pList;
+    AssignOffsetLink( elem, NULL, pList->LinkOffset);
+
+    pList->Tail = (size_t) elem - (size_t) pList;
+}
+
+
+void        OffsetAddToHead( GenLinkedOffsetList *pList, void *elem)
+/* Add a linked list element to the head of the list. */
+{
+    AssignOffsetLink( elem, GetHeadPtr( pList), pList->LinkOffset);
+    if ( pList->Tail == 0)
+        pList->Tail = (size_t) elem - (size_t) pList;
+
+    pList->Head = (size_t) elem - (size_t) pList;
+}
+
+
+int     OffsetRemoveFromList( GenLinkedOffsetList *pList, void *elem)
+/* Remove a linked list element from the list. Return 0 if it was not found. */
+/* If the element is removed, its link will be set to NULL. */
+{
+    void    *iElem, *lastElem;
+
+    for ( iElem = GetHeadPtr( pList), lastElem = NULL; iElem;
+          iElem = GetOffsetLink( pList, iElem))
+    {
+        if ( iElem == elem) {
+            if ( lastElem) {        // somewhere past the head
+                AssignOffsetLink( lastElem, GetOffsetLink( pList, elem), pList->LinkOffset);
+            } else {                // at the head
+                iElem = GetOffsetLink( pList, elem);
+                pList->Head = iElem ? (size_t) iElem - (size_t) pList : 0;
+            }
+            if ( GetTailPtr( pList) == elem)
+                pList->Tail = lastElem ? (size_t) lastElem - (size_t) pList : 0;
+            AssignOffsetLink( elem, NULL, pList->LinkOffset);   // maybe catch a stale reference bug.
+            return 1;
+        }
+        lastElem = iElem;
+    }
+
+    return 0;
+}
+
+
+int         OffsetReplaceElem( GenLinkedOffsetList *pList, void *elemInList, void *newElem)
+/* Replace an element in the list with a new element, in the same position. */
+{
+    void    *iElem, *lastElem;
+
+    if ( elemInList == NULL || newElem == NULL)
+        return 0;
+
+    for ( iElem = GetHeadPtr( pList), lastElem = NULL; iElem;
+          iElem = GetOffsetLink( pList, iElem))
+    {
+        if ( iElem == elemInList)
+        {
+            AssignOffsetLink( newElem, GetOffsetLink( pList, elemInList), pList->LinkOffset);
+            if ( lastElem)      // somewhere past the head
+            {
+                AssignOffsetLink( lastElem, newElem, pList->LinkOffset);
+            }
+            else                // at the head
+            {
+                pList->Head = (size_t) newElem - (size_t) pList;
+            }
+            if ( GetTailPtr( pList) == elemInList)
+                pList->Tail = (size_t) newElem - (size_t) pList;
+            return 1;
+        }
+        lastElem = iElem;
+    }
+
+    return 0;
+}
+
+
diff --git a/mDNSResponder/mDNSShared/GenLinkedList.h b/mDNSResponder/mDNSShared/GenLinkedList.h
new file mode 100644
index 00000000..2d0ada6d
--- /dev/null
+++ b/mDNSResponder/mDNSShared/GenLinkedList.h
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __GenLinkedList__
+#define __GenLinkedList__
+
+
+#include <stddef.h>
+
+
+struct  GenLinkedList
+{
+    void        *Head,
+    *Tail;
+    size_t LinkOffset;
+};
+typedef struct GenLinkedList GenLinkedList;
+
+
+void        InitLinkedList( GenLinkedList *pList, size_t linkOffset);
+
+void        AddToHead( GenLinkedList *pList, void *elem);
+void        AddToTail( GenLinkedList *pList, void *elem);
+
+int     RemoveFromList( GenLinkedList *pList, void *elem);
+
+int     ReplaceElem( GenLinkedList *pList, void *elemInList, void *newElem);
+
+
+
+struct  GenDoubleLinkedList
+{
+    void        *Head,
+    *Tail;
+    size_t FwdLinkOffset,
+           BackLinkOffset;
+};
+typedef struct GenDoubleLinkedList GenDoubleLinkedList;
+
+
+void        InitDoubleLinkedList( GenDoubleLinkedList *pList, size_t fwdLinkOffset,
+                                  size_t backLinkOffset);
+
+void        DLLAddToHead( GenDoubleLinkedList *pList, void *elem);
+
+void        DLLRemoveFromList( GenDoubleLinkedList *pList, void *elem);
+
+
+
+/* A GenLinkedOffsetList is like a GenLinkedList that stores the *Next field as a signed */
+/* offset from the address of the beginning of the element, rather than as a pointer. */
+
+struct  GenLinkedOffsetList
+{
+    size_t Head,
+           Tail;
+    size_t LinkOffset;
+};
+typedef struct GenLinkedOffsetList GenLinkedOffsetList;
+
+
+void        InitLinkedOffsetList( GenLinkedOffsetList *pList, size_t linkOffset);
+
+void        *GetHeadPtr( GenLinkedOffsetList *pList);
+void        *GetTailPtr( GenLinkedOffsetList *pList);
+void        *GetOffsetLink( GenLinkedOffsetList *pList, void *elem);
+
+void        OffsetAddToHead( GenLinkedOffsetList *pList, void *elem);
+void        OffsetAddToTail( GenLinkedOffsetList *pList, void *elem);
+
+int     OffsetRemoveFromList( GenLinkedOffsetList *pList, void *elem);
+
+int     OffsetReplaceElem( GenLinkedOffsetList *pList, void *elemInList, void *newElem);
+
+
+#endif //	__GenLinkedList__
diff --git a/mDNSResponder/mDNSShared/Java/BaseListener.java b/mDNSResponder/mDNSShared/Java/BaseListener.java
new file mode 100644
index 00000000..b99d341c
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/BaseListener.java
@@ -0,0 +1,36 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A base class for DNSSD listeners. */
+
+public interface BaseListener
+{
+	/** Called to report DNSSD operation failures.<P> 
+
+		@param	service
+					The service that encountered the failure.
+		<P>
+		@param	errorCode
+					Indicates the failure that occurred. See {@link DNSSDException} for error codes.
+	*/
+	void	operationFailed( DNSSDService service, int errorCode);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/BrowseListener.java b/mDNSResponder/mDNSShared/Java/BrowseListener.java
new file mode 100644
index 00000000..b92b9dc5
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/BrowseListener.java
@@ -0,0 +1,73 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A listener that receives results from {@link DNSSD#browse}. */
+
+public interface BrowseListener extends BaseListener
+{
+	/** Called to report discovered services.<P> 
+
+		@param	browser
+					The active browse service.
+		<P>
+		@param	flags
+					Possible values are DNSSD.MORE_COMING.
+		<P>
+		@param	ifIndex
+					The interface on which the service is advertised. This index should be passed 
+					to {@link DNSSD#resolve} when resolving the service.
+		<P>
+		@param	serviceName
+					The service name discovered.
+		<P>
+		@param	regType
+					The registration type, as passed in to DNSSD.browse().
+		<P>
+		@param	domain
+					The domain in which the service was discovered.
+	*/
+	void	serviceFound( DNSSDService browser, int flags, int ifIndex, 
+							String serviceName, String regType, String domain);
+
+	/** Called to report services which have been deregistered.<P> 
+
+		@param	browser
+					The active browse service.
+		<P>
+		@param	flags
+					Possible values are DNSSD.MORE_COMING.
+		<P>
+		@param	ifIndex
+					The interface on which the service is advertised.
+		<P>
+		@param	serviceName
+					The service name which has deregistered.
+		<P>
+		@param	regType
+					The registration type, as passed in to DNSSD.browse().
+		<P>
+		@param	domain
+					The domain in which the service was discovered.
+	*/
+	void	serviceLost( DNSSDService browser, int flags, int ifIndex,
+							String serviceName, String regType, String domain);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSRecord.java b/mDNSResponder/mDNSShared/Java/DNSRecord.java
new file mode 100644
index 00000000..a853d091
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSRecord.java
@@ -0,0 +1,52 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	
+	Reference to a record returned by {@link DNSSDRegistration#addRecord}.<P> 
+
+	Note: client is responsible for serializing access to these objects if 
+	they are shared between concurrent threads.
+*/
+
+public interface	DNSRecord
+{
+	/** Update a registered resource record.<P> 
+		The record must either be the primary txt record of a service registered via DNSSD.register(), 
+		or a record added to a registered service via addRecord().<P>
+
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	rData
+					The new rdata to be contained in the updated resource record.
+		<P>
+		@param	ttl
+					The time to live of the updated resource record, in seconds.
+	*/
+	void			update( int flags, byte[] rData, int ttl)
+	throws DNSSDException;
+
+	/** Remove a registered resource record.<P> 
+	*/
+	void			remove()
+	throws DNSSDException;
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSSD.java b/mDNSResponder/mDNSShared/Java/DNSSD.java
new file mode 100644
index 00000000..f749a88e
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSSD.java
@@ -0,0 +1,860 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+	This file declares and implements DNSSD, the central Java factory class
+	for doing DNS Service Discovery. It includes the mostly-abstract public
+	interface, as well as the Apple* implementation subclasses.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**
+	DNSSD provides access to DNS Service Discovery features of ZeroConf networking.<P>
+
+	It is a factory class that is used to invoke registration and discovery-related
+	operations. Most operations are non-blocking; clients are called back through an interface
+	with the result of an operation. Callbacks are made from a separate worker thread.<P>
+
+	For example, in this program<P>
+	<PRE><CODE>
+    class   MyClient implements BrowseListener {
+        void    lookForWebServers() {
+            myBrowser = DNSSD.browse("_http._tcp", this);
+        }
+    
+        public void serviceFound(DNSSDService browser, int flags, int ifIndex,
+                            String serviceName, String regType, String domain) {}
+        ...
+    }</CODE></PRE>
+	<CODE>MyClient.serviceFound()</CODE> would be called for every HTTP server discovered in the
+	default browse domain(s).
+*/
+
+abstract public class	DNSSD
+{
+	/**	Flag indicates to a {@link BrowseListener} that another result is
+		queued.  Applications should not update their UI to display browse
+		results if the MORE_COMING flag is set; they will be called at least once
+		more with the flag clear.
+	*/
+	public static final int		MORE_COMING = ( 1 << 0 );
+
+	/** If flag is set in a {@link DomainListener} callback, indicates that the result is the default domain. */
+	public static final int		DEFAULT = ( 1 << 2 );
+
+    /**	If flag is set, a name conflict will trigger an exception when registering non-shared records.<P>
+    	A name must be explicitly specified when registering a service if this bit is set
+    	(i.e. the default name may not not be used).
+     */
+	public static final int		NO_AUTO_RENAME = ( 1 << 3 );
+
+	/**	If flag is set, allow multiple records with this name on the network (e.g. PTR records)
+		when registering individual records on a {@link DNSSDRegistration}.
+	*/
+	public static final int		SHARED = ( 1 << 4 );
+
+	/**	If flag is set, records with this name must be unique on the network (e.g. SRV records). */
+	public static final int		UNIQUE = ( 1 << 5 );
+
+	/** Set flag when calling enumerateDomains() to restrict results to domains recommended for browsing. */
+	public static final int		BROWSE_DOMAINS = ( 1 << 6 );
+	/** Set flag when calling enumerateDomains() to restrict results to domains recommended for registration. */
+	public static final int		REGISTRATION_DOMAINS = ( 1 << 7 );
+
+	/** Maximum length, in bytes, of a domain name represented as an escaped C-String. */
+    public static final int     MAX_DOMAIN_NAME = 1009;
+
+	/** Pass for ifIndex to specify all available interfaces. */
+    public static final int     ALL_INTERFACES = 0;
+
+	/** Pass for ifIndex to specify the localhost interface. */
+    public static final int     LOCALHOST_ONLY = -1;
+
+	/** Browse for instances of a service.<P>
+
+		Note: browsing consumes network bandwidth. Call {@link DNSSDService#stop} when you have finished browsing.<P>
+
+		@param	flags
+					Currently ignored, reserved for future use.
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to browse for services
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Most applications will pass 0 to browse on all available
+					interfaces.  Pass -1 to only browse for services provided on the local host.
+		<P>
+		@param	regType
+					The registration type being browsed for followed by the protocol, separated by a
+					dot (e.g. "_ftp._tcp"). The transport protocol must be "_tcp" or "_udp".
+		<P>
+		@param	domain
+					If non-null, specifies the domain on which to browse for services.
+					Most applications will not specify a domain, instead browsing on the
+					default domain(s).
+		<P>
+		@param	listener
+					This object will get called when instances of the service are discovered (or disappear).
+		<P>
+		@return		A {@link DNSSDService} that represents the active browse operation.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDService	browse( int flags, int ifIndex, String regType, String domain, BrowseListener listener)
+	throws DNSSDException
+	{ return getInstance()._makeBrowser( flags, ifIndex, regType, domain, listener); }
+
+	/** Browse for instances of a service. Use default flags, ifIndex and domain.<P>
+
+		@param	regType
+					The registration type being browsed for followed by the protocol, separated by a
+					dot (e.g. "_ftp._tcp"). The transport protocol must be "_tcp" or "_udp".
+		<P>
+		@param	listener
+					This object will get called when instances of the service are discovered (or disappear).
+		<P>
+		@return		A {@link DNSSDService} that represents the active browse operation.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDService	browse( String regType, BrowseListener listener)
+	throws DNSSDException
+	{ return browse( 0, 0, regType, "", listener); }
+
+	/** Resolve a service name discovered via browse() to a target host name, port number, and txt record.<P>
+		
+		Note: Applications should NOT use resolve() solely for txt record monitoring - use
+		queryRecord() instead, as it is more efficient for this task.<P>
+		
+		Note: When the desired results have been returned, the client MUST terminate the resolve by
+		calling {@link DNSSDService#stop}.<P>
+
+		Note: resolve() behaves correctly for typical services that have a single SRV record and
+ 		a single TXT record (the TXT record may be empty.)  To resolve non-standard services with
+ 		multiple SRV or TXT records, use queryRecord().<P>
+
+		@param	flags
+					Currently ignored, reserved for future use.
+		<P>
+		@param	ifIndex
+					The interface on which to resolve the service.  The client should
+					pass the interface on which the serviceName was discovered (i.e.
+					the ifIndex passed to the serviceFound() callback)
+					or 0 to resolve the named service on all available interfaces.
+		<P>
+		@param	serviceName
+					The servicename to be resolved.
+		<P>
+		@param	regType
+					The registration type being resolved followed by the protocol, separated by a
+					dot (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+		<P>
+		@param	domain
+					The domain on which the service is registered, i.e. the domain passed
+					to the serviceFound() callback.
+		<P>
+		@param	listener
+					This object will get called when the service is resolved.
+		<P>
+		@return		A {@link DNSSDService} that represents the active resolve operation.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDService	resolve( int flags, int ifIndex, String serviceName, String regType,
+										String domain, ResolveListener listener)
+	throws DNSSDException
+	{ return getInstance()._resolve( flags, ifIndex, serviceName, regType, domain, listener); }
+
+	/** Register a service, to be discovered via browse() and resolve() calls.<P>
+		@param	flags
+					Possible values are: NO_AUTO_RENAME.
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to register the service
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Most applications will pass 0 to register on all
+					available interfaces.  Pass -1 to register a service only on the local
+					machine (service will not be visible to remote hosts).
+		<P>
+		@param	serviceName
+					If non-null, specifies the service name to be registered.
+					Applications need not specify a name, in which case the
+					computer name is used (this name is communicated to the client via
+					the serviceRegistered() callback).
+		<P>
+		@param	regType
+					The registration type being registered followed by the protocol, separated by a
+					dot (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+		<P>
+		@param	domain
+					If non-null, specifies the domain on which to advertise the service.
+					Most applications will not specify a domain, instead automatically
+					registering in the default domain(s).
+		<P>
+		@param	host
+					If non-null, specifies the SRV target host name.  Most applications
+					will not specify a host, instead automatically using the machine's
+					default host name(s).  Note that specifying a non-null host does NOT
+					create an address record for that host - the application is responsible
+					for ensuring that the appropriate address record exists, or creating it
+					via {@link DNSSDRegistration#addRecord}.
+		<P>
+		@param	port
+					The port on which the service accepts connections.  Pass 0 for a
+					"placeholder" service (i.e. a service that will not be discovered by
+					browsing, but will cause a name conflict if another client tries to
+					register that same name.)  Most clients will not use placeholder services.
+		<P>
+		@param	txtRecord
+					The txt record rdata.  May be null.  Note that a non-null txtRecord
+					MUST be a properly formatted DNS TXT record, i.e. &lt;length byte&gt; &lt;data&gt;
+					&lt;length byte&gt; &lt;data&gt; ...
+		<P>
+		@param	listener
+					This object will get called when the service is registered.
+		<P>
+		@return		A {@link DNSSDRegistration} that controls the active registration.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDRegistration	register( int flags, int ifIndex, String serviceName, String regType,
+									String domain, String host, int port, TXTRecord txtRecord, RegisterListener listener)
+	throws DNSSDException
+	{ return getInstance()._register( flags, ifIndex, serviceName, regType, domain, host, port, txtRecord, listener); }
+
+	/** Register a service, to be discovered via browse() and resolve() calls. Use default flags, ifIndex, domain, host and txtRecord.<P>
+		@param	serviceName
+					If non-null, specifies the service name to be registered.
+					Applications need not specify a name, in which case the
+					computer name is used (this name is communicated to the client via
+					the serviceRegistered() callback).
+		<P>
+		@param	regType
+					The registration type being registered followed by the protocol, separated by a
+					dot (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+		<P>
+		@param	port
+					The port on which the service accepts connections.  Pass 0 for a
+					"placeholder" service (i.e. a service that will not be discovered by
+					browsing, but will cause a name conflict if another client tries to
+					register that same name.)  Most clients will not use placeholder services.
+		<P>
+		@param	listener
+					This object will get called when the service is registered.
+		<P>
+		@return		A {@link DNSSDRegistration} that controls the active registration.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDRegistration	register( String serviceName, String regType, int port, RegisterListener listener)
+	throws DNSSDException
+	{ return register( 0, 0, serviceName, regType, null, null, port, null, listener); }
+
+	/** Create a {@link DNSSDRecordRegistrar} allowing efficient registration of
+		multiple individual records.<P>
+		<P>
+		@return		A {@link DNSSDRecordRegistrar} that can be used to register records.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDRecordRegistrar	createRecordRegistrar( RegisterRecordListener listener)
+	throws DNSSDException
+	{ return getInstance()._createRecordRegistrar( listener); }
+
+	/** Query for an arbitrary DNS record.<P>
+		@param	flags
+					Possible values are: MORE_COMING.
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to issue the query
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Passing 0 causes the name to be queried for on all
+					interfaces.  Passing -1 causes the name to be queried for only on the
+					local host.
+		<P>
+		@param	serviceName
+					The full domain name of the resource record to be queried for.
+		<P>
+		@param	rrtype
+					The numerical type of the resource record to be queried for (e.g. PTR, SRV, etc)
+					as defined in nameser.h.
+		<P>
+		@param	rrclass
+					The class of the resource record, as defined in nameser.h
+					(usually 1 for the Internet class).
+		<P>
+		@param	listener
+					This object will get called when the query completes.
+		<P>
+		@return		A {@link DNSSDService} that controls the active query.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDService	queryRecord( int flags, int ifIndex, String serviceName, int rrtype,
+										int rrclass, QueryListener listener)
+	throws DNSSDException
+	{ return getInstance()._queryRecord( flags, ifIndex, serviceName, rrtype, rrclass, listener); }
+
+	/** Asynchronously enumerate domains available for browsing and registration.<P>
+	
+		Currently, the only domain returned is "local.", but other domains will be returned in future.<P>
+		
+		The enumeration MUST be cancelled by calling {@link DNSSDService#stop} when no more domains
+		are to be found.<P>
+		@param	flags
+					Possible values are: BROWSE_DOMAINS, REGISTRATION_DOMAINS.
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to look for domains.
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Most applications will pass 0 to enumerate domains on
+					all interfaces.
+		<P>
+		@param	listener
+					This object will get called when domains are found.
+		<P>
+		@return		A {@link DNSSDService} that controls the active enumeration.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static DNSSDService	enumerateDomains( int flags, int ifIndex, DomainListener listener)
+	throws DNSSDException
+	{ return getInstance()._enumerateDomains( flags, ifIndex, listener); }
+
+	/**	Concatenate a three-part domain name (as provided to the listeners) into a
+		properly-escaped full domain name. Note that strings passed to listeners are
+		ALREADY ESCAPED where necessary.<P>
+		@param	serviceName
+					The service name - any dots or slashes must NOT be escaped.
+					May be null (to construct a PTR record name, e.g. "_ftp._tcp.apple.com").
+		<P>
+		@param	regType
+					The registration type followed by the protocol, separated by a dot (e.g. "_ftp._tcp").
+		<P>
+		@param	domain
+					The domain name, e.g. "apple.com".  Any literal dots or backslashes must be escaped.
+		<P>
+		@return		The full domain name.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static String		constructFullName( String serviceName, String regType, String domain)
+	throws DNSSDException
+	{ return getInstance()._constructFullName( serviceName, regType, domain); }
+
+	/** Instruct the daemon to verify the validity of a resource record that appears to
+		be out of date. (e.g. because tcp connection to a service's target failed.) <P>
+		
+		Causes the record to be flushed from the daemon's cache (as well as all other
+		daemons' caches on the network) if the record is determined to be invalid.<P>
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to reconfirm the record
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Passing 0 causes the name to be reconfirmed on all
+					interfaces.  Passing -1 causes the name to be reconfirmed only on the
+					local host.
+		<P>
+		@param	fullName
+					The resource record's full domain name.
+		<P>
+		@param	rrtype
+					The resource record's type (e.g. PTR, SRV, etc) as defined in nameser.h.
+		<P>
+		@param	rrclass
+					The class of the resource record, as defined in nameser.h (usually 1).
+		<P>
+		@param	rdata
+					The raw rdata of the resource record.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static void		reconfirmRecord( int flags, int ifIndex, String fullName, int rrtype,
+										int rrclass, byte[] rdata)
+	{ getInstance()._reconfirmRecord( flags, ifIndex, fullName, rrtype, rrclass, rdata); }
+
+	/** Return the canonical name of a particular interface index.<P>
+		@param	ifIndex
+					A valid interface index. Must not be ALL_INTERFACES.
+		<P>
+		@return		The name of the interface, which should match java.net.NetworkInterface.getName().
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static String	getNameForIfIndex( int ifIndex)
+	{ return getInstance()._getNameForIfIndex( ifIndex); }
+
+	/** Return the index of a named interface.<P>
+		@param	ifName
+					A valid interface name. An example is java.net.NetworkInterface.getName().
+		<P>
+		@return		The interface index.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public static int		getIfIndexForName( String ifName)
+	{ return getInstance()._getIfIndexForName( ifName); }
+
+	protected						DNSSD() {}	// prevent direct instantiation
+
+	/** Return the single instance of DNSSD. */
+	static protected final DNSSD	getInstance()
+	{
+		SecurityManager sm = System.getSecurityManager();
+        if (sm != null)
+            sm.checkPermission( new RuntimePermission( "getDNSSDInstance"));
+		 return fInstance;
+	}
+
+	abstract protected DNSSDService	_makeBrowser( int flags, int ifIndex, String regType, String domain, BrowseListener listener)
+	throws DNSSDException;
+
+	abstract protected DNSSDService	_resolve( int flags, int ifIndex, String serviceName, String regType,
+										String domain, ResolveListener listener)
+	throws DNSSDException;
+
+	abstract protected DNSSDRegistration	_register( int flags, int ifIndex, String serviceName, String regType,
+									String domain, String host, int port, TXTRecord txtRecord, RegisterListener listener)
+	throws DNSSDException;
+
+	abstract protected DNSSDRecordRegistrar	_createRecordRegistrar( RegisterRecordListener listener)
+	throws DNSSDException;
+
+	abstract protected DNSSDService	_queryRecord( int flags, int ifIndex, String serviceName, int rrtype,
+										int rrclass, QueryListener listener)
+	throws DNSSDException;
+
+	abstract protected DNSSDService	_enumerateDomains( int flags, int ifIndex, DomainListener listener)
+	throws DNSSDException;
+
+	abstract protected String		_constructFullName( String serviceName, String regType, String domain)
+	throws DNSSDException;
+
+	abstract protected void			_reconfirmRecord( int flags, int ifIndex, String fullName, int rrtype,
+										int rrclass, byte[] rdata);
+
+	abstract protected String		_getNameForIfIndex( int ifIndex);
+
+	abstract protected int			_getIfIndexForName( String ifName);
+
+	protected static DNSSD			fInstance;
+
+	static
+	{
+		try
+		{
+			String name = System.getProperty( "com.apple.dnssd.DNSSD" );
+			if (name == null)
+				name = "com.apple.dnssd.AppleDNSSD";	// Fall back to Apple-provided class.
+			fInstance = (DNSSD) Class.forName(name).newInstance();
+		}
+		catch( Exception e )
+		{
+			throw new InternalError( "cannot instantiate DNSSD" + e );
+		}
+	}
+}
+
+
+// Concrete implementation of DNSSDException
+class	AppleDNSSDException extends DNSSDException
+{
+	public						AppleDNSSDException( int errorCode) { fErrorCode = errorCode; }
+
+	public int					getErrorCode() { return fErrorCode; }
+
+	public String				getMessage()
+	{
+		final String	kMessages[] = {		// should probably be put into a resource or something
+			"UNKNOWN",
+			"NO_SUCH_NAME",
+			"NO_MEMORY",
+			"BAD_PARAM",
+			"BAD_REFERENCE",
+			"BAD_STATE",
+			"BAD_FLAGS",
+			"UNSUPPORTED",
+			"NOT_INITIALIZED",
+			"NO_CACHE",
+			"ALREADY_REGISTERED",
+			"NAME_CONFLICT",
+			"INVALID",
+			"FIREWALL",
+			"INCOMPATIBLE",
+			"BAD_INTERFACE_INDEX",
+			"REFUSED",
+			"NOSUCHRECORD",
+			"NOAUTH",
+			"NOSUCHKEY",
+			"NATTRAVERSAL",
+			"DOUBLENAT",
+			"BADTIME",
+			"BADSIG",
+			"BADKEY",
+			"TRANSIENT",
+			"SERVICENOTRUNNING",
+			"NATPORTMAPPINGUNSUPPORTED",
+			"NATPORTMAPPINGDISABLED"
+		};
+	
+		if (fErrorCode <= UNKNOWN && fErrorCode > ( UNKNOWN - kMessages.length))
+		{
+			return "DNS-SD Error " + String.valueOf( fErrorCode) + ": " + kMessages[ UNKNOWN - fErrorCode];
+		}
+		else
+			return super.getMessage() + "(" + String.valueOf( fErrorCode) + ")";
+	}
+
+	protected int			fErrorCode;
+}
+
+// The concrete, default implementation.
+class	AppleDNSSD extends DNSSD
+{
+	static
+	{
+		System.loadLibrary( "jdns_sd");
+	
+		int		libInitResult = InitLibrary( 2);	// Current version number (must be sync'd with jnilib version)
+
+		if (libInitResult != DNSSDException.NO_ERROR)
+			throw new InternalError( "cannot instantiate DNSSD: " + new AppleDNSSDException( libInitResult).getMessage());
+	}
+
+	static public boolean	hasAutoCallbacks;	// Set by InitLibrary() to value of AUTO_CALLBACKS
+
+	protected DNSSDService	_makeBrowser( int flags, int ifIndex, String regType, String domain, BrowseListener client)
+	throws DNSSDException
+	{
+		return new AppleBrowser( flags, ifIndex, regType, domain, client);
+	}
+
+	protected DNSSDService	_resolve( int flags, int ifIndex, String serviceName, String regType,
+										String domain, ResolveListener client)
+	throws DNSSDException
+	{
+		return new AppleResolver( flags, ifIndex, serviceName, regType, domain, client);
+	}
+
+	protected DNSSDRegistration	_register( int flags, int ifIndex, String serviceName, String regType,
+									String domain, String host, int port, TXTRecord txtRecord, RegisterListener client)
+	throws DNSSDException
+	{
+		return new AppleRegistration( flags, ifIndex, serviceName, regType, domain, host, port,
+										( txtRecord != null) ? txtRecord.getRawBytes() : null, client);
+	}
+
+	protected DNSSDRecordRegistrar	_createRecordRegistrar( RegisterRecordListener listener)
+	throws DNSSDException
+	{
+		return new AppleRecordRegistrar( listener);
+	}
+
+	protected DNSSDService		_queryRecord( int flags, int ifIndex, String serviceName, int rrtype,
+										int rrclass, QueryListener client)
+	throws DNSSDException
+	{
+		return new AppleQuery( flags, ifIndex, serviceName, rrtype, rrclass, client);
+	}
+
+	protected DNSSDService		_enumerateDomains( int flags, int ifIndex, DomainListener listener)
+	throws DNSSDException
+	{
+		return new AppleDomainEnum( flags, ifIndex, listener);
+	}
+
+	protected String			_constructFullName( String serviceName, String regType, String domain)
+	throws DNSSDException
+	{
+		String[]	responseHolder = new String[1];	// lame maneuver to get around Java's lack of reference parameters
+
+		int rc = ConstructName( serviceName, regType, domain, responseHolder);
+		if (rc != 0)
+			throw new AppleDNSSDException( rc);
+
+		return responseHolder[0];
+	}
+
+	protected void				_reconfirmRecord( int flags, int ifIndex, String fullName, int rrtype,
+										int rrclass, byte[] rdata)
+	{
+		ReconfirmRecord( flags, ifIndex, fullName, rrtype, rrclass, rdata);
+	}
+
+	protected String			_getNameForIfIndex( int ifIndex)
+	{
+		return GetNameForIfIndex( ifIndex);
+	}
+
+	protected int				_getIfIndexForName( String ifName)
+	{
+		return GetIfIndexForName( ifName);
+	}
+
+
+	protected native int	ConstructName( String serviceName, String regType, String domain, String[] pOut);
+
+	protected native void	ReconfirmRecord( int flags, int ifIndex, String fullName, int rrtype,
+										int rrclass, byte[] rdata);
+
+	protected native String	GetNameForIfIndex( int ifIndex);
+
+	protected native int	GetIfIndexForName( String ifName);
+
+	protected static native int	InitLibrary( int callerVersion);
+}
+
+class	AppleService implements DNSSDService, Runnable
+{
+	public					AppleService(BaseListener listener)	{ fNativeContext = 0; fListener = listener; }
+
+	public void				stop() { this.HaltOperation(); }
+
+	/* Block until data arrives, or one second passes. Returns 1 if data present, 0 otherwise. */
+	protected native int	BlockForData();
+
+	/* Call ProcessResults when data appears on socket descriptor. */
+	protected native int	ProcessResults();
+
+	protected synchronized native void HaltOperation();
+
+	protected void			ThrowOnErr( int rc) throws DNSSDException
+	{
+		if (rc != 0)
+			throw new AppleDNSSDException( rc);
+	}
+
+	protected long	/* warning */	fNativeContext;		// Private storage for native side
+
+	public void		run()
+	{
+		while ( true )
+		{
+			// Note: We want to allow our DNS-SD operation to be stopped from other threads, so we have to
+			// block waiting for data *outside* the synchronized section. Because we're doing this unsynchronized
+			// we have to write some careful code. Suppose our DNS-SD operation is stopped from some other thread,
+			// and then immediately afterwards that thread (or some third, unrelated thread) starts a new DNS-SD
+			// operation. The Unix kernel always allocates the lowest available file descriptor to a new socket,
+			// so the same file descriptor is highly likely to be reused for the new operation, and if our old
+			// stale ServiceThread accidentally consumes bytes off that new socket we'll get really messed up.
+			// To guard against that, before calling ProcessResults we check to ensure that our
+			// fNativeContext has not been deleted, which is a telltale sign that our operation was stopped.
+			// After calling ProcessResults we check again, because it's extremely common for callback
+			// functions to stop their own operation and start others. For example, a resolveListener callback
+			// may well stop the resolve and then start a QueryRecord call to monitor the TXT record.
+			//
+			// The remaining risk is that between our checking fNativeContext and calling ProcessResults(),
+			// some other thread could stop the operation and start a new one using same file descriptor, and
+			// we wouldn't know. To prevent this, the AppleService object's HaltOperation() routine is declared
+			// synchronized and we perform our checks synchronized on the AppleService object, which ensures
+			// that HaltOperation() can't execute while we're doing it. Because Java locks are re-entrant this
+			// locking DOESN'T prevent the callback routine from stopping its own operation, but DOES prevent
+			// any other thread from stopping it until after the callback has completed and returned to us here.
+
+			int result = BlockForData();
+			synchronized (this)
+			{
+				if (fNativeContext == 0) break;	// Some other thread stopped our DNSSD operation; time to terminate this thread
+				if (result == 0) continue;		// If BlockForData() said there was no data, go back and block again
+				result = ProcessResults();
+				if (fNativeContext == 0) break;	// Event listener stopped its own DNSSD operation; terminate this thread
+				if (result != 0) { fListener.operationFailed(this, result); break; }	// If error, notify listener
+			}
+		}
+	}
+
+	protected BaseListener fListener;
+}
+
+
+class	AppleBrowser extends AppleService
+{
+	public			AppleBrowser( int flags, int ifIndex, String regType, String domain, BrowseListener client)
+	throws DNSSDException
+	{
+		super(client);
+		this.ThrowOnErr( this.CreateBrowser( flags, ifIndex, regType, domain));
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	CreateBrowser( int flags, int ifIndex, String regType, String domain);
+}
+
+class	AppleResolver extends AppleService
+{
+	public			AppleResolver( int flags, int ifIndex, String serviceName, String regType,
+									String domain, ResolveListener client)
+	throws DNSSDException
+	{
+		super(client);
+		this.ThrowOnErr( this.CreateResolver( flags, ifIndex, serviceName, regType, domain));
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	CreateResolver( int flags, int ifIndex, String serviceName, String regType,
+											String domain);
+}
+
+// An AppleDNSRecord is a simple wrapper around a dns_sd DNSRecord.
+class	AppleDNSRecord implements DNSRecord
+{
+	public			AppleDNSRecord( AppleService owner)
+	{
+		fOwner = owner;
+		fRecord = 0; 		// record always starts out empty
+	}
+
+	public void			update( int flags, byte[] rData, int ttl)
+	throws DNSSDException
+	{
+		this.ThrowOnErr( this.Update( flags, rData, ttl));
+	}
+
+	public void			remove()
+	throws DNSSDException
+	{
+		this.ThrowOnErr( this.Remove());
+	}
+
+	protected long			fRecord;		// Really a DNSRecord; sizeof(long) == sizeof(void*) ?
+	protected AppleService	fOwner;
+
+	protected void			ThrowOnErr( int rc) throws DNSSDException
+	{
+		if (rc != 0)
+			throw new AppleDNSSDException( rc);
+	}
+
+	protected native int	Update( int flags, byte[] rData, int ttl);
+
+	protected native int	Remove();
+}
+
+class	AppleRegistration extends AppleService implements DNSSDRegistration
+{
+	public			AppleRegistration( int flags, int ifIndex, String serviceName, String regType, String domain,
+								String host, int port, byte[] txtRecord, RegisterListener client)
+	throws DNSSDException
+	{
+		super(client);
+		this.ThrowOnErr( this.BeginRegister( ifIndex, flags, serviceName, regType, domain, host, port, txtRecord));
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	public DNSRecord	addRecord( int flags, int rrType, byte[] rData, int ttl)
+	throws DNSSDException
+	{
+		AppleDNSRecord	newRecord = new AppleDNSRecord( this);
+
+		this.ThrowOnErr( this.AddRecord( flags, rrType, rData, ttl, newRecord));
+		return newRecord;
+	}
+
+	public DNSRecord	getTXTRecord()
+	throws DNSSDException
+	{
+		return new AppleDNSRecord( this);	// A record with ref 0 is understood to be primary TXT record
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	BeginRegister( int ifIndex, int flags, String serviceName, String regType,
+											String domain, String host, int port, byte[] txtRecord);
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	AddRecord( int flags, int rrType, byte[] rData, int ttl, AppleDNSRecord destObj);
+}
+
+class	AppleRecordRegistrar extends AppleService implements DNSSDRecordRegistrar
+{
+	public			AppleRecordRegistrar( RegisterRecordListener listener)
+	throws DNSSDException
+	{
+		super(listener);
+		this.ThrowOnErr( this.CreateConnection());
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	public DNSRecord	registerRecord( int flags, int ifIndex, String fullname, int rrtype,
+									int rrclass, byte[] rdata, int ttl)
+	throws DNSSDException
+	{
+		AppleDNSRecord	newRecord = new AppleDNSRecord( this);
+
+		this.ThrowOnErr( this.RegisterRecord( flags, ifIndex, fullname, rrtype, rrclass, rdata, ttl, newRecord));
+		return newRecord;
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	CreateConnection();
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	RegisterRecord( int flags, int ifIndex, String fullname, int rrtype,
+										int rrclass, byte[] rdata, int ttl, AppleDNSRecord destObj);
+}
+
+class	AppleQuery extends AppleService
+{
+	public			AppleQuery( int flags, int ifIndex, String serviceName, int rrtype,
+										int rrclass, QueryListener client)
+	throws DNSSDException
+	{
+		super(client);
+		this.ThrowOnErr( this.CreateQuery( flags, ifIndex, serviceName, rrtype, rrclass));
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	CreateQuery( int flags, int ifIndex, String serviceName, int rrtype, int rrclass);
+}
+
+class	AppleDomainEnum extends AppleService
+{
+	public			AppleDomainEnum( int flags, int ifIndex, DomainListener client)
+	throws DNSSDException
+	{
+		super(client);
+		this.ThrowOnErr( this.BeginEnum( flags, ifIndex));
+		if (!AppleDNSSD.hasAutoCallbacks)
+			new Thread(this).start();
+	}
+
+	// Sets fNativeContext. Returns non-zero on error.
+	protected native int	BeginEnum( int flags, int ifIndex);
+}
+
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSSDException.java b/mDNSResponder/mDNSShared/Java/DNSSDException.java
new file mode 100644
index 00000000..99549b5d
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSSDException.java
@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package	com.apple.dnssd;
+
+
+/**
+	Used to report various DNS-SD-related error conditions.
+*/
+
+abstract public class	DNSSDException extends Exception
+{
+    public static final int		NO_ERROR                  =  0;
+    public static final int		UNKNOWN                   = -65537;
+    public static final int		NO_SUCH_NAME              = -65538;
+    public static final int		NO_MEMORY                 = -65539;
+    public static final int		BAD_PARAM                 = -65540;
+    public static final int		BAD_REFERENCE             = -65541;
+    public static final int		BAD_STATE                 = -65542;
+    public static final int		BAD_FLAGS                 = -65543;
+    public static final int		UNSUPPORTED               = -65544;
+    public static final int		NOT_INITIALIZED           = -65545;
+    public static final int		NO_CACHE                  = -65546;
+    public static final int		ALREADY_REGISTERED        = -65547;
+    public static final int		NAME_CONFLICT             = -65548;
+    public static final int		INVALID                   = -65549;
+    public static final int		FIREWALL                  = -65550;
+    public static final int		INCOMPATIBLE              = -65551;
+    public static final int		BAD_INTERFACE_INDEX       = -65552;
+    public static final int		REFUSED                   = -65553;
+    public static final int		NOSUCHRECORD              = -65554;
+    public static final int		NOAUTH                    = -65555;
+    public static final int		NOSUCHKEY                 = -65556;
+    public static final int		NATTRAVERSAL              = -65557;
+    public static final int		DOUBLENAT                 = -65558;
+    public static final int		BADTIME                   = -65559;
+    public static final int		BADSIG                    = -65560;
+    public static final int		BADKEY                    = -65561;
+    public static final int		TRANSIENT                 = -65562;
+    public static final int		SERVICENOTRUNNING         = -65563;
+    public static final int		NATPORTMAPPINGUNSUPPORTED = -65564;
+    public static final int		NATPORTMAPPINGDISABLED    = -65565;
+    
+    // Note: When adding new error values here, remember also
+    // to update the corresponding kMessages array in AppleDNSSDException (DNSSD.java)
+
+	/** Returns the sub-code that identifies the particular error. */
+	abstract public int			getErrorCode();
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSSDRecordRegistrar.java b/mDNSResponder/mDNSShared/Java/DNSSDRecordRegistrar.java
new file mode 100644
index 00000000..3baac677
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSSDRecordRegistrar.java
@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	An object for registering records, created by {@link DNSSD#createRecordRegistrar}. */
+
+public interface	DNSSDRecordRegistrar extends DNSSDService
+{
+	/** Register an independent {@link DNSRecord}.<P> 
+		@param	flags
+					Possible values are SHARED or UNIQUE (see flag type definitions for details).
+		<P>
+		@param	ifIndex
+					If non-zero, specifies the interface on which to register the record
+					(the index for a given interface is determined via the if_nametoindex()
+					family of calls.)  Passing 0 causes the record to be registered on all interfaces.
+		<P>
+		@param	fullname
+					The full domain name of the resource record.
+		<P>
+		@param	rrtype
+					The numerical type of the resource record to be queried for (e.g. PTR, SRV, etc)
+					as defined in nameser.h.
+		<P>
+		@param	rrclass
+					The class of the resource record, as defined in nameser.h 
+					(usually 1 for the Internet class).
+		<P>
+		@param	rData
+					The new rdata  as it is to appear in the DNS record.
+		<P>
+		@param	ttl
+					The time to live of the resource record, in seconds. Pass 0 to use a default value.
+		<P>
+		@param	listener
+					This object will get called when the service is registered.
+		<P>
+		@return		A {@link DNSSDService} that can be used to abort the record registration.
+
+		@throws SecurityException If a security manager is present and denies <tt>RuntimePermission("getDNSSDInstance")</tt>.
+		@see    RuntimePermission
+	*/
+	public DNSRecord	registerRecord( int flags, int ifIndex, String fullname, int rrtype, 
+									int rrclass, byte[] rdata, int ttl)
+	throws DNSSDException;
+} 
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSSDRegistration.java b/mDNSResponder/mDNSShared/Java/DNSSDRegistration.java
new file mode 100644
index 00000000..720df0b8
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSSDRegistration.java
@@ -0,0 +1,60 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A tracking object for a registration created by {@link DNSSD#register}. */
+
+public interface	DNSSDRegistration extends DNSSDService
+{
+	/** Get a reference to the primary TXT record of a registered service.<P> 
+		The record can be updated by sending it an update() message.<P>
+
+		<P>
+		@return		A {@link DNSRecord}. 
+					If {@link DNSSDRegistration#stop} is called, the DNSRecord is also 
+					invalidated and may not be used further.
+	*/
+	DNSRecord		getTXTRecord()
+	throws DNSSDException;
+
+	/** Add a record to a registered service.<P> 
+		The name of the record will be the same as the registered service's name.<P>
+		The record can be updated or deregistered by sending it an update() or remove() message.<P>
+
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	rrType
+					The type of the record (e.g. TXT, SRV, etc), as defined in nameser.h.
+		<P>
+		@param	rData
+					The raw rdata to be contained in the added resource record.
+		<P>
+		@param	ttl
+					The time to live of the resource record, in seconds.
+		<P>
+		@return		A {@link DNSRecord} that may be passed to updateRecord() or removeRecord(). 
+					If {@link DNSSDRegistration#stop} is called, the DNSRecord is also 
+					invalidated and may not be used further.
+	*/
+	DNSRecord		addRecord( int flags, int rrType, byte[] rData, int ttl)
+	throws DNSSDException;
+} 
+
diff --git a/mDNSResponder/mDNSShared/Java/DNSSDService.java b/mDNSResponder/mDNSShared/Java/DNSSDService.java
new file mode 100644
index 00000000..10f74021
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DNSSDService.java
@@ -0,0 +1,37 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+/**	A tracking object for a service created by {@link DNSSD}. */
+
+public interface	DNSSDService
+{
+	/**
+	Halt the active operation and free resources associated with the DNSSDService.<P>
+
+	Any services or records registered with this DNSSDService will be deregistered. Any
+	Browse, Resolve, or Query operations associated with this reference will be terminated.<P>
+
+	Note: if the service was initialized with DNSSD.register(), and an extra resource record was
+	added to the service via {@link DNSSDRegistration#addRecord}, the DNSRecord so created 
+	is invalidated when this method is called - the DNSRecord may not be used afterward.
+	*/
+	void		stop();
+} 
+
diff --git a/mDNSResponder/mDNSShared/Java/DomainListener.java b/mDNSResponder/mDNSShared/Java/DomainListener.java
new file mode 100644
index 00000000..852f6430
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/DomainListener.java
@@ -0,0 +1,60 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**
+	A listener that receives results from {@link DNSSD#enumerateDomains}.
+*/
+
+public interface DomainListener extends BaseListener
+{
+	/** Called to report discovered domains.<P> 
+
+		@param	domainEnum
+					The active domain enumerator.
+		@param	flags
+					Possible values are: DNSSD.MORE_COMING, DNSSD.DEFAULT
+		<P>
+		@param	ifIndex
+					Specifies the interface on which the domain exists.  (The index for a given 
+					interface is determined via the if_nametoindex() family of calls.)  
+		<P>
+		@param	domain
+					The name of the domain.
+	*/
+	void	domainFound( DNSSDService domainEnum, int flags, int ifIndex, String domain);
+
+	/** Called to report that a domain has disappeared.<P> 
+
+		@param	domainEnum
+					The active domain enumerator.
+		@param	flags
+					Possible values are: DNSSD.MORE_COMING, DNSSD.DEFAULT
+		<P>
+		@param	ifIndex
+					Specifies the interface on which the domain exists.  (The index for a given 
+					interface is determined via the if_nametoindex() family of calls.)  
+		<P>
+		@param	domain
+					The name of the domain.
+	*/
+	void	domainLost( DNSSDService domainEnum, int flags, int ifIndex, String domain);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/JNISupport.c b/mDNSResponder/mDNSShared/Java/JNISupport.c
new file mode 100644
index 00000000..22b40930
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/JNISupport.c
@@ -0,0 +1,1072 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    This file contains the platform support for DNSSD and related Java classes.
+    It is used to shim through to the underlying <dns_sd.h> API.
+ */
+
+// AUTO_CALLBACKS should be set to 1 if the underlying mDNS implementation fires response
+// callbacks automatically (as in the early Windows prototypes).
+// AUTO_CALLBACKS should be set to 0 if the client must call DNSServiceProcessResult() to
+// invoke response callbacks (as is true on Mac OS X, Posix, Windows, etc.).
+// (Invoking callbacks automatically on a different thread sounds attractive, but while
+// the client gains by not needing to add an event source to its main event loop, it loses
+// by being forced to deal with concurrency and locking, which can be a bigger burden.)
+#ifndef AUTO_CALLBACKS
+#define AUTO_CALLBACKS  0
+#endif
+
+#if !AUTO_CALLBACKS
+#ifdef _WIN32
+#include <winsock2.h>
+#else //_WIN32
+#include <sys/types.h>
+#include <sys/select.h>
+#endif // _WIN32
+#endif // AUTO_CALLBACKS
+
+#include <dns_sd.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <iphlpapi.h>
+static char *   win32_if_indextoname( DWORD ifIndex, char * nameBuff);
+static DWORD    win32_if_nametoindex( const char * nameStr );
+#define if_indextoname win32_if_indextoname
+#define if_nametoindex win32_if_nametoindex
+#define IF_NAMESIZE MAX_ADAPTER_NAME_LENGTH
+#else // _WIN32
+#include <sys/socket.h>
+#include <net/if.h>
+#endif // _WIN32
+
+// When compiling with "-Wshadow" set, including jni.h produces the following error:
+// /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/jni.h:609: warning: declaration of 'index' shadows a global declaration
+// To work around this, we use the preprocessor to map the identifier 'index', which appears harmlessly in function prototype declarations,
+// to something 'jni_index', which doesn't conflict
+#define index jni_index
+#include "DNSSD.java.h"
+#undef index
+
+//#include <syslog.h>
+
+// convenience definition
+#ifdef __GNUC__
+#define _UNUSED __attribute__ ((unused))
+#else
+#define _UNUSED
+#endif
+
+enum {
+    kInterfaceVersionOne = 1,
+    kInterfaceVersionCurrent        // Must match version in .jar file
+};
+
+typedef struct OpContext OpContext;
+
+struct  OpContext
+{
+    DNSServiceRef ServiceRef;
+    JNIEnv          *Env;
+    jobject JavaObj;
+    jobject ClientObj;
+    jmethodID Callback;
+    jmethodID Callback2;
+};
+
+// For AUTO_CALLBACKS, we must attach the callback thread to the Java VM prior to upcall.
+#if AUTO_CALLBACKS
+JavaVM      *gJavaVM = NULL;
+#endif
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDNSSD_InitLibrary( JNIEnv *pEnv, jclass cls,
+                                                                    jint callerVersion)
+{
+    /* Ensure that caller & interface versions match. */
+    if ( callerVersion != kInterfaceVersionCurrent)
+        return kDNSServiceErr_Incompatible;
+
+#if AUTO_CALLBACKS
+    {
+        jsize numVMs;
+
+        if ( 0 != JNI_GetCreatedJavaVMs( &gJavaVM, 1, &numVMs))
+            return kDNSServiceErr_BadState;
+    }
+#endif
+
+    // Set AppleDNSSD.hasAutoCallbacks
+    {
+#if AUTO_CALLBACKS
+        jboolean hasAutoC = JNI_TRUE;
+#else
+        jboolean hasAutoC = JNI_FALSE;
+#endif
+        jfieldID hasAutoCField = (*pEnv)->GetStaticFieldID( pEnv, cls, "hasAutoCallbacks", "Z");
+        (*pEnv)->SetStaticBooleanField( pEnv, cls, hasAutoCField, hasAutoC);
+    }
+
+    return kDNSServiceErr_NoError;
+}
+
+
+static const char*  SafeGetUTFChars( JNIEnv *pEnv, jstring str)
+// Wrapper for JNI GetStringUTFChars() that returns NULL for null str.
+{
+    return str != NULL ? (*pEnv)->GetStringUTFChars( pEnv, str, 0) : NULL;
+}
+
+static void         SafeReleaseUTFChars( JNIEnv *pEnv, jstring str, const char *buff)
+// Wrapper for JNI GetStringUTFChars() that handles null str.
+{
+    if ( str != NULL)
+        (*pEnv)->ReleaseStringUTFChars( pEnv, str, buff);
+}
+
+
+#if AUTO_CALLBACKS
+static void SetupCallbackState( JNIEnv **ppEnv)
+{
+    (*gJavaVM)->AttachCurrentThread( gJavaVM, (void**) ppEnv, NULL);
+}
+
+static void TeardownCallbackState( void )
+{
+    (*gJavaVM)->DetachCurrentThread( gJavaVM);
+}
+
+#else   // AUTO_CALLBACKS
+
+static void SetupCallbackState( JNIEnv **ppEnv _UNUSED)
+{
+    // No setup necessary if ProcessResults() has been called
+}
+
+static void TeardownCallbackState( void )
+{
+    // No teardown necessary if ProcessResults() has been called
+}
+#endif  // AUTO_CALLBACKS
+
+
+static OpContext    *NewContext( JNIEnv *pEnv, jobject owner,
+                                 const char *callbackName, const char *callbackSig)
+// Create and initialize a new OpContext.
+{
+    OpContext               *pContext = (OpContext*) malloc( sizeof *pContext);
+
+    if ( pContext != NULL)
+    {
+        jfieldID clientField = (*pEnv)->GetFieldID( pEnv, (*pEnv)->GetObjectClass( pEnv, owner),
+                                                    "fListener", "Lcom/apple/dnssd/BaseListener;");
+
+        pContext->JavaObj = (*pEnv)->NewWeakGlobalRef( pEnv, owner);    // must convert local ref to global to cache;
+        pContext->ClientObj = (*pEnv)->GetObjectField( pEnv, owner, clientField);
+        pContext->ClientObj = (*pEnv)->NewWeakGlobalRef( pEnv, pContext->ClientObj);    // must convert local ref to global to cache
+        pContext->Callback = (*pEnv)->GetMethodID( pEnv,
+                                                   (*pEnv)->GetObjectClass( pEnv, pContext->ClientObj),
+                                                   callbackName, callbackSig);
+        pContext->Callback2 = NULL;     // not always used
+    }
+
+    return pContext;
+}
+
+
+static void         ReportError( JNIEnv *pEnv, jobject target, jobject service, DNSServiceErrorType err)
+// Invoke operationFailed() method on target with err.
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, target);
+    jmethodID opFailed = (*pEnv)->GetMethodID( pEnv, cls, "operationFailed",
+                                               "(Lcom/apple/dnssd/DNSSDService;I)V");
+
+    (*pEnv)->CallVoidMethod( pEnv, target, opFailed, service, err);
+}
+
+JNIEXPORT void JNICALL Java_com_apple_dnssd_AppleService_HaltOperation( JNIEnv *pEnv, jobject pThis)
+/* Deallocate the dns_sd service browser and set the Java object's fNativeContext field to 0. */
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+
+    if ( contextField != 0)
+    {
+        OpContext   *pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
+        if ( pContext != NULL)
+        {
+            // MUST clear fNativeContext first, BEFORE calling DNSServiceRefDeallocate()
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, 0);
+            if ( pContext->ServiceRef != NULL)
+                DNSServiceRefDeallocate( pContext->ServiceRef);
+
+            (*pEnv)->DeleteWeakGlobalRef( pEnv, pContext->JavaObj);
+            (*pEnv)->DeleteWeakGlobalRef( pEnv, pContext->ClientObj);
+            free( pContext);
+        }
+    }
+}
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleService_BlockForData( JNIEnv *pEnv, jobject pThis)
+/* Block until data arrives, or one second passes. Returns 1 if data present, 0 otherwise. */
+{
+// BlockForData() not supported with AUTO_CALLBACKS
+#if !AUTO_CALLBACKS
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+
+    if ( contextField != 0)
+    {
+        OpContext   *pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
+        if ( pContext != NULL)
+        {
+            fd_set readFDs;
+            int sd = DNSServiceRefSockFD( pContext->ServiceRef);
+            struct timeval timeout = { 1, 0 };
+            FD_ZERO( &readFDs);
+            FD_SET( sd, &readFDs);
+
+            // Q: Why do we poll here?
+            // A: Because there's no other thread-safe way to do it.
+            // Mac OS X terminates a select() call if you close one of the sockets it's listening on, but Linux does not,
+            // and arguably Linux is correct (See <http://www.ussg.iu.edu/hypermail/linux/kernel/0405.1/0418.html>)
+            // The problem is that the Mac OS X behaviour assumes that it's okay for one thread to close a socket while
+            // some other thread is monitoring that socket in select(), but the difficulty is that there's no general way
+            // to make that thread-safe, because there's no atomic way to enter select() and release a lock simultaneously.
+            // If we try to do this without holding any lock, then right as we jump to the select() routine,
+            // some other thread could stop our operation (thereby closing the socket),
+            // and then that thread (or even some third, unrelated thread)
+            // could do some other DNS-SD operation (or some other operation that opens a new file descriptor)
+            // and then we'd blindly resume our fall into the select() call, now blocking on a file descriptor
+            // that may coincidentally have the same numerical value, but is semantically unrelated
+            // to the true file descriptor we thought we were blocking on.
+            // We can't stop this race condition from happening, but at least if we wake up once a second we can detect
+            // when fNativeContext has gone to zero, and thereby discover that we were blocking on the wrong fd.
+
+            if (select( sd + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &timeout) == 1) return(1);
+        }
+    }
+#endif // !AUTO_CALLBACKS
+    return(0);
+}
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleService_ProcessResults( JNIEnv *pEnv, jobject pThis)
+/* Call through to DNSServiceProcessResult() while data remains on socket. */
+{
+#if !AUTO_CALLBACKS // ProcessResults() not supported with AUTO_CALLBACKS
+
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext       *pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
+    DNSServiceErrorType err = kDNSServiceErr_BadState;
+
+    if ( pContext != NULL)
+    {
+        int sd = DNSServiceRefSockFD( pContext->ServiceRef);
+        fd_set readFDs;
+        struct timeval zeroTimeout = { 0, 0 };
+
+        pContext->Env = pEnv;
+
+        FD_ZERO( &readFDs);
+        FD_SET( sd, &readFDs);
+
+        err = kDNSServiceErr_NoError;
+        if (0 < select(sd + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout))
+        {
+            err = DNSServiceProcessResult(pContext->ServiceRef);
+            // Use caution here!
+            // We cannot touch any data structures associated with this operation!
+            // The DNSServiceProcessResult() routine should have invoked our callback,
+            // and our callback could have terminated the operation with op.stop();
+            // and that means HaltOperation() will have been called, which frees pContext.
+            // Basically, from here we just have to get out without touching any stale
+            // data structures that could blow up on us! Particularly, any attempt
+            // to loop here reading more results from the file descriptor is unsafe.
+        }
+    }
+    return err;
+#endif // AUTO_CALLBACKS
+}
+
+
+static void DNSSD_API   ServiceBrowseReply( DNSServiceRef sdRef _UNUSED, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                            DNSServiceErrorType errorCode, const char *serviceName, const char *regtype,
+                                            const char *replyDomain, void *context)
+{
+    OpContext       *pContext = (OpContext*) context;
+
+    SetupCallbackState( &pContext->Env);
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj,
+                                              ( flags & kDNSServiceFlagsAdd) != 0 ? pContext->Callback : pContext->Callback2,
+                                              pContext->JavaObj, flags, interfaceIndex,
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, serviceName),
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, regtype),
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, replyDomain));
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleBrowser_CreateBrowser( JNIEnv *pEnv, jobject pThis,
+                                                                        jint flags, jint ifIndex, jstring regType, jstring domain)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "serviceFound",
+                               "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        const char  *regStr = SafeGetUTFChars( pEnv, regType);
+        const char  *domainStr = SafeGetUTFChars( pEnv, domain);
+
+        pContext->Callback2 = (*pEnv)->GetMethodID( pEnv,
+                                                    (*pEnv)->GetObjectClass( pEnv, pContext->ClientObj),
+                                                    "serviceLost", "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+
+        err = DNSServiceBrowse( &pContext->ServiceRef, flags, ifIndex, regStr, domainStr, ServiceBrowseReply, pContext);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+
+        SafeReleaseUTFChars( pEnv, regType, regStr);
+        SafeReleaseUTFChars( pEnv, domain, domainStr);
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+
+static void DNSSD_API   ServiceResolveReply( DNSServiceRef sdRef _UNUSED, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                             DNSServiceErrorType errorCode, const char *fullname, const char *hosttarget,
+                                             uint16_t port, uint16_t txtLen, const unsigned char *txtRecord, void *context)
+{
+    OpContext       *pContext = (OpContext*) context;
+    jclass txtCls;
+    jmethodID txtCtor;
+    jbyteArray txtBytes;
+    jobject txtObj;
+    jbyte           *pBytes;
+
+    SetupCallbackState( &pContext->Env);
+
+    txtCls = (*pContext->Env)->FindClass( pContext->Env, "com/apple/dnssd/TXTRecord");
+    txtCtor = (*pContext->Env)->GetMethodID( pContext->Env, txtCls, "<init>", "([B)V");
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL && txtCtor != NULL &&
+         NULL != ( txtBytes = (*pContext->Env)->NewByteArray( pContext->Env, txtLen)))
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            // Since Java ints are defined to be big-endian, we canonicalize 'port' from a 16-bit
+            // pattern into a number here.
+            port = ( ((unsigned char*) &port)[0] << 8) | ((unsigned char*) &port)[1];
+
+            // Initialize txtBytes with contents of txtRecord
+            pBytes = (*pContext->Env)->GetByteArrayElements( pContext->Env, txtBytes, NULL);
+            memcpy( pBytes, txtRecord, txtLen);
+            (*pContext->Env)->ReleaseByteArrayElements( pContext->Env, txtBytes, pBytes, JNI_COMMIT);
+
+            // Construct txtObj with txtBytes
+            txtObj = (*pContext->Env)->NewObject( pContext->Env, txtCls, txtCtor, txtBytes);
+            (*pContext->Env)->DeleteLocalRef( pContext->Env, txtBytes);
+
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
+                                              pContext->JavaObj, flags, interfaceIndex,
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, fullname),
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, hosttarget),
+                                              port, txtObj);
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleResolver_CreateResolver( JNIEnv *pEnv, jobject pThis,
+                                                                          jint flags, jint ifIndex, jstring serviceName, jstring regType, jstring domain)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "serviceResolved",
+                               "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;Ljava/lang/String;ILcom/apple/dnssd/TXTRecord;)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        const char  *servStr = SafeGetUTFChars( pEnv, serviceName);
+        const char  *regStr = SafeGetUTFChars( pEnv, regType);
+        const char  *domainStr = SafeGetUTFChars( pEnv, domain);
+
+        err = DNSServiceResolve( &pContext->ServiceRef, flags, ifIndex,
+                                 servStr, regStr, domainStr, ServiceResolveReply, pContext);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+
+        SafeReleaseUTFChars( pEnv, serviceName, servStr);
+        SafeReleaseUTFChars( pEnv, regType, regStr);
+        SafeReleaseUTFChars( pEnv, domain, domainStr);
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+
+static void DNSSD_API   ServiceRegisterReply( DNSServiceRef sdRef _UNUSED, DNSServiceFlags flags,
+                                              DNSServiceErrorType errorCode, const char *serviceName,
+                                              const char *regType, const char *domain, void *context)
+{
+    OpContext       *pContext = (OpContext*) context;
+
+    SetupCallbackState( &pContext->Env);
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
+                                              pContext->JavaObj, flags,
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, serviceName),
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, regType),
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, domain));
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleRegistration_BeginRegister( JNIEnv *pEnv, jobject pThis,
+                                                                             jint ifIndex, jint flags, jstring serviceName, jstring regType,
+                                                                             jstring domain, jstring host, jint port, jbyteArray txtRecord)
+{
+    //syslog(LOG_ERR, "BR");
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    jbyte                   *pBytes;
+    jsize numBytes;
+
+    //syslog(LOG_ERR, "BR: contextField %d", contextField);
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "serviceRegistered",
+                               "(Lcom/apple/dnssd/DNSSDRegistration;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        const char  *servStr = SafeGetUTFChars( pEnv, serviceName);
+        const char  *regStr = SafeGetUTFChars( pEnv, regType);
+        const char  *domainStr = SafeGetUTFChars( pEnv, domain);
+        const char  *hostStr = SafeGetUTFChars( pEnv, host);
+
+        //syslog(LOG_ERR, "BR: regStr %s", regStr);
+
+        // Since Java ints are defined to be big-endian, we de-canonicalize 'port' from a
+        // big-endian number into a 16-bit pattern here.
+        uint16_t portBits = port;
+        portBits = ( ((unsigned char*) &portBits)[0] << 8) | ((unsigned char*) &portBits)[1];
+
+        pBytes = txtRecord ? (*pEnv)->GetByteArrayElements( pEnv, txtRecord, NULL) : NULL;
+        numBytes = txtRecord ? (*pEnv)->GetArrayLength( pEnv, txtRecord) : 0;
+
+        err = DNSServiceRegister( &pContext->ServiceRef, flags, ifIndex, servStr, regStr,
+                                  domainStr, hostStr, portBits,
+                                  numBytes, pBytes, ServiceRegisterReply, pContext);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+
+        if ( pBytes != NULL)
+            (*pEnv)->ReleaseByteArrayElements( pEnv, txtRecord, pBytes, 0);
+
+        SafeReleaseUTFChars( pEnv, serviceName, servStr);
+        SafeReleaseUTFChars( pEnv, regType, regStr);
+        SafeReleaseUTFChars( pEnv, domain, domainStr);
+        SafeReleaseUTFChars( pEnv, host, hostStr);
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleRegistration_AddRecord( JNIEnv *pEnv, jobject pThis,
+                                                                         jint flags, jint rrType, jbyteArray rData, jint ttl, jobject destObj)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    jclass destCls = (*pEnv)->GetObjectClass( pEnv, destObj);
+    jfieldID recField = (*pEnv)->GetFieldID( pEnv, destCls, "fRecord", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    jbyte                   *pBytes;
+    jsize numBytes;
+    DNSRecordRef recRef;
+
+    if ( contextField != 0)
+        pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
+    if ( pContext == NULL || pContext->ServiceRef == NULL)
+        return kDNSServiceErr_BadParam;
+
+    pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
+    numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
+
+    err = DNSServiceAddRecord( pContext->ServiceRef, &recRef, flags, rrType, numBytes, pBytes, ttl);
+    if ( err == kDNSServiceErr_NoError)
+    {
+        (*pEnv)->SetLongField(pEnv, destObj, recField, (long) recRef);
+    }
+
+    if ( pBytes != NULL)
+        (*pEnv)->ReleaseByteArrayElements( pEnv, rData, pBytes, 0);
+
+    return err;
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDNSRecord_Update( JNIEnv *pEnv, jobject pThis,
+                                                                   jint flags, jbyteArray rData, jint ttl)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID ownerField = (*pEnv)->GetFieldID( pEnv, cls, "fOwner", "Lcom/apple/dnssd/AppleService;");
+    jfieldID recField = (*pEnv)->GetFieldID( pEnv, cls, "fRecord", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    jbyte                   *pBytes;
+    jsize numBytes;
+    DNSRecordRef recRef = NULL;
+
+    if ( ownerField != 0)
+    {
+        jobject ownerObj = (*pEnv)->GetObjectField( pEnv, pThis, ownerField);
+        jclass ownerClass = (*pEnv)->GetObjectClass( pEnv, ownerObj);
+        jfieldID contextField = (*pEnv)->GetFieldID( pEnv, ownerClass, "fNativeContext", "J");
+        if ( contextField != 0)
+            pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, ownerObj, contextField);
+    }
+    if ( recField != 0)
+        recRef = (DNSRecordRef) (long) (*pEnv)->GetLongField(pEnv, pThis, recField);
+    if ( pContext == NULL || pContext->ServiceRef == NULL)
+        return kDNSServiceErr_BadParam;
+
+    pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
+    numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
+
+    err = DNSServiceUpdateRecord( pContext->ServiceRef, recRef, flags, numBytes, pBytes, ttl);
+
+    if ( pBytes != NULL)
+        (*pEnv)->ReleaseByteArrayElements( pEnv, rData, pBytes, 0);
+
+    return err;
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDNSRecord_Remove( JNIEnv *pEnv, jobject pThis)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID ownerField = (*pEnv)->GetFieldID( pEnv, cls, "fOwner", "Lcom/apple/dnssd/AppleService;");
+    jfieldID recField = (*pEnv)->GetFieldID( pEnv, cls, "fRecord", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    DNSRecordRef recRef = NULL;
+
+    if ( ownerField != 0)
+    {
+        jobject ownerObj = (*pEnv)->GetObjectField( pEnv, pThis, ownerField);
+        jclass ownerClass = (*pEnv)->GetObjectClass( pEnv, ownerObj);
+        jfieldID contextField = (*pEnv)->GetFieldID( pEnv, ownerClass, "fNativeContext", "J");
+        if ( contextField != 0)
+            pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, ownerObj, contextField);
+    }
+    if ( recField != 0)
+        recRef = (DNSRecordRef) (long) (*pEnv)->GetLongField(pEnv, pThis, recField);
+    if ( pContext == NULL || pContext->ServiceRef == NULL)
+        return kDNSServiceErr_BadParam;
+
+    err = DNSServiceRemoveRecord( pContext->ServiceRef, recRef, 0);
+
+    return err;
+}
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleRecordRegistrar_CreateConnection( JNIEnv *pEnv, jobject pThis)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "recordRegistered", "(Lcom/apple/dnssd/DNSRecord;I)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        err = DNSServiceCreateConnection( &pContext->ServiceRef);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+struct RecordRegistrationRef
+{
+    OpContext       *Context;
+    jobject RecordObj;
+};
+typedef struct RecordRegistrationRef RecordRegistrationRef;
+
+static void DNSSD_API   RegisterRecordReply( DNSServiceRef sdRef _UNUSED,
+                                             DNSRecordRef recordRef _UNUSED, DNSServiceFlags flags,
+                                             DNSServiceErrorType errorCode, void *context)
+{
+    RecordRegistrationRef   *regEnvelope = (RecordRegistrationRef*) context;
+    OpContext       *pContext = regEnvelope->Context;
+
+    SetupCallbackState( &pContext->Env);
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
+                                              regEnvelope->RecordObj, flags);
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+
+    (*pContext->Env)->DeleteWeakGlobalRef( pContext->Env, regEnvelope->RecordObj);
+    free( regEnvelope);
+
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleRecordRegistrar_RegisterRecord( JNIEnv *pEnv, jobject pThis,
+                                                                                 jint flags, jint ifIndex, jstring fullname, jint rrType, jint rrClass,
+                                                                                 jbyteArray rData, jint ttl, jobject destObj)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    jclass destCls = (*pEnv)->GetObjectClass( pEnv, destObj);
+    jfieldID recField = (*pEnv)->GetFieldID( pEnv, destCls, "fRecord", "J");
+    const char              *nameStr = SafeGetUTFChars( pEnv, fullname);
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    jbyte                   *pBytes;
+    jsize numBytes;
+    DNSRecordRef recRef;
+    RecordRegistrationRef   *regEnvelope;
+
+    if ( contextField != 0)
+        pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
+    if ( pContext == NULL || pContext->ServiceRef == NULL || nameStr == NULL)
+        return kDNSServiceErr_BadParam;
+
+    regEnvelope = calloc( 1, sizeof *regEnvelope);
+    if ( regEnvelope == NULL)
+        return kDNSServiceErr_NoMemory;
+    regEnvelope->Context = pContext;
+    regEnvelope->RecordObj = (*pEnv)->NewWeakGlobalRef( pEnv, destObj); // must convert local ref to global to cache
+
+    pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
+    numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
+
+    err = DNSServiceRegisterRecord( pContext->ServiceRef, &recRef, flags, ifIndex,
+                                    nameStr, rrType, rrClass, numBytes, pBytes, ttl,
+                                    RegisterRecordReply, regEnvelope);
+
+    if ( err == kDNSServiceErr_NoError)
+    {
+        (*pEnv)->SetLongField(pEnv, destObj, recField, (long) recRef);
+    }
+    else
+    {
+        if ( regEnvelope->RecordObj != NULL)
+            (*pEnv)->DeleteWeakGlobalRef( pEnv, regEnvelope->RecordObj);
+        free( regEnvelope);
+    }
+
+    if ( pBytes != NULL)
+        (*pEnv)->ReleaseByteArrayElements( pEnv, rData, pBytes, 0);
+
+    SafeReleaseUTFChars( pEnv, fullname, nameStr);
+
+    return err;
+}
+
+
+static void DNSSD_API   ServiceQueryReply( DNSServiceRef sdRef _UNUSED, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                           DNSServiceErrorType errorCode, const char *serviceName,
+                                           uint16_t rrtype, uint16_t rrclass, uint16_t rdlen,
+                                           const void *rdata, uint32_t ttl, void *context)
+{
+    OpContext       *pContext = (OpContext*) context;
+    jbyteArray rDataObj;
+    jbyte           *pBytes;
+
+    SetupCallbackState( &pContext->Env);
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL &&
+         NULL != ( rDataObj = (*pContext->Env)->NewByteArray( pContext->Env, rdlen)))
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            // Initialize rDataObj with contents of rdata
+            pBytes = (*pContext->Env)->GetByteArrayElements( pContext->Env, rDataObj, NULL);
+            memcpy( pBytes, rdata, rdlen);
+            (*pContext->Env)->ReleaseByteArrayElements( pContext->Env, rDataObj, pBytes, JNI_COMMIT);
+
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
+                                              pContext->JavaObj, flags, interfaceIndex,
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, serviceName),
+                                              rrtype, rrclass, rDataObj, ttl);
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleQuery_CreateQuery( JNIEnv *pEnv, jobject pThis,
+                                                                    jint flags, jint ifIndex, jstring serviceName, jint rrtype, jint rrclass)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "queryAnswered",
+                               "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;II[BI)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        const char  *servStr = SafeGetUTFChars( pEnv, serviceName);
+
+        err = DNSServiceQueryRecord( &pContext->ServiceRef, flags, ifIndex, servStr,
+                                     rrtype, rrclass, ServiceQueryReply, pContext);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+
+        SafeReleaseUTFChars( pEnv, serviceName, servStr);
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+
+static void DNSSD_API   DomainEnumReply( DNSServiceRef sdRef _UNUSED, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                         DNSServiceErrorType errorCode, const char *replyDomain, void *context)
+{
+    OpContext       *pContext = (OpContext*) context;
+
+    SetupCallbackState( &pContext->Env);
+
+    if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+    {
+        if ( errorCode == kDNSServiceErr_NoError)
+        {
+            (*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj,
+                                              ( flags & kDNSServiceFlagsAdd) != 0 ? pContext->Callback : pContext->Callback2,
+                                              pContext->JavaObj, flags, interfaceIndex,
+                                              (*pContext->Env)->NewStringUTF( pContext->Env, replyDomain));
+        }
+        else
+            ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+    }
+    TeardownCallbackState();
+}
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDomainEnum_BeginEnum( JNIEnv *pEnv, jobject pThis,
+                                                                       jint flags, jint ifIndex)
+{
+    jclass cls = (*pEnv)->GetObjectClass( pEnv, pThis);
+    jfieldID contextField = (*pEnv)->GetFieldID( pEnv, cls, "fNativeContext", "J");
+    OpContext               *pContext = NULL;
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+
+    if ( contextField != 0)
+        pContext = NewContext( pEnv, pThis, "domainFound",
+                               "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;)V");
+    else
+        err = kDNSServiceErr_BadParam;
+
+    if ( pContext != NULL)
+    {
+        pContext->Callback2 = (*pEnv)->GetMethodID( pEnv,
+                                                    (*pEnv)->GetObjectClass( pEnv, pContext->ClientObj),
+                                                    "domainLost", "(Lcom/apple/dnssd/DNSSDService;IILjava/lang/String;)V");
+
+        err = DNSServiceEnumerateDomains( &pContext->ServiceRef, flags, ifIndex,
+                                          DomainEnumReply, pContext);
+        if ( err == kDNSServiceErr_NoError)
+        {
+            (*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
+        }
+    }
+    else
+        err = kDNSServiceErr_NoMemory;
+
+    return err;
+}
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDNSSD_ConstructName( JNIEnv *pEnv, jobject pThis _UNUSED,
+                                                                      jstring serviceName, jstring regtype, jstring domain, jobjectArray pOut)
+{
+    DNSServiceErrorType err = kDNSServiceErr_NoError;
+    const char              *nameStr = SafeGetUTFChars( pEnv, serviceName);
+    const char              *regStr = SafeGetUTFChars( pEnv, regtype);
+    const char              *domStr = SafeGetUTFChars( pEnv, domain);
+    char buff[ kDNSServiceMaxDomainName + 1];
+
+    err = DNSServiceConstructFullName( buff, nameStr, regStr, domStr);
+
+    if ( err == kDNSServiceErr_NoError)
+    {
+        // pOut is expected to be a String[1] array.
+        (*pEnv)->SetObjectArrayElement( pEnv, pOut, 0, (*pEnv)->NewStringUTF( pEnv, buff));
+    }
+
+    SafeReleaseUTFChars( pEnv, serviceName, nameStr);
+    SafeReleaseUTFChars( pEnv, regtype, regStr);
+    SafeReleaseUTFChars( pEnv, domain, domStr);
+
+    return err;
+}
+
+JNIEXPORT void JNICALL Java_com_apple_dnssd_AppleDNSSD_ReconfirmRecord( JNIEnv *pEnv, jobject pThis _UNUSED,
+                                                                        jint flags, jint ifIndex, jstring fullName,
+                                                                        jint rrtype, jint rrclass, jbyteArray rdata)
+{
+    jbyte                   *pBytes;
+    jsize numBytes;
+    const char              *nameStr = SafeGetUTFChars( pEnv, fullName);
+
+    pBytes = (*pEnv)->GetByteArrayElements( pEnv, rdata, NULL);
+    numBytes = (*pEnv)->GetArrayLength( pEnv, rdata);
+
+    DNSServiceReconfirmRecord( flags, ifIndex, nameStr, rrtype, rrclass, numBytes, pBytes);
+
+    if ( pBytes != NULL)
+        (*pEnv)->ReleaseByteArrayElements( pEnv, rdata, pBytes, 0);
+
+    SafeReleaseUTFChars( pEnv, fullName, nameStr);
+}
+
+#define LOCAL_ONLY_NAME "loo"
+#define P2P_NAME "p2p"
+
+JNIEXPORT jstring JNICALL Java_com_apple_dnssd_AppleDNSSD_GetNameForIfIndex( JNIEnv *pEnv, jobject pThis _UNUSED,
+                                                                             jint ifIndex)
+{
+    char                    *p = LOCAL_ONLY_NAME, nameBuff[IF_NAMESIZE];
+
+    if (ifIndex == (jint) kDNSServiceInterfaceIndexP2P)
+        p = P2P_NAME;
+    else if (ifIndex != (jint) kDNSServiceInterfaceIndexLocalOnly)
+        p = if_indextoname( ifIndex, nameBuff );
+
+    return (*pEnv)->NewStringUTF( pEnv, p);
+}
+
+
+JNIEXPORT jint JNICALL Java_com_apple_dnssd_AppleDNSSD_GetIfIndexForName( JNIEnv *pEnv, jobject pThis _UNUSED,
+                                                                          jstring ifName)
+{
+    uint32_t ifIndex = kDNSServiceInterfaceIndexLocalOnly;
+    const char              *nameStr = SafeGetUTFChars( pEnv, ifName);
+
+    if (strcmp(nameStr, P2P_NAME) == 0)
+        ifIndex = kDNSServiceInterfaceIndexP2P;
+    else if (strcmp(nameStr, LOCAL_ONLY_NAME))
+        ifIndex = if_nametoindex( nameStr);
+
+    SafeReleaseUTFChars( pEnv, ifName, nameStr);
+
+    return ifIndex;
+}
+
+
+#if defined(_WIN32)
+static char*
+win32_if_indextoname( DWORD ifIndex, char * nameBuff)
+{
+    PIP_ADAPTER_INFO pAdapterInfo = NULL;
+    PIP_ADAPTER_INFO pAdapter = NULL;
+    DWORD dwRetVal = 0;
+    char            *   ifName = NULL;
+    ULONG ulOutBufLen = 0;
+
+    if (GetAdaptersInfo( NULL, &ulOutBufLen) != ERROR_BUFFER_OVERFLOW)
+    {
+        goto exit;
+    }
+
+    pAdapterInfo = (IP_ADAPTER_INFO *) malloc(ulOutBufLen);
+
+    if (pAdapterInfo == NULL)
+    {
+        goto exit;
+    }
+
+    dwRetVal = GetAdaptersInfo( pAdapterInfo, &ulOutBufLen );
+
+    if (dwRetVal != NO_ERROR)
+    {
+        goto exit;
+    }
+
+    pAdapter = pAdapterInfo;
+    while (pAdapter)
+    {
+        if (pAdapter->Index == ifIndex)
+        {
+            // It would be better if we passed in the length of nameBuff to this
+            // function, so we would have absolute certainty that no buffer
+            // overflows would occur.  Buffer overflows *shouldn't* occur because
+            // nameBuff is of size MAX_ADAPTER_NAME_LENGTH.
+            strcpy( nameBuff, pAdapter->AdapterName );
+            ifName = nameBuff;
+            break;
+        }
+
+        pAdapter = pAdapter->Next;
+    }
+
+exit:
+
+    if (pAdapterInfo != NULL)
+    {
+        free( pAdapterInfo );
+        pAdapterInfo = NULL;
+    }
+
+    return ifName;
+}
+
+
+static DWORD
+win32_if_nametoindex( const char * nameStr )
+{
+    PIP_ADAPTER_INFO pAdapterInfo = NULL;
+    PIP_ADAPTER_INFO pAdapter = NULL;
+    DWORD dwRetVal = 0;
+    DWORD ifIndex = 0;
+    ULONG ulOutBufLen = 0;
+
+    if (GetAdaptersInfo( NULL, &ulOutBufLen) != ERROR_BUFFER_OVERFLOW)
+    {
+        goto exit;
+    }
+
+    pAdapterInfo = (IP_ADAPTER_INFO *) malloc(ulOutBufLen);
+
+    if (pAdapterInfo == NULL)
+    {
+        goto exit;
+    }
+
+    dwRetVal = GetAdaptersInfo( pAdapterInfo, &ulOutBufLen );
+
+    if (dwRetVal != NO_ERROR)
+    {
+        goto exit;
+    }
+
+    pAdapter = pAdapterInfo;
+    while (pAdapter)
+    {
+        if (strcmp(pAdapter->AdapterName, nameStr) == 0)
+        {
+            ifIndex = pAdapter->Index;
+            break;
+        }
+
+        pAdapter = pAdapter->Next;
+    }
+
+exit:
+
+    if (pAdapterInfo != NULL)
+    {
+        free( pAdapterInfo );
+        pAdapterInfo = NULL;
+    }
+
+    return ifIndex;
+}
+#endif
+
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// NOT static -- otherwise the compiler may optimize it out
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS[] = "@(#) libjdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
diff --git a/mDNSResponder/mDNSShared/Java/QueryListener.java b/mDNSResponder/mDNSShared/Java/QueryListener.java
new file mode 100644
index 00000000..0decb7fc
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/QueryListener.java
@@ -0,0 +1,59 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A listener that receives results from {@link DNSSD#queryRecord}. */
+
+public interface QueryListener extends BaseListener
+{
+	/** Called when a record query has been completed. Inspect flags 
+	    parameter to determine nature of query event.<P> 
+
+		@param	query
+					The active query object.
+		<P>
+		@param	flags
+					If kDNSServiceFlagsAdd bit is set, this is a newly discovered answer; 
+					otherwise this is a previously discovered answer which has expired.
+					Other possible values are DNSSD.MORE_COMING.
+		<P>
+		@param	ifIndex
+					The interface on which the query was resolved. (The index for a given 
+					interface is determined via the if_nametoindex() family of calls.) 
+		<P>
+		@param	fullName
+					The resource record's full domain name.
+		<P>
+		@param	rrtype
+					The resource record's type (e.g. PTR, SRV, etc) as defined by RFC 1035 and its updates.
+		<P>
+		@param	rrclass
+					The class of the resource record, as defined by RFC 1035 and its updates.
+		<P>
+		@param	rdata
+					The raw rdata of the resource record.
+		<P>
+		@param	ttl
+					The resource record's time to live, in seconds.
+	*/
+	void	queryAnswered( DNSSDService query, int flags, int ifIndex, String fullName, 
+								int rrtype, int rrclass, byte[] rdata, int ttl);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/RegisterListener.java b/mDNSResponder/mDNSShared/Java/RegisterListener.java
new file mode 100644
index 00000000..00fa1a63
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/RegisterListener.java
@@ -0,0 +1,49 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A listener that receives results from {@link DNSSD#register}. */
+
+public interface RegisterListener extends BaseListener
+{
+	/** Called when a registration has been completed.<P> 
+
+		@param	registration
+					The active registration.
+		<P>
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	serviceName
+					The service name registered (if the application did not specify a name in 
+					DNSSD.register(), this indicates what name was automatically chosen).
+		<P>
+		@param	regType
+					The type of service registered, as it was passed to DNSSD.register().
+		<P>
+		@param	domain
+					The domain on which the service was registered. If the application did not
+					specify a domain in DNSSD.register(), this is the default domain
+					on which the service was registered.
+	*/
+	void	serviceRegistered( DNSSDRegistration registration, int flags, String serviceName, 
+								String regType, String domain);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/RegisterRecordListener.java b/mDNSResponder/mDNSShared/Java/RegisterRecordListener.java
new file mode 100644
index 00000000..6fecf8d8
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/RegisterRecordListener.java
@@ -0,0 +1,37 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A listener that receives results from {@link DNSSDRecordRegistrar#registerRecord}. */
+
+public interface RegisterRecordListener extends BaseListener
+{
+	/** Called when a record registration succeeds.<P> 
+
+		@param	record
+					A {@link DNSRecord}. 
+		<P>
+		@param	flags
+					Currently ignored, reserved for future use.
+		<P>
+	*/
+	void	recordRegistered( DNSRecord record, int flags);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/ResolveListener.java b/mDNSResponder/mDNSShared/Java/ResolveListener.java
new file mode 100644
index 00000000..33dafa38
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/ResolveListener.java
@@ -0,0 +1,56 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	A listener that receives results from {@link DNSSD#resolve}. */
+
+public interface ResolveListener extends BaseListener
+{
+	/** Called when a service has been resolved.<P> 
+
+		@param	resolver
+					The active resolver object.
+		<P>
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	fullName
+					The full service domain name, in the form &lt;servicename&gt;.&lt;protocol&gt;.&lt;domain&gt;.
+					(Any literal dots (".") are escaped with a backslash ("\."), and literal
+					backslashes are escaped with a second backslash ("\\"), e.g. a web server
+					named "Dr. Pepper" would have the fullname  "Dr\.\032Pepper._http._tcp.local.").
+					This is the appropriate format to pass to standard system DNS APIs such as 
+					res_query(), or to the special-purpose functions included in this API that
+					take fullname parameters.
+		<P>
+		@param	hostName
+					The target hostname of the machine providing the service.  This name can 
+					be passed to functions like queryRecord() to look up the host's IP address.
+		<P>
+		@param	port
+					The port number on which connections are accepted for this service.
+		<P>
+		@param	txtRecord
+					The service's primary txt record.
+	*/
+	void	serviceResolved( DNSSDService resolver, int flags, int ifIndex, String fullName, 
+								String hostName, int port, TXTRecord txtRecord);
+}
+
diff --git a/mDNSResponder/mDNSShared/Java/TXTRecord.java b/mDNSResponder/mDNSShared/Java/TXTRecord.java
new file mode 100644
index 00000000..8d9df7a1
--- /dev/null
+++ b/mDNSResponder/mDNSShared/Java/TXTRecord.java
@@ -0,0 +1,290 @@
+/* -*- Mode: Java; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+	To do:
+	- implement remove()
+	- fix set() to replace existing values
+ */
+
+
+package	com.apple.dnssd;
+
+
+/**	
+	Object used to construct and parse DNS-SD format TXT records.
+	For more info see <a href="http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt">DNS-Based Service Discovery</a>, section 6. 
+*/
+
+public class	TXTRecord
+{
+	/* 
+	DNS-SD specifies that a TXT record corresponding to an SRV record consist of
+	a packed array of bytes, each preceded by a length byte. Each string
+	is an attribute-value pair. 
+	
+	The TXTRecord object stores the entire TXT data as a single byte array, traversing it
+	as need be to implement its various methods.
+	*/
+
+	static final protected byte		kAttrSep = '=';
+
+	protected byte[]		fBytes;
+
+	/** Constructs a new, empty TXT record. */
+	public		TXTRecord() 
+	{ fBytes = new byte[0]; }
+
+	/** Constructs a new TXT record from a byte array in the standard format. */
+	public		TXTRecord( byte[] initBytes) 
+	{ fBytes = (byte[]) initBytes.clone(); }
+
+	/** Set a key/value pair in the TXT record. Setting an existing key will replace its value.<P>
+		@param	key
+					The key name. Must be ASCII, with no '=' characters.
+		<P>
+		@param	value
+					Value to be encoded into bytes using the default platform character set.
+	*/
+	public void	set( String key, String value)
+	{
+		byte[]	valBytes = (value != null) ? value.getBytes() : null;
+		this.set( key, valBytes);
+	}
+
+	/** Set a key/value pair in the TXT record. Setting an existing key will replace its value.<P>
+		@param	key
+					The key name. Must be ASCII, with no '=' characters.
+		<P>
+		@param	value
+					Binary representation of the value.
+	*/
+	public void	set( String key, byte[] value)
+	{
+		byte[]	keyBytes;
+		int		valLen = (value != null) ? value.length : 0;
+
+		try {
+			keyBytes = key.getBytes( "US-ASCII");
+		}
+		catch ( java.io.UnsupportedEncodingException uee) {
+			throw new IllegalArgumentException();
+		}
+
+		for ( int i=0; i < keyBytes.length; i++)
+			if ( keyBytes[i] == '=')
+				throw new IllegalArgumentException();
+
+		if ( keyBytes.length + valLen >= 255)
+			throw new ArrayIndexOutOfBoundsException();
+
+		int		prevLoc = this.remove( key);
+		if ( prevLoc == -1)
+			prevLoc = this.size();
+
+		this.insert( keyBytes, value, prevLoc);
+	}
+
+	protected void	insert( byte[] keyBytes, byte[] value, int index)
+	// Insert a key-value pair at index
+	{
+		byte[]	oldBytes = fBytes;
+		int		valLen = (value != null) ? value.length : 0;
+		int		insertion = 0;
+		int		newLen, avLen;
+	
+		// locate the insertion point
+		for ( int i=0; i < index && insertion < fBytes.length; i++)
+			insertion += (0xFF & (fBytes[ insertion] + 1));
+	
+		avLen = keyBytes.length + valLen + (value != null ? 1 : 0);
+		newLen = avLen + oldBytes.length + 1;
+
+		fBytes = new byte[ newLen];
+		System.arraycopy( oldBytes, 0, fBytes, 0, insertion);
+		int secondHalfLen = oldBytes.length - insertion;
+		System.arraycopy( oldBytes, insertion, fBytes, newLen - secondHalfLen, secondHalfLen);
+		fBytes[ insertion] = ( byte) avLen;
+		System.arraycopy( keyBytes, 0, fBytes, insertion + 1, keyBytes.length);
+		if ( value != null)
+		{
+			fBytes[ insertion + 1 + keyBytes.length] = kAttrSep;
+			System.arraycopy( value, 0, fBytes, insertion + keyBytes.length + 2, valLen);
+		}
+	}
+
+	/** Remove a key/value pair from the TXT record. Returns index it was at, or -1 if not found. */
+	public int	remove( String key)
+	{
+		int		avStart = 0;
+
+		for ( int i=0; avStart < fBytes.length; i++)
+		{
+			int		avLen = fBytes[ avStart];
+			if ( key.length() <= avLen && 
+				 ( key.length() == avLen || fBytes[ avStart + key.length() + 1] == kAttrSep))
+			{
+				String	s = new String( fBytes, avStart + 1, key.length());
+				if ( 0 == key.compareToIgnoreCase( s))
+				{
+					byte[]	oldBytes = fBytes;
+					fBytes = new byte[ oldBytes.length - avLen - 1];
+					System.arraycopy( oldBytes, 0, fBytes, 0, avStart);
+					System.arraycopy( oldBytes, avStart + avLen + 1, fBytes, avStart, oldBytes.length - avStart - avLen - 1);
+					return i;
+				}
+			}
+			avStart += (0xFF & (avLen + 1));
+		}
+		return -1;
+	}
+
+	/**	Return the number of keys in the TXT record. */
+	public int	size()
+	{
+		int		i, avStart;
+
+		for ( i=0, avStart=0; avStart < fBytes.length; i++)
+			avStart += (0xFF & (fBytes[ avStart] + 1));
+		return i;
+	}
+
+	/** Return true if key is present in the TXT record, false if not. */
+	public boolean	contains( String key)
+	{		
+		String	s = null;
+
+		for ( int i=0; null != ( s = this.getKey( i)); i++)
+			if ( 0 == key.compareToIgnoreCase( s))
+				return true;
+		return false;
+	}
+
+	/**	Return a key in the TXT record by zero-based index. Returns null if index exceeds the total number of keys. */
+	public String	getKey( int index)
+	{
+		int		avStart = 0;
+
+		for ( int i=0; i < index && avStart < fBytes.length; i++)
+			avStart += fBytes[ avStart] + 1;
+
+		if ( avStart < fBytes.length)
+		{
+			int	avLen = fBytes[ avStart];
+			int	aLen = 0;
+			
+			for ( aLen=0; aLen < avLen; aLen++)
+				if ( fBytes[ avStart + aLen + 1] == kAttrSep)
+					break;
+			return new String( fBytes, avStart + 1, aLen);
+		}
+		return null;
+	}
+
+	/**	
+		Look up a key in the TXT record by zero-based index and return its value. <P>
+		Returns null if index exceeds the total number of keys. 
+		Returns null if the key is present with no value.
+	*/
+	public byte[]	getValue( int index)
+	{
+		int		avStart = 0;
+		byte[]	value = null;
+
+		for ( int i=0; i < index && avStart < fBytes.length; i++)
+			avStart += fBytes[ avStart] + 1;
+
+		if ( avStart < fBytes.length)
+		{
+			int	avLen = fBytes[ avStart];
+			int	aLen = 0;
+			
+			for ( aLen=0; aLen < avLen; aLen++)
+			{
+				if ( fBytes[ avStart + aLen + 1] == kAttrSep)
+				{
+					value = new byte[ avLen - aLen - 1];
+					System.arraycopy( fBytes, avStart + aLen + 2, value, 0, avLen - aLen - 1);
+					break;
+				}
+			}
+		}
+		return value;
+	}
+
+	/** Converts the result of getValue() to a string in the platform default character set. */
+	public String	getValueAsString( int index)
+	{
+		byte[]	value = this.getValue( index);
+		return value != null ? new String( value) : null;
+	}
+
+	/**	Get the value associated with a key. Will be null if the key is not defined.
+		Array will have length 0 if the key is defined with an = but no value.<P> 
+
+		@param	forKey
+					The left-hand side of the key-value pair.
+		<P>
+		@return		The binary representation of the value.
+	*/
+	public byte[]	getValue( String forKey)
+	{
+		String	s = null;
+		int		i;
+
+		for ( i=0; null != ( s = this.getKey( i)); i++)
+			if ( 0 == forKey.compareToIgnoreCase( s))
+				return this.getValue( i);
+		return null;
+	}
+
+	/**	Converts the result of getValue() to a string in the platform default character set.<P> 
+
+		@param	forKey
+					The left-hand side of the key-value pair.
+		<P>
+		@return		The value represented in the default platform character set.
+	*/
+	public String	getValueAsString( String forKey)
+	{
+		byte[]	val = this.getValue( forKey);
+		return val != null ? new String( val) : null;
+	}
+
+	/** Return the contents of the TXT record as raw bytes. */
+	public byte[]	getRawBytes() { return (byte[]) fBytes.clone(); }
+
+	/** Return a string representation of the object. */
+	public String	toString()
+	{
+		String		a, result = null;
+		
+		for ( int i=0; null != ( a = this.getKey( i)); i++)
+		{
+			String av = String.valueOf( i) + "={" + a;
+			String val = this.getValueAsString( i);
+			if ( val != null)
+				av += "=" + val + "}";
+			else
+				av += "}";
+			if ( result == null)
+				result = av;
+			else
+				result = result + ", " + av;
+		}
+		return result != null ? result : "";
+	}
+}
+
diff --git a/mDNSResponder/mDNSShared/PlatformCommon.c b/mDNSResponder/mDNSShared/PlatformCommon.c
new file mode 100644
index 00000000..d86a755a
--- /dev/null
+++ b/mDNSResponder/mDNSShared/PlatformCommon.c
@@ -0,0 +1,199 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>              // Needed for fopen() etc.
+#include <unistd.h>             // Needed for close()
+#include <string.h>             // Needed for strlen() etc.
+#include <errno.h>              // Needed for errno etc.
+#include <sys/socket.h>         // Needed for socket() etc.
+#include <netinet/in.h>         // Needed for sockaddr_in
+#include <syslog.h>
+
+#include "mDNSEmbeddedAPI.h"    // Defines the interface provided to the client layer above
+#include "DNSCommon.h"
+#include "PlatformCommon.h"
+
+#ifdef NOT_HAVE_SOCKLEN_T
+typedef unsigned int socklen_t;
+#endif
+
+// Bind a UDP socket to find the source address to a destination
+mDNSexport void mDNSPlatformSourceAddrForDest(mDNSAddr *const src, const mDNSAddr *const dst)
+{
+    union { struct sockaddr s; struct sockaddr_in a4; struct sockaddr_in6 a6; } addr;
+    socklen_t len = sizeof(addr);
+    socklen_t inner_len = 0;
+    int sock = socket(AF_INET, SOCK_DGRAM, 0);
+    src->type = mDNSAddrType_None;
+    if (sock == -1) return;
+    if (dst->type == mDNSAddrType_IPv4)
+    {
+        inner_len = sizeof(addr.a4);
+        #ifndef NOT_HAVE_SA_LEN
+        addr.a4.sin_len         = inner_len;
+        #endif
+        addr.a4.sin_family      = AF_INET;
+        addr.a4.sin_port        = 1;    // Not important, any port will do
+        addr.a4.sin_addr.s_addr = dst->ip.v4.NotAnInteger;
+    }
+    else if (dst->type == mDNSAddrType_IPv6)
+    {
+        inner_len = sizeof(addr.a6);
+        #ifndef NOT_HAVE_SA_LEN
+        addr.a6.sin6_len      = inner_len;
+        #endif
+        addr.a6.sin6_family   = AF_INET6;
+        addr.a6.sin6_flowinfo = 0;
+        addr.a6.sin6_port     = 1;  // Not important, any port will do
+        addr.a6.sin6_addr     = *(struct in6_addr*)&dst->ip.v6;
+        addr.a6.sin6_scope_id = 0;
+    }
+    else return;
+
+    if ((connect(sock, &addr.s, inner_len)) < 0)
+    { LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno)); goto exit; }
+
+    if ((getsockname(sock, &addr.s, &len)) < 0)
+    { LogMsg("mDNSPlatformSourceAddrForDest: getsockname failed errno %d (%s)", errno, strerror(errno)); goto exit; }
+
+    src->type = dst->type;
+    if (dst->type == mDNSAddrType_IPv4) src->ip.v4.NotAnInteger = addr.a4.sin_addr.s_addr;
+    else src->ip.v6 = *(mDNSv6Addr*)&addr.a6.sin6_addr;
+exit:
+    close(sock);
+}
+
+// dst must be at least MAX_ESCAPED_DOMAIN_NAME bytes, and option must be less than 32 bytes in length
+mDNSlocal mDNSBool GetConfigOption(char *dst, const char *option, FILE *f)
+{
+    char buf[32+1+MAX_ESCAPED_DOMAIN_NAME]; // Option name, one space, option value
+    unsigned int len = strlen(option);
+    if (len + 1 + MAX_ESCAPED_DOMAIN_NAME > sizeof(buf)-1) { LogMsg("GetConfigOption: option %s too long", option); return mDNSfalse; }
+    fseek(f, 0, SEEK_SET);  // set position to beginning of stream
+    while (fgets(buf, sizeof(buf), f))      // Read at most sizeof(buf)-1 bytes from file, and append '\0' C-string terminator
+    {
+        if (!strncmp(buf, option, len))
+        {
+            strncpy(dst, buf + len + 1, MAX_ESCAPED_DOMAIN_NAME-1);
+            if (dst[MAX_ESCAPED_DOMAIN_NAME-1]) dst[MAX_ESCAPED_DOMAIN_NAME-1] = '\0';
+            len = strlen(dst);
+            if (len && dst[len-1] == '\n') dst[len-1] = '\0';  // chop newline
+            return mDNStrue;
+        }
+    }
+    debugf("Option %s not set", option);
+    return mDNSfalse;
+}
+
+mDNSexport void ReadDDNSSettingsFromConfFile(mDNS *const m, const char *const filename, domainname *const hostname, domainname *const domain, mDNSBool *DomainDiscoveryDisabled)
+{
+    char buf[MAX_ESCAPED_DOMAIN_NAME] = "";
+    mStatus err;
+    FILE *f = fopen(filename, "r");
+
+    if (hostname) hostname->c[0] = 0;
+    if (domain) domain->c[0] = 0;
+    if (DomainDiscoveryDisabled) *DomainDiscoveryDisabled = mDNSfalse;
+
+    if (f)
+    {
+        if (DomainDiscoveryDisabled && GetConfigOption(buf, "DomainDiscoveryDisabled", f) && !strcasecmp(buf, "true")) *DomainDiscoveryDisabled = mDNStrue;
+        if (hostname && GetConfigOption(buf, "hostname", f) && !MakeDomainNameFromDNSNameString(hostname, buf)) goto badf;
+        if (domain && GetConfigOption(buf, "zone", f) && !MakeDomainNameFromDNSNameString(domain, buf)) goto badf;
+        buf[0] = 0;
+        GetConfigOption(buf, "secret-64", f);  // failure means no authentication
+        fclose(f);
+        f = NULL;
+    }
+    else
+    {
+        if (errno != ENOENT) LogMsg("ERROR: Config file exists, but cannot be opened.");
+        return;
+    }
+
+    if (domain && domain->c[0] && buf[0])
+    {
+        DomainAuthInfo *info = (DomainAuthInfo*)mDNSPlatformMemAllocate(sizeof(*info));
+        // for now we assume keyname = service reg domain and we use same key for service and hostname registration
+        err = mDNS_SetSecretForDomain(m, info, domain, domain, buf, NULL, 0, mDNSfalse);
+        if (err) LogMsg("ERROR: mDNS_SetSecretForDomain returned %d for domain %##s", err, domain->c);
+    }
+
+    return;
+
+badf:
+    LogMsg("ERROR: malformatted config file");
+    if (f) fclose(f);
+}
+
+#if MDNS_DEBUGMSGS
+mDNSexport void mDNSPlatformWriteDebugMsg(const char *msg)
+{
+    fprintf(stderr,"%s\n", msg);
+    fflush(stderr);
+}
+#endif
+
+mDNSexport void mDNSPlatformWriteLogMsg(const char *ident, const char *buffer, mDNSLogLevel_t loglevel)
+{
+#if APPLE_OSX_mDNSResponder && LogTimeStamps
+    extern mDNS mDNSStorage;
+    extern mDNSu32 mDNSPlatformClockDivisor;
+    mDNSs32 t = mDNSStorage.timenow ? mDNSStorage.timenow : mDNSPlatformClockDivisor ? mDNS_TimeNow_NoLock(&mDNSStorage) : 0;
+    int ms = ((t < 0) ? -t : t) % 1000;
+#endif
+
+    if (mDNS_DebugMode) // In debug mode we write to stderr
+    {
+#if APPLE_OSX_mDNSResponder && LogTimeStamps
+        if (ident && ident[0] && mDNSPlatformClockDivisor)
+            fprintf(stderr,"%8d.%03d: %s\n", (int)(t/1000), ms, buffer);
+        else
+#endif
+        fprintf(stderr,"%s\n", buffer);
+        fflush(stderr);
+    }
+    else                // else, in production mode, we write to syslog
+    {
+        static int log_inited = 0;
+
+        int syslog_level = LOG_ERR;
+        switch (loglevel)
+        {
+        case MDNS_LOG_MSG:       syslog_level = LOG_ERR;     break;
+        case MDNS_LOG_OPERATION: syslog_level = LOG_WARNING; break;
+        case MDNS_LOG_SPS:       syslog_level = LOG_NOTICE;  break;
+        case MDNS_LOG_INFO:      syslog_level = LOG_INFO;    break;
+        case MDNS_LOG_DEBUG:     syslog_level = LOG_DEBUG;   break;
+        default:
+            fprintf(stderr, "Unknown loglevel %d, assuming LOG_ERR\n", loglevel);
+            fflush(stderr);
+        }
+
+        if (!log_inited) { openlog(ident, LOG_CONS, LOG_DAEMON); log_inited++; }
+
+#if APPLE_OSX_mDNSResponder && LogTimeStamps
+        if (ident && ident[0] && mDNSPlatformClockDivisor)
+            syslog(syslog_level, "%8d.%03d: %s", (int)(t/1000), ms, buffer);
+        else
+#elif APPLE_OSX_mDNSResponder
+        mDNSPlatformLogToFile(syslog_level, buffer);
+#else
+        syslog(syslog_level, "%s", buffer);
+#endif
+    }
+}
diff --git a/mDNSResponder/mDNSShared/PlatformCommon.h b/mDNSResponder/mDNSShared/PlatformCommon.h
new file mode 100644
index 00000000..2a068711
--- /dev/null
+++ b/mDNSResponder/mDNSShared/PlatformCommon.h
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+extern void ReadDDNSSettingsFromConfFile(mDNS *const m, const char *const filename, domainname *const hostname, domainname *const domain, mDNSBool *DomainDiscoveryDisabled);
diff --git a/mDNSResponder/mDNSShared/dns-sd.1 b/mDNSResponder/mDNSShared/dns-sd.1
new file mode 100644
index 00000000..9d8323b9
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dns-sd.1
@@ -0,0 +1,266 @@
+.\" -*- tab-width: 4 -*-
+.\" 
+.\" Copyright (c) 2004 Apple Computer, Inc. All Rights Reserved.
+.\" 
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\" 
+.\"     http://www.apache.org/licenses/LICENSE-2.0
+.\" 
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.Dd April 2004              \" Date
+.Dt dns-sd 1                \" Document Title
+.Os Darwin                  \" Operating System
+.\"
+.Sh NAME
+.Nm dns-sd
+.Nd Multicast DNS (mDNS) & DNS Service Discovery (DNS-SD) Test Tool \" For whatis
+.\" 
+.Sh SYNOPSIS
+.Nm Fl E
+.Pp
+.Nm Fl F
+.Pp
+.Nm Fl R Ar name type domain port Op Ar key=value ...
+.Pp
+.Nm Fl B Ar      type domain
+.Pp
+.Nm Fl L Ar name type domain
+.Pp
+.Nm Fl P Ar name type domain port host IP Op Ar key=value ...
+.Pp
+.Nm Fl q Ar name rrtype rrclass
+.Pp
+.Nm Fl Z Ar      type domain
+.Pp
+.Nm Fl G Ns \ v4/v6/v4v6 Ar      name
+.Pp
+.Nm Fl V
+.\"
+.Sh DESCRIPTION
+The
+.Nm
+command is a network diagnostic tool, much like
+.Xr ping 8
+or
+.Xr traceroute 8 .
+However, unlike those tools, most of its functionality is not implemented in the
+.Nm
+executable itself, but in library code that is available to any application.
+The library API that
+.Nm
+uses is documented in
+.Pa /usr/include/dns_sd.h .
+The
+.Nm
+command replaces the older
+mDNS
+command.
+.Pp
+The
+.Nm
+command is primarily intended for interactive use.
+Because its command-line arguments and output format are subject to change,
+invoking it from a shell script will generally be fragile. Additionally,
+the asynchronous nature of DNS Service Discovery does
+not lend itself easily to script-oriented programming. For example,
+calls like "browse" never complete; the action of performing a "browse"
+sets in motion machinery to notify the client whenever instances of
+that service type appear or disappear from the network. These
+notifications continue to be delivered indefinitely, for minutes,
+hours, or even days, as services come and go, until the client
+explicitly terminates the call. This style of asynchronous interaction
+works best with applications that are either multi-threaded, or use a
+main event-handling loop to receive keystrokes, network data, and other
+asynchronous event notifications as they happen.
+.br
+If you wish to perform DNS Service Discovery operations from a
+scripting language, then the best way to do this is not to execute the
+.Nm
+command and then attempt to decipher the textual output, but instead to
+directly call the DNS-SD APIs using a binding for your chosen language.
+.br
+For example, if you are programming in Ruby, then you can
+directly call DNS-SD APIs using the dnssd package documented at
+.Pa <http://rubyforge.org/projects/dnssd/> .
+.br
+Similar bindings for other languages are also in development.
+.Pp
+.Bl -tag -width E
+.It Nm Fl E
+return a list of domains recommended for registering(advertising) services.
+.Pp
+.It Nm Fl F
+return a list of domains recommended for browsing services.
+.Pp
+Normally, on your home network, the only domain you are likely to see is "local". 
+However if your network administrator has created Domain Enumeration records, 
+then you may also see other recommended domains for registering and browsing.
+.Pp
+.It Nm Fl R Ar name type domain port Op Ar key=value ...
+register (advertise) a service in the specified
+.Ar domain 
+with the given
+.Ar name
+and
+.Ar type
+as listening (on the current machine) on
+.Ar port.
+.Pp
+.Ar name
+can be arbitrary unicode text, containing any legal unicode characters
+(including dots, spaces, slashes, colons, etc. without restriction),
+up to 63 UTF-8 bytes long.
+.Ar type
+must be of the form "_app-proto._tcp" or "_app-proto._udp", where
+"app-proto" is an application protocol name registered at
+.Pa http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml .
+.Pp
+.Ar domain
+is the domain in which to register the service.
+In current implementations, only the local multicast domain "local" is
+supported. In the future, registering will be supported in any arbitrary
+domain that has a working DNS Update server [RFC 2136]. The
+.Ar domain
+"." is a synonym for "pick a sensible default" which today
+means "local".
+.Pp
+.Ar port
+is a number from 0 to 65535, and is the TCP or UDP port number upon
+which the service is listening.
+.Pp 
+Additional attributes of the service may optionally be described by
+key/value pairs, which are stored in the advertised service's DNS TXT
+record. Allowable keys and values are listed with the service
+registration at
+.Pa http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml .
+.It Nm Fl B Ar type domain
+browse for instances of service
+.Ar type
+in
+.Ar domain .
+.Pp
+For valid 
+.Ar type Ns s
+see
+.Pa http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml .
+as described above. Omitting the
+.Ar domain
+or using "." means "pick a sensible default."
+.It Nm Fl L Ar name type domain
+look up and display the information necessary to contact and use the
+named service: the hostname of the machine where that service is
+available, the port number on which the service is listening, and (if
+present) TXT record attributes describing properties of the service.
+.Pp
+Note that in a typical application, browsing may only happen rarely, while lookup
+(or "resolving") happens every time the service is used. For example, a
+user browses the network to pick a default printer fairly rarely, but once
+a default printer has been picked, that named service is resolved to its
+current IP address and port number every time the user presses Cmd-P to
+print.
+.Pp
+.It Nm Fl P Ar name type domain port host IP Op Ar key=value ...
+create a proxy advertisement for a service running on(offered by) some other machine.
+The two new options are Host, a name for the device and IP, the address of it.
+.Pp
+The service for which you create a proxy advertisement does not necessarily have to be on your local network. 
+You can set up a local proxy for a website on the Internet.
+.Pp
+.It Nm Fl q Ar name rrtype rrclass
+look up any DNS name, resource record type, and resource record class, 
+not necessarily DNS-SD names and record types.
+If rrtype is not specified, it queries for the IPv4 address of the name, 
+if rrclass is not specified, IN class is assumed. If the name is not a fully 
+qualified domain name, then search domains may be appended.
+.Pp
+.It Nm Fl Z Ar type domain
+browse for service instances and display output in zone file format.
+.Pp
+.It Nm Fl G Ns \ v4/v6/v4v6 Ar name
+look up the IP address information of the name.
+If v4 is specified, the IPv4 address of the name is looked up, 
+if v6 is specified the IPv6 address is looked up. If v4v6 is specified both the IPv4 and IPv6 
+address is looked up. If the name is not a fully qualified domain name, 
+then search domains may be appended.
+.Pp
+.It Nm Fl V
+return the version of the currently running daemon/system service.
+.El
+.Sh EXAMPLES
+.Pp
+To advertise the existence of LPR printing service on port 515 on this
+machine, such that it will be discovered by the Mac OS X printing software
+and other DNS-SD compatible printing clients, use:
+.Pp
+.Dl Nm Fl R Ns \ \&"My Test\&" _printer._tcp. \&. 515 pdl=application/postscript
+.Pp
+For this registration to be useful, you need to actually have LPR service
+available on port 515. Advertising a service that does not exist is not
+very useful, and will be confusing and annoying to other people on the
+network.
+.Pp
+Similarly, to advertise a web page being served by an HTTP
+server on port 80 on this machine, such that it will show up in the
+Bonjour list in Safari and other DNS-SD compatible Web clients, use:
+.Pp
+.Dl Nm Fl R Ns \ \&"My Test\&" _http._tcp \&. 80 path=/path-to-page.html
+.Pp
+To find the advertised web pages on the local network (the same list that
+Safari shows), use:
+.Pp
+.Dl Nm Fl B Ns \ _http._tcp
+.Pp
+While that command is running, in another window, try the
+.Nm Fl R
+example given above to advertise a web page, and you should see the
+"Add" event reported to the
+.Nm Fl B
+window. Now press Ctrl-C in the
+.Nm Fl R
+window and you should see the "Remove" event reported to the
+.Nm Fl B
+window.
+.Pp
+In the example below, the www.apple.com web page is advertised as a service called "apple", 
+running on a target host called apple.local, which resolves to 17.149.160.49.
+.Pp
+.Dl Nm Fl P Ns \ apple _http._tcp \&"\&"\& 80 apple.local 17.149.160.49
+.Pp
+The Bonjour menu in the Safari web browser will now show "apple".
+The same IP address can be reached by entering apple.local in the web browser.
+In either case, the request will be resolved to the IP address and browser will show
+contents associated with www.apple.com.
+.Pp
+If a client wants to be notified of changes in server state, it can
+initiate a query for the service's particular record and leave it running.
+For example, to monitor the status of an iChat user you can use:
+.Pp
+.Dl Nm Fl q Ns \ someone@ex1._presence._tcp.local txt
+.Pp
+Everytime status of that user(someone) changes, you will see a new TXT record result reported.
+.Pp
+You can also query for a unicast name like www.apple.com and monitor its status.
+.Pp 
+.Dl Nm Fl q Ns \ www.apple.com
+.Pp
+.Sh FILES
+.Pa /usr/bin/dns-sd \" Pathname
+.\"
+.Sh SEE ALSO
+.Xr mDNSResponder 8
+.\"
+.Sh BUGS
+.Nm
+bugs are tracked in Apple Radar component "mDNSResponder".
+.\"
+.Sh HISTORY
+The
+.Nm
+command first appeared in Mac OS X 10.4 (Tiger).
diff --git a/mDNSResponder/mDNSShared/dns_sd.h b/mDNSResponder/mDNSShared/dns_sd.h
new file mode 100644
index 00000000..99373de6
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dns_sd.h
@@ -0,0 +1,2657 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/*! @header     DNS Service Discovery
+ *
+ * @discussion  This section describes the functions, callbacks, and data structures
+ *              that make up the DNS Service Discovery API.
+ *
+ *              The DNS Service Discovery API is part of Bonjour, Apple's implementation
+ *              of zero-configuration networking (ZEROCONF).
+ *
+ *              Bonjour allows you to register a network service, such as a
+ *              printer or file server, so that it can be found by name or browsed
+ *              for by service type and domain. Using Bonjour, applications can
+ *              discover what services are available on the network, along with
+ *              all the information -- such as name, IP address, and port --
+ *              necessary to access a particular service.
+ *
+ *              In effect, Bonjour combines the functions of a local DNS server and
+ *              AppleTalk. Bonjour allows applications to provide user-friendly printer
+ *              and server browsing, among other things, over standard IP networks.
+ *              This behavior is a result of combining protocols such as multicast and
+ *              DNS to add new functionality to the network (such as multicast DNS).
+ *
+ *              Bonjour gives applications easy access to services over local IP
+ *              networks without requiring the service or the application to support
+ *              an AppleTalk or a Netbeui stack, and without requiring a DNS server
+ *              for the local network.
+ */
+
+
+/* _DNS_SD_H contains the mDNSResponder version number for this header file, formatted as follows:
+ *   Major part of the build number * 10000 +
+ *   minor part of the build number *   100
+ * For example, Mac OS X 10.4.9 has mDNSResponder-108.4, which would be represented as
+ * version 1080400. This allows C code to do simple greater-than and less-than comparisons:
+ * e.g. an application that requires the DNSServiceGetProperty() call (new in mDNSResponder-126) can check:
+ *
+ *   #if _DNS_SD_H+0 >= 1260000
+ *   ... some C code that calls DNSServiceGetProperty() ...
+ *   #endif
+ *
+ * The version defined in this header file symbol allows for compile-time
+ * checking, so that C code building with earlier versions of the header file
+ * can avoid compile errors trying to use functions that aren't even defined
+ * in those earlier versions. Similar checks may also be performed at run-time:
+ *  => weak linking -- to avoid link failures if run with an earlier
+ *     version of the library that's missing some desired symbol, or
+ *  => DNSServiceGetProperty(DaemonVersion) -- to verify whether the running daemon
+ *     ("system service" on Windows) meets some required minimum functionality level.
+ */
+
+#ifndef _DNS_SD_H
+#define _DNS_SD_H 5440000
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Set to 1 if libdispatch is supported
+ * Note: May also be set by project and/or Makefile
+ */
+#ifndef _DNS_SD_LIBDISPATCH
+#define _DNS_SD_LIBDISPATCH 0
+#endif /* ndef _DNS_SD_LIBDISPATCH */
+
+/* standard calling convention under Win32 is __stdcall */
+/* Note: When compiling Intel EFI (Extensible Firmware Interface) under MS Visual Studio, the */
+/* _WIN32 symbol is defined by the compiler even though it's NOT compiling code for Windows32 */
+#if defined(_WIN32) && !defined(EFI32) && !defined(EFI64)
+#define DNSSD_API __stdcall
+#else
+#define DNSSD_API
+#endif
+
+/* stdint.h does not exist on FreeBSD 4.x; its types are defined in sys/types.h instead */
+#if defined(__FreeBSD__) && (__FreeBSD__ < 5)
+#include <sys/types.h>
+
+/* Likewise, on Sun, standard integer types are in sys/types.h */
+#elif defined(__sun__)
+#include <sys/types.h>
+
+/* EFI does not have stdint.h, or anything else equivalent */
+#elif defined(EFI32) || defined(EFI64) || defined(EFIX64)
+#include "Tiano.h"
+#if !defined(_STDINT_H_)
+typedef UINT8 uint8_t;
+typedef INT8 int8_t;
+typedef UINT16 uint16_t;
+typedef INT16 int16_t;
+typedef UINT32 uint32_t;
+typedef INT32 int32_t;
+#endif
+/* Windows has its own differences */
+#elif defined(_WIN32)
+#include <windows.h>
+#define _UNUSED
+#ifndef _MSL_STDINT_H
+typedef UINT8 uint8_t;
+typedef INT8 int8_t;
+typedef UINT16 uint16_t;
+typedef INT16 int16_t;
+typedef UINT32 uint32_t;
+typedef INT32 int32_t;
+#endif
+
+/* All other Posix platforms use stdint.h */
+#else
+#include <stdint.h>
+#endif
+
+#if _DNS_SD_LIBDISPATCH
+#include <dispatch/dispatch.h>
+#endif
+
+/* DNSServiceRef, DNSRecordRef
+ *
+ * Opaque internal data types.
+ * Note: client is responsible for serializing access to these structures if
+ * they are shared between concurrent threads.
+ */
+
+typedef struct _DNSServiceRef_t *DNSServiceRef;
+typedef struct _DNSRecordRef_t *DNSRecordRef;
+
+struct sockaddr;
+
+/*! @enum General flags
+ * Most DNS-SD API functions and callbacks include a DNSServiceFlags parameter.
+ * As a general rule, any given bit in the 32-bit flags field has a specific fixed meaning,
+ * regardless of the function or callback being used. For any given function or callback,
+ * typically only a subset of the possible flags are meaningful, and all others should be zero.
+ * The discussion section for each API call describes which flags are valid for that call
+ * and callback. In some cases, for a particular call, it may be that no flags are currently
+ * defined, in which case the DNSServiceFlags parameter exists purely to allow future expansion.
+ * In all cases, developers should expect that in future releases, it is possible that new flag
+ * values will be defined, and write code with this in mind. For example, code that tests
+ *     if (flags == kDNSServiceFlagsAdd) ...
+ * will fail if, in a future release, another bit in the 32-bit flags field is also set.
+ * The reliable way to test whether a particular bit is set is not with an equality test,
+ * but with a bitwise mask:
+ *     if (flags & kDNSServiceFlagsAdd) ...
+ * With the exception of kDNSServiceFlagsValidate, each flag can be valid(be set) 
+ * EITHER only as an input to one of the DNSService*() APIs OR only as an output
+ * (provide status) through any of the callbacks used. For example, kDNSServiceFlagsAdd
+ * can be set only as an output in the callback, whereas the kDNSServiceFlagsIncludeP2P
+ * can be set only as an input to the DNSService*() APIs. See comments on kDNSServiceFlagsValidate  
+ * defined in enum below.
+ */
+enum
+{
+    kDNSServiceFlagsMoreComing          = 0x1,
+    /* MoreComing indicates to a callback that at least one more result is
+     * queued and will be delivered following immediately after this one.
+     * When the MoreComing flag is set, applications should not immediately
+     * update their UI, because this can result in a great deal of ugly flickering
+     * on the screen, and can waste a great deal of CPU time repeatedly updating
+     * the screen with content that is then immediately erased, over and over.
+     * Applications should wait until MoreComing is not set, and then
+     * update their UI when no more changes are imminent.
+     * When MoreComing is not set, that doesn't mean there will be no more
+     * answers EVER, just that there are no more answers immediately
+     * available right now at this instant. If more answers become available
+     * in the future they will be delivered as usual.
+     */
+
+    kDNSServiceFlagsAdd                 = 0x2,
+    kDNSServiceFlagsDefault             = 0x4,
+    /* Flags for domain enumeration and browse/query reply callbacks.
+     * "Default" applies only to enumeration and is only valid in
+     * conjunction with "Add". An enumeration callback with the "Add"
+     * flag NOT set indicates a "Remove", i.e. the domain is no longer
+     * valid.
+     */
+
+    kDNSServiceFlagsNoAutoRename        = 0x8,
+    /* Flag for specifying renaming behavior on name conflict when registering
+     * non-shared records. By default, name conflicts are automatically handled
+     * by renaming the service. NoAutoRename overrides this behavior - with this
+     * flag set, name conflicts will result in a callback. The NoAutorename flag
+     * is only valid if a name is explicitly specified when registering a service
+     * (i.e. the default name is not used.)
+     */
+
+    kDNSServiceFlagsShared              = 0x10,
+    kDNSServiceFlagsUnique              = 0x20,
+    /* Flag for registering individual records on a connected
+     * DNSServiceRef. Shared indicates that there may be multiple records
+     * with this name on the network (e.g. PTR records). Unique indicates that the
+     * record's name is to be unique on the network (e.g. SRV records).
+     */
+
+    kDNSServiceFlagsBrowseDomains       = 0x40,
+    kDNSServiceFlagsRegistrationDomains = 0x80,
+    /* Flags for specifying domain enumeration type in DNSServiceEnumerateDomains.
+     * BrowseDomains enumerates domains recommended for browsing, RegistrationDomains
+     * enumerates domains recommended for registration.
+     */
+
+    kDNSServiceFlagsLongLivedQuery      = 0x100,
+    /* Flag for creating a long-lived unicast query for the DNSServiceQueryRecord call. */
+
+    kDNSServiceFlagsAllowRemoteQuery    = 0x200,
+    /* Flag for creating a record for which we will answer remote queries
+     * (queries from hosts more than one hop away; hosts not directly connected to the local link).
+     */
+
+    kDNSServiceFlagsForceMulticast      = 0x400,
+    /* Flag for signifying that a query or registration should be performed exclusively via multicast
+     * DNS, even for a name in a domain (e.g. foo.apple.com.) that would normally imply unicast DNS.
+     */
+
+    kDNSServiceFlagsForce               = 0x800,    // This flag is deprecated.
+
+    kDNSServiceFlagsKnownUnique         = 0x800,
+    /* 
+     * Client guarantees that record names are unique, so we can skip sending out initial
+     * probe messages.  Standard name conflict resolution is still done if a conflict is discovered.
+     * Currently only valid for a DNSServiceRegister call.
+     */
+
+    kDNSServiceFlagsReturnIntermediates = 0x1000,
+    /* Flag for returning intermediate results.
+     * For example, if a query results in an authoritative NXDomain (name does not exist)
+     * then that result is returned to the client. However the query is not implicitly
+     * cancelled -- it remains active and if the answer subsequently changes
+     * (e.g. because a VPN tunnel is subsequently established) then that positive
+     * result will still be returned to the client.
+     * Similarly, if a query results in a CNAME record, then in addition to following
+     * the CNAME referral, the intermediate CNAME result is also returned to the client.
+     * When this flag is not set, NXDomain errors are not returned, and CNAME records
+     * are followed silently without informing the client of the intermediate steps.
+     * (In earlier builds this flag was briefly calledkDNSServiceFlagsReturnCNAME)
+     */
+
+    kDNSServiceFlagsNonBrowsable        = 0x2000,
+    /* A service registered with the NonBrowsable flag set can be resolved using
+     * DNSServiceResolve(), but will not be discoverable using DNSServiceBrowse().
+     * This is for cases where the name is actually a GUID; it is found by other means;
+     * there is no end-user benefit to browsing to find a long list of opaque GUIDs.
+     * Using the NonBrowsable flag creates SRV+TXT without the cost of also advertising
+     * an associated PTR record.
+     */
+
+    kDNSServiceFlagsShareConnection     = 0x4000,
+    /* For efficiency, clients that perform many concurrent operations may want to use a
+     * single Unix Domain Socket connection with the background daemon, instead of having a
+     * separate connection for each independent operation. To use this mode, clients first
+     * call DNSServiceCreateConnection(&MainRef) to initialize the main DNSServiceRef.
+     * For each subsequent operation that is to share that same connection, the client copies
+     * the MainRef, and then passes the address of that copy, setting the ShareConnection flag
+     * to tell the library that this DNSServiceRef is not a typical uninitialized DNSServiceRef;
+     * it's a copy of an existing DNSServiceRef whose connection information should be reused.
+     *
+     * For example:
+     *
+     * DNSServiceErrorType error;
+     * DNSServiceRef MainRef;
+     * error = DNSServiceCreateConnection(&MainRef);
+     * if (error) ...
+     * DNSServiceRef BrowseRef = MainRef;  // Important: COPY the primary DNSServiceRef first...
+     * error = DNSServiceBrowse(&BrowseRef, kDNSServiceFlagsShareConnection, ...); // then use the copy
+     * if (error) ...
+     * ...
+     * DNSServiceRefDeallocate(BrowseRef); // Terminate the browse operation
+     * DNSServiceRefDeallocate(MainRef);   // Terminate the shared connection
+     *
+     * Notes:
+     *
+     * 1. Collective kDNSServiceFlagsMoreComing flag
+     * When callbacks are invoked using a shared DNSServiceRef, the
+     * kDNSServiceFlagsMoreComing flag applies collectively to *all* active
+     * operations sharing the same parent DNSServiceRef. If the MoreComing flag is
+     * set it means that there are more results queued on this parent DNSServiceRef,
+     * but not necessarily more results for this particular callback function.
+     * The implication of this for client programmers is that when a callback
+     * is invoked with the MoreComing flag set, the code should update its
+     * internal data structures with the new result, and set a variable indicating
+     * that its UI needs to be updated. Then, later when a callback is eventually
+     * invoked with the MoreComing flag not set, the code should update *all*
+     * stale UI elements related to that shared parent DNSServiceRef that need
+     * updating, not just the UI elements related to the particular callback
+     * that happened to be the last one to be invoked.
+     *
+     * 2. Canceling operations and kDNSServiceFlagsMoreComing
+     * Whenever you cancel any operation for which you had deferred UI updates
+     * waiting because of a kDNSServiceFlagsMoreComing flag, you should perform
+     * those deferred UI updates. This is because, after cancelling the operation,
+     * you can no longer wait for a callback *without* MoreComing set, to tell
+     * you do perform your deferred UI updates (the operation has been canceled,
+     * so there will be no more callbacks). An implication of the collective
+     * kDNSServiceFlagsMoreComing flag for shared connections is that this
+     * guideline applies more broadly -- any time you cancel an operation on
+     * a shared connection, you should perform all deferred UI updates for all
+     * operations sharing that connection. This is because the MoreComing flag
+     * might have been referring to events coming for the operation you canceled,
+     * which will now not be coming because the operation has been canceled.
+     *
+     * 3. Only share DNSServiceRef's created with DNSServiceCreateConnection
+     * Calling DNSServiceCreateConnection(&ref) creates a special shareable DNSServiceRef.
+     * DNSServiceRef's created by other calls like DNSServiceBrowse() or DNSServiceResolve()
+     * cannot be shared by copying them and using kDNSServiceFlagsShareConnection.
+     *
+     * 4. Don't Double-Deallocate
+     * Calling DNSServiceRefDeallocate(ref) for a particular operation's DNSServiceRef terminates
+     * just that operation. Calling DNSServiceRefDeallocate(ref) for the main shared DNSServiceRef
+     * (the parent DNSServiceRef, originally created by DNSServiceCreateConnection(&ref))
+     * automatically terminates the shared connection and all operations that were still using it.
+     * After doing this, DO NOT then attempt to deallocate any remaining subordinate DNSServiceRef's.
+     * The memory used by those subordinate DNSServiceRef's has already been freed, so any attempt
+     * to do a DNSServiceRefDeallocate (or any other operation) on them will result in accesses
+     * to freed memory, leading to crashes or other equally undesirable results.
+     *
+     * 5. Thread Safety
+     * The dns_sd.h API does not presuppose any particular threading model, and consequently
+     * does no locking of its own (which would require linking some specific threading library).
+     * If client code calls API routines on the same DNSServiceRef concurrently
+     * from multiple threads, it is the client's responsibility to use a mutext
+     * lock or take similar appropriate precautions to serialize those calls.
+     */
+
+    kDNSServiceFlagsSuppressUnusable    = 0x8000,
+    /*
+     * This flag is meaningful only in DNSServiceQueryRecord which suppresses unusable queries on the
+     * wire. If "hostname" is a wide-area unicast DNS hostname (i.e. not a ".local." name)
+     * but this host has no routable IPv6 address, then the call will not try to look up IPv6 addresses
+     * for "hostname", since any addresses it found would be unlikely to be of any use anyway. Similarly,
+     * if this host has no routable IPv4 address, the call will not try to look up IPv4 addresses for
+     * "hostname".
+     */
+
+    kDNSServiceFlagsTimeout            = 0x10000,
+    /*
+     * When kDNServiceFlagsTimeout is passed to DNSServiceQueryRecord or DNSServiceGetAddrInfo, the query is
+     * stopped after a certain number of seconds have elapsed. The time at which the query will be stopped
+     * is determined by the system and cannot be configured by the user. The query will be stopped irrespective
+     * of whether a response was given earlier or not. When the query is stopped, the callback will be called
+     * with an error code of kDNSServiceErr_Timeout and a NULL sockaddr will be returned for DNSServiceGetAddrInfo
+     * and zero length rdata will be returned for DNSServiceQueryRecord.
+     */
+
+    kDNSServiceFlagsIncludeP2P          = 0x20000,
+    /*
+     * Include P2P interfaces when kDNSServiceInterfaceIndexAny is specified.
+     * By default, specifying kDNSServiceInterfaceIndexAny does not include P2P interfaces.
+     */
+
+    kDNSServiceFlagsWakeOnResolve      = 0x40000,
+    /*
+    * This flag is meaningful only in DNSServiceResolve. When set, it tries to send a magic packet
+    * to wake up the client.
+    */
+
+    kDNSServiceFlagsBackgroundTrafficClass  = 0x80000,
+    /*
+    * This flag is meaningful in DNSServiceBrowse, DNSServiceGetAddrInfo, DNSServiceQueryRecord, 
+    * and DNSServiceResolve. When set, it uses the background traffic 
+    * class for packets that service the request.
+    */
+
+    kDNSServiceFlagsIncludeAWDL      = 0x100000,
+   /*
+    * Include AWDL interface when kDNSServiceInterfaceIndexAny is specified.
+    */
+
+    kDNSServiceFlagsValidate               = 0x200000,
+   /*
+    * This flag is meaningful in DNSServiceGetAddrInfo and DNSServiceQueryRecord. This is the ONLY flag to be valid 
+    * as an input to the APIs and also an output through the callbacks in the APIs.
+    *
+    * When this flag is passed to DNSServiceQueryRecord and DNSServiceGetAddrInfo to resolve unicast names, 
+    * the response  will be validated using DNSSEC. The validation results are delivered using the flags field in 
+    * the callback and kDNSServiceFlagsValidate is marked in the flags to indicate that DNSSEC status is also available.
+    * When the callback is called to deliver the query results, the validation results may or may not be available. 
+    * If it is not delivered along with the results, the validation status is delivered when the validation completes.
+    * 
+    * When the validation results are delivered in the callback, it is indicated by marking the flags with
+    * kDNSServiceFlagsValidate and kDNSServiceFlagsAdd along with the DNSSEC status flags (described below) and a NULL
+    * sockaddr will be returned for DNSServiceGetAddrInfo and zero length rdata will be returned for DNSServiceQueryRecord.
+    * DNSSEC validation results are for the whole RRSet and not just individual records delivered in the callback. When
+    * kDNSServiceFlagsAdd is not set in the flags, applications should implicitly assume that the DNSSEC status of the 
+    * RRSet that has been delivered up until that point is not valid anymore, till another callback is called with
+    * kDNSServiceFlagsAdd and kDNSServiceFlagsValidate.
+    *
+    * The following four flags indicate the status of the DNSSEC validation and marked in the flags field of the callback.
+    * When any of the four flags is set, kDNSServiceFlagsValidate will also be set. To check the validation status, the 
+    * other applicable output flags should be masked. See kDNSServiceOutputFlags below.
+    */
+
+    kDNSServiceFlagsSecure                 = 0x200010,
+   /*
+    * The response has been validated by verifying all the signaures in the response and was able to
+    * build a successful authentication chain starting from a known trust anchor.   
+    */
+
+    kDNSServiceFlagsInsecure               = 0x200020,
+   /*
+    * A chain of trust cannot be built starting from a known trust anchor to the response.
+    */
+
+    kDNSServiceFlagsBogus                  = 0x200040,
+   /*
+    * If the response cannot be verified to be secure due to expired signatures, missing signatures etc.,
+    * then the results are considered to be bogus.
+    */
+
+    kDNSServiceFlagsIndeterminate          = 0x200080,
+   /*
+    * There is no valid trust anchor that can be used to determine whether a response is secure or not.
+    */
+
+    kDNSServiceFlagsUnicastResponse        = 0x400000,
+   /*
+    * Request unicast response to query.
+    */
+    kDNSServiceFlagsValidateOptional       = 0x800000,
+
+    /*
+     * This flag is identical to kDNSServiceFlagsValidate except for the case where the response
+     * cannot be validated. If this flag is set in DNSServiceQueryRecord or DNSServiceGetAddrInfo,
+     * the DNSSEC records will be requested for validation. If they cannot be received for some reason
+     * during the validation (e.g., zone is not signed, zone is signed but cannot be traced back to
+     * root, recursive server does not understand DNSSEC etc.), then this will fallback to the default
+     * behavior where the validation will not be performed and no DNSSEC results will be provided.
+     *
+     * If the zone is signed and there is a valid path to a known trust anchor configured in the system
+     * and the application requires DNSSEC validation irrespective of the DNSSEC awareness in the current
+     * network, then this option MUST not be used. This is only intended to be used during the transition
+     * period where the different nodes participating in the DNS resolution may not understand DNSSEC or
+     * managed properly (e.g. missing DS record) but still want to be able to resolve DNS successfully.
+     */
+
+    kDNSServiceFlagsWakeOnlyService        = 0x1000000,
+    /*
+     * This flag is meaningful only in DNSServiceRegister. When set, the service will not be registered
+     * with sleep proxy server during sleep.
+     */
+
+    kDNSServiceFlagsThresholdOne           = 0x2000000,
+    kDNSServiceFlagsThresholdFinder        = 0x4000000,
+    kDNSServiceFlagsThresholdReached       = kDNSServiceFlagsThresholdOne,
+    /*
+     * kDNSServiceFlagsThresholdOne is meaningful only in DNSServiceBrowse. When set,
+     * the system will stop issuing browse queries on the network once the number
+     * of answers returned is one or more.  It will issue queries on the network
+     * again if the number of answers drops to zero.
+     * This flag is for Apple internal use only. Third party developers
+     * should not rely on this behavior being supported in any given software release.
+     *
+     * kDNSServiceFlagsThresholdFinder is meaningful only in DNSServiceBrowse. When set,
+     * the system will stop issuing browse queries on the network once the number
+     * of answers has reached the threshold set for Finder.
+     * It will issue queries on the network again if the number of answers drops below
+     * this threshold.
+     * This flag is for Apple internal use only. Third party developers
+     * should not rely on this behavior being supported in any given software release.
+     *
+     * When kDNSServiceFlagsThresholdReached is set in the client callback add or remove event,
+     * it indicates that the browse answer threshold has been reached and no 
+     * browse requests will be generated on the network until the number of answers falls
+     * below the threshold value.  Add and remove events can still occur based
+     * on incoming Bonjour traffic observed by the system.
+     * The set of services return to the client is not guaranteed to represent the 
+     * entire set of services present on the network once the threshold has been reached.
+     *
+     * Note, while kDNSServiceFlagsThresholdReached and kDNSServiceFlagsThresholdOne
+     * have the same value, there  isn't a conflict because kDNSServiceFlagsThresholdReached
+     * is only set in the callbacks and kDNSServiceFlagsThresholdOne is only set on
+     * input to a DNSServiceBrowse call.
+     */
+};
+
+#define kDNSServiceOutputFlags (kDNSServiceFlagsValidate | kDNSServiceFlagsValidateOptional | kDNSServiceFlagsMoreComing | kDNSServiceFlagsAdd | kDNSServiceFlagsDefault)
+   /* All the output flags excluding the DNSSEC Status flags. Typically used to check DNSSEC Status */
+
+/* Possible protocol values */
+enum
+{
+    /* for DNSServiceGetAddrInfo() */
+    kDNSServiceProtocol_IPv4 = 0x01,
+    kDNSServiceProtocol_IPv6 = 0x02,
+    /* 0x04 and 0x08 reserved for future internetwork protocols */
+
+    /* for DNSServiceNATPortMappingCreate() */
+    kDNSServiceProtocol_UDP  = 0x10,
+    kDNSServiceProtocol_TCP  = 0x20
+                               /* 0x40 and 0x80 reserved for future transport protocols, e.g. SCTP [RFC 2960]
+                                * or DCCP [RFC 4340]. If future NAT gateways are created that support port
+                                * mappings for these protocols, new constants will be defined here.
+                                */
+};
+
+/*
+ * The values for DNS Classes and Types are listed in RFC 1035, and are available
+ * on every OS in its DNS header file. Unfortunately every OS does not have the
+ * same header file containing DNS Class and Type constants, and the names of
+ * the constants are not consistent. For example, BIND 8 uses "T_A",
+ * BIND 9 uses "ns_t_a", Windows uses "DNS_TYPE_A", etc.
+ * For this reason, these constants are also listed here, so that code using
+ * the DNS-SD programming APIs can use these constants, so that the same code
+ * can compile on all our supported platforms.
+ */
+
+enum
+{
+    kDNSServiceClass_IN       = 1       /* Internet */
+};
+
+enum
+{
+    kDNSServiceType_A          = 1,      /* Host address. */
+    kDNSServiceType_NS         = 2,      /* Authoritative server. */
+    kDNSServiceType_MD         = 3,      /* Mail destination. */
+    kDNSServiceType_MF         = 4,      /* Mail forwarder. */
+    kDNSServiceType_CNAME      = 5,      /* Canonical name. */
+    kDNSServiceType_SOA        = 6,      /* Start of authority zone. */
+    kDNSServiceType_MB         = 7,      /* Mailbox domain name. */
+    kDNSServiceType_MG         = 8,      /* Mail group member. */
+    kDNSServiceType_MR         = 9,      /* Mail rename name. */
+    kDNSServiceType_NULL       = 10,     /* Null resource record. */
+    kDNSServiceType_WKS        = 11,     /* Well known service. */
+    kDNSServiceType_PTR        = 12,     /* Domain name pointer. */
+    kDNSServiceType_HINFO      = 13,     /* Host information. */
+    kDNSServiceType_MINFO      = 14,     /* Mailbox information. */
+    kDNSServiceType_MX         = 15,     /* Mail routing information. */
+    kDNSServiceType_TXT        = 16,     /* One or more text strings (NOT "zero or more..."). */
+    kDNSServiceType_RP         = 17,     /* Responsible person. */
+    kDNSServiceType_AFSDB      = 18,     /* AFS cell database. */
+    kDNSServiceType_X25        = 19,     /* X_25 calling address. */
+    kDNSServiceType_ISDN       = 20,     /* ISDN calling address. */
+    kDNSServiceType_RT         = 21,     /* Router. */
+    kDNSServiceType_NSAP       = 22,     /* NSAP address. */
+    kDNSServiceType_NSAP_PTR   = 23,     /* Reverse NSAP lookup (deprecated). */
+    kDNSServiceType_SIG        = 24,     /* Security signature. */
+    kDNSServiceType_KEY        = 25,     /* Security key. */
+    kDNSServiceType_PX         = 26,     /* X.400 mail mapping. */
+    kDNSServiceType_GPOS       = 27,     /* Geographical position (withdrawn). */
+    kDNSServiceType_AAAA       = 28,     /* IPv6 Address. */
+    kDNSServiceType_LOC        = 29,     /* Location Information. */
+    kDNSServiceType_NXT        = 30,     /* Next domain (security). */
+    kDNSServiceType_EID        = 31,     /* Endpoint identifier. */
+    kDNSServiceType_NIMLOC     = 32,     /* Nimrod Locator. */
+    kDNSServiceType_SRV        = 33,     /* Server Selection. */
+    kDNSServiceType_ATMA       = 34,     /* ATM Address */
+    kDNSServiceType_NAPTR      = 35,     /* Naming Authority PoinTeR */
+    kDNSServiceType_KX         = 36,     /* Key Exchange */
+    kDNSServiceType_CERT       = 37,     /* Certification record */
+    kDNSServiceType_A6         = 38,     /* IPv6 Address (deprecated) */
+    kDNSServiceType_DNAME      = 39,     /* Non-terminal DNAME (for IPv6) */
+    kDNSServiceType_SINK       = 40,     /* Kitchen sink (experimental) */
+    kDNSServiceType_OPT        = 41,     /* EDNS0 option (meta-RR) */
+    kDNSServiceType_APL        = 42,     /* Address Prefix List */
+    kDNSServiceType_DS         = 43,     /* Delegation Signer */
+    kDNSServiceType_SSHFP      = 44,     /* SSH Key Fingerprint */
+    kDNSServiceType_IPSECKEY   = 45,     /* IPSECKEY */
+    kDNSServiceType_RRSIG      = 46,     /* RRSIG */
+    kDNSServiceType_NSEC       = 47,     /* Denial of Existence */
+    kDNSServiceType_DNSKEY     = 48,     /* DNSKEY */
+    kDNSServiceType_DHCID      = 49,     /* DHCP Client Identifier */
+    kDNSServiceType_NSEC3      = 50,     /* Hashed Authenticated Denial of Existence */
+    kDNSServiceType_NSEC3PARAM = 51,     /* Hashed Authenticated Denial of Existence */
+
+    kDNSServiceType_HIP        = 55,     /* Host Identity Protocol */
+
+    kDNSServiceType_SPF        = 99,     /* Sender Policy Framework for E-Mail */
+    kDNSServiceType_UINFO      = 100,    /* IANA-Reserved */
+    kDNSServiceType_UID        = 101,    /* IANA-Reserved */
+    kDNSServiceType_GID        = 102,    /* IANA-Reserved */
+    kDNSServiceType_UNSPEC     = 103,    /* IANA-Reserved */
+
+    kDNSServiceType_TKEY       = 249,    /* Transaction key */
+    kDNSServiceType_TSIG       = 250,    /* Transaction signature. */
+    kDNSServiceType_IXFR       = 251,    /* Incremental zone transfer. */
+    kDNSServiceType_AXFR       = 252,    /* Transfer zone of authority. */
+    kDNSServiceType_MAILB      = 253,    /* Transfer mailbox records. */
+    kDNSServiceType_MAILA      = 254,    /* Transfer mail agent records. */
+    kDNSServiceType_ANY        = 255     /* Wildcard match. */
+};
+
+/* possible error code values */
+enum
+{
+    kDNSServiceErr_NoError                   = 0,
+    kDNSServiceErr_Unknown                   = -65537,  /* 0xFFFE FFFF */
+    kDNSServiceErr_NoSuchName                = -65538,
+    kDNSServiceErr_NoMemory                  = -65539,
+    kDNSServiceErr_BadParam                  = -65540,
+    kDNSServiceErr_BadReference              = -65541,
+    kDNSServiceErr_BadState                  = -65542,
+    kDNSServiceErr_BadFlags                  = -65543,
+    kDNSServiceErr_Unsupported               = -65544,
+    kDNSServiceErr_NotInitialized            = -65545,
+    kDNSServiceErr_AlreadyRegistered         = -65547,
+    kDNSServiceErr_NameConflict              = -65548,
+    kDNSServiceErr_Invalid                   = -65549,
+    kDNSServiceErr_Firewall                  = -65550,
+    kDNSServiceErr_Incompatible              = -65551,  /* client library incompatible with daemon */
+    kDNSServiceErr_BadInterfaceIndex         = -65552,
+    kDNSServiceErr_Refused                   = -65553,
+    kDNSServiceErr_NoSuchRecord              = -65554,
+    kDNSServiceErr_NoAuth                    = -65555,
+    kDNSServiceErr_NoSuchKey                 = -65556,
+    kDNSServiceErr_NATTraversal              = -65557,
+    kDNSServiceErr_DoubleNAT                 = -65558,
+    kDNSServiceErr_BadTime                   = -65559,  /* Codes up to here existed in Tiger */
+    kDNSServiceErr_BadSig                    = -65560,
+    kDNSServiceErr_BadKey                    = -65561,
+    kDNSServiceErr_Transient                 = -65562,
+    kDNSServiceErr_ServiceNotRunning         = -65563,  /* Background daemon not running */
+    kDNSServiceErr_NATPortMappingUnsupported = -65564,  /* NAT doesn't support PCP, NAT-PMP or UPnP */
+    kDNSServiceErr_NATPortMappingDisabled    = -65565,  /* NAT supports PCP, NAT-PMP or UPnP, but it's disabled by the administrator */
+    kDNSServiceErr_NoRouter                  = -65566,  /* No router currently configured (probably no network connectivity) */
+    kDNSServiceErr_PollingMode               = -65567,
+    kDNSServiceErr_Timeout                   = -65568
+
+                                               /* mDNS Error codes are in the range
+                                                * FFFE FF00 (-65792) to FFFE FFFF (-65537) */
+};
+
+/* Maximum length, in bytes, of a service name represented as a */
+/* literal C-String, including the terminating NULL at the end. */
+
+#define kDNSServiceMaxServiceName 64
+
+/* Maximum length, in bytes, of a domain name represented as an *escaped* C-String */
+/* including the final trailing dot, and the C-String terminating NULL at the end. */
+
+#define kDNSServiceMaxDomainName 1009
+
+/*
+ * Notes on DNS Name Escaping
+ *   -- or --
+ * "Why is kDNSServiceMaxDomainName 1009, when the maximum legal domain name is 256 bytes?"
+ *
+ * All strings used in the DNS-SD APIs are UTF-8 strings. Apart from the exceptions noted below,
+ * the APIs expect the strings to be properly escaped, using the conventional DNS escaping rules:
+ *
+ *   '\\' represents a single literal '\' in the name
+ *   '\.' represents a single literal '.' in the name
+ *   '\ddd', where ddd is a three-digit decimal value from 000 to 255,
+ *        represents a single literal byte with that value.
+ *   A bare unescaped '.' is a label separator, marking a boundary between domain and subdomain.
+ *
+ * The exceptions, that do not use escaping, are the routines where the full
+ * DNS name of a resource is broken, for convenience, into servicename/regtype/domain.
+ * In these routines, the "servicename" is NOT escaped. It does not need to be, since
+ * it is, by definition, just a single literal string. Any characters in that string
+ * represent exactly what they are. The "regtype" portion is, technically speaking,
+ * escaped, but since legal regtypes are only allowed to contain letters, digits,
+ * and hyphens, there is nothing to escape, so the issue is moot. The "domain"
+ * portion is also escaped, though most domains in use on the public Internet
+ * today, like regtypes, don't contain any characters that need to be escaped.
+ * As DNS-SD becomes more popular, rich-text domains for service discovery will
+ * become common, so software should be written to cope with domains with escaping.
+ *
+ * The servicename may be up to 63 bytes of UTF-8 text (not counting the C-String
+ * terminating NULL at the end). The regtype is of the form _service._tcp or
+ * _service._udp, where the "service" part is 1-15 characters, which may be
+ * letters, digits, or hyphens. The domain part of the three-part name may be
+ * any legal domain, providing that the resulting servicename+regtype+domain
+ * name does not exceed 256 bytes.
+ *
+ * For most software, these issues are transparent. When browsing, the discovered
+ * servicenames should simply be displayed as-is. When resolving, the discovered
+ * servicename/regtype/domain are simply passed unchanged to DNSServiceResolve().
+ * When a DNSServiceResolve() succeeds, the returned fullname is already in
+ * the correct format to pass to standard system DNS APIs such as res_query().
+ * For converting from servicename/regtype/domain to a single properly-escaped
+ * full DNS name, the helper function DNSServiceConstructFullName() is provided.
+ *
+ * The following (highly contrived) example illustrates the escaping process.
+ * Suppose you have an service called "Dr. Smith\Dr. Johnson", of type "_ftp._tcp"
+ * in subdomain "4th. Floor" of subdomain "Building 2" of domain "apple.com."
+ * The full (escaped) DNS name of this service's SRV record would be:
+ * Dr\.\032Smith\\Dr\.\032Johnson._ftp._tcp.4th\.\032Floor.Building\0322.apple.com.
+ */
+
+
+/*
+ * Constants for specifying an interface index
+ *
+ * Specific interface indexes are identified via a 32-bit unsigned integer returned
+ * by the if_nametoindex() family of calls.
+ *
+ * If the client passes 0 for interface index, that means "do the right thing",
+ * which (at present) means, "if the name is in an mDNS local multicast domain
+ * (e.g. 'local.', '254.169.in-addr.arpa.', '{8,9,A,B}.E.F.ip6.arpa.') then multicast
+ * on all applicable interfaces, otherwise send via unicast to the appropriate
+ * DNS server." Normally, most clients will use 0 for interface index to
+ * automatically get the default sensible behaviour.
+ *
+ * If the client passes a positive interface index, then for multicast names that
+ * indicates to do the operation only on that one interface. For unicast names the
+ * interface index is ignored unless kDNSServiceFlagsForceMulticast is also set.
+ *
+ * If the client passes kDNSServiceInterfaceIndexLocalOnly when registering
+ * a service, then that service will be found *only* by other local clients
+ * on the same machine that are browsing using kDNSServiceInterfaceIndexLocalOnly
+ * or kDNSServiceInterfaceIndexAny.
+ * If a client has a 'private' service, accessible only to other processes
+ * running on the same machine, this allows the client to advertise that service
+ * in a way such that it does not inadvertently appear in service lists on
+ * all the other machines on the network.
+ *
+ * If the client passes kDNSServiceInterfaceIndexLocalOnly when browsing
+ * then it will find *all* records registered on that same local machine.
+ * Clients explicitly wishing to discover *only* LocalOnly services can
+ * accomplish this by inspecting the interfaceIndex of each service reported
+ * to their DNSServiceBrowseReply() callback function, and discarding those
+ * where the interface index is not kDNSServiceInterfaceIndexLocalOnly.
+ *
+ * kDNSServiceInterfaceIndexP2P is meaningful only in Browse, QueryRecord, Register,
+ * and Resolve operations. It should not be used in other DNSService APIs.
+ *
+ * - If kDNSServiceInterfaceIndexP2P is passed to DNSServiceBrowse or
+ *   DNSServiceQueryRecord, it restricts the operation to P2P.
+ *
+ * - If kDNSServiceInterfaceIndexP2P is passed to DNSServiceRegister, it is
+ *   mapped internally to kDNSServiceInterfaceIndexAny with the kDNSServiceFlagsIncludeP2P
+ *   set.
+ *
+ * - If kDNSServiceInterfaceIndexP2P is passed to DNSServiceResolve, it is
+ *   mapped internally to kDNSServiceInterfaceIndexAny with the kDNSServiceFlagsIncludeP2P
+ *   set, because resolving a P2P service may create and/or enable an interface whose 
+ *   index is not known a priori. The resolve callback will indicate the index of the
+ *   interface via which the service can be accessed.
+ *
+ * If applications pass kDNSServiceInterfaceIndexAny to DNSServiceBrowse
+ * or DNSServiceQueryRecord, they must set the kDNSServiceFlagsIncludeP2P flag
+ * to include P2P. In this case, if a service instance or the record being queried
+ * is found over P2P, the resulting ADD event will indicate kDNSServiceInterfaceIndexP2P
+ * as the interface index.
+ */
+
+#define kDNSServiceInterfaceIndexAny 0
+#define kDNSServiceInterfaceIndexLocalOnly ((uint32_t)-1)
+#define kDNSServiceInterfaceIndexUnicast   ((uint32_t)-2)
+#define kDNSServiceInterfaceIndexP2P       ((uint32_t)-3)
+
+typedef uint32_t DNSServiceFlags;
+typedef uint32_t DNSServiceProtocol;
+typedef int32_t DNSServiceErrorType;
+
+
+/*********************************************************************************************
+*
+* Version checking
+*
+*********************************************************************************************/
+
+/* DNSServiceGetProperty() Parameters:
+ *
+ * property:        The requested property.
+ *                  Currently the only property defined is kDNSServiceProperty_DaemonVersion.
+ *
+ * result:          Place to store result.
+ *                  For retrieving DaemonVersion, this should be the address of a uint32_t.
+ *
+ * size:            Pointer to uint32_t containing size of the result location.
+ *                  For retrieving DaemonVersion, this should be sizeof(uint32_t).
+ *                  On return the uint32_t is updated to the size of the data returned.
+ *                  For DaemonVersion, the returned size is always sizeof(uint32_t), but
+ *                  future properties could be defined which return variable-sized results.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, or kDNSServiceErr_ServiceNotRunning
+ *                  if the daemon (or "system service" on Windows) is not running.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceGetProperty
+(
+    const char *property,  /* Requested property (i.e. kDNSServiceProperty_DaemonVersion) */
+    void       *result,    /* Pointer to place to store result */
+    uint32_t   *size       /* size of result location */
+);
+
+/*
+ * When requesting kDNSServiceProperty_DaemonVersion, the result pointer must point
+ * to a 32-bit unsigned integer, and the size parameter must be set to sizeof(uint32_t).
+ *
+ * On return, the 32-bit unsigned integer contains the version number, formatted as follows:
+ *   Major part of the build number * 10000 +
+ *   minor part of the build number *   100
+ *
+ * For example, Mac OS X 10.4.9 has mDNSResponder-108.4, which would be represented as
+ * version 1080400. This allows applications to do simple greater-than and less-than comparisons:
+ * e.g. an application that requires at least mDNSResponder-108.4 can check:
+ *
+ *   if (version >= 1080400) ...
+ *
+ * Example usage:
+ *
+ * uint32_t version;
+ * uint32_t size = sizeof(version);
+ * DNSServiceErrorType err = DNSServiceGetProperty(kDNSServiceProperty_DaemonVersion, &version, &size);
+ * if (!err) printf("Bonjour version is %d.%d\n", version / 10000, version / 100 % 100);
+ */
+
+#define kDNSServiceProperty_DaemonVersion "DaemonVersion"
+
+
+// Map the source port of the local UDP socket that was opened for sending the DNS query
+// to the process ID of the application that triggered the DNS resolution.
+//
+/* DNSServiceGetPID() Parameters:
+ *
+ * srcport:         Source port (in network byte order) of the UDP socket that was created by
+ *                  mDNSResponder to send the DNS query on the wire.
+ *
+ * pid:             Process ID of the application that started the name resolution which triggered
+ *                  mDNSResponder to send the query on the wire. The value can be -1 if the srcport
+ *                  cannot be mapped.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, or kDNSServiceErr_ServiceNotRunning
+ *                  if the daemon is not running. The value of the pid is undefined if the return
+ *                  value has error.
+ */
+DNSServiceErrorType DNSSD_API DNSServiceGetPID
+(
+    uint16_t srcport,
+    int32_t *pid
+);
+
+/*********************************************************************************************
+*
+* Unix Domain Socket access, DNSServiceRef deallocation, and data processing functions
+*
+*********************************************************************************************/
+
+/* DNSServiceRefSockFD()
+ *
+ * Access underlying Unix domain socket for an initialized DNSServiceRef.
+ * The DNS Service Discovery implementation uses this socket to communicate between the client and
+ * the mDNSResponder daemon. The application MUST NOT directly read from or write to this socket.
+ * Access to the socket is provided so that it can be used as a kqueue event source, a CFRunLoop
+ * event source, in a select() loop, etc. When the underlying event management subsystem (kqueue/
+ * select/CFRunLoop etc.) indicates to the client that data is available for reading on the
+ * socket, the client should call DNSServiceProcessResult(), which will extract the daemon's
+ * reply from the socket, and pass it to the appropriate application callback. By using a run
+ * loop or select(), results from the daemon can be processed asynchronously. Alternatively,
+ * a client can choose to fork a thread and have it loop calling "DNSServiceProcessResult(ref);"
+ * If DNSServiceProcessResult() is called when no data is available for reading on the socket, it
+ * will block until data does become available, and then process the data and return to the caller.
+ * When data arrives on the socket, the client is responsible for calling DNSServiceProcessResult(ref)
+ * in a timely fashion -- if the client allows a large backlog of data to build up the daemon
+ * may terminate the connection.
+ *
+ * sdRef:           A DNSServiceRef initialized by any of the DNSService calls.
+ *
+ * return value:    The DNSServiceRef's underlying socket descriptor, or -1 on
+ *                  error.
+ */
+
+int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef);
+
+
+/* DNSServiceProcessResult()
+ *
+ * Read a reply from the daemon, calling the appropriate application callback. This call will
+ * block until the daemon's response is received. Use DNSServiceRefSockFD() in
+ * conjunction with a run loop or select() to determine the presence of a response from the
+ * server before calling this function to process the reply without blocking. Call this function
+ * at any point if it is acceptable to block until the daemon's response arrives. Note that the
+ * client is responsible for ensuring that DNSServiceProcessResult() is called whenever there is
+ * a reply from the daemon - the daemon may terminate its connection with a client that does not
+ * process the daemon's responses.
+ *
+ * sdRef:           A DNSServiceRef initialized by any of the DNSService calls
+ *                  that take a callback parameter.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns
+ *                  an error code indicating the specific failure that occurred.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceProcessResult(DNSServiceRef sdRef);
+
+
+/* DNSServiceRefDeallocate()
+ *
+ * Terminate a connection with the daemon and free memory associated with the DNSServiceRef.
+ * Any services or records registered with this DNSServiceRef will be deregistered. Any
+ * Browse, Resolve, or Query operations called with this reference will be terminated.
+ *
+ * Note: If the reference's underlying socket is used in a run loop or select() call, it should
+ * be removed BEFORE DNSServiceRefDeallocate() is called, as this function closes the reference's
+ * socket.
+ *
+ * Note: If the reference was initialized with DNSServiceCreateConnection(), any DNSRecordRefs
+ * created via this reference will be invalidated by this call - the resource records are
+ * deregistered, and their DNSRecordRefs may not be used in subsequent functions. Similarly,
+ * if the reference was initialized with DNSServiceRegister, and an extra resource record was
+ * added to the service via DNSServiceAddRecord(), the DNSRecordRef created by the Add() call
+ * is invalidated when this function is called - the DNSRecordRef may not be used in subsequent
+ * functions.
+ *
+ * Note: This call is to be used only with the DNSServiceRef defined by this API.
+ *
+ * sdRef:           A DNSServiceRef initialized by any of the DNSService calls.
+ *
+ */
+
+void DNSSD_API DNSServiceRefDeallocate(DNSServiceRef sdRef);
+
+
+/*********************************************************************************************
+*
+* Domain Enumeration
+*
+*********************************************************************************************/
+
+/* DNSServiceEnumerateDomains()
+ *
+ * Asynchronously enumerate domains available for browsing and registration.
+ *
+ * The enumeration MUST be cancelled via DNSServiceRefDeallocate() when no more domains
+ * are to be found.
+ *
+ * Note that the names returned are (like all of DNS-SD) UTF-8 strings,
+ * and are escaped using standard DNS escaping rules.
+ * (See "Notes on DNS Name Escaping" earlier in this file for more details.)
+ * A graphical browser displaying a hierarchical tree-structured view should cut
+ * the names at the bare dots to yield individual labels, then de-escape each
+ * label according to the escaping rules, and then display the resulting UTF-8 text.
+ *
+ * DNSServiceDomainEnumReply Callback Parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceEnumerateDomains().
+ *
+ * flags:           Possible values are:
+ *                  kDNSServiceFlagsMoreComing
+ *                  kDNSServiceFlagsAdd
+ *                  kDNSServiceFlagsDefault
+ *
+ * interfaceIndex:  Specifies the interface on which the domain exists. (The index for a given
+ *                  interface is determined via the if_nametoindex() family of calls.)
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError (0) on success, otherwise indicates
+ *                  the failure that occurred (other parameters are undefined if errorCode is nonzero).
+ *
+ * replyDomain:     The name of the domain.
+ *
+ * context:         The context pointer passed to DNSServiceEnumerateDomains.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceDomainEnumReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char                          *replyDomain,
+    void                                *context
+);
+
+
+/* DNSServiceEnumerateDomains() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds
+ *                  then it initializes the DNSServiceRef, returns kDNSServiceErr_NoError,
+ *                  and the enumeration operation will run indefinitely until the client
+ *                  terminates it by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           Possible values are:
+ *                  kDNSServiceFlagsBrowseDomains to enumerate domains recommended for browsing.
+ *                  kDNSServiceFlagsRegistrationDomains to enumerate domains recommended
+ *                  for registration.
+ *
+ * interfaceIndex:  If non-zero, specifies the interface on which to look for domains.
+ *                  (the index for a given interface is determined via the if_nametoindex()
+ *                  family of calls.) Most applications will pass 0 to enumerate domains on
+ *                  all interfaces. See "Constants for specifying an interface index" for more details.
+ *
+ * callBack:        The function to be called when a domain is found or the call asynchronously
+ *                  fails.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is not invoked and the DNSServiceRef
+ *                  is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceEnumerateDomains
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceDomainEnumReply callBack,
+    void                                *context  /* may be NULL */
+);
+
+
+/*********************************************************************************************
+*
+*  Service Registration
+*
+*********************************************************************************************/
+
+/* Register a service that is discovered via Browse() and Resolve() calls.
+ *
+ * DNSServiceRegisterReply() Callback Parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceRegister().
+ *
+ * flags:           When a name is successfully registered, the callback will be
+ *                  invoked with the kDNSServiceFlagsAdd flag set. When Wide-Area
+ *                  DNS-SD is in use, it is possible for a single service to get
+ *                  more than one success callback (e.g. one in the "local" multicast
+ *                  DNS domain, and another in a wide-area unicast DNS domain).
+ *                  If a successfully-registered name later suffers a name conflict
+ *                  or similar problem and has to be deregistered, the callback will
+ *                  be invoked with the kDNSServiceFlagsAdd flag not set. The callback
+ *                  is *not* invoked in the case where the caller explicitly terminates
+ *                  the service registration by calling DNSServiceRefDeallocate(ref);
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError on success, otherwise will
+ *                  indicate the failure that occurred (including name conflicts,
+ *                  if the kDNSServiceFlagsNoAutoRename flag was used when registering.)
+ *                  Other parameters are undefined if errorCode is nonzero.
+ *
+ * name:            The service name registered (if the application did not specify a name in
+ *                  DNSServiceRegister(), this indicates what name was automatically chosen).
+ *
+ * regtype:         The type of service registered, as it was passed to the callout.
+ *
+ * domain:          The domain on which the service was registered (if the application did not
+ *                  specify a domain in DNSServiceRegister(), this indicates the default domain
+ *                  on which the service was registered).
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceRegisterReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    DNSServiceErrorType errorCode,
+    const char                          *name,
+    const char                          *regtype,
+    const char                          *domain,
+    void                                *context
+);
+
+
+/* DNSServiceRegister() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds
+ *                  then it initializes the DNSServiceRef, returns kDNSServiceErr_NoError,
+ *                  and the registration will remain active indefinitely until the client
+ *                  terminates it by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * interfaceIndex:  If non-zero, specifies the interface on which to register the service
+ *                  (the index for a given interface is determined via the if_nametoindex()
+ *                  family of calls.) Most applications will pass 0 to register on all
+ *                  available interfaces. See "Constants for specifying an interface index" for more details.
+ *
+ * flags:           Indicates the renaming behavior on name conflict (most applications
+ *                  will pass 0). See flag definitions above for details.
+ *
+ * name:            If non-NULL, specifies the service name to be registered.
+ *                  Most applications will not specify a name, in which case the computer
+ *                  name is used (this name is communicated to the client via the callback).
+ *                  If a name is specified, it must be 1-63 bytes of UTF-8 text.
+ *                  If the name is longer than 63 bytes it will be automatically truncated
+ *                  to a legal length, unless the NoAutoRename flag is set,
+ *                  in which case kDNSServiceErr_BadParam will be returned.
+ *
+ * regtype:         The service type followed by the protocol, separated by a dot
+ *                  (e.g. "_ftp._tcp"). The service type must be an underscore, followed
+ *                  by 1-15 characters, which may be letters, digits, or hyphens.
+ *                  The transport protocol must be "_tcp" or "_udp". New service types
+ *                  should be registered at <http://www.dns-sd.org/ServiceTypes.html>.
+ *
+ *                  Additional subtypes of the primary service type (where a service
+ *                  type has defined subtypes) follow the primary service type in a
+ *                  comma-separated list, with no additional spaces, e.g.
+ *                      "_primarytype._tcp,_subtype1,_subtype2,_subtype3"
+ *                  Subtypes provide a mechanism for filtered browsing: A client browsing
+ *                  for "_primarytype._tcp" will discover all instances of this type;
+ *                  a client browsing for "_primarytype._tcp,_subtype2" will discover only
+ *                  those instances that were registered with "_subtype2" in their list of
+ *                  registered subtypes.
+ *
+ *                  The subtype mechanism can be illustrated with some examples using the
+ *                  dns-sd command-line tool:
+ *
+ *                  % dns-sd -R Simple _test._tcp "" 1001 &
+ *                  % dns-sd -R Better _test._tcp,HasFeatureA "" 1002 &
+ *                  % dns-sd -R Best   _test._tcp,HasFeatureA,HasFeatureB "" 1003 &
+ *
+ *                  Now:
+ *                  % dns-sd -B _test._tcp             # will find all three services
+ *                  % dns-sd -B _test._tcp,HasFeatureA # finds "Better" and "Best"
+ *                  % dns-sd -B _test._tcp,HasFeatureB # finds only "Best"
+ *
+ *                  Subtype labels may be up to 63 bytes long, and may contain any eight-
+ *                  bit byte values, including zero bytes. However, due to the nature of
+ *                  using a C-string-based API, conventional DNS escaping must be used for
+ *                  dots ('.'), commas (','), backslashes ('\') and zero bytes, as shown below:
+ *
+ *                  % dns-sd -R Test '_test._tcp,s\.one,s\,two,s\\three,s\000four' local 123
+ *
+ *                  When a service is registered, all the clients browsing for the registered
+ *                  type ("regtype") will discover it. If the discovery should be
+ *                  restricted to a smaller set of well known peers, the service can be
+ *                  registered with additional data (group identifier) that is known
+ *                  only to a smaller set of peers. The group identifier should follow primary
+ *                  service type using a colon (":") as a delimeter. If subtypes are also present,
+ *                  it should be given before the subtype as shown below.
+ *
+ *                  % dns-sd -R _test1 _http._tcp:mygroup1 local 1001 
+ *                  % dns-sd -R _test2 _http._tcp:mygroup2 local 1001 
+ *                  % dns-sd -R _test3 _http._tcp:mygroup3,HasFeatureA local 1001 
+ *
+ *                  Now:
+ *                  % dns-sd -B _http._tcp:"mygroup1"                # will discover only test1
+ *                  % dns-sd -B _http._tcp:"mygroup2"                # will discover only test2
+ *                  % dns-sd -B _http._tcp:"mygroup3",HasFeatureA    # will discover only test3
+ *                  
+ *                  By specifying the group information, only the members of that group are
+ *                  discovered.
+ *
+ *                  The group identifier itself is not sent in clear. Only a hash of the group
+ *                  identifier is sent and the clients discover them anonymously. The group identifier
+ *                  may be up to 256 bytes long and may contain any eight bit values except comma which
+ *                  should be escaped.
+ *
+ * domain:          If non-NULL, specifies the domain on which to advertise the service.
+ *                  Most applications will not specify a domain, instead automatically
+ *                  registering in the default domain(s).
+ *
+ * host:            If non-NULL, specifies the SRV target host name. Most applications
+ *                  will not specify a host, instead automatically using the machine's
+ *                  default host name(s). Note that specifying a non-NULL host does NOT
+ *                  create an address record for that host - the application is responsible
+ *                  for ensuring that the appropriate address record exists, or creating it
+ *                  via DNSServiceRegisterRecord().
+ *
+ * port:            The port, in network byte order, on which the service accepts connections.
+ *                  Pass 0 for a "placeholder" service (i.e. a service that will not be discovered
+ *                  by browsing, but will cause a name conflict if another client tries to
+ *                  register that same name). Most clients will not use placeholder services.
+ *
+ * txtLen:          The length of the txtRecord, in bytes. Must be zero if the txtRecord is NULL.
+ *
+ * txtRecord:       The TXT record rdata. A non-NULL txtRecord MUST be a properly formatted DNS
+ *                  TXT record, i.e. <length byte> <data> <length byte> <data> ...
+ *                  Passing NULL for the txtRecord is allowed as a synonym for txtLen=1, txtRecord="",
+ *                  i.e. it creates a TXT record of length one containing a single empty string.
+ *                  RFC 1035 doesn't allow a TXT record to contain *zero* strings, so a single empty
+ *                  string is the smallest legal DNS TXT record.
+ *                  As with the other parameters, the DNSServiceRegister call copies the txtRecord
+ *                  data; e.g. if you allocated the storage for the txtRecord parameter with malloc()
+ *                  then you can safely free that memory right after the DNSServiceRegister call returns.
+ *
+ * callBack:        The function to be called when the registration completes or asynchronously
+ *                  fails. The client MAY pass NULL for the callback -  The client will NOT be notified
+ *                  of the default values picked on its behalf, and the client will NOT be notified of any
+ *                  asynchronous errors (e.g. out of memory errors, etc.) that may prevent the registration
+ *                  of the service. The client may NOT pass the NoAutoRename flag if the callback is NULL.
+ *                  The client may still deregister the service at any time via DNSServiceRefDeallocate().
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is never invoked and the DNSServiceRef
+ *                  is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceRegister
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *name,         /* may be NULL */
+    const char                          *regtype,
+    const char                          *domain,       /* may be NULL */
+    const char                          *host,         /* may be NULL */
+    uint16_t port,                                     /* In network byte order */
+    uint16_t txtLen,
+    const void                          *txtRecord,    /* may be NULL */
+    DNSServiceRegisterReply callBack,                  /* may be NULL */
+    void                                *context       /* may be NULL */
+);
+
+
+/* DNSServiceAddRecord()
+ *
+ * Add a record to a registered service. The name of the record will be the same as the
+ * registered service's name.
+ * The record can later be updated or deregistered by passing the RecordRef initialized
+ * by this function to DNSServiceUpdateRecord() or DNSServiceRemoveRecord().
+ *
+ * Note that the DNSServiceAddRecord/UpdateRecord/RemoveRecord are *NOT* thread-safe
+ * with respect to a single DNSServiceRef. If you plan to have multiple threads
+ * in your program simultaneously add, update, or remove records from the same
+ * DNSServiceRef, then it's the caller's responsibility to use a mutext lock
+ * or take similar appropriate precautions to serialize those calls.
+ *
+ * Parameters;
+ *
+ * sdRef:           A DNSServiceRef initialized by DNSServiceRegister().
+ *
+ * RecordRef:       A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this
+ *                  call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord().
+ *                  If the above DNSServiceRef is passed to DNSServiceRefDeallocate(), RecordRef is also
+ *                  invalidated and may not be used further.
+ *
+ * flags:           Currently ignored, reserved for future use.
+ *
+ * rrtype:          The type of the record (e.g. kDNSServiceType_TXT, kDNSServiceType_SRV, etc)
+ *
+ * rdlen:           The length, in bytes, of the rdata.
+ *
+ * rdata:           The raw rdata to be contained in the added resource record.
+ *
+ * ttl:             The time to live of the resource record, in seconds.
+ *                  Most clients should pass 0 to indicate that the system should
+ *                  select a sensible default value.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns an
+ *                  error code indicating the error that occurred (the RecordRef is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceAddRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef                        *RecordRef,
+    DNSServiceFlags flags,
+    uint16_t rrtype,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl
+);
+
+
+/* DNSServiceUpdateRecord
+ *
+ * Update a registered resource record. The record must either be:
+ *   - The primary txt record of a service registered via DNSServiceRegister()
+ *   - A record added to a registered service via DNSServiceAddRecord()
+ *   - An individual record registered by DNSServiceRegisterRecord()
+ *
+ * Parameters:
+ *
+ * sdRef:           A DNSServiceRef that was initialized by DNSServiceRegister()
+ *                  or DNSServiceCreateConnection().
+ *
+ * RecordRef:       A DNSRecordRef initialized by DNSServiceAddRecord, or NULL to update the
+ *                  service's primary txt record.
+ *
+ * flags:           Currently ignored, reserved for future use.
+ *
+ * rdlen:           The length, in bytes, of the new rdata.
+ *
+ * rdata:           The new rdata to be contained in the updated resource record.
+ *
+ * ttl:             The time to live of the updated resource record, in seconds.
+ *                  Most clients should pass 0 to indicate that the system should
+ *                  select a sensible default value.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns an
+ *                  error code indicating the error that occurred.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceUpdateRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,                            /* may be NULL */
+    DNSServiceFlags flags,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl
+);
+
+
+/* DNSServiceRemoveRecord
+ *
+ * Remove a record previously added to a service record set via DNSServiceAddRecord(), or deregister
+ * an record registered individually via DNSServiceRegisterRecord().
+ *
+ * Parameters:
+ *
+ * sdRef:           A DNSServiceRef initialized by DNSServiceRegister() (if the
+ *                  record being removed was registered via DNSServiceAddRecord()) or by
+ *                  DNSServiceCreateConnection() (if the record being removed was registered via
+ *                  DNSServiceRegisterRecord()).
+ *
+ * recordRef:       A DNSRecordRef initialized by a successful call to DNSServiceAddRecord()
+ *                  or DNSServiceRegisterRecord().
+ *
+ * flags:           Currently ignored, reserved for future use.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns an
+ *                  error code indicating the error that occurred.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceRemoveRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,
+    DNSServiceFlags flags
+);
+
+
+/*********************************************************************************************
+*
+*  Service Discovery
+*
+*********************************************************************************************/
+
+/* Browse for instances of a service.
+ *
+ * DNSServiceBrowseReply() Parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceBrowse().
+ *
+ * flags:           Possible values are kDNSServiceFlagsMoreComing and kDNSServiceFlagsAdd.
+ *                  See flag definitions for details.
+ *
+ * interfaceIndex:  The interface on which the service is advertised. This index should
+ *                  be passed to DNSServiceResolve() when resolving the service.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError (0) on success, otherwise will
+ *                  indicate the failure that occurred. Other parameters are undefined if
+ *                  the errorCode is nonzero.
+ *
+ * serviceName:     The discovered service name. This name should be displayed to the user,
+ *                  and stored for subsequent use in the DNSServiceResolve() call.
+ *
+ * regtype:         The service type, which is usually (but not always) the same as was passed
+ *                  to DNSServiceBrowse(). One case where the discovered service type may
+ *                  not be the same as the requested service type is when using subtypes:
+ *                  The client may want to browse for only those ftp servers that allow
+ *                  anonymous connections. The client will pass the string "_ftp._tcp,_anon"
+ *                  to DNSServiceBrowse(), but the type of the service that's discovered
+ *                  is simply "_ftp._tcp". The regtype for each discovered service instance
+ *                  should be stored along with the name, so that it can be passed to
+ *                  DNSServiceResolve() when the service is later resolved.
+ *
+ * domain:          The domain of the discovered service instance. This may or may not be the
+ *                  same as the domain that was passed to DNSServiceBrowse(). The domain for each
+ *                  discovered service instance should be stored along with the name, so that
+ *                  it can be passed to DNSServiceResolve() when the service is later resolved.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceBrowseReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char                          *serviceName,
+    const char                          *regtype,
+    const char                          *replyDomain,
+    void                                *context
+);
+
+
+/* DNSServiceBrowse() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds
+ *                  then it initializes the DNSServiceRef, returns kDNSServiceErr_NoError,
+ *                  and the browse operation will run indefinitely until the client
+ *                  terminates it by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           Currently ignored, reserved for future use.
+ *
+ * interfaceIndex:  If non-zero, specifies the interface on which to browse for services
+ *                  (the index for a given interface is determined via the if_nametoindex()
+ *                  family of calls.) Most applications will pass 0 to browse on all available
+ *                  interfaces. See "Constants for specifying an interface index" for more details.
+ *
+ * regtype:         The service type being browsed for followed by the protocol, separated by a
+ *                  dot (e.g. "_ftp._tcp"). The transport protocol must be "_tcp" or "_udp".
+ *                  A client may optionally specify a single subtype to perform filtered browsing:
+ *                  e.g. browsing for "_primarytype._tcp,_subtype" will discover only those
+ *                  instances of "_primarytype._tcp" that were registered specifying "_subtype"
+ *                  in their list of registered subtypes. Additionally, a group identifier may
+ *                  also be specified before the subtype e.g., _primarytype._tcp:GroupID, which
+ *                  will discover only the members that register the service with GroupID. See
+ *                  DNSServiceRegister for more details.
+ *
+ * domain:          If non-NULL, specifies the domain on which to browse for services.
+ *                  Most applications will not specify a domain, instead browsing on the
+ *                  default domain(s).
+ *
+ * callBack:        The function to be called when an instance of the service being browsed for
+ *                  is found, or if the call asynchronously fails.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is not invoked and the DNSServiceRef
+ *                  is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceBrowse
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *regtype,
+    const char                          *domain,    /* may be NULL */
+    DNSServiceBrowseReply callBack,
+    void                                *context    /* may be NULL */
+);
+
+
+/* DNSServiceResolve()
+ *
+ * Resolve a service name discovered via DNSServiceBrowse() to a target host name, port number, and
+ * txt record.
+ *
+ * Note: Applications should NOT use DNSServiceResolve() solely for txt record monitoring - use
+ * DNSServiceQueryRecord() instead, as it is more efficient for this task.
+ *
+ * Note: When the desired results have been returned, the client MUST terminate the resolve by calling
+ * DNSServiceRefDeallocate().
+ *
+ * Note: DNSServiceResolve() behaves correctly for typical services that have a single SRV record
+ * and a single TXT record. To resolve non-standard services with multiple SRV or TXT records,
+ * DNSServiceQueryRecord() should be used.
+ *
+ * DNSServiceResolveReply Callback Parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceResolve().
+ *
+ * flags:           Possible values: kDNSServiceFlagsMoreComing
+ *
+ * interfaceIndex:  The interface on which the service was resolved.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError (0) on success, otherwise will
+ *                  indicate the failure that occurred. Other parameters are undefined if
+ *                  the errorCode is nonzero.
+ *
+ * fullname:        The full service domain name, in the form <servicename>.<protocol>.<domain>.
+ *                  (This name is escaped following standard DNS rules, making it suitable for
+ *                  passing to standard system DNS APIs such as res_query(), or to the
+ *                  special-purpose functions included in this API that take fullname parameters.
+ *                  See "Notes on DNS Name Escaping" earlier in this file for more details.)
+ *
+ * hosttarget:      The target hostname of the machine providing the service. This name can
+ *                  be passed to functions like gethostbyname() to identify the host's IP address.
+ *
+ * port:            The port, in network byte order, on which connections are accepted for this service.
+ *
+ * txtLen:          The length of the txt record, in bytes.
+ *
+ * txtRecord:       The service's primary txt record, in standard txt record format.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ * NOTE: In earlier versions of this header file, the txtRecord parameter was declared "const char *"
+ * This is incorrect, since it contains length bytes which are values in the range 0 to 255, not -128 to +127.
+ * Depending on your compiler settings, this change may cause signed/unsigned mismatch warnings.
+ * These should be fixed by updating your own callback function definition to match the corrected
+ * function signature using "const unsigned char *txtRecord". Making this change may also fix inadvertent
+ * bugs in your callback function, where it could have incorrectly interpreted a length byte with value 250
+ * as being -6 instead, with various bad consequences ranging from incorrect operation to software crashes.
+ * If you need to maintain portable code that will compile cleanly with both the old and new versions of
+ * this header file, you should update your callback function definition to use the correct unsigned value,
+ * and then in the place where you pass your callback function to DNSServiceResolve(), use a cast to eliminate
+ * the compiler warning, e.g.:
+ *   DNSServiceResolve(sd, flags, index, name, regtype, domain, (DNSServiceResolveReply)MyCallback, context);
+ * This will ensure that your code compiles cleanly without warnings (and more importantly, works correctly)
+ * with both the old header and with the new corrected version.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceResolveReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char                          *fullname,
+    const char                          *hosttarget,
+    uint16_t port,                                   /* In network byte order */
+    uint16_t txtLen,
+    const unsigned char                 *txtRecord,
+    void                                *context
+);
+
+
+/* DNSServiceResolve() Parameters
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds
+ *                  then it initializes the DNSServiceRef, returns kDNSServiceErr_NoError,
+ *                  and the resolve operation will run indefinitely until the client
+ *                  terminates it by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           Specifying kDNSServiceFlagsForceMulticast will cause query to be
+ *                  performed with a link-local mDNS query, even if the name is an
+ *                  apparently non-local name (i.e. a name not ending in ".local.")
+ *
+ * interfaceIndex:  The interface on which to resolve the service. If this resolve call is
+ *                  as a result of a currently active DNSServiceBrowse() operation, then the
+ *                  interfaceIndex should be the index reported in the DNSServiceBrowseReply
+ *                  callback. If this resolve call is using information previously saved
+ *                  (e.g. in a preference file) for later use, then use interfaceIndex 0, because
+ *                  the desired service may now be reachable via a different physical interface.
+ *                  See "Constants for specifying an interface index" for more details.
+ *
+ * name:            The name of the service instance to be resolved, as reported to the
+ *                  DNSServiceBrowseReply() callback.
+ *
+ * regtype:         The type of the service instance to be resolved, as reported to the
+ *                  DNSServiceBrowseReply() callback.
+ *
+ * domain:          The domain of the service instance to be resolved, as reported to the
+ *                  DNSServiceBrowseReply() callback.
+ *
+ * callBack:        The function to be called when a result is found, or if the call
+ *                  asynchronously fails.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is never invoked and the DNSServiceRef
+ *                  is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceResolve
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *name,
+    const char                          *regtype,
+    const char                          *domain,
+    DNSServiceResolveReply callBack,
+    void                                *context  /* may be NULL */
+);
+
+
+/*********************************************************************************************
+*
+*  Querying Individual Specific Records
+*
+*********************************************************************************************/
+
+/* DNSServiceQueryRecord
+ *
+ * Query for an arbitrary DNS record.
+ *
+ * DNSServiceQueryRecordReply() Callback Parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceQueryRecord().
+ *
+ * flags:           Possible values are kDNSServiceFlagsMoreComing and
+ *                  kDNSServiceFlagsAdd. The Add flag is NOT set for PTR records
+ *                  with a ttl of 0, i.e. "Remove" events.
+ *
+ * interfaceIndex:  The interface on which the query was resolved (the index for a given
+ *                  interface is determined via the if_nametoindex() family of calls).
+ *                  See "Constants for specifying an interface index" for more details.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError on success, otherwise will
+ *                  indicate the failure that occurred. Other parameters are undefined if
+ *                  errorCode is nonzero.
+ *
+ * fullname:        The resource record's full domain name.
+ *
+ * rrtype:          The resource record's type (e.g. kDNSServiceType_PTR, kDNSServiceType_SRV, etc)
+ *
+ * rrclass:         The class of the resource record (usually kDNSServiceClass_IN).
+ *
+ * rdlen:           The length, in bytes, of the resource record rdata.
+ *
+ * rdata:           The raw rdata of the resource record.
+ *
+ * ttl:             If the client wishes to cache the result for performance reasons,
+ *                  the TTL indicates how long the client may legitimately hold onto
+ *                  this result, in seconds. After the TTL expires, the client should
+ *                  consider the result no longer valid, and if it requires this data
+ *                  again, it should be re-fetched with a new query. Of course, this
+ *                  only applies to clients that cancel the asynchronous operation when
+ *                  they get a result. Clients that leave the asynchronous operation
+ *                  running can safely assume that the data remains valid until they
+ *                  get another callback telling them otherwise.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceQueryRecordReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char                          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl,
+    void                                *context
+);
+
+
+/* DNSServiceQueryRecord() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds
+ *                  then it initializes the DNSServiceRef, returns kDNSServiceErr_NoError,
+ *                  and the query operation will run indefinitely until the client
+ *                  terminates it by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           kDNSServiceFlagsForceMulticast or kDNSServiceFlagsLongLivedQuery.
+ *                  Pass kDNSServiceFlagsLongLivedQuery to create a "long-lived" unicast
+ *                  query to a unicast DNS server that implements the protocol. This flag
+ *                  has no effect on link-local multicast queries.
+ *
+ * interfaceIndex:  If non-zero, specifies the interface on which to issue the query
+ *                  (the index for a given interface is determined via the if_nametoindex()
+ *                  family of calls.) Passing 0 causes the name to be queried for on all
+ *                  interfaces. See "Constants for specifying an interface index" for more details.
+ *
+ * fullname:        The full domain name of the resource record to be queried for.
+ *
+ * rrtype:          The numerical type of the resource record to be queried for
+ *                  (e.g. kDNSServiceType_PTR, kDNSServiceType_SRV, etc)
+ *
+ * rrclass:         The class of the resource record (usually kDNSServiceClass_IN).
+ *
+ * callBack:        The function to be called when a result is found, or if the call
+ *                  asynchronously fails.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is never invoked and the DNSServiceRef
+ *                  is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceQueryRecord
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    DNSServiceQueryRecordReply callBack,
+    void                                *context  /* may be NULL */
+);
+
+
+/*********************************************************************************************
+*
+*  Unified lookup of both IPv4 and IPv6 addresses for a fully qualified hostname
+*
+*********************************************************************************************/
+
+/* DNSServiceGetAddrInfo
+ *
+ * Queries for the IP address of a hostname by using either Multicast or Unicast DNS.
+ *
+ * DNSServiceGetAddrInfoReply() parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceGetAddrInfo().
+ *
+ * flags:           Possible values are kDNSServiceFlagsMoreComing and
+ *                  kDNSServiceFlagsAdd.
+ *
+ * interfaceIndex:  The interface to which the answers pertain.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError on success, otherwise will
+ *                  indicate the failure that occurred.  Other parameters are
+ *                  undefined if errorCode is nonzero.
+ *
+ * hostname:        The fully qualified domain name of the host to be queried for.
+ *
+ * address:         IPv4 or IPv6 address.
+ *
+ * ttl:             If the client wishes to cache the result for performance reasons,
+ *                  the TTL indicates how long the client may legitimately hold onto
+ *                  this result, in seconds. After the TTL expires, the client should
+ *                  consider the result no longer valid, and if it requires this data
+ *                  again, it should be re-fetched with a new query. Of course, this
+ *                  only applies to clients that cancel the asynchronous operation when
+ *                  they get a result. Clients that leave the asynchronous operation
+ *                  running can safely assume that the data remains valid until they
+ *                  get another callback telling them otherwise.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceGetAddrInfoReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    const char                       *hostname,
+    const struct sockaddr            *address,
+    uint32_t ttl,
+    void                             *context
+);
+
+
+/* DNSServiceGetAddrInfo() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds then it
+ *                  initializes the DNSServiceRef, returns kDNSServiceErr_NoError, and the query
+ *                  begins and will last indefinitely until the client terminates the query
+ *                  by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           kDNSServiceFlagsForceMulticast or kDNSServiceFlagsLongLivedQuery.
+ *                  Pass kDNSServiceFlagsLongLivedQuery to create a "long-lived" unicast
+ *                  query to a unicast DNS server that implements the protocol. This flag
+ *                  has no effect on link-local multicast queries.
+ *
+ * interfaceIndex:  The interface on which to issue the query.  Passing 0 causes the query to be
+ *                  sent on all active interfaces via Multicast or the primary interface via Unicast.
+ *
+ * protocol:        Pass in kDNSServiceProtocol_IPv4 to look up IPv4 addresses, or kDNSServiceProtocol_IPv6
+ *                  to look up IPv6 addresses, or both to look up both kinds. If neither flag is
+ *                  set, the system will apply an intelligent heuristic, which is (currently)
+ *                  that it will attempt to look up both, except:
+ *
+ *                   * If "hostname" is a wide-area unicast DNS hostname (i.e. not a ".local." name)
+ *                     but this host has no routable IPv6 address, then the call will not try to
+ *                     look up IPv6 addresses for "hostname", since any addresses it found would be
+ *                     unlikely to be of any use anyway. Similarly, if this host has no routable
+ *                     IPv4 address, the call will not try to look up IPv4 addresses for "hostname".
+ *
+ * hostname:        The fully qualified domain name of the host to be queried for.
+ *
+ * callBack:        The function to be called when the query succeeds or fails asynchronously.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceGetAddrInfo
+(
+    DNSServiceRef                    *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceProtocol protocol,
+    const char                       *hostname,
+    DNSServiceGetAddrInfoReply callBack,
+    void                             *context          /* may be NULL */
+);
+
+
+/*********************************************************************************************
+*
+*  Special Purpose Calls:
+*  DNSServiceCreateConnection(), DNSServiceRegisterRecord(), DNSServiceReconfirmRecord()
+*  (most applications will not use these)
+*
+*********************************************************************************************/
+
+/* DNSServiceCreateConnection()
+ *
+ * Create a connection to the daemon allowing efficient registration of
+ * multiple individual records.
+ *
+ * Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. Deallocating
+ *                  the reference (via DNSServiceRefDeallocate()) severs the
+ *                  connection and deregisters all records registered on this connection.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns
+ *                  an error code indicating the specific failure that occurred (in which
+ *                  case the DNSServiceRef is not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceCreateConnection(DNSServiceRef *sdRef);
+
+/* DNSServiceRegisterRecord
+ *
+ * Register an individual resource record on a connected DNSServiceRef.
+ *
+ * Note that name conflicts occurring for records registered via this call must be handled
+ * by the client in the callback.
+ *
+ * DNSServiceRegisterRecordReply() parameters:
+ *
+ * sdRef:           The connected DNSServiceRef initialized by
+ *                  DNSServiceCreateConnection().
+ *
+ * RecordRef:       The DNSRecordRef initialized by DNSServiceRegisterRecord(). If the above
+ *                  DNSServiceRef is passed to DNSServiceRefDeallocate(), this DNSRecordRef is
+ *                  invalidated, and may not be used further.
+ *
+ * flags:           Currently unused, reserved for future use.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError on success, otherwise will
+ *                  indicate the failure that occurred (including name conflicts.)
+ *                  Other parameters are undefined if errorCode is nonzero.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceRegisterRecordReply)
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,
+    DNSServiceFlags flags,
+    DNSServiceErrorType errorCode,
+    void                                *context
+);
+
+
+/* DNSServiceRegisterRecord() Parameters:
+ *
+ * sdRef:           A DNSServiceRef initialized by DNSServiceCreateConnection().
+ *
+ * RecordRef:       A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this
+ *                  call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord().
+ *                  (To deregister ALL records registered on a single connected DNSServiceRef
+ *                  and deallocate each of their corresponding DNSServiceRecordRefs, call
+ *                  DNSServiceRefDeallocate()).
+ *
+ * flags:           Possible values are kDNSServiceFlagsShared or kDNSServiceFlagsUnique
+ *                  (see flag type definitions for details).
+ *
+ * interfaceIndex:  If non-zero, specifies the interface on which to register the record
+ *                  (the index for a given interface is determined via the if_nametoindex()
+ *                  family of calls.) Passing 0 causes the record to be registered on all interfaces.
+ *                  See "Constants for specifying an interface index" for more details.
+ *
+ * fullname:        The full domain name of the resource record.
+ *
+ * rrtype:          The numerical type of the resource record (e.g. kDNSServiceType_PTR, kDNSServiceType_SRV, etc)
+ *
+ * rrclass:         The class of the resource record (usually kDNSServiceClass_IN)
+ *
+ * rdlen:           Length, in bytes, of the rdata.
+ *
+ * rdata:           A pointer to the raw rdata, as it is to appear in the DNS record.
+ *
+ * ttl:             The time to live of the resource record, in seconds.
+ *                  Most clients should pass 0 to indicate that the system should
+ *                  select a sensible default value.
+ *
+ * callBack:        The function to be called when a result is found, or if the call
+ *                  asynchronously fails (e.g. because of a name conflict.)
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred (the callback is never invoked and the DNSRecordRef is
+ *                  not initialized).
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceRegisterRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef                        *RecordRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl,
+    DNSServiceRegisterRecordReply callBack,
+    void                                *context    /* may be NULL */
+);
+
+
+/* DNSServiceReconfirmRecord
+ *
+ * Instruct the daemon to verify the validity of a resource record that appears
+ * to be out of date (e.g. because TCP connection to a service's target failed.)
+ * Causes the record to be flushed from the daemon's cache (as well as all other
+ * daemons' caches on the network) if the record is determined to be invalid.
+ * Use this routine conservatively. Reconfirming a record necessarily consumes
+ * network bandwidth, so this should not be done indiscriminately.
+ *
+ * Parameters:
+ *
+ * flags:           Not currently used.
+ *
+ * interfaceIndex:  Specifies the interface of the record in question.
+ *                  The caller must specify the interface.
+ *                  This API (by design) causes increased network traffic, so it requires
+ *                  the caller to be precise about which record should be reconfirmed.
+ *                  It is not possible to pass zero for the interface index to perform
+ *                  a "wildcard" reconfirmation, where *all* matching records are reconfirmed.
+ *
+ * fullname:        The resource record's full domain name.
+ *
+ * rrtype:          The resource record's type (e.g. kDNSServiceType_PTR, kDNSServiceType_SRV, etc)
+ *
+ * rrclass:         The class of the resource record (usually kDNSServiceClass_IN).
+ *
+ * rdlen:           The length, in bytes, of the resource record rdata.
+ *
+ * rdata:           The raw rdata of the resource record.
+ *
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceReconfirmRecord
+(
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                         *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                         *rdata
+);
+
+
+/*********************************************************************************************
+*
+*  NAT Port Mapping
+*
+*********************************************************************************************/
+
+/* DNSServiceNATPortMappingCreate
+ *
+ * Request a port mapping in the NAT gateway, which maps a port on the local machine
+ * to an external port on the NAT. The NAT should support either PCP, NAT-PMP or the
+ * UPnP/IGD protocol for this API to create a successful mapping. Note that this API
+ * currently supports IPv4 addresses/mappings only. If the NAT gateway supports PCP and
+ * returns an IPv6 address (incorrectly, since this API specifically requests IPv4
+ * addresses), the DNSServiceNATPortMappingReply callback will be invoked with errorCode
+ * kDNSServiceErr_NATPortMappingUnsupported.
+ *
+ * The port mapping will be renewed indefinitely until the client process exits, or
+ * explicitly terminates the port mapping request by calling DNSServiceRefDeallocate().
+ * The client callback will be invoked, informing the client of the NAT gateway's
+ * external IP address and the external port that has been allocated for this client.
+ * The client should then record this external IP address and port using whatever
+ * directory service mechanism it is using to enable peers to connect to it.
+ * (Clients advertising services using Wide-Area DNS-SD DO NOT need to use this API
+ * -- when a client calls DNSServiceRegister() NAT mappings are automatically created
+ * and the external IP address and port for the service are recorded in the global DNS.
+ * Only clients using some directory mechanism other than Wide-Area DNS-SD need to use
+ * this API to explicitly map their own ports.)
+ *
+ * It's possible that the client callback could be called multiple times, for example
+ * if the NAT gateway's IP address changes, or if a configuration change results in a
+ * different external port being mapped for this client. Over the lifetime of any long-lived
+ * port mapping, the client should be prepared to handle these notifications of changes
+ * in the environment, and should update its recorded address and/or port as appropriate.
+ *
+ * NOTE: There are two unusual aspects of how the DNSServiceNATPortMappingCreate API works,
+ * which were intentionally designed to help simplify client code:
+ *
+ *  1. It's not an error to request a NAT mapping when the machine is not behind a NAT gateway.
+ *     In other NAT mapping APIs, if you request a NAT mapping and the machine is not behind a NAT
+ *     gateway, then the API returns an error code -- it can't get you a NAT mapping if there's no
+ *     NAT gateway. The DNSServiceNATPortMappingCreate API takes a different view. Working out
+ *     whether or not you need a NAT mapping can be tricky and non-obvious, particularly on
+ *     a machine with multiple active network interfaces. Rather than make every client recreate
+ *     this logic for deciding whether a NAT mapping is required, the PortMapping API does that
+ *     work for you. If the client calls the PortMapping API when the machine already has a
+ *     routable public IP address, then instead of complaining about it and giving an error,
+ *     the PortMapping API just invokes your callback, giving the machine's public address
+ *     and your own port number. This means you don't need to write code to work out whether
+ *     your client needs to call the PortMapping API -- just call it anyway, and if it wasn't
+ *     necessary, no harm is done:
+ *
+ *     - If the machine already has a routable public IP address, then your callback
+ *       will just be invoked giving your own address and port.
+ *     - If a NAT mapping is required and obtained, then your callback will be invoked
+ *       giving you the external address and port.
+ *     - If a NAT mapping is required but not obtained from the local NAT gateway,
+ *       or the machine has no network connectivity, then your callback will be
+ *       invoked giving zero address and port.
+ *
+ *  2. In other NAT mapping APIs, if a laptop computer is put to sleep and woken up on a new
+ *     network, it's the client's job to notice this, and work out whether a NAT mapping
+ *     is required on the new network, and make a new NAT mapping request if necessary.
+ *     The DNSServiceNATPortMappingCreate API does this for you, automatically.
+ *     The client just needs to make one call to the PortMapping API, and its callback will
+ *     be invoked any time the mapping state changes. This property complements point (1) above.
+ *     If the client didn't make a NAT mapping request just because it determined that one was
+ *     not required at that particular moment in time, the client would then have to monitor
+ *     for network state changes to determine if a NAT port mapping later became necessary.
+ *     By unconditionally making a NAT mapping request, even when a NAT mapping not to be
+ *     necessary, the PortMapping API will then begin monitoring network state changes on behalf of
+ *     the client, and if a NAT mapping later becomes necessary, it will automatically create a NAT
+ *     mapping and inform the client with a new callback giving the new address and port information.
+ *
+ * DNSServiceNATPortMappingReply() parameters:
+ *
+ * sdRef:           The DNSServiceRef initialized by DNSServiceNATPortMappingCreate().
+ *
+ * flags:           Currently unused, reserved for future use.
+ *
+ * interfaceIndex:  The interface through which the NAT gateway is reached.
+ *
+ * errorCode:       Will be kDNSServiceErr_NoError on success.
+ *                  Will be kDNSServiceErr_DoubleNAT when the NAT gateway is itself behind one or
+ *                  more layers of NAT, in which case the other parameters have the defined values.
+ *                  For other failures, will indicate the failure that occurred, and the other
+ *                  parameters are undefined.
+ *
+ * externalAddress: Four byte IPv4 address in network byte order.
+ *
+ * protocol:        Will be kDNSServiceProtocol_UDP or kDNSServiceProtocol_TCP or both.
+ *
+ * internalPort:    The port on the local machine that was mapped.
+ *
+ * externalPort:    The actual external port in the NAT gateway that was mapped.
+ *                  This is likely to be different than the requested external port.
+ *
+ * ttl:             The lifetime of the NAT port mapping created on the gateway.
+ *                  This controls how quickly stale mappings will be garbage-collected
+ *                  if the client machine crashes, suffers a power failure, is disconnected
+ *                  from the network, or suffers some other unfortunate demise which
+ *                  causes it to vanish without explicitly removing its NAT port mapping.
+ *                  It's possible that the ttl value will differ from the requested ttl value.
+ *
+ * context:         The context pointer that was passed to the callout.
+ *
+ */
+
+typedef void (DNSSD_API *DNSServiceNATPortMappingReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceErrorType errorCode,
+    uint32_t externalAddress,                           /* four byte IPv4 address in network byte order */
+    DNSServiceProtocol protocol,
+    uint16_t internalPort,                              /* In network byte order */
+    uint16_t externalPort,                              /* In network byte order and may be different than the requested port */
+    uint32_t ttl,                                       /* may be different than the requested ttl */
+    void                             *context
+);
+
+
+/* DNSServiceNATPortMappingCreate() Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. If the call succeeds then it
+ *                  initializes the DNSServiceRef, returns kDNSServiceErr_NoError, and the nat
+ *                  port mapping will last indefinitely until the client terminates the port
+ *                  mapping request by passing this DNSServiceRef to DNSServiceRefDeallocate().
+ *
+ * flags:           Currently ignored, reserved for future use.
+ *
+ * interfaceIndex:  The interface on which to create port mappings in a NAT gateway. Passing 0 causes
+ *                  the port mapping request to be sent on the primary interface.
+ *
+ * protocol:        To request a port mapping, pass in kDNSServiceProtocol_UDP, or kDNSServiceProtocol_TCP,
+ *                  or (kDNSServiceProtocol_UDP | kDNSServiceProtocol_TCP) to map both.
+ *                  The local listening port number must also be specified in the internalPort parameter.
+ *                  To just discover the NAT gateway's external IP address, pass zero for protocol,
+ *                  internalPort, externalPort and ttl.
+ *
+ * internalPort:    The port number in network byte order on the local machine which is listening for packets.
+ *
+ * externalPort:    The requested external port in network byte order in the NAT gateway that you would
+ *                  like to map to the internal port. Pass 0 if you don't care which external port is chosen for you.
+ *
+ * ttl:             The requested renewal period of the NAT port mapping, in seconds.
+ *                  If the client machine crashes, suffers a power failure, is disconnected from
+ *                  the network, or suffers some other unfortunate demise which causes it to vanish
+ *                  unexpectedly without explicitly removing its NAT port mappings, then the NAT gateway
+ *                  will garbage-collect old stale NAT port mappings when their lifetime expires.
+ *                  Requesting a short TTL causes such orphaned mappings to be garbage-collected
+ *                  more promptly, but consumes system resources and network bandwidth with
+ *                  frequent renewal packets to keep the mapping from expiring.
+ *                  Requesting a long TTL is more efficient on the network, but in the event of the
+ *                  client vanishing, stale NAT port mappings will not be garbage-collected as quickly.
+ *                  Most clients should pass 0 to use a system-wide default value.
+ *
+ * callBack:        The function to be called when the port mapping request succeeds or fails asynchronously.
+ *
+ * context:         An application context pointer which is passed to the callback function
+ *                  (may be NULL).
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success (any subsequent, asynchronous
+ *                  errors are delivered to the callback), otherwise returns an error code indicating
+ *                  the error that occurred.
+ *
+ *                  If you don't actually want a port mapped, and are just calling the API
+ *                  because you want to find out the NAT's external IP address (e.g. for UI
+ *                  display) then pass zero for protocol, internalPort, externalPort and ttl.
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceNATPortMappingCreate
+(
+    DNSServiceRef                    *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceProtocol protocol,                        /* TCP and/or UDP          */
+    uint16_t internalPort,                              /* network byte order      */
+    uint16_t externalPort,                              /* network byte order      */
+    uint32_t ttl,                                       /* time to live in seconds */
+    DNSServiceNATPortMappingReply callBack,
+    void                             *context           /* may be NULL             */
+);
+
+
+/*********************************************************************************************
+*
+*  General Utility Functions
+*
+*********************************************************************************************/
+
+/* DNSServiceConstructFullName()
+ *
+ * Concatenate a three-part domain name (as returned by the above callbacks) into a
+ * properly-escaped full domain name. Note that callbacks in the above functions ALREADY ESCAPE
+ * strings where necessary.
+ *
+ * Parameters:
+ *
+ * fullName:        A pointer to a buffer that where the resulting full domain name is to be written.
+ *                  The buffer must be kDNSServiceMaxDomainName (1009) bytes in length to
+ *                  accommodate the longest legal domain name without buffer overrun.
+ *
+ * service:         The service name - any dots or backslashes must NOT be escaped.
+ *                  May be NULL (to construct a PTR record name, e.g.
+ *                  "_ftp._tcp.apple.com.").
+ *
+ * regtype:         The service type followed by the protocol, separated by a dot
+ *                  (e.g. "_ftp._tcp").
+ *
+ * domain:          The domain name, e.g. "apple.com.". Literal dots or backslashes,
+ *                  if any, must be escaped, e.g. "1st\. Floor.apple.com."
+ *
+ * return value:    Returns kDNSServiceErr_NoError (0) on success, kDNSServiceErr_BadParam on error.
+ *
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceConstructFullName
+(
+    char                            * const fullName,
+    const char                      * const service,      /* may be NULL */
+    const char                      * const regtype,
+    const char                      * const domain
+);
+
+
+/*********************************************************************************************
+*
+*   TXT Record Construction Functions
+*
+*********************************************************************************************/
+
+/*
+ * A typical calling sequence for TXT record construction is something like:
+ *
+ * Client allocates storage for TXTRecord data (e.g. declare buffer on the stack)
+ * TXTRecordCreate();
+ * TXTRecordSetValue();
+ * TXTRecordSetValue();
+ * TXTRecordSetValue();
+ * ...
+ * DNSServiceRegister( ... TXTRecordGetLength(), TXTRecordGetBytesPtr() ... );
+ * TXTRecordDeallocate();
+ * Explicitly deallocate storage for TXTRecord data (if not allocated on the stack)
+ */
+
+
+/* TXTRecordRef
+ *
+ * Opaque internal data type.
+ * Note: Represents a DNS-SD TXT record.
+ */
+
+typedef union _TXTRecordRef_t { char PrivateData[16]; char *ForceNaturalAlignment; } TXTRecordRef;
+
+
+/* TXTRecordCreate()
+ *
+ * Creates a new empty TXTRecordRef referencing the specified storage.
+ *
+ * If the buffer parameter is NULL, or the specified storage size is not
+ * large enough to hold a key subsequently added using TXTRecordSetValue(),
+ * then additional memory will be added as needed using malloc().
+ *
+ * On some platforms, when memory is low, malloc() may fail. In this
+ * case, TXTRecordSetValue() will return kDNSServiceErr_NoMemory, and this
+ * error condition will need to be handled as appropriate by the caller.
+ *
+ * You can avoid the need to handle this error condition if you ensure
+ * that the storage you initially provide is large enough to hold all
+ * the key/value pairs that are to be added to the record.
+ * The caller can precompute the exact length required for all of the
+ * key/value pairs to be added, or simply provide a fixed-sized buffer
+ * known in advance to be large enough.
+ * A no-value (key-only) key requires  (1 + key length) bytes.
+ * A key with empty value requires     (1 + key length + 1) bytes.
+ * A key with non-empty value requires (1 + key length + 1 + value length).
+ * For most applications, DNS-SD TXT records are generally
+ * less than 100 bytes, so in most cases a simple fixed-sized
+ * 256-byte buffer will be more than sufficient.
+ * Recommended size limits for DNS-SD TXT Records are discussed in
+ * <http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt>
+ *
+ * Note: When passing parameters to and from these TXT record APIs,
+ * the key name does not include the '=' character. The '=' character
+ * is the separator between the key and value in the on-the-wire
+ * packet format; it is not part of either the key or the value.
+ *
+ * txtRecord:       A pointer to an uninitialized TXTRecordRef.
+ *
+ * bufferLen:       The size of the storage provided in the "buffer" parameter.
+ *
+ * buffer:          Optional caller-supplied storage used to hold the TXTRecord data.
+ *                  This storage must remain valid for as long as
+ *                  the TXTRecordRef.
+ */
+
+void DNSSD_API TXTRecordCreate
+(
+    TXTRecordRef     *txtRecord,
+    uint16_t bufferLen,
+    void             *buffer
+);
+
+
+/* TXTRecordDeallocate()
+ *
+ * Releases any resources allocated in the course of preparing a TXT Record
+ * using TXTRecordCreate()/TXTRecordSetValue()/TXTRecordRemoveValue().
+ * Ownership of the buffer provided in TXTRecordCreate() returns to the client.
+ *
+ * txtRecord:           A TXTRecordRef initialized by calling TXTRecordCreate().
+ *
+ */
+
+void DNSSD_API TXTRecordDeallocate
+(
+    TXTRecordRef     *txtRecord
+);
+
+
+/* TXTRecordSetValue()
+ *
+ * Adds a key (optionally with value) to a TXTRecordRef. If the "key" already
+ * exists in the TXTRecordRef, then the current value will be replaced with
+ * the new value.
+ * Keys may exist in four states with respect to a given TXT record:
+ *  - Absent (key does not appear at all)
+ *  - Present with no value ("key" appears alone)
+ *  - Present with empty value ("key=" appears in TXT record)
+ *  - Present with non-empty value ("key=value" appears in TXT record)
+ * For more details refer to "Data Syntax for DNS-SD TXT Records" in
+ * <http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt>
+ *
+ * txtRecord:       A TXTRecordRef initialized by calling TXTRecordCreate().
+ *
+ * key:             A null-terminated string which only contains printable ASCII
+ *                  values (0x20-0x7E), excluding '=' (0x3D). Keys should be
+ *                  9 characters or fewer (not counting the terminating null).
+ *
+ * valueSize:       The size of the value.
+ *
+ * value:           Any binary value. For values that represent
+ *                  textual data, UTF-8 is STRONGLY recommended.
+ *                  For values that represent textual data, valueSize
+ *                  should NOT include the terminating null (if any)
+ *                  at the end of the string.
+ *                  If NULL, then "key" will be added with no value.
+ *                  If non-NULL but valueSize is zero, then "key=" will be
+ *                  added with empty value.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success.
+ *                  Returns kDNSServiceErr_Invalid if the "key" string contains
+ *                  illegal characters.
+ *                  Returns kDNSServiceErr_NoMemory if adding this key would
+ *                  exceed the available storage.
+ */
+
+DNSServiceErrorType DNSSD_API TXTRecordSetValue
+(
+    TXTRecordRef     *txtRecord,
+    const char       *key,
+    uint8_t valueSize,                 /* may be zero */
+    const void       *value            /* may be NULL */
+);
+
+
+/* TXTRecordRemoveValue()
+ *
+ * Removes a key from a TXTRecordRef. The "key" must be an
+ * ASCII string which exists in the TXTRecordRef.
+ *
+ * txtRecord:       A TXTRecordRef initialized by calling TXTRecordCreate().
+ *
+ * key:             A key name which exists in the TXTRecordRef.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success.
+ *                  Returns kDNSServiceErr_NoSuchKey if the "key" does not
+ *                  exist in the TXTRecordRef.
+ */
+
+DNSServiceErrorType DNSSD_API TXTRecordRemoveValue
+(
+    TXTRecordRef     *txtRecord,
+    const char       *key
+);
+
+
+/* TXTRecordGetLength()
+ *
+ * Allows you to determine the length of the raw bytes within a TXTRecordRef.
+ *
+ * txtRecord:       A TXTRecordRef initialized by calling TXTRecordCreate().
+ *
+ * return value:    Returns the size of the raw bytes inside a TXTRecordRef
+ *                  which you can pass directly to DNSServiceRegister() or
+ *                  to DNSServiceUpdateRecord().
+ *                  Returns 0 if the TXTRecordRef is empty.
+ */
+
+uint16_t DNSSD_API TXTRecordGetLength
+(
+    const TXTRecordRef *txtRecord
+);
+
+
+/* TXTRecordGetBytesPtr()
+ *
+ * Allows you to retrieve a pointer to the raw bytes within a TXTRecordRef.
+ *
+ * txtRecord:       A TXTRecordRef initialized by calling TXTRecordCreate().
+ *
+ * return value:    Returns a pointer to the raw bytes inside the TXTRecordRef
+ *                  which you can pass directly to DNSServiceRegister() or
+ *                  to DNSServiceUpdateRecord().
+ */
+
+const void * DNSSD_API TXTRecordGetBytesPtr
+(
+    const TXTRecordRef *txtRecord
+);
+
+
+/*********************************************************************************************
+*
+*   TXT Record Parsing Functions
+*
+*********************************************************************************************/
+
+/*
+ * A typical calling sequence for TXT record parsing is something like:
+ *
+ * Receive TXT record data in DNSServiceResolve() callback
+ * if (TXTRecordContainsKey(txtLen, txtRecord, "key")) then do something
+ * val1ptr = TXTRecordGetValuePtr(txtLen, txtRecord, "key1", &len1);
+ * val2ptr = TXTRecordGetValuePtr(txtLen, txtRecord, "key2", &len2);
+ * ...
+ * memcpy(myval1, val1ptr, len1);
+ * memcpy(myval2, val2ptr, len2);
+ * ...
+ * return;
+ *
+ * If you wish to retain the values after return from the DNSServiceResolve()
+ * callback, then you need to copy the data to your own storage using memcpy()
+ * or similar, as shown in the example above.
+ *
+ * If for some reason you need to parse a TXT record you built yourself
+ * using the TXT record construction functions above, then you can do
+ * that using TXTRecordGetLength and TXTRecordGetBytesPtr calls:
+ * TXTRecordGetValue(TXTRecordGetLength(x), TXTRecordGetBytesPtr(x), key, &len);
+ *
+ * Most applications only fetch keys they know about from a TXT record and
+ * ignore the rest.
+ * However, some debugging tools wish to fetch and display all keys.
+ * To do that, use the TXTRecordGetCount() and TXTRecordGetItemAtIndex() calls.
+ */
+
+/* TXTRecordContainsKey()
+ *
+ * Allows you to determine if a given TXT Record contains a specified key.
+ *
+ * txtLen:          The size of the received TXT Record.
+ *
+ * txtRecord:       Pointer to the received TXT Record bytes.
+ *
+ * key:             A null-terminated ASCII string containing the key name.
+ *
+ * return value:    Returns 1 if the TXT Record contains the specified key.
+ *                  Otherwise, it returns 0.
+ */
+
+int DNSSD_API TXTRecordContainsKey
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    const char       *key
+);
+
+
+/* TXTRecordGetValuePtr()
+ *
+ * Allows you to retrieve the value for a given key from a TXT Record.
+ *
+ * txtLen:          The size of the received TXT Record
+ *
+ * txtRecord:       Pointer to the received TXT Record bytes.
+ *
+ * key:             A null-terminated ASCII string containing the key name.
+ *
+ * valueLen:        On output, will be set to the size of the "value" data.
+ *
+ * return value:    Returns NULL if the key does not exist in this TXT record,
+ *                  or exists with no value (to differentiate between
+ *                  these two cases use TXTRecordContainsKey()).
+ *                  Returns pointer to location within TXT Record bytes
+ *                  if the key exists with empty or non-empty value.
+ *                  For empty value, valueLen will be zero.
+ *                  For non-empty value, valueLen will be length of value data.
+ */
+
+const void * DNSSD_API TXTRecordGetValuePtr
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    const char       *key,
+    uint8_t          *valueLen
+);
+
+
+/* TXTRecordGetCount()
+ *
+ * Returns the number of keys stored in the TXT Record. The count
+ * can be used with TXTRecordGetItemAtIndex() to iterate through the keys.
+ *
+ * txtLen:          The size of the received TXT Record.
+ *
+ * txtRecord:       Pointer to the received TXT Record bytes.
+ *
+ * return value:    Returns the total number of keys in the TXT Record.
+ *
+ */
+
+uint16_t DNSSD_API TXTRecordGetCount
+(
+    uint16_t txtLen,
+    const void       *txtRecord
+);
+
+
+/* TXTRecordGetItemAtIndex()
+ *
+ * Allows you to retrieve a key name and value pointer, given an index into
+ * a TXT Record. Legal index values range from zero to TXTRecordGetCount()-1.
+ * It's also possible to iterate through keys in a TXT record by simply
+ * calling TXTRecordGetItemAtIndex() repeatedly, beginning with index zero
+ * and increasing until TXTRecordGetItemAtIndex() returns kDNSServiceErr_Invalid.
+ *
+ * On return:
+ * For keys with no value, *value is set to NULL and *valueLen is zero.
+ * For keys with empty value, *value is non-NULL and *valueLen is zero.
+ * For keys with non-empty value, *value is non-NULL and *valueLen is non-zero.
+ *
+ * txtLen:          The size of the received TXT Record.
+ *
+ * txtRecord:       Pointer to the received TXT Record bytes.
+ *
+ * itemIndex:       An index into the TXT Record.
+ *
+ * keyBufLen:       The size of the string buffer being supplied.
+ *
+ * key:             A string buffer used to store the key name.
+ *                  On return, the buffer contains a null-terminated C string
+ *                  giving the key name. DNS-SD TXT keys are usually
+ *                  9 characters or fewer. To hold the maximum possible
+ *                  key name, the buffer should be 256 bytes long.
+ *
+ * valueLen:        On output, will be set to the size of the "value" data.
+ *
+ * value:           On output, *value is set to point to location within TXT
+ *                  Record bytes that holds the value data.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success.
+ *                  Returns kDNSServiceErr_NoMemory if keyBufLen is too short.
+ *                  Returns kDNSServiceErr_Invalid if index is greater than
+ *                  TXTRecordGetCount()-1.
+ */
+
+DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    uint16_t itemIndex,
+    uint16_t keyBufLen,
+    char             *key,
+    uint8_t          *valueLen,
+    const void       **value
+);
+
+#if _DNS_SD_LIBDISPATCH
+/*
+ * DNSServiceSetDispatchQueue
+ *
+ * Allows you to schedule a DNSServiceRef on a serial dispatch queue for receiving asynchronous
+ * callbacks.  It's the clients responsibility to ensure that the provided dispatch queue is running.
+ *
+ * A typical application that uses CFRunLoopRun or dispatch_main on its main thread will
+ * usually schedule DNSServiceRefs on its main queue (which is always a serial queue)
+ * using "DNSServiceSetDispatchQueue(sdref, dispatch_get_main_queue());"
+ *
+ * If there is any error during the processing of events, the application callback will
+ * be called with an error code. For shared connections, each subordinate DNSServiceRef
+ * will get its own error callback. Currently these error callbacks only happen
+ * if the mDNSResponder daemon is manually terminated or crashes, and the error
+ * code in this case is kDNSServiceErr_ServiceNotRunning. The application must call
+ * DNSServiceRefDeallocate to free the DNSServiceRef when it gets such an error code.
+ * These error callbacks are rare and should not normally happen on customer machines,
+ * but application code should be written defensively to handle such error callbacks
+ * gracefully if they occur.
+ *
+ * After using DNSServiceSetDispatchQueue on a DNSServiceRef, calling DNSServiceProcessResult
+ * on the same DNSServiceRef will result in undefined behavior and should be avoided.
+ *
+ * Once the application successfully schedules a DNSServiceRef on a serial dispatch queue using
+ * DNSServiceSetDispatchQueue, it cannot remove the DNSServiceRef from the dispatch queue, or use
+ * DNSServiceSetDispatchQueue a second time to schedule the DNSServiceRef onto a different serial dispatch
+ * queue. Once scheduled onto a dispatch queue a DNSServiceRef will deliver events to that queue until
+ * the application no longer requires that operation and terminates it using DNSServiceRefDeallocate.
+ *
+ * service:         DNSServiceRef that was allocated and returned to the application, when the
+ *                  application calls one of the DNSService API.
+ *
+ * queue:           dispatch queue where the application callback will be scheduled
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success.
+ *                  Returns kDNSServiceErr_NoMemory if it cannot create a dispatch source
+ *                  Returns kDNSServiceErr_BadParam if the service param is invalid or the
+ *                  queue param is invalid
+ */
+
+DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue
+(
+    DNSServiceRef service,
+    dispatch_queue_t queue
+);
+#endif //_DNS_SD_LIBDISPATCH
+
+#if !defined(_WIN32)
+typedef void (DNSSD_API *DNSServiceSleepKeepaliveReply)
+(
+    DNSServiceRef sdRef,
+    DNSServiceErrorType errorCode,
+    void                                *context
+);
+DNSServiceErrorType DNSSD_API DNSServiceSleepKeepalive
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    int fd,
+    unsigned int timeout,
+    DNSServiceSleepKeepaliveReply callBack,
+    void                                *context
+);
+#endif
+
+#ifdef APPLE_OSX_mDNSResponder
+/* DNSServiceCreateDelegateConnection()
+ *
+ * Create a delegate connection to the daemon allowing efficient registration of
+ * multiple individual records.
+ *
+ * Parameters:
+ *
+ * sdRef:           A pointer to an uninitialized DNSServiceRef. Deallocating
+ *                  the reference (via DNSServiceRefDeallocate()) severs the
+ *                  connection and deregisters all records registered on this connection.
+ *
+ * pid :            Process ID of the delegate
+ *
+ * uuid:            UUID of the delegate
+ *
+ *                  Note that only one of the two arguments (pid or uuid) can be specified. If pid
+ *                  is zero, uuid will be assumed to be a valid value; otherwise pid will be used.
+ *
+ * return value:    Returns kDNSServiceErr_NoError on success, otherwise returns
+ *                  an error code indicating the specific failure that occurred (in which
+ *                  case the DNSServiceRef is not initialized). kDNSServiceErr_NotAuth is
+ *                  returned to indicate that the calling process does not have entitlements
+ *                  to use this API.
+ */
+DNSServiceErrorType DNSSD_API DNSServiceCreateDelegateConnection(DNSServiceRef *sdRef, int32_t pid, uuid_t uuid);
+#endif
+
+#ifdef __APPLE_API_PRIVATE
+
+#define kDNSServiceCompPrivateDNS   "PrivateDNS"
+#define kDNSServiceCompMulticastDNS "MulticastDNS"
+
+#endif //__APPLE_API_PRIVATE
+
+/* Some C compiler cleverness. We can make the compiler check certain things for us,
+ * and report errors at compile-time if anything is wrong. The usual way to do this would
+ * be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but
+ * then you don't find out what's wrong until you run the software. This way, if the assertion
+ * condition is false, the array size is negative, and the complier complains immediately.
+ */
+
+struct CompileTimeAssertionChecks_DNS_SD
+{
+    char assert0[(sizeof(union _TXTRecordRef_t) == 16) ? 1 : -1];
+};
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  /* _DNS_SD_H */
diff --git a/mDNSResponder/mDNSShared/dnsextd.8 b/mDNSResponder/mDNSShared/dnsextd.8
new file mode 100644
index 00000000..796caaba
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd.8
@@ -0,0 +1,69 @@
+.\" -*- tab-width: 4 -*-
+.\" 
+.\" Copyright (c) 2004 Apple Computer, Inc. All Rights Reserved.
+.\" 
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\" 
+.\"     http://www.apache.org/licenses/LICENSE-2.0
+.\" 
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.Dd August 2004             \" Date
+.Dt dnsextd 8               \" Document Title
+.Os Darwin                  \" Operating System
+.\"
+.Sh NAME
+.Nm dnsextd
+.Nd BIND Extension Daemon   \" Name Description for whatis database
+.\" 
+.Sh SYNOPSIS
+.Nm
+.\"
+.Sh DESCRIPTION
+.Nm
+is a daemon invoked at boot time, running alongside BIND 9,
+to implement two EDNS0 extensions to the standard DNS protocol.
+.Pp
+.Nm
+allows clients to perform DNS Updates with an attached lease lifetime,
+so that if the client crashes or is disconnected from the network, its
+address records will be automatically deleted after the lease expires.
+.Pp
+.Nm
+allows clients to perform long-lived queries. Instead of rapidly polling
+the server to discover when information changes, long-lived queries
+enable a client to indicate its interest in some set of data, and then
+be notified asynchronously by the server whenever any of that data changes.
+.Pp
+.Nm
+has no user-specifiable command-line argument, and users should not run
+.Nm
+manually.
+.\"
+.Sh SEE ALSO
+.Xr mDNS 1
+.Xr mDNSResponder 8
+.Pp
+For information on Dynamic DNS Update, see RFC 2136
+"Dynamic Updates in the Domain Name System (DNS UPDATE)"
+.Pp
+For information on Dynamic DNS Update Leases, see
+.Pa http://files.dns-sd.org/draft-dns-update-leases.txt
+.Pp
+For information on Long-Lived Queries, see
+.Pa http://files.dns-sd.org/draft-dns-llq.txt
+.\"
+.Sh BUGS
+.Nm
+bugs are tracked in Apple Radar component "mDNSResponder".
+.\"
+.Sh HISTORY
+The
+.Nm
+daemon first appeared in Mac OS X 10.4 (Tiger).
diff --git a/mDNSResponder/mDNSShared/dnsextd.c b/mDNSResponder/mDNSShared/dnsextd.c
new file mode 100644
index 00000000..aa06650a
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd.c
@@ -0,0 +1,3150 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if __APPLE__
+// In Mac OS X 10.5 and later trying to use the daemon function gives a “‘daemon’ is deprecated”
+// error, which prevents compilation because we build with "-Werror".
+// Since this is supposed to be portable cross-platform code, we don't care that daemon is
+// deprecated on Mac OS X 10.5, so we use this preprocessor trick to eliminate the error message.
+#define daemon yes_we_know_that_daemon_is_deprecated_in_os_x_10_5_thankyou
+#endif
+
+#include <signal.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <time.h>
+#include <errno.h>
+
+#if __APPLE__
+#undef daemon
+extern int daemon(int, int);
+#endif
+
+// Solaris doesn't have daemon(), so we define it here
+#ifdef NOT_HAVE_DAEMON
+#include "../mDNSPosix/mDNSUNP.h"       // For daemon()
+#endif // NOT_HAVE_DAEMON
+
+#include "dnsextd.h"
+#include "../mDNSShared/uds_daemon.h"
+#include "../mDNSShared/dnssd_ipc.h"
+#include "../mDNSCore/uDNS.h"
+#include "../mDNSShared/DebugServices.h"
+
+// Compatibility workaround
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+
+//
+// Constants
+//
+mDNSexport const char ProgramName[] = "dnsextd";
+
+#define LOOPBACK                    "127.0.0.1"
+#if !defined(LISTENQ)
+#   define LISTENQ                  128                 // tcp connection backlog
+#endif
+#define RECV_BUFLEN                 9000
+#define LEASETABLE_INIT_NBUCKETS    256                 // initial hashtable size (doubles as table fills)
+#define EXPIRATION_INTERVAL         300                 // check for expired records every 5 minutes
+#define SRV_TTL                     7200                // TTL For _dns-update SRV records
+#define CONFIG_FILE                 "/etc/dnsextd.conf"
+#define TCP_SOCKET_FLAGS            kTCPSocketFlags_UseTLS
+
+// LLQ Lease bounds (seconds)
+#define LLQ_MIN_LEASE (15 * 60)
+#define LLQ_MAX_LEASE (120 * 60)
+#define LLQ_LEASE_FUDGE 60
+
+// LLQ SOA poll interval (microseconds)
+#define LLQ_MONITOR_ERR_INTERVAL (60 * 1000000)
+#define LLQ_MONITOR_INTERVAL 250000
+#ifdef SIGINFO
+#define INFO_SIGNAL SIGINFO
+#else
+#define INFO_SIGNAL SIGUSR1
+#endif
+
+#define SAME_INADDR(x,y) (*((mDNSu32 *)&x) == *((mDNSu32 *)&y))
+
+//
+// Data Structures
+// Structs/fields that must be locked for thread safety are explicitly commented
+//
+
+// args passed to UDP request handler thread as void*
+
+typedef struct
+{
+    PktMsg pkt;
+    struct sockaddr_in cliaddr;
+    DaemonInfo *d;
+    int sd;
+} UDPContext;
+
+// args passed to TCP request handler thread as void*
+typedef struct
+{
+    PktMsg pkt;
+    struct sockaddr_in cliaddr;
+    TCPSocket *sock;           // socket connected to client
+    DaemonInfo *d;
+} TCPContext;
+
+// args passed to UpdateAnswerList thread as void*
+typedef struct
+{
+    DaemonInfo *d;
+    AnswerListElem *a;
+} UpdateAnswerListArgs;
+
+//
+// Global Variables
+//
+
+// booleans to determine runtime output
+// read-only after initialization (no mutex protection)
+static mDNSBool foreground = 0;
+static mDNSBool verbose = 0;
+
+// globals set via signal handler (accessed exclusively by main select loop and signal handler)
+static mDNSBool terminate = 0;
+static mDNSBool dumptable = 0;
+static mDNSBool hangup    = 0;
+
+// global for config file location
+static char *   cfgfile   = NULL;
+
+//
+// Logging Routines
+// Log messages are delivered to syslog unless -f option specified
+//
+
+// common message logging subroutine
+mDNSlocal void PrintLog(const char *buffer)
+{
+    if (foreground)
+    {
+        fprintf(stderr,"%s\n", buffer);
+        fflush(stderr);
+    }
+    else
+    {
+        openlog("dnsextd", LOG_CONS, LOG_DAEMON);
+        syslog(LOG_ERR, "%s", buffer);
+        closelog();
+    }
+}
+
+// Verbose Logging (conditional on -v option)
+mDNSlocal void VLog(const char *format, ...)
+{
+    char buffer[512];
+    va_list ptr;
+
+    if (!verbose) return;
+    va_start(ptr,format);
+    buffer[mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr)] = 0;
+    va_end(ptr);
+    PrintLog(buffer);
+}
+
+// Unconditional Logging
+mDNSlocal void Log(const char *format, ...)
+{
+    char buffer[512];
+    va_list ptr;
+
+    va_start(ptr,format);
+    buffer[mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr)] = 0;
+    va_end(ptr);
+    PrintLog(buffer);
+}
+
+// Error Logging
+// prints message "dnsextd <function>: <operation> - <error message>"
+// must be compiled w/ -D_REENTRANT for thread-safe errno usage
+mDNSlocal void LogErr(const char *fn, const char *operation)
+{
+    char buf[512], errbuf[256];
+    strerror_r(errno, errbuf, sizeof(errbuf));
+    snprintf(buf, sizeof(buf), "%s: %s - %s", fn, operation, errbuf);
+    PrintLog(buf);
+}
+
+//
+// Networking Utility Routines
+//
+
+// Convert DNS Message Header from Network to Host byte order
+mDNSlocal void HdrNToH(PktMsg *pkt)
+{
+    // Read the integer parts which are in IETF byte-order (MSB first, LSB second)
+    mDNSu8 *ptr = (mDNSu8 *)&pkt->msg.h.numQuestions;
+    pkt->msg.h.numQuestions   = (mDNSu16)((mDNSu16)ptr[0] <<  8 | ptr[1]);
+    pkt->msg.h.numAnswers     = (mDNSu16)((mDNSu16)ptr[2] <<  8 | ptr[3]);
+    pkt->msg.h.numAuthorities = (mDNSu16)((mDNSu16)ptr[4] <<  8 | ptr[5]);
+    pkt->msg.h.numAdditionals = (mDNSu16)((mDNSu16)ptr[6] <<  8 | ptr[7]);
+}
+
+// Convert DNS Message Header from Host to Network byte order
+mDNSlocal void HdrHToN(PktMsg *pkt)
+{
+    mDNSu16 numQuestions   = pkt->msg.h.numQuestions;
+    mDNSu16 numAnswers     = pkt->msg.h.numAnswers;
+    mDNSu16 numAuthorities = pkt->msg.h.numAuthorities;
+    mDNSu16 numAdditionals = pkt->msg.h.numAdditionals;
+    mDNSu8 *ptr = (mDNSu8 *)&pkt->msg.h.numQuestions;
+
+    // Put all the integer values in IETF byte-order (MSB first, LSB second)
+    *ptr++ = (mDNSu8)(numQuestions   >> 8);
+    *ptr++ = (mDNSu8)(numQuestions   &  0xFF);
+    *ptr++ = (mDNSu8)(numAnswers     >> 8);
+    *ptr++ = (mDNSu8)(numAnswers     &  0xFF);
+    *ptr++ = (mDNSu8)(numAuthorities >> 8);
+    *ptr++ = (mDNSu8)(numAuthorities &  0xFF);
+    *ptr++ = (mDNSu8)(numAdditionals >> 8);
+    *ptr++ = (mDNSu8)(numAdditionals &  0xFF);
+}
+
+
+// Add socket to event loop
+
+mDNSlocal mStatus AddSourceToEventLoop( DaemonInfo * self, TCPSocket *sock, EventCallback callback, void *context )
+{
+    EventSource * newSource;
+    mStatus err = mStatus_NoError;
+
+    if ( self->eventSources.LinkOffset == 0 )
+    {
+        InitLinkedList( &self->eventSources, offsetof( EventSource, next));
+    }
+
+    newSource = ( EventSource*) malloc( sizeof *newSource );
+    if ( newSource == NULL )
+    {
+        err = mStatus_NoMemoryErr;
+        goto exit;
+    }
+
+    newSource->callback = callback;
+    newSource->context = context;
+    newSource->sock = sock;
+    newSource->fd = mDNSPlatformTCPGetFD( sock );
+
+    AddToTail( &self->eventSources, newSource );
+
+exit:
+
+    return err;
+}
+
+
+// Remove socket from event loop
+
+mDNSlocal mStatus RemoveSourceFromEventLoop( DaemonInfo * self, TCPSocket *sock )
+{
+    EventSource *   source;
+    mStatus err;
+
+    for ( source = ( EventSource* ) self->eventSources.Head; source; source = source->next )
+    {
+        if ( source->sock == sock )
+        {
+            RemoveFromList( &self->eventSources, source );
+
+            free( source );
+            err = mStatus_NoError;
+            goto exit;
+        }
+    }
+
+    err = mStatus_NoSuchNameErr;
+
+exit:
+
+    return err;
+}
+
+// create a socket connected to nameserver
+// caller terminates connection via close()
+mDNSlocal TCPSocket *ConnectToServer(DaemonInfo *d)
+{
+    int ntries = 0, retry = 0;
+
+    while (1)
+    {
+        mDNSIPPort port = zeroIPPort;
+        int fd;
+
+        TCPSocket *sock = mDNSPlatformTCPSocket( NULL, 0, &port, mDNSfalse );
+        if ( !sock ) { LogErr("ConnectToServer", "socket");  return NULL; }
+        fd = mDNSPlatformTCPGetFD( sock );
+        if (!connect( fd, (struct sockaddr *)&d->ns_addr, sizeof(d->ns_addr))) return sock;
+        mDNSPlatformTCPCloseConnection( sock );
+        if (++ntries < 10)
+        {
+            LogErr("ConnectToServer", "connect");
+            Log("ConnectToServer - retrying connection");
+            if (!retry) retry = 500000 + random() % 500000;
+            usleep(retry);
+            retry *= 2;
+        }
+        else { Log("ConnectToServer - %d failed attempts.  Aborting.", ntries); return NULL; }
+    }
+}
+
+// send an entire block of data over a connected socket
+mDNSlocal int MySend(TCPSocket *sock, const void *msg, int len)
+{
+    int selectval, n, nsent = 0;
+    fd_set wset;
+    struct timeval timeout = { 3, 0 };  // until we remove all calls from main thread, keep timeout short
+
+    while (nsent < len)
+    {
+        int fd;
+
+        FD_ZERO(&wset);
+
+        fd = mDNSPlatformTCPGetFD( sock );
+
+        FD_SET( fd, &wset );
+        selectval = select( fd+1, NULL, &wset, NULL, &timeout);
+        if (selectval < 0) { LogErr("MySend", "select");  return -1; }
+        if (!selectval || !FD_ISSET(fd, &wset)) { Log("MySend - timeout"); return -1; }
+
+        n = mDNSPlatformWriteTCP( sock, ( char* ) msg + nsent, len - nsent);
+
+        if (n < 0) { LogErr("MySend", "send");  return -1; }
+        nsent += n;
+    }
+    return 0;
+}
+
+// Transmit a DNS message, prefixed by its length, over TCP, blocking if necessary
+mDNSlocal int SendPacket(TCPSocket *sock, PktMsg *pkt)
+{
+    // send the lenth, in network byte order
+    mDNSu16 len = htons((mDNSu16)pkt->len);
+    if (MySend(sock, &len, sizeof(len)) < 0) return -1;
+
+    // send the message
+    VLog("SendPacket Q:%d A:%d A:%d A:%d ",
+         ntohs(pkt->msg.h.numQuestions),
+         ntohs(pkt->msg.h.numAnswers),
+         ntohs(pkt->msg.h.numAuthorities),
+         ntohs(pkt->msg.h.numAdditionals));
+    return MySend(sock, &pkt->msg, pkt->len);
+}
+
+// Receive len bytes, waiting until we have all of them.
+// Returns number of bytes read (which should always be the number asked for).
+static int my_recv(TCPSocket *sock, void *const buf, const int len, mDNSBool * closed)
+{
+    // Don't use "MSG_WAITALL"; it returns "Invalid argument" on some Linux versions;
+    // use an explicit while() loop instead.
+    // Also, don't try to do '+=' arithmetic on the original "void *" pointer --
+    // arithmetic on "void *" pointers is compiler-dependent.
+
+    fd_set rset;
+    struct timeval timeout = { 3, 0 };  // until we remove all calls from main thread, keep timeout short
+    int selectval, remaining = len;
+    char *ptr = (char *)buf;
+    ssize_t num_read;
+
+    while (remaining)
+    {
+        int fd;
+
+        fd = mDNSPlatformTCPGetFD( sock );
+
+        FD_ZERO(&rset);
+        FD_SET(fd, &rset);
+        selectval = select(fd+1, &rset, NULL, NULL, &timeout);
+        if (selectval < 0) { LogErr("my_recv", "select");  return -1; }
+        if (!selectval || !FD_ISSET(fd, &rset))
+        {
+            Log("my_recv - timeout");
+            return -1;
+        }
+
+        num_read = mDNSPlatformReadTCP( sock, ptr, remaining, closed );
+
+        if (((num_read == 0) && *closed) || (num_read < 0) || (num_read > remaining)) return -1;
+        if (num_read == 0) return 0;
+        ptr       += num_read;
+        remaining -= num_read;
+    }
+    return(len);
+}
+
+// Return a DNS Message read off of a TCP socket, or NULL on failure
+// If storage is non-null, result is placed in that buffer.  Otherwise,
+// returned value is allocated with Malloc, and contains sufficient extra
+// storage for a Lease OPT RR
+
+mDNSlocal PktMsg*
+RecvPacket
+(
+    TCPSocket * sock,
+    PktMsg      *   storage,
+    mDNSBool    *   closed
+)
+{
+    int nread;
+    int allocsize;
+    mDNSu16 msglen = 0;
+    PktMsg      *   pkt = NULL;
+    unsigned int srclen;
+    int fd;
+    mStatus err = 0;
+
+    fd = mDNSPlatformTCPGetFD( sock );
+
+    nread = my_recv( sock, &msglen, sizeof( msglen ), closed );
+
+    require_action_quiet( nread != -1, exit, err = mStatus_UnknownErr );
+    require_action_quiet( nread > 0, exit, err = mStatus_NoError );
+
+    msglen = ntohs( msglen );
+    require_action_quiet( nread == sizeof( msglen ), exit, err = mStatus_UnknownErr; Log( "Could not read length field of message") );
+
+    if ( storage )
+    {
+        require_action_quiet( msglen <= sizeof( storage->msg ), exit, err = mStatus_UnknownErr; Log( "RecvPacket: provided buffer too small." ) );
+        pkt = storage;
+    }
+    else
+    {
+        // buffer extra space to add an OPT RR
+
+        if ( msglen > sizeof(DNSMessage))
+        {
+            allocsize = sizeof(PktMsg) - sizeof(DNSMessage) + msglen;
+        }
+        else
+        {
+            allocsize = sizeof(PktMsg);
+        }
+
+        pkt = malloc(allocsize);
+        require_action_quiet( pkt, exit, err = mStatus_NoMemoryErr; LogErr( "RecvPacket", "malloc" ) );
+        mDNSPlatformMemZero( pkt, sizeof( *pkt ) );
+    }
+
+    pkt->len = msglen;
+    srclen = sizeof(pkt->src);
+
+    if ( getpeername( fd, ( struct sockaddr* ) &pkt->src, &srclen ) || ( srclen != sizeof( pkt->src ) ) )
+    {
+        LogErr("RecvPacket", "getpeername");
+        mDNSPlatformMemZero(&pkt->src, sizeof(pkt->src));
+    }
+
+    nread = my_recv(sock, &pkt->msg, msglen, closed );
+    require_action_quiet( nread >= 0, exit, err = mStatus_UnknownErr ; LogErr( "RecvPacket", "recv" ) );
+    require_action_quiet( nread == msglen, exit, err = mStatus_UnknownErr ; Log( "Could not read entire message" ) );
+    require_action_quiet( pkt->len >= sizeof( DNSMessageHeader ), exit, err = mStatus_UnknownErr ; Log( "RecvPacket: Message too short (%d bytes)", pkt->len ) );
+
+exit:
+
+    if ( err && pkt )
+    {
+        if ( pkt != storage )
+        {
+            free(pkt);
+        }
+
+        pkt = NULL;
+    }
+
+    return pkt;
+}
+
+
+mDNSlocal DNSZone*
+FindZone
+(
+    DaemonInfo  *   self,
+    domainname  *   name
+)
+{
+    DNSZone * zone;
+
+    for ( zone = self->zones; zone; zone = zone->next )
+    {
+        if ( SameDomainName( &zone->name, name ) )
+        {
+            break;
+        }
+    }
+
+    return zone;
+}
+
+
+mDNSlocal mDNSBool
+ZoneHandlesName
+(
+    const domainname * zname,
+    const domainname * dname
+)
+{
+    mDNSu16 i = DomainNameLength( zname );
+    mDNSu16 j = DomainNameLength( dname );
+
+    if ( ( i == ( MAX_DOMAIN_NAME + 1 ) ) || ( j == ( MAX_DOMAIN_NAME + 1 ) ) || ( i > j )  || ( memcmp( zname->c, dname->c + ( j - i ), i ) != 0 ) )
+    {
+        return mDNSfalse;
+    }
+
+    return mDNStrue;
+}
+
+
+mDNSlocal mDNSBool IsQuery( PktMsg * pkt )
+{
+    return ( pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask ) == (mDNSu8) ( kDNSFlag0_QR_Query | kDNSFlag0_OP_StdQuery );
+}
+
+
+mDNSlocal mDNSBool IsUpdate( PktMsg * pkt )
+{
+    return ( pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask ) == (mDNSu8) ( kDNSFlag0_OP_Update );
+}
+
+
+mDNSlocal mDNSBool IsNotify(PktMsg *pkt)
+{
+    return ( pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask ) == ( mDNSu8) ( kDNSFlag0_OP_Notify );
+}
+
+
+mDNSlocal mDNSBool IsLLQRequest(PktMsg *pkt)
+{
+    const mDNSu8 *ptr = NULL, *end = (mDNSu8 *)&pkt->msg + pkt->len;
+    LargeCacheRecord lcr;
+    int i;
+    mDNSBool result = mDNSfalse;
+
+    HdrNToH(pkt);
+    if ((mDNSu8)(pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) != (mDNSu8)(kDNSFlag0_QR_Query | kDNSFlag0_OP_StdQuery)) goto end;
+
+    if (!pkt->msg.h.numAdditionals) goto end;
+    ptr = LocateAdditionals(&pkt->msg, end);
+    if (!ptr) goto end;
+
+    // find last Additional info.
+    for (i = 0; i < pkt->msg.h.numAdditionals; i++)
+    {
+        ptr = GetLargeResourceRecord(NULL, &pkt->msg, ptr, end, 0, kDNSRecordTypePacketAdd, &lcr);
+        if (!ptr) { Log("Unable to read additional record"); goto end; }
+    }
+
+    if ( lcr.r.resrec.rrtype == kDNSType_OPT && lcr.r.resrec.rdlength >= DNSOpt_LLQData_Space && lcr.r.resrec.rdata->u.opt[0].opt == kDNSOpt_LLQ )
+    {
+        result = mDNStrue;
+    }
+
+end:
+    HdrHToN(pkt);
+    return result;
+}
+
+// !!!KRS implement properly
+mDNSlocal mDNSBool IsLLQAck(PktMsg *pkt)
+{
+    if ((pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask ) == (mDNSu8) ( kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery ) &&
+        pkt->msg.h.numQuestions && !pkt->msg.h.numAnswers && !pkt->msg.h.numAuthorities) return mDNStrue;
+    return mDNSfalse;
+}
+
+
+mDNSlocal mDNSBool
+IsPublicSRV
+(
+    DaemonInfo  *   self,
+    DNSQuestion *   q
+)
+{
+    DNameListElem   *   elem;
+    mDNSBool ret     = mDNSfalse;
+    int i       = ( int ) DomainNameLength( &q->qname ) - 1;
+
+    for ( elem = self->public_names; elem; elem = elem->next )
+    {
+        int j = ( int ) DomainNameLength( &elem->name ) - 1;
+
+        if ( i > j )
+        {
+            for ( ; i >= 0; i--, j-- )
+            {
+                if ( q->qname.c[ i ] != elem->name.c[ j ] )
+                {
+                    ret = mDNStrue;
+                    goto exit;
+                }
+            }
+        }
+    }
+
+exit:
+
+    return ret;
+}
+
+
+mDNSlocal void
+SetZone
+(
+    DaemonInfo  * self,
+    PktMsg      * pkt
+)
+{
+    domainname zname;
+    mDNSu8 QR_OP;
+    const mDNSu8    *   ptr = pkt->msg.data;
+    mDNSBool exception = mDNSfalse;
+
+    // Initialize
+
+    pkt->zone           = NULL;
+    pkt->isZonePublic   = mDNStrue;
+    zname.c[0]          = '\0';
+
+    // Figure out what type of packet this is
+
+    QR_OP = ( mDNSu8 ) ( pkt->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask );
+
+    if ( IsQuery( pkt ) )
+    {
+        DNSQuestion question;
+
+        // It's a query
+
+        ptr = getQuestion( &pkt->msg, ptr, ( ( mDNSu8* ) &pkt->msg ) + pkt->len, NULL, &question );
+
+        AppendDomainName( &zname, &question.qname );
+
+        exception = ( ( question.qtype == kDNSType_SOA ) || ( question.qtype == kDNSType_NS ) || ( ( question.qtype == kDNSType_SRV ) && IsPublicSRV( self, &question ) ) );
+    }
+    else if ( IsUpdate( pkt ) )
+    {
+        DNSQuestion question;
+
+        // It's an update.  The format of the zone section is the same as the format for the question section
+        // according to RFC 2136, so we'll just treat this as a question so we can get at the zone.
+
+        ptr = getQuestion( &pkt->msg, ptr, ( ( mDNSu8* ) &pkt->msg ) + pkt->len, NULL, &question );
+
+        AppendDomainName( &zname, &question.qname );
+
+        exception = mDNSfalse;
+    }
+
+    if ( zname.c[0] != '\0' )
+    {
+        // Find the right zone
+
+        for ( pkt->zone = self->zones; pkt->zone; pkt->zone = pkt->zone->next )
+        {
+            if ( ZoneHandlesName( &pkt->zone->name, &zname ) )
+            {
+                VLog( "found correct zone %##s for query", pkt->zone->name.c );
+
+                pkt->isZonePublic = ( ( pkt->zone->type == kDNSZonePublic ) || exception );
+
+                VLog( "zone %##s is %s", pkt->zone->name.c, ( pkt->isZonePublic ) ? "public" : "private" );
+
+                break;
+            }
+        }
+    }
+}
+
+
+mDNSlocal int
+UDPServerTransaction(const DaemonInfo *d, const PktMsg *request, PktMsg *reply, mDNSBool *trunc)
+{
+    fd_set rset;
+    struct timeval timeout = { 3, 0 };   // until we remove all calls from main thread, keep timeout short
+    int sd;
+    int res;
+    mStatus err = mStatus_NoError;
+
+    // Initialize
+
+    *trunc = mDNSfalse;
+
+    // Create a socket
+
+    sd = socket( AF_INET, SOCK_DGRAM, 0 );
+    require_action( sd >= 0, exit, err = mStatus_UnknownErr; LogErr( "UDPServerTransaction", "socket" ) );
+
+    // Send the packet to the nameserver
+
+    VLog("UDPServerTransaction Q:%d A:%d A:%d A:%d ",
+         ntohs(request->msg.h.numQuestions),
+         ntohs(request->msg.h.numAnswers),
+         ntohs(request->msg.h.numAuthorities),
+         ntohs(request->msg.h.numAdditionals));
+    res = sendto( sd, (char *)&request->msg, request->len, 0, ( struct sockaddr* ) &d->ns_addr, sizeof( d->ns_addr ) );
+    require_action( res == (int) request->len, exit, err = mStatus_UnknownErr; LogErr( "UDPServerTransaction", "sendto" ) );
+
+    // Wait for reply
+
+    FD_ZERO( &rset );
+    FD_SET( sd, &rset );
+    res = select( sd + 1, &rset, NULL, NULL, &timeout );
+    require_action( res >= 0, exit, err = mStatus_UnknownErr; LogErr( "UDPServerTransaction", "select" ) );
+    require_action( ( res > 0 ) && FD_ISSET( sd, &rset ), exit, err = mStatus_UnknownErr; Log( "UDPServerTransaction - timeout" ) );
+
+    // Receive reply
+
+    reply->len = recvfrom( sd, &reply->msg, sizeof(reply->msg), 0, NULL, NULL );
+    require_action( ( ( int ) reply->len ) >= 0, exit, err = mStatus_UnknownErr; LogErr( "UDPServerTransaction", "recvfrom" ) );
+    require_action( reply->len >= sizeof( DNSMessageHeader ), exit, err = mStatus_UnknownErr; Log( "UDPServerTransaction - Message too short (%d bytes)", reply->len ) );
+
+    // Check for truncation bit
+
+    if ( reply->msg.h.flags.b[0] & kDNSFlag0_TC )
+    {
+        *trunc = mDNStrue;
+    }
+
+exit:
+
+    if ( sd >= 0 )
+    {
+        close( sd );
+    }
+
+    return err;
+}
+
+//
+// Dynamic Update Utility Routines
+//
+
+// check if a request and server response complete a successful dynamic update
+mDNSlocal mDNSBool SuccessfulUpdateTransaction(PktMsg *request, PktMsg *reply)
+{
+    char buf[32];
+    char *vlogmsg = NULL;
+
+    // check messages
+    if (!request || !reply) { vlogmsg = "NULL message"; goto failure; }
+    if (request->len < sizeof(DNSMessageHeader) || reply->len < sizeof(DNSMessageHeader)) { vlogmsg = "Malformatted message"; goto failure; }
+
+    // check request operation
+    if ((request->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) != (request->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask))
+    { vlogmsg = "Request opcode not an update"; goto failure; }
+
+    // check result
+    if ((reply->msg.h.flags.b[1] & kDNSFlag1_RC_Mask)) { vlogmsg = "Reply contains non-zero rcode";  goto failure; }
+    if ((reply->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) != (kDNSFlag0_OP_Update | kDNSFlag0_QR_Response))
+    { vlogmsg = "Reply opcode not an update response"; goto failure; }
+
+    VLog("Successful update from %s", inet_ntop(AF_INET, &request->src.sin_addr, buf, 32));
+    return mDNStrue;
+
+failure:
+    VLog("Request %s: %s", inet_ntop(AF_INET, &request->src.sin_addr, buf, 32), vlogmsg);
+    return mDNSfalse;
+}
+
+// Allocate an appropriately sized CacheRecord and copy data from original.
+// Name pointer in CacheRecord object is set to point to the name specified
+//
+mDNSlocal CacheRecord *CopyCacheRecord(const CacheRecord *orig, domainname *name)
+{
+    CacheRecord *cr;
+    size_t size = sizeof(*cr);
+    if (orig->resrec.rdlength > InlineCacheRDSize) size += orig->resrec.rdlength - InlineCacheRDSize;
+    cr = malloc(size);
+    if (!cr) { LogErr("CopyCacheRecord", "malloc"); return NULL; }
+    memcpy(cr, orig, size);
+    cr->resrec.rdata = (RData*)&cr->smallrdatastorage;
+    cr->resrec.name = name;
+
+    return cr;
+}
+
+
+//
+// Lease Hashtable Utility Routines
+//
+
+// double hash table size
+// caller must lock table prior to invocation
+mDNSlocal void RehashTable(DaemonInfo *d)
+{
+    RRTableElem *ptr, *tmp, **new;
+    int i, bucket, newnbuckets = d->nbuckets * 2;
+
+    VLog("Rehashing lease table (new size %d buckets)", newnbuckets);
+    new = malloc(sizeof(RRTableElem *) * newnbuckets);
+    if (!new) { LogErr("RehashTable", "malloc");  return; }
+    mDNSPlatformMemZero(new, newnbuckets * sizeof(RRTableElem *));
+
+    for (i = 0; i < d->nbuckets; i++)
+    {
+        ptr = d->table[i];
+        while (ptr)
+        {
+            bucket = ptr->rr.resrec.namehash % newnbuckets;
+            tmp = ptr;
+            ptr = ptr->next;
+            tmp->next = new[bucket];
+            new[bucket] = tmp;
+        }
+    }
+    d->nbuckets = newnbuckets;
+    free(d->table);
+    d->table = new;
+}
+
+// print entire contents of hashtable, invoked via SIGINFO
+mDNSlocal void PrintLeaseTable(DaemonInfo *d)
+{
+    int i;
+    RRTableElem *ptr;
+    char rrbuf[MaxMsg], addrbuf[16];
+    struct timeval now;
+    int hr, min, sec;
+
+    if (gettimeofday(&now, NULL)) { LogErr("PrintTable", "gettimeofday"); return; }
+    if (pthread_mutex_lock(&d->tablelock)) { LogErr("PrintTable", "pthread_mutex_lock"); return; }
+
+    Log("Dumping Lease Table Contents (table contains %d resource records)", d->nelems);
+    for (i = 0; i < d->nbuckets; i++)
+    {
+        for (ptr = d->table[i]; ptr; ptr = ptr->next)
+        {
+            hr = ((ptr->expire - now.tv_sec) / 60) / 60;
+            min = ((ptr->expire - now.tv_sec) / 60) % 60;
+            sec = (ptr->expire - now.tv_sec) % 60;
+            Log("Update from %s, Expires in %d:%d:%d\n\t%s", inet_ntop(AF_INET, &ptr->cli.sin_addr, addrbuf, 16), hr, min, sec,
+                GetRRDisplayString_rdb(&ptr->rr.resrec, &ptr->rr.resrec.rdata->u, rrbuf));
+        }
+    }
+    pthread_mutex_unlock(&d->tablelock);
+}
+
+//
+// Startup SRV Registration Routines
+// Register _dns-update._udp/_tcp.<zone> SRV records indicating the port on which
+// the daemon accepts requests
+//
+
+// delete all RRS of a given name/type
+mDNSlocal mDNSu8 *putRRSetDeletion(DNSMessage *msg, mDNSu8 *ptr, mDNSu8 *limit,  ResourceRecord *rr)
+{
+    ptr = putDomainNameAsLabels(msg, ptr, limit, rr->name);
+    if (!ptr || ptr + 10 >= limit) return NULL;  // out of space
+    ptr[0] = (mDNSu8)(rr->rrtype  >> 8);
+    ptr[1] = (mDNSu8)(rr->rrtype  &  0xFF);
+    ptr[2] = (mDNSu8)((mDNSu16)kDNSQClass_ANY >> 8);
+    ptr[3] = (mDNSu8)((mDNSu16)kDNSQClass_ANY &  0xFF);
+    mDNSPlatformMemZero(ptr+4, sizeof(rr->rroriginalttl) + sizeof(rr->rdlength)); // zero ttl/rdata
+    msg->h.mDNS_numUpdates++;
+    return ptr + 10;
+}
+
+mDNSlocal mDNSu8 *PutUpdateSRV(DaemonInfo *d, DNSZone * zone, PktMsg *pkt, mDNSu8 *ptr, char *regtype, mDNSIPPort port, mDNSBool registration)
+{
+    AuthRecord rr;
+    char hostname[1024], buf[MaxMsg];
+    mDNSu8 *end = (mDNSu8 *)&pkt->msg + sizeof(DNSMessage);
+
+    ( void ) d;
+
+    mDNS_SetupResourceRecord(&rr, NULL, 0, kDNSType_SRV, SRV_TTL, kDNSRecordTypeUnique, AuthRecordAny, NULL, NULL);
+    rr.resrec.rrclass = kDNSClass_IN;
+    rr.resrec.rdata->u.srv.priority = 0;
+    rr.resrec.rdata->u.srv.weight   = 0;
+    rr.resrec.rdata->u.srv.port     = port;
+    if (gethostname(hostname, 1024) < 0 || !MakeDomainNameFromDNSNameString(&rr.resrec.rdata->u.srv.target, hostname))
+        rr.resrec.rdata->u.srv.target.c[0] = '\0';
+
+    MakeDomainNameFromDNSNameString(&rr.namestorage, regtype);
+    AppendDomainName(&rr.namestorage, &zone->name);
+    VLog("%s  %s", registration ? "Registering SRV record" : "Deleting existing RRSet",
+         GetRRDisplayString_rdb(&rr.resrec, &rr.resrec.rdata->u, buf));
+    if (registration) ptr = PutResourceRecord(&pkt->msg, ptr, &pkt->msg.h.mDNS_numUpdates, &rr.resrec);
+    else ptr = putRRSetDeletion(&pkt->msg, ptr, end, &rr.resrec);
+    return ptr;
+}
+
+
+// perform dynamic update.
+// specify deletion by passing false for the register parameter, otherwise register the records.
+mDNSlocal int UpdateSRV(DaemonInfo *d, mDNSBool registration)
+{
+    TCPSocket *sock = NULL;
+    DNSZone * zone;
+    int err = mStatus_NoError;
+
+    sock = ConnectToServer( d );
+    require_action( sock, exit, err = mStatus_UnknownErr; Log( "UpdateSRV: ConnectToServer failed" ) );
+
+    for ( zone = d->zones; zone; zone = zone->next )
+    {
+        PktMsg pkt;
+        mDNSu8 *ptr = pkt.msg.data;
+        mDNSu8 *end = (mDNSu8 *)&pkt.msg + sizeof(DNSMessage);
+        PktMsg *reply = NULL;
+        mDNSBool closed;
+        mDNSBool ok;
+
+        // Initialize message
+        InitializeDNSMessage(&pkt.msg.h, zeroID, UpdateReqFlags);
+        pkt.src.sin_addr.s_addr = zerov4Addr.NotAnInteger; // address field set solely for verbose logging in subroutines
+        pkt.src.sin_family = AF_INET;
+
+        // format message body
+        ptr = putZone(&pkt.msg, ptr, end, &zone->name, mDNSOpaque16fromIntVal(kDNSClass_IN));
+        require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+
+        if ( zone->type == kDNSZonePrivate )
+        {
+            ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-update-tls._tcp.", d->private_port, registration);
+            require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+            ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-query-tls._tcp.", d->private_port, registration);
+            require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+            ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-llq-tls._tcp.", d->private_port, registration);
+            require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+
+            if ( !registration )
+            {
+                ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-update._udp.", d->llq_port, registration);
+                require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+                ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-llq._udp.", d->llq_port, registration);
+                require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+            }
+        }
+        else
+        {
+            if ( !registration )
+            {
+                ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-update-tls.", d->private_port, registration);
+                require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+                ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-query-tls.", d->private_port, registration);
+                require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+                ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-llq-tls.", d->private_port, registration);
+                require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+            }
+
+            ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-update._udp.", d->llq_port, registration);
+            require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+            ptr = PutUpdateSRV(d, zone, &pkt, ptr, "_dns-llq._udp.", d->llq_port, registration);
+            require_action( ptr, exit, err = mStatus_UnknownErr; Log("UpdateSRV: Error constructing lease expiration update" ) );
+        }
+
+        HdrHToN(&pkt);
+
+        if ( zone->updateKeys )
+        {
+            DNSDigest_SignMessage( &pkt.msg, &ptr, zone->updateKeys, 0 );
+            require_action( ptr, exit, Log("UpdateSRV: Error constructing lease expiration update" ) );
+        }
+
+        pkt.len = ptr - (mDNSu8 *)&pkt.msg;
+
+        // send message, receive reply
+
+        err = SendPacket( sock, &pkt );
+        require_action( !err, exit, Log( "UpdateSRV: SendPacket failed" ) );
+
+        reply = RecvPacket( sock, NULL, &closed );
+        require_action( reply, exit, err = mStatus_UnknownErr; Log( "UpdateSRV: RecvPacket returned NULL" ) );
+
+        ok = SuccessfulUpdateTransaction( &pkt, reply );
+
+        if ( !ok )
+        {
+            Log("SRV record registration failed with rcode %d", reply->msg.h.flags.b[1] & kDNSFlag1_RC_Mask);
+        }
+
+        free( reply );
+    }
+
+exit:
+
+    if ( sock )
+    {
+        mDNSPlatformTCPCloseConnection( sock );
+    }
+
+    return err;
+}
+
+// wrapper routines/macros
+#define ClearUpdateSRV(d) UpdateSRV(d, 0)
+
+// clear any existing records prior to registration
+mDNSlocal int SetUpdateSRV(DaemonInfo *d)
+{
+    int err;
+
+    err = ClearUpdateSRV(d);         // clear any existing record
+    if (!err) err = UpdateSRV(d, 1);
+    return err;
+}
+
+//
+// Argument Parsing and Configuration
+//
+
+mDNSlocal void PrintUsage(void)
+{
+    fprintf(stderr, "Usage: dnsextd [-f <config file>] [-vhd] ...\n"
+            "Use \"dnsextd -h\" for help\n");
+}
+
+mDNSlocal void PrintHelp(void)
+{
+    fprintf(stderr, "\n\n");
+    PrintUsage();
+
+    fprintf(stderr,
+            "dnsextd is a daemon that implements DNS extensions supporting Dynamic DNS Update Leases\n"
+            "and Long Lived Queries, used in Wide-Area DNS Service Discovery, on behalf of name servers\n"
+            "that do not natively support these extensions.  (See dns-sd.org for more info on DNS Service\n"
+            "Discovery, Update Leases, and Long Lived Queries.)\n\n"
+
+            "dnsextd requires one argument,the zone, which is the domain for which Update Leases\n"
+            "and Long Lived Queries are to be administered.  dnsextd communicates directly with the\n"
+            "primary master server for this zone.\n\n"
+
+            "The options are as follows:\n\n"
+
+            "-f    Specify configuration file. The default is /etc/dnsextd.conf.\n\n"
+
+            "-d    Run daemon in foreground.\n\n"
+
+            "-h    Print help.\n\n"
+
+            "-v    Verbose output.\n\n"
+            );
+}
+
+
+// Note: ProcessArgs called before process is daemonized, and therefore must open no descriptors
+// returns 0 (success) if program is to continue execution
+// output control arguments (-f, -v) do not affect this routine
+mDNSlocal int ProcessArgs(int argc, char *argv[], DaemonInfo *d)
+{
+    DNSZone *   zone;
+    int opt;
+    int err = 0;
+
+    cfgfile = strdup( CONFIG_FILE );
+    require_action( cfgfile, arg_error, err = mStatus_NoMemoryErr );
+
+    // defaults, may be overriden by command option
+
+    // setup our sockaddr
+
+    mDNSPlatformMemZero( &d->addr, sizeof( d->addr ) );
+    d->addr.sin_addr.s_addr = zerov4Addr.NotAnInteger;
+    d->addr.sin_port        = UnicastDNSPort.NotAnInteger;
+    d->addr.sin_family      = AF_INET;
+#ifndef NOT_HAVE_SA_LEN
+    d->addr.sin_len         = sizeof( d->addr );
+#endif
+
+    // setup nameserver's sockaddr
+
+    mDNSPlatformMemZero(&d->ns_addr, sizeof(d->ns_addr));
+    d->ns_addr.sin_family   = AF_INET;
+    inet_pton( AF_INET, LOOPBACK, &d->ns_addr.sin_addr );
+    d->ns_addr.sin_port     = NSIPCPort.NotAnInteger;
+#ifndef NOT_HAVE_SA_LEN
+    d->ns_addr.sin_len      = sizeof( d->ns_addr );
+#endif
+
+    // setup our ports
+
+    d->private_port = PrivateDNSPort;
+    d->llq_port     = DNSEXTPort;
+
+    while ((opt = getopt(argc, argv, "f:hdv")) != -1)
+    {
+        switch(opt)
+        {
+        case 'f': free( cfgfile ); cfgfile = strdup( optarg ); require_action( cfgfile, arg_error, err = mStatus_NoMemoryErr ); break;
+        case 'h': PrintHelp();    return -1;
+        case 'd': foreground = 1; break;            // Also used when launched via OS X's launchd mechanism
+        case 'v': verbose = 1;    break;
+        default:  goto arg_error;
+        }
+    }
+
+    err = ParseConfig( d, cfgfile );
+    require_noerr( err, arg_error );
+
+    // Make sure we've specified some zones
+
+    require_action( d->zones, arg_error, err = mStatus_UnknownErr );
+
+    // if we have a shared secret, use it for the entire zone
+
+    for ( zone = d->zones; zone; zone = zone->next )
+    {
+        if ( zone->updateKeys )
+        {
+            AssignDomainName( &zone->updateKeys->domain, &zone->name );
+        }
+    }
+
+    return 0;
+
+arg_error:
+
+    PrintUsage();
+    return -1;
+}
+
+
+//
+// Initialization Routines
+//
+
+// Allocate memory, initialize locks and bookkeeping variables
+mDNSlocal int InitLeaseTable(DaemonInfo *d)
+{
+    if (pthread_mutex_init(&d->tablelock, NULL)) { LogErr("InitLeaseTable", "pthread_mutex_init"); return -1; }
+    d->nbuckets = LEASETABLE_INIT_NBUCKETS;
+    d->nelems = 0;
+    d->table = malloc(sizeof(RRTableElem *) * LEASETABLE_INIT_NBUCKETS);
+    if (!d->table) { LogErr("InitLeaseTable", "malloc"); return -1; }
+    mDNSPlatformMemZero(d->table, sizeof(RRTableElem *) * LEASETABLE_INIT_NBUCKETS);
+    return 0;
+}
+
+
+mDNSlocal int
+SetupSockets
+(
+    DaemonInfo * self
+)
+{
+    static const int kOn = 1;
+    int sockpair[2];
+    mDNSBool private = mDNSfalse;
+    struct sockaddr_in daddr;
+    DNSZone         *   zone;
+    mStatus err = 0;
+
+    // set up sockets on which we all ns requests
+
+    self->tcpsd = socket( AF_INET, SOCK_STREAM, 0 );
+    require_action( dnssd_SocketValid(self->tcpsd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+
+#if defined(SO_REUSEADDR)
+    err = setsockopt(self->tcpsd, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+    require_action( !err, exit, LogErr( "SetupSockets", "SO_REUSEADDR self->tcpsd" ) );
+#endif
+
+    err = bind( self->tcpsd, ( struct sockaddr* ) &self->addr, sizeof( self->addr ) );
+    require_action( !err, exit, LogErr( "SetupSockets", "bind self->tcpsd" ) );
+
+    err = listen( self->tcpsd, LISTENQ );
+    require_action( !err, exit, LogErr( "SetupSockets", "listen" ) );
+
+    self->udpsd = socket( AF_INET, SOCK_DGRAM, 0 );
+    require_action( dnssd_SocketValid(self->udpsd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+
+#if defined(SO_REUSEADDR)
+    err = setsockopt(self->udpsd, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+    require_action( !err, exit, LogErr( "SetupSockets", "SO_REUSEADDR self->udpsd" ) );
+#endif
+
+    err = bind( self->udpsd, ( struct sockaddr* ) &self->addr, sizeof( self->addr ) );
+    require_action( !err, exit, LogErr( "SetupSockets", "bind self->udpsd" ) );
+
+    // set up sockets on which we receive llq requests
+
+    mDNSPlatformMemZero(&self->llq_addr, sizeof(self->llq_addr));
+    self->llq_addr.sin_family       = AF_INET;
+    self->llq_addr.sin_addr.s_addr  = zerov4Addr.NotAnInteger;
+    self->llq_addr.sin_port         = ( self->llq_port.NotAnInteger ) ? self->llq_port.NotAnInteger : DNSEXTPort.NotAnInteger;
+
+    if (self->llq_addr.sin_port == self->addr.sin_port)
+    {
+        self->llq_tcpsd = self->tcpsd;
+        self->llq_udpsd = self->udpsd;
+    }
+    else
+    {
+        self->llq_tcpsd = socket( AF_INET, SOCK_STREAM, 0 );
+        require_action( dnssd_SocketValid(self->llq_tcpsd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+
+#if defined(SO_REUSEADDR)
+        err = setsockopt(self->llq_tcpsd, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+        require_action( !err, exit, LogErr( "SetupSockets", "SO_REUSEADDR self->llq_tcpsd" ) );
+#endif
+
+        err = bind( self->llq_tcpsd, ( struct sockaddr* ) &self->llq_addr, sizeof( self->llq_addr ) );
+        require_action( !err, exit, LogErr( "SetupSockets", "bind self->llq_tcpsd" ) );
+
+        err = listen( self->llq_tcpsd, LISTENQ );
+        require_action( !err, exit, LogErr( "SetupSockets", "listen" ) );
+
+        self->llq_udpsd = socket( AF_INET, SOCK_DGRAM, 0 );
+        require_action( dnssd_SocketValid(self->llq_udpsd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+
+#if defined(SO_REUSEADDR)
+        err = setsockopt(self->llq_udpsd, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+        require_action( !err, exit, LogErr( "SetupSockets", "SO_REUSEADDR self->llq_udpsd" ) );
+#endif
+
+        err = bind(self->llq_udpsd, ( struct sockaddr* ) &self->llq_addr, sizeof( self->llq_addr ) );
+        require_action( !err, exit, LogErr( "SetupSockets", "bind self->llq_udpsd" ) );
+    }
+
+    // set up Unix domain socket pair for LLQ polling thread to signal main thread that a change to the zone occurred
+
+    err = socketpair( AF_LOCAL, SOCK_STREAM, 0, sockpair );
+    require_action( !err, exit, LogErr( "SetupSockets", "socketpair" ) );
+
+    self->LLQEventListenSock = sockpair[0];
+    self->LLQEventNotifySock = sockpair[1];
+
+    // set up socket on which we receive private requests
+
+    self->llq_tcpsd = socket( AF_INET, SOCK_STREAM, 0 );
+    require_action( dnssd_SocketValid(self->tlssd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+    mDNSPlatformMemZero(&daddr, sizeof(daddr));
+    daddr.sin_family        = AF_INET;
+    daddr.sin_addr.s_addr   = zerov4Addr.NotAnInteger;
+    daddr.sin_port          = ( self->private_port.NotAnInteger ) ? self->private_port.NotAnInteger : PrivateDNSPort.NotAnInteger;
+
+    self->tlssd = socket( AF_INET, SOCK_STREAM, 0 );
+    require_action( dnssd_SocketValid(self->tlssd), exit, err = mStatus_UnknownErr; LogErr( "SetupSockets", "socket" ) );
+
+#if defined(SO_REUSEADDR)
+    err = setsockopt(self->tlssd, SOL_SOCKET, SO_REUSEADDR, &kOn, sizeof(kOn));
+    require_action( !err, exit, LogErr( "SetupSockets", "SO_REUSEADDR self->tlssd" ) );
+#endif
+
+    err = bind( self->tlssd, ( struct sockaddr* ) &daddr, sizeof( daddr ) );
+    require_action( !err, exit, LogErr( "SetupSockets", "bind self->tlssd" ) );
+
+    err = listen( self->tlssd, LISTENQ );
+    require_action( !err, exit, LogErr( "SetupSockets", "listen" ) );
+
+    // Do we have any private zones?
+
+    for ( zone = self->zones; zone; zone = zone->next )
+    {
+        if ( zone->type == kDNSZonePrivate )
+        {
+            private = mDNStrue;
+            break;
+        }
+    }
+
+    if ( private )
+    {
+        err = mDNSPlatformTLSSetupCerts();
+        require_action( !err, exit, LogErr( "SetupSockets", "mDNSPlatformTLSSetupCerts" ) );
+    }
+
+exit:
+
+    return err;
+}
+
+//
+// periodic table updates
+//
+
+// Delete a resource record from the nameserver via a dynamic update
+// sd is a socket already connected to the server
+mDNSlocal void DeleteOneRecord(DaemonInfo *d, CacheRecord *rr, domainname *zname, TCPSocket *sock)
+{
+    DNSZone *   zone;
+    PktMsg pkt;
+    mDNSu8 *ptr = pkt.msg.data;
+    mDNSu8 *end = (mDNSu8 *)&pkt.msg + sizeof(DNSMessage);
+    char buf[MaxMsg];
+    mDNSBool closed;
+    PktMsg *reply = NULL;
+
+    VLog("Expiring record %s", GetRRDisplayString_rdb(&rr->resrec, &rr->resrec.rdata->u, buf));
+
+    InitializeDNSMessage(&pkt.msg.h, zeroID, UpdateReqFlags);
+
+    ptr = putZone(&pkt.msg, ptr, end, zname, mDNSOpaque16fromIntVal(rr->resrec.rrclass));
+    if (!ptr) goto end;
+    ptr = putDeletionRecord(&pkt.msg, ptr, &rr->resrec);
+    if (!ptr) goto end;
+
+    HdrHToN(&pkt);
+
+    zone = FindZone( d, zname );
+
+    if ( zone && zone->updateKeys)
+    {
+        DNSDigest_SignMessage(&pkt.msg, &ptr, zone->updateKeys, 0 );
+        if (!ptr) goto end;
+    }
+
+    pkt.len = ptr - (mDNSu8 *)&pkt.msg;
+    pkt.src.sin_addr.s_addr = zerov4Addr.NotAnInteger; // address field set solely for verbose logging in subroutines
+    pkt.src.sin_family = AF_INET;
+    if (SendPacket( sock, &pkt)) { Log("DeleteOneRecord: SendPacket failed"); }
+    reply = RecvPacket( sock, NULL, &closed );
+    if (reply) HdrNToH(reply);
+    require_action( reply, end, Log( "DeleteOneRecord: RecvPacket returned NULL" ) );
+
+    if (!SuccessfulUpdateTransaction(&pkt, reply))
+        Log("Expiration update failed with rcode %d", reply ? reply->msg.h.flags.b[1] & kDNSFlag1_RC_Mask : -1);
+
+end:
+    if (!ptr) { Log("DeleteOneRecord: Error constructing lease expiration update"); }
+    if (reply) free(reply);
+}
+
+// iterate over table, deleting expired records (or all records if DeleteAll is true)
+mDNSlocal void DeleteRecords(DaemonInfo *d, mDNSBool DeleteAll)
+{
+    struct timeval now;
+    int i;
+    TCPSocket *sock = ConnectToServer(d);
+    if (!sock) { Log("DeleteRecords: ConnectToServer failed"); return; }
+    if (gettimeofday(&now, NULL)) { LogErr("DeleteRecords ", "gettimeofday"); return; }
+    if (pthread_mutex_lock(&d->tablelock)) { LogErr("DeleteRecords", "pthread_mutex_lock"); return; }
+
+    for (i = 0; i < d->nbuckets; i++)
+    {
+        RRTableElem **ptr = &d->table[i];
+        while (*ptr)
+        {
+            if (DeleteAll || (*ptr)->expire - now.tv_sec < 0)
+            {
+                RRTableElem *fptr;
+                // delete record from server
+                DeleteOneRecord(d, &(*ptr)->rr, &(*ptr)->zone, sock);
+                fptr = *ptr;
+                *ptr = (*ptr)->next;
+                free(fptr);
+                d->nelems--;
+            }
+            else ptr = &(*ptr)->next;
+        }
+    }
+    pthread_mutex_unlock(&d->tablelock);
+    mDNSPlatformTCPCloseConnection( sock );
+}
+
+//
+// main update request handling
+//
+
+// Add, delete, or refresh records in table based on contents of a successfully completed dynamic update
+mDNSlocal void UpdateLeaseTable(PktMsg *pkt, DaemonInfo *d, mDNSs32 lease)
+{
+    RRTableElem **rptr, *tmp;
+    int i, allocsize, bucket;
+    LargeCacheRecord lcr;
+    ResourceRecord *rr = &lcr.r.resrec;
+    const mDNSu8 *ptr, *end;
+    struct timeval tv;
+    DNSQuestion zone;
+    char buf[MaxMsg];
+
+    if (pthread_mutex_lock(&d->tablelock)) { LogErr("UpdateLeaseTable", "pthread_mutex_lock"); return; }
+    HdrNToH(pkt);
+    ptr = pkt->msg.data;
+    end = (mDNSu8 *)&pkt->msg + pkt->len;
+    ptr = getQuestion(&pkt->msg, ptr, end, 0, &zone);
+    if (!ptr) { Log("UpdateLeaseTable: cannot read zone");  goto cleanup; }
+    ptr = LocateAuthorities(&pkt->msg, end);
+    if (!ptr) { Log("UpdateLeaseTable: Format error");  goto cleanup; }
+
+    for (i = 0; i < pkt->msg.h.mDNS_numUpdates; i++)
+    {
+        mDNSBool DeleteAllRRSets = mDNSfalse, DeleteOneRRSet = mDNSfalse, DeleteOneRR = mDNSfalse;
+
+        ptr = GetLargeResourceRecord(NULL, &pkt->msg, ptr, end, 0, kDNSRecordTypePacketAns, &lcr);
+        if (!ptr || lcr.r.resrec.RecordType == kDNSRecordTypePacketNegative) { Log("UpdateLeaseTable: GetLargeResourceRecord failed"); goto cleanup; }
+        bucket = rr->namehash % d->nbuckets;
+        rptr = &d->table[bucket];
+
+        // handle deletions
+        if (rr->rrtype == kDNSQType_ANY && !rr->rroriginalttl && rr->rrclass == kDNSQClass_ANY && !rr->rdlength)
+            DeleteAllRRSets = mDNStrue; // delete all rrsets for a name
+        else if (!rr->rroriginalttl && rr->rrclass == kDNSQClass_ANY && !rr->rdlength)
+            DeleteOneRRSet = mDNStrue;
+        else if (!rr->rroriginalttl && rr->rrclass == kDNSClass_NONE)
+            DeleteOneRR = mDNStrue;
+
+        if (DeleteAllRRSets || DeleteOneRRSet || DeleteOneRR)
+        {
+            while (*rptr)
+            {
+                if (SameDomainName((*rptr)->rr.resrec.name, rr->name) &&
+                    (DeleteAllRRSets ||
+                     (DeleteOneRRSet && (*rptr)->rr.resrec.rrtype == rr->rrtype) ||
+                     (DeleteOneRR && IdenticalResourceRecord(&(*rptr)->rr.resrec, rr))))
+                {
+                    tmp = *rptr;
+                    VLog("Received deletion update for %s", GetRRDisplayString_rdb(&tmp->rr.resrec, &tmp->rr.resrec.rdata->u, buf));
+                    *rptr = (*rptr)->next;
+                    free(tmp);
+                    d->nelems--;
+                }
+                else rptr = &(*rptr)->next;
+            }
+        }
+        else if (lease > 0)
+        {
+            // see if add or refresh
+            while (*rptr && !IdenticalResourceRecord(&(*rptr)->rr.resrec, rr)) rptr = &(*rptr)->next;
+            if (*rptr)
+            {
+                // refresh
+                if (gettimeofday(&tv, NULL)) { LogErr("UpdateLeaseTable", "gettimeofday"); goto cleanup; }
+                (*rptr)->expire = tv.tv_sec + (unsigned)lease;
+                VLog("Refreshing lease for %s", GetRRDisplayString_rdb(&lcr.r.resrec, &lcr.r.resrec.rdata->u, buf));
+            }
+            else
+            {
+                // New record - add to table
+                if (d->nelems > d->nbuckets)
+                {
+                    RehashTable(d);
+                    bucket = rr->namehash % d->nbuckets;
+                    rptr = &d->table[bucket];
+                }
+                if (gettimeofday(&tv, NULL)) { LogErr("UpdateLeaseTable", "gettimeofday"); goto cleanup; }
+                allocsize = sizeof(RRTableElem);
+                if (rr->rdlength > InlineCacheRDSize) allocsize += (rr->rdlength - InlineCacheRDSize);
+                tmp = malloc(allocsize);
+                if (!tmp) { LogErr("UpdateLeaseTable", "malloc"); goto cleanup; }
+                memcpy(&tmp->rr, &lcr.r, sizeof(CacheRecord) + rr->rdlength - InlineCacheRDSize);
+                tmp->rr.resrec.rdata = (RData *)&tmp->rr.smallrdatastorage;
+                AssignDomainName(&tmp->name, rr->name);
+                tmp->rr.resrec.name = &tmp->name;
+                tmp->expire = tv.tv_sec + (unsigned)lease;
+                tmp->cli.sin_addr = pkt->src.sin_addr;
+                AssignDomainName(&tmp->zone, &zone.qname);
+                tmp->next = d->table[bucket];
+                d->table[bucket] = tmp;
+                d->nelems++;
+                VLog("Adding update for %s to lease table", GetRRDisplayString_rdb(&lcr.r.resrec, &lcr.r.resrec.rdata->u, buf));
+            }
+        }
+    }
+
+cleanup:
+    pthread_mutex_unlock(&d->tablelock);
+    HdrHToN(pkt);
+}
+
+// Given a successful reply from a server, create a new reply that contains lease information
+// Replies are currently not signed !!!KRS change this
+mDNSlocal PktMsg *FormatLeaseReply(DaemonInfo *d, PktMsg *orig, mDNSu32 lease)
+{
+    PktMsg *reply;
+    mDNSu8 *ptr, *end;
+    mDNSOpaque16 flags;
+
+    (void)d;  //unused
+    reply = malloc(sizeof(*reply));
+    if (!reply) { LogErr("FormatLeaseReply", "malloc"); return NULL; }
+    flags.b[0] = kDNSFlag0_QR_Response | kDNSFlag0_OP_Update;
+    flags.b[1] = 0;
+
+    InitializeDNSMessage(&reply->msg.h, orig->msg.h.id, flags);
+    reply->src.sin_addr.s_addr = zerov4Addr.NotAnInteger;            // unused except for log messages
+    reply->src.sin_family = AF_INET;
+    ptr = reply->msg.data;
+    end = (mDNSu8 *)&reply->msg + sizeof(DNSMessage);
+    ptr = putUpdateLease(&reply->msg, ptr, lease);
+    if (!ptr) { Log("FormatLeaseReply: putUpdateLease failed"); free(reply); return NULL; }
+    reply->len = ptr - (mDNSu8 *)&reply->msg;
+    HdrHToN(reply);
+    return reply;
+}
+
+
+// pkt is thread-local, not requiring locking
+
+mDNSlocal PktMsg*
+HandleRequest
+(
+    DaemonInfo  *   self,
+    PktMsg      *   request
+)
+{
+    PktMsg      *   reply = NULL;
+    PktMsg      *   leaseReply;
+    PktMsg buf;
+    char addrbuf[32];
+    TCPSocket * sock = NULL;
+    mStatus err;
+    mDNSs32 lease = 0;
+    if ((request->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) == kDNSFlag0_OP_Update)
+    {
+        int i, adds = 0, dels = 0;
+        const mDNSu8 *ptr, *end = (mDNSu8 *)&request->msg + request->len;
+        HdrNToH(request);
+        lease = GetPktLease(&mDNSStorage, &request->msg, end);
+        ptr = LocateAuthorities(&request->msg, end);
+        for (i = 0; i < request->msg.h.mDNS_numUpdates; i++)
+        {
+            LargeCacheRecord lcr;
+            ptr = GetLargeResourceRecord(NULL, &request->msg, ptr, end, 0, kDNSRecordTypePacketAns, &lcr);
+            if (lcr.r.resrec.RecordType != kDNSRecordTypePacketNegative && lcr.r.resrec.rroriginalttl) adds++;else dels++;
+        }
+        HdrHToN(request);
+        if (adds && !lease)
+        {
+            static const mDNSOpaque16 UpdateRefused = { { kDNSFlag0_QR_Response | kDNSFlag0_OP_Update, kDNSFlag1_RC_Refused } };
+            Log("Rejecting Update Request with %d additions but no lease", adds);
+            reply = malloc(sizeof(*reply));
+            mDNSPlatformMemZero(&reply->src, sizeof(reply->src));
+            reply->len = sizeof(DNSMessageHeader);
+            reply->zone = NULL;
+            reply->isZonePublic = 0;
+            InitializeDNSMessage(&reply->msg.h, request->msg.h.id, UpdateRefused);
+            return(reply);
+        }
+        if (lease > 7200)   // Don't allow lease greater than two hours; typically 90-minute renewal period
+            lease = 7200;
+    }
+    // Send msg to server, read reply
+
+    if ( request->len <= 512 )
+    {
+        mDNSBool trunc;
+
+        if ( UDPServerTransaction( self, request, &buf, &trunc) < 0 )
+        {
+            Log("HandleRequest - UDPServerTransaction failed.  Trying TCP");
+        }
+        else if ( trunc )
+        {
+            VLog("HandleRequest - answer truncated.  Using TCP");
+        }
+        else
+        {
+            reply = &buf; // success
+        }
+    }
+
+    if ( !reply )
+    {
+        mDNSBool closed;
+        int res;
+
+        sock = ConnectToServer( self );
+        require_action_quiet( sock, exit, err = mStatus_UnknownErr ; Log( "Discarding request from %s due to connection errors", inet_ntop( AF_INET, &request->src.sin_addr, addrbuf, 32 ) ) );
+
+        res = SendPacket( sock, request );
+        require_action_quiet( res >= 0, exit, err = mStatus_UnknownErr ; Log( "Couldn't relay message from %s to server.  Discarding.", inet_ntop(AF_INET, &request->src.sin_addr, addrbuf, 32 ) ) );
+
+        reply = RecvPacket( sock, &buf, &closed );
+    }
+
+    // IMPORTANT: reply is in network byte order at this point in the code
+    // We keep it this way because we send it back to the client in the same form
+
+    // Is it an update?
+
+    if ( reply && ( ( reply->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask ) == ( kDNSFlag0_OP_Update | kDNSFlag0_QR_Response ) ) )
+    {
+        char pingmsg[4];
+        mDNSBool ok = SuccessfulUpdateTransaction( request, reply );
+        require_action( ok, exit, err = mStatus_UnknownErr; VLog( "Message from %s not a successful update.", inet_ntop(AF_INET, &request->src.sin_addr, addrbuf, 32 ) ) );
+
+        UpdateLeaseTable( request, self, lease );
+
+        if ( lease > 0 )
+        {
+            leaseReply = FormatLeaseReply( self, reply, lease );
+
+            if ( !leaseReply )
+            {
+                Log("HandleRequest - unable to format lease reply");
+            }
+
+            // %%% Looks like a potential memory leak -- who frees the original reply?
+            reply = leaseReply;
+        }
+
+        // tell the main thread there was an update so it can send LLQs
+
+        if ( send( self->LLQEventNotifySock, pingmsg, sizeof( pingmsg ), 0 ) != sizeof( pingmsg ) )
+        {
+            LogErr("HandleRequest", "send");
+        }
+    }
+
+exit:
+
+    if ( sock )
+    {
+        mDNSPlatformTCPCloseConnection( sock );
+    }
+
+    if ( reply == &buf )
+    {
+        reply = malloc( sizeof( *reply ) );
+
+        if ( reply )
+        {
+            reply->len = buf.len;
+            memcpy(&reply->msg, &buf.msg, buf.len);
+        }
+        else
+        {
+            LogErr("HandleRequest", "malloc");
+        }
+    }
+
+    return reply;
+}
+
+
+//
+// LLQ Support Routines
+//
+
+// Set fields of an LLQ OPT Resource Record
+mDNSlocal void FormatLLQOpt(AuthRecord *opt, int opcode, const mDNSOpaque64 *const id, mDNSs32 lease)
+{
+    mDNSPlatformMemZero(opt, sizeof(*opt));
+    mDNS_SetupResourceRecord(opt, mDNSNULL, mDNSInterface_Any, kDNSType_OPT, kStandardTTL, kDNSRecordTypeKnownUnique, AuthRecordAny, mDNSNULL, mDNSNULL);
+    opt->resrec.rrclass = NormalMaxDNSMessageData;
+    opt->resrec.rdlength   = sizeof(rdataOPT);  // One option in this OPT record
+    opt->resrec.rdestimate = sizeof(rdataOPT);
+    opt->resrec.rdata->u.opt[0].opt = kDNSOpt_LLQ;
+    opt->resrec.rdata->u.opt[0].u.llq.vers  = kLLQ_Vers;
+    opt->resrec.rdata->u.opt[0].u.llq.llqOp = opcode;
+    opt->resrec.rdata->u.opt[0].u.llq.err   = LLQErr_NoError;
+    opt->resrec.rdata->u.opt[0].u.llq.id    = *id;
+    opt->resrec.rdata->u.opt[0].u.llq.llqlease = lease;
+}
+
+// Calculate effective remaining lease of an LLQ
+mDNSlocal mDNSu32 LLQLease(LLQEntry *e)
+{
+    struct timeval t;
+
+    gettimeofday(&t, NULL);
+    if (e->expire < t.tv_sec) return 0;
+    else return e->expire - t.tv_sec;
+}
+
+mDNSlocal void DeleteLLQ(DaemonInfo *d, LLQEntry *e)
+{
+    int bucket = DomainNameHashValue(&e->qname) % LLQ_TABLESIZE;
+    LLQEntry **ptr = &d->LLQTable[bucket];
+    AnswerListElem *a = e->AnswerList;
+    char addr[32];
+
+    inet_ntop(AF_INET, &e->cli.sin_addr, addr, 32);
+    VLog("Deleting LLQ table entry for %##s client %s", e->qname.c, addr);
+
+    if (a && !(--a->refcount) && d->AnswerTableCount >= LLQ_TABLESIZE)
+    {
+        // currently, generating initial answers blocks the main thread, so we keep the answer list
+        // even if the ref count drops to zero.  To prevent unbounded table growth, we free shared answers
+        // if the ref count drops to zero AND there are more table elements than buckets
+        // !!!KRS update this when we make the table dynamically growable
+
+        CacheRecord *cr = a->KnownAnswers, *tmp;
+        AnswerListElem **tbl = &d->AnswerTable[bucket];
+
+        while (cr)
+        {
+            tmp = cr;
+            cr = cr->next;
+            free(tmp);
+        }
+
+        while (*tbl && *tbl != a) tbl = &(*tbl)->next;
+        if (*tbl) { *tbl = (*tbl)->next; free(a); d->AnswerTableCount--; }
+        else Log("Error: DeleteLLQ - AnswerList not found in table");
+    }
+
+    // remove LLQ from table, free memory
+    while(*ptr && *ptr != e) ptr = &(*ptr)->next;
+    if (!*ptr) { Log("Error: DeleteLLQ - LLQ not in table"); return; }
+    *ptr = (*ptr)->next;
+    free(e);
+}
+
+mDNSlocal int SendLLQ(DaemonInfo *d, PktMsg *pkt, struct sockaddr_in dst, TCPSocket *sock)
+{
+    char addr[32];
+    int err = -1;
+
+    HdrHToN(pkt);
+
+    if ( sock )
+    {
+        if ( SendPacket( sock, pkt ) != 0 )
+        {
+            LogErr("DaemonInfo", "MySend");
+            Log("Could not send response to client %s", inet_ntop(AF_INET, &dst.sin_addr, addr, 32));
+        }
+    }
+    else
+    {
+        if (sendto(d->llq_udpsd, &pkt->msg, pkt->len, 0, (struct sockaddr *)&dst, sizeof(dst)) != (int)pkt->len)
+        {
+            LogErr("DaemonInfo", "sendto");
+            Log("Could not send response to client %s", inet_ntop(AF_INET, &dst.sin_addr, addr, 32));
+        }
+    }
+
+    err = 0;
+    HdrNToH(pkt);
+    return err;
+}
+
+mDNSlocal CacheRecord *AnswerQuestion(DaemonInfo *d, AnswerListElem *e)
+{
+    PktMsg q;
+    int i;
+    TCPSocket *sock = NULL;
+    const mDNSu8 *ansptr;
+    mDNSu8 *end = q.msg.data;
+    PktMsg buf, *reply = NULL;
+    LargeCacheRecord lcr;
+    CacheRecord *AnswerList = NULL;
+    mDNSu8 rcode;
+
+    VLog("Querying server for %##s type %d", e->name.c, e->type);
+
+    InitializeDNSMessage(&q.msg.h, zeroID, uQueryFlags);
+
+    end = putQuestion(&q.msg, end, end + AbsoluteMaxDNSMessageData, &e->name, e->type, kDNSClass_IN);
+    if (!end) { Log("Error: AnswerQuestion - putQuestion returned NULL"); goto end; }
+    q.len = (int)(end - (mDNSu8 *)&q.msg);
+
+    HdrHToN(&q);
+
+    if (!e->UseTCP)
+    {
+        mDNSBool trunc;
+
+        if (UDPServerTransaction(d, &q, &buf, &trunc) < 0)
+            Log("AnswerQuestion %##s - UDPServerTransaction failed.  Trying TCP", e->name.c);
+        else if (trunc)
+        { VLog("AnswerQuestion %##s - answer truncated.  Using TCP", e->name.c); e->UseTCP = mDNStrue; }
+        else reply = &buf;  // success
+    }
+
+    if (!reply)
+    {
+        mDNSBool closed;
+
+        sock = ConnectToServer(d);
+        if (!sock) { Log("AnswerQuestion: ConnectToServer failed"); goto end; }
+        if (SendPacket( sock, &q)) { Log("AnswerQuestion: SendPacket failed"); mDNSPlatformTCPCloseConnection( sock ); goto end; }
+        reply = RecvPacket( sock, NULL, &closed );
+        mDNSPlatformTCPCloseConnection( sock );
+        require_action( reply, end, Log( "AnswerQuestion: RecvPacket returned NULL" ) );
+    }
+
+    HdrNToH(&q);
+    if (reply) HdrNToH(reply);
+
+    if ((reply->msg.h.flags.b[0] & kDNSFlag0_QROP_Mask) != (kDNSFlag0_QR_Response | kDNSFlag0_OP_StdQuery))
+    { Log("AnswerQuestion: %##s type %d - Invalid response flags from server"); goto end; }
+    rcode = (mDNSu8)(reply->msg.h.flags.b[1] & kDNSFlag1_RC_Mask);
+    if (rcode && rcode != kDNSFlag1_RC_NXDomain) { Log("AnswerQuestion: %##s type %d - non-zero rcode %d from server", e->name.c, e->type, rcode); goto end; }
+
+    end = (mDNSu8 *)&reply->msg + reply->len;
+    ansptr = LocateAnswers(&reply->msg, end);
+    if (!ansptr) { Log("Error: AnswerQuestion - LocateAnswers returned NULL"); goto end; }
+
+    for (i = 0; i < reply->msg.h.numAnswers; i++)
+    {
+        ansptr = GetLargeResourceRecord(NULL, &reply->msg, ansptr, end, 0, kDNSRecordTypePacketAns, &lcr);
+        if (!ansptr) { Log("AnswerQuestions: GetLargeResourceRecord returned NULL"); goto end; }
+        if (lcr.r.resrec.RecordType != kDNSRecordTypePacketNegative)
+        {
+            if (lcr.r.resrec.rrtype != e->type || lcr.r.resrec.rrclass != kDNSClass_IN || !SameDomainName(lcr.r.resrec.name, &e->name))
+            {
+                Log("AnswerQuestion: response %##s type #d does not answer question %##s type #d.  Discarding",
+                    lcr.r.resrec.name->c, lcr.r.resrec.rrtype, e->name.c, e->type);
+            }
+            else
+            {
+                CacheRecord *cr = CopyCacheRecord(&lcr.r, &e->name);
+                if (!cr) { Log("Error: AnswerQuestion - CopyCacheRecord returned NULL"); goto end; }
+                cr->next = AnswerList;
+                AnswerList = cr;
+            }
+        }
+    }
+
+end:
+    if (reply && reply != &buf) free(reply);
+    return AnswerList;
+}
+
+// Routine forks a thread to set EventList to contain Add/Remove events, and deletes any removes from the KnownAnswer list
+mDNSlocal void *UpdateAnswerList(void *args)
+{
+    CacheRecord *cr, *NewAnswers, **na, **ka; // "new answer", "known answer"
+    DaemonInfo *d = ((UpdateAnswerListArgs *)args)->d;
+    AnswerListElem *a = ((UpdateAnswerListArgs *)args)->a;
+
+    free(args);
+    args = NULL;
+
+    // get up to date answers
+    NewAnswers = AnswerQuestion(d, a);
+
+    // first pass - mark all answers for deletion
+    for (ka = &a->KnownAnswers; *ka; ka = &(*ka)->next)
+        (*ka)->resrec.rroriginalttl = (unsigned)-1; // -1 means delete
+
+    // second pass - mark answers pre-existent
+    for (ka = &a->KnownAnswers; *ka; ka = &(*ka)->next)
+    {
+        for (na = &NewAnswers; *na; na = &(*na)->next)
+        {
+            if (IdenticalResourceRecord(&(*ka)->resrec, &(*na)->resrec))
+            { (*ka)->resrec.rroriginalttl = 0; break; }     // 0 means no change
+        }
+    }
+
+    // third pass - add new records to Event list
+    na = &NewAnswers;
+    while (*na)
+    {
+        for (ka = &a->KnownAnswers; *ka; ka = &(*ka)->next)
+            if (IdenticalResourceRecord(&(*ka)->resrec, &(*na)->resrec)) break;
+        if (!*ka)
+        {
+            // answer is not in list - splice from NewAnswers list, add to Event list
+            cr = *na;
+            *na = (*na)->next;        // splice from list
+            cr->next = a->EventList;  // add spliced record to event list
+            a->EventList = cr;
+            cr->resrec.rroriginalttl = 1; // 1 means add
+        }
+        else na = &(*na)->next;
+    }
+
+    // move all the removes from the answer list to the event list
+    ka = &a->KnownAnswers;
+    while (*ka)
+    {
+        if ((*ka)->resrec.rroriginalttl == (unsigned)-1)
+        {
+            cr = *ka;
+            *ka = (*ka)->next;
+            cr->next = a->EventList;
+            a->EventList = cr;
+        }
+        else ka = &(*ka)->next;
+    }
+
+    // lastly, free the remaining records (known answers) in NewAnswers list
+    while (NewAnswers)
+    {
+        cr = NewAnswers;
+        NewAnswers = NewAnswers->next;
+        free(cr);
+    }
+
+    return NULL;
+}
+
+mDNSlocal void SendEvents(DaemonInfo *d, LLQEntry *e)
+{
+    PktMsg response;
+    CacheRecord *cr;
+    mDNSu8 *end = (mDNSu8 *)&response.msg.data;
+    mDNSOpaque16 msgID;
+    char rrbuf[MaxMsg], addrbuf[32];
+    AuthRecord opt;
+
+    // Should this really be random?  Do we use the msgID on the receiving end?
+    msgID.NotAnInteger = random();
+    if (verbose) inet_ntop(AF_INET, &e->cli.sin_addr, addrbuf, 32);
+    InitializeDNSMessage(&response.msg.h, msgID, ResponseFlags);
+    end = putQuestion(&response.msg, end, end + AbsoluteMaxDNSMessageData, &e->qname, e->qtype, kDNSClass_IN);
+    if (!end) { Log("Error: SendEvents - putQuestion returned NULL"); return; }
+
+    // put adds/removes in packet
+    for (cr = e->AnswerList->EventList; cr; cr = cr->next)
+    {
+        if (verbose) GetRRDisplayString_rdb(&cr->resrec, &cr->resrec.rdata->u, rrbuf);
+        VLog("%s (%s): %s", addrbuf, (mDNSs32)cr->resrec.rroriginalttl < 0 ? "Remove" : "Add", rrbuf);
+        end = PutResourceRecordTTLJumbo(&response.msg, end, &response.msg.h.numAnswers, &cr->resrec, cr->resrec.rroriginalttl);
+        if (!end) { Log("Error: SendEvents - PutResourceRecordTTLJumbo returned NULL"); return; }
+    }
+
+    FormatLLQOpt(&opt, kLLQOp_Event, &e->id, LLQLease(e));
+    end = PutResourceRecordTTLJumbo(&response.msg, end, &response.msg.h.numAdditionals, &opt.resrec, 0);
+    if (!end) { Log("Error: SendEvents - PutResourceRecordTTLJumbo"); return; }
+
+    response.len = (int)(end - (mDNSu8 *)&response.msg);
+    if (SendLLQ(d, &response, e->cli, NULL ) < 0) LogMsg("Error: SendEvents - SendLLQ");
+}
+
+mDNSlocal void PrintLLQAnswers(DaemonInfo *d)
+{
+    int i;
+    char rrbuf[MaxMsg];
+
+    Log("Printing LLQ Answer Table contents");
+
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        AnswerListElem *a = d->AnswerTable[i];
+        while(a)
+        {
+            int ancount = 0;
+            const CacheRecord *rr = a->KnownAnswers;
+            while (rr) { ancount++; rr = rr->next; }
+            Log("%p : Question %##s;  type %d;  referenced by %d LLQs; %d answers:", a, a->name.c, a->type, a->refcount, ancount);
+            for (rr = a->KnownAnswers; rr; rr = rr->next) Log("\t%s", GetRRDisplayString_rdb(&rr->resrec, &rr->resrec.rdata->u, rrbuf));
+            a = a->next;
+        }
+    }
+}
+
+mDNSlocal void PrintLLQTable(DaemonInfo *d)
+{
+    LLQEntry *e;
+    char addr[32];
+    int i;
+
+    Log("Printing LLQ table contents");
+
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        e = d->LLQTable[i];
+        while(e)
+        {
+            char *state;
+
+            switch (e->state)
+            {
+            case RequestReceived: state = "RequestReceived"; break;
+            case ChallengeSent:   state = "ChallengeSent";   break;
+            case Established:     state = "Established";     break;
+            default:              state = "unknown";
+            }
+            inet_ntop(AF_INET, &e->cli.sin_addr, addr, 32);
+
+            Log("LLQ from %s in state %s; %##s; type %d; orig lease %d; remaining lease %d; AnswerList %p)",
+                addr, state, e->qname.c, e->qtype, e->lease, LLQLease(e), e->AnswerList);
+            e = e->next;
+        }
+    }
+}
+
+// Send events to clients as a result of a change in the zone
+mDNSlocal void GenLLQEvents(DaemonInfo *d)
+{
+    LLQEntry **e;
+    int i;
+    struct timeval t;
+    UpdateAnswerListArgs *args;
+
+    VLog("Generating LLQ Events");
+
+    gettimeofday(&t, NULL);
+
+    // get all answers up to date
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        AnswerListElem *a = d->AnswerTable[i];
+        while(a)
+        {
+            args = malloc(sizeof(*args));
+            if (!args) { LogErr("GenLLQEvents", "malloc"); return; }
+            args->d = d;
+            args->a = a;
+            if (pthread_create(&a->tid, NULL, UpdateAnswerList, args) < 0) { LogErr("GenLLQEvents", "pthread_create"); return; }
+            usleep(1);
+            a = a->next;
+        }
+    }
+
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        AnswerListElem *a = d->AnswerTable[i];
+        while(a)
+        {
+            if (pthread_join(a->tid, NULL)) LogErr("GenLLQEvents", "pthread_join");
+            a = a->next;
+        }
+    }
+
+    // for each established LLQ, send events
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        e = &d->LLQTable[i];
+        while(*e)
+        {
+            if ((*e)->expire < t.tv_sec) DeleteLLQ(d, *e);
+            else
+            {
+                if ((*e)->state == Established && (*e)->AnswerList->EventList) SendEvents(d, *e);
+                e = &(*e)->next;
+            }
+        }
+    }
+
+    // now that all LLQs are updated, we move Add events from the Event list to the Known Answer list, and free Removes
+    for (i = 0; i < LLQ_TABLESIZE; i++)
+    {
+        AnswerListElem *a = d->AnswerTable[i];
+        while(a)
+        {
+            if (a->EventList)
+            {
+                CacheRecord *cr = a->EventList, *tmp;
+                while (cr)
+                {
+                    tmp = cr;
+                    cr = cr->next;
+                    if ((signed)tmp->resrec.rroriginalttl < 0) free(tmp);
+                    else
+                    {
+                        tmp->next = a->KnownAnswers;
+                        a->KnownAnswers = tmp;
+                        tmp->resrec.rroriginalttl = 0;
+                    }
+                }
+                a->EventList = NULL;
+            }
+            a = a->next;
+        }
+    }
+}
+
+mDNSlocal void SetAnswerList(DaemonInfo *d, LLQEntry *e)
+{
+    int bucket = DomainNameHashValue(&e->qname) % LLQ_TABLESIZE;
+    AnswerListElem *a = d->AnswerTable[bucket];
+    while (a && (a->type != e->qtype ||!SameDomainName(&a->name, &e->qname))) a = a->next;
+    if (!a)
+    {
+        a = malloc(sizeof(*a));
+        if (!a) { LogErr("SetAnswerList", "malloc"); return; }
+        AssignDomainName(&a->name, &e->qname);
+        a->type = e->qtype;
+        a->refcount = 0;
+        a->EventList = NULL;
+        a->UseTCP = mDNSfalse;
+        a->next = d->AnswerTable[bucket];
+        d->AnswerTable[bucket] = a;
+        d->AnswerTableCount++;
+        a->KnownAnswers = AnswerQuestion(d, a);
+    }
+
+    e->AnswerList = a;
+    a->refcount++;
+}
+
+// Allocate LLQ entry, insert into table
+mDNSlocal LLQEntry *NewLLQ(DaemonInfo *d, struct sockaddr_in cli, domainname *qname, mDNSu16 qtype, mDNSu32 lease )
+{
+    char addr[32];
+    struct timeval t;
+    int bucket = DomainNameHashValue(qname) % LLQ_TABLESIZE;
+    LLQEntry *e;
+
+    e = malloc(sizeof(*e));
+    if (!e) { LogErr("NewLLQ", "malloc"); return NULL; }
+
+    inet_ntop(AF_INET, &cli.sin_addr, addr, 32);
+    VLog("Allocating LLQ entry for client %s question %##s type %d", addr, qname->c, qtype);
+
+    // initialize structure
+    e->cli = cli;
+    AssignDomainName(&e->qname, qname);
+    e->qtype = qtype;
+    e->id    = zeroOpaque64;
+    e->state = RequestReceived;
+    e->AnswerList = NULL;
+
+    if (lease < LLQ_MIN_LEASE) lease = LLQ_MIN_LEASE;
+    else if (lease > LLQ_MAX_LEASE) lease = LLQ_MAX_LEASE;
+
+    gettimeofday(&t, NULL);
+    e->expire = t.tv_sec + (int)lease;
+    e->lease = lease;
+
+    // add to table
+    e->next = d->LLQTable[bucket];
+    d->LLQTable[bucket] = e;
+
+    return e;
+}
+
+// Handle a refresh request from client
+mDNSlocal void LLQRefresh(DaemonInfo *d, LLQEntry *e, LLQOptData *llq, mDNSOpaque16 msgID, TCPSocket *sock )
+{
+    AuthRecord opt;
+    PktMsg ack;
+    mDNSu8 *end = (mDNSu8 *)&ack.msg.data;
+    char addr[32];
+
+    inet_ntop(AF_INET, &e->cli.sin_addr, addr, 32);
+    VLog("%s LLQ for %##s from %s", llq->llqlease ? "Refreshing" : "Deleting", e->qname.c, addr);
+
+    if (llq->llqlease)
+    {
+        struct timeval t;
+        if (llq->llqlease < LLQ_MIN_LEASE) llq->llqlease = LLQ_MIN_LEASE;
+        else if (llq->llqlease > LLQ_MAX_LEASE) llq->llqlease = LLQ_MIN_LEASE;
+        gettimeofday(&t, NULL);
+        e->expire = t.tv_sec + llq->llqlease;
+    }
+
+    ack.src.sin_addr.s_addr = 0; // unused
+    InitializeDNSMessage(&ack.msg.h, msgID, ResponseFlags);
+    end = putQuestion(&ack.msg, end, end + AbsoluteMaxDNSMessageData, &e->qname, e->qtype, kDNSClass_IN);
+    if (!end) { Log("Error: putQuestion"); return; }
+
+    FormatLLQOpt(&opt, kLLQOp_Refresh, &e->id, llq->llqlease ? LLQLease(e) : 0);
+    end = PutResourceRecordTTLJumbo(&ack.msg, end, &ack.msg.h.numAdditionals, &opt.resrec, 0);
+    if (!end) { Log("Error: PutResourceRecordTTLJumbo"); return; }
+
+    ack.len = (int)(end - (mDNSu8 *)&ack.msg);
+    if (SendLLQ(d, &ack, e->cli, sock)) Log("Error: LLQRefresh");
+
+    if (llq->llqlease) e->state = Established;
+    else DeleteLLQ(d, e);
+}
+
+// Complete handshake with Ack an initial answers
+mDNSlocal void LLQCompleteHandshake(DaemonInfo *d, LLQEntry *e, LLQOptData *llq, mDNSOpaque16 msgID, TCPSocket *sock)
+{
+    char addr[32];
+    CacheRecord *ptr;
+    AuthRecord opt;
+    PktMsg ack;
+    mDNSu8 *end = (mDNSu8 *)&ack.msg.data;
+    char rrbuf[MaxMsg], addrbuf[32];
+
+    inet_ntop(AF_INET, &e->cli.sin_addr, addr, 32);
+
+    if (!mDNSSameOpaque64(&llq->id, &e->id) ||
+        llq->vers  != kLLQ_Vers             ||
+        llq->llqOp != kLLQOp_Setup          ||
+        llq->err   != LLQErr_NoError        ||
+        llq->llqlease > e->lease + LLQ_LEASE_FUDGE ||
+        llq->llqlease < e->lease - LLQ_LEASE_FUDGE)
+    {
+        Log("Incorrect challenge response from %s", addr);
+        return;
+    }
+
+    if (e->state == Established) VLog("Retransmitting LLQ ack + answers for %##s", e->qname.c);
+    else VLog("Delivering LLQ ack + answers for %##s", e->qname.c);
+
+    // format ack + answers
+    ack.src.sin_addr.s_addr = 0; // unused
+    InitializeDNSMessage(&ack.msg.h, msgID, ResponseFlags);
+    end = putQuestion(&ack.msg, end, end + AbsoluteMaxDNSMessageData, &e->qname, e->qtype, kDNSClass_IN);
+    if (!end) { Log("Error: putQuestion"); return; }
+
+    if (e->state != Established) { SetAnswerList(d, e); e->state = Established; }
+
+    if (verbose) inet_ntop(AF_INET, &e->cli.sin_addr, addrbuf, 32);
+    for (ptr = e->AnswerList->KnownAnswers; ptr; ptr = ptr->next)
+    {
+        if (verbose) GetRRDisplayString_rdb(&ptr->resrec, &ptr->resrec.rdata->u, rrbuf);
+        VLog("%s Intitial Answer - %s", addr, rrbuf);
+        end = PutResourceRecordTTLJumbo(&ack.msg, end, &ack.msg.h.numAnswers, &ptr->resrec, 1);
+        if (!end) { Log("Error: PutResourceRecordTTLJumbo"); return; }
+    }
+
+    FormatLLQOpt(&opt, kLLQOp_Setup, &e->id, LLQLease(e));
+    end = PutResourceRecordTTLJumbo(&ack.msg, end, &ack.msg.h.numAdditionals, &opt.resrec, 0);
+    if (!end) { Log("Error: PutResourceRecordTTLJumbo"); return; }
+
+    ack.len = (int)(end - (mDNSu8 *)&ack.msg);
+    if (SendLLQ(d, &ack, e->cli, sock)) Log("Error: LLQCompleteHandshake");
+}
+
+mDNSlocal void LLQSetupChallenge(DaemonInfo *d, LLQEntry *e, LLQOptData *llq, mDNSOpaque16 msgID)
+{
+    struct timeval t;
+    PktMsg challenge;
+    mDNSu8 *end = challenge.msg.data;
+    AuthRecord opt;
+
+    if (e->state == ChallengeSent) VLog("Retransmitting LLQ setup challenge for %##s", e->qname.c);
+    else VLog("Sending LLQ setup challenge for %##s", e->qname.c);
+
+    if (!mDNSOpaque64IsZero(&llq->id)) { Log("Error: LLQSetupChallenge - nonzero ID"); return; } // server bug
+    if (llq->llqOp != kLLQOp_Setup) { Log("LLQSetupChallenge - incorrrect operation from client"); return; } // client error
+
+    if (mDNSOpaque64IsZero(&e->id)) // don't regenerate random ID for retransmissions
+    {
+        // construct ID <time><random>
+        gettimeofday(&t, NULL);
+        e->id.l[0] = t.tv_sec;
+        e->id.l[1] = random();
+    }
+
+    // format response (query + LLQ opt rr)
+    challenge.src.sin_addr.s_addr = 0; // unused
+    InitializeDNSMessage(&challenge.msg.h, msgID, ResponseFlags);
+    end = putQuestion(&challenge.msg, end, end + AbsoluteMaxDNSMessageData, &e->qname, e->qtype, kDNSClass_IN);
+    if (!end) { Log("Error: putQuestion"); return; }
+    FormatLLQOpt(&opt, kLLQOp_Setup, &e->id, LLQLease(e));
+    end = PutResourceRecordTTLJumbo(&challenge.msg, end, &challenge.msg.h.numAdditionals, &opt.resrec, 0);
+    if (!end) { Log("Error: PutResourceRecordTTLJumbo"); return; }
+    challenge.len = (int)(end - (mDNSu8 *)&challenge.msg);
+    if (SendLLQ(d, &challenge, e->cli, NULL)) { Log("Error: LLQSetupChallenge"); return; }
+    e->state = ChallengeSent;
+}
+
+// Take action on an LLQ message from client.  Entry must be initialized and in table
+mDNSlocal void UpdateLLQ(DaemonInfo *d, LLQEntry *e, LLQOptData *llq, mDNSOpaque16 msgID, TCPSocket *sock )
+{
+    switch(e->state)
+    {
+    case RequestReceived:
+        if ( sock )
+        {
+            struct timeval t;
+            gettimeofday(&t, NULL);
+            e->id.l[0] = t.tv_sec;      // construct ID <time><random>
+            e->id.l[1] = random();
+            llq->id = e->id;
+            LLQCompleteHandshake( d, e, llq, msgID, sock );
+
+            // Set the state to established because we've just set the LLQ up using TCP
+            e->state = Established;
+        }
+        else
+        {
+            LLQSetupChallenge(d, e, llq, msgID);
+        }
+        return;
+    case ChallengeSent:
+        if (mDNSOpaque64IsZero(&llq->id)) LLQSetupChallenge(d, e, llq, msgID);     // challenge sent and lost
+        else LLQCompleteHandshake(d, e, llq, msgID, sock );
+        return;
+    case Established:
+        if (mDNSOpaque64IsZero(&llq->id))
+        {
+            // client started over.  reset state.
+            LLQEntry *newe = NewLLQ(d, e->cli, &e->qname, e->qtype, llq->llqlease );
+            if (!newe) return;
+            DeleteLLQ(d, e);
+            LLQSetupChallenge(d, newe, llq, msgID);
+            return;
+        }
+        else if (llq->llqOp == kLLQOp_Setup)
+        { LLQCompleteHandshake(d, e, llq, msgID, sock); return; }         // Ack lost
+        else if (llq->llqOp == kLLQOp_Refresh)
+        { LLQRefresh(d, e, llq, msgID, sock); return; }
+        else { Log("Unhandled message for established LLQ"); return; }
+    }
+}
+
+mDNSlocal LLQEntry *LookupLLQ(DaemonInfo *d, struct sockaddr_in cli, domainname *qname, mDNSu16 qtype, const mDNSOpaque64 *const id)
+{
+    int bucket = bucket = DomainNameHashValue(qname) % LLQ_TABLESIZE;
+    LLQEntry *ptr = d->LLQTable[bucket];
+
+    while(ptr)
+    {
+        if (((ptr->state == ChallengeSent && mDNSOpaque64IsZero(id) && (cli.sin_port == ptr->cli.sin_port)) || // zero-id due to packet loss OK in state ChallengeSent
+             mDNSSameOpaque64(id, &ptr->id)) &&                        // id match
+            (cli.sin_addr.s_addr == ptr->cli.sin_addr.s_addr) && (qtype == ptr->qtype) && SameDomainName(&ptr->qname, qname)) // same source, type, qname
+            return ptr;
+        ptr = ptr->next;
+    }
+    return NULL;
+}
+
+mDNSlocal int
+RecvNotify
+(
+    DaemonInfo  *   d,
+    PktMsg      *   pkt
+)
+{
+    int res;
+    int err = 0;
+
+    pkt->msg.h.flags.b[0] |= kDNSFlag0_QR_Response;
+
+    res = sendto( d->udpsd, &pkt->msg, pkt->len, 0, ( struct sockaddr* ) &pkt->src, sizeof( pkt->src ) );
+    require_action( res == ( int ) pkt->len, exit, err = mStatus_UnknownErr; LogErr( "RecvNotify", "sendto" ) );
+
+exit:
+
+    return err;
+}
+
+
+mDNSlocal int RecvLLQ( DaemonInfo *d, PktMsg *pkt, TCPSocket *sock )
+{
+    DNSQuestion q;
+    LargeCacheRecord opt;
+    int i, err = -1;
+    char addr[32];
+    const mDNSu8 *qptr = pkt->msg.data;
+    const mDNSu8 *end = (mDNSu8 *)&pkt->msg + pkt->len;
+    const mDNSu8 *aptr;
+    LLQOptData *llq = NULL;
+    LLQEntry *e = NULL;
+
+    HdrNToH(pkt);
+    aptr = LocateAdditionals(&pkt->msg, end);   // Can't do this until after HdrNToH(pkt);
+    inet_ntop(AF_INET, &pkt->src.sin_addr, addr, 32);
+
+    VLog("Received LLQ msg from %s", addr);
+    // sanity-check packet
+    if (!pkt->msg.h.numQuestions || !pkt->msg.h.numAdditionals)
+    {
+        Log("Malformatted LLQ from %s with %d questions, %d additionals", addr, pkt->msg.h.numQuestions, pkt->msg.h.numAdditionals);
+        goto end;
+    }
+
+    // Locate the OPT record.
+    // According to RFC 2671, "One OPT pseudo-RR can be added to the additional data section of either a request or a response."
+    // This implies that there may be *at most* one OPT record per DNS message, in the Additional Section,
+    // but not necessarily the *last* entry in the Additional Section.
+    for (i = 0; i < pkt->msg.h.numAdditionals; i++)
+    {
+        aptr = GetLargeResourceRecord(NULL, &pkt->msg, aptr, end, 0, kDNSRecordTypePacketAdd, &opt);
+        if (!aptr) { Log("Malformatted LLQ from %s: could not get Additional record %d", addr, i); goto end; }
+        if (opt.r.resrec.RecordType != kDNSRecordTypePacketNegative && opt.r.resrec.rrtype == kDNSType_OPT) break;
+    }
+
+    // validate OPT
+    if (opt.r.resrec.rrtype != kDNSType_OPT) { Log("Malformatted LLQ from %s: last Additional not an OPT RR", addr); goto end; }
+    if (opt.r.resrec.rdlength < pkt->msg.h.numQuestions * DNSOpt_LLQData_Space) { Log("Malformatted LLQ from %s: OPT RR to small (%d bytes for %d questions)", addr, opt.r.resrec.rdlength, pkt->msg.h.numQuestions); }
+
+    // dispatch each question
+    for (i = 0; i < pkt->msg.h.numQuestions; i++)
+    {
+        qptr = getQuestion(&pkt->msg, qptr, end, 0, &q);
+        if (!qptr) { Log("Malformatted LLQ from %s: cannot read question %d", addr, i); goto end; }
+        llq = (LLQOptData *)&opt.r.resrec.rdata->u.opt[0].u.llq + i; // point into OptData at index i
+        if (llq->vers != kLLQ_Vers) { Log("LLQ from %s contains bad version %d (expected %d)", addr, llq->vers, kLLQ_Vers); goto end; }
+
+        e = LookupLLQ(d, pkt->src, &q.qname, q.qtype, &llq->id);
+        if (!e)
+        {
+            // no entry - if zero ID, create new
+            e = NewLLQ(d, pkt->src, &q.qname, q.qtype, llq->llqlease );
+            if (!e) goto end;
+        }
+        UpdateLLQ(d, e, llq, pkt->msg.h.id, sock);
+    }
+    err = 0;
+
+end:
+    HdrHToN(pkt);
+    return err;
+}
+
+
+mDNSlocal mDNSBool IsAuthorized( DaemonInfo * d, PktMsg * pkt, DomainAuthInfo ** key, mDNSu16 * rcode, mDNSu16 * tcode )
+{
+    const mDNSu8    *   lastPtr = NULL;
+    const mDNSu8    *   ptr = NULL;
+    DomainAuthInfo  *   keys;
+    mDNSu8          *   end = ( mDNSu8* ) &pkt->msg + pkt->len;
+    LargeCacheRecord lcr;
+    mDNSBool hasTSIG = mDNSfalse;
+    mDNSBool strip = mDNSfalse;
+    mDNSBool ok = mDNSfalse;
+    int i;
+
+    // Unused parameters
+
+    ( void ) d;
+
+    HdrNToH(pkt);
+
+    *key = NULL;
+
+    if ( pkt->msg.h.numAdditionals )
+    {
+        ptr = LocateAdditionals(&pkt->msg, end);
+        if (ptr)
+        {
+            for (i = 0; i < pkt->msg.h.numAdditionals; i++)
+            {
+                lastPtr = ptr;
+                ptr = GetLargeResourceRecord(NULL, &pkt->msg, ptr, end, 0, kDNSRecordTypePacketAdd, &lcr);
+                if (!ptr)
+                {
+                    Log("Unable to read additional record");
+                    lastPtr = NULL;
+                    break;
+                }
+            }
+
+            hasTSIG = ( ptr && lcr.r.resrec.RecordType != kDNSRecordTypePacketNegative && lcr.r.resrec.rrtype == kDNSType_TSIG );
+        }
+        else
+        {
+            LogMsg( "IsAuthorized: unable to find Additional section" );
+        }
+    }
+
+    // If we don't know what zone this is, then it's authorized.
+
+    if ( !pkt->zone )
+    {
+        ok = mDNStrue;
+        strip = mDNSfalse;
+        goto exit;
+    }
+
+    if ( IsQuery( pkt ) )
+    {
+        keys = pkt->zone->queryKeys;
+        strip = mDNStrue;
+    }
+    else if ( IsUpdate( pkt ) )
+    {
+        keys = pkt->zone->updateKeys;
+        strip = mDNSfalse;
+    }
+    else
+    {
+        ok = mDNStrue;
+        strip = mDNSfalse;
+        goto exit;
+    }
+
+    if ( pkt->isZonePublic )
+    {
+        ok = mDNStrue;
+        goto exit;
+    }
+
+    // If there are no keys, then we're authorized
+
+    if ( ( hasTSIG && !keys ) || ( !hasTSIG && keys ) )
+    {
+        Log( "Invalid TSIG spec %##s for zone %##s", lcr.r.resrec.name->c, pkt->zone->name.c );
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadKey;
+        strip = mDNStrue;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    // Find the right key
+
+    for ( *key = keys; *key; *key = (*key)->next )
+    {
+        if ( SameDomainName( lcr.r.resrec.name, &(*key)->keyname ) )
+        {
+            break;
+        }
+    }
+
+    if ( !(*key) )
+    {
+        Log( "Invalid TSIG name %##s for zone %##s", lcr.r.resrec.name->c, pkt->zone->name.c );
+        *rcode = kDNSFlag1_RC_NotAuth;
+        *tcode = TSIG_ErrBadKey;
+        strip = mDNStrue;
+        ok = mDNSfalse;
+        goto exit;
+    }
+
+    // Okay, we have the correct key and a TSIG record.  DNSDigest_VerifyMessage does the heavy
+    // lifting of message verification
+
+    pkt->msg.h.numAdditionals--;
+
+    HdrHToN( pkt );
+
+    ok = DNSDigest_VerifyMessage( &pkt->msg, ( mDNSu8* ) lastPtr, &lcr, (*key), rcode, tcode );
+
+    HdrNToH( pkt );
+
+    pkt->msg.h.numAdditionals++;
+
+exit:
+
+    if ( hasTSIG && strip )
+    {
+        // Strip the TSIG from the message
+
+        pkt->msg.h.numAdditionals--;
+        pkt->len = lastPtr - ( mDNSu8* ) ( &pkt->msg );
+    }
+
+    HdrHToN(pkt);
+
+    return ok;
+}
+
+// request handler wrappers for TCP and UDP requests
+// (read message off socket, fork thread that invokes main processing routine and handles cleanup)
+
+mDNSlocal void*
+UDPMessageHandler
+(
+    void * vptr
+)
+{
+    UDPContext  *   context = ( UDPContext* ) vptr;
+    PktMsg      *   reply   = NULL;
+    int res;
+    mStatus err;
+
+    // !!!KRS strictly speaking, we shouldn't use TCP for a UDP request because the server
+    // may give us a long answer that would require truncation for UDP delivery to client
+
+    reply = HandleRequest( context->d, &context->pkt );
+    require_action( reply, exit, err = mStatus_UnknownErr );
+
+    res = sendto( context->sd, &reply->msg, reply->len, 0, ( struct sockaddr* ) &context->pkt.src, sizeof( context->pkt.src ) );
+    require_action_quiet( res == ( int ) reply->len, exit, LogErr( "UDPMessageHandler", "sendto" ) );
+
+exit:
+
+    if ( reply )
+    {
+        free( reply );
+    }
+
+    free( context );
+
+    pthread_exit( NULL );
+
+    return NULL;
+}
+
+
+mDNSlocal int
+RecvUDPMessage
+(
+    DaemonInfo  *   self,
+    int sd
+)
+{
+    UDPContext      *   context = NULL;
+    pthread_t tid;
+    mDNSu16 rcode;
+    mDNSu16 tcode;
+    DomainAuthInfo  *   key;
+    unsigned int clisize = sizeof( context->cliaddr );
+    int res;
+    mStatus err = mStatus_NoError;
+
+    context = malloc( sizeof( UDPContext ) );
+    require_action( context, exit, err = mStatus_NoMemoryErr ; LogErr( "RecvUDPMessage", "malloc" ) );
+
+    mDNSPlatformMemZero( context, sizeof( *context ) );
+    context->d = self;
+    context->sd = sd;
+
+    res = recvfrom(sd, &context->pkt.msg, sizeof(context->pkt.msg), 0, (struct sockaddr *)&context->cliaddr, &clisize);
+
+    require_action( res >= 0, exit, err = mStatus_UnknownErr ; LogErr( "RecvUDPMessage", "recvfrom" ) );
+    context->pkt.len = res;
+    require_action( clisize == sizeof( context->cliaddr ), exit, err = mStatus_UnknownErr ; Log( "Client address of unknown size %d", clisize ) );
+    context->pkt.src = context->cliaddr;
+
+    // Set the zone in the packet
+
+    SetZone( context->d, &context->pkt );
+
+    // Notify messages handled by main thread
+
+    if ( IsNotify( &context->pkt ) )
+    {
+        int e = RecvNotify( self, &context->pkt );
+        free(context);
+        return e;
+    }
+    else if ( IsAuthorized( context->d, &context->pkt, &key, &rcode, &tcode ) )
+    {
+        if ( IsLLQRequest( &context->pkt ) )
+        {
+            // LLQ messages handled by main thread
+            int e = RecvLLQ( self, &context->pkt, NULL );
+            free(context);
+            return e;
+        }
+
+        if ( IsLLQAck(&context->pkt ) )
+        {
+            // !!!KRS need to do acks + retrans
+
+            free(context);
+            return 0;
+        }
+
+        err = pthread_create( &tid, NULL, UDPMessageHandler, context );
+        require_action( !err, exit, LogErr( "RecvUDPMessage", "pthread_create" ) );
+
+        pthread_detach(tid);
+    }
+    else
+    {
+        PktMsg reply;
+        int e;
+
+        memcpy( &reply, &context->pkt, sizeof( PktMsg ) );
+
+        reply.msg.h.flags.b[0]  =  kDNSFlag0_QR_Response | kDNSFlag0_AA | kDNSFlag0_RD;
+        reply.msg.h.flags.b[1]  =  kDNSFlag1_RA | kDNSFlag1_RC_NXDomain;
+
+        e = sendto( sd, &reply.msg, reply.len, 0, ( struct sockaddr* ) &context->pkt.src, sizeof( context->pkt.src ) );
+        require_action_quiet( e == ( int ) reply.len, exit, LogErr( "RecvUDPMessage", "sendto" ) );
+
+        err = mStatus_NoAuth;
+    }
+
+exit:
+
+    if ( err && context )
+    {
+        free( context );
+    }
+
+    return err;
+}
+
+
+mDNSlocal void
+FreeTCPContext
+(
+    TCPContext * context
+)
+{
+    if ( context )
+    {
+        if ( context->sock )
+        {
+            mDNSPlatformTCPCloseConnection( context->sock );
+        }
+
+        free( context );
+    }
+}
+
+
+mDNSlocal void*
+TCPMessageHandler
+(
+    void * vptr
+)
+{
+    TCPContext  *   context = ( TCPContext* ) vptr;
+    PktMsg      *   reply = NULL;
+    int res;
+    char buf[32];
+
+    //!!!KRS if this read blocks indefinitely, we can run out of threads
+    // read the request
+
+    reply = HandleRequest( context->d, &context->pkt );
+    require_action_quiet( reply, exit, LogMsg( "TCPMessageHandler: No reply for client %s", inet_ntop( AF_INET, &context->cliaddr.sin_addr, buf, 32 ) ) );
+
+    // deliver reply to client
+
+    res = SendPacket( context->sock, reply );
+    require_action( res >= 0, exit, LogMsg("TCPMessageHandler: Unable to send reply to client %s", inet_ntop(AF_INET, &context->cliaddr.sin_addr, buf, 32 ) ) );
+
+exit:
+
+    FreeTCPContext( context );
+
+    if ( reply )
+    {
+        free( reply );
+    }
+
+    pthread_exit(NULL);
+}
+
+
+mDNSlocal void
+RecvTCPMessage
+(
+    void * param
+)
+{
+    TCPContext      *   context = ( TCPContext* ) param;
+    mDNSu16 rcode;
+    mDNSu16 tcode;
+    pthread_t tid;
+    DomainAuthInfo  *   key;
+    PktMsg          *   pkt;
+    mDNSBool closed;
+    mDNSBool freeContext = mDNStrue;
+    mStatus err = mStatus_NoError;
+
+    // Receive a packet.  It's okay if we don't actually read a packet, as long as the closed flag is
+    // set to false.  This is because SSL/TLS layer might gobble up the first packet that we read off the
+    // wire.  We'll let it do that, and wait for the next packet which will be ours.
+
+    pkt = RecvPacket( context->sock, &context->pkt, &closed );
+    if (pkt) HdrNToH(pkt);
+    require_action( pkt || !closed, exit, err = mStatus_UnknownErr; LogMsg( "client disconnected" ) );
+
+    if ( pkt )
+    {
+        // Always do this, regardless of what kind of packet it is.  If we wanted LLQ events to be sent over TCP,
+        // we would change this line of code.  As it is now, we will reply to an LLQ via TCP, but then events
+        // are sent over UDP
+
+        RemoveSourceFromEventLoop( context->d, context->sock );
+
+        // Set's the DNS Zone that is associated with this message
+
+        SetZone( context->d, &context->pkt );
+
+        // IsAuthorized will make sure the message is authorized for the designated zone.
+        // After verifying the signature, it will strip the TSIG from the message
+
+        if ( IsAuthorized( context->d, &context->pkt, &key, &rcode, &tcode ) )
+        {
+            if ( IsLLQRequest( &context->pkt ) )
+            {
+                // LLQ messages handled by main thread
+                RecvLLQ( context->d, &context->pkt, context->sock);
+            }
+            else
+            {
+                err = pthread_create( &tid, NULL, TCPMessageHandler, context );
+
+                if ( err )
+                {
+                    LogErr( "RecvTCPMessage", "pthread_create" );
+                    err = mStatus_NoError;
+                    goto exit;
+                }
+
+                // Let the thread free the context
+
+                freeContext = mDNSfalse;
+
+                pthread_detach(tid);
+            }
+        }
+        else
+        {
+            PktMsg reply;
+
+            LogMsg( "Client %s Not authorized for zone %##s", inet_ntoa( context->pkt.src.sin_addr ), pkt->zone->name.c );
+
+            memcpy( &reply, &context->pkt, sizeof( PktMsg ) );
+
+            reply.msg.h.flags.b[0]  =  kDNSFlag0_QR_Response | kDNSFlag0_AA | kDNSFlag0_RD;
+            reply.msg.h.flags.b[1]  =  kDNSFlag1_RA | kDNSFlag1_RC_Refused;
+
+            SendPacket( context->sock, &reply );
+        }
+    }
+    else
+    {
+        freeContext = mDNSfalse;
+    }
+
+exit:
+
+    if ( err )
+    {
+        RemoveSourceFromEventLoop( context->d, context->sock );
+    }
+
+    if ( freeContext )
+    {
+        FreeTCPContext( context );
+    }
+}
+
+
+mDNSlocal int
+AcceptTCPConnection
+(
+    DaemonInfo      *   self,
+    int sd,
+    TCPSocketFlags flags
+)
+{
+    TCPContext *    context = NULL;
+    unsigned int clilen = sizeof( context->cliaddr);
+    int newSock;
+    mStatus err = mStatus_NoError;
+
+    context = ( TCPContext* ) malloc( sizeof( TCPContext ) );
+    require_action( context, exit, err = mStatus_NoMemoryErr; LogErr( "AcceptTCPConnection", "malloc" ) );
+    mDNSPlatformMemZero( context, sizeof( sizeof( TCPContext ) ) );
+    context->d       = self;
+    newSock = accept( sd, ( struct sockaddr* ) &context->cliaddr, &clilen );
+    require_action( newSock != -1, exit, err = mStatus_UnknownErr; LogErr( "AcceptTCPConnection", "accept" ) );
+
+    context->sock = mDNSPlatformTCPAccept( flags, newSock );
+    require_action( context->sock, exit, err = mStatus_UnknownErr; LogErr( "AcceptTCPConnection", "mDNSPlatformTCPAccept" ) );
+
+    err = AddSourceToEventLoop( self, context->sock, RecvTCPMessage, context );
+    require_action( !err, exit, LogErr( "AcceptTCPConnection", "AddSourceToEventLoop" ) );
+
+exit:
+
+    if ( err && context )
+    {
+        free( context );
+        context = NULL;
+    }
+
+    return err;
+}
+
+
+// main event loop
+// listen for incoming requests, periodically check table for expired records, respond to signals
+mDNSlocal int Run(DaemonInfo *d)
+{
+    int staticMaxFD, nfds;
+    fd_set rset;
+    struct timeval timenow, timeout, EventTS, tablecheck = { 0, 0 };
+    mDNSBool EventsPending = mDNSfalse;
+
+    VLog("Listening for requests...");
+
+    staticMaxFD = 0;
+
+    if ( d->tcpsd + 1  > staticMaxFD ) staticMaxFD = d->tcpsd + 1;
+    if ( d->udpsd + 1  > staticMaxFD ) staticMaxFD = d->udpsd + 1;
+    if ( d->tlssd + 1  > staticMaxFD ) staticMaxFD = d->tlssd + 1;
+    if ( d->llq_tcpsd + 1 > staticMaxFD ) staticMaxFD = d->llq_tcpsd + 1;
+    if ( d->llq_udpsd + 1 > staticMaxFD ) staticMaxFD = d->llq_udpsd + 1;
+    if ( d->LLQEventListenSock + 1 > staticMaxFD ) staticMaxFD = d->LLQEventListenSock + 1;
+
+    while(1)
+    {
+        EventSource * source;
+        int maxFD;
+
+        // set timeout
+        timeout.tv_sec = timeout.tv_usec = 0;
+        if (gettimeofday(&timenow, NULL)) { LogErr("Run", "gettimeofday"); return -1; }
+
+        if (EventsPending)
+        {
+            if (timenow.tv_sec - EventTS.tv_sec >= 5)           // if we've been waiting 5 seconds for a "quiet" period to send
+            { GenLLQEvents(d); EventsPending = mDNSfalse; }     // events, we go ahead and do it now
+            else timeout.tv_usec = 500000;                      // else do events after 1/2 second with no new events or LLQs
+        }
+        if (!EventsPending)
+        {
+            // if no pending events, timeout when we need to check for expired records
+            if (tablecheck.tv_sec && timenow.tv_sec - tablecheck.tv_sec >= 0)
+            { DeleteRecords(d, mDNSfalse); tablecheck.tv_sec = 0; }     // table check overdue
+            if (!tablecheck.tv_sec) tablecheck.tv_sec = timenow.tv_sec + EXPIRATION_INTERVAL;
+            timeout.tv_sec = tablecheck.tv_sec - timenow.tv_sec;
+        }
+
+        FD_ZERO(&rset);
+        FD_SET( d->tcpsd, &rset );
+        FD_SET( d->udpsd, &rset );
+        FD_SET( d->tlssd, &rset );
+        FD_SET( d->llq_tcpsd, &rset );
+        FD_SET( d->llq_udpsd, &rset );
+        FD_SET( d->LLQEventListenSock, &rset );
+
+        maxFD = staticMaxFD;
+
+        for ( source = ( EventSource* ) d->eventSources.Head; source; source = source->next )
+        {
+            FD_SET( source->fd, &rset );
+
+            if ( source->fd > maxFD )
+            {
+                maxFD = source->fd;
+            }
+        }
+
+        nfds = select( maxFD + 1, &rset, NULL, NULL, &timeout);
+        if (nfds < 0)
+        {
+            if (errno == EINTR)
+            {
+                if (terminate)
+                {
+                    // close sockets to prevent clients from making new requests during shutdown
+                    close( d->tcpsd );
+                    close( d->udpsd );
+                    close( d->tlssd );
+                    close( d->llq_tcpsd );
+                    close( d->llq_udpsd );
+                    d->tcpsd = d->udpsd = d->tlssd = d->llq_tcpsd = d->llq_udpsd = -1;
+                    DeleteRecords(d, mDNStrue);
+                    return 0;
+                }
+                else if (dumptable)
+                {
+                    Log( "Received SIGINFO" );
+
+                    PrintLeaseTable(d);
+                    PrintLLQTable(d);
+                    PrintLLQAnswers(d);
+                    dumptable = 0;
+                }
+                else if (hangup)
+                {
+                    int err;
+
+                    Log( "Received SIGHUP" );
+
+                    err = ParseConfig( d, cfgfile );
+
+                    if ( err )
+                    {
+                        LogErr( "Run", "ParseConfig" );
+                        return -1;
+                    }
+
+                    hangup = 0;
+                }
+                else
+                {
+                    Log("Received unhandled signal - continuing");
+                }
+            }
+            else
+            {
+                LogErr("Run", "select"); return -1;
+            }
+        }
+        else if (nfds)
+        {
+            if (FD_ISSET(d->udpsd, &rset)) RecvUDPMessage( d, d->udpsd );
+            if (FD_ISSET(d->llq_udpsd, &rset)) RecvUDPMessage( d, d->llq_udpsd );
+            if (FD_ISSET(d->tcpsd, &rset)) AcceptTCPConnection( d, d->tcpsd, 0 );
+            if (FD_ISSET(d->llq_tcpsd, &rset)) AcceptTCPConnection( d, d->llq_tcpsd, 0 );
+            if (FD_ISSET(d->tlssd, &rset)) AcceptTCPConnection( d, d->tlssd, TCP_SOCKET_FLAGS );
+            if (FD_ISSET(d->LLQEventListenSock, &rset))
+            {
+                // clear signalling data off socket
+                char buf[256];
+                recv(d->LLQEventListenSock, buf, 256, 0);
+                if (!EventsPending)
+                {
+                    EventsPending = mDNStrue;
+                    if (gettimeofday(&EventTS, NULL)) { LogErr("Run", "gettimeofday"); return -1; }
+                }
+            }
+
+            for ( source = ( EventSource* ) d->eventSources.Head; source; source = source->next )
+            {
+                if ( FD_ISSET( source->fd, &rset ) )
+                {
+                    source->callback( source->context );
+                    break;  // in case we removed this guy from the event loop
+                }
+            }
+        }
+        else
+        {
+            // timeout
+            if (EventsPending) { GenLLQEvents(d); EventsPending = mDNSfalse; }
+            else { DeleteRecords(d, mDNSfalse); tablecheck.tv_sec = 0; }
+        }
+    }
+    return 0;
+}
+
+// signal handler sets global variables, which are inspected by main event loop
+// (select automatically returns due to the handled signal)
+mDNSlocal void HndlSignal(int sig)
+{
+    if (sig == SIGTERM || sig == SIGINT ) { terminate = 1; return; }
+    if (sig == INFO_SIGNAL)               { dumptable = 1; return; }
+    if (sig == SIGHUP)                    { hangup    = 1; return; }
+}
+
+mDNSlocal mStatus
+SetPublicSRV
+(
+    DaemonInfo  *   d,
+    const char  *   name
+)
+{
+    DNameListElem * elem;
+    mStatus err = mStatus_NoError;
+
+    elem = ( DNameListElem* ) malloc( sizeof( DNameListElem ) );
+    require_action( elem, exit, err = mStatus_NoMemoryErr );
+    MakeDomainNameFromDNSNameString( &elem->name, name );
+    elem->next = d->public_names;
+    d->public_names = elem;
+
+exit:
+
+    return err;
+}
+
+
+int main(int argc, char *argv[])
+{
+    int started_via_launchd = 0;
+    DaemonInfo *d;
+    struct rlimit rlim;
+
+    Log("dnsextd starting");
+
+    d = malloc(sizeof(*d));
+    if (!d) { LogErr("main", "malloc"); exit(1); }
+    mDNSPlatformMemZero(d, sizeof(DaemonInfo));
+
+    // Setup the public SRV record names
+
+    SetPublicSRV(d, "_dns-update._udp.");
+    SetPublicSRV(d, "_dns-llq._udp.");
+    SetPublicSRV(d, "_dns-update-tls._tcp.");
+    SetPublicSRV(d, "_dns-query-tls._tcp.");
+    SetPublicSRV(d, "_dns-llq-tls._tcp.");
+
+    // Setup signal handling
+
+    if (signal(SIGHUP,      HndlSignal) == SIG_ERR) perror("Can't catch SIGHUP");
+    if (signal(SIGTERM,     HndlSignal) == SIG_ERR) perror("Can't catch SIGTERM");
+    if (signal(INFO_SIGNAL, HndlSignal) == SIG_ERR) perror("Can't catch SIGINFO");
+    if (signal(SIGINT,      HndlSignal) == SIG_ERR) perror("Can't catch SIGINT");
+    if (signal(SIGPIPE,     SIG_IGN  )  == SIG_ERR) perror("Can't ignore SIGPIPE");
+
+    // remove open file limit
+    rlim.rlim_max = RLIM_INFINITY;
+    rlim.rlim_cur = RLIM_INFINITY;
+    if (setrlimit(RLIMIT_NOFILE, &rlim) < 0)
+    {
+        LogErr("main", "setrlimit");
+        Log("Using default file descriptor resource limit");
+    }
+
+    if (argc > 1 && !strcasecmp(argv[1], "-launchd"))
+    {
+        Log("started_via_launchd");
+        started_via_launchd = 1;
+        argv++;
+        argc--;
+    }
+    if (ProcessArgs(argc, argv, d) < 0) { LogErr("main", "ProcessArgs"); exit(1); }
+
+    if (!foreground && !started_via_launchd)
+    {
+        if (daemon(0,0))
+        {
+            LogErr("main", "daemon");
+            foreground = 1;
+        }
+    }
+
+    if (InitLeaseTable(d) < 0) { LogErr("main", "InitLeaseTable"); exit(1); }
+    if (SetupSockets(d) < 0) { LogErr("main", "SetupSockets"); exit(1); }
+    if (SetUpdateSRV(d) < 0) { LogErr("main", "SetUpdateSRV"); exit(1); }
+
+    Run(d);
+
+    Log("dnsextd stopping");
+
+    if (ClearUpdateSRV(d) < 0) { LogErr("main", "ClearUpdateSRV"); exit(1); }  // clear update srv's even if Run or pthread_create returns an error
+    free(d);
+    exit(0);
+}
+
+
+// These are stubbed out implementations of up-call routines that the various platform support layers
+// call.  These routines are fully implemented in both mDNS.c and uDNS.c, but dnsextd doesn't
+// link this code in.
+//
+// It's an error for these routines to actually be called, so perhaps we should log any call
+// to them.
+void mDNSCoreInitComplete( mDNS * const m, mStatus result) { ( void ) m; ( void ) result; }
+void mDNS_ConfigChanged(mDNS *const m)  { ( void ) m; }
+void mDNSCoreMachineSleep(mDNS * const m, mDNSBool wake) { ( void ) m; ( void ) wake; }
+void mDNSCoreReceive(mDNS *const m, void *const msg, const mDNSu8 *const end,
+                     const mDNSAddr *const srcaddr, const mDNSIPPort srcport,
+                     const mDNSAddr *const dstaddr, const mDNSIPPort dstport, const mDNSInterfaceID iid)
+{ ( void ) m; ( void ) msg; ( void ) end; ( void ) srcaddr; ( void ) srcport; ( void ) dstaddr; ( void ) dstport; ( void ) iid; }
+DNSServer *mDNS_AddDNSServer(mDNS *const m, const domainname *d, const mDNSInterfaceID interface, const int serviceID, const mDNSAddr *addr, const mDNSIPPort port, 
+                             mDNSu32 scoped, mDNSu32 timeout, mDNSBool cellIntf, mDNSu16 resGroupID, mDNSBool reqA, mDNSBool reqAAAA, mDNSBool reqDO)
+{ ( void ) m; ( void ) d; ( void ) interface; ( void ) serviceID; ( void ) addr; ( void ) port; ( void ) scoped; ( void ) timeout; (void) cellIntf; 
+ (void) resGroupID; (void) reqA; (void) reqAAAA; (void) reqDO; return(NULL); }
+void mDNS_AddSearchDomain(const domainname *const domain, mDNSInterfaceID InterfaceID) { (void)domain; (void) InterfaceID;}
+void mDNS_AddDynDNSHostName(mDNS *m, const domainname *fqdn, mDNSRecordCallback *StatusCallback, const void *StatusContext)
+{ ( void ) m; ( void ) fqdn; ( void ) StatusCallback; ( void ) StatusContext; }
+mDNSs32 mDNS_Execute   (mDNS *const m) { ( void ) m; return 0; }
+mDNSs32 mDNS_TimeNow(const mDNS *const m) { ( void ) m; return 0; }
+mStatus mDNS_Deregister(mDNS *const m, AuthRecord *const rr) { ( void ) m; ( void ) rr; return 0; }
+void mDNS_DeregisterInterface(mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping)
+{ ( void ) m; ( void ) set; ( void ) flapping; }
+const char * const mDNS_DomainTypeNames[1] = {};
+mStatus mDNS_GetDomains(mDNS *const m, DNSQuestion *const question, mDNS_DomainType DomainType, const domainname *dom,
+                        const mDNSInterfaceID InterfaceID, mDNSQuestionCallback *Callback, void *Context)
+{ ( void ) m; ( void ) question; ( void ) DomainType; ( void ) dom; ( void ) InterfaceID; ( void ) Callback; ( void ) Context; return 0; }
+mStatus mDNS_Register(mDNS *const m, AuthRecord *const rr) { ( void ) m; ( void ) rr; return 0; }
+mStatus mDNS_RegisterInterface(mDNS *const m, NetworkInterfaceInfo *set, mDNSBool flapping)
+{ ( void ) m; ( void ) set; ( void ) flapping; return 0; }
+void mDNS_RemoveDynDNSHostName(mDNS *m, const domainname *fqdn) { ( void ) m; ( void ) fqdn; }
+void mDNS_SetFQDN(mDNS * const m) { ( void ) m; }
+void mDNS_SetPrimaryInterfaceInfo(mDNS *m, const mDNSAddr *v4addr,  const mDNSAddr *v6addr, const mDNSAddr *router)
+{ ( void ) m; ( void ) v4addr; ( void ) v6addr; ( void ) router; }
+mStatus uDNS_SetupDNSConfig( mDNS *const m ) { ( void ) m; return 0; }
+mStatus mDNS_SetSecretForDomain(mDNS *m, DomainAuthInfo *info,
+                                const domainname *domain, const domainname *keyname, const char *b64keydata, const domainname *hostname, mDNSIPPort *port, mDNSBool autoTunnel)
+{ ( void ) m; ( void ) info; ( void ) domain; ( void ) keyname; ( void ) b64keydata; ( void ) hostname; (void) port; ( void ) autoTunnel; return 0; }
+mStatus mDNS_StopQuery(mDNS *const m, DNSQuestion *const question) { ( void ) m; ( void ) question; return 0; }
+void TriggerEventCompletion(void);
+void TriggerEventCompletion() {}
+int AnonInfoAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q);
+int AnonInfoAnswersQuestion(const ResourceRecord *const rr, const DNSQuestion *const q) { ( void ) rr; ( void ) q; return 1;}
+mDNS mDNSStorage;
+
+
+// For convenience when using the "strings" command, this is the last thing in the file
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char mDNSResponderVersionString_SCCS[] = "@(#) dnsextd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+
+#if _BUILDING_XCODE_PROJECT_
+// If the process crashes, then this string will be magically included in the automatically-generated crash log
+const char *__crashreporter_info__ = mDNSResponderVersionString_SCCS + 5;
+asm (".desc ___crashreporter_info__, 0x10");
+#endif
diff --git a/mDNSResponder/mDNSShared/dnsextd.conf b/mDNSResponder/mDNSShared/dnsextd.conf
new file mode 100644
index 00000000..0379580d
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd.conf
@@ -0,0 +1,60 @@
+// ----------------------------------------------------------------------------
+//
+// Instructions for /etc/dnsextd.conf (this file)
+//
+// In most cases, you should not need to change these default options in
+// the "options" section below. The dnsextd daemon will receive DNS packets
+// on port 53, and forward them on as appropriate to BIND on localhost:5030.
+//
+// You need to edit the "zone" statement below to give the name of your
+// dynamic zone that will be accepting Wide-Area Bonjour DNS updates.
+//
+// ----------------------------------------------------------------------------
+//
+// Instructions for /etc/named.conf
+//
+// In /etc/named.conf you will need to modify the "options" section to
+// tell BIND to accept packets from localhost:5030, like this:
+//
+//   listen-on port 5030 { 127.0.0.1; };
+//
+// You also need a "zone" statement in /etc/named.conf to tell BIND the update
+// policy for your dynamic zone. For example, within a small closed private
+// network, you might allow anyone to perform updates. To do that, you just
+// permit any and all updates coming from dnsextd on the same machine:
+//
+//   zone "my-dynamic-subdomain.company.com."
+//     { type master; file "db.xxx"; allow-update { 127.0.0.1; }; };
+//
+// On a machine connected to the Internet or other large open network,
+// you'll want to limit updates to only users with keys. For example,
+// you could choose to allow anyone with a DNS key on your server to
+// perform updates in your dynamic zone, like this:
+//
+//   key keyname. { algorithm hmac-md5; secret "abcdefghijklmnopqrstuv=="; };
+//   zone "my-dynamic-subdomain.company.com." in
+//     {
+//     type master;
+//     file "db.my-dynamic-subdomain.company.com";
+//     update-policy { grant * wildcard *.my-dynamic-subdomain.company.com.; };
+//     };
+//
+// You could use a single key which you give to all authorized users, but
+// it is better (though more work) to create a unique key for each user.
+//
+// ----------------------------------------------------------------------------
+
+options {
+//  This defaults to: * port 53
+//	listen-on 			port 53 { 192.168.2.10; 127.0.0.1; };
+//  This defaults to: 127.0.0.1:5030
+//	nameserver			address 127.0.0.1 port 5030;
+//  This defaults to: 5533
+//	private 			port 5533;
+//  This defaults to: 5352
+//	llq	   				port 5352;
+};
+
+zone "my-dynamic-subdomain.company.com." {
+	type public;
+};
diff --git a/mDNSResponder/mDNSShared/dnsextd.h b/mDNSResponder/mDNSShared/dnsextd.h
new file mode 100644
index 00000000..67927c9b
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd.h
@@ -0,0 +1,163 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef _dnsextd_h
+#define _dnsextd_h
+
+
+#include <mDNSEmbeddedAPI.h>
+#include <DNSCommon.h>
+#include <GenLinkedList.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+
+#define LLQ_TABLESIZE   1024    // !!!KRS make this dynamically growable
+
+
+typedef enum DNSZoneSpecType
+{
+    kDNSZonePublic,
+    kDNSZonePrivate
+} DNSZoneSpecType;
+
+
+typedef struct DNSZone
+{
+    domainname name;
+    DNSZoneSpecType type;
+    DomainAuthInfo      *   updateKeys; // linked list of keys for signing deletion updates
+    DomainAuthInfo      *   queryKeys;  // linked list of keys for queries
+    struct DNSZone      *   next;
+} DNSZone;
+
+
+typedef struct
+{
+    struct sockaddr_in src;
+    size_t len;
+    DNSZone * zone;
+    mDNSBool isZonePublic;
+    DNSMessage msg;
+    // Note: extra storage for oversized (TCP) messages goes here
+} PktMsg;
+
+// lease table entry
+typedef struct RRTableElem
+{
+    struct RRTableElem *next;
+    struct sockaddr_in cli;   // client's source address
+    long expire;              // expiration time, in seconds since epoch
+    domainname zone;          // from zone field of update message
+    domainname name;          // name of the record
+    CacheRecord rr;           // last field in struct allows for allocation of oversized RRs
+} RRTableElem;
+
+typedef enum
+{
+    RequestReceived = 0,
+    ChallengeSent   = 1,
+    Established     = 2
+} LLQState;
+
+typedef struct AnswerListElem
+{
+    struct AnswerListElem *next;
+    domainname name;
+    mDNSu16 type;
+    CacheRecord *KnownAnswers;  // All valid answers delivered to client
+    CacheRecord *EventList;     // New answers (adds/removes) to be sent to client
+    int refcount;
+    mDNSBool UseTCP;            // Use TCP if UDP would cause truncation
+    pthread_t tid;              // Allow parallel list updates
+} AnswerListElem;
+
+// llq table entry
+typedef struct LLQEntry
+{
+    struct LLQEntry *next;
+    struct sockaddr_in cli;   // clien'ts source address
+    domainname qname;
+    mDNSu16 qtype;
+    mDNSOpaque64 id;
+    LLQState state;
+    mDNSu32 lease;            // original lease, in seconds
+    mDNSs32 expire;           // expiration, absolute, in seconds since epoch
+    AnswerListElem *AnswerList;
+} LLQEntry;
+
+
+typedef void (*EventCallback)( void * context );
+
+typedef struct EventSource
+{
+    EventCallback callback;
+    void                *   context;
+    TCPSocket *         sock;
+    int fd;
+    mDNSBool markedForDeletion;
+    struct  EventSource *   next;
+} EventSource;
+
+
+// daemon-wide information
+typedef struct
+{
+    // server variables - read only after initialization (no locking)
+    struct sockaddr_in addr;            // the address we will bind to
+    struct sockaddr_in llq_addr;        // the address we will receive llq requests on.
+    struct sockaddr_in ns_addr;         // the real ns server address
+    int tcpsd;                          // listening TCP socket for dns requests
+    int udpsd;                          // listening UDP socket for dns requests
+    int tlssd;                          // listening TCP socket for private browsing
+    int llq_tcpsd;                      // listening TCP socket for llq service
+    int llq_udpsd;                      // listening UDP socket for llq service
+    DNameListElem   *   public_names;   // list of public SRV names
+    DNSZone         *   zones;
+
+    // daemon variables - read only after initialization (no locking)
+    mDNSIPPort private_port;           // listening port for private messages
+    mDNSIPPort llq_port;           // listening port for llq
+
+    // lease table variables (locked via mutex after initialization)
+    RRTableElem **table;       // hashtable for records with leases
+    pthread_mutex_t tablelock; // mutex for lease table
+    mDNSs32 nbuckets;          // buckets allocated
+    mDNSs32 nelems;            // elements in table
+
+    // LLQ table variables
+    LLQEntry *LLQTable[LLQ_TABLESIZE];  // !!!KRS change this and RRTable to use a common data structure
+    AnswerListElem *AnswerTable[LLQ_TABLESIZE];
+    int AnswerTableCount;
+    int LLQEventNotifySock;          // Unix domain socket pair - update handling thread writes to EventNotifySock, which wakes
+    int LLQEventListenSock;          // the main thread listening on EventListenSock, indicating that the zone has changed
+
+    GenLinkedList eventSources;     // linked list of EventSource's
+} DaemonInfo;
+
+
+int
+ParseConfig
+(
+    DaemonInfo  *   d,
+    const char  *   file
+);
+
+
+#endif
diff --git a/mDNSResponder/mDNSShared/dnsextd_lexer.l b/mDNSResponder/mDNSShared/dnsextd_lexer.l
new file mode 100644
index 00000000..5cac1060
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd_lexer.l
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2006-2011 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+%{
+#include <string.h>
+#include <stdio.h>
+#include "dnsextd_parser.h"
+
+
+extern YYSTYPE yylval;
+
+/* Mac OS X 10.4 has flex version 2.5.4, which doesn't define yylineno for us */
+/* Mac OS X 10.5 has flex version 2.5.33, which does define yylineno          */
+#if YY_FLEX_MAJOR_VERSION <= 2 && YY_FLEX_MINOR_VERSION <= 5 && YY_FLEX_SUBMINOR_VERSION <= 4
+int yylineno = 1;
+#endif
+#define YY_NO_INPUT 1
+int  yylex(void);
+
+static char*
+StripQuotes
+	(
+	const char * string
+	)
+{
+	char * dup;
+
+	dup = strdup( string + 1);
+
+	dup[ strlen( dup ) - 1 ] = '\0';
+
+	return dup;
+}
+
+
+%}
+
+%option nounput
+%%
+
+options								return OPTIONS;
+listen-on							return LISTEN_ON;
+nameserver							return NAMESERVER;
+port								return PORT;
+address								return ADDRESS;
+llq									return LLQ;
+public								return PUBLIC;
+private								return PRIVATE;
+key									return KEY;
+allow-update						return ALLOWUPDATE;
+allow-query							return ALLOWQUERY;
+algorithm							return ALGORITHM;
+secret								return SECRET;
+zone                    			return ZONE;
+type                    			return TYPE;
+allow								return ALLOW;
+\{                      			return OBRACE;
+\}                      			return EBRACE;
+;                       			return SEMICOLON;
+IN									return IN;
+\*									yylval.string = strdup(yytext);	return WILDCARD;
+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+		yylval.string = strdup(yytext);	return DOTTED_DECIMAL_ADDRESS;
+[0123456789]+						yylval.number = atoi(yytext);	return NUMBER;
+[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*		yylval.string = strdup(yytext);	return HOSTNAME;
+[a-zA-Z0-9\.]+([a-zA-Z0-9\.]+)*		yylval.string = strdup(yytext);	return DOMAINNAME;
+\"([^"\\\r\n]*(\\.[^"\\\r\n]*)*)\"	yylval.string = StripQuotes(yytext);	return QUOTEDSTRING;
+[\/][\/].*							/* ignore C++ style comments */;
+\n                      			yylineno++; /* ignore EOL */;
+[ \t]+                  			/* ignore whitespace */;
+%%
diff --git a/mDNSResponder/mDNSShared/dnsextd_parser.y b/mDNSResponder/mDNSShared/dnsextd_parser.y
new file mode 100644
index 00000000..18c5990f
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnsextd_parser.y
@@ -0,0 +1,585 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+%{
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "mDNSEmbeddedAPI.h"
+#include "DebugServices.h"
+#include "dnsextd.h"
+
+void yyerror( const char* error );
+int  yylex(void);
+
+
+typedef struct StringListElem
+{
+	char					*	string;
+	struct StringListElem	*	next;
+} StringListElem;
+
+
+typedef struct OptionsInfo
+{
+	char	server_address[ 256 ];
+	int		server_port;
+	char	source_address[ 256 ];
+	int		source_port;
+	int		private_port;
+	int		llq_port;
+} OptionsInfo;
+
+
+typedef struct ZoneInfo
+{
+	char	name[ 256 ];
+	char	certificate_name[ 256 ];
+	char	allow_clients_file[ 256 ];
+	char	allow_clients[ 256 ];
+	char	key[ 256 ];
+} ZoneInfo;
+
+
+typedef struct KeySpec
+{
+	char 				name[ 256 ];
+	char				algorithm[ 256 ];
+	char				secret[ 256 ];
+	struct KeySpec	*	next;
+} KeySpec;
+
+
+typedef struct ZoneSpec
+{
+	char				name[ 256 ];
+	DNSZoneSpecType		type;
+	StringListElem	*	allowUpdate;
+	StringListElem	*	allowQuery;
+	char				key[ 256 ];
+	struct ZoneSpec	*	next;
+} ZoneSpec;
+
+
+static StringListElem	*	g_stringList = NULL;
+static KeySpec			*	g_keys;
+static ZoneSpec			*	g_zones;
+static ZoneSpec				g_zoneSpec;
+static const char		*	g_filename;
+
+#define YYPARSE_PARAM  context
+
+void
+SetupOptions
+	(
+	OptionsInfo	*	info,
+	void		*	context
+	);
+
+%}
+
+%union
+{
+	int			number;
+	char	*	string;
+}
+
+%token	OPTIONS 
+%token	LISTEN_ON 
+%token	NAMESERVER
+%token	PORT 
+%token	ADDRESS 
+%token	LLQ 
+%token	PUBLIC
+%token  PRIVATE
+%token  ALLOWUPDATE
+%token  ALLOWQUERY
+%token	KEY 
+%token  ALGORITHM
+%token  SECRET
+%token  ISSUER
+%token  SERIAL
+%token	ZONE
+%token  TYPE
+%token	ALLOW
+%token	OBRACE 
+%token	EBRACE 
+%token	SEMICOLON
+%token 	IN
+%token	<string>	DOTTED_DECIMAL_ADDRESS 
+%token	<string>	WILDCARD 
+%token	<string>	DOMAINNAME 
+%token	<string>	HOSTNAME 
+%token	<string>	QUOTEDSTRING
+%token	<number> 	NUMBER 
+
+%type	<string>	addressstatement
+%type	<string>	networkaddress
+
+%%
+
+commands:
+        |        
+        commands command SEMICOLON
+        ;
+
+
+command:
+		options_set
+		|
+        zone_set 
+		|
+		key_set
+        ;
+
+
+options_set:
+		OPTIONS optionscontent
+		{
+			// SetupOptions( &g_optionsInfo, context );
+		}
+		;
+
+optionscontent:
+		OBRACE optionsstatements EBRACE
+		;
+
+optionsstatements:
+		|
+		optionsstatements optionsstatement SEMICOLON
+		;
+
+
+optionsstatement:
+		statements
+		|
+		LISTEN_ON addresscontent
+		{
+		}
+		|
+		LISTEN_ON PORT NUMBER addresscontent
+		{
+		}
+		|
+		NAMESERVER ADDRESS networkaddress
+		{
+		}
+		|
+		NAMESERVER ADDRESS networkaddress PORT NUMBER
+		{
+		}
+		|
+		PRIVATE PORT NUMBER
+		{
+			( ( DaemonInfo* ) context )->private_port = mDNSOpaque16fromIntVal( $3 );
+		}
+		|
+		LLQ PORT NUMBER
+		{
+			( ( DaemonInfo* ) context )->llq_port = mDNSOpaque16fromIntVal( $3 );
+		}
+		;
+
+key_set:
+        KEY QUOTEDSTRING OBRACE SECRET QUOTEDSTRING SEMICOLON EBRACE
+        {
+			KeySpec	* keySpec;
+
+			keySpec = ( KeySpec* ) malloc( sizeof( KeySpec ) );
+
+			if ( !keySpec )
+				{
+				LogMsg("ERROR: memory allocation failure");
+				YYABORT;
+				}
+
+			strncpy( keySpec->name, $2, sizeof( keySpec->name ) );
+			strncpy( keySpec->secret, $5, sizeof( keySpec->secret ) );
+
+			keySpec->next	= g_keys;
+			g_keys			= keySpec;
+        }
+        ;
+
+zone_set:
+		ZONE QUOTEDSTRING zonecontent
+		{
+			ZoneSpec * zoneSpec;
+
+			zoneSpec = ( ZoneSpec* ) malloc( sizeof( ZoneSpec ) );
+
+			if ( !zoneSpec )
+				{
+				LogMsg("ERROR: memory allocation failure");
+				YYABORT;
+				}
+
+			strncpy( zoneSpec->name, $2, sizeof( zoneSpec->name ) );
+			zoneSpec->type = g_zoneSpec.type;
+			strcpy( zoneSpec->key, g_zoneSpec.key );
+			zoneSpec->allowUpdate = g_zoneSpec.allowUpdate;
+			zoneSpec->allowQuery = g_zoneSpec.allowQuery;
+
+			zoneSpec->next = g_zones;
+			g_zones = zoneSpec;
+		}
+		|
+		ZONE QUOTEDSTRING IN zonecontent
+        {
+			ZoneSpec * zoneSpec;
+
+			zoneSpec = ( ZoneSpec* ) malloc( sizeof( ZoneSpec ) );
+
+			if ( !zoneSpec )
+				{
+				LogMsg("ERROR: memory allocation failure");
+				YYABORT;
+				}
+
+			strncpy( zoneSpec->name, $2, sizeof( zoneSpec->name ) );
+			zoneSpec->type = g_zoneSpec.type;
+			strcpy( zoneSpec->key, g_zoneSpec.key );
+			zoneSpec->allowUpdate = g_zoneSpec.allowUpdate;
+			zoneSpec->allowQuery = g_zoneSpec.allowQuery;
+
+			zoneSpec->next = g_zones;
+			g_zones = zoneSpec;
+		}
+        ;
+
+zonecontent:
+		OBRACE zonestatements EBRACE 
+
+zonestatements:
+        |
+        zonestatements zonestatement SEMICOLON
+        ;
+
+zonestatement:
+		TYPE PUBLIC
+		{
+			g_zoneSpec.type = kDNSZonePublic;
+		}
+		|
+		TYPE PRIVATE
+		{
+			g_zoneSpec.type = kDNSZonePrivate;
+		}
+		|
+		ALLOWUPDATE keycontent
+		{
+			g_zoneSpec.allowUpdate = g_stringList;
+			g_stringList = NULL;
+		}
+		|
+		ALLOWQUERY keycontent
+		{
+			g_zoneSpec.allowQuery = g_stringList;
+			g_stringList = NULL;
+		}
+        ;
+
+addresscontent:
+		OBRACE addressstatements EBRACE
+		{
+		}
+
+addressstatements:
+		|
+		addressstatements addressstatement SEMICOLON
+		{
+		}
+		;
+
+addressstatement:
+		DOTTED_DECIMAL_ADDRESS
+		{
+		}
+		;
+
+
+keycontent:
+		OBRACE keystatements EBRACE
+		{
+		}
+
+keystatements:
+		|
+		keystatements keystatement SEMICOLON
+		{
+		}
+		;
+
+keystatement:
+		KEY DOMAINNAME
+		{
+			StringListElem * elem;
+
+			elem = ( StringListElem* ) malloc( sizeof( StringListElem ) );
+
+			if ( !elem )
+				{
+				LogMsg("ERROR: memory allocation failure");
+				YYABORT;
+				}
+
+			elem->string = $2;
+
+			elem->next		= g_stringList;
+			g_stringList	= elem;
+		}
+		;
+
+
+networkaddress:
+		DOTTED_DECIMAL_ADDRESS
+		|
+		HOSTNAME
+		|
+		WILDCARD
+		;
+
+block: 
+		OBRACE zonestatements EBRACE SEMICOLON
+        ;
+
+statements:
+        |
+		statements statement
+        ;
+
+statement:
+		block
+		{
+			$<string>$ = NULL;
+		}
+		|
+		QUOTEDSTRING
+		{
+			$<string>$ = $1;
+		}
+%%
+
+int yywrap(void);
+
+extern int yylineno;
+
+void yyerror( const char *str )
+{
+        fprintf( stderr,"%s:%d: error: %s\n", g_filename, yylineno, str );
+}
+ 
+int yywrap()
+{
+        return 1;
+} 
+
+
+int
+ParseConfig
+	(
+	DaemonInfo	*	d,
+	const char	*	file
+	)
+	{
+	extern FILE		*	yyin;
+	DNSZone			*	zone;
+	DomainAuthInfo	*	key;
+	KeySpec			*	keySpec;
+	ZoneSpec		*	zoneSpec;
+	int					err = 0;
+
+	g_filename = file;
+
+	// Tear down the current zone specifiers
+
+	zone = d->zones;
+
+	while ( zone )
+		{
+		DNSZone * next = zone->next;
+
+		key = zone->updateKeys;
+
+		while ( key )
+			{
+			DomainAuthInfo * nextKey = key->next;
+
+			free( key );
+
+			key = nextKey;
+			}
+
+		key = zone->queryKeys;
+
+		while ( key )
+			{
+			DomainAuthInfo * nextKey = key->next;
+
+			free( key );
+
+			key = nextKey;
+			}
+
+		free( zone );
+
+		zone = next;
+		}
+
+	d->zones = NULL;
+	
+	yyin = fopen( file, "r" );
+	require_action( yyin, exit, err = 0 );
+
+	err = yyparse( ( void* ) d );
+	require_action( !err, exit, err = 1 );
+
+	for ( zoneSpec = g_zones; zoneSpec; zoneSpec = zoneSpec->next )
+		{
+		StringListElem  *   elem;
+		mDNSu8			*	ok;
+
+		zone = ( DNSZone* ) malloc( sizeof( DNSZone ) );
+		require_action( zone, exit, err = 1 );
+		memset( zone, 0, sizeof( DNSZone ) );
+
+		zone->next	= d->zones;
+		d->zones	= zone;
+
+		// Fill in the domainname
+
+		ok = MakeDomainNameFromDNSNameString( &zone->name, zoneSpec->name );
+		require_action( ok, exit, err = 1 );
+
+		// Fill in the type
+
+		zone->type = zoneSpec->type;
+
+		// Fill in the allow-update keys
+
+		for ( elem = zoneSpec->allowUpdate; elem; elem = elem->next )
+			{
+			mDNSBool found = mDNSfalse;
+
+			for ( keySpec = g_keys; keySpec; keySpec = keySpec->next )
+				{
+				if ( strcmp( elem->string, keySpec->name ) == 0 )
+					{
+					DomainAuthInfo	*	authInfo = malloc( sizeof( DomainAuthInfo ) );
+					mDNSs32				keylen;
+					require_action( authInfo, exit, err = 1 );
+					memset( authInfo, 0, sizeof( DomainAuthInfo ) );
+
+					ok = MakeDomainNameFromDNSNameString( &authInfo->keyname, keySpec->name );
+					if (!ok) { free(authInfo); err = 1; goto exit; }
+
+					keylen = DNSDigest_ConstructHMACKeyfromBase64( authInfo, keySpec->secret );
+					if (keylen < 0) { free(authInfo); err = 1; goto exit; }
+
+					authInfo->next = zone->updateKeys;
+					zone->updateKeys = authInfo;
+
+					found = mDNStrue;
+
+					break;
+					}
+				}
+
+			// Log this
+			require_action( found, exit, err = 1 );
+			}
+
+		// Fill in the allow-query keys
+
+		for ( elem = zoneSpec->allowQuery; elem; elem = elem->next )
+			{
+			mDNSBool found = mDNSfalse;
+
+			for ( keySpec = g_keys; keySpec; keySpec = keySpec->next )
+				{
+				if ( strcmp( elem->string, keySpec->name ) == 0 )
+					{
+					DomainAuthInfo	*	authInfo = malloc( sizeof( DomainAuthInfo ) );
+					mDNSs32				keylen;
+					require_action( authInfo, exit, err = 1 );
+					memset( authInfo, 0, sizeof( DomainAuthInfo ) );
+
+					ok = MakeDomainNameFromDNSNameString( &authInfo->keyname, keySpec->name );
+					if (!ok) { free(authInfo); err = 1; goto exit; }
+
+					keylen = DNSDigest_ConstructHMACKeyfromBase64( authInfo, keySpec->secret );
+					if (keylen < 0) { free(authInfo); err = 1; goto exit; }
+
+					authInfo->next = zone->queryKeys;
+					zone->queryKeys = authInfo;
+
+					found = mDNStrue;
+
+					break;
+					}
+				}
+
+			// Log this
+			require_action( found, exit, err = 1 );
+			}
+		}
+
+exit:
+
+	return err;
+	}
+
+
+void
+SetupOptions
+	(
+	OptionsInfo	*	info,
+	void		*	context
+	)
+	{
+	DaemonInfo * d = ( DaemonInfo* ) context;
+
+	if ( strlen( info->source_address ) )
+		{
+		inet_pton( AF_INET, info->source_address, &d->addr.sin_addr );
+		}
+
+	if ( info->source_port )
+		{
+		d->addr.sin_port = htons( ( mDNSu16 ) info->source_port );
+		}
+				
+	if ( strlen( info->server_address ) )
+		{
+		inet_pton( AF_INET, info->server_address, &d->ns_addr.sin_addr );
+		}
+
+	if ( info->server_port )
+		{
+		d->ns_addr.sin_port = htons( ( mDNSu16 ) info->server_port );
+		}
+
+	if ( info->private_port )
+		{
+		d->private_port = mDNSOpaque16fromIntVal( info->private_port );
+		}
+
+	if ( info->llq_port )
+		{
+		d->llq_port = mDNSOpaque16fromIntVal( info->llq_port );
+		}
+	}
diff --git a/mDNSResponder/mDNSShared/dnssd_clientlib.c b/mDNSResponder/mDNSShared/dnssd_clientlib.c
new file mode 100644
index 00000000..cca58853
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnssd_clientlib.c
@@ -0,0 +1,366 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dns_sd.h"
+
+#if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
+#pragma export on
+#endif
+
+#if defined(_WIN32)
+// disable warning "conversion from <data> to uint16_t"
+#pragma warning(disable:4244)
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#endif
+
+/*********************************************************************************************
+*
+*  Supporting Functions
+*
+*********************************************************************************************/
+
+#define mDNSIsDigit(X)     ((X) >= '0' && (X) <= '9')
+
+// DomainEndsInDot returns 1 if name ends with a dot, 0 otherwise
+// (DNSServiceConstructFullName depends this returning 1 for true, rather than any non-zero value meaning true)
+
+static int DomainEndsInDot(const char *dom)
+{
+    while (dom[0] && dom[1])
+    {
+        if (dom[0] == '\\') // advance past escaped byte sequence
+        {
+            if (mDNSIsDigit(dom[1]) && mDNSIsDigit(dom[2]) && mDNSIsDigit(dom[3]))
+                dom += 4;           // If "\ddd"    then skip four
+            else dom += 2;          // else if "\x" then skip two
+        }
+        else dom++;                 // else goto next character
+    }
+    return (dom[0] == '.');
+}
+
+static uint8_t *InternalTXTRecordSearch
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    const char       *key,
+    unsigned long    *keylen
+)
+{
+    uint8_t *p = (uint8_t*)txtRecord;
+    uint8_t *e = p + txtLen;
+    *keylen = (unsigned long) strlen(key);
+    while (p<e)
+    {
+        uint8_t *x = p;
+        p += 1 + p[0];
+        if (p <= e && *keylen <= x[0] && !strncasecmp(key, (char*)x+1, *keylen))
+            if (*keylen == x[0] || x[1+*keylen] == '=') return(x);
+    }
+    return(NULL);
+}
+
+/*********************************************************************************************
+*
+*  General Utility Functions
+*
+*********************************************************************************************/
+
+// Note: Need to make sure we don't write more than kDNSServiceMaxDomainName (1009) bytes to fullName
+// In earlier builds this constant was defined to be 1005, so to avoid buffer overruns on clients
+// compiled with that constant we'll actually limit the output to 1005 bytes.
+
+DNSServiceErrorType DNSSD_API DNSServiceConstructFullName
+(
+    char       *const fullName,
+    const char *const service,      // May be NULL
+    const char *const regtype,
+    const char *const domain
+)
+{
+    const size_t len = !regtype ? 0 : strlen(regtype) - DomainEndsInDot(regtype);
+    char       *fn   = fullName;
+    char *const lim  = fullName + 1005;
+    const char *s    = service;
+    const char *r    = regtype;
+    const char *d    = domain;
+
+    // regtype must be at least "x._udp" or "x._tcp"
+    if (len < 6 || !domain || !domain[0]) return kDNSServiceErr_BadParam;
+    if (strncasecmp((regtype + len - 4), "_tcp", 4) && strncasecmp((regtype + len - 4), "_udp", 4)) return kDNSServiceErr_BadParam;
+
+    if (service && *service)
+    {
+        while (*s)
+        {
+            unsigned char c = *s++;             // Needs to be unsigned, or values like 0xFF will be interpreted as < 32
+            if (c <= ' ')                       // Escape non-printable characters
+            {
+                if (fn+4 >= lim) goto fail;
+                *fn++ = '\\';
+                *fn++ = '0' + (c / 100);
+                *fn++ = '0' + (c /  10) % 10;
+                c     = '0' + (c      ) % 10;
+            }
+            else if (c == '.' || (c == '\\'))   // Escape dot and backslash literals
+            {
+                if (fn+2 >= lim) goto fail;
+                *fn++ = '\\';
+            }
+            else
+            if (fn+1 >= lim) goto fail;
+            *fn++ = (char)c;
+        }
+        *fn++ = '.';
+    }
+
+    while (*r) if (fn+1 >= lim) goto fail;else *fn++ = *r++;
+    if (!DomainEndsInDot(regtype)) { if (fn+1 >= lim) goto fail;else *fn++ = '.';}
+
+    while (*d) if (fn+1 >= lim) goto fail;else *fn++ = *d++;
+    if (!DomainEndsInDot(domain)) { if (fn+1 >= lim) goto fail;else *fn++ = '.';}
+
+    *fn = '\0';
+    return kDNSServiceErr_NoError;
+
+fail:
+    *fn = '\0';
+    return kDNSServiceErr_BadParam;
+}
+
+/*********************************************************************************************
+*
+*   TXT Record Construction Functions
+*
+*********************************************************************************************/
+
+typedef struct _TXTRecordRefRealType
+{
+    uint8_t  *buffer;       // Pointer to data
+    uint16_t buflen;        // Length of buffer
+    uint16_t datalen;       // Length currently in use
+    uint16_t malloced;  // Non-zero if buffer was allocated via malloc()
+} TXTRecordRefRealType;
+
+#define txtRec ((TXTRecordRefRealType*)txtRecord)
+
+// The opaque storage defined in the public dns_sd.h header is 16 bytes;
+// make sure we don't exceed that.
+struct CompileTimeAssertionCheck_dnssd_clientlib
+{
+    char assert0[(sizeof(TXTRecordRefRealType) <= 16) ? 1 : -1];
+};
+
+void DNSSD_API TXTRecordCreate
+(
+    TXTRecordRef     *txtRecord,
+    uint16_t bufferLen,
+    void             *buffer
+)
+{
+    txtRec->buffer   = buffer;
+    txtRec->buflen   = buffer ? bufferLen : (uint16_t)0;
+    txtRec->datalen  = 0;
+    txtRec->malloced = 0;
+}
+
+void DNSSD_API TXTRecordDeallocate(TXTRecordRef *txtRecord)
+{
+    if (txtRec->malloced) free(txtRec->buffer);
+}
+
+DNSServiceErrorType DNSSD_API TXTRecordSetValue
+(
+    TXTRecordRef     *txtRecord,
+    const char       *key,
+    uint8_t valueSize,
+    const void       *value
+)
+{
+    uint8_t *start, *p;
+    const char *k;
+    unsigned long keysize, keyvalsize;
+
+    for (k = key; *k; k++) if (*k < 0x20 || *k > 0x7E || *k == '=') return(kDNSServiceErr_Invalid);
+    keysize = (unsigned long)(k - key);
+    keyvalsize = 1 + keysize + (value ? (1 + valueSize) : 0);
+    if (keysize < 1 || keyvalsize > 255) return(kDNSServiceErr_Invalid);
+    (void)TXTRecordRemoveValue(txtRecord, key);
+    if (txtRec->datalen + keyvalsize > txtRec->buflen)
+    {
+        unsigned char *newbuf;
+        unsigned long newlen = txtRec->datalen + keyvalsize;
+        if (newlen > 0xFFFF) return(kDNSServiceErr_Invalid);
+        newbuf = malloc((size_t)newlen);
+        if (!newbuf) return(kDNSServiceErr_NoMemory);
+        memcpy(newbuf, txtRec->buffer, txtRec->datalen);
+        if (txtRec->malloced) free(txtRec->buffer);
+        txtRec->buffer = newbuf;
+        txtRec->buflen = (uint16_t)(newlen);
+        txtRec->malloced = 1;
+    }
+    start = txtRec->buffer + txtRec->datalen;
+    p = start + 1;
+    memcpy(p, key, keysize);
+    p += keysize;
+    if (value)
+    {
+        *p++ = '=';
+        memcpy(p, value, valueSize);
+        p += valueSize;
+    }
+    *start = (uint8_t)(p - start - 1);
+    txtRec->datalen += p - start;
+    return(kDNSServiceErr_NoError);
+}
+
+DNSServiceErrorType DNSSD_API TXTRecordRemoveValue
+(
+    TXTRecordRef     *txtRecord,
+    const char       *key
+)
+{
+    unsigned long keylen, itemlen, remainder;
+    uint8_t *item = InternalTXTRecordSearch(txtRec->datalen, txtRec->buffer, key, &keylen);
+    if (!item) return(kDNSServiceErr_NoSuchKey);
+    itemlen   = (unsigned long)(1 + item[0]);
+    remainder = (unsigned long)((txtRec->buffer + txtRec->datalen) - (item + itemlen));
+    // Use memmove because memcpy behaviour is undefined for overlapping regions
+    memmove(item, item + itemlen, remainder);
+    txtRec->datalen -= itemlen;
+    return(kDNSServiceErr_NoError);
+}
+
+uint16_t DNSSD_API TXTRecordGetLength  (const TXTRecordRef *txtRecord) { return(txtRec->datalen); }
+const void * DNSSD_API TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) { return(txtRec->buffer); }
+
+/*********************************************************************************************
+*
+*   TXT Record Parsing Functions
+*
+*********************************************************************************************/
+
+int DNSSD_API TXTRecordContainsKey
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    const char       *key
+)
+{
+    unsigned long keylen;
+    return (InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen) ? 1 : 0);
+}
+
+const void * DNSSD_API TXTRecordGetValuePtr
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    const char       *key,
+    uint8_t          *valueLen
+)
+{
+    unsigned long keylen;
+    uint8_t *item = InternalTXTRecordSearch(txtLen, txtRecord, key, &keylen);
+    if (!item || item[0] <= keylen) return(NULL);   // If key not found, or found with no value, return NULL
+    *valueLen = (uint8_t)(item[0] - (keylen + 1));
+    return (item + 1 + keylen + 1);
+}
+
+uint16_t DNSSD_API TXTRecordGetCount
+(
+    uint16_t txtLen,
+    const void       *txtRecord
+)
+{
+    uint16_t count = 0;
+    uint8_t *p = (uint8_t*)txtRecord;
+    uint8_t *e = p + txtLen;
+    while (p<e) { p += 1 + p[0]; count++; }
+    return((p>e) ? (uint16_t)0 : count);
+}
+
+DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
+(
+    uint16_t txtLen,
+    const void       *txtRecord,
+    uint16_t itemIndex,
+    uint16_t keyBufLen,
+    char             *key,
+    uint8_t          *valueLen,
+    const void       **value
+)
+{
+    uint16_t count = 0;
+    uint8_t *p = (uint8_t*)txtRecord;
+    uint8_t *e = p + txtLen;
+    while (p<e && count<itemIndex) { p += 1 + p[0]; count++; }  // Find requested item
+    if (p<e && p + 1 + p[0] <= e)   // If valid
+    {
+        uint8_t *x = p+1;
+        unsigned long len = 0;
+        e = p + 1 + p[0];
+        while (x+len<e && x[len] != '=') len++;
+        if (len >= keyBufLen) return(kDNSServiceErr_NoMemory);
+        memcpy(key, x, len);
+        key[len] = 0;
+        if (x+len<e)        // If we found '='
+        {
+            *value = x + len + 1;
+            *valueLen = (uint8_t)(p[0] - (len + 1));
+        }
+        else
+        {
+            *value = NULL;
+            *valueLen = 0;
+        }
+        return(kDNSServiceErr_NoError);
+    }
+    return(kDNSServiceErr_Invalid);
+}
+
+/*********************************************************************************************
+*
+*   SCCS-compatible version string
+*
+*********************************************************************************************/
+
+// For convenience when using the "strings" command, this is the last thing in the file
+
+// Note: The C preprocessor stringify operator ('#') makes a string from its argument, without macro expansion
+// e.g. If "version" is #define'd to be "4", then STRINGIFY_AWE(version) will return the string "version", not "4"
+// To expand "version" to its value before making the string, use STRINGIFY(version) instead
+#define STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s) # s
+#define STRINGIFY(s) STRINGIFY_ARGUMENT_WITHOUT_EXPANSION(s)
+
+// NOT static -- otherwise the compiler may optimize it out
+// The "@(#) " pattern is a special prefix the "what" command looks for
+const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
diff --git a/mDNSResponder/mDNSShared/dnssd_clientshim.c b/mDNSResponder/mDNSShared/dnssd_clientshim.c
new file mode 100644
index 00000000..cb143104
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnssd_clientshim.c
@@ -0,0 +1,811 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+ * This file defines a simple shim layer between a client calling the "/usr/include/dns_sd.h" APIs
+ * and an implementation of mDNSCore ("mDNSEmbeddedAPI.h" APIs) in the same address space.
+ * When the client calls a dns_sd.h function, the shim calls the corresponding mDNSEmbeddedAPI.h
+ * function, and when mDNSCore calls the shim's callback, we call through to the client's callback.
+ * The shim is responsible for two main things:
+ * - converting string parameters between C string format and native DNS format,
+ * - and for allocating and freeing memory.
+ */
+
+#include "dns_sd.h"             // Defines the interface to the client layer above
+#include "mDNSEmbeddedAPI.h"        // The interface we're building on top of
+extern mDNS mDNSStorage;        // We need to pass the address of this storage to the lower-layer functions
+
+#if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
+#pragma export on
+#endif
+
+//*************************************************************************************************************
+// General Utility Functions
+
+// All mDNS_DirectOP structures start with the pointer to the type-specific disposal function.
+// Optional type-specific data follows these three fields
+// When the client starts an operation, we return the address of the corresponding mDNS_DirectOP
+// as the DNSServiceRef for the operation
+// We stash the value in core context fields so we can get it back to recover our state in our callbacks,
+// and pass it though to the client for it to recover its state
+
+typedef struct mDNS_DirectOP_struct mDNS_DirectOP;
+typedef void mDNS_DirectOP_Dispose (mDNS_DirectOP *op);
+struct mDNS_DirectOP_struct
+{
+    mDNS_DirectOP_Dispose  *disposefn;
+};
+
+typedef struct
+{
+    mDNS_DirectOP_Dispose  *disposefn;
+    DNSServiceRegisterReply callback;
+    void                   *context;
+    mDNSBool autoname;                      // Set if this name is tied to the Computer Name
+    mDNSBool autorename;                    // Set if we just got a name conflict and now need to automatically pick a new name
+    domainlabel name;
+    domainname host;
+    ServiceRecordSet s;
+} mDNS_DirectOP_Register;
+
+typedef struct
+{
+    mDNS_DirectOP_Dispose  *disposefn;
+    DNSServiceBrowseReply callback;
+    void                   *context;
+    DNSQuestion q;
+} mDNS_DirectOP_Browse;
+
+typedef struct
+{
+    mDNS_DirectOP_Dispose  *disposefn;
+    DNSServiceResolveReply callback;
+    void                   *context;
+    const ResourceRecord   *SRV;
+    const ResourceRecord   *TXT;
+    DNSQuestion qSRV;
+    DNSQuestion qTXT;
+} mDNS_DirectOP_Resolve;
+
+typedef struct
+{
+    mDNS_DirectOP_Dispose      *disposefn;
+    DNSServiceQueryRecordReply callback;
+    void                       *context;
+    DNSQuestion q;
+} mDNS_DirectOP_QueryRecord;
+
+int DNSServiceRefSockFD(DNSServiceRef sdRef)
+{
+    (void)sdRef;    // Unused
+    return(0);
+}
+
+DNSServiceErrorType DNSServiceProcessResult(DNSServiceRef sdRef)
+{
+    (void)sdRef;    // Unused
+    return(kDNSServiceErr_NoError);
+}
+
+void DNSServiceRefDeallocate(DNSServiceRef sdRef)
+{
+    mDNS_DirectOP *op = (mDNS_DirectOP *)sdRef;
+    //LogMsg("DNSServiceRefDeallocate");
+    op->disposefn(op);
+}
+
+//*************************************************************************************************************
+// Domain Enumeration
+
+// Not yet implemented, so don't include in stub library
+// We DO include it in the actual Extension, so that if a later client compiled to use this
+// is run against this Extension, it will get a reasonable error code instead of just
+// failing to launch (Strong Link) or calling an unresolved symbol and crashing (Weak Link)
+#if !MDNS_BUILDINGSTUBLIBRARY
+DNSServiceErrorType DNSServiceEnumerateDomains
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceDomainEnumReply callback,
+    void                                *context  /* may be NULL */
+)
+{
+    (void)sdRef;            // Unused
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+    (void)callback;         // Unused
+    (void)context;          // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+#endif
+
+//*************************************************************************************************************
+// Register Service
+
+mDNSlocal void FreeDNSServiceRegistration(mDNS_DirectOP_Register *x)
+{
+    while (x->s.Extras)
+    {
+        ExtraResourceRecord *extras = x->s.Extras;
+        x->s.Extras = x->s.Extras->next;
+        if (extras->r.resrec.rdata != &extras->r.rdatastorage)
+            mDNSPlatformMemFree(extras->r.resrec.rdata);
+        mDNSPlatformMemFree(extras);
+    }
+
+    if (x->s.RR_TXT.resrec.rdata != &x->s.RR_TXT.rdatastorage)
+        mDNSPlatformMemFree(x->s.RR_TXT.resrec.rdata);
+
+    if (x->s.SubTypes) mDNSPlatformMemFree(x->s.SubTypes);
+
+    mDNSPlatformMemFree(x);
+}
+
+static void DNSServiceRegisterDispose(mDNS_DirectOP *op)
+{
+    mDNS_DirectOP_Register *x = (mDNS_DirectOP_Register*)op;
+    x->autorename = mDNSfalse;
+    // If mDNS_DeregisterService() returns mStatus_NoError, that means that the service was found in the list,
+    // is sending its goodbye packet, and we'll get an mStatus_MemFree message when we can free the memory.
+    // If mDNS_DeregisterService() returns an error, it means that the service had already been removed from
+    // the list, so we should go ahead and free the memory right now
+    if (mDNS_DeregisterService(&mDNSStorage, &x->s) != mStatus_NoError)
+        FreeDNSServiceRegistration(x);
+}
+
+mDNSlocal void RegCallback(mDNS *const m, ServiceRecordSet *const sr, mStatus result)
+{
+    mDNS_DirectOP_Register *x = (mDNS_DirectOP_Register*)sr->ServiceContext;
+
+    domainlabel name;
+    domainname type, dom;
+    char namestr[MAX_DOMAIN_LABEL+1];       // Unescaped name: up to 63 bytes plus C-string terminating NULL.
+    char typestr[MAX_ESCAPED_DOMAIN_NAME];
+    char domstr [MAX_ESCAPED_DOMAIN_NAME];
+    if (!DeconstructServiceName(sr->RR_SRV.resrec.name, &name, &type, &dom)) return;
+    if (!ConvertDomainLabelToCString_unescaped(&name, namestr)) return;
+    if (!ConvertDomainNameToCString(&type, typestr)) return;
+    if (!ConvertDomainNameToCString(&dom, domstr)) return;
+
+    if (result == mStatus_NoError)
+    {
+        if (x->callback)
+            x->callback((DNSServiceRef)x, 0, result, namestr, typestr, domstr, x->context);
+    }
+    else if (result == mStatus_NameConflict)
+    {
+        if (x->autoname) mDNS_RenameAndReregisterService(m, sr, mDNSNULL);
+        else if (x->callback)
+            x->callback((DNSServiceRef)x, 0, result, namestr, typestr, domstr, x->context);
+    }
+    else if (result == mStatus_MemFree)
+    {
+        if (x->autorename)
+        {
+            x->autorename = mDNSfalse;
+            x->name = mDNSStorage.nicelabel;
+            mDNS_RenameAndReregisterService(m, &x->s, &x->name);
+        }
+        else
+            FreeDNSServiceRegistration(x);
+    }
+}
+
+DNSServiceErrorType DNSServiceRegister
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *name,         /* may be NULL */
+    const char                          *regtype,
+    const char                          *domain,       /* may be NULL */
+    const char                          *host,         /* may be NULL */
+    uint16_t notAnIntPort,
+    uint16_t txtLen,
+    const void                          *txtRecord,    /* may be NULL */
+    DNSServiceRegisterReply callback,                  /* may be NULL */
+    void                                *context       /* may be NULL */
+)
+{
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    domainlabel n;
+    domainname t, d, h, srv;
+    mDNSIPPort port;
+    unsigned int size = sizeof(RDataBody);
+    AuthRecord *SubTypes = mDNSNULL;
+    mDNSu32 NumSubTypes = 0;
+    mDNS_DirectOP_Register *x;
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+
+    // Check parameters
+    if (!name) name = "";
+    if (!name[0]) n = mDNSStorage.nicelabel;
+    else if (!MakeDomainLabelFromLiteralString(&n, name))                              { errormsg = "Bad Instance Name"; goto badparam; }
+    if (!regtype || !*regtype || !MakeDomainNameFromDNSNameString(&t, regtype))        { errormsg = "Bad Service Type";  goto badparam; }
+    if (!MakeDomainNameFromDNSNameString(&d, (domain && *domain) ? domain : "local.")) { errormsg = "Bad Domain";        goto badparam; }
+    if (!MakeDomainNameFromDNSNameString(&h, (host   && *host  ) ? host   : ""))       { errormsg = "Bad Target Host";   goto badparam; }
+    if (!ConstructServiceName(&srv, &n, &t, &d))                                       { errormsg = "Bad Name";          goto badparam; }
+    port.NotAnInteger = notAnIntPort;
+
+    // Allocate memory, and handle failure
+    if (size < txtLen)
+        size = txtLen;
+    x = (mDNS_DirectOP_Register *)mDNSPlatformMemAllocate(sizeof(*x) - sizeof(RDataBody) + size);
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object
+    x->disposefn = DNSServiceRegisterDispose;
+    x->callback  = callback;
+    x->context   = context;
+    x->autoname = (!name[0]);
+    x->autorename = mDNSfalse;
+    x->name = n;
+    x->host = h;
+
+    // Do the operation
+    err = mDNS_RegisterService(&mDNSStorage, &x->s,
+                               &x->name, &t, &d, // Name, type, domain
+                               &x->host, port, // Host and port
+                               txtRecord, txtLen, // TXT data, length
+                               SubTypes, NumSubTypes, // Subtypes
+                               mDNSInterface_Any, // Interface ID
+                               RegCallback, x, 0); // Callback, context, flags
+    if (err) { mDNSPlatformMemFree(x); errormsg = "mDNS_RegisterService"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    *sdRef = (DNSServiceRef)x;
+    return(mStatus_NoError);
+
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("DNSServiceBrowse(\"%s\", \"%s\") failed: %s (%ld)", regtype, domain, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Add / Update / Remove records from existing Registration
+
+// Not yet implemented, so don't include in stub library
+// We DO include it in the actual Extension, so that if a later client compiled to use this
+// is run against this Extension, it will get a reasonable error code instead of just
+// failing to launch (Strong Link) or calling an unresolved symbol and crashing (Weak Link)
+#if !MDNS_BUILDINGSTUBLIBRARY
+DNSServiceErrorType DNSServiceAddRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef                        *RecordRef,
+    DNSServiceFlags flags,
+    uint16_t rrtype,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl
+)
+{
+    (void)sdRef;        // Unused
+    (void)RecordRef;    // Unused
+    (void)flags;        // Unused
+    (void)rrtype;       // Unused
+    (void)rdlen;        // Unused
+    (void)rdata;        // Unused
+    (void)ttl;          // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+
+DNSServiceErrorType DNSServiceUpdateRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,                            /* may be NULL */
+    DNSServiceFlags flags,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl
+)
+{
+    (void)sdRef;        // Unused
+    (void)RecordRef;    // Unused
+    (void)flags;        // Unused
+    (void)rdlen;        // Unused
+    (void)rdata;        // Unused
+    (void)ttl;          // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+
+DNSServiceErrorType DNSServiceRemoveRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,
+    DNSServiceFlags flags
+)
+{
+    (void)sdRef;        // Unused
+    (void)RecordRef;    // Unused
+    (void)flags;        // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+#endif
+
+//*************************************************************************************************************
+// Browse for services
+
+static void DNSServiceBrowseDispose(mDNS_DirectOP *op)
+{
+    mDNS_DirectOP_Browse *x = (mDNS_DirectOP_Browse*)op;
+    //LogMsg("DNSServiceBrowseDispose");
+    mDNS_StopBrowse(&mDNSStorage, &x->q);
+    mDNSPlatformMemFree(x);
+}
+
+mDNSlocal void FoundInstance(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    DNSServiceFlags flags = AddRecord ? kDNSServiceFlagsAdd : (DNSServiceFlags)0;
+    domainlabel name;
+    domainname type, domain;
+    char cname[MAX_DOMAIN_LABEL+1];         // Unescaped name: up to 63 bytes plus C-string terminating NULL.
+    char ctype[MAX_ESCAPED_DOMAIN_NAME];
+    char cdom [MAX_ESCAPED_DOMAIN_NAME];
+    mDNS_DirectOP_Browse *x = (mDNS_DirectOP_Browse*)question->QuestionContext;
+    (void)m;        // Unused
+
+    if (answer->rrtype != kDNSType_PTR)
+    { LogMsg("FoundInstance: Should not be called with rrtype %d (not a PTR record)", answer->rrtype); return; }
+
+    if (!DeconstructServiceName(&answer->rdata->u.name, &name, &type, &domain))
+    {
+        LogMsg("FoundInstance: %##s PTR %##s received from network is not valid DNS-SD service pointer",
+               answer->name->c, answer->rdata->u.name.c);
+        return;
+    }
+
+    ConvertDomainLabelToCString_unescaped(&name, cname);
+    ConvertDomainNameToCString(&type, ctype);
+    ConvertDomainNameToCString(&domain, cdom);
+    if (x->callback)
+        x->callback((DNSServiceRef)x, flags, 0, 0, cname, ctype, cdom, x->context);
+}
+
+DNSServiceErrorType DNSServiceBrowse
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *regtype,
+    const char                          *domain,    /* may be NULL */
+    DNSServiceBrowseReply callback,
+    void                                *context    /* may be NULL */
+)
+{
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    domainname t, d;
+    mDNS_DirectOP_Browse *x;
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+
+    // Check parameters
+    if (!regtype[0] || !MakeDomainNameFromDNSNameString(&t, regtype))      { errormsg = "Illegal regtype"; goto badparam; }
+    if (!MakeDomainNameFromDNSNameString(&d, *domain ? domain : "local.")) { errormsg = "Illegal domain";  goto badparam; }
+
+    // Allocate memory, and handle failure
+    x = (mDNS_DirectOP_Browse *)mDNSPlatformMemAllocate(sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object
+    x->disposefn = DNSServiceBrowseDispose;
+    x->callback  = callback;
+    x->context   = context;
+    x->q.QuestionContext = x;
+
+    // Do the operation
+    err = mDNS_StartBrowse(&mDNSStorage, &x->q, &t, &d, mDNSNULL, mDNSInterface_Any, flags, (flags & kDNSServiceFlagsForceMulticast) != 0, (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0, FoundInstance, x);
+    if (err) { mDNSPlatformMemFree(x); errormsg = "mDNS_StartBrowse"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    *sdRef = (DNSServiceRef)x;
+    return(mStatus_NoError);
+
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("DNSServiceBrowse(\"%s\", \"%s\") failed: %s (%ld)", regtype, domain, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Resolve Service Info
+
+static void DNSServiceResolveDispose(mDNS_DirectOP *op)
+{
+    mDNS_DirectOP_Resolve *x = (mDNS_DirectOP_Resolve*)op;
+    if (x->qSRV.ThisQInterval >= 0) mDNS_StopQuery(&mDNSStorage, &x->qSRV);
+    if (x->qTXT.ThisQInterval >= 0) mDNS_StopQuery(&mDNSStorage, &x->qTXT);
+    mDNSPlatformMemFree(x);
+}
+
+mDNSlocal void FoundServiceInfo(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    mDNS_DirectOP_Resolve *x = (mDNS_DirectOP_Resolve*)question->QuestionContext;
+    (void)m;    // Unused
+    if (!AddRecord)
+    {
+        if (answer->rrtype == kDNSType_SRV && x->SRV == answer) x->SRV = mDNSNULL;
+        if (answer->rrtype == kDNSType_TXT && x->TXT == answer) x->TXT = mDNSNULL;
+    }
+    else
+    {
+        if (answer->rrtype == kDNSType_SRV) x->SRV = answer;
+        if (answer->rrtype == kDNSType_TXT) x->TXT = answer;
+        if (x->SRV && x->TXT && x->callback)
+        {
+            char fullname[MAX_ESCAPED_DOMAIN_NAME], targethost[MAX_ESCAPED_DOMAIN_NAME];
+            ConvertDomainNameToCString(answer->name, fullname);
+            ConvertDomainNameToCString(&x->SRV->rdata->u.srv.target, targethost);
+            x->callback((DNSServiceRef)x, 0, 0, kDNSServiceErr_NoError, fullname, targethost,
+                        x->SRV->rdata->u.srv.port.NotAnInteger, x->TXT->rdlength, (unsigned char*)x->TXT->rdata->u.txt.c, x->context);
+        }
+    }
+}
+
+DNSServiceErrorType DNSServiceResolve
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *name,
+    const char                          *regtype,
+    const char                          *domain,
+    DNSServiceResolveReply callback,
+    void                                *context  /* may be NULL */
+)
+{
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    domainlabel n;
+    domainname t, d, srv;
+    mDNS_DirectOP_Resolve *x;
+
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+
+    // Check parameters
+    if (!name[0]    || !MakeDomainLabelFromLiteralString(&n, name  )) { errormsg = "Bad Instance Name"; goto badparam; }
+    if (!regtype[0] || !MakeDomainNameFromDNSNameString(&t, regtype)) { errormsg = "Bad Service Type";  goto badparam; }
+    if (!domain[0]  || !MakeDomainNameFromDNSNameString(&d, domain )) { errormsg = "Bad Domain";        goto badparam; }
+    if (!ConstructServiceName(&srv, &n, &t, &d))                      { errormsg = "Bad Name";          goto badparam; }
+
+    // Allocate memory, and handle failure
+    x = (mDNS_DirectOP_Resolve *)mDNSPlatformMemAllocate(sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object
+    x->disposefn = DNSServiceResolveDispose;
+    x->callback  = callback;
+    x->context   = context;
+    x->SRV       = mDNSNULL;
+    x->TXT       = mDNSNULL;
+
+    x->qSRV.ThisQInterval       = -1;       // So that DNSServiceResolveDispose() knows whether to cancel this question
+    x->qSRV.InterfaceID         = mDNSInterface_Any;
+    x->qSRV.flags               = 0;
+    x->qSRV.Target              = zeroAddr;
+    AssignDomainName(&x->qSRV.qname, &srv);
+    x->qSRV.qtype               = kDNSType_SRV;
+    x->qSRV.qclass              = kDNSClass_IN;
+    x->qSRV.LongLived           = mDNSfalse;
+    x->qSRV.ExpectUnique        = mDNStrue;
+    x->qSRV.ForceMCast          = mDNSfalse;
+    x->qSRV.ReturnIntermed      = mDNSfalse;
+    x->qSRV.SuppressUnusable    = mDNSfalse;
+    x->qSRV.SearchListIndex     = 0;
+    x->qSRV.AppendSearchDomains = 0;
+    x->qSRV.RetryWithSearchDomains = mDNSfalse;
+    x->qSRV.TimeoutQuestion     = 0;
+    x->qSRV.WakeOnResolve       = 0;
+    x->qSRV.UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    x->qSRV.ValidationRequired  = 0;
+    x->qSRV.ValidatingResponse  = 0;
+    x->qSRV.ProxyQuestion       = 0;
+    x->qSRV.qnameOrig           = mDNSNULL;
+    x->qSRV.AnonInfo            = mDNSNULL;
+    x->qSRV.pid                 = mDNSPlatformGetPID();
+    x->qSRV.QuestionCallback    = FoundServiceInfo;
+    x->qSRV.QuestionContext     = x;
+
+    x->qTXT.ThisQInterval       = -1;       // So that DNSServiceResolveDispose() knows whether to cancel this question
+    x->qTXT.InterfaceID         = mDNSInterface_Any;
+    x->qTXT.flags               = 0;
+    x->qTXT.Target              = zeroAddr;
+    AssignDomainName(&x->qTXT.qname, &srv);
+    x->qTXT.qtype               = kDNSType_TXT;
+    x->qTXT.qclass              = kDNSClass_IN;
+    x->qTXT.LongLived           = mDNSfalse;
+    x->qTXT.ExpectUnique        = mDNStrue;
+    x->qTXT.ForceMCast          = mDNSfalse;
+    x->qTXT.ReturnIntermed      = mDNSfalse;
+    x->qTXT.SuppressUnusable    = mDNSfalse;
+    x->qTXT.SearchListIndex     = 0;
+    x->qTXT.AppendSearchDomains = 0;
+    x->qTXT.RetryWithSearchDomains = mDNSfalse;
+    x->qTXT.TimeoutQuestion     = 0;
+    x->qTXT.WakeOnResolve       = 0;
+    x->qTXT.UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    x->qTXT.ValidationRequired  = 0;
+    x->qTXT.ValidatingResponse  = 0;
+    x->qTXT.ProxyQuestion       = 0;
+    x->qTXT.qnameOrig           = mDNSNULL;
+    x->qTXT.AnonInfo            = mDNSNULL;
+    x->qTXT.pid                 = mDNSPlatformGetPID();
+    x->qTXT.QuestionCallback    = FoundServiceInfo;
+    x->qTXT.QuestionContext     = x;
+
+    err = mDNS_StartQuery(&mDNSStorage, &x->qSRV);
+    if (err) { DNSServiceResolveDispose((mDNS_DirectOP*)x); errormsg = "mDNS_StartQuery qSRV"; goto fail; }
+    err = mDNS_StartQuery(&mDNSStorage, &x->qTXT);
+    if (err) { DNSServiceResolveDispose((mDNS_DirectOP*)x); errormsg = "mDNS_StartQuery qTXT"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    *sdRef = (DNSServiceRef)x;
+    return(mStatus_NoError);
+
+badparam:
+    err = mStatus_BadParamErr;
+fail:
+    LogMsg("DNSServiceResolve(\"%s\", \"%s\", \"%s\") failed: %s (%ld)", name, regtype, domain, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// Connection-oriented calls
+
+// Not yet implemented, so don't include in stub library
+// We DO include it in the actual Extension, so that if a later client compiled to use this
+// is run against this Extension, it will get a reasonable error code instead of just
+// failing to launch (Strong Link) or calling an unresolved symbol and crashing (Weak Link)
+#if !MDNS_BUILDINGSTUBLIBRARY
+DNSServiceErrorType DNSServiceCreateConnection(DNSServiceRef *sdRef)
+{
+    (void)sdRef;    // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+
+DNSServiceErrorType DNSServiceRegisterRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef                        *RecordRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                          *rdata,
+    uint32_t ttl,
+    DNSServiceRegisterRecordReply callback,
+    void                                *context    /* may be NULL */
+)
+{
+    (void)sdRef;            // Unused
+    (void)RecordRef;        // Unused
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+    (void)fullname;         // Unused
+    (void)rrtype;           // Unused
+    (void)rrclass;          // Unused
+    (void)rdlen;            // Unused
+    (void)rdata;            // Unused
+    (void)ttl;              // Unused
+    (void)callback;         // Unused
+    (void)context;          // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+#endif
+
+//*************************************************************************************************************
+// DNSServiceQueryRecord
+
+static void DNSServiceQueryRecordDispose(mDNS_DirectOP *op)
+{
+    mDNS_DirectOP_QueryRecord *x = (mDNS_DirectOP_QueryRecord*)op;
+    if (x->q.ThisQInterval >= 0) mDNS_StopQuery(&mDNSStorage, &x->q);
+    mDNSPlatformMemFree(x);
+}
+
+mDNSlocal void DNSServiceQueryRecordResponse(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    mDNS_DirectOP_QueryRecord *x = (mDNS_DirectOP_QueryRecord*)question->QuestionContext;
+    char fullname[MAX_ESCAPED_DOMAIN_NAME];
+    (void)m;    // Unused
+    ConvertDomainNameToCString(answer->name, fullname);
+    x->callback((DNSServiceRef)x, AddRecord ? kDNSServiceFlagsAdd : (DNSServiceFlags)0, 0, kDNSServiceErr_NoError,
+                fullname, answer->rrtype, answer->rrclass, answer->rdlength, answer->rdata->u.data, answer->rroriginalttl, x->context);
+}
+
+DNSServiceErrorType DNSServiceQueryRecord
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    DNSServiceQueryRecordReply callback,
+    void                                *context  /* may be NULL */
+)
+{
+    mStatus err = mStatus_NoError;
+    const char *errormsg = "Unknown";
+    mDNS_DirectOP_QueryRecord *x;
+
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+
+    // Allocate memory, and handle failure
+    x = (mDNS_DirectOP_QueryRecord *)mDNSPlatformMemAllocate(sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object
+    x->disposefn = DNSServiceQueryRecordDispose;
+    x->callback  = callback;
+    x->context   = context;
+
+    x->q.ThisQInterval       = -1;      // So that DNSServiceResolveDispose() knows whether to cancel this question
+    x->q.InterfaceID         = mDNSInterface_Any;
+    x->q.flags               = flags;
+    x->q.Target              = zeroAddr;
+    MakeDomainNameFromDNSNameString(&x->q.qname, fullname);
+    x->q.qtype               = rrtype;
+    x->q.qclass              = rrclass;
+    x->q.LongLived           = (flags & kDNSServiceFlagsLongLivedQuery) != 0;
+    x->q.ExpectUnique        = mDNSfalse;
+    x->q.ForceMCast          = (flags & kDNSServiceFlagsForceMulticast) != 0;
+    x->q.ReturnIntermed      = (flags & kDNSServiceFlagsReturnIntermediates) != 0;
+    x->q.SuppressUnsable     = (flags & kDNSServiceFlagsSuppressUnusable) != 0;
+    x->q.SearchListIndex     = 0;
+    x->q.AppendSearchDomains = 0;
+    x->q.RetryWithSearchDomains = mDNSfalse;
+    x->q.TimeoutQuestion     = 0;
+    x->q.WakeOnResolve       = 0;
+    x->q.UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    x->q.ValidationRequired  = 0;
+    x->q.ValidatingResponse  = 0;
+    x->q.ProxyQuestion       = 0;
+    x->q.qnameOrig           = mDNSNULL;
+    x->q.AnonInfo            = mDNSNULL;
+    x->q.pid                 = mDNSPlatformGetPID();
+    x->q.QuestionCallback    = DNSServiceQueryRecordResponse;
+    x->q.QuestionContext     = x;
+
+    err = mDNS_StartQuery(&mDNSStorage, &x->q);
+    if (err) { DNSServiceResolveDispose((mDNS_DirectOP*)x); errormsg = "mDNS_StartQuery"; goto fail; }
+
+    // Succeeded: Wrap up and return
+    *sdRef = (DNSServiceRef)x;
+    return(mStatus_NoError);
+
+fail:
+    LogMsg("DNSServiceQueryRecord(\"%s\", %d, %d) failed: %s (%ld)", fullname, rrtype, rrclass, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// DNSServiceGetAddrInfo
+
+static void DNSServiceGetAddrInfoDispose(mDNS_DirectOP *op)
+{
+    mDNS_DirectOP_GetAddrInfo *x = (mDNS_DirectOP_GetAddrInfo*)op;
+    if (x->aQuery) DNSServiceRefDeallocate(x->aQuery);
+    mDNSPlatformMemFree(x);
+}
+
+static void DNSSD_API DNSServiceGetAddrInfoResponse(
+    DNSServiceRef inRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceErrorType inErrorCode,
+    const char *        inFullName,
+    uint16_t inRRType,
+    uint16_t inRRClass,
+    uint16_t inRDLen,
+    const void *        inRData,
+    uint32_t inTTL,
+    void *              inContext )
+{
+    mDNS_DirectOP_GetAddrInfo *     x = (mDNS_DirectOP_GetAddrInfo*)inContext;
+    struct sockaddr_in sa4;
+
+    mDNSPlatformMemZero(&sa4, sizeof(sa4));
+    if (inErrorCode == kDNSServiceErr_NoError && inRRType == kDNSServiceType_A)
+    {
+        sa4.sin_family = AF_INET;
+        mDNSPlatformMemCopy(&sa4.sin_addr.s_addr, inRData, 4);
+    }
+
+    x->callback((DNSServiceRef)x, inFlags, inInterfaceIndex, inErrorCode, inFullName,
+                (const struct sockaddr *) &sa4, inTTL, x->context);
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceGetAddrInfo(
+    DNSServiceRef *             outRef,
+    DNSServiceFlags inFlags,
+    uint32_t inInterfaceIndex,
+    DNSServiceProtocol inProtocol,
+    const char *                inHostName,
+    DNSServiceGetAddrInfoReply inCallback,
+    void *                      inContext )
+{
+    const char *                    errormsg = "Unknown";
+    DNSServiceErrorType err;
+    mDNS_DirectOP_GetAddrInfo *     x;
+
+    // Allocate memory, and handle failure
+    x = (mDNS_DirectOP_GetAddrInfo *)mDNSPlatformMemAllocate(sizeof(*x));
+    if (!x) { err = mStatus_NoMemoryErr; errormsg = "No memory"; goto fail; }
+
+    // Set up object
+    x->disposefn = DNSServiceGetAddrInfoDispose;
+    x->callback  = inCallback;
+    x->context   = inContext;
+    x->aQuery    = mDNSNULL;
+
+    // Start the query.
+    // (It would probably be more efficient to code this using mDNS_StartQuery directly,
+    // instead of wrapping DNSServiceQueryRecord, which then unnecessarily allocates
+    // more memory and then just calls through to mDNS_StartQuery. -- SC June 2010)
+    err = DNSServiceQueryRecord(&x->aQuery, inFlags, inInterfaceIndex, inHostName, kDNSServiceType_A,
+                                kDNSServiceClass_IN, DNSServiceGetAddrInfoResponse, x);
+    if (err) { DNSServiceGetAddrInfoDispose((mDNS_DirectOP*)x); errormsg = "DNSServiceQueryRecord"; goto fail; }
+
+    *outRef = (DNSServiceRef)x;
+    return(mStatus_NoError);
+
+fail:
+    LogMsg("DNSServiceGetAddrInfo(\"%s\", %d) failed: %s (%ld)", inHostName, inProtocol, errormsg, err);
+    return(err);
+}
+
+//*************************************************************************************************************
+// DNSServiceReconfirmRecord
+
+// Not yet implemented, so don't include in stub library
+// We DO include it in the actual Extension, so that if a later client compiled to use this
+// is run against this Extension, it will get a reasonable error code instead of just
+// failing to launch (Strong Link) or calling an unresolved symbol and crashing (Weak Link)
+#if !MDNS_BUILDINGSTUBLIBRARY
+DNSServiceErrorType DNSSD_API DNSServiceReconfirmRecord
+(
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                         *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                         *rdata
+)
+{
+    (void)flags;            // Unused
+    (void)interfaceIndex;   // Unused
+    (void)fullname;         // Unused
+    (void)rrtype;           // Unused
+    (void)rrclass;          // Unused
+    (void)rdlen;            // Unused
+    (void)rdata;            // Unused
+    return(kDNSServiceErr_Unsupported);
+}
+
+
+#endif  // !MDNS_BUILDINGSTUBLIBRARY
diff --git a/mDNSResponder/mDNSShared/dnssd_clientstub.c b/mDNSResponder/mDNSShared/dnssd_clientstub.c
new file mode 100644
index 00000000..d21658fa
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnssd_clientstub.c
@@ -0,0 +1,2363 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+
+#if APPLE_OSX_mDNSResponder
+#include <mach-o/dyld.h>
+#include <uuid/uuid.h>
+#include <TargetConditionals.h>
+#endif
+
+#include "dnssd_ipc.h"
+
+static int gDaemonErr = kDNSServiceErr_NoError;
+
+#if defined(_WIN32)
+
+    #define _SSIZE_T
+    #include <CommonServices.h>
+    #include <DebugServices.h>
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+    #include <windows.h>
+    #include <stdarg.h>
+    #include <stdio.h>
+
+    #define sockaddr_mdns sockaddr_in
+    #define AF_MDNS AF_INET
+
+// Disable warning: "'type cast' : from data pointer 'void *' to function pointer"
+    #pragma warning(disable:4055)
+
+// Disable warning: "nonstandard extension, function/data pointer conversion in expression"
+    #pragma warning(disable:4152)
+
+extern BOOL IsSystemServiceDisabled();
+
+    #define sleep(X) Sleep((X) * 1000)
+
+static int g_initWinsock = 0;
+    #define LOG_WARNING kDebugLevelWarning
+    #define LOG_INFO kDebugLevelInfo
+static void syslog( int priority, const char * message, ...)
+{
+    va_list args;
+    int len;
+    char * buffer;
+    DWORD err = WSAGetLastError();
+    (void) priority;
+    va_start( args, message );
+    len = _vscprintf( message, args ) + 1;
+    buffer = malloc( len * sizeof(char) );
+    if ( buffer ) { vsprintf( buffer, message, args ); OutputDebugString( buffer ); free( buffer ); }
+    WSASetLastError( err );
+}
+#else
+
+    #include <sys/fcntl.h>      // For O_RDWR etc.
+    #include <sys/time.h>
+    #include <sys/socket.h>
+    #include <syslog.h>
+
+    #define sockaddr_mdns sockaddr_un
+    #define AF_MDNS AF_LOCAL
+
+#endif
+
+// <rdar://problem/4096913> Specifies how many times we'll try and connect to the server.
+
+#define DNSSD_CLIENT_MAXTRIES 4
+
+// Uncomment the line below to use the old error return mechanism of creating a temporary named socket (e.g. in /var/tmp)
+//#define USE_NAMED_ERROR_RETURN_SOCKET 1
+
+// If the UDS client has not received a response from the daemon in 60 secs, it is unlikely to get one
+// Note: Timeout of 3 secs should be sufficient in normal scenarios, but 60 secs is chosen as a safeguard since
+// some clients may come up before mDNSResponder itself after a BOOT and on rare ocassions IOPM/Keychain/D2D calls
+// in mDNSResponder's INIT may take a much longer time to return
+#define DNSSD_CLIENT_TIMEOUT 60
+
+#ifndef CTL_PATH_PREFIX
+#define CTL_PATH_PREFIX "/var/tmp/dnssd_result_socket."
+#endif
+
+typedef struct
+{
+    ipc_msg_hdr ipc_hdr;
+    DNSServiceFlags cb_flags;
+    uint32_t cb_interface;
+    DNSServiceErrorType cb_err;
+} CallbackHeader;
+
+typedef struct _DNSServiceRef_t DNSServiceOp;
+typedef struct _DNSRecordRef_t DNSRecord;
+
+#if !defined(_WIN32)
+typedef struct
+{
+    void             *AppCallback;      // Client callback function and context
+    void             *AppContext;
+} SleepKAContext;
+#endif
+
+// client stub callback to process message from server and deliver results to client application
+typedef void (*ProcessReplyFn)(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *msg, const char *const end);
+
+#define ValidatorBits 0x12345678
+#define DNSServiceRefValid(X) (dnssd_SocketValid((X)->sockfd) && (((X)->sockfd ^ (X)->validator) == ValidatorBits))
+
+// When using kDNSServiceFlagsShareConnection, there is one primary _DNSServiceOp_t, and zero or more subordinates
+// For the primary, the 'next' field points to the first subordinate, and its 'next' field points to the next, and so on.
+// For the primary, the 'primary' field is NULL; for subordinates the 'primary' field points back to the associated primary
+//
+// _DNS_SD_LIBDISPATCH is defined where libdispatch/GCD is available. This does not mean that the application will use the
+// DNSServiceSetDispatchQueue API. Hence any new code guarded with _DNS_SD_LIBDISPATCH should still be backwards compatible.
+struct _DNSServiceRef_t
+{
+    DNSServiceOp     *next;             // For shared connection
+    DNSServiceOp     *primary;          // For shared connection
+    dnssd_sock_t sockfd;                // Connected socket between client and daemon
+    dnssd_sock_t validator;             // Used to detect memory corruption, double disposals, etc.
+    client_context_t uid;               // For shared connection requests, each subordinate DNSServiceRef has its own ID,
+                                        // unique within the scope of the same shared parent DNSServiceRef
+    uint32_t op;                        // request_op_t or reply_op_t
+    uint32_t max_index;                 // Largest assigned record index - 0 if no additional records registered
+    uint32_t logcounter;                // Counter used to control number of syslog messages we write
+    int              *moreptr;          // Set while DNSServiceProcessResult working on this particular DNSServiceRef
+    ProcessReplyFn ProcessReply;        // Function pointer to the code to handle received messages
+    void             *AppCallback;      // Client callback function and context
+    void             *AppContext;
+    DNSRecord        *rec;
+#if _DNS_SD_LIBDISPATCH
+    dispatch_source_t disp_source;
+    dispatch_queue_t disp_queue;
+#endif
+    void             *kacontext;
+};
+
+struct _DNSRecordRef_t
+{
+    DNSRecord       *recnext;
+    void *AppContext;
+    DNSServiceRegisterRecordReply AppCallback;
+    DNSRecordRef recref;
+    uint32_t record_index;  // index is unique to the ServiceDiscoveryRef
+    client_context_t uid;  // For demultiplexing multiple DNSServiceRegisterRecord calls
+    DNSServiceOp *sdr;
+};
+
+// Write len bytes. Return 0 on success, -1 on error
+static int write_all(dnssd_sock_t sd, char *buf, size_t len)
+{
+    // Don't use "MSG_WAITALL"; it returns "Invalid argument" on some Linux versions; use an explicit while() loop instead.
+    //if (send(sd, buf, len, MSG_WAITALL) != len) return -1;
+    while (len)
+    {
+        ssize_t num_written = send(sd, buf, (long)len, 0);
+        if (num_written < 0 || (size_t)num_written > len)
+        {
+            // Should never happen. If it does, it indicates some OS bug,
+            // or that the mDNSResponder daemon crashed (which should never happen).
+            #if !defined(__ppc__) && defined(SO_ISDEFUNCT)
+            int defunct;
+            socklen_t dlen = sizeof (defunct);
+            if (getsockopt(sd, SOL_SOCKET, SO_ISDEFUNCT, &defunct, &dlen) < 0)
+                syslog(LOG_WARNING, "dnssd_clientstub write_all: SO_ISDEFUNCT failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+            if (!defunct)
+                syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%ld %d %s", sd,
+                       (long)num_written, (long)len,
+                       (num_written < 0) ? dnssd_errno                 : 0,
+                       (num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
+            else
+                syslog(LOG_INFO, "dnssd_clientstub write_all(%d) DEFUNCT", sd);
+            #else
+            syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%ld %d %s", sd,
+                   (long)num_written, (long)len,
+                   (num_written < 0) ? dnssd_errno                 : 0,
+                   (num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
+            #endif
+            return -1;
+        }
+        buf += num_written;
+        len -= num_written;
+    }
+    return 0;
+}
+
+enum { read_all_success = 0, read_all_fail = -1, read_all_wouldblock = -2 };
+
+// Read len bytes. Return 0 on success, read_all_fail on error, or read_all_wouldblock for
+static int read_all(dnssd_sock_t sd, char *buf, int len)
+{
+    // Don't use "MSG_WAITALL"; it returns "Invalid argument" on some Linux versions; use an explicit while() loop instead.
+    //if (recv(sd, buf, len, MSG_WAITALL) != len) return -1;
+
+    while (len)
+    {
+        ssize_t num_read = recv(sd, buf, len, 0);
+        // It is valid to get an interrupted system call error e.g., somebody attaching
+        // in a debugger, retry without failing
+        if ((num_read < 0) && (errno == EINTR)) 
+        { 
+            syslog(LOG_INFO, "dnssd_clientstub read_all: EINTR continue"); 
+            continue; 
+        }
+        if ((num_read == 0) || (num_read < 0) || (num_read > len))
+        {
+            int printWarn = 0;
+            int defunct = 0;
+            // Should never happen. If it does, it indicates some OS bug,
+            // or that the mDNSResponder daemon crashed (which should never happen).
+#if defined(WIN32)
+            // <rdar://problem/7481776> Suppress logs for "A non-blocking socket operation
+            //                          could not be completed immediately"
+            if (WSAGetLastError() != WSAEWOULDBLOCK)
+                printWarn = 1;
+#endif
+#if !defined(__ppc__) && defined(SO_ISDEFUNCT)
+            {
+                socklen_t dlen = sizeof (defunct);
+                if (getsockopt(sd, SOL_SOCKET, SO_ISDEFUNCT, &defunct, &dlen) < 0)
+                    syslog(LOG_WARNING, "dnssd_clientstub read_all: SO_ISDEFUNCT failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+            }
+            if (!defunct)
+                printWarn = 1;
+#endif
+            if (printWarn)
+                syslog(LOG_WARNING, "dnssd_clientstub read_all(%d) failed %ld/%ld %d %s", sd,
+                       (long)num_read, (long)len,
+                       (num_read < 0) ? dnssd_errno                 : 0,
+                       (num_read < 0) ? dnssd_strerror(dnssd_errno) : "");
+            else if (defunct)
+                syslog(LOG_INFO, "dnssd_clientstub read_all(%d) DEFUNCT", sd);
+            return (num_read < 0 && dnssd_errno == dnssd_EWOULDBLOCK) ? read_all_wouldblock : read_all_fail;
+        }
+        buf += num_read;
+        len -= num_read;
+    }
+    return read_all_success;
+}
+
+// Returns 1 if more bytes remain to be read on socket descriptor sd, 0 otherwise
+static int more_bytes(dnssd_sock_t sd)
+{
+    struct timeval tv = { 0, 0 };
+    fd_set readfds;
+    fd_set *fs;
+    int ret;
+
+    if (sd < FD_SETSIZE)
+    {
+        fs = &readfds;
+        FD_ZERO(fs);
+    }
+    else
+    {
+        // Compute the number of integers needed for storing "sd". Internally fd_set is stored
+        // as an array of ints with one bit for each fd and hence we need to compute
+        // the number of ints needed rather than the number of bytes. If "sd" is 32, we need
+        // two ints and not just one.
+        int nfdbits = sizeof (int) * 8;
+        int nints = (sd/nfdbits) + 1;
+        fs = (fd_set *)calloc(nints, sizeof(int));
+        if (fs == NULL) 
+        { 
+            syslog(LOG_WARNING, "dnssd_clientstub more_bytes: malloc failed"); 
+            return 0; 
+        }
+    }
+    FD_SET(sd, fs);
+    ret = select((int)sd+1, fs, (fd_set*)NULL, (fd_set*)NULL, &tv);
+    if (fs != &readfds) 
+        free(fs);
+    return (ret > 0);
+}
+
+// set_waitlimit() implements a timeout using select. It is called from deliver_request() before recv() OR accept()
+// to ensure the UDS clients are not blocked in these system calls indefinitely.
+// Note: Ideally one should never be blocked here, because it indicates either mDNSResponder daemon is not yet up/hung/
+// superbusy/crashed or some other OS bug. For eg: On Windows which suffers from 3rd party software 
+// (primarily 3rd party firewall software) interfering with proper functioning of the TCP protocol stack it is possible 
+// the next operation on this socket(recv/accept) is blocked since we depend on TCP to communicate with the system service.
+static int set_waitlimit(dnssd_sock_t sock, int timeout)
+{
+    // To prevent stack corruption since select does not work with timeout if fds > FD_SETSIZE(1024)
+    if (!gDaemonErr && sock < FD_SETSIZE)
+    {
+        struct timeval tv;
+        fd_set set;
+
+        FD_ZERO(&set);
+        FD_SET(sock, &set);
+        tv.tv_sec = timeout;
+        tv.tv_usec = 0;
+        if (!select((int)(sock + 1), &set, NULL, NULL, &tv))
+        {
+            // Ideally one should never hit this case: See comments before set_waitlimit()
+            syslog(LOG_WARNING, "dnssd_clientstub set_waitlimit:_daemon timed out (%d secs) without any response: Socket %d", timeout, sock);
+            gDaemonErr = kDNSServiceErr_Timeout;
+        }
+    }
+    return gDaemonErr;
+}
+
+/* create_hdr
+ *
+ * allocate and initialize an ipc message header. Value of len should initially be the
+ * length of the data, and is set to the value of the data plus the header. data_start
+ * is set to point to the beginning of the data section. SeparateReturnSocket should be
+ * non-zero for calls that can't receive an immediate error return value on their primary
+ * socket, and therefore require a separate return path for the error code result.
+ * if zero, the path to a control socket is appended at the beginning of the message buffer.
+ * data_start is set past this string.
+ */
+static ipc_msg_hdr *create_hdr(uint32_t op, size_t *len, char **data_start, int SeparateReturnSocket, DNSServiceOp *ref)
+{
+    char *msg = NULL;
+    ipc_msg_hdr *hdr;
+    int datalen;
+#if !defined(USE_TCP_LOOPBACK)
+    char ctrl_path[64] = "";    // "/var/tmp/dnssd_result_socket.xxxxxxxxxx-xxx-xxxxxx"
+#endif
+
+    if (SeparateReturnSocket)
+    {
+#if defined(USE_TCP_LOOPBACK)
+        *len += 2;  // Allocate space for two-byte port number
+#elif defined(USE_NAMED_ERROR_RETURN_SOCKET)
+        struct timeval tv;
+        if (gettimeofday(&tv, NULL) < 0)
+        { syslog(LOG_WARNING, "dnssd_clientstub create_hdr: gettimeofday failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno)); return NULL; }
+        sprintf(ctrl_path, "%s%d-%.3lx-%.6lu", CTL_PATH_PREFIX, (int)getpid(),
+                (unsigned long)(tv.tv_sec & 0xFFF), (unsigned long)(tv.tv_usec));
+        *len += strlen(ctrl_path) + 1;
+#else
+        *len += 1;      // Allocate space for single zero byte (empty C string)
+#endif
+    }
+
+    datalen = (int) *len;
+    *len += sizeof(ipc_msg_hdr);
+
+    // Write message to buffer
+    msg = malloc(*len);
+    if (!msg) { syslog(LOG_WARNING, "dnssd_clientstub create_hdr: malloc failed"); return NULL; }
+
+    memset(msg, 0, *len);
+    hdr = (ipc_msg_hdr *)msg;
+    hdr->version                = VERSION;
+    hdr->datalen                = datalen;
+    hdr->ipc_flags              = 0;
+    hdr->op                     = op;
+    hdr->client_context         = ref->uid;
+    hdr->reg_index              = 0;
+    *data_start = msg + sizeof(ipc_msg_hdr);
+#if defined(USE_TCP_LOOPBACK)
+    // Put dummy data in for the port, since we don't know what it is yet.
+    // The data will get filled in before we send the message. This happens in deliver_request().
+    if (SeparateReturnSocket) put_uint16(0, data_start);
+#else
+    if (SeparateReturnSocket) put_string(ctrl_path, data_start);
+#endif
+    return hdr;
+}
+
+static void FreeDNSRecords(DNSServiceOp *sdRef)
+{
+    DNSRecord *rec = sdRef->rec;
+    while (rec)
+    {
+        DNSRecord *next = rec->recnext;
+        free(rec);
+        rec = next;
+    }
+}
+
+static void FreeDNSServiceOp(DNSServiceOp *x)
+{
+    // We don't use our DNSServiceRefValid macro here because if we're cleaning up after a socket() call failed
+    // then sockfd could legitimately contain a failing value (e.g. dnssd_InvalidSocket)
+    if ((x->sockfd ^ x->validator) != ValidatorBits)
+        syslog(LOG_WARNING, "dnssd_clientstub attempt to dispose invalid DNSServiceRef %p %08X %08X", x, x->sockfd, x->validator);
+    else
+    {
+        x->next         = NULL;
+        x->primary      = NULL;
+        x->sockfd       = dnssd_InvalidSocket;
+        x->validator    = 0xDDDDDDDD;
+        x->op           = request_op_none;
+        x->max_index    = 0;
+        x->logcounter   = 0;
+        x->moreptr      = NULL;
+        x->ProcessReply = NULL;
+        x->AppCallback  = NULL;
+        x->AppContext   = NULL;
+#if _DNS_SD_LIBDISPATCH
+        if (x->disp_source) dispatch_release(x->disp_source);
+        x->disp_source  = NULL;
+        x->disp_queue   = NULL;
+#endif
+        // DNSRecords may have been added to subordinate sdRef e.g., DNSServiceRegister/DNSServiceAddRecord
+        // or on the main sdRef e.g., DNSServiceCreateConnection/DNSServiveRegisterRecord. DNSRecords may have
+        // been freed if the application called DNSRemoveRecord
+        FreeDNSRecords(x);
+        if (x->kacontext)
+        {
+            free(x->kacontext);
+            x->kacontext = NULL;
+        }
+        free(x);
+    }
+}
+
+// Return a connected service ref (deallocate with DNSServiceRefDeallocate)
+static DNSServiceErrorType ConnectToServer(DNSServiceRef *ref, DNSServiceFlags flags, uint32_t op, ProcessReplyFn ProcessReply, void *AppCallback, void *AppContext)
+{
+    int NumTries = 0;
+
+    dnssd_sockaddr_t saddr;
+    DNSServiceOp *sdr;
+
+    if (!ref) 
+    { 
+        syslog(LOG_WARNING, "dnssd_clientstub DNSService operation with NULL DNSServiceRef"); 
+        return kDNSServiceErr_BadParam; 
+    }
+
+    if (flags & kDNSServiceFlagsShareConnection)
+    {
+        if (!*ref)
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub kDNSServiceFlagsShareConnection used with NULL DNSServiceRef");
+            return kDNSServiceErr_BadParam;
+        }
+        if (!DNSServiceRefValid(*ref) || ((*ref)->op != connection_request && (*ref)->op != connection_delegate_request) || (*ref)->primary)
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub kDNSServiceFlagsShareConnection used with invalid DNSServiceRef %p %08X %08X op %d",
+                   (*ref), (*ref)->sockfd, (*ref)->validator, (*ref)->op);
+            *ref = NULL;
+            return kDNSServiceErr_BadReference;
+        }
+    }
+
+    #if defined(_WIN32)
+    if (!g_initWinsock)
+    {
+        WSADATA wsaData;
+        g_initWinsock = 1;
+        if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) { *ref = NULL; return kDNSServiceErr_ServiceNotRunning; }
+    }
+    // <rdar://problem/4096913> If the system service is disabled, we only want to try to connect once
+    if (IsSystemServiceDisabled()) 
+        NumTries = DNSSD_CLIENT_MAXTRIES;
+    #endif
+
+    sdr = malloc(sizeof(DNSServiceOp));
+    if (!sdr) 
+    { 
+        syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: malloc failed"); 
+        *ref = NULL; 
+        return kDNSServiceErr_NoMemory; 
+    }
+    sdr->next          = NULL;
+    sdr->primary       = NULL;
+    sdr->sockfd        = dnssd_InvalidSocket;
+    sdr->validator     = sdr->sockfd ^ ValidatorBits;
+    sdr->op            = op;
+    sdr->max_index     = 0;
+    sdr->logcounter    = 0;
+    sdr->moreptr       = NULL;
+    sdr->uid.u32[0]    = 0;
+    sdr->uid.u32[1]    = 0;
+    sdr->ProcessReply  = ProcessReply;
+    sdr->AppCallback   = AppCallback;
+    sdr->AppContext    = AppContext;
+    sdr->rec           = NULL;
+#if _DNS_SD_LIBDISPATCH
+    sdr->disp_source   = NULL;
+    sdr->disp_queue    = NULL;
+#endif
+    sdr->kacontext     = NULL;
+
+    if (flags & kDNSServiceFlagsShareConnection)
+    {
+        DNSServiceOp **p = &(*ref)->next;       // Append ourselves to end of primary's list
+        while (*p) 
+            p = &(*p)->next;
+        *p = sdr;
+        // Preincrement counter before we use it -- it helps with debugging if we know the all-zeroes ID should never appear
+        if (++(*ref)->uid.u32[0] == 0) 
+            ++(*ref)->uid.u32[1];               // In parent DNSServiceOp increment UID counter
+        sdr->primary    = *ref;                 // Set our primary pointer
+        sdr->sockfd     = (*ref)->sockfd;       // Inherit primary's socket
+        sdr->validator  = (*ref)->validator;
+        sdr->uid        = (*ref)->uid;
+        //printf("ConnectToServer sharing socket %d\n", sdr->sockfd);
+    }
+    else
+    {
+        #ifdef SO_NOSIGPIPE
+        const unsigned long optval = 1;
+        #endif
+        *ref = NULL;
+        sdr->sockfd    = socket(AF_DNSSD, SOCK_STREAM, 0);
+        sdr->validator = sdr->sockfd ^ ValidatorBits;
+        if (!dnssd_SocketValid(sdr->sockfd))
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: socket failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+            FreeDNSServiceOp(sdr);
+            return kDNSServiceErr_NoMemory;
+        }
+        #ifdef SO_NOSIGPIPE
+        // Some environments (e.g. OS X) support turning off SIGPIPE for a socket
+        if (setsockopt(sdr->sockfd, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval)) < 0)
+            syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: SO_NOSIGPIPE failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+        #endif
+        #if defined(USE_TCP_LOOPBACK)
+        saddr.sin_family      = AF_INET;
+        saddr.sin_addr.s_addr = inet_addr(MDNS_TCP_SERVERADDR);
+        saddr.sin_port        = htons(MDNS_TCP_SERVERPORT);
+        #else
+        saddr.sun_family      = AF_LOCAL;
+        strcpy(saddr.sun_path, MDNS_UDS_SERVERPATH);
+        #if !defined(__ppc__) && defined(SO_DEFUNCTOK)
+        {
+            int defunct = 1;
+            if (setsockopt(sdr->sockfd, SOL_SOCKET, SO_DEFUNCTOK, &defunct, sizeof(defunct)) < 0)
+                syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: SO_DEFUNCTOK failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+        }
+        #endif
+        #endif
+        
+        while (1)
+        {
+            int err = connect(sdr->sockfd, (struct sockaddr *) &saddr, sizeof(saddr));
+            if (!err)
+                break; // If we succeeded, return sdr
+            // If we failed, then it may be because the daemon is still launching.
+            // This can happen for processes that launch early in the boot process, while the
+            // daemon is still coming up. Rather than fail here, we wait 1 sec and try again.
+            // If, after DNSSD_CLIENT_MAXTRIES, we still can't connect to the daemon,
+            // then we give up and return a failure code.
+            if (++NumTries < DNSSD_CLIENT_MAXTRIES)
+            {
+                syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: connect()-> No of tries: %d", NumTries);  
+                sleep(1); // Sleep a bit, then try again
+            }
+            else 
+            {
+                syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: connect() failed Socket:%d Err:%d Errno:%d %s", 
+                        sdr->sockfd, err, dnssd_errno, dnssd_strerror(dnssd_errno));
+                dnssd_close(sdr->sockfd); 
+                FreeDNSServiceOp(sdr); 
+                return kDNSServiceErr_ServiceNotRunning; 
+            }
+        }
+        //printf("ConnectToServer opened socket %d\n", sdr->sockfd);
+    }
+
+    *ref = sdr;
+    return kDNSServiceErr_NoError;
+}
+
+#define deliver_request_bailout(MSG) \
+    do { syslog(LOG_WARNING, "dnssd_clientstub deliver_request: %s failed %d (%s)", (MSG), dnssd_errno, dnssd_strerror(dnssd_errno)); goto cleanup; } while(0)
+
+static DNSServiceErrorType deliver_request(ipc_msg_hdr *hdr, DNSServiceOp *sdr)
+{
+    uint32_t datalen = hdr->datalen;    // We take a copy here because we're going to convert hdr->datalen to network byte order
+    #if defined(USE_TCP_LOOPBACK) || defined(USE_NAMED_ERROR_RETURN_SOCKET)
+    char *const data = (char *)hdr + sizeof(ipc_msg_hdr);
+    #endif
+    dnssd_sock_t listenfd = dnssd_InvalidSocket, errsd = dnssd_InvalidSocket;
+    DNSServiceErrorType err = kDNSServiceErr_Unknown;   // Default for the "goto cleanup" cases
+    int MakeSeparateReturnSocket = 0;
+
+    // Note: need to check hdr->op, not sdr->op.
+    // hdr->op contains the code for the specific operation we're currently doing, whereas sdr->op
+    // contains the original parent DNSServiceOp (e.g. for an add_record_request, hdr->op will be
+    // add_record_request but the parent sdr->op will be connection_request or reg_service_request)
+    if (sdr->primary ||
+        hdr->op == reg_record_request || hdr->op == add_record_request || hdr->op == update_record_request || hdr->op == remove_record_request)
+        MakeSeparateReturnSocket = 1;
+
+    if (!DNSServiceRefValid(sdr))
+    {
+        if (hdr)
+            free(hdr);
+        syslog(LOG_WARNING, "dnssd_clientstub deliver_request: invalid DNSServiceRef %p %08X %08X", sdr, sdr->sockfd, sdr->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    if (!hdr) 
+    { 
+        syslog(LOG_WARNING, "dnssd_clientstub deliver_request: !hdr"); 
+        return kDNSServiceErr_Unknown;  
+    }
+
+    if (MakeSeparateReturnSocket)
+    {
+        #if defined(USE_TCP_LOOPBACK)
+        {
+            union { uint16_t s; u_char b[2]; } port;
+            dnssd_sockaddr_t caddr;
+            dnssd_socklen_t len = (dnssd_socklen_t) sizeof(caddr);
+            listenfd = socket(AF_DNSSD, SOCK_STREAM, 0);
+            if (!dnssd_SocketValid(listenfd)) deliver_request_bailout("TCP socket");
+
+            caddr.sin_family      = AF_INET;
+            caddr.sin_port        = 0;
+            caddr.sin_addr.s_addr = inet_addr(MDNS_TCP_SERVERADDR);
+            if (bind(listenfd, (struct sockaddr*) &caddr, sizeof(caddr)) < 0) deliver_request_bailout("TCP bind");
+            if (getsockname(listenfd, (struct sockaddr*) &caddr, &len)   < 0) deliver_request_bailout("TCP getsockname");
+            if (listen(listenfd, 1)                                      < 0) deliver_request_bailout("TCP listen");
+            port.s = caddr.sin_port;
+            data[0] = port.b[0];  // don't switch the byte order, as the
+            data[1] = port.b[1];  // daemon expects it in network byte order
+        }
+        #elif defined(USE_NAMED_ERROR_RETURN_SOCKET)
+        {
+            mode_t mask;
+            int bindresult;
+            dnssd_sockaddr_t caddr;
+            listenfd = socket(AF_DNSSD, SOCK_STREAM, 0);
+            if (!dnssd_SocketValid(listenfd)) deliver_request_bailout("USE_NAMED_ERROR_RETURN_SOCKET socket");
+
+            caddr.sun_family = AF_LOCAL;
+            // According to Stevens (section 3.2), there is no portable way to
+            // determine whether sa_len is defined on a particular platform.
+            #ifndef NOT_HAVE_SA_LEN
+            caddr.sun_len = sizeof(struct sockaddr_un);
+            #endif
+            strcpy(caddr.sun_path, data);
+            mask = umask(0);
+            bindresult = bind(listenfd, (struct sockaddr *)&caddr, sizeof(caddr));
+            umask(mask);
+            if (bindresult          < 0) deliver_request_bailout("USE_NAMED_ERROR_RETURN_SOCKET bind");
+            if (listen(listenfd, 1) < 0) deliver_request_bailout("USE_NAMED_ERROR_RETURN_SOCKET listen");
+        }
+        #else
+        {
+            dnssd_sock_t sp[2];
+            if (socketpair(AF_DNSSD, SOCK_STREAM, 0, sp) < 0) deliver_request_bailout("socketpair");
+            else
+            {
+                errsd    = sp[0];   // We'll read our four-byte error code from sp[0]
+                listenfd = sp[1];   // We'll send sp[1] to the daemon
+                #if !defined(__ppc__) && defined(SO_DEFUNCTOK)
+                {
+                    int defunct = 1;
+                    if (setsockopt(errsd, SOL_SOCKET, SO_DEFUNCTOK, &defunct, sizeof(defunct)) < 0)
+                        syslog(LOG_WARNING, "dnssd_clientstub ConnectToServer: SO_DEFUNCTOK failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
+                }
+                #endif
+            }
+        }
+        #endif
+    }
+
+#if !defined(USE_TCP_LOOPBACK) && !defined(USE_NAMED_ERROR_RETURN_SOCKET)
+    // If we're going to make a separate error return socket, and pass it to the daemon
+    // using sendmsg, then we'll hold back one data byte to go with it.
+    // On some versions of Unix (including Leopard) sending a control message without
+    // any associated data does not work reliably -- e.g. one particular issue we ran
+    // into is that if the receiving program is in a kqueue loop waiting to be notified
+    // of the received message, it doesn't get woken up when the control message arrives.
+    if (MakeSeparateReturnSocket || sdr->op == send_bpf) 
+        datalen--;     // Okay to use sdr->op when checking for op == send_bpf
+#endif
+
+    // At this point, our listening socket is set up and waiting, if necessary, for the daemon to connect back to
+    ConvertHeaderBytes(hdr);
+    //syslog(LOG_WARNING, "dnssd_clientstub deliver_request writing %lu bytes", (unsigned long)(datalen + sizeof(ipc_msg_hdr)));
+    //if (MakeSeparateReturnSocket) syslog(LOG_WARNING, "dnssd_clientstub deliver_request name is %s", data);
+#if TEST_SENDING_ONE_BYTE_AT_A_TIME
+    unsigned int i;
+    for (i=0; i<datalen + sizeof(ipc_msg_hdr); i++)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub deliver_request writing %d", i);
+        if (write_all(sdr->sockfd, ((char *)hdr)+i, 1) < 0)
+        { syslog(LOG_WARNING, "write_all (byte %u) failed", i); goto cleanup; }
+        usleep(10000);
+    }
+#else
+    if (write_all(sdr->sockfd, (char *)hdr, datalen + sizeof(ipc_msg_hdr)) < 0)
+    {
+        // write_all already prints an error message if there is an error writing to
+        // the socket except for DEFUNCT. Logging here is unnecessary and also wrong
+        // in the case of DEFUNCT sockets
+        syslog(LOG_INFO, "dnssd_clientstub deliver_request ERROR: write_all(%d, %lu bytes) failed",
+               sdr->sockfd, (unsigned long)(datalen + sizeof(ipc_msg_hdr)));
+        goto cleanup;
+    }
+#endif
+
+    if (!MakeSeparateReturnSocket) 
+        errsd = sdr->sockfd;
+    if (MakeSeparateReturnSocket || sdr->op == send_bpf)    // Okay to use sdr->op when checking for op == send_bpf
+    {
+#if defined(USE_TCP_LOOPBACK) || defined(USE_NAMED_ERROR_RETURN_SOCKET)
+        // At this point we may wait in accept for a few milliseconds waiting for the daemon to connect back to us,
+        // but that's okay -- the daemon should not take more than a few milliseconds to respond.
+        // set_waitlimit() ensures we do not block indefinitely just in case something is wrong
+        dnssd_sockaddr_t daddr;
+        dnssd_socklen_t len = sizeof(daddr);
+        if ((err = set_waitlimit(listenfd, DNSSD_CLIENT_TIMEOUT)) != kDNSServiceErr_NoError) 
+            goto cleanup;
+        errsd = accept(listenfd, (struct sockaddr *)&daddr, &len);
+        if (!dnssd_SocketValid(errsd)) 
+            deliver_request_bailout("accept");
+#else
+
+        struct iovec vec = { ((char *)hdr) + sizeof(ipc_msg_hdr) + datalen, 1 }; // Send the last byte along with the SCM_RIGHTS
+        struct msghdr msg;
+        struct cmsghdr *cmsg;
+        char cbuf[CMSG_SPACE(4 * sizeof(dnssd_sock_t))];
+
+        msg.msg_name       = 0;
+        msg.msg_namelen    = 0;
+        msg.msg_iov        = &vec;
+        msg.msg_iovlen     = 1;
+        msg.msg_flags      = 0;
+        if (MakeSeparateReturnSocket || sdr->op == send_bpf)    // Okay to use sdr->op when checking for op == send_bpf
+        {
+            if (sdr->op == send_bpf)
+            {
+                int i;
+                char p[12];     // Room for "/dev/bpf999" with terminating null
+                for (i=0; i<100; i++)
+                {
+                    snprintf(p, sizeof(p), "/dev/bpf%d", i);
+                    listenfd = open(p, O_RDWR, 0);
+                    //if (dnssd_SocketValid(listenfd)) syslog(LOG_WARNING, "Sending fd %d for %s", listenfd, p);
+                    if (!dnssd_SocketValid(listenfd) && dnssd_errno != EBUSY)
+                        syslog(LOG_WARNING, "Error opening %s %d (%s)", p, dnssd_errno, dnssd_strerror(dnssd_errno));
+                    if (dnssd_SocketValid(listenfd) || dnssd_errno != EBUSY) break;
+                }
+            }
+            msg.msg_control    = cbuf;
+            msg.msg_controllen = CMSG_LEN(sizeof(dnssd_sock_t));
+
+            cmsg = CMSG_FIRSTHDR(&msg);
+            cmsg->cmsg_len     = CMSG_LEN(sizeof(dnssd_sock_t));
+            cmsg->cmsg_level   = SOL_SOCKET;
+            cmsg->cmsg_type    = SCM_RIGHTS;
+            *((dnssd_sock_t *)CMSG_DATA(cmsg)) = listenfd;
+        }
+
+#if TEST_KQUEUE_CONTROL_MESSAGE_BUG
+        sleep(1);
+#endif
+
+#if DEBUG_64BIT_SCM_RIGHTS
+        syslog(LOG_WARNING, "dnssd_clientstub sendmsg read sd=%d write sd=%d %ld %ld %ld/%ld/%ld/%ld",
+               errsd, listenfd, sizeof(dnssd_sock_t), sizeof(void*),
+               sizeof(struct cmsghdr) + sizeof(dnssd_sock_t),
+               CMSG_LEN(sizeof(dnssd_sock_t)), (long)CMSG_SPACE(sizeof(dnssd_sock_t)),
+               (long)((char*)CMSG_DATA(cmsg) + 4 - cbuf));
+#endif // DEBUG_64BIT_SCM_RIGHTS
+
+        if (sendmsg(sdr->sockfd, &msg, 0) < 0)
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub deliver_request ERROR: sendmsg failed read sd=%d write sd=%d errno %d (%s)",
+                   errsd, listenfd, dnssd_errno, dnssd_strerror(dnssd_errno));
+            err = kDNSServiceErr_Incompatible;
+            goto cleanup;
+        }
+
+#if DEBUG_64BIT_SCM_RIGHTS
+        syslog(LOG_WARNING, "dnssd_clientstub sendmsg read sd=%d write sd=%d okay", errsd, listenfd);
+#endif // DEBUG_64BIT_SCM_RIGHTS
+
+#endif
+        // Close our end of the socketpair *before* calling read_all() to get the four-byte error code.
+        // Otherwise, if the daemon closes our socket (or crashes), we will have to wait for a timeout
+        // in read_all() because the socket is not closed (we still have an open reference to it)
+        // Note: listenfd is overwritten in the case of send_bpf above and that will be closed here
+        // for send_bpf operation.
+        dnssd_close(listenfd);
+        listenfd = dnssd_InvalidSocket; // Make sure we don't close it a second time in the cleanup handling below
+    }
+
+    // At this point we may wait in read_all for a few milliseconds waiting for the daemon to send us the error code,
+    // but that's okay -- the daemon should not take more than a few milliseconds to respond.
+    // set_waitlimit() ensures we do not block indefinitely just in case something is wrong
+    if (sdr->op == send_bpf)    // Okay to use sdr->op when checking for op == send_bpf
+        err = kDNSServiceErr_NoError;
+    else if ((err = set_waitlimit(errsd, DNSSD_CLIENT_TIMEOUT)) == kDNSServiceErr_NoError)
+    {
+        if (read_all(errsd, (char*)&err, (int)sizeof(err)) < 0)
+            err = kDNSServiceErr_ServiceNotRunning; // On failure read_all will have written a message to syslog for us
+        else
+            err = ntohl(err);
+    }
+    //syslog(LOG_WARNING, "dnssd_clientstub deliver_request: retrieved error code %d", err);
+
+cleanup:
+    if (MakeSeparateReturnSocket)
+    {
+        if (dnssd_SocketValid(listenfd)) dnssd_close(listenfd);
+        if (dnssd_SocketValid(errsd)) dnssd_close(errsd);
+#if defined(USE_NAMED_ERROR_RETURN_SOCKET)
+        // syslog(LOG_WARNING, "dnssd_clientstub deliver_request: removing UDS: %s", data);
+        if (unlink(data) != 0)
+            syslog(LOG_WARNING, "dnssd_clientstub WARNING: unlink(\"%s\") failed errno %d (%s)", data, dnssd_errno, dnssd_strerror(dnssd_errno));
+        // else syslog(LOG_WARNING, "dnssd_clientstub deliver_request: removed UDS: %s", data);
+#endif
+    }
+
+    free(hdr);
+    return err;
+}
+
+int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef)
+{
+    if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD called with NULL DNSServiceRef"); return dnssd_InvalidSocket; }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD called with invalid DNSServiceRef %p %08X %08X",
+               sdRef, sdRef->sockfd, sdRef->validator);
+        return dnssd_InvalidSocket;
+    }
+
+    if (sdRef->primary)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefSockFD undefined for kDNSServiceFlagsShareConnection subordinate DNSServiceRef %p", sdRef);
+        return dnssd_InvalidSocket;
+    }
+
+    return (int) sdRef->sockfd;
+}
+
+#if _DNS_SD_LIBDISPATCH
+static void CallbackWithError(DNSServiceRef sdRef, DNSServiceErrorType error)
+{
+    DNSServiceOp *sdr = sdRef;
+    DNSServiceOp *sdrNext;
+    DNSRecord *rec;
+    DNSRecord *recnext;
+    int morebytes;
+
+    while (sdr)
+    {
+        // We can't touch the sdr after the callback as it can be deallocated in the callback
+        sdrNext = sdr->next;
+        morebytes = 1;
+        sdr->moreptr = &morebytes;
+        switch (sdr->op)
+        {
+        case resolve_request:
+            if (sdr->AppCallback) ((DNSServiceResolveReply)    sdr->AppCallback)(sdr, 0, 0, error, NULL, 0, 0, 0, NULL,    sdr->AppContext);
+            break;
+        case query_request:
+            if (sdr->AppCallback) ((DNSServiceQueryRecordReply)sdr->AppCallback)(sdr, 0, 0, error, NULL, 0, 0, 0, NULL, 0, sdr->AppContext);
+            break;
+        case addrinfo_request:
+            if (sdr->AppCallback) ((DNSServiceGetAddrInfoReply)sdr->AppCallback)(sdr, 0, 0, error, NULL, NULL, 0,          sdr->AppContext);
+            break;
+        case browse_request:
+            if (sdr->AppCallback) ((DNSServiceBrowseReply)     sdr->AppCallback)(sdr, 0, 0, error, NULL, 0, NULL,          sdr->AppContext);
+            break;
+        case reg_service_request:
+            if (sdr->AppCallback) ((DNSServiceRegisterReply)   sdr->AppCallback)(sdr, 0,    error, NULL, 0, NULL,          sdr->AppContext);
+            break;
+        case enumeration_request:
+            if (sdr->AppCallback) ((DNSServiceDomainEnumReply) sdr->AppCallback)(sdr, 0, 0, error, NULL,                   sdr->AppContext);
+            break;
+        case connection_request:
+        case connection_delegate_request:
+            // This means Register Record, walk the list of DNSRecords to do the callback
+            rec = sdr->rec;
+            while (rec)
+            {
+                recnext = rec->recnext;
+                if (rec->AppCallback) ((DNSServiceRegisterRecordReply)rec->AppCallback)(sdr, 0, 0, error, rec->AppContext);
+                // The Callback can call DNSServiceRefDeallocate which in turn frees sdr and all the records.
+                // Detect that and return early
+                if (!morebytes) {syslog(LOG_WARNING, "dnssdclientstub:Record: CallbackwithError morebytes zero"); return;}
+                rec = recnext;
+            }
+            break;
+        case port_mapping_request:
+            if (sdr->AppCallback) ((DNSServiceNATPortMappingReply)sdr->AppCallback)(sdr, 0, 0, error, 0, 0, 0, 0, 0, sdr->AppContext);
+            break;
+        default:
+            syslog(LOG_WARNING, "dnssd_clientstub CallbackWithError called with bad op %d", sdr->op);
+        }
+        // If DNSServiceRefDeallocate was called in the callback, morebytes will be zero. As the sdRef
+        // (and its subordinates) have been freed, we should not proceed further. Note that when we
+        // call the callback with a subordinate sdRef the application can call DNSServiceRefDeallocate
+        // on the main sdRef and DNSServiceRefDeallocate handles this case by walking all the sdRefs and
+        // clears the moreptr so that we can terminate here.
+        //
+        // If DNSServiceRefDeallocate was not called in the callback, then set moreptr to NULL so that
+        // we don't access the stack variable after we return from this function.
+        if (!morebytes) {syslog(LOG_WARNING, "dnssdclientstub:sdRef: CallbackwithError morebytes zero sdr %p", sdr); return;}
+        else {sdr->moreptr = NULL;}
+        sdr = sdrNext;
+    }
+}
+#endif // _DNS_SD_LIBDISPATCH
+
+// Handle reply from server, calling application client callback. If there is no reply
+// from the daemon on the socket contained in sdRef, the call will block.
+DNSServiceErrorType DNSSD_API DNSServiceProcessResult(DNSServiceRef sdRef)
+{
+    int morebytes = 0;
+
+    if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult called with NULL DNSServiceRef"); return kDNSServiceErr_BadParam; }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    if (sdRef->primary)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult undefined for kDNSServiceFlagsShareConnection subordinate DNSServiceRef %p", sdRef);
+        return kDNSServiceErr_BadReference;
+    }
+
+    if (!sdRef->ProcessReply)
+    {
+        static int num_logs = 0;
+        if (num_logs < 10) syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult called with DNSServiceRef with no ProcessReply function");
+        if (num_logs < 1000) num_logs++;else sleep(1);
+        return kDNSServiceErr_BadReference;
+    }
+
+    do
+    {
+        CallbackHeader cbh;
+        char *data;
+
+        // return NoError on EWOULDBLOCK. This will handle the case
+        // where a non-blocking socket is told there is data, but it was a false positive.
+        // On error, read_all will write a message to syslog for us, so don't need to duplicate that here
+        // Note: If we want to properly support using non-blocking sockets in the future
+        int result = read_all(sdRef->sockfd, (void *)&cbh.ipc_hdr, sizeof(cbh.ipc_hdr));
+        if (result == read_all_fail)
+        {
+            // Set the ProcessReply to NULL before callback as the sdRef can get deallocated
+            // in the callback.
+            sdRef->ProcessReply = NULL;
+#if _DNS_SD_LIBDISPATCH
+            // Call the callbacks with an error if using the dispatch API, as DNSServiceProcessResult
+            // is not called by the application and hence need to communicate the error. Cancel the
+            // source so that we don't get any more events
+            // Note: read_all fails if we could not read from the daemon which can happen if the
+            // daemon dies or the file descriptor is disconnected (defunct).
+            if (sdRef->disp_source)
+            {
+                dispatch_source_cancel(sdRef->disp_source);
+                dispatch_release(sdRef->disp_source);
+                sdRef->disp_source = NULL;
+                CallbackWithError(sdRef, kDNSServiceErr_ServiceNotRunning);
+            }
+#endif
+            // Don't touch sdRef anymore as it might have been deallocated
+            return kDNSServiceErr_ServiceNotRunning;
+        }
+        else if (result == read_all_wouldblock)
+        {
+            if (morebytes && sdRef->logcounter < 100)
+            {
+                sdRef->logcounter++;
+                syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult error: select indicated data was waiting but read_all returned EWOULDBLOCK");
+            }
+            return kDNSServiceErr_NoError;
+        }
+
+        ConvertHeaderBytes(&cbh.ipc_hdr);
+        if (cbh.ipc_hdr.version != VERSION)
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub DNSServiceProcessResult daemon version %d does not match client version %d", cbh.ipc_hdr.version, VERSION);
+            sdRef->ProcessReply = NULL;
+            return kDNSServiceErr_Incompatible;
+        }
+
+        data = malloc(cbh.ipc_hdr.datalen);
+        if (!data) return kDNSServiceErr_NoMemory;
+        if (read_all(sdRef->sockfd, data, cbh.ipc_hdr.datalen) < 0) // On error, read_all will write a message to syslog for us
+        {
+            // Set the ProcessReply to NULL before callback as the sdRef can get deallocated
+            // in the callback.
+            sdRef->ProcessReply = NULL;
+#if _DNS_SD_LIBDISPATCH
+            // Call the callbacks with an error if using the dispatch API, as DNSServiceProcessResult
+            // is not called by the application and hence need to communicate the error. Cancel the
+            // source so that we don't get any more events
+            if (sdRef->disp_source)
+            {
+                dispatch_source_cancel(sdRef->disp_source);
+                dispatch_release(sdRef->disp_source);
+                sdRef->disp_source = NULL;
+                CallbackWithError(sdRef, kDNSServiceErr_ServiceNotRunning);
+            }
+#endif
+            // Don't touch sdRef anymore as it might have been deallocated
+            free(data);
+            return kDNSServiceErr_ServiceNotRunning;
+        }
+        else
+        {
+            const char *ptr = data;
+            cbh.cb_flags     = get_flags     (&ptr, data + cbh.ipc_hdr.datalen);
+            cbh.cb_interface = get_uint32    (&ptr, data + cbh.ipc_hdr.datalen);
+            cbh.cb_err       = get_error_code(&ptr, data + cbh.ipc_hdr.datalen);
+
+            // CAUTION: We have to handle the case where the client calls DNSServiceRefDeallocate from within the callback function.
+            // To do this we set moreptr to point to morebytes. If the client does call DNSServiceRefDeallocate(),
+            // then that routine will clear morebytes for us, and cause us to exit our loop.
+            morebytes = more_bytes(sdRef->sockfd);
+            if (morebytes)
+            {
+                cbh.cb_flags |= kDNSServiceFlagsMoreComing;
+                sdRef->moreptr = &morebytes;
+            }
+            if (ptr) sdRef->ProcessReply(sdRef, &cbh, ptr, data + cbh.ipc_hdr.datalen);
+            // Careful code here:
+            // If morebytes is non-zero, that means we set sdRef->moreptr above, and the operation was not
+            // cancelled out from under us, so now we need to clear sdRef->moreptr so we don't leave a stray
+            // dangling pointer pointing to a long-gone stack variable.
+            // If morebytes is zero, then one of two thing happened:
+            // (a) morebytes was 0 above, so we didn't set sdRef->moreptr, so we don't need to clear it
+            // (b) morebytes was 1 above, and we set sdRef->moreptr, but the operation was cancelled (with DNSServiceRefDeallocate()),
+            //     so we MUST NOT try to dereference our stale sdRef pointer.
+            if (morebytes) sdRef->moreptr = NULL;
+        }
+        free(data);
+    } while (morebytes);
+
+    return kDNSServiceErr_NoError;
+}
+
+void DNSSD_API DNSServiceRefDeallocate(DNSServiceRef sdRef)
+{
+    if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefDeallocate called with NULL DNSServiceRef"); return; }
+
+    if (!DNSServiceRefValid(sdRef))     // Also verifies dnssd_SocketValid(sdRef->sockfd) for us too
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRefDeallocate called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return;
+    }
+
+    // If we're in the middle of a DNSServiceProcessResult() invocation for this DNSServiceRef, clear its morebytes flag to break it out of its while loop
+    if (sdRef->moreptr) *(sdRef->moreptr) = 0;
+
+    if (sdRef->primary)     // If this is a subordinate DNSServiceOp, just send a 'stop' command
+    {
+        DNSServiceOp **p = &sdRef->primary->next;
+        while (*p && *p != sdRef) p = &(*p)->next;
+        if (*p)
+        {
+            char *ptr;
+            size_t len = 0;
+            ipc_msg_hdr *hdr = create_hdr(cancel_request, &len, &ptr, 0, sdRef);
+            if (hdr)
+            {
+                ConvertHeaderBytes(hdr);
+                write_all(sdRef->sockfd, (char *)hdr, len);
+                free(hdr);
+            }
+            *p = sdRef->next;
+            FreeDNSServiceOp(sdRef);
+        }
+    }
+    else                    // else, make sure to terminate all subordinates as well
+    {
+#if _DNS_SD_LIBDISPATCH
+        // The cancel handler will close the fd if a dispatch source has been set
+        if (sdRef->disp_source)
+        {
+            // By setting the ProcessReply to NULL, we make sure that we never call
+            // the application callbacks ever, after returning from this function. We
+            // assume that DNSServiceRefDeallocate is called from the serial queue
+            // that was passed to DNSServiceSetDispatchQueue. Hence, dispatch_source_cancel
+            // should cancel all the blocks on the queue and hence there should be no more
+            // callbacks when we return from this function. Setting ProcessReply to NULL
+            // provides extra protection.
+            sdRef->ProcessReply = NULL;
+            dispatch_source_cancel(sdRef->disp_source);
+            dispatch_release(sdRef->disp_source);
+            sdRef->disp_source = NULL;
+        }
+        // if disp_queue is set, it means it used the DNSServiceSetDispatchQueue API. In that case,
+        // when the source was cancelled, the fd was closed in the handler. Currently the source
+        // is cancelled only when the mDNSResponder daemon dies
+        else if (!sdRef->disp_queue) dnssd_close(sdRef->sockfd);
+#else
+        dnssd_close(sdRef->sockfd);
+#endif
+        // Free DNSRecords added in DNSRegisterRecord if they have not
+        // been freed in DNSRemoveRecord
+        while (sdRef)
+        {
+            DNSServiceOp *p = sdRef;
+            sdRef = sdRef->next;
+            // When there is an error reading from the daemon e.g., bad fd, CallbackWithError
+            // is called which sets moreptr. It might set the moreptr on a subordinate sdRef
+            // but the application might call DNSServiceRefDeallocate with the main sdRef from
+            // the callback. Hence, when we loop through the subordinate sdRefs, we need
+            // to clear the moreptr so that CallbackWithError can terminate itself instead of
+            // walking through the freed sdRefs.
+            if (p->moreptr) *(p->moreptr) = 0;
+            FreeDNSServiceOp(p);
+        }
+    }
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceGetProperty(const char *property, void *result, uint32_t *size)
+{
+    char *ptr;
+    size_t len = strlen(property) + 1;
+    ipc_msg_hdr *hdr;
+    DNSServiceOp *tmp;
+    uint32_t actualsize;
+
+    DNSServiceErrorType err = ConnectToServer(&tmp, 0, getproperty_request, NULL, NULL, NULL);
+    if (err) return err;
+
+    hdr = create_hdr(getproperty_request, &len, &ptr, 0, tmp);
+    if (!hdr) { DNSServiceRefDeallocate(tmp); return kDNSServiceErr_NoMemory; }
+
+    put_string(property, &ptr);
+    err = deliver_request(hdr, tmp);        // Will free hdr for us
+    if (read_all(tmp->sockfd, (char*)&actualsize, (int)sizeof(actualsize)) < 0)
+    { DNSServiceRefDeallocate(tmp); return kDNSServiceErr_ServiceNotRunning; }
+
+    actualsize = ntohl(actualsize);
+    if (read_all(tmp->sockfd, (char*)result, actualsize < *size ? actualsize : *size) < 0)
+    { DNSServiceRefDeallocate(tmp); return kDNSServiceErr_ServiceNotRunning; }
+    DNSServiceRefDeallocate(tmp);
+
+    // Swap version result back to local process byte order
+    if (!strcmp(property, kDNSServiceProperty_DaemonVersion) && *size >= 4)
+        *(uint32_t*)result = ntohl(*(uint32_t*)result);
+
+    *size = actualsize;
+    return kDNSServiceErr_NoError;
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceGetPID(const uint16_t srcport, int32_t *pid)
+{
+    char *ptr;
+    ipc_msg_hdr *hdr;
+    DNSServiceOp *tmp;
+    size_t len = sizeof(int32_t);
+
+    DNSServiceErrorType err = ConnectToServer(&tmp, 0, getpid_request, NULL, NULL, NULL);
+    if (err)
+        return err;
+
+    hdr = create_hdr(getpid_request, &len, &ptr, 0, tmp);
+    if (!hdr)
+    {
+        DNSServiceRefDeallocate(tmp);
+        return kDNSServiceErr_NoMemory;
+    }
+
+    put_uint16(srcport, &ptr);
+    err = deliver_request(hdr, tmp);        // Will free hdr for us
+
+    if (read_all(tmp->sockfd, (char*)pid, sizeof(int32_t)) < 0)
+    {
+        DNSServiceRefDeallocate(tmp);
+        return kDNSServiceErr_ServiceNotRunning;
+    }
+
+    DNSServiceRefDeallocate(tmp);
+    return kDNSServiceErr_NoError;
+}
+
+static void handle_resolve_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *end)
+{
+    char fullname[kDNSServiceMaxDomainName];
+    char target[kDNSServiceMaxDomainName];
+    uint16_t txtlen;
+    union { uint16_t s; u_char b[2]; } port;
+    unsigned char *txtrecord;
+
+    get_string(&data, end, fullname, kDNSServiceMaxDomainName);
+    get_string(&data, end, target,   kDNSServiceMaxDomainName);
+    if (!data || data + 2 > end) goto fail;
+
+    port.b[0] = *data++;
+    port.b[1] = *data++;
+    txtlen = get_uint16(&data, end);
+    txtrecord = (unsigned char *)get_rdata(&data, end, txtlen);
+
+    if (!data) goto fail;
+    ((DNSServiceResolveReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, fullname, target, port.s, txtlen, txtrecord, sdr->AppContext);
+    return;
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+fail:
+    syslog(LOG_WARNING, "dnssd_clientstub handle_resolve_response: error reading result from daemon");
+}
+
+#if APPLE_OSX_mDNSResponder
+
+static int32_t libSystemVersion = 0;
+
+// Return true if the application linked against a version of libsystem where P2P
+// interfaces were included by default when using kDNSServiceInterfaceIndexAny.
+// Using 160.0.0 == 0xa00000 as the version threshold.
+static int includeP2PWithIndexAny()
+{
+    if (libSystemVersion == 0)
+        libSystemVersion = NSVersionOfLinkTimeLibrary("System");
+
+    if (libSystemVersion < 0xa00000)
+        return 1;
+    else
+        return 0;
+}
+
+#else   // APPLE_OSX_mDNSResponder
+
+// always return false for non Apple platforms
+static int includeP2PWithIndexAny()
+{
+    return 0;
+}
+
+#endif  // APPLE_OSX_mDNSResponder
+
+DNSServiceErrorType DNSSD_API DNSServiceResolve
+(
+    DNSServiceRef                 *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                    *name,
+    const char                    *regtype,
+    const char                    *domain,
+    DNSServiceResolveReply callBack,
+    void                          *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+
+    if (!name || !regtype || !domain || !callBack) return kDNSServiceErr_BadParam;
+
+    // Need a real InterfaceID for WakeOnResolve
+    if ((flags & kDNSServiceFlagsWakeOnResolve) != 0 &&
+        ((interfaceIndex == kDNSServiceInterfaceIndexAny) ||
+         (interfaceIndex == kDNSServiceInterfaceIndexLocalOnly) ||
+         (interfaceIndex == kDNSServiceInterfaceIndexUnicast) ||
+         (interfaceIndex == kDNSServiceInterfaceIndexP2P)))
+    {
+        return kDNSServiceErr_BadParam;
+    }
+
+    if ((interfaceIndex == kDNSServiceInterfaceIndexAny) && includeP2PWithIndexAny())
+        flags |= kDNSServiceFlagsIncludeP2P;
+
+    err = ConnectToServer(sdRef, flags, resolve_request, handle_resolve_response, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    // Calculate total message length
+    len = sizeof(flags);
+    len += sizeof(interfaceIndex);
+    len += strlen(name) + 1;
+    len += strlen(regtype) + 1;
+    len += strlen(domain) + 1;
+
+    hdr = create_hdr(resolve_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(name, &ptr);
+    put_string(regtype, &ptr);
+    put_string(domain, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+static void handle_query_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    uint32_t ttl;
+    char name[kDNSServiceMaxDomainName];
+    uint16_t rrtype, rrclass, rdlen;
+    const char *rdata;
+
+    get_string(&data, end, name, kDNSServiceMaxDomainName);
+    rrtype  = get_uint16(&data, end);
+    rrclass = get_uint16(&data, end);
+    rdlen   = get_uint16(&data, end);
+    rdata   = get_rdata(&data, end, rdlen);
+    ttl     = get_uint32(&data, end);
+
+    if (!data) syslog(LOG_WARNING, "dnssd_clientstub handle_query_response: error reading result from daemon");
+    else ((DNSServiceQueryRecordReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, name, rrtype, rrclass, rdlen, rdata, ttl, sdr->AppContext);
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceQueryRecord
+(
+    DNSServiceRef              *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                 *name,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    DNSServiceQueryRecordReply callBack,
+    void                       *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+
+    if ((interfaceIndex == kDNSServiceInterfaceIndexAny) && includeP2PWithIndexAny())
+        flags |= kDNSServiceFlagsIncludeP2P;
+
+    err = ConnectToServer(sdRef, flags, query_request, handle_query_response, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    if (!name) name = "\0";
+
+    // Calculate total message length
+    len = sizeof(flags);
+    len += sizeof(uint32_t);  // interfaceIndex
+    len += strlen(name) + 1;
+    len += 2 * sizeof(uint16_t);  // rrtype, rrclass
+
+    hdr = create_hdr(query_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(name, &ptr);
+    put_uint16(rrtype, &ptr);
+    put_uint16(rrclass, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+static void handle_addrinfo_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    char hostname[kDNSServiceMaxDomainName];
+    uint16_t rrtype, rrclass, rdlen;
+    const char *rdata;
+    uint32_t ttl;
+
+    get_string(&data, end, hostname, kDNSServiceMaxDomainName);
+    rrtype  = get_uint16(&data, end);
+    rrclass = get_uint16(&data, end);
+    rdlen   = get_uint16(&data, end);
+    rdata   = get_rdata (&data, end, rdlen);
+    ttl     = get_uint32(&data, end);
+
+    // We only generate client callbacks for A and AAAA results (including NXDOMAIN results for
+    // those types, if the client has requested those with the kDNSServiceFlagsReturnIntermediates).
+    // Other result types, specifically CNAME referrals, are not communicated to the client, because
+    // the DNSServiceGetAddrInfoReply interface doesn't have any meaningful way to communiate CNAME referrals.
+    if (!data) syslog(LOG_WARNING, "dnssd_clientstub handle_addrinfo_response: error reading result from daemon");
+    else if (rrtype == kDNSServiceType_A || rrtype == kDNSServiceType_AAAA)
+    {
+        struct sockaddr_in sa4;
+        struct sockaddr_in6 sa6;
+        const struct sockaddr *const sa = (rrtype == kDNSServiceType_A) ? (struct sockaddr*)&sa4 : (struct sockaddr*)&sa6;
+        if (rrtype == kDNSServiceType_A)
+        {
+            memset(&sa4, 0, sizeof(sa4));
+            #ifndef NOT_HAVE_SA_LEN
+            sa4.sin_len = sizeof(struct sockaddr_in);
+            #endif
+            sa4.sin_family = AF_INET;
+            //  sin_port   = 0;
+            if (!cbh->cb_err) memcpy(&sa4.sin_addr, rdata, rdlen);
+        }
+        else
+        {
+            memset(&sa6, 0, sizeof(sa6));
+            #ifndef NOT_HAVE_SA_LEN
+            sa6.sin6_len = sizeof(struct sockaddr_in6);
+            #endif
+            sa6.sin6_family     = AF_INET6;
+            //  sin6_port     = 0;
+            //  sin6_flowinfo = 0;
+            //  sin6_scope_id = 0;
+            if (!cbh->cb_err)
+            {
+                memcpy(&sa6.sin6_addr, rdata, rdlen);
+                if (IN6_IS_ADDR_LINKLOCAL(&sa6.sin6_addr)) sa6.sin6_scope_id = cbh->cb_interface;
+            }
+        }
+        // Validation results are always delivered separately from the actual results of the
+        // DNSServiceGetAddrInfo. Set the "addr" to NULL as per the documentation.
+        //
+        // Note: If we deliver validation results along with the "addr" in the future, we need
+        // a way to differentiate the negative response from validation-only response as both
+        // has zero address.
+        if (!(cbh->cb_flags & kDNSServiceFlagsValidate))
+            ((DNSServiceGetAddrInfoReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, hostname, sa, ttl, sdr->AppContext);
+        else
+            ((DNSServiceGetAddrInfoReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, hostname, NULL, 0, sdr->AppContext);
+        // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+    }
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceGetAddrInfo
+(
+    DNSServiceRef                    *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    uint32_t protocol,
+    const char                       *hostname,
+    DNSServiceGetAddrInfoReply callBack,
+    void                             *context          /* may be NULL */
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+
+    if (!hostname) return kDNSServiceErr_BadParam;
+
+    err = ConnectToServer(sdRef, flags, addrinfo_request, handle_addrinfo_response, callBack, context);
+    if (err)
+    {
+         return err;    // On error ConnectToServer leaves *sdRef set to NULL
+    }
+
+    // Calculate total message length
+    len = sizeof(flags);
+    len += sizeof(uint32_t);      // interfaceIndex
+    len += sizeof(uint32_t);      // protocol
+    len += strlen(hostname) + 1;
+
+    hdr = create_hdr(addrinfo_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_uint32(protocol, &ptr);
+    put_string(hostname, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+static void handle_browse_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    char replyName[256], replyType[kDNSServiceMaxDomainName], replyDomain[kDNSServiceMaxDomainName];
+    get_string(&data, end, replyName, 256);
+    get_string(&data, end, replyType, kDNSServiceMaxDomainName);
+    get_string(&data, end, replyDomain, kDNSServiceMaxDomainName);
+    if (!data) syslog(LOG_WARNING, "dnssd_clientstub handle_browse_response: error reading result from daemon");
+    else ((DNSServiceBrowseReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, replyName, replyType, replyDomain, sdr->AppContext);
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceBrowse
+(
+    DNSServiceRef         *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char            *regtype,
+    const char            *domain,
+    DNSServiceBrowseReply callBack,
+    void                  *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+
+    if ((interfaceIndex == kDNSServiceInterfaceIndexAny) && includeP2PWithIndexAny())
+        flags |= kDNSServiceFlagsIncludeP2P;
+
+    err = ConnectToServer(sdRef, flags, browse_request, handle_browse_response, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    if (!domain) domain = "";
+    len = sizeof(flags);
+    len += sizeof(interfaceIndex);
+    len += strlen(regtype) + 1;
+    len += strlen(domain) + 1;
+
+    hdr = create_hdr(browse_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(regtype, &ptr);
+    put_string(domain, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceSetDefaultDomainForUser(DNSServiceFlags flags, const char *domain);
+DNSServiceErrorType DNSSD_API DNSServiceSetDefaultDomainForUser(DNSServiceFlags flags, const char *domain)
+{
+    DNSServiceOp *tmp;
+    char *ptr;
+    size_t len = sizeof(flags) + strlen(domain) + 1;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err = ConnectToServer(&tmp, 0, setdomain_request, NULL, NULL, NULL);
+    if (err) return err;
+
+    hdr = create_hdr(setdomain_request, &len, &ptr, 0, tmp);
+    if (!hdr) { DNSServiceRefDeallocate(tmp); return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_string(domain, &ptr);
+    err = deliver_request(hdr, tmp);        // Will free hdr for us
+    DNSServiceRefDeallocate(tmp);
+    return err;
+}
+
+static void handle_regservice_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    char name[256], regtype[kDNSServiceMaxDomainName], domain[kDNSServiceMaxDomainName];
+    get_string(&data, end, name, 256);
+    get_string(&data, end, regtype, kDNSServiceMaxDomainName);
+    get_string(&data, end, domain,  kDNSServiceMaxDomainName);
+    if (!data) syslog(LOG_WARNING, "dnssd_clientstub handle_regservice_response: error reading result from daemon");
+    else ((DNSServiceRegisterReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_err, name, regtype, domain, sdr->AppContext);
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceRegister
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                          *name,
+    const char                          *regtype,
+    const char                          *domain,
+    const char                          *host,
+    uint16_t PortInNetworkByteOrder,
+    uint16_t txtLen,
+    const void                          *txtRecord,
+    DNSServiceRegisterReply callBack,
+    void                                *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+    union { uint16_t s; u_char b[2]; } port = { PortInNetworkByteOrder };
+
+    if (!name) name = "";
+    if (!regtype) return kDNSServiceErr_BadParam;
+    if (!domain) domain = "";
+    if (!host) host = "";
+    if (!txtRecord) txtRecord = (void*)"";
+
+    // No callback must have auto-rename
+    if (!callBack && (flags & kDNSServiceFlagsNoAutoRename)) return kDNSServiceErr_BadParam;
+
+    if ((interfaceIndex == kDNSServiceInterfaceIndexAny) && includeP2PWithIndexAny())
+        flags |= kDNSServiceFlagsIncludeP2P;
+
+    err = ConnectToServer(sdRef, flags, reg_service_request, callBack ? handle_regservice_response : NULL, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    len = sizeof(DNSServiceFlags);
+    len += sizeof(uint32_t);  // interfaceIndex
+    len += strlen(name) + strlen(regtype) + strlen(domain) + strlen(host) + 4;
+    len += 2 * sizeof(uint16_t);  // port, txtLen
+    len += txtLen;
+
+    hdr = create_hdr(reg_service_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    // If it is going over a shared connection, then don't set the IPC_FLAGS_NOREPLY
+    // as it affects all the operations over the shared connection. This is not
+    // a normal case and hence receiving the response back from the daemon and
+    // discarding it in ConnectionResponse is okay.
+
+    if (!(flags & kDNSServiceFlagsShareConnection) && !callBack) hdr->ipc_flags |= IPC_FLAGS_NOREPLY;
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(name, &ptr);
+    put_string(regtype, &ptr);
+    put_string(domain, &ptr);
+    put_string(host, &ptr);
+    *ptr++ = port.b[0];
+    *ptr++ = port.b[1];
+    put_uint16(txtLen, &ptr);
+    put_rdata(txtLen, txtRecord, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+static void handle_enumeration_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    char domain[kDNSServiceMaxDomainName];
+    get_string(&data, end, domain, kDNSServiceMaxDomainName);
+    if (!data) syslog(LOG_WARNING, "dnssd_clientstub handle_enumeration_response: error reading result from daemon");
+    else ((DNSServiceDomainEnumReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, domain, sdr->AppContext);
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceEnumerateDomains
+(
+    DNSServiceRef             *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    DNSServiceDomainEnumReply callBack,
+    void                      *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err;
+
+    int f1 = (flags & kDNSServiceFlagsBrowseDomains) != 0;
+    int f2 = (flags & kDNSServiceFlagsRegistrationDomains) != 0;
+    if (f1 + f2 != 1) return kDNSServiceErr_BadParam;
+
+    err = ConnectToServer(sdRef, flags, enumeration_request, handle_enumeration_response, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    len = sizeof(DNSServiceFlags);
+    len += sizeof(uint32_t);
+
+    hdr = create_hdr(enumeration_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+static void ConnectionResponse(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *const data, const char *const end)
+{
+    (void)data; // Unused
+
+    //printf("ConnectionResponse got %d\n", cbh->ipc_hdr.op);
+    if (cbh->ipc_hdr.op != reg_record_reply_op)
+    {
+        // When using kDNSServiceFlagsShareConnection, need to search the list of associated DNSServiceOps
+        // to find the one this response is intended for, and then call through to its ProcessReply handler.
+        // We start with our first subordinate DNSServiceRef -- don't want to accidentally match the parent DNSServiceRef.
+        DNSServiceOp *op = sdr->next;
+        while (op && (op->uid.u32[0] != cbh->ipc_hdr.client_context.u32[0] || op->uid.u32[1] != cbh->ipc_hdr.client_context.u32[1]))
+            op = op->next;
+        // Note: We may sometimes not find a matching DNSServiceOp, in the case where the client has
+        // cancelled the subordinate DNSServiceOp, but there are still messages in the pipeline from the daemon
+        if (op && op->ProcessReply) op->ProcessReply(op, cbh, data, end);
+        // WARNING: Don't touch op or sdr after this -- client may have called DNSServiceRefDeallocate
+        return;
+    }
+    else
+    {
+        DNSRecordRef rec;
+        for (rec = sdr->rec; rec; rec = rec->recnext)
+        {
+            if (rec->uid.u32[0] == cbh->ipc_hdr.client_context.u32[0] && rec->uid.u32[1] == cbh->ipc_hdr.client_context.u32[1])
+                break;
+        }
+        // The record might have been freed already and hence not an
+        // error if the record is not found.
+        if (!rec)
+        {
+            syslog(LOG_INFO, "ConnectionResponse: Record not found");
+            return;
+        }
+        if (rec->sdr != sdr)
+        {
+            syslog(LOG_WARNING, "ConnectionResponse: Record sdr mismatch: rec %p sdr %p", rec->sdr, sdr);
+            return;
+        }
+
+        if (sdr->op == connection_request || sdr->op == connection_delegate_request)
+        {
+            rec->AppCallback(rec->sdr, rec, cbh->cb_flags, cbh->cb_err, rec->AppContext);
+        }
+        else
+        {
+            syslog(LOG_WARNING, "dnssd_clientstub ConnectionResponse: sdr->op != connection_request");
+            rec->AppCallback(rec->sdr, rec, 0, kDNSServiceErr_Unknown, rec->AppContext);
+        }
+        // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+    }
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceCreateConnection(DNSServiceRef *sdRef)
+{
+    char *ptr;
+    size_t len = 0;
+    ipc_msg_hdr *hdr;
+    DNSServiceErrorType err = ConnectToServer(sdRef, 0, connection_request, ConnectionResponse, NULL, NULL);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    hdr = create_hdr(connection_request, &len, &ptr, 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+#if APPLE_OSX_mDNSResponder && !TARGET_IPHONE_SIMULATOR
+DNSServiceErrorType DNSSD_API DNSServiceCreateDelegateConnection(DNSServiceRef *sdRef, int32_t pid, uuid_t uuid)
+{
+    char *ptr;
+    size_t len = 0;
+    ipc_msg_hdr *hdr;
+
+    DNSServiceErrorType err = ConnectToServer(sdRef, 0, connection_delegate_request, ConnectionResponse, NULL, NULL);
+    if (err)
+    {
+         return err;    // On error ConnectToServer leaves *sdRef set to NULL
+    }
+
+    // Only one of the two options can be set. If pid is zero, uuid is used. 
+    // If both are specified only pid will be used. We send across the pid
+    // so that the daemon knows what to read from the socket.
+
+    len += sizeof(int32_t);
+
+    hdr = create_hdr(connection_delegate_request, &len, &ptr, 0, *sdRef);
+    if (!hdr)
+    {
+        DNSServiceRefDeallocate(*sdRef);
+        *sdRef = NULL;
+        return kDNSServiceErr_NoMemory;
+    }
+
+    if (pid && setsockopt((*sdRef)->sockfd, SOL_SOCKET, SO_DELEGATED, &pid, sizeof(pid)) == -1)
+    {  
+        // Free the hdr in case we return before calling deliver_request() 
+        if (hdr)
+            free(hdr);
+        DNSServiceRefDeallocate(*sdRef);
+        *sdRef = NULL;
+        return kDNSServiceErr_NoAuth;
+    }
+
+    if (!pid && setsockopt((*sdRef)->sockfd, SOL_SOCKET, SO_DELEGATED_UUID, uuid, sizeof(uuid_t)) == -1)
+    {
+        // Free the hdr in case we return before calling deliver_request()
+        if (hdr)
+            free(hdr);
+        DNSServiceRefDeallocate(*sdRef);
+        *sdRef = NULL;
+        return kDNSServiceErr_NoAuth;
+    }
+
+    put_uint32(pid, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err)
+    {
+        DNSServiceRefDeallocate(*sdRef);
+        *sdRef = NULL;
+    }
+    return err;
+}
+#elif TARGET_IPHONE_SIMULATOR // This hack is for Simulator platform only
+DNSServiceErrorType DNSSD_API DNSServiceCreateDelegateConnection(DNSServiceRef *sdRef, int32_t pid, uuid_t uuid)
+{
+    (void) pid;
+    (void) uuid;
+    return DNSServiceCreateConnection(sdRef);
+}
+#endif
+
+DNSServiceErrorType DNSSD_API DNSServiceRegisterRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef                  *RecordRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char                    *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void                    *rdata,
+    uint32_t ttl,
+    DNSServiceRegisterRecordReply callBack,
+    void                          *context
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr = NULL;
+    DNSRecordRef rref = NULL;
+    DNSRecord **p;
+    int f1 = (flags & kDNSServiceFlagsShared) != 0;
+    int f2 = (flags & kDNSServiceFlagsUnique) != 0;
+    if (f1 + f2 != 1) return kDNSServiceErr_BadParam;
+
+    if ((interfaceIndex == kDNSServiceInterfaceIndexAny) && includeP2PWithIndexAny())
+        flags |= kDNSServiceFlagsIncludeP2P;
+
+    if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRegisterRecord called with NULL DNSServiceRef"); return kDNSServiceErr_BadParam; }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRegisterRecord called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    if (sdRef->op != connection_request && sdRef->op != connection_delegate_request)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRegisterRecord called with non-DNSServiceCreateConnection DNSServiceRef %p %d", sdRef, sdRef->op);
+        return kDNSServiceErr_BadReference;
+    }
+
+    *RecordRef = NULL;
+
+    len = sizeof(DNSServiceFlags);
+    len += 2 * sizeof(uint32_t);  // interfaceIndex, ttl
+    len += 3 * sizeof(uint16_t);  // rrtype, rrclass, rdlen
+    len += strlen(fullname) + 1;
+    len += rdlen;
+
+    // Bump up the uid. Normally for shared operations (kDNSServiceFlagsShareConnection), this
+    // is done in ConnectToServer. For DNSServiceRegisterRecord, ConnectToServer has already
+    // been called. As multiple DNSServiceRegisterRecords can be multiplexed over a single
+    // connection, we need a way to demultiplex the response so that the callback corresponding
+    // to the right DNSServiceRegisterRecord instance can be called. Use the same mechanism that
+    // is used by kDNSServiceFlagsShareConnection. create_hdr copies the uid value to ipc
+    // hdr->client_context which will be returned in the ipc response.
+    if (++sdRef->uid.u32[0] == 0)
+        ++sdRef->uid.u32[1];
+    hdr = create_hdr(reg_record_request, &len, &ptr, 1, sdRef);
+    if (!hdr) return kDNSServiceErr_NoMemory;
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(fullname, &ptr);
+    put_uint16(rrtype, &ptr);
+    put_uint16(rrclass, &ptr);
+    put_uint16(rdlen, &ptr);
+    put_rdata(rdlen, rdata, &ptr);
+    put_uint32(ttl, &ptr);
+
+    rref = malloc(sizeof(DNSRecord));
+    if (!rref) { free(hdr); return kDNSServiceErr_NoMemory; }
+    rref->AppContext = context;
+    rref->AppCallback = callBack;
+    rref->record_index = sdRef->max_index++;
+    rref->sdr = sdRef;
+    rref->recnext = NULL;
+    *RecordRef = rref;
+    // Remember the uid that we are sending across so that we can match
+    // when the response comes back.
+    rref->uid = sdRef->uid;
+    hdr->reg_index = rref->record_index;
+
+    p = &(sdRef)->rec;
+    while (*p) p = &(*p)->recnext;
+    *p = rref;
+
+    return deliver_request(hdr, sdRef);     // Will free hdr for us
+}
+
+// sdRef returned by DNSServiceRegister()
+DNSServiceErrorType DNSSD_API DNSServiceAddRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef    *RecordRef,
+    DNSServiceFlags flags,
+    uint16_t rrtype,
+    uint16_t rdlen,
+    const void      *rdata,
+    uint32_t ttl
+)
+{
+    ipc_msg_hdr *hdr;
+    size_t len = 0;
+    char *ptr;
+    DNSRecordRef rref;
+    DNSRecord **p;
+
+    if (!sdRef)     { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceAddRecord called with NULL DNSServiceRef");        return kDNSServiceErr_BadParam; }
+    if (!RecordRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceAddRecord called with NULL DNSRecordRef pointer"); return kDNSServiceErr_BadParam; }
+    if (sdRef->op != reg_service_request)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceAddRecord called with non-DNSServiceRegister DNSServiceRef %p %d", sdRef, sdRef->op);
+        return kDNSServiceErr_BadReference;
+    }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceAddRecord called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    *RecordRef = NULL;
+
+    len += 2 * sizeof(uint16_t);  // rrtype, rdlen
+    len += rdlen;
+    len += sizeof(uint32_t);
+    len += sizeof(DNSServiceFlags);
+
+    hdr = create_hdr(add_record_request, &len, &ptr, 1, sdRef);
+    if (!hdr) return kDNSServiceErr_NoMemory;
+    put_flags(flags, &ptr);
+    put_uint16(rrtype, &ptr);
+    put_uint16(rdlen, &ptr);
+    put_rdata(rdlen, rdata, &ptr);
+    put_uint32(ttl, &ptr);
+
+    rref = malloc(sizeof(DNSRecord));
+    if (!rref) { free(hdr); return kDNSServiceErr_NoMemory; }
+    rref->AppContext = NULL;
+    rref->AppCallback = NULL;
+    rref->record_index = sdRef->max_index++;
+    rref->sdr = sdRef;
+    rref->recnext = NULL;
+    *RecordRef = rref;
+    hdr->reg_index = rref->record_index;
+
+    p = &(sdRef)->rec;
+    while (*p) p = &(*p)->recnext;
+    *p = rref;
+
+    return deliver_request(hdr, sdRef);     // Will free hdr for us
+}
+
+// DNSRecordRef returned by DNSServiceRegisterRecord or DNSServiceAddRecord
+DNSServiceErrorType DNSSD_API DNSServiceUpdateRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,
+    DNSServiceFlags flags,
+    uint16_t rdlen,
+    const void      *rdata,
+    uint32_t ttl
+)
+{
+    ipc_msg_hdr *hdr;
+    size_t len = 0;
+    char *ptr;
+
+    if (!sdRef) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceUpdateRecord called with NULL DNSServiceRef"); return kDNSServiceErr_BadParam; }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceUpdateRecord called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    // Note: RecordRef is allowed to be NULL
+
+    len += sizeof(uint16_t);
+    len += rdlen;
+    len += sizeof(uint32_t);
+    len += sizeof(DNSServiceFlags);
+
+    hdr = create_hdr(update_record_request, &len, &ptr, 1, sdRef);
+    if (!hdr) return kDNSServiceErr_NoMemory;
+    hdr->reg_index = RecordRef ? RecordRef->record_index : TXT_RECORD_INDEX;
+    put_flags(flags, &ptr);
+    put_uint16(rdlen, &ptr);
+    put_rdata(rdlen, rdata, &ptr);
+    put_uint32(ttl, &ptr);
+    return deliver_request(hdr, sdRef);     // Will free hdr for us
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceRemoveRecord
+(
+    DNSServiceRef sdRef,
+    DNSRecordRef RecordRef,
+    DNSServiceFlags flags
+)
+{
+    ipc_msg_hdr *hdr;
+    size_t len = 0;
+    char *ptr;
+    DNSServiceErrorType err;
+
+    if (!sdRef)            { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRemoveRecord called with NULL DNSServiceRef"); return kDNSServiceErr_BadParam; }
+    if (!RecordRef)        { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRemoveRecord called with NULL DNSRecordRef");  return kDNSServiceErr_BadParam; }
+    if (!sdRef->max_index) { syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRemoveRecord called with bad DNSServiceRef");  return kDNSServiceErr_BadReference; }
+
+    if (!DNSServiceRefValid(sdRef))
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceRemoveRecord called with invalid DNSServiceRef %p %08X %08X", sdRef, sdRef->sockfd, sdRef->validator);
+        return kDNSServiceErr_BadReference;
+    }
+
+    len += sizeof(flags);
+    hdr = create_hdr(remove_record_request, &len, &ptr, 1, sdRef);
+    if (!hdr) return kDNSServiceErr_NoMemory;
+    hdr->reg_index = RecordRef->record_index;
+    put_flags(flags, &ptr);
+    err = deliver_request(hdr, sdRef);      // Will free hdr for us
+    if (!err)
+    {
+        // This RecordRef could have been allocated in DNSServiceRegisterRecord or DNSServiceAddRecord.
+        // If so, delink from the list before freeing
+        DNSRecord **p = &sdRef->rec;
+        while (*p && *p != RecordRef) p = &(*p)->recnext;
+        if (*p) *p = RecordRef->recnext;
+        free(RecordRef);
+    }
+    return err;
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceReconfirmRecord
+(
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    const char      *fullname,
+    uint16_t rrtype,
+    uint16_t rrclass,
+    uint16_t rdlen,
+    const void      *rdata
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    DNSServiceOp *tmp;
+
+    DNSServiceErrorType err = ConnectToServer(&tmp, flags, reconfirm_record_request, NULL, NULL, NULL);
+    if (err) return err;
+
+    len = sizeof(DNSServiceFlags);
+    len += sizeof(uint32_t);
+    len += strlen(fullname) + 1;
+    len += 3 * sizeof(uint16_t);
+    len += rdlen;
+    hdr = create_hdr(reconfirm_record_request, &len, &ptr, 0, tmp);
+    if (!hdr) { DNSServiceRefDeallocate(tmp); return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_string(fullname, &ptr);
+    put_uint16(rrtype, &ptr);
+    put_uint16(rrclass, &ptr);
+    put_uint16(rdlen, &ptr);
+    put_rdata(rdlen, rdata, &ptr);
+
+    err = deliver_request(hdr, tmp);        // Will free hdr for us
+    DNSServiceRefDeallocate(tmp);
+    return err;
+}
+
+
+static void handle_port_mapping_response(DNSServiceOp *const sdr, const CallbackHeader *const cbh, const char *data, const char *const end)
+{
+    union { uint32_t l; u_char b[4]; } addr;
+    uint8_t protocol;
+    union { uint16_t s; u_char b[2]; } internalPort;
+    union { uint16_t s; u_char b[2]; } externalPort;
+    uint32_t ttl;
+
+    if (!data || data + 13 > end) goto fail;
+
+    addr.b[0] = *data++;
+    addr.b[1] = *data++;
+    addr.b[2] = *data++;
+    addr.b[3] = *data++;
+    protocol          = *data++;
+    internalPort.b[0] = *data++;
+    internalPort.b[1] = *data++;
+    externalPort.b[0] = *data++;
+    externalPort.b[1] = *data++;
+    ttl               = get_uint32(&data, end);
+    if (!data) goto fail;
+
+    ((DNSServiceNATPortMappingReply)sdr->AppCallback)(sdr, cbh->cb_flags, cbh->cb_interface, cbh->cb_err, addr.l, protocol, internalPort.s, externalPort.s, ttl, sdr->AppContext);
+    return;
+    // MUST NOT touch sdr after invoking AppCallback -- client is allowed to dispose it from within callback function
+
+    fail :
+    syslog(LOG_WARNING, "dnssd_clientstub handle_port_mapping_response: error reading result from daemon");
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceNATPortMappingCreate
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    uint32_t interfaceIndex,
+    uint32_t protocol,                                /* TCP and/or UDP */
+    uint16_t internalPortInNetworkByteOrder,
+    uint16_t externalPortInNetworkByteOrder,
+    uint32_t ttl,                                     /* time to live in seconds */
+    DNSServiceNATPortMappingReply callBack,
+    void                                *context      /* may be NULL */
+)
+{
+    char *ptr;
+    size_t len;
+    ipc_msg_hdr *hdr;
+    union { uint16_t s; u_char b[2]; } internalPort = { internalPortInNetworkByteOrder };
+    union { uint16_t s; u_char b[2]; } externalPort = { externalPortInNetworkByteOrder };
+
+    DNSServiceErrorType err = ConnectToServer(sdRef, flags, port_mapping_request, handle_port_mapping_response, callBack, context);
+    if (err) return err;    // On error ConnectToServer leaves *sdRef set to NULL
+
+    len = sizeof(flags);
+    len += sizeof(interfaceIndex);
+    len += sizeof(protocol);
+    len += sizeof(internalPort);
+    len += sizeof(externalPort);
+    len += sizeof(ttl);
+
+    hdr = create_hdr(port_mapping_request, &len, &ptr, (*sdRef)->primary ? 1 : 0, *sdRef);
+    if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+
+    put_flags(flags, &ptr);
+    put_uint32(interfaceIndex, &ptr);
+    put_uint32(protocol, &ptr);
+    *ptr++ = internalPort.b[0];
+    *ptr++ = internalPort.b[1];
+    *ptr++ = externalPort.b[0];
+    *ptr++ = externalPort.b[1];
+    put_uint32(ttl, &ptr);
+
+    err = deliver_request(hdr, *sdRef);     // Will free hdr for us
+    if (err) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; }
+    return err;
+}
+
+#if _DNS_SD_LIBDISPATCH
+DNSServiceErrorType DNSSD_API DNSServiceSetDispatchQueue
+(
+    DNSServiceRef service,
+    dispatch_queue_t queue
+)
+{
+    int dnssd_fd  = DNSServiceRefSockFD(service);
+    if (dnssd_fd == dnssd_InvalidSocket) return kDNSServiceErr_BadParam;
+    if (!queue)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub: DNSServiceSetDispatchQueue dispatch queue NULL");
+        return kDNSServiceErr_BadParam;
+    }
+    if (service->disp_queue)
+    {
+        syslog(LOG_WARNING, "dnssd_clientstub DNSServiceSetDispatchQueue dispatch queue set already");
+        return kDNSServiceErr_BadParam;
+    }
+    if (service->disp_source)
+    {
+        syslog(LOG_WARNING, "DNSServiceSetDispatchQueue dispatch source set already");
+        return kDNSServiceErr_BadParam;
+    }
+    service->disp_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, dnssd_fd, 0, queue);
+    if (!service->disp_source)
+    {
+        syslog(LOG_WARNING, "DNSServiceSetDispatchQueue dispatch_source_create failed");
+        return kDNSServiceErr_NoMemory;
+    }
+    service->disp_queue = queue;
+    dispatch_source_set_event_handler(service->disp_source, ^{DNSServiceProcessResult(service);});
+    dispatch_source_set_cancel_handler(service->disp_source, ^{dnssd_close(dnssd_fd);});
+    dispatch_resume(service->disp_source);
+    return kDNSServiceErr_NoError;
+}
+#endif // _DNS_SD_LIBDISPATCH
+
+#if !defined(_WIN32)
+
+static void DNSSD_API SleepKeepaliveCallback(DNSServiceRef sdRef, DNSRecordRef rec, const DNSServiceFlags flags,
+                                             DNSServiceErrorType errorCode, void *context)
+{
+    SleepKAContext *ka = (SleepKAContext *)context;
+    (void)rec;      // Unused
+    (void)flags;    // Unused
+
+    if (sdRef->kacontext != context)
+        syslog(LOG_WARNING, "SleepKeepaliveCallback context mismatch");
+
+    if (ka->AppCallback)
+        ((DNSServiceSleepKeepaliveReply)ka->AppCallback)(sdRef, errorCode, ka->AppContext);
+}
+
+DNSServiceErrorType DNSSD_API DNSServiceSleepKeepalive
+(
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags flags,
+    int fd,
+    unsigned int timeout,
+    DNSServiceSleepKeepaliveReply callBack,
+    void                                *context
+)
+{
+    char source_str[INET6_ADDRSTRLEN];
+    char target_str[INET6_ADDRSTRLEN];
+    struct sockaddr_storage lss;
+    struct sockaddr_storage rss;
+    socklen_t len1, len2;
+    unsigned int len, proxyreclen;
+    char buf[256];
+    DNSServiceErrorType err;
+    DNSRecordRef record = NULL;
+    char name[10];
+    char recname[128];
+    SleepKAContext *ka;
+    unsigned int i, unique;
+
+
+    (void) flags; //unused
+    if (!timeout) return kDNSServiceErr_BadParam;
+
+
+    len1 = sizeof(lss);
+    if (getsockname(fd, (struct sockaddr *)&lss, &len1) < 0)
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive: getsockname %d\n", errno);
+        return kDNSServiceErr_BadParam;
+    }
+
+    len2 = sizeof(rss);
+    if (getpeername(fd, (struct sockaddr *)&rss, &len2) < 0)
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive: getpeername %d\n", errno);
+        return kDNSServiceErr_BadParam;
+    }
+
+    if (len1 != len2)
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive local/remote info not same");
+        return kDNSServiceErr_Unknown;
+    }
+
+    unique = 0;
+    if (lss.ss_family == AF_INET)
+    {
+        struct sockaddr_in *sl = (struct sockaddr_in *)&lss;
+        struct sockaddr_in *sr = (struct sockaddr_in *)&rss;
+        unsigned char *ptr = (unsigned char *)&sl->sin_addr;
+
+        if (!inet_ntop(AF_INET, (const void *)&sr->sin_addr, target_str, sizeof (target_str)))
+        {
+            syslog(LOG_WARNING, "DNSServiceSleepKeepalive remote info failed %d", errno);
+            return kDNSServiceErr_Unknown;
+        }
+        if (!inet_ntop(AF_INET, (const void *)&sl->sin_addr, source_str, sizeof (source_str)))
+        {
+            syslog(LOG_WARNING, "DNSServiceSleepKeepalive local info failed %d", errno);
+            return kDNSServiceErr_Unknown;
+        }
+        // Sum of all bytes in the local address and port should result in a unique
+        // number in the local network
+        for (i = 0; i < sizeof(struct in_addr); i++)
+            unique += ptr[i];
+        unique += sl->sin_port;
+        len = snprintf(buf+1, sizeof(buf) - 1, "t=%u h=%s d=%s l=%u r=%u", timeout, source_str, target_str, ntohs(sl->sin_port), ntohs(sr->sin_port));
+    }
+    else
+    {
+        struct sockaddr_in6 *sl6 = (struct sockaddr_in6 *)&lss;
+        struct sockaddr_in6 *sr6 = (struct sockaddr_in6 *)&rss;
+        unsigned char *ptr = (unsigned char *)&sl6->sin6_addr;
+
+        if (!inet_ntop(AF_INET6, (const void *)&sr6->sin6_addr, target_str, sizeof (target_str)))
+        {
+            syslog(LOG_WARNING, "DNSServiceSleepKeepalive remote6 info failed %d", errno);
+            return kDNSServiceErr_Unknown;
+        }
+        if (!inet_ntop(AF_INET6, (const void *)&sl6->sin6_addr, source_str, sizeof (source_str)))
+        {
+            syslog(LOG_WARNING, "DNSServiceSleepKeepalive local6 info failed %d", errno);
+            return kDNSServiceErr_Unknown;
+        }
+        for (i = 0; i < sizeof(struct in6_addr); i++)
+            unique += ptr[i];
+        unique += sl6->sin6_port;
+        len = snprintf(buf+1, sizeof(buf) - 1, "t=%u H=%s D=%s l=%u r=%u", timeout, source_str, target_str, ntohs(sl6->sin6_port), ntohs(sr6->sin6_port));
+    }
+
+    if (len >= (sizeof(buf) - 1))
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive could not fit local/remote info");
+        return kDNSServiceErr_Unknown;
+    }
+    // Include the NULL byte also in the first byte. The total length of the record includes the
+    // first byte also.
+    buf[0] = len + 1;
+    proxyreclen = len + 2;
+
+    len = snprintf(name, sizeof(name), "%u", unique);
+    if (len >= sizeof(name))
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive could not fit unique");
+        return kDNSServiceErr_Unknown;
+    }
+
+    len = snprintf(recname, sizeof(recname), "%s.%s", name, "_keepalive._dns-sd._udp.local");
+    if (len >= sizeof(recname))
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive could not fit name");
+        return kDNSServiceErr_Unknown;
+    }
+
+    ka = malloc(sizeof(SleepKAContext));
+    if (!ka) return kDNSServiceErr_NoMemory;
+    ka->AppCallback = callBack;
+    ka->AppContext = context;
+
+    err = DNSServiceCreateConnection(sdRef);
+    if (err)
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive cannot create connection");
+        free(ka);
+        return err;
+    }
+
+    // we don't care about the "record". When sdRef gets deallocated later, it will be freed too
+    err = DNSServiceRegisterRecord(*sdRef, &record, kDNSServiceFlagsUnique, 0, recname,
+                                   kDNSServiceType_NULL,  kDNSServiceClass_IN, proxyreclen, buf,  kDNSServiceInterfaceIndexAny, SleepKeepaliveCallback, ka);
+    if (err)
+    {
+        syslog(LOG_WARNING, "DNSServiceSleepKeepalive cannot create connection");
+        free(ka);
+        return err;
+    }
+    (*sdRef)->kacontext = ka;
+    return kDNSServiceErr_NoError;
+}
+#endif
diff --git a/mDNSResponder/mDNSShared/dnssd_ipc.c b/mDNSResponder/mDNSShared/dnssd_ipc.c
new file mode 100644
index 00000000..6059eb39
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnssd_ipc.c
@@ -0,0 +1,161 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "dnssd_ipc.h"
+
+#if defined(_WIN32)
+
+char *win32_strerror(int inErrorCode)
+{
+    static char buffer[1024];
+    DWORD n;
+    memset(buffer, 0, sizeof(buffer));
+    n = FormatMessageA(
+        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        (DWORD) inErrorCode,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        buffer,
+        sizeof(buffer),
+        NULL);
+    if (n > 0)
+    {
+        // Remove any trailing CR's or LF's since some messages have them.
+        while ((n > 0) && isspace(((unsigned char *) buffer)[n - 1]))
+            buffer[--n] = '\0';
+    }
+    return buffer;
+}
+
+#endif
+
+void put_uint32(const uint32_t l, char **ptr)
+{
+    (*ptr)[0] = (char)((l >> 24) &  0xFF);
+    (*ptr)[1] = (char)((l >> 16) &  0xFF);
+    (*ptr)[2] = (char)((l >>  8) &  0xFF);
+    (*ptr)[3] = (char)((l      ) &  0xFF);
+    *ptr += sizeof(uint32_t);
+}
+
+uint32_t get_uint32(const char **ptr, const char *end)
+{
+    if (!*ptr || *ptr + sizeof(uint32_t) > end)
+    {
+        *ptr = NULL;
+        return(0);
+    }
+    else
+    {
+        uint8_t *p = (uint8_t*) *ptr;
+        *ptr += sizeof(uint32_t);
+        return((uint32_t) ((uint32_t)p[0] << 24 | (uint32_t)p[1] << 16 | (uint32_t)p[2] << 8 | p[3]));
+    }
+}
+
+void put_uint16(uint16_t s, char **ptr)
+{
+    (*ptr)[0] = (char)((s >>  8) &  0xFF);
+    (*ptr)[1] = (char)((s      ) &  0xFF);
+    *ptr += sizeof(uint16_t);
+}
+
+uint16_t get_uint16(const char **ptr, const char *end)
+{
+    if (!*ptr || *ptr + sizeof(uint16_t) > end)
+    {
+        *ptr = NULL;
+        return(0);
+    }
+    else
+    {
+        uint8_t *p = (uint8_t*) *ptr;
+        *ptr += sizeof(uint16_t);
+        return((uint16_t) ((uint16_t)p[0] << 8 | p[1]));
+    }
+}
+
+int put_string(const char *str, char **ptr)
+{
+    if (!str) str = "";
+    strcpy(*ptr, str);
+    *ptr += strlen(str) + 1;
+    return 0;
+}
+
+int get_string(const char **ptr, const char *const end, char *buffer, int buflen)
+{
+    if (!*ptr)
+    {
+        *buffer = 0;
+        return(-1);
+    }
+    else
+    {
+        char *lim = buffer + buflen;    // Calculate limit
+        while (*ptr < end && buffer < lim)
+        {
+            char c = *buffer++ = *(*ptr)++;
+            if (c == 0) return(0);      // Success
+        }
+        if (buffer == lim) buffer--;
+        *buffer = 0;                    // Failed, so terminate string,
+        *ptr = NULL;                    // clear pointer,
+        return(-1);                     // and return failure indication
+    }
+}
+
+void put_rdata(const int rdlen, const unsigned char *rdata, char **ptr)
+{
+    memcpy(*ptr, rdata, rdlen);
+    *ptr += rdlen;
+}
+
+const char *get_rdata(const char **ptr, const char *end, int rdlen)
+{
+    if (!*ptr || *ptr + rdlen > end)
+    {
+        *ptr = NULL;
+        return(0);
+    }
+    else
+    {
+        const char *rd = *ptr;
+        *ptr += rdlen;
+        return rd;
+    }
+}
+
+void ConvertHeaderBytes(ipc_msg_hdr *hdr)
+{
+    hdr->version   = htonl(hdr->version);
+    hdr->datalen   = htonl(hdr->datalen);
+    hdr->ipc_flags = htonl(hdr->ipc_flags);
+    hdr->op        = htonl(hdr->op );
+    hdr->reg_index = htonl(hdr->reg_index);
+}
diff --git a/mDNSResponder/mDNSShared/dnssd_ipc.h b/mDNSResponder/mDNSShared/dnssd_ipc.h
new file mode 100644
index 00000000..360d703f
--- /dev/null
+++ b/mDNSResponder/mDNSShared/dnssd_ipc.h
@@ -0,0 +1,221 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DNSSD_IPC_H
+#define DNSSD_IPC_H
+
+#include "dns_sd.h"
+
+//
+// Common cross platform services
+//
+#if defined(WIN32)
+#   include <winsock2.h>
+#   define dnssd_InvalidSocket  INVALID_SOCKET
+#   define dnssd_SocketValid(s) ((s) != INVALID_SOCKET)
+#   define dnssd_EWOULDBLOCK    WSAEWOULDBLOCK
+#   define dnssd_EINTR          WSAEINTR
+#   define dnssd_ECONNRESET     WSAECONNRESET
+#   define dnssd_sock_t         SOCKET
+#   define dnssd_socklen_t      int
+#   define dnssd_close(sock)    closesocket(sock)
+#   define dnssd_errno          WSAGetLastError()
+#   define dnssd_strerror(X)    win32_strerror(X)
+#   define ssize_t              int
+#   define getpid               _getpid
+#   define unlink               _unlink
+extern char *win32_strerror(int inErrorCode);
+#else
+#   include <sys/types.h>
+#   include <unistd.h>
+#   include <sys/un.h>
+#   include <string.h>
+#   include <stdio.h>
+#   include <stdlib.h>
+#   include <sys/stat.h>
+#   include <sys/socket.h>
+#   include <netinet/in.h>
+#   include <arpa/inet.h>
+#   define dnssd_InvalidSocket  -1
+#   define dnssd_SocketValid(s) ((s) >= 0)
+#   define dnssd_EWOULDBLOCK    EWOULDBLOCK
+#   define dnssd_EINTR          EINTR
+#   define dnssd_ECONNRESET     ECONNRESET
+#   define dnssd_EPIPE          EPIPE
+#   define dnssd_sock_t         int
+#   define dnssd_socklen_t      unsigned int
+#   define dnssd_close(sock)    close(sock)
+#   define dnssd_errno          errno
+#   define dnssd_strerror(X)    strerror(X)
+#endif
+
+#if defined(USE_TCP_LOOPBACK)
+#   define AF_DNSSD             AF_INET
+#   define MDNS_TCP_SERVERADDR  "127.0.0.1"
+#   define MDNS_TCP_SERVERPORT  5354
+#   define LISTENQ              5
+#   define dnssd_sockaddr_t     struct sockaddr_in
+#else
+#   define AF_DNSSD             AF_LOCAL
+#   ifndef MDNS_UDS_SERVERPATH
+#       define MDNS_UDS_SERVERPATH  "/var/run/mDNSResponder"
+#   endif
+#   define LISTENQ              100
+// longest legal control path length
+#   define MAX_CTLPATH          256
+#   define dnssd_sockaddr_t     struct sockaddr_un
+#endif
+
+// Compatibility workaround
+#ifndef AF_LOCAL
+#define AF_LOCAL    AF_UNIX
+#endif
+
+// General UDS constants
+#define TXT_RECORD_INDEX ((uint32_t)(-1))   // record index for default text record
+
+// IPC data encoding constants and types
+#define VERSION 1
+#define IPC_FLAGS_NOREPLY 1 // set flag if no asynchronous replies are to be sent to client
+
+// Structure packing macro. If we're not using GNUC, it's not fatal. Most compilers naturally pack the on-the-wire
+// structures correctly anyway, so a plain "struct" is usually fine. In the event that structures are not packed
+// correctly, our compile-time assertion checks will catch it and prevent inadvertent generation of non-working code.
+#ifndef packedstruct
+ #if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9)))
+  #define packedstruct struct __attribute__((__packed__))
+  #define packedunion  union  __attribute__((__packed__))
+ #else
+  #define packedstruct struct
+  #define packedunion  union
+ #endif
+#endif
+
+typedef enum
+{
+    request_op_none = 0,    // No request yet received on this connection
+    connection_request = 1, // connected socket via DNSServiceConnect()
+    reg_record_request,     // reg/remove record only valid for connected sockets
+    remove_record_request,
+    enumeration_request,
+    reg_service_request,
+    browse_request,
+    resolve_request,
+    query_request,
+    reconfirm_record_request,
+    add_record_request,
+    update_record_request,
+    setdomain_request,      // Up to here is in Tiger and B4W 1.0.3
+    getproperty_request,    // New in B4W 1.0.4
+    port_mapping_request,   // New in Leopard and B4W 2.0
+    addrinfo_request,
+    send_bpf,               // New in SL
+    getpid_request,
+    release_request,
+    connection_delegate_request,
+
+    cancel_request = 63
+} request_op_t;
+
+typedef enum
+{
+    enumeration_reply_op = 64,
+    reg_service_reply_op,
+    browse_reply_op,
+    resolve_reply_op,
+    query_reply_op,
+    reg_record_reply_op,    // Up to here is in Tiger and B4W 1.0.3
+    getproperty_reply_op,   // New in B4W 1.0.4
+    port_mapping_reply_op,  // New in Leopard and B4W 2.0
+    addrinfo_reply_op
+} reply_op_t;
+
+#if defined(_WIN64)
+#   pragma pack(push,4)
+#endif
+
+// Define context object big enough to hold a 64-bit pointer,
+// to accomodate 64-bit clients communicating with 32-bit daemon.
+// There's no reason for the daemon to ever be a 64-bit process, but its clients might be
+typedef packedunion
+{
+    void *context;
+    uint32_t u32[2];
+} client_context_t;
+
+typedef packedstruct
+{
+    uint32_t version;
+    uint32_t datalen;
+    uint32_t ipc_flags;
+    uint32_t op;        // request_op_t or reply_op_t
+    client_context_t client_context; // context passed from client, returned by server in corresponding reply
+    uint32_t reg_index;            // identifier for a record registered via DNSServiceRegisterRecord() on a
+    // socket connected by DNSServiceCreateConnection().  Must be unique in the scope of the connection, such that and
+    // index/socket pair uniquely identifies a record.  (Used to select records for removal by DNSServiceRemoveRecord())
+} ipc_msg_hdr;
+
+#if defined(_WIN64)
+#   pragma pack(pop)
+#endif
+
+// routines to write to and extract data from message buffers.
+// caller responsible for bounds checking.
+// ptr is the address of the pointer to the start of the field.
+// it is advanced to point to the next field, or the end of the message
+
+void put_uint32(const uint32_t l, char **ptr);
+uint32_t get_uint32(const char **ptr, const char *end);
+
+void put_uint16(uint16_t s, char **ptr);
+uint16_t get_uint16(const char **ptr, const char *end);
+
+#define put_flags put_uint32
+#define get_flags get_uint32
+
+#define put_error_code put_uint32
+#define get_error_code get_uint32
+
+int put_string(const char *str, char **ptr);
+int get_string(const char **ptr, const char *const end, char *buffer, int buflen);
+
+void put_rdata(const int rdlen, const unsigned char *rdata, char **ptr);
+const char *get_rdata(const char **ptr, const char *end, int rdlen);  // return value is rdata pointed to by *ptr -
+// rdata is not copied from buffer.
+
+void ConvertHeaderBytes(ipc_msg_hdr *hdr);
+
+struct CompileTimeAssertionChecks_dnssd_ipc
+{
+    // Check that the compiler generated our on-the-wire packet format structure definitions
+    // properly packed, without adding padding bytes to align fields on 32-bit or 64-bit boundaries.
+    char assert0[(sizeof(client_context_t) ==  8) ? 1 : -1];
+    char assert1[(sizeof(ipc_msg_hdr)      == 28) ? 1 : -1];
+};
+
+#endif // DNSSD_IPC_H
diff --git a/mDNSResponder/mDNSShared/mDNSDebug.c b/mDNSResponder/mDNSShared/mDNSDebug.c
new file mode 100644
index 00000000..cb4da6ec
--- /dev/null
+++ b/mDNSResponder/mDNSShared/mDNSDebug.c
@@ -0,0 +1,95 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    File:		mDNSDebug.c
+
+    Contains:	Implementation of debugging utilities. Requires a POSIX environment.
+
+    Version:	1.0
+
+ */
+
+#include "mDNSDebug.h"
+
+#include <stdio.h>
+
+#if defined(WIN32) || defined(EFI32) || defined(EFI64) || defined(EFIX64)
+// Need to add Windows/EFI syslog support here
+#define LOG_PID 0x01
+#define LOG_CONS 0x02
+#define LOG_PERROR 0x20
+#else
+#include <syslog.h>
+#endif
+
+#include "mDNSEmbeddedAPI.h"
+
+mDNSexport int mDNS_LoggingEnabled       = 0;
+mDNSexport int mDNS_PacketLoggingEnabled = 0;
+mDNSexport int mDNS_McastLoggingEnabled  = 0;
+mDNSexport int mDNS_McastTracingEnabled  = 0; 
+
+#if MDNS_DEBUGMSGS
+mDNSexport int mDNS_DebugMode = mDNStrue;
+#else
+mDNSexport int mDNS_DebugMode = mDNSfalse;
+#endif
+
+// Note, this uses mDNS_vsnprintf instead of standard "vsnprintf", because mDNS_vsnprintf knows
+// how to print special data types like IP addresses and length-prefixed domain names
+#if MDNS_DEBUGMSGS > 1
+mDNSexport void verbosedebugf_(const char *format, ...)
+{
+    char buffer[512];
+    va_list ptr;
+    va_start(ptr,format);
+    buffer[mDNS_vsnprintf(buffer, sizeof(buffer), format, ptr)] = 0;
+    va_end(ptr);
+    mDNSPlatformWriteDebugMsg(buffer);
+}
+#endif
+
+// Log message with default "mDNSResponder" ident string at the start
+mDNSlocal void LogMsgWithLevelv(mDNSLogLevel_t logLevel, const char *format, va_list ptr)
+{
+    char buffer[512];
+    buffer[mDNS_vsnprintf((char *)buffer, sizeof(buffer), format, ptr)] = 0;
+    mDNSPlatformWriteLogMsg(ProgramName, buffer, logLevel);
+}
+
+#define LOG_HELPER_BODY(L) \
+    { \
+        va_list ptr; \
+        va_start(ptr,format); \
+        LogMsgWithLevelv(L, format, ptr); \
+        va_end(ptr); \
+    }
+
+// see mDNSDebug.h
+#if !MDNS_HAS_VA_ARG_MACROS
+void LogMsg_(const char *format, ...)       LOG_HELPER_BODY(MDNS_LOG_MSG)
+void LogOperation_(const char *format, ...) LOG_HELPER_BODY(MDNS_LOG_OPERATION)
+void LogSPS_(const char *format, ...)       LOG_HELPER_BODY(MDNS_LOG_SPS)
+void LogInfo_(const char *format, ...)      LOG_HELPER_BODY(MDNS_LOG_INFO)
+#endif
+
+#if MDNS_DEBUGMSGS
+void debugf_(const char *format, ...)       LOG_HELPER_BODY(MDNS_LOG_DEBUG)
+#endif
+
+// Log message with default "mDNSResponder" ident string at the start
+mDNSexport void LogMsgWithLevel(mDNSLogLevel_t logLevel, const char *format, ...)
+LOG_HELPER_BODY(logLevel)
diff --git a/mDNSResponder/mDNSShared/mDNSResponder.8 b/mDNSResponder/mDNSShared/mDNSResponder.8
new file mode 100644
index 00000000..48c1cf65
--- /dev/null
+++ b/mDNSResponder/mDNSShared/mDNSResponder.8
@@ -0,0 +1,116 @@
+.\" -*- tab-width: 4 -*-
+.\" 
+.\" Copyright (c) 2003-2004 Apple Computer, Inc. All Rights Reserved.
+.\" 
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\" 
+.\"     http://www.apache.org/licenses/LICENSE-2.0
+.\" 
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.Dd April 2004              \" Date
+.Dt mDNSResponder 8         \" Document Title
+.Os Darwin                  \" Operating System
+.\"
+.Sh NAME
+.Nm mDNSResponder
+.Nd Multicast and Unicast DNS daemon    \" Name Description for whatis database
+.\" 
+.Sh SYNOPSIS
+.Nm
+.\"
+.Sh DESCRIPTION
+.Nm
+(also known as
+.Nm mdnsd
+on some systems)
+is a daemon invoked at boot time to implement Multicast DNS and DNS Service Discovery. On
+Mac OS X 10.6 (Snow Leopard), 
+.Nm 
+is also the system-wide Unicast DNS Resolver.
+.Pp
+.Nm
+listens on UDP port 5353 for Multicast DNS Query packets.
+When it receives a query for which it knows an answer,
+.Nm
+issues the appropriate Multicast DNS Reply packet.
+.Pp
+.Nm
+also performs Unicast and Multicast DNS Queries on behalf of client processes, and 
+maintains a cache of the replies.
+.Pp
+.Nm
+has no user-specifiable command-line argument, and users should not run
+.Nm
+manually.
+.Pp
+.Sh LOGGING
+There are several methods with which to examine 
+.Nm Ns 's internal state for debugging and diagnostic purposes. The syslog(1)
+logging levels map as follows:
+.Pp
+.Dl Error - Error messages
+.Dl Warning - Client-initiated operations
+.Dl Notice - Sleep proxy operations
+.Dl Info - Informational messages
+.Pp
+By default, only log level Error is logged.
+.Pp
+A SIGUSR1 signal toggles additional logging, with Warning and Notice
+enabled by default:
+.Pp
+.Dl % sudo killall -USR1 mDNSResponder
+.Pp
+Once this logging is enabled, users can additionally use syslog(1)
+to change the log filter for the process. For example, to enable log levels Emergency - Debug:
+.Pp
+.Dl % sudo syslog -c mDNSResponder -d
+.Pp
+A SIGUSR2 signal toggles packet logging:
+.Pp
+.Dl % sudo killall -USR2 mDNSResponder
+.Pp
+A SIGINFO signal will dump a snapshot summary of the internal state to 
+.Pa /var/log/system.log Ns :
+.Pp
+.Dl % sudo killall -INFO mDNSResponder
+.Sh FILES
+.Pa /usr/sbin/mDNSResponder \" Pathname
+.\"
+.Pp
+.Sh INFO
+.Pp
+For information on Multicast DNS, see
+.Pa http://www.multicastdns.org/
+.Pp
+For information on DNS Service Discovery, see
+.Pa http://www.dns-sd.org/
+.Pp
+For information on how to use the Multicast DNS and the
+DNS Service Discovery APIs on Mac OS X and other platforms, see
+.Pa http://developer.apple.com/bonjour/
+.Pp
+For the source code to
+.Nm , see
+.Pa http://developer.apple.com/darwin/projects/bonjour/
+.\"
+.Sh BUGS
+.Nm
+bugs are tracked in Apple Radar component "mDNSResponder".
+.\"
+.Sh HISTORY
+The
+.Nm
+daemon first appeared in Mac OS X 10.2 (Jaguar).
+.Pp
+Also available from the Darwin open source repository
+(though not officially supported by Apple) are 
+.Nm
+daemons for other platforms, including Mac OS 9, Microsoft Windows,
+Linux, FreeBSD, NetBSD, Solaris, and other POSIX systems.
diff --git a/mDNSResponder/mDNSShared/uds_daemon.c b/mDNSResponder/mDNSShared/uds_daemon.c
new file mode 100644
index 00000000..53677bdf
--- /dev/null
+++ b/mDNSResponder/mDNSShared/uds_daemon.c
@@ -0,0 +1,6103 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if defined(_WIN32)
+#include <process.h>
+#define usleep(X) Sleep(((X)+999)/1000)
+#else
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "mDNSEmbeddedAPI.h"
+#include "DNSCommon.h"
+#include "uDNS.h"
+#include "uds_daemon.h"
+
+// Normally we append search domains only for queries with a single label that are not
+// fully qualified. This can be overridden to apply search domains for queries (that are
+// not fully qualified) with any number of labels e.g., moon, moon.cs, moon.cs.be, etc.
+mDNSBool AlwaysAppendSearchDomains = mDNSfalse;
+
+// Apple-specific functionality, not required for other platforms
+#if APPLE_OSX_mDNSResponder
+#include <sys/ucred.h>
+#ifndef PID_FILE
+#define PID_FILE ""
+#endif
+#endif
+
+#ifdef LOCAL_PEERPID
+#include <sys/un.h>         // for LOCAL_PEERPID
+#include <sys/socket.h>     // for getsockopt
+#include <sys/proc_info.h>  // for struct proc_bsdshortinfo
+#include <libproc.h>        // for proc_pidinfo()
+#endif //LOCAL_PEERPID
+//upto 16 characters of process name (defined in <sys/proc.h> but we do not want to include that file)
+#define MAXCOMLEN 16
+
+#if APPLE_OSX_mDNSResponder
+#include <WebFilterDNS/WebFilterDNS.h>
+
+#if !NO_WCF
+
+int WCFIsServerRunning(WCFConnection *conn) __attribute__((weak_import));
+int WCFNameResolvesToAddr(WCFConnection *conn, char* domainName, struct sockaddr* address, uid_t userid) __attribute__((weak_import));
+int WCFNameResolvesToName(WCFConnection *conn, char* fromName, char* toName, uid_t userid) __attribute__((weak_import));
+
+// Do we really need to define a macro for "if"?
+#define CHECK_WCF_FUNCTION(X) if (X)
+#endif // ! NO_WCF
+
+#else
+#define NO_WCF 1
+#endif // APPLE_OSX_mDNSResponder
+
+// User IDs 0-500 are system-wide processes, not actual users in the usual sense
+// User IDs for real user accounts start at 501 and count up from there
+#define SystemUID(X) ((X) <= 500)
+
+#define MAX_ANONYMOUS_DATA      256
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Types and Data Structures
+#endif
+
+typedef enum
+{
+    t_uninitialized,
+    t_morecoming,
+    t_complete,
+    t_error,
+    t_terminated
+} transfer_state;
+
+typedef struct request_state request_state;
+
+typedef void (*req_termination_fn)(request_state *request);
+
+typedef struct registered_record_entry
+{
+    struct registered_record_entry *next;
+    mDNSu32 key;
+    client_context_t regrec_client_context;
+    request_state *request;
+    mDNSBool external_advertise;
+    mDNSInterfaceID origInterfaceID;
+    AuthRecord *rr;             // Pointer to variable-sized AuthRecord (Why a pointer? Why not just embed it here?)
+} registered_record_entry;
+
+// A single registered service: ServiceRecordSet + bookkeeping
+// Note that we duplicate some fields from parent service_info object
+// to facilitate cleanup, when instances and parent may be deallocated at different times.
+typedef struct service_instance
+{
+    struct service_instance *next;
+    request_state *request;
+    AuthRecord *subtypes;
+    mDNSBool renameonmemfree;       // Set on config change when we deregister original name
+    mDNSBool clientnotified;        // Has client been notified of successful registration yet?
+    mDNSBool default_local;         // is this the "local." from an empty-string registration?
+    mDNSBool external_advertise;    // is this is being advertised externally?
+    domainname domain;
+    ServiceRecordSet srs;           // note -- variable-sized object -- must be last field in struct
+} service_instance;
+
+// for multi-domain default browsing
+typedef struct browser_t
+{
+    struct browser_t *next;
+    domainname domain;
+    DNSQuestion q;
+} browser_t;
+
+#ifdef _WIN32
+    typedef unsigned int pid_t;
+    typedef unsigned int socklen_t;
+#endif
+
+struct request_state
+{
+    request_state *next;
+    request_state *primary;         // If this operation is on a shared socket, pointer to primary
+                                    // request_state for the original DNSServiceCreateConnection() operation
+    dnssd_sock_t sd;
+    pid_t process_id;               // Client's PID value
+    char  pid_name[MAXCOMLEN];      // Client's process name
+    char uuid[UUID_SIZE];
+    mDNSBool validUUID;
+    dnssd_sock_t errsd;
+    mDNSu32 uid;
+    void * platform_data;
+
+    // Note: On a shared connection these fields in the primary structure, including hdr, are re-used
+    // for each new request. This is because, until we've read the ipc_msg_hdr to find out what the
+    // operation is, we don't know if we're going to need to allocate a new request_state or not.
+    transfer_state ts;
+    mDNSu32 hdr_bytes;              // bytes of header already read
+    ipc_msg_hdr hdr;
+    mDNSu32 data_bytes;             // bytes of message data already read
+    char          *msgbuf;          // pointer to data storage to pass to free()
+    const char    *msgptr;          // pointer to data to be read from (may be modified)
+    char          *msgend;          // pointer to byte after last byte of message
+
+    // reply, termination, error, and client context info
+    int no_reply;                   // don't send asynchronous replies to client
+    mDNSs32 time_blocked;           // record time of a blocked client
+    int unresponsiveness_reports;
+    struct reply_state *replies;    // corresponding (active) reply list
+    req_termination_fn terminate;
+    DNSServiceFlags flags;
+
+    union
+    {
+        registered_record_entry *reg_recs;  // list of registrations for a connection-oriented request
+        struct
+        {
+            mDNSInterfaceID interface_id;
+            mDNSBool default_domain;
+            mDNSBool ForceMCast;
+            domainname regtype;
+            browser_t *browsers;
+            const mDNSu8 *AnonData;
+        } browser;
+        struct
+        {
+            mDNSInterfaceID InterfaceID;
+            mDNSu16 txtlen;
+            void *txtdata;
+            mDNSIPPort port;
+            domainlabel name;
+            char type_as_string[MAX_ESCAPED_DOMAIN_NAME];
+            domainname type;
+            mDNSBool default_domain;
+            domainname host;
+            mDNSBool autoname;              // Set if this name is tied to the Computer Name
+            mDNSBool autorename;            // Set if this client wants us to automatically rename on conflict
+            mDNSBool allowremotequery;      // Respond to unicast queries from outside the local link?
+            int num_subtypes;
+            mDNSBool AnonData;
+            service_instance *instances;
+        } servicereg;
+        struct
+        {
+            mDNSInterfaceID interface_id;
+            mDNSu32 flags;
+            mDNSu32 protocol;
+            DNSQuestion q4;
+            DNSQuestion *q42;
+            DNSQuestion q6;
+            DNSQuestion *q62;
+            mDNSu8 v4ans;
+            mDNSu8 v6ans;
+        } addrinfo;
+        struct
+        {
+            mDNSIPPort ReqExt;              // External port we originally requested, for logging purposes
+            NATTraversalInfo NATinfo;
+        } pm;
+        struct
+        {
+            DNSServiceFlags flags;
+            DNSQuestion q_all;
+            DNSQuestion q_default;
+        } enumeration;
+        struct
+        {
+            DNSQuestion q;
+            DNSQuestion *q2;
+            mDNSu8 ans;
+        } queryrecord;
+        struct
+        {
+            DNSQuestion qtxt;
+            DNSQuestion qsrv;
+            const ResourceRecord *txt;
+            const ResourceRecord *srv;
+            mDNSs32 ReportTime;
+            mDNSBool external_advertise;
+        } resolve;
+    } u;
+};
+
+// struct physically sits between ipc message header and call-specific fields in the message buffer
+typedef struct
+{
+    DNSServiceFlags flags;          // Note: This field is in NETWORK byte order
+    mDNSu32 ifi;                    // Note: This field is in NETWORK byte order
+    DNSServiceErrorType error;      // Note: This field is in NETWORK byte order
+} reply_hdr;
+
+typedef struct reply_state
+{
+    struct reply_state *next;       // If there are multiple unsent replies
+    mDNSu32 totallen;
+    mDNSu32 nwriten;
+    ipc_msg_hdr mhdr[1];
+    reply_hdr rhdr[1];
+} reply_state;
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Globals
+#endif
+
+// globals
+mDNSexport mDNS mDNSStorage;
+mDNSexport const char ProgramName[] = "mDNSResponder";
+
+static dnssd_sock_t listenfd = dnssd_InvalidSocket;
+static request_state *all_requests = NULL;
+#ifdef LOCAL_PEERPID
+struct proc_bsdshortinfo proc;
+#endif //LOCAL_PEERPID
+mDNSlocal void set_peer_pid(request_state *request);
+mDNSlocal void LogMcastClientInfo(request_state *req);
+mDNSlocal void GetMcastClients(request_state *req);
+static mDNSu32 mcount;     // tracks the current active mcast operations for McastLogging
+static mDNSu32 i_mcount;   // sets mcount when McastLogging is enabled(PROF signal is sent)
+static mDNSu32 n_mrecords; // tracks the current active mcast records for McastLogging
+static mDNSu32 n_mquests;  // tracks the current active mcast questions for McastLogging
+
+// Note asymmetry here between registration and browsing.
+// For service registrations we only automatically register in domains that explicitly appear in local configuration data
+// (so AutoRegistrationDomains could equally well be called SCPrefRegDomains)
+// For service browsing we also learn automatic browsing domains from the network, so for that case we have:
+// 1. SCPrefBrowseDomains (local configuration data)
+// 2. LocalDomainEnumRecords (locally-generated local-only PTR records -- equivalent to slElem->AuthRecs in uDNS.c)
+// 3. AutoBrowseDomains, which is populated by tracking add/rmv events in AutomaticBrowseDomainChange, the callback function for our mDNS_GetDomains call.
+// By creating and removing our own LocalDomainEnumRecords, we trigger AutomaticBrowseDomainChange callbacks just like domains learned from the network would.
+
+mDNSexport DNameListElem *AutoRegistrationDomains;  // Domains where we automatically register for empty-string registrations
+
+static DNameListElem *SCPrefBrowseDomains;          // List of automatic browsing domains read from SCPreferences for "empty string" browsing
+static ARListElem    *LocalDomainEnumRecords;       // List of locally-generated PTR records to augment those we learn from the network
+mDNSexport DNameListElem *AutoBrowseDomains;        // List created from those local-only PTR records plus records we get from the network
+
+#define MSG_PAD_BYTES 5     // pad message buffer (read from client) with n zero'd bytes to guarantee
+                            // n get_string() calls w/o buffer overrun
+// initialization, setup/teardown functions
+
+// If a platform specifies its own PID file name, we use that
+#ifndef PID_FILE
+#define PID_FILE "/var/run/mDNSResponder.pid"
+#endif
+
+mDNSlocal char *AnonDataToString(const mDNSu8 *ad, int adlen, char *adstr, int adstrlen);
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - General Utility Functions
+#endif
+
+mDNSlocal void FatalError(char *errmsg)
+{
+    char* ptr = NULL;
+    LogMsg("%s: %s", errmsg, dnssd_strerror(dnssd_errno));
+    *ptr = 0;   // On OS X abort() doesn't generate a crash log, but writing to zero does
+    abort();    // On platforms where writing to zero doesn't generate an exception, abort instead
+}
+
+mDNSlocal mDNSu32 dnssd_htonl(mDNSu32 l)
+{
+    mDNSu32 ret;
+    char *data = (char*) &ret;
+    put_uint32(l, &data);
+    return ret;
+}
+
+// hack to search-replace perror's to LogMsg's
+mDNSlocal void my_perror(char *errmsg)
+{
+    LogMsg("%s: %d (%s)", errmsg, dnssd_errno, dnssd_strerror(dnssd_errno));
+}
+
+// Throttled version of my_perror: Logs once every 250 msgs
+mDNSlocal void my_throttled_perror(char *err_msg)
+{
+    static int uds_throttle_count = 0;
+    if ((uds_throttle_count++ % 250) == 0) 
+        my_perror(err_msg);
+} 
+
+// LogMcastQuestion/LogMcastQ should be called after the DNSQuestion struct is initialized(especially for q->TargetQID)
+// Hence all calls are made after mDNS_StartQuery()/mDNS_StopQuery()/mDNS_StopBrowse() is called.
+mDNSlocal void LogMcastQuestion(mDNS *const m, const DNSQuestion *const q, request_state *req, q_state status)
+{
+    if (mDNSOpaque16IsZero(q->TargetQID)) // Check for Mcast Query
+    {
+        mDNSBool mflag = mDNSfalse;
+        if (status == q_start)
+        {
+            if (++mcount == 1)
+                mflag = mDNStrue;
+        }
+        else
+        {
+            mcount--;
+        }
+        LogMcast("%s: %##s  (%s) (%s)  Client(%d)[%s]", status ? "+Question" : "-Question", q->qname.c, DNSTypeName(q->qtype), 
+                 q->InterfaceID == mDNSInterface_LocalOnly ? "lo" : q->InterfaceID == mDNSInterface_P2P ? "p2p" : 
+                 q->InterfaceID == mDNSInterface_Any ? "any" : InterfaceNameForID(m, q->InterfaceID), 
+                 req->process_id, req->pid_name);
+        LogMcastStateInfo(m, mflag, mDNSfalse, mDNSfalse);
+    }
+    return;
+}
+
+// LogMcastService/LogMcastS should be called after the AuthRecord struct is initialized
+// Hence all calls are made after mDNS_Register()/ just before mDNS_Deregister()
+mDNSlocal void LogMcastService(mDNS *const m, const AuthRecord *const ar, request_state *req, reg_state status)
+{
+    if (!AuthRecord_uDNS(ar)) // Check for Mcast Service
+    {
+        mDNSBool mflag = mDNSfalse;
+        if (status == reg_start)
+        {
+            if (++mcount == 1)
+                mflag = mDNStrue;
+        }
+        else
+        {
+            mcount--;
+        }
+        LogMcast("%s: %##s  (%s)  (%s)  Client(%d)[%s]", status ? "+Service" : "-Service", ar->resrec.name->c, DNSTypeName(ar->resrec.rrtype),
+                 ar->resrec.InterfaceID == mDNSInterface_LocalOnly ? "lo" : ar->resrec.InterfaceID == mDNSInterface_P2P ? "p2p" : 
+                 ar->resrec.InterfaceID == mDNSInterface_Any ? "all" : InterfaceNameForID(m, ar->resrec.InterfaceID), 
+                 req->process_id, req->pid_name);
+        LogMcastStateInfo(m, mflag, mDNSfalse, mDNSfalse);
+    }
+    return;
+}
+
+// For complete Mcast State Log, pass mDNStrue to mstatelog in LogMcastStateInfo()
+mDNSexport void LogMcastStateInfo(mDNS *const m, mDNSBool mflag, mDNSBool start, mDNSBool mstatelog)
+{
+    if (!mstatelog)
+    {
+        if (!all_requests)
+        {
+            LogMcastNoIdent("<None>");
+        }
+        else
+        {
+            request_state *req, *r;
+            for (req = all_requests; req; req=req->next)
+            {    
+                if (req->primary) // If this is a subbordinate operation, check that the parent is in the list
+                {    
+                    for (r = all_requests; r && r != req; r=r->next) 
+                        if (r == req->primary) 
+                            goto foundpar;
+                }    
+                // For non-subbordinate operations, and subbordinate operations that have lost their parent, write out their info
+                GetMcastClients(req);
+    foundpar:;
+            }
+            LogMcastNoIdent("--- MCAST RECORDS COUNT[%d] MCAST QUESTIONS COUNT[%d] ---", n_mrecords, n_mquests);
+            n_mrecords = n_mquests = 0; // Reset the values
+        }
+    }
+    else
+    {
+        static mDNSu32 i_mpktnum;
+        i_mcount = 0;
+        if (start)
+            mcount = 0;
+        // mcount is initialized to 0 when the PROF signal is sent since mcount could have
+        // wrong value if MulticastLogging is disabled and then re-enabled
+        LogMcastNoIdent("--- START MCAST STATE LOG ---");
+        if (!all_requests)
+        { 
+            mcount = 0;
+            LogMcastNoIdent("<None>");
+        } 
+        else 
+        {    
+            request_state *req, *r;
+            for (req = all_requests; req; req=req->next)
+            {    
+                if (req->primary) // If this is a subbordinate operation, check that the parent is in the list
+                {    
+                    for (r = all_requests; r && r != req; r=r->next) 
+                        if (r == req->primary) 
+                            goto foundparent;
+                    LogMcastNoIdent("%3d: Orphan operation; parent not found in request list", req->sd);
+                }    
+                // For non-subbordinate operations, and subbordinate operations that have lost their parent, write out their info
+                LogMcastClientInfo(req);
+    foundparent:;
+            }
+            if(!mcount) // To initially set mcount
+                mcount = i_mcount;    
+        }
+        if (mcount == 0)
+        {
+            i_mpktnum = m->MPktNum;
+            LogMcastNoIdent("--- MCOUNT[%d]: IMPKTNUM[%d] ---", mcount, i_mpktnum);
+        }
+        if (mflag)
+            LogMcastNoIdent("--- MCOUNT[%d]: CMPKTNUM[%d] - IMPKTNUM[%d] = [%d]PKTS ---", mcount, m->MPktNum, i_mpktnum, (m->MPktNum - i_mpktnum));    
+        LogMcastNoIdent("--- END MCAST STATE LOG ---");
+    }
+}
+
+mDNSlocal void abort_request(request_state *req)
+{
+    if (req->terminate == (req_termination_fn) ~0)
+    { LogMsg("abort_request: ERROR: Attempt to abort operation %p with req->terminate %p", req, req->terminate); return; }
+
+    // First stop whatever mDNSCore operation we were doing
+    // If this is actually a shared connection operation, then its req->terminate function will scan
+    // the all_requests list and terminate any subbordinate operations sharing this file descriptor
+    if (req->terminate) req->terminate(req);
+
+    if (!dnssd_SocketValid(req->sd))
+    { LogMsg("abort_request: ERROR: Attempt to abort operation %p with invalid fd %d",     req, req->sd);        return; }
+
+    // Now, if this request_state is not subordinate to some other primary, close file descriptor and discard replies
+    if (!req->primary)
+    {
+        if (req->errsd != req->sd) LogOperation("%3d: Removing FD and closing errsd %d", req->sd, req->errsd);
+        else LogOperation("%3d: Removing FD", req->sd);
+        udsSupportRemoveFDFromEventLoop(req->sd, req->platform_data);       // Note: This also closes file descriptor req->sd for us
+        if (req->errsd != req->sd) { dnssd_close(req->errsd); req->errsd = req->sd; }
+
+        while (req->replies)    // free pending replies
+        {
+            reply_state *ptr = req->replies;
+            req->replies = req->replies->next;
+            freeL("reply_state (abort)", ptr);
+        }
+    }
+
+    // Set req->sd to something invalid, so that udsserver_idle knows to unlink and free this structure
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+    // Don't use dnssd_InvalidSocket (-1) because that's the sentinel value MACOSX_MDNS_MALLOC_DEBUGGING uses
+    // for detecting when the memory for an object is inadvertently freed while the object is still on some list
+    req->sd = req->errsd = -2;
+#else
+    req->sd = req->errsd = dnssd_InvalidSocket;
+#endif
+    // We also set req->terminate to a bogus value so we know if abort_request() gets called again for this request
+    req->terminate = (req_termination_fn) ~0;
+}
+
+mDNSlocal void AbortUnlinkAndFree(request_state *req)
+{
+    request_state **p = &all_requests;
+    abort_request(req);
+    while (*p && *p != req) p=&(*p)->next;
+    if (*p) { *p = req->next; freeL("request_state/AbortUnlinkAndFree", req); }
+    else LogMsg("AbortUnlinkAndFree: ERROR: Attempt to abort operation %p not in list", req);
+}
+
+mDNSlocal reply_state *create_reply(const reply_op_t op, const size_t datalen, request_state *const request)
+{
+    reply_state *reply;
+
+    if ((unsigned)datalen < sizeof(reply_hdr))
+    {
+        LogMsg("ERROR: create_reply - data length less than length of required fields");
+        return NULL;
+    }
+
+    reply = mallocL("reply_state", sizeof(reply_state) + datalen - sizeof(reply_hdr));
+    if (!reply) FatalError("ERROR: malloc");
+
+    reply->next     = mDNSNULL;
+    reply->totallen = (mDNSu32)datalen + sizeof(ipc_msg_hdr);
+    reply->nwriten  = 0;
+
+    reply->mhdr->version        = VERSION;
+    reply->mhdr->datalen        = (mDNSu32)datalen;
+    reply->mhdr->ipc_flags      = 0;
+    reply->mhdr->op             = op;
+    reply->mhdr->client_context = request->hdr.client_context;
+    reply->mhdr->reg_index      = 0;
+
+    return reply;
+}
+
+// Append a reply to the list in a request object
+// If our request is sharing a connection, then we append our reply_state onto the primary's list
+mDNSlocal void append_reply(request_state *req, reply_state *rep)
+{
+    request_state *r = req->primary ? req->primary : req;
+    reply_state **ptr = &r->replies;
+    while (*ptr) ptr = &(*ptr)->next;
+    *ptr = rep;
+    rep->next = NULL;
+}
+
+// Generates a response message giving name, type, domain, plus interface index,
+// suitable for a browse result or service registration result.
+// On successful completion rep is set to point to a malloc'd reply_state struct
+mDNSlocal mStatus GenerateNTDResponse(const domainname *const servicename, const mDNSInterfaceID id,
+                                      request_state *const request, reply_state **const rep, reply_op_t op, DNSServiceFlags flags, mStatus err)
+{
+    domainlabel name;
+    domainname type, dom;
+    *rep = NULL;
+    if (!DeconstructServiceName(servicename, &name, &type, &dom))
+        return kDNSServiceErr_Invalid;
+    else
+    {
+        char namestr[MAX_DOMAIN_LABEL+1];
+        char typestr[MAX_ESCAPED_DOMAIN_NAME];
+        char domstr [MAX_ESCAPED_DOMAIN_NAME];
+        int len;
+        char *data;
+
+        ConvertDomainLabelToCString_unescaped(&name, namestr);
+        ConvertDomainNameToCString(&type, typestr);
+        ConvertDomainNameToCString(&dom, domstr);
+
+        // Calculate reply data length
+        len = sizeof(DNSServiceFlags);
+        len += sizeof(mDNSu32);  // if index
+        len += sizeof(DNSServiceErrorType);
+        len += (int) (strlen(namestr) + 1);
+        len += (int) (strlen(typestr) + 1);
+        len += (int) (strlen(domstr) + 1);
+
+        // Build reply header
+        *rep = create_reply(op, len, request);
+        (*rep)->rhdr->flags = dnssd_htonl(flags);
+        (*rep)->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(&mDNSStorage, id, mDNSfalse));
+        (*rep)->rhdr->error = dnssd_htonl(err);
+
+        // Build reply body
+        data = (char *)&(*rep)->rhdr[1];
+        put_string(namestr, &data);
+        put_string(typestr, &data);
+        put_string(domstr, &data);
+
+        return mStatus_NoError;
+    }
+}
+
+// Special support to enable the DNSServiceBrowse call made by Bonjour Browser
+// Remove after Bonjour Browser is updated to use DNSServiceQueryRecord instead of DNSServiceBrowse
+mDNSlocal void GenerateBonjourBrowserResponse(const domainname *const servicename, const mDNSInterfaceID id,
+                                              request_state *const request, reply_state **const rep, reply_op_t op, DNSServiceFlags flags, mStatus err)
+{
+    char namestr[MAX_DOMAIN_LABEL+1];
+    char typestr[MAX_ESCAPED_DOMAIN_NAME];
+    static const char domstr[] = ".";
+    int len;
+    char *data;
+
+    *rep = NULL;
+
+    // 1. Put first label in namestr
+    ConvertDomainLabelToCString_unescaped((const domainlabel *)servicename, namestr);
+
+    // 2. Put second label and "local" into typestr
+    mDNS_snprintf(typestr, sizeof(typestr), "%#s.local.", SecondLabel(servicename));
+
+    // Calculate reply data length
+    len = sizeof(DNSServiceFlags);
+    len += sizeof(mDNSu32);  // if index
+    len += sizeof(DNSServiceErrorType);
+    len += (int) (strlen(namestr) + 1);
+    len += (int) (strlen(typestr) + 1);
+    len += (int) (strlen(domstr) + 1);
+
+    // Build reply header
+    *rep = create_reply(op, len, request);
+    (*rep)->rhdr->flags = dnssd_htonl(flags);
+    (*rep)->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(&mDNSStorage, id, mDNSfalse));
+    (*rep)->rhdr->error = dnssd_htonl(err);
+
+    // Build reply body
+    data = (char *)&(*rep)->rhdr[1];
+    put_string(namestr, &data);
+    put_string(typestr, &data);
+    put_string(domstr, &data);
+}
+
+// Returns a resource record (allocated w/ malloc) containing the data found in an IPC message
+// Data must be in the following format: flags, interfaceIndex, name, rrtype, rrclass, rdlen, rdata, (optional) ttl
+// (ttl only extracted/set if ttl argument is non-zero). Returns NULL for a bad-parameter error
+mDNSlocal AuthRecord *read_rr_from_ipc_msg(request_state *request, int GetTTL, int validate_flags)
+{
+    DNSServiceFlags flags  = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    char name[256];
+    int str_err = get_string(&request->msgptr, request->msgend, name, sizeof(name));
+    mDNSu16 type    = get_uint16(&request->msgptr, request->msgend);
+    mDNSu16     class   = get_uint16(&request->msgptr, request->msgend);
+    mDNSu16 rdlen   = get_uint16(&request->msgptr, request->msgend);
+    const char *rdata   = get_rdata (&request->msgptr, request->msgend, rdlen);
+    mDNSu32 ttl   = GetTTL ? get_uint32(&request->msgptr, request->msgend) : 0;
+    int storage_size = rdlen > sizeof(RDataBody) ? rdlen : sizeof(RDataBody);
+    AuthRecord *rr;
+    mDNSInterfaceID InterfaceID;
+    AuthRecType artype;
+
+    request->flags = flags;
+
+    if (str_err) { LogMsg("ERROR: read_rr_from_ipc_msg - get_string"); return NULL; }
+
+    if (!request->msgptr) { LogMsg("Error reading Resource Record from client"); return NULL; }
+
+    if (validate_flags &&
+        !((flags & kDNSServiceFlagsShared) == kDNSServiceFlagsShared) &&
+        !((flags & kDNSServiceFlagsUnique) == kDNSServiceFlagsUnique))
+    {
+        LogMsg("ERROR: Bad resource record flags (must be kDNSServiceFlagsShared or kDNSServiceFlagsUnique)");
+        return NULL;
+    }
+
+    rr = mallocL("AuthRecord/read_rr_from_ipc_msg", sizeof(AuthRecord) - sizeof(RDataBody) + storage_size);
+    if (!rr) FatalError("ERROR: malloc");
+
+    InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (InterfaceID == mDNSInterface_LocalOnly)
+        artype = AuthRecordLocalOnly;
+    else if (InterfaceID == mDNSInterface_P2P)
+        artype = AuthRecordP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & kDNSServiceFlagsIncludeP2P)
+            && (flags & kDNSServiceFlagsIncludeAWDL))
+        artype = AuthRecordAnyIncludeAWDLandP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & kDNSServiceFlagsIncludeP2P))
+        artype = AuthRecordAnyIncludeP2P;
+    else if ((InterfaceID == mDNSInterface_Any) && (flags & kDNSServiceFlagsIncludeAWDL))
+        artype = AuthRecordAnyIncludeAWDL;
+    else
+        artype = AuthRecordAny;
+
+    mDNS_SetupResourceRecord(rr, mDNSNULL, InterfaceID, type, 0,
+                             (mDNSu8) ((flags & kDNSServiceFlagsShared) ? kDNSRecordTypeShared : kDNSRecordTypeUnique), artype, mDNSNULL, mDNSNULL);
+
+    if (!MakeDomainNameFromDNSNameString(&rr->namestorage, name))
+    {
+        LogMsg("ERROR: bad name: %s", name);
+        freeL("AuthRecord/read_rr_from_ipc_msg", rr);
+        return NULL;
+    }
+
+    if (flags & kDNSServiceFlagsAllowRemoteQuery) rr->AllowRemoteQuery = mDNStrue;
+    rr->resrec.rrclass = class;
+    rr->resrec.rdlength = rdlen;
+    rr->resrec.rdata->MaxRDLength = rdlen;
+    mDNSPlatformMemCopy(rr->resrec.rdata->u.data, rdata, rdlen);
+    if (GetTTL) rr->resrec.rroriginalttl = ttl;
+    rr->resrec.namehash = DomainNameHashValue(rr->resrec.name);
+    SetNewRData(&rr->resrec, mDNSNULL, 0);  // Sets rr->rdatahash for us
+    return rr;
+}
+
+mDNSlocal int build_domainname_from_strings(domainname *srv, char *name, char *regtype, char *domain)
+{
+    domainlabel n;
+    domainname d, t;
+
+    if (!MakeDomainLabelFromLiteralString(&n, name)) return -1;
+    if (!MakeDomainNameFromDNSNameString(&t, regtype)) return -1;
+    if (!MakeDomainNameFromDNSNameString(&d, domain)) return -1;
+    if (!ConstructServiceName(srv, &n, &t, &d)) return -1;
+    return 0;
+}
+
+mDNSlocal void send_all(dnssd_sock_t s, const char *ptr, int len)
+{
+    int n = send(s, ptr, len, 0);
+    // On a freshly-created Unix Domain Socket, the kernel should *never* fail to buffer a small write for us
+    // (four bytes for a typical error code return, 12 bytes for DNSServiceGetProperty(DaemonVersion)).
+    // If it does fail, we don't attempt to handle this failure, but we do log it so we know something is wrong.
+    if (n < len)
+        LogMsg("ERROR: send_all(%d) wrote %d of %d errno %d (%s)",
+               s, n, len, dnssd_errno, dnssd_strerror(dnssd_errno));
+}
+
+#if 0
+mDNSlocal mDNSBool AuthorizedDomain(const request_state * const request, const domainname * const d, const DNameListElem * const doms)
+{
+    const DNameListElem   *delem = mDNSNULL;
+    int bestDelta   = -1;                           // the delta of the best match, lower is better
+    int dLabels     = 0;
+    mDNSBool allow       = mDNSfalse;
+
+    if (SystemUID(request->uid)) return mDNStrue;
+
+    dLabels = CountLabels(d);
+    for (delem = doms; delem; delem = delem->next)
+    {
+        if (delem->uid)
+        {
+            int delemLabels = CountLabels(&delem->name);
+            int delta       = dLabels - delemLabels;
+            if ((bestDelta == -1 || delta <= bestDelta) && SameDomainName(&delem->name, SkipLeadingLabels(d, delta)))
+            {
+                bestDelta = delta;
+                allow = (allow || (delem->uid == request->uid));
+            }
+        }
+    }
+
+    return bestDelta == -1 ? mDNStrue : allow;
+}
+#endif
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - external helpers
+#endif
+
+mDNSlocal mDNSBool callExternalHelpers(mDNSInterfaceID InterfaceID, const domainname *const domain, DNSServiceFlags flags)
+{
+#if APPLE_OSX_mDNSResponder
+
+    if (   ((InterfaceID == mDNSInterface_Any) && (flags & (kDNSServiceFlagsIncludeP2P | kDNSServiceFlagsIncludeAWDL)) && IsLocalDomain(domain))
+        || mDNSPlatformInterfaceIsD2D(InterfaceID))
+    {
+        return mDNStrue;
+    }
+    else
+        return mDNSfalse;
+
+#else
+    (void) InterfaceID;
+    (void) domain;
+    (void) flags;
+
+    return mDNSfalse;
+#endif  // APPLE_OSX_mDNSResponder
+}
+
+mDNSlocal void external_start_advertising_helper(service_instance *const instance)
+{
+    AuthRecord *st = instance->subtypes;
+    ExtraResourceRecord *e;
+    int i;
+
+    if (mDNSIPPortIsZero(instance->request->u.servicereg.port))
+    {
+        LogInfo("external_start_advertising_helper: Not registering service with port number zero");
+        return;
+    }
+
+    if (instance->external_advertise) LogMsg("external_start_advertising_helper: external_advertise already set!");
+
+    for ( i = 0; i < instance->request->u.servicereg.num_subtypes; i++)
+        external_start_advertising_service(&st[i].resrec, instance->request->flags);
+
+    external_start_advertising_service(&instance->srs.RR_PTR.resrec, instance->request->flags);
+    external_start_advertising_service(&instance->srs.RR_SRV.resrec, instance->request->flags);
+    external_start_advertising_service(&instance->srs.RR_TXT.resrec, instance->request->flags);
+
+    for (e = instance->srs.Extras; e; e = e->next)
+        external_start_advertising_service(&e->r.resrec, instance->request->flags);
+
+    instance->external_advertise = mDNStrue;
+}
+
+mDNSlocal void external_stop_advertising_helper(service_instance *const instance)
+{
+    AuthRecord *st = instance->subtypes;
+    ExtraResourceRecord *e;
+    int i;
+
+    if (!instance->external_advertise) return;
+
+    LogInfo("external_stop_advertising_helper: calling external_stop_advertising_service");
+
+    for ( i = 0; i < instance->request->u.servicereg.num_subtypes; i++)
+        external_stop_advertising_service(&st[i].resrec, instance->request->flags);
+
+    external_stop_advertising_service(&instance->srs.RR_PTR.resrec, instance->request->flags);
+    external_stop_advertising_service(&instance->srs.RR_SRV.resrec, instance->request->flags);
+    external_stop_advertising_service(&instance->srs.RR_TXT.resrec, instance->request->flags);
+
+    for (e = instance->srs.Extras; e; e = e->next)
+        external_stop_advertising_service(&e->r.resrec, instance->request->flags);
+
+    instance->external_advertise = mDNSfalse;
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceRegister
+#endif
+
+mDNSexport void FreeExtraRR(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    ExtraResourceRecord *extra = (ExtraResourceRecord *)rr->RecordContext;
+    (void)m;  // Unused
+
+    if (result != mStatus_MemFree) { LogMsg("Error: FreeExtraRR invoked with unexpected error %d", result); return; }
+
+    LogInfo("     FreeExtraRR %s", RRDisplayString(m, &rr->resrec));
+
+    if (rr->resrec.rdata != &rr->rdatastorage)
+        freeL("Extra RData", rr->resrec.rdata);
+    freeL("ExtraResourceRecord/FreeExtraRR", extra);
+}
+
+mDNSlocal void unlink_and_free_service_instance(service_instance *srv)
+{
+    ExtraResourceRecord *e = srv->srs.Extras, *tmp;
+
+    external_stop_advertising_helper(srv);
+
+    // clear pointers from parent struct
+    if (srv->request)
+    {
+        service_instance **p = &srv->request->u.servicereg.instances;
+        while (*p)
+        {
+            if (*p == srv) { *p = (*p)->next; break; }
+            p = &(*p)->next;
+        }
+    }
+
+    while (e)
+    {
+        e->r.RecordContext = e;
+        tmp = e;
+        e = e->next;
+        FreeExtraRR(&mDNSStorage, &tmp->r, mStatus_MemFree);
+    }
+
+    if (srv->srs.RR_TXT.resrec.rdata != &srv->srs.RR_TXT.rdatastorage)
+        freeL("TXT RData", srv->srs.RR_TXT.resrec.rdata);
+
+    if (srv->subtypes)
+    {
+        freeL("ServiceSubTypes", srv->subtypes);
+        srv->subtypes = NULL;
+    }
+    if (srv->srs.AnonData)
+    {
+        freeL("Anonymous", (void *)srv->srs.AnonData);
+        srv->srs.AnonData = NULL;
+    }
+    freeL("service_instance", srv);
+}
+
+// Count how many other service records we have locally with the same name, but different rdata.
+// For auto-named services, we can have at most one per machine -- if we allowed two auto-named services of
+// the same type on the same machine, we'd get into an infinite autoimmune-response loop of continuous renaming.
+mDNSexport int CountPeerRegistrations(mDNS *const m, ServiceRecordSet *const srs)
+{
+    int count = 0;
+    ResourceRecord *r = &srs->RR_SRV.resrec;
+    AuthRecord *rr;
+
+    for (rr = m->ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.rrtype == kDNSType_SRV && SameDomainName(rr->resrec.name, r->name) && !IdenticalSameNameRecord(&rr->resrec, r))
+            count++;
+
+    verbosedebugf("%d peer registrations for %##s", count, r->name->c);
+    return(count);
+}
+
+mDNSexport int CountExistingRegistrations(domainname *srv, mDNSIPPort port)
+{
+    int count = 0;
+    AuthRecord *rr;
+    for (rr = mDNSStorage.ResourceRecords; rr; rr=rr->next)
+        if (rr->resrec.rrtype == kDNSType_SRV &&
+            mDNSSameIPPort(rr->resrec.rdata->u.srv.port, port) &&
+            SameDomainName(rr->resrec.name, srv))
+            count++;
+    return(count);
+}
+
+mDNSlocal void SendServiceRemovalNotification(ServiceRecordSet *const srs)
+{
+    reply_state *rep;
+    service_instance *instance = srs->ServiceContext;
+    if (GenerateNTDResponse(srs->RR_SRV.resrec.name, srs->RR_SRV.resrec.InterfaceID, instance->request, &rep, reg_service_reply_op, 0, mStatus_NoError) != mStatus_NoError)
+        LogMsg("%3d: SendServiceRemovalNotification: %##s is not valid DNS-SD SRV name", instance->request->sd, srs->RR_SRV.resrec.name->c);
+    else { append_reply(instance->request, rep); instance->clientnotified = mDNSfalse; }
+}
+
+// service registration callback performs three duties - frees memory for deregistered services,
+// handles name conflicts, and delivers completed registration information to the client
+mDNSlocal void regservice_callback(mDNS *const m, ServiceRecordSet *const srs, mStatus result)
+{
+    mStatus err;
+    mDNSBool SuppressError = mDNSfalse;
+    service_instance *instance;
+    reply_state         *rep;
+    (void)m; // Unused
+
+    if (!srs)      { LogMsg("regservice_callback: srs is NULL %d",                 result); return; }
+
+    instance = srs->ServiceContext;
+    if (!instance) { LogMsg("regservice_callback: srs->ServiceContext is NULL %d", result); return; }
+
+    // don't send errors up to client for wide-area, empty-string registrations
+    if (instance->request &&
+        instance->request->u.servicereg.default_domain &&
+        !instance->default_local)
+        SuppressError = mDNStrue;
+
+    if (mDNS_LoggingEnabled)
+    {
+        const char *const fmt =
+            (result == mStatus_NoError)      ? "%s DNSServiceRegister(%##s, %u) REGISTERED"    :
+            (result == mStatus_MemFree)      ? "%s DNSServiceRegister(%##s, %u) DEREGISTERED"  :
+            (result == mStatus_NameConflict) ? "%s DNSServiceRegister(%##s, %u) NAME CONFLICT" :
+            "%s DNSServiceRegister(%##s, %u) %s %d";
+        char prefix[16] = "---:";
+        if (instance->request) mDNS_snprintf(prefix, sizeof(prefix), "%3d:", instance->request->sd);
+        LogOperation(fmt, prefix, srs->RR_SRV.resrec.name->c, mDNSVal16(srs->RR_SRV.resrec.rdata->u.srv.port),
+                     SuppressError ? "suppressed error" : "CALLBACK", result);
+    }
+
+    if (!instance->request && result != mStatus_MemFree) { LogMsg("regservice_callback: instance->request is NULL %d", result); return; }
+
+    if (result == mStatus_NoError)
+    {
+        if (instance->request->u.servicereg.allowremotequery)
+        {
+            ExtraResourceRecord *e;
+            srs->RR_ADV.AllowRemoteQuery = mDNStrue;
+            srs->RR_PTR.AllowRemoteQuery = mDNStrue;
+            srs->RR_SRV.AllowRemoteQuery = mDNStrue;
+            srs->RR_TXT.AllowRemoteQuery = mDNStrue;
+            for (e = instance->srs.Extras; e; e = e->next) e->r.AllowRemoteQuery = mDNStrue;
+        }
+
+        if (GenerateNTDResponse(srs->RR_SRV.resrec.name, srs->RR_SRV.resrec.InterfaceID, instance->request, &rep, reg_service_reply_op, kDNSServiceFlagsAdd, result) != mStatus_NoError)
+            LogMsg("%3d: regservice_callback: %##s is not valid DNS-SD SRV name", instance->request->sd, srs->RR_SRV.resrec.name->c);
+        else { append_reply(instance->request, rep); instance->clientnotified = mDNStrue; }
+
+        if (callExternalHelpers(instance->request->u.servicereg.InterfaceID, &instance->domain, instance->request->flags))
+        {
+            LogInfo("regservice_callback: calling external_start_advertising_helper()");
+            external_start_advertising_helper(instance);
+        }
+        if (instance->request->u.servicereg.autoname && CountPeerRegistrations(m, srs) == 0)
+            RecordUpdatedNiceLabel(m, 0);   // Successfully got new name, tell user immediately
+    }
+    else if (result == mStatus_MemFree)
+    {
+        if (instance->request && instance->renameonmemfree)
+        {
+            external_stop_advertising_helper(instance);
+            instance->renameonmemfree = 0;
+            err = mDNS_RenameAndReregisterService(m, srs, &instance->request->u.servicereg.name);
+            if (err) LogMsg("ERROR: regservice_callback - RenameAndReregisterService returned %d", err);
+            // error should never happen - safest to log and continue
+        }
+        else
+            unlink_and_free_service_instance(instance);
+    }
+    else if (result == mStatus_NameConflict)
+    {
+        if (instance->request->u.servicereg.autorename)
+        {
+            external_stop_advertising_helper(instance);
+            if (instance->request->u.servicereg.autoname && CountPeerRegistrations(m, srs) == 0)
+            {
+                // On conflict for an autoname service, rename and reregister *all* autoname services
+                IncrementLabelSuffix(&m->nicelabel, mDNStrue);
+                mDNS_ConfigChanged(m);  // Will call back into udsserver_handle_configchange()
+            }
+            else    // On conflict for a non-autoname service, rename and reregister just that one service
+            {
+                if (instance->clientnotified) SendServiceRemovalNotification(srs);
+                mDNS_RenameAndReregisterService(m, srs, mDNSNULL);
+            }
+        }
+        else
+        {
+            if (!SuppressError)
+            {
+                if (GenerateNTDResponse(srs->RR_SRV.resrec.name, srs->RR_SRV.resrec.InterfaceID, instance->request, &rep, reg_service_reply_op, kDNSServiceFlagsAdd, result) != mStatus_NoError)
+                    LogMsg("%3d: regservice_callback: %##s is not valid DNS-SD SRV name", instance->request->sd, srs->RR_SRV.resrec.name->c);
+                else { append_reply(instance->request, rep); instance->clientnotified = mDNStrue; }
+            }
+            unlink_and_free_service_instance(instance);
+        }
+    }
+    else        // Not mStatus_NoError, mStatus_MemFree, or mStatus_NameConflict
+    {
+        if (!SuppressError)
+        {
+            if (GenerateNTDResponse(srs->RR_SRV.resrec.name, srs->RR_SRV.resrec.InterfaceID, instance->request, &rep, reg_service_reply_op, kDNSServiceFlagsAdd, result) != mStatus_NoError)
+                LogMsg("%3d: regservice_callback: %##s is not valid DNS-SD SRV name", instance->request->sd, srs->RR_SRV.resrec.name->c);
+            else { append_reply(instance->request, rep); instance->clientnotified = mDNStrue; }
+        }
+    }
+}
+
+mDNSlocal void regrecord_callback(mDNS *const m, AuthRecord *rr, mStatus result)
+{
+    (void)m; // Unused
+    if (!rr->RecordContext)     // parent struct already freed by termination callback
+    {
+        if (result == mStatus_NoError)
+            LogMsg("Error: regrecord_callback: successful registration of orphaned record %s", ARDisplayString(m, rr));
+        else
+        {
+            if (result != mStatus_MemFree) LogMsg("regrecord_callback: error %d received after parent termination", result);
+
+            // We come here when the record is being deregistered either from DNSServiceRemoveRecord or connection_termination.
+            // If the record has been updated, we need to free the rdata. Everytime we call mDNS_Update, it calls update_callback
+            // with the old rdata (so that we can free it) and stores the new rdata in "rr->resrec.rdata". This means, we need
+            // to free the latest rdata for which the update_callback was never called with.
+            if (rr->resrec.rdata != &rr->rdatastorage) freeL("RData/regrecord_callback", rr->resrec.rdata);
+            freeL("AuthRecord/regrecord_callback", rr);
+        }
+    }
+    else
+    {
+        registered_record_entry *re = rr->RecordContext;
+        request_state *request = re->request;
+
+        if (mDNS_LoggingEnabled)
+        {
+            char *fmt = (result == mStatus_NoError)      ? "%3d: DNSServiceRegisterRecord(%u %s) REGISTERED"    :
+                        (result == mStatus_MemFree)      ? "%3d: DNSServiceRegisterRecord(%u %s) DEREGISTERED"  :
+                        (result == mStatus_NameConflict) ? "%3d: DNSServiceRegisterRecord(%u %s) NAME CONFLICT" :
+                        "%3d: DNSServiceRegisterRecord(%u %s) %d";
+            LogOperation(fmt, request->sd, re->key, RRDisplayString(m, &rr->resrec), result);
+        }
+
+        if (result != mStatus_MemFree)
+        {
+            int len = sizeof(DNSServiceFlags) + sizeof(mDNSu32) + sizeof(DNSServiceErrorType);
+            reply_state *reply = create_reply(reg_record_reply_op, len, request);
+            reply->mhdr->client_context = re->regrec_client_context;
+            reply->rhdr->flags = dnssd_htonl(0);
+            reply->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(m, rr->resrec.InterfaceID, mDNSfalse));
+            reply->rhdr->error = dnssd_htonl(result);
+            append_reply(request, reply);
+        }
+
+        if (result)
+        {
+            // If this is a callback to a keepalive record, do not free it.
+            if (result == mStatus_BadStateErr)
+            {
+                LogInfo("regrecord_callback: Callback with error code mStatus_BadStateErr - not freeing the record.");
+            }
+            else
+            {
+                // unlink from list, free memory
+                registered_record_entry **ptr = &request->u.reg_recs;
+                while (*ptr && (*ptr) != re) ptr = &(*ptr)->next;
+                if (!*ptr) { LogMsg("regrecord_callback - record not in list!"); return; }
+                *ptr = (*ptr)->next;
+                freeL("registered_record_entry AuthRecord regrecord_callback", re->rr);
+                freeL("registered_record_entry regrecord_callback", re);
+             }
+        }
+        else
+        {
+            if (re->external_advertise) LogMsg("regrecord_callback: external_advertise already set!");
+
+            if (callExternalHelpers(re->origInterfaceID, &rr->namestorage, request->flags))
+            {
+                LogInfo("regrecord_callback: calling external_start_advertising_service");
+                external_start_advertising_service(&rr->resrec, request->flags);
+                re->external_advertise = mDNStrue;
+            }
+        }
+    }
+}
+
+// set_peer_pid() is called after mem is allocated for each new request in NewRequest()
+// This accounts for 2 places (connect_callback, request_callback)
+mDNSlocal void set_peer_pid(request_state *request)
+{
+    pid_t           p    = (pid_t) -1;
+    socklen_t       len  = sizeof(p);
+    request->pid_name[0] = '\0';
+    request->process_id  = -1;
+#ifdef LOCAL_PEERPID  
+    if (request->sd < 0)  
+        return;
+    // to extract the pid value
+    if (getsockopt(request->sd, SOL_LOCAL, LOCAL_PEERPID, &p, &len) != 0)
+        return;
+    // to extract the process name from the pid value
+    if (proc_pidinfo(p, PROC_PIDT_SHORTBSDINFO, 1, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) == 0)
+        return;
+    mDNSPlatformStrCopy(request->pid_name, proc.pbsi_comm);
+    request->process_id = p;
+#else   // !LOCAL_PEERPID
+    len = 0;
+    if (request->sd < 0)
+        return;
+    LogInfo("set_peer_pid: Not Supported on this version of OS");
+#endif  // LOCAL_PEERPID
+}
+
+mDNSlocal void connection_termination(request_state *request)
+{
+    // When terminating a shared connection, we need to scan the all_requests list
+    // and terminate any subbordinate operations sharing this file descriptor
+    request_state **req = &all_requests;
+
+    LogOperation("%3d: DNSServiceCreateConnection STOP PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+
+    while (*req)
+    {
+        if ((*req)->primary == request)
+        {
+            // Since we're already doing a list traversal, we unlink the request directly instead of using AbortUnlinkAndFree()
+            request_state *tmp = *req;
+            if (tmp->primary == tmp) LogMsg("connection_termination ERROR (*req)->primary == *req for %p %d",                  tmp, tmp->sd);
+            if (tmp->replies) LogMsg("connection_termination ERROR How can subordinate req %p %d have replies queued?", tmp, tmp->sd);
+            abort_request(tmp);
+            *req = tmp->next;
+            freeL("request_state/connection_termination", tmp);
+        }
+        else
+            req = &(*req)->next;
+    }
+
+    while (request->u.reg_recs)
+    {
+        registered_record_entry *ptr = request->u.reg_recs;
+        LogOperation("%3d: DNSServiceRegisterRecord(%u %s) STOP PID[%d](%s)", request->sd, ptr->key, RRDisplayString(&mDNSStorage, &ptr->rr->resrec), request->process_id, request->pid_name);
+		request->u.reg_recs = request->u.reg_recs->next;
+        ptr->rr->RecordContext = NULL;
+        if (ptr->external_advertise)
+        {
+            ptr->external_advertise = mDNSfalse;
+            external_stop_advertising_service(&ptr->rr->resrec, request->flags);
+        }
+        LogMcastS(&mDNSStorage, ptr->rr, request, reg_stop);
+        mDNS_Deregister(&mDNSStorage, ptr->rr);     // Will free ptr->rr for us
+        freeL("registered_record_entry/connection_termination", ptr);
+    }
+}
+
+mDNSlocal void handle_cancel_request(request_state *request)
+{
+    request_state **req = &all_requests;
+    LogOperation("%3d: Cancel %08X %08X", request->sd, request->hdr.client_context.u32[1], request->hdr.client_context.u32[0]);
+    while (*req)
+    {
+        if ((*req)->primary == request &&
+            (*req)->hdr.client_context.u32[0] == request->hdr.client_context.u32[0] &&
+            (*req)->hdr.client_context.u32[1] == request->hdr.client_context.u32[1])
+        {
+            // Since we're already doing a list traversal, we unlink the request directly instead of using AbortUnlinkAndFree()
+            request_state *tmp = *req;
+            abort_request(tmp);
+            *req = tmp->next;
+            freeL("request_state/handle_cancel_request", tmp);
+        }
+        else
+            req = &(*req)->next;
+    }
+}
+
+mDNSlocal mStatus handle_regrecord_request(request_state *request)
+{
+    mStatus err = mStatus_BadParamErr;
+    AuthRecord *rr = read_rr_from_ipc_msg(request, 1, 1);
+    if (rr)
+    {
+        registered_record_entry *re;
+        // Don't allow non-local domains to be regsitered as LocalOnly. Allowing this would permit
+        // clients to register records such as www.bigbank.com A w.x.y.z to redirect Safari.
+        if (rr->resrec.InterfaceID == mDNSInterface_LocalOnly && !IsLocalDomain(rr->resrec.name) &&
+            rr->resrec.rrclass == kDNSClass_IN && (rr->resrec.rrtype == kDNSType_A || rr->resrec.rrtype == kDNSType_AAAA ||
+                                                   rr->resrec.rrtype == kDNSType_CNAME))
+        {
+            freeL("AuthRecord/handle_regrecord_request", rr);
+            return (mStatus_BadParamErr);
+        }
+        // allocate registration entry, link into list
+        re = mallocL("registered_record_entry", sizeof(registered_record_entry));
+        if (!re) 
+            FatalError("ERROR: malloc");
+        re->key                   = request->hdr.reg_index;
+        re->rr                    = rr;
+        re->regrec_client_context = request->hdr.client_context;
+        re->request               = request;
+        re->external_advertise    = mDNSfalse;
+        rr->RecordContext         = re;
+        rr->RecordCallback        = regrecord_callback;
+
+        re->origInterfaceID = rr->resrec.InterfaceID;
+        if (rr->resrec.InterfaceID == mDNSInterface_P2P) 
+            rr->resrec.InterfaceID = mDNSInterface_Any;
+#if 0
+        if (!AuthorizedDomain(request, rr->resrec.name, AutoRegistrationDomains)) return (mStatus_NoError);
+#endif
+        if (rr->resrec.rroriginalttl == 0)
+            rr->resrec.rroriginalttl = DefaultTTLforRRType(rr->resrec.rrtype);
+
+        LogOperation("%3d: DNSServiceRegisterRecord(%u %s) START PID[%d](%s)", request->sd, re->key, RRDisplayString(&mDNSStorage, &rr->resrec), 
+                     request->process_id, request->pid_name);
+
+        err = mDNS_Register(&mDNSStorage, rr);
+        if (err)
+        {
+            LogOperation("%3d: DNSServiceRegisterRecord(%u %s) ERROR (%d)", request->sd, re->key, RRDisplayString(&mDNSStorage, &rr->resrec), err);
+            freeL("registered_record_entry", re);
+            freeL("registered_record_entry/AuthRecord", rr);
+        }
+        else
+        {
+            LogMcastS(&mDNSStorage, rr, request, reg_start); 
+            re->next = request->u.reg_recs;
+            request->u.reg_recs = re;
+        }
+    }
+    return(err);
+}
+
+mDNSlocal void UpdateDeviceInfoRecord(mDNS *const m);
+
+mDNSlocal void regservice_termination_callback(request_state *request)
+{
+    if (!request) 
+    { 
+        LogMsg("regservice_termination_callback context is NULL"); 
+        return; 
+    }
+    while (request->u.servicereg.instances)
+    {
+        service_instance *p = request->u.servicereg.instances;
+        request->u.servicereg.instances = request->u.servicereg.instances->next;
+        // only safe to free memory if registration is not valid, i.e. deregister fails (which invalidates p)
+        LogOperation("%3d: DNSServiceRegister(%##s, %u) STOP PID[%d](%s)", request->sd, p->srs.RR_SRV.resrec.name->c, 
+                     mDNSVal16(p->srs.RR_SRV.resrec.rdata->u.srv.port), request->process_id, request->pid_name);
+
+        external_stop_advertising_helper(p);
+
+        // Clear backpointer *before* calling mDNS_DeregisterService/unlink_and_free_service_instance
+        // We don't need unlink_and_free_service_instance to cut its element from the list, because we're already advancing
+        // request->u.servicereg.instances as we work our way through the list, implicitly cutting one element at a time
+        // We can't clear p->request *after* the calling mDNS_DeregisterService/unlink_and_free_service_instance
+        // because by then we might have already freed p
+        p->request = NULL;
+        LogMcastS(&mDNSStorage, &p->srs.RR_SRV, request, reg_stop);
+        if (mDNS_DeregisterService(&mDNSStorage, &p->srs))
+        {
+            unlink_and_free_service_instance(p);
+            // Don't touch service_instance *p after this -- it's likely to have been freed already
+        }
+    }
+    if (request->u.servicereg.txtdata)
+    { 
+        freeL("service_info txtdata", request->u.servicereg.txtdata); 
+        request->u.servicereg.txtdata = NULL; 
+    }
+    if (request->u.servicereg.autoname)
+    {
+        // Clear autoname before calling UpdateDeviceInfoRecord() so it doesn't mistakenly include this in its count of active autoname registrations
+        request->u.servicereg.autoname = mDNSfalse;
+        UpdateDeviceInfoRecord(&mDNSStorage);
+    }
+}
+
+mDNSlocal request_state *LocateSubordinateRequest(request_state *request)
+{
+    request_state *req;
+    for (req = all_requests; req; req = req->next)
+        if (req->primary == request &&
+            req->hdr.client_context.u32[0] == request->hdr.client_context.u32[0] &&
+            req->hdr.client_context.u32[1] == request->hdr.client_context.u32[1]) return(req);
+    return(request);
+}
+
+mDNSlocal mStatus add_record_to_service(request_state *request, service_instance *instance, mDNSu16 rrtype, mDNSu16 rdlen, const char *rdata, mDNSu32 ttl)
+{
+    ServiceRecordSet *srs = &instance->srs;
+    mStatus result;
+    mDNSu32 coreFlags = 0;  // translate to corresponding mDNSCore flag definitions
+    int size = rdlen > sizeof(RDataBody) ? rdlen : sizeof(RDataBody);
+    ExtraResourceRecord *extra = mallocL("ExtraResourceRecord", sizeof(*extra) - sizeof(RDataBody) + size);
+    if (!extra) { my_perror("ERROR: malloc"); return mStatus_NoMemoryErr; }
+
+    mDNSPlatformMemZero(extra, sizeof(ExtraResourceRecord));  // OK if oversized rdata not zero'd
+    extra->r.resrec.rrtype = rrtype;
+    extra->r.rdatastorage.MaxRDLength = (mDNSu16) size;
+    extra->r.resrec.rdlength = rdlen;
+    mDNSPlatformMemCopy(&extra->r.rdatastorage.u.data, rdata, rdlen);
+    // use InterfaceID value from DNSServiceRegister() call that created the original service
+    extra->r.resrec.InterfaceID = request->u.servicereg.InterfaceID;
+
+    if (request->flags & kDNSServiceFlagsIncludeP2P)
+        coreFlags |= coreFlagIncludeP2P;
+    if (request->flags & kDNSServiceFlagsIncludeAWDL)
+        coreFlags |= coreFlagIncludeAWDL;
+    
+    result = mDNS_AddRecordToService(&mDNSStorage, srs, extra, &extra->r.rdatastorage, ttl, coreFlags);
+    if (result) 
+    { 
+        freeL("ExtraResourceRecord/add_record_to_service", extra); 
+        return result; 
+    }
+    LogMcastS(&mDNSStorage, &srs->RR_PTR, request, reg_start);
+     
+    extra->ClientID = request->hdr.reg_index;
+    if (   instance->external_advertise
+           && callExternalHelpers(request->u.servicereg.InterfaceID, &instance->domain, request->flags))
+    {
+        LogInfo("add_record_to_service: calling external_start_advertising_service");
+        external_start_advertising_service(&extra->r.resrec, request->flags);
+    }
+    return result;
+}
+
+mDNSlocal mStatus handle_add_request(request_state *request)
+{
+    service_instance *i;
+    mStatus result = mStatus_UnknownErr;
+    DNSServiceFlags flags  = get_flags (&request->msgptr, request->msgend);
+    mDNSu16 rrtype = get_uint16(&request->msgptr, request->msgend);
+    mDNSu16 rdlen  = get_uint16(&request->msgptr, request->msgend);
+    const char     *rdata  = get_rdata (&request->msgptr, request->msgend, rdlen);
+    mDNSu32 ttl    = get_uint32(&request->msgptr, request->msgend);
+    if (!ttl) ttl = DefaultTTLforRRType(rrtype);
+    (void)flags; // Unused
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceAddRecord(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    // If this is a shared connection, check if the operation actually applies to a subordinate request_state object
+    if (request->terminate == connection_termination) request = LocateSubordinateRequest(request);
+
+    if (request->terminate != regservice_termination_callback)
+    { LogMsg("%3d: DNSServiceAddRecord(not a registered service ref)", request->sd); return(mStatus_BadParamErr); }
+
+    // For a service registered with zero port, don't allow adding records. This mostly happens due to a bug
+    // in the application. See radar://9165807.
+    if (mDNSIPPortIsZero(request->u.servicereg.port))
+    { LogMsg("%3d: DNSServiceAddRecord: adding record to a service registered with zero port", request->sd); return(mStatus_BadParamErr); }
+
+    LogOperation("%3d: DNSServiceAddRecord(%X, %##s, %s, %d)", request->sd, flags,
+                 (request->u.servicereg.instances) ? request->u.servicereg.instances->srs.RR_SRV.resrec.name->c : NULL, DNSTypeName(rrtype), rdlen);
+
+    for (i = request->u.servicereg.instances; i; i = i->next)
+    {
+        result = add_record_to_service(request, i, rrtype, rdlen, rdata, ttl);
+        if (result && i->default_local) break;
+        else result = mStatus_NoError;  // suppress non-local default errors
+    }
+
+    return(result);
+}
+
+mDNSlocal void update_callback(mDNS *const m, AuthRecord *const rr, RData *oldrd, mDNSu16 oldrdlen)
+{
+    mDNSBool external_advertise = (rr->UpdateContext) ? *((mDNSBool *)rr->UpdateContext) : mDNSfalse;
+    (void)m; // Unused
+
+    // There are three cases.
+    //
+    // 1. We have updated the primary TXT record of the service
+    // 2. We have updated the TXT record that was added to the service using DNSServiceAddRecord
+    // 3. We have updated the TXT record that was registered using DNSServiceRegisterRecord
+    //
+    // external_advertise is set if we have advertised at least once during the initial addition
+    // of the record in all of the three cases above. We should have checked for InterfaceID/LocalDomain
+    // checks during the first time and hence we don't do any checks here
+    if (external_advertise)
+    {
+        ResourceRecord ext = rr->resrec;
+        DNSServiceFlags flags = 0;
+
+        // Since we don't have a copy of the flags value used when the record was registered,
+        // we'll have to derive it from the ARType field.  
+        if (rr->ARType == AuthRecordAnyIncludeP2P)
+            flags |= kDNSServiceFlagsIncludeP2P;
+        else if (rr->ARType == AuthRecordAnyIncludeAWDL)
+            flags |= kDNSServiceFlagsIncludeAWDL;
+
+        if (ext.rdlength == oldrdlen && mDNSPlatformMemSame(&ext.rdata->u, &oldrd->u, oldrdlen)) goto exit;
+        SetNewRData(&ext, oldrd, oldrdlen);
+        external_stop_advertising_service(&ext, flags);
+        LogInfo("update_callback: calling external_start_advertising_service");
+        external_start_advertising_service(&rr->resrec, flags);
+    }
+exit:
+    if (oldrd != &rr->rdatastorage) freeL("RData/update_callback", oldrd);
+}
+
+mDNSlocal mStatus update_record(AuthRecord *rr, mDNSu16 rdlen, const char *rdata, mDNSu32 ttl, const mDNSBool *const external_advertise)
+{
+    mStatus result;
+    const int rdsize = rdlen > sizeof(RDataBody) ? rdlen : sizeof(RDataBody);
+    RData *newrd = mallocL("RData/update_record", sizeof(RData) - sizeof(RDataBody) + rdsize);
+    if (!newrd) FatalError("ERROR: malloc");
+    newrd->MaxRDLength = (mDNSu16) rdsize;
+    mDNSPlatformMemCopy(&newrd->u, rdata, rdlen);
+
+    // BIND named (name daemon) doesn't allow TXT records with zero-length rdata. This is strictly speaking correct,
+    // since RFC 1035 specifies a TXT record as "One or more <character-string>s", not "Zero or more <character-string>s".
+    // Since some legacy apps try to create zero-length TXT records, we'll silently correct it here.
+    if (rr->resrec.rrtype == kDNSType_TXT && rdlen == 0) { rdlen = 1; newrd->u.txt.c[0] = 0; }
+
+    if (external_advertise) rr->UpdateContext = (void *)external_advertise;
+
+    result = mDNS_Update(&mDNSStorage, rr, ttl, rdlen, newrd, update_callback);
+    if (result) { LogMsg("update_record: Error %d for %s", (int)result, ARDisplayString(&mDNSStorage, rr)); freeL("RData/update_record", newrd); }
+    return result;
+}
+
+mDNSlocal mStatus handle_update_request(request_state *request)
+{
+    const ipc_msg_hdr *const hdr = &request->hdr;
+    mStatus result = mStatus_BadReferenceErr;
+    service_instance *i;
+    AuthRecord *rr = NULL;
+
+    // get the message data
+    DNSServiceFlags flags = get_flags (&request->msgptr, request->msgend);  // flags unused
+    mDNSu16 rdlen = get_uint16(&request->msgptr, request->msgend);
+    const char     *rdata = get_rdata (&request->msgptr, request->msgend, rdlen);
+    mDNSu32 ttl   = get_uint32(&request->msgptr, request->msgend);
+    (void)flags; // Unused
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceUpdateRecord(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    // If this is a shared connection, check if the operation actually applies to a subordinate request_state object
+    if (request->terminate == connection_termination) request = LocateSubordinateRequest(request);
+
+    if (request->terminate == connection_termination)
+    {
+        // update an individually registered record
+        registered_record_entry *reptr;
+        for (reptr = request->u.reg_recs; reptr; reptr = reptr->next)
+        {
+            if (reptr->key == hdr->reg_index)
+            {
+                result = update_record(reptr->rr, rdlen, rdata, ttl, &reptr->external_advertise);
+                LogOperation("%3d: DNSServiceUpdateRecord(%##s, %s)",
+                             request->sd, reptr->rr->resrec.name->c, reptr->rr ? DNSTypeName(reptr->rr->resrec.rrtype) : "<NONE>");
+                goto end;
+            }
+        }
+        result = mStatus_BadReferenceErr;
+        goto end;
+    }
+
+    if (request->terminate != regservice_termination_callback)
+    { LogMsg("%3d: DNSServiceUpdateRecord(not a registered service ref)", request->sd); return(mStatus_BadParamErr); }
+
+    // For a service registered with zero port, only SRV record is initialized. Don't allow any updates.
+    if (mDNSIPPortIsZero(request->u.servicereg.port))
+    { LogMsg("%3d: DNSServiceUpdateRecord: updating the record of a service registered with zero port", request->sd); return(mStatus_BadParamErr); }
+
+    // update the saved off TXT data for the service
+    if (hdr->reg_index == TXT_RECORD_INDEX)
+    {
+        if (request->u.servicereg.txtdata)
+        { freeL("service_info txtdata", request->u.servicereg.txtdata); request->u.servicereg.txtdata = NULL; }
+        if (rdlen > 0)
+        {
+            request->u.servicereg.txtdata = mallocL("service_info txtdata", rdlen);
+            if (!request->u.servicereg.txtdata) FatalError("ERROR: handle_update_request - malloc");
+            mDNSPlatformMemCopy(request->u.servicereg.txtdata, rdata, rdlen);
+        }
+        request->u.servicereg.txtlen = rdlen;
+    }
+
+    // update a record from a service record set
+    for (i = request->u.servicereg.instances; i; i = i->next)
+    {
+        if (hdr->reg_index == TXT_RECORD_INDEX) rr = &i->srs.RR_TXT;
+        else
+        {
+            ExtraResourceRecord *e;
+            for (e = i->srs.Extras; e; e = e->next)
+                if (e->ClientID == hdr->reg_index) { rr = &e->r; break; }
+        }
+
+        if (!rr) { result = mStatus_BadReferenceErr; goto end; }
+        result = update_record(rr, rdlen, rdata, ttl, &i->external_advertise);
+        if (result && i->default_local) goto end;
+        else result = mStatus_NoError;  // suppress non-local default errors
+    }
+
+end:
+    if (request->terminate == regservice_termination_callback)
+        LogOperation("%3d: DNSServiceUpdateRecord(%##s, %s)", request->sd,
+                     (request->u.servicereg.instances) ? request->u.servicereg.instances->srs.RR_SRV.resrec.name->c : NULL,
+                     rr ? DNSTypeName(rr->resrec.rrtype) : "<NONE>");
+
+    return(result);
+}
+
+// remove a resource record registered via DNSServiceRegisterRecord()
+mDNSlocal mStatus remove_record(request_state *request)
+{
+    mStatus err = mStatus_UnknownErr;
+    registered_record_entry *e, **ptr = &request->u.reg_recs;
+
+    while (*ptr && (*ptr)->key != request->hdr.reg_index) ptr = &(*ptr)->next;
+    if (!*ptr) { LogMsg("%3d: DNSServiceRemoveRecord(%u) not found", request->sd, request->hdr.reg_index); return mStatus_BadReferenceErr; }
+    e = *ptr;
+    *ptr = e->next; // unlink
+
+    LogOperation("%3d: DNSServiceRemoveRecord(%u %s)", request->sd, e->key, RRDisplayString(&mDNSStorage, &e->rr->resrec));
+    e->rr->RecordContext = NULL;
+    if (e->external_advertise)
+    {
+        external_stop_advertising_service(&e->rr->resrec, request->flags);
+        e->external_advertise = mDNSfalse;
+    }
+    LogMcastS(&mDNSStorage, e->rr, request, reg_stop);
+    err = mDNS_Deregister(&mDNSStorage, e->rr);     // Will free e->rr for us; we're responsible for freeing e
+    if (err)
+    {
+        LogMsg("ERROR: remove_record, mDNS_Deregister: %d", err);
+        freeL("registered_record_entry AuthRecord remove_record", e->rr);
+    }
+    freeL("registered_record_entry remove_record", e);
+    return err;
+}
+
+mDNSlocal mStatus remove_extra(const request_state *const request, service_instance *const serv, mDNSu16 *const rrtype)
+{
+    mStatus err = mStatus_BadReferenceErr;
+    ExtraResourceRecord *ptr;
+
+    for (ptr = serv->srs.Extras; ptr; ptr = ptr->next)
+    {
+        if (ptr->ClientID == request->hdr.reg_index) // found match
+        {
+            *rrtype = ptr->r.resrec.rrtype;
+            if (serv->external_advertise) external_stop_advertising_service(&ptr->r.resrec, request->flags);
+            err = mDNS_RemoveRecordFromService(&mDNSStorage, &serv->srs, ptr, FreeExtraRR, ptr);
+            break;
+        }
+    }
+    return err;
+}
+
+mDNSlocal mStatus handle_removerecord_request(request_state *request)
+{
+    mStatus err = mStatus_BadReferenceErr;
+    get_flags(&request->msgptr, request->msgend);   // flags unused
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceRemoveRecord(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    // If this is a shared connection, check if the operation actually applies to a subordinate request_state object
+    if (request->terminate == connection_termination) request = LocateSubordinateRequest(request);
+
+    if (request->terminate == connection_termination)
+        err = remove_record(request);  // remove individually registered record
+    else if (request->terminate != regservice_termination_callback)
+    { LogMsg("%3d: DNSServiceRemoveRecord(not a registered service ref)", request->sd); return(mStatus_BadParamErr); }
+    else
+    {
+        service_instance *i;
+        mDNSu16 rrtype = 0;
+        LogOperation("%3d: DNSServiceRemoveRecord(%##s, %s)", request->sd,
+                     (request->u.servicereg.instances) ? request->u.servicereg.instances->srs.RR_SRV.resrec.name->c : NULL,
+                     rrtype ? DNSTypeName(rrtype) : "<NONE>");
+        for (i = request->u.servicereg.instances; i; i = i->next)
+        {
+            err = remove_extra(request, i, &rrtype);
+            if (err && i->default_local) break;
+            else err = mStatus_NoError;  // suppress non-local default errors
+        }
+    }
+
+    return(err);
+}
+
+// If there's a comma followed by another character,
+// FindFirstSubType overwrites the comma with a nul and returns the pointer to the next character.
+// Otherwise, it returns a pointer to the final nul at the end of the string
+mDNSlocal char *FindFirstSubType(char *p, char **AnonData)
+{
+    while (*p)
+    {
+        if (p[0] == '\\' && p[1])
+        {
+             p += 2;
+        }
+        else if (p[0] == ',' && p[1])
+        {
+            *p++ = 0;
+            return(p);
+        }
+        else if (p[0] == ':' && p[1])
+        {
+            *p++ = 0;
+            *AnonData = p;
+        }
+        else
+        {
+            p++;
+        }
+    }
+    return(p);
+}
+
+// If there's a comma followed by another character,
+// FindNextSubType overwrites the comma with a nul and returns the pointer to the next character.
+// If it finds an illegal unescaped dot in the subtype name, it returns mDNSNULL
+// Otherwise, it returns a pointer to the final nul at the end of the string
+mDNSlocal char *FindNextSubType(char *p)
+{
+    while (*p)
+    {
+        if (p[0] == '\\' && p[1])       // If escape character
+            p += 2;                     // ignore following character
+        else if (p[0] == ',')           // If we found a comma
+        {
+            if (p[1]) *p++ = 0;
+            return(p);
+        }
+        else if (p[0] == '.')
+            return(mDNSNULL);
+        else p++;
+    }
+    return(p);
+}
+
+// Returns -1 if illegal subtype found
+mDNSexport mDNSs32 ChopSubTypes(char *regtype, char **AnonData)
+{
+    mDNSs32 NumSubTypes = 0;
+    char *stp = FindFirstSubType(regtype, AnonData);
+    while (stp && *stp)                 // If we found a comma...
+    {
+        if (*stp == ',') return(-1);
+        NumSubTypes++;
+        stp = FindNextSubType(stp);
+    }
+    if (!stp) return(-1);
+    return(NumSubTypes);
+}
+
+mDNSexport AuthRecord *AllocateSubTypes(mDNSs32 NumSubTypes, char *p, char **AnonData)
+{
+    AuthRecord *st = mDNSNULL;
+    // 
+    // "p" is pointing at the regtype e.g., _http._tcp followed by ":<AnonData>" indicated
+    // by AnonData being non-NULL which is in turn follwed by ",<SubTypes>" indicated by
+    // NumSubTypes being non-zero. We need to skip the initial regtype to get to the actual
+    // data that we want. When we come here, ChopSubTypes has null terminated like this e.g.,
+    //
+    // _http._tcp<NULL><AnonData><NULL><SubType1><NULL><SubType2><NULL> etc.
+    //
+    // 1. If we have Anonymous data and subtypes, skip the regtype (e.g., "_http._tcp")
+    //    to get the AnonData and then skip the AnonData to get to the SubType.
+    //
+    // 2. If we have only SubTypes, skip the regtype to get to the SubType data.
+    //
+    // 3. If we have only AnonData, skip the regtype to get to the AnonData.
+    //
+    // 4. If we don't have AnonData or NumStypes, it is a noop.
+    //
+    if (AnonData)
+    {
+        int len;
+
+        // Skip the regtype
+        while (*p) p++;
+        p++;
+
+        len = strlen(p) + 1;
+        *AnonData = mallocL("Anonymous", len);
+        if (!(*AnonData))
+        {
+           return (mDNSNULL);
+        }
+        mDNSPlatformMemCopy(*AnonData, p, len);
+    }
+    if (NumSubTypes)
+    {
+        mDNSs32 i;
+        st = mallocL("ServiceSubTypes", NumSubTypes * sizeof(AuthRecord));
+        if (!st) return(mDNSNULL);
+        for (i = 0; i < NumSubTypes; i++)
+        {
+            mDNS_SetupResourceRecord(&st[i], mDNSNULL, mDNSInterface_Any, kDNSQType_ANY, kStandardTTL, 0, AuthRecordAny, mDNSNULL, mDNSNULL);
+            // First time through we skip the regtype or AnonData. Subsequently, the
+            // previous subtype.
+            while (*p) p++;
+            p++;
+            if (!MakeDomainNameFromDNSNameString(&st[i].namestorage, p))
+            {
+                freeL("ServiceSubTypes", st);
+                if (*AnonData)
+                    freeL("AnonymousData", *AnonData);
+                return(mDNSNULL);
+            }
+        }
+    }
+    // If NumSubTypes is zero and AnonData is non-NULL, we still return NULL but AnonData has been
+    // initialized. The caller knows how to handle this.
+    return(st);
+}
+
+mDNSlocal mStatus register_service_instance(request_state *request, const domainname *domain)
+{
+    service_instance **ptr, *instance;
+    const int extra_size = (request->u.servicereg.txtlen > sizeof(RDataBody)) ? (request->u.servicereg.txtlen - sizeof(RDataBody)) : 0;
+    const mDNSBool DomainIsLocal = SameDomainName(domain, &localdomain);
+    mStatus result;
+    mDNSInterfaceID interfaceID = request->u.servicereg.InterfaceID;
+    mDNSu32 coreFlags = 0;
+
+    if (request->flags & kDNSServiceFlagsIncludeP2P)
+        coreFlags |= coreFlagIncludeP2P;
+    if (request->flags & kDNSServiceFlagsIncludeAWDL)
+        coreFlags |= coreFlagIncludeAWDL;
+
+    // Client guarantees that record names are unique, so we can skip sending out initial
+    // probe messages.  Standard name conflict resolution is still done if a conflict is discovered.
+    if (request->flags & kDNSServiceFlagsKnownUnique)
+        coreFlags |= coreFlagKnownUnique;
+
+    if (request->flags & kDNSServiceFlagsWakeOnlyService)
+        coreFlags |= coreFlagWakeOnly;
+
+    // If the client specified an interface, but no domain, then we honor the specified interface for the "local" (mDNS)
+    // registration but for the wide-area registrations we don't (currently) have any concept of a wide-area unicast
+    // registrations scoped to a specific interface, so for the automatic domains we add we must *not* specify an interface.
+    // (Specifying an interface with an apparently wide-area domain (i.e. something other than "local")
+    // currently forces the registration to use mDNS multicast despite the apparently wide-area domain.)
+    if (request->u.servicereg.default_domain && !DomainIsLocal) interfaceID = mDNSInterface_Any;
+
+    for (ptr = &request->u.servicereg.instances; *ptr; ptr = &(*ptr)->next)
+    {
+        if (SameDomainName(&(*ptr)->domain, domain))
+        {
+            LogMsg("register_service_instance: domain %##s already registered for %#s.%##s",
+                   domain->c, &request->u.servicereg.name, &request->u.servicereg.type);
+            return mStatus_AlreadyRegistered;
+        }
+    }
+
+    instance = mallocL("service_instance", sizeof(*instance) + extra_size);
+    if (!instance) { my_perror("ERROR: malloc"); return mStatus_NoMemoryErr; }
+
+    instance->next                          = mDNSNULL;
+    instance->request                       = request;
+    instance->renameonmemfree               = 0;
+    instance->clientnotified                = mDNSfalse;
+    instance->default_local                 = (request->u.servicereg.default_domain && DomainIsLocal);
+    instance->external_advertise            = mDNSfalse;
+    AssignDomainName(&instance->domain, domain);
+
+    instance->srs.AnonData = mDNSNULL;
+    if (!request->u.servicereg.AnonData)
+    {
+        instance->subtypes = AllocateSubTypes(request->u.servicereg.num_subtypes, request->u.servicereg.type_as_string, mDNSNULL);
+    }
+    else
+    {
+        char *AnonData = mDNSNULL;
+        instance->subtypes = AllocateSubTypes(request->u.servicereg.num_subtypes, request->u.servicereg.type_as_string, &AnonData);
+        if (AnonData)
+            instance->srs.AnonData = (const mDNSu8 *)AnonData;    
+    }
+
+    if (request->u.servicereg.num_subtypes && !instance->subtypes)
+    { 
+        unlink_and_free_service_instance(instance); 
+        instance = NULL; 
+        FatalError("ERROR: malloc"); 
+    }
+
+    result = mDNS_RegisterService(&mDNSStorage, &instance->srs,
+                                  &request->u.servicereg.name, &request->u.servicereg.type, domain,
+                                  request->u.servicereg.host.c[0] ? &request->u.servicereg.host : NULL,
+                                  request->u.servicereg.port,
+                                  request->u.servicereg.txtdata, request->u.servicereg.txtlen,
+                                  instance->subtypes, request->u.servicereg.num_subtypes,
+                                  interfaceID, regservice_callback, instance, coreFlags);
+
+    if (!result)
+    {
+        *ptr = instance;        // Append this to the end of our request->u.servicereg.instances list
+        LogOperation("%3d: DNSServiceRegister(%##s, %u) ADDED", instance->request->sd, 
+                     instance->srs.RR_SRV.resrec.name->c, mDNSVal16(request->u.servicereg.port));
+        LogMcastS(&mDNSStorage, &instance->srs.RR_SRV, request, reg_start);
+    }
+    else
+    {
+        LogMsg("register_service_instance %#s.%##s%##s error %d",
+               &request->u.servicereg.name, &request->u.servicereg.type, domain->c, result);
+        unlink_and_free_service_instance(instance);
+    }
+
+    return result;
+}
+
+mDNSlocal void udsserver_default_reg_domain_changed(const DNameListElem *const d, const mDNSBool add)
+{
+    request_state *request;
+
+#if APPLE_OSX_mDNSResponder
+    machserver_automatic_registration_domain_changed(&d->name, add);
+#endif // APPLE_OSX_mDNSResponder
+
+    LogMsg("%s registration domain %##s", add ? "Adding" : "Removing", d->name.c);
+    for (request = all_requests; request; request = request->next)
+    {
+        if (request->terminate != regservice_termination_callback) continue;
+        if (!request->u.servicereg.default_domain) continue;
+        if (!d->uid || SystemUID(request->uid) || request->uid == d->uid)
+        {
+            service_instance **ptr = &request->u.servicereg.instances;
+            while (*ptr && !SameDomainName(&(*ptr)->domain, &d->name)) ptr = &(*ptr)->next;
+            if (add)
+            {
+                // If we don't already have this domain in our list for this registration, add it now
+                if (!*ptr) register_service_instance(request, &d->name);
+                else debugf("udsserver_default_reg_domain_changed %##s already in list, not re-adding", &d->name);
+            }
+            else
+            {
+                // Normally we should not fail to find the specified instance
+                // One case where this can happen is if a uDNS update fails for some reason,
+                // and regservice_callback then calls unlink_and_free_service_instance and disposes of that instance.
+                if (!*ptr)
+                    LogMsg("udsserver_default_reg_domain_changed domain %##s not found for service %#s type %s",
+                           &d->name, request->u.servicereg.name.c, request->u.servicereg.type_as_string);
+                else
+                {
+                    DNameListElem *p;
+                    for (p = AutoRegistrationDomains; p; p=p->next)
+                        if (!p->uid || SystemUID(request->uid) || request->uid == p->uid)
+                            if (SameDomainName(&d->name, &p->name)) break;
+                    if (p) debugf("udsserver_default_reg_domain_changed %##s still in list, not removing", &d->name);
+                    else
+                    {
+                        mStatus err;
+                        service_instance *si = *ptr;
+                        *ptr = si->next;
+                        if (si->clientnotified) SendServiceRemovalNotification(&si->srs); // Do this *before* clearing si->request backpointer
+                        // Now that we've cut this service_instance from the list, we MUST clear the si->request backpointer.
+                        // Otherwise what can happen is this: While our mDNS_DeregisterService is in the
+                        // process of completing asynchronously, the client cancels the entire operation, so
+                        // regservice_termination_callback then runs through the whole list deregistering each
+                        // instance, clearing the backpointers, and then disposing the parent request_state object.
+                        // However, because this service_instance isn't in the list any more, regservice_termination_callback
+                        // has no way to find it and clear its backpointer, and then when our mDNS_DeregisterService finally
+                        // completes later with a mStatus_MemFree message, it calls unlink_and_free_service_instance() with
+                        // a service_instance with a stale si->request backpointer pointing to memory that's already been freed.
+                        si->request = NULL;
+                        err = mDNS_DeregisterService(&mDNSStorage, &si->srs);
+                        if (err) { LogMsg("udsserver_default_reg_domain_changed err %d", err); unlink_and_free_service_instance(si); }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// Don't allow normal and anonymous registration to coexist.
+mDNSlocal mDNSBool CheckForMixedRegistrations(domainname *regtype, domainname *domain, mDNSBool AnonData)
+{
+    request_state *request;
+
+    // We only care about local domains where the anonymous extension is
+    // implemented.
+    if (!SameDomainName(domain, (const domainname *) "\x5" "local"))
+    {
+        return mDNStrue;
+    }
+
+    for (request = all_requests; request; request = request->next)
+    {
+        service_instance *ptr;
+
+        if (request->terminate != regservice_termination_callback) continue;
+        for (ptr = request->u.servicereg.instances; ptr ; ptr = ptr->next)
+        {
+            if (!SameDomainName(&ptr->domain, (const domainname *)"\x5" "local") ||
+                !SameDomainName(&request->u.servicereg.type, regtype))
+            {
+                continue;
+            }
+
+            // If we are about to register a anonymous registraion, we dont't want to
+            // allow the regular ones and vice versa.
+            if (AnonData)
+            {
+                if (!ptr->srs.AnonData)
+                {
+                    LogMsg("CheckForMixedRegistrations: Normal registration already exists for %##s", regtype->c);
+                    return mDNSfalse;
+                }
+            }
+            else
+            {
+                // Allow multiple regular registrations
+                if (ptr->srs.AnonData)
+                {
+                    LogMsg("CheckForMixedRegistrations: Anonymous registration already exists for %##s", regtype->c);
+                    return mDNSfalse;
+                }
+            }
+        }
+    }
+    return mDNStrue;
+}
+
+mDNSlocal mStatus handle_regservice_request(request_state *request)
+{
+    char name[256]; // Lots of spare space for extra-long names that we'll auto-truncate down to 63 bytes
+    char domain[MAX_ESCAPED_DOMAIN_NAME], host[MAX_ESCAPED_DOMAIN_NAME];
+    char type_as_string[MAX_ESCAPED_DOMAIN_NAME];
+    domainname d, srv;
+    mStatus err;
+    char *AnonData = mDNSNULL;
+
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID;
+
+    // Map kDNSServiceInterfaceIndexP2P to kDNSServiceInterfaceIndexAny with the 
+    // kDNSServiceFlagsIncludeP2P flag set.
+    if (interfaceIndex == kDNSServiceInterfaceIndexP2P)
+    {
+        LogOperation("handle_regservice_request: mapping kDNSServiceInterfaceIndexP2P to kDNSServiceInterfaceIndexAny + kDNSServiceFlagsIncludeP2P");
+        flags |= kDNSServiceFlagsIncludeP2P;
+        interfaceIndex = kDNSServiceInterfaceIndexAny;
+    }
+
+    InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (interfaceIndex && !InterfaceID)
+    { LogMsg("ERROR: handle_regservice_request - Couldn't find interfaceIndex %d", interfaceIndex); return(mStatus_BadParamErr); }
+
+    if (get_string(&request->msgptr, request->msgend, name, sizeof(name)) < 0 ||
+        get_string(&request->msgptr, request->msgend, type_as_string, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        get_string(&request->msgptr, request->msgend, domain, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        get_string(&request->msgptr, request->msgend, host, MAX_ESCAPED_DOMAIN_NAME) < 0)
+    { LogMsg("ERROR: handle_regservice_request - Couldn't read name/regtype/domain"); return(mStatus_BadParamErr); }
+
+    request->flags = flags;
+    request->u.servicereg.InterfaceID = InterfaceID;
+    request->u.servicereg.instances = NULL;
+    request->u.servicereg.txtlen  = 0;
+    request->u.servicereg.txtdata = NULL;
+    mDNSPlatformStrCopy(request->u.servicereg.type_as_string, type_as_string);
+
+    if (request->msgptr + 2 > request->msgend) request->msgptr = NULL;
+    else
+    {
+        request->u.servicereg.port.b[0] = *request->msgptr++;
+        request->u.servicereg.port.b[1] = *request->msgptr++;
+    }
+
+    request->u.servicereg.txtlen = get_uint16(&request->msgptr, request->msgend);
+    if (request->u.servicereg.txtlen)
+    {
+        request->u.servicereg.txtdata = mallocL("service_info txtdata", request->u.servicereg.txtlen);
+        if (!request->u.servicereg.txtdata) FatalError("ERROR: handle_regservice_request - malloc");
+        mDNSPlatformMemCopy(request->u.servicereg.txtdata, get_rdata(&request->msgptr, request->msgend, request->u.servicereg.txtlen), request->u.servicereg.txtlen);
+    }
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceRegister(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    // Check for sub-types after the service type
+    request->u.servicereg.num_subtypes = ChopSubTypes(request->u.servicereg.type_as_string, &AnonData);    // Note: Modifies regtype string to remove trailing subtypes
+    if (request->u.servicereg.num_subtypes < 0)
+    {
+        LogMsg("ERROR: handle_regservice_request - ChopSubTypes failed %s", request->u.servicereg.type_as_string);
+        return(mStatus_BadParamErr);
+    }
+    if (AnonData)
+    {
+        int AnonDataLen = strlen(AnonData);
+        if (AnonDataLen > MAX_ANONYMOUS_DATA)
+        {
+            LogMsg("ERROR: handle_regservice_request: AnonDataLen %d", AnonDataLen);
+            return(mStatus_BadParamErr);
+        }
+        request->u.servicereg.AnonData = mDNStrue;
+    }
+    else
+    {
+        request->u.servicereg.AnonData = mDNSfalse;
+    }
+
+    // Don't try to construct "domainname t" until *after* ChopSubTypes has worked its magic
+    if (!*request->u.servicereg.type_as_string || !MakeDomainNameFromDNSNameString(&request->u.servicereg.type, request->u.servicereg.type_as_string))
+    { LogMsg("ERROR: handle_regservice_request - type_as_string bad %s", request->u.servicereg.type_as_string); return(mStatus_BadParamErr); }
+
+    if (!name[0])
+    {
+        request->u.servicereg.name = mDNSStorage.nicelabel;
+        request->u.servicereg.autoname = mDNStrue;
+    }
+    else
+    {
+        // If the client is allowing AutoRename, then truncate name to legal length before converting it to a DomainLabel
+        if ((flags & kDNSServiceFlagsNoAutoRename) == 0)
+        {
+            int newlen = TruncateUTF8ToLength((mDNSu8*)name, mDNSPlatformStrLen(name), MAX_DOMAIN_LABEL);
+            name[newlen] = 0;
+        }
+        if (!MakeDomainLabelFromLiteralString(&request->u.servicereg.name, name))
+        { LogMsg("ERROR: handle_regservice_request - name bad %s", name); return(mStatus_BadParamErr); }
+        request->u.servicereg.autoname = mDNSfalse;
+    }
+
+    if (*domain)
+    {
+        request->u.servicereg.default_domain = mDNSfalse;
+        if (!MakeDomainNameFromDNSNameString(&d, domain))
+        { LogMsg("ERROR: handle_regservice_request - domain bad %s", domain); return(mStatus_BadParamErr); }
+    }
+    else
+    {
+        request->u.servicereg.default_domain = mDNStrue;
+        MakeDomainNameFromDNSNameString(&d, "local.");
+    }
+
+    // We don't allow the anonymous and the regular ones to coexist
+    if (!CheckForMixedRegistrations(&request->u.servicereg.type, &d, request->u.servicereg.AnonData))
+    {
+        return(mStatus_BadParamErr);
+    }
+
+    if (!ConstructServiceName(&srv, &request->u.servicereg.name, &request->u.servicereg.type, &d))
+    {
+        LogMsg("ERROR: handle_regservice_request - Couldn't ConstructServiceName from, “%#s” “%##s” “%##s”",
+               request->u.servicereg.name.c, request->u.servicereg.type.c, d.c); return(mStatus_BadParamErr);
+    }
+
+    if (!MakeDomainNameFromDNSNameString(&request->u.servicereg.host, host))
+    { LogMsg("ERROR: handle_regservice_request - host bad %s", host); return(mStatus_BadParamErr); }
+    request->u.servicereg.autorename       = (flags & kDNSServiceFlagsNoAutoRename    ) == 0;
+    request->u.servicereg.allowremotequery = (flags & kDNSServiceFlagsAllowRemoteQuery) != 0;
+
+    // Some clients use mDNS for lightweight copy protection, registering a pseudo-service with
+    // a port number of zero. When two instances of the protected client are allowed to run on one
+    // machine, we don't want to see misleading "Bogus client" messages in syslog and the console.
+    if (!mDNSIPPortIsZero(request->u.servicereg.port))
+    {
+        int count = CountExistingRegistrations(&srv, request->u.servicereg.port);
+        if (count)
+            LogMsg("Client application[%d](%s) registered %d identical instances of service %##s port %u.", request->process_id,
+                   request->pid_name, count+1, srv.c, mDNSVal16(request->u.servicereg.port));
+    }
+
+    LogOperation("%3d: DNSServiceRegister(%X, %d, \"%s\", \"%s\", \"%s\", \"%s\", %u) START PID[%d](%s)",
+    	         request->sd, flags, interfaceIndex, name, request->u.servicereg.type_as_string, domain, host, 
+                 mDNSVal16(request->u.servicereg.port), request->process_id, request->pid_name);
+
+    // We need to unconditionally set request->terminate, because even if we didn't successfully
+    // start any registrations right now, subsequent configuration changes may cause successful
+    // registrations to be added, and we'll need to cancel them before freeing this memory.
+    // We also need to set request->terminate first, before adding additional service instances,
+    // because the uds_validatelists uses the request->terminate function pointer to determine
+    // what kind of request this is, and therefore what kind of list validation is required.
+    request->terminate = regservice_termination_callback;
+
+    err = register_service_instance(request, &d);
+
+#if 0
+    err = AuthorizedDomain(request, &d, AutoRegistrationDomains) ? register_service_instance(request, &d) : mStatus_NoError;
+#endif
+    if (!err)
+    {
+        if (request->u.servicereg.autoname) UpdateDeviceInfoRecord(&mDNSStorage);
+
+        if (!*domain)
+        {
+            DNameListElem *ptr;
+            // Note that we don't report errors for non-local, non-explicit domains
+            for (ptr = AutoRegistrationDomains; ptr; ptr = ptr->next)
+                if (!ptr->uid || SystemUID(request->uid) || request->uid == ptr->uid)
+                    register_service_instance(request, &ptr->name);
+        }
+    }
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceBrowse
+#endif
+
+mDNSlocal void FoundInstance(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    DNSServiceFlags flags = AddRecord ? kDNSServiceFlagsAdd : 0;
+    request_state *req = question->QuestionContext;
+    reply_state *rep;
+    (void)m; // Unused
+
+    if (answer->rrtype != kDNSType_PTR)
+    { LogMsg("%3d: FoundInstance: Should not be called with rrtype %d (not a PTR record)", req->sd, answer->rrtype); return; }
+
+    if (mDNSOpaque16IsZero(question->TargetQID) && (question->BrowseThreshold > 0) && (question->CurrentAnswers >= question->BrowseThreshold))
+    {
+        flags |= kDNSServiceFlagsThresholdReached;
+    }
+
+    if (GenerateNTDResponse(&answer->rdata->u.name, answer->InterfaceID, req, &rep, browse_reply_op, flags, mStatus_NoError) != mStatus_NoError)
+    {
+        if (SameDomainName(&req->u.browser.regtype, (const domainname*)"\x09_services\x07_dns-sd\x04_udp"))
+        {
+            // Special support to enable the DNSServiceBrowse call made by Bonjour Browser
+            // Remove after Bonjour Browser is updated to use DNSServiceQueryRecord instead of DNSServiceBrowse
+            GenerateBonjourBrowserResponse(&answer->rdata->u.name, answer->InterfaceID, req, &rep, browse_reply_op, flags, mStatus_NoError);
+            goto bonjourbrowserhack;
+        }
+
+        LogMsg("%3d: FoundInstance: %##s PTR %##s received from network is not valid DNS-SD service pointer",
+               req->sd, answer->name->c, answer->rdata->u.name.c);
+        return;
+    }
+
+bonjourbrowserhack:
+
+    LogOperation("%3d: DNSServiceBrowse(%##s, %s) RESULT %s %d: %s",
+                 req->sd, question->qname.c, DNSTypeName(question->qtype), AddRecord ? "Add" : "Rmv",
+                 mDNSPlatformInterfaceIndexfromInterfaceID(m, answer->InterfaceID, mDNSfalse), RRDisplayString(m, answer));
+
+    append_reply(req, rep);
+}
+
+mDNSlocal mStatus add_domain_to_browser(request_state *info, const domainname *d)
+{
+    browser_t *b, *p;
+    mStatus err;
+
+    for (p = info->u.browser.browsers; p; p = p->next)
+    {
+        if (SameDomainName(&p->domain, d))
+        { debugf("add_domain_to_browser %##s already in list", d->c); return mStatus_AlreadyRegistered; }
+    }
+
+    b = mallocL("browser_t", sizeof(*b));
+    if (!b) return mStatus_NoMemoryErr;
+    AssignDomainName(&b->domain, d);
+    err = mDNS_StartBrowse(&mDNSStorage, &b->q, &info->u.browser.regtype, d, info->u.browser.AnonData, info->u.browser.interface_id, info->flags, 
+                            info->u.browser.ForceMCast, (info->flags & kDNSServiceFlagsBackgroundTrafficClass) != 0, FoundInstance, info);
+    if (err)
+    {
+        LogMsg("mDNS_StartBrowse returned %d for type %##s domain %##s", err, info->u.browser.regtype.c, d->c);
+        freeL("browser_t/add_domain_to_browser", b);
+    }
+    else
+    {
+        b->next = info->u.browser.browsers;
+        info->u.browser.browsers = b;
+        LogOperation("%3d: DNSServiceBrowse(%##s) START PID[%d](%s)", info->sd, b->q.qname.c, info->process_id, 
+                     info->pid_name);
+        LogMcastQ(&mDNSStorage, &b->q, info, q_start);
+        if (callExternalHelpers(info->u.browser.interface_id, &b->domain, info->flags))
+        {
+            domainname tmp;
+            ConstructServiceName(&tmp, NULL, &info->u.browser.regtype, &b->domain);
+            LogInfo("add_domain_to_browser: calling external_start_browsing_for_service()");
+            external_start_browsing_for_service(info->u.browser.interface_id, &tmp, kDNSType_PTR, info->flags);
+        }
+    }
+    return err;
+}
+
+mDNSlocal void browse_termination_callback(request_state *info)
+{
+    if (info->u.browser.default_domain)
+    {
+        // Stop the domain enumeration queries to discover the WAB legacy browse domains
+        LogInfo("%3d: DNSServiceBrowse Cancel WAB PID[%d](%s)", info->sd, info->process_id, info->pid_name);
+        uDNS_StopWABQueries(&mDNSStorage, UDNS_WAB_LBROWSE_QUERY);
+    }
+    if (info->u.browser.AnonData)
+        freeL("Anonymous", (void *)info->u.browser.AnonData);
+    while (info->u.browser.browsers)
+    {
+        browser_t *ptr = info->u.browser.browsers;
+
+        if (callExternalHelpers(info->u.browser.interface_id, &ptr->domain, info->flags))
+        {
+            domainname tmp;
+            ConstructServiceName(&tmp, NULL, &info->u.browser.regtype, &ptr->domain);
+            LogInfo("browse_termination_callback: calling external_stop_browsing_for_service()");
+            external_stop_browsing_for_service(info->u.browser.interface_id, &tmp, kDNSType_PTR, info->flags);
+        }
+
+        info->u.browser.browsers = ptr->next;
+        LogOperation("%3d: DNSServiceBrowse(%##s) STOP PID[%d](%s)", info->sd, ptr->q.qname.c, info->process_id, info->pid_name);
+        mDNS_StopBrowse(&mDNSStorage, &ptr->q);  // no need to error-check result
+        LogMcastQ(&mDNSStorage, &ptr->q, info, q_stop);         
+        freeL("browser_t/browse_termination_callback", ptr);
+    }
+}
+
+mDNSlocal void udsserver_automatic_browse_domain_changed(const DNameListElem *const d, const mDNSBool add)
+{
+    request_state *request;
+    debugf("udsserver_automatic_browse_domain_changed: %s default browse domain %##s", add ? "Adding" : "Removing", d->name.c);
+
+#if APPLE_OSX_mDNSResponder
+    machserver_automatic_browse_domain_changed(&d->name, add);
+#endif // APPLE_OSX_mDNSResponder
+
+    for (request = all_requests; request; request = request->next)
+    {
+        if (request->terminate != browse_termination_callback) continue;    // Not a browse operation
+        if (!request->u.browser.default_domain) continue;                   // Not an auto-browse operation
+        if (!d->uid || SystemUID(request->uid) || request->uid == d->uid)
+        {
+            browser_t **ptr = &request->u.browser.browsers;
+            while (*ptr && !SameDomainName(&(*ptr)->domain, &d->name)) ptr = &(*ptr)->next;
+            if (add)
+            {
+                // If we don't already have this domain in our list for this browse operation, add it now
+                if (!*ptr) add_domain_to_browser(request, &d->name);
+                else debugf("udsserver_automatic_browse_domain_changed %##s already in list, not re-adding", &d->name);
+            }
+            else
+            {
+                if (!*ptr) LogMsg("udsserver_automatic_browse_domain_changed ERROR %##s not found", &d->name);
+                else
+                {
+                    DNameListElem *p;
+                    for (p = AutoBrowseDomains; p; p=p->next)
+                        if (!p->uid || SystemUID(request->uid) || request->uid == p->uid)
+                            if (SameDomainName(&d->name, &p->name)) break;
+                    if (p) debugf("udsserver_automatic_browse_domain_changed %##s still in list, not removing", &d->name);
+                    else
+                    {
+                        browser_t *rem = *ptr;
+                        *ptr = (*ptr)->next;
+                        mDNS_StopQueryWithRemoves(&mDNSStorage, &rem->q);
+                        freeL("browser_t/udsserver_automatic_browse_domain_changed", rem);
+                    }
+                }
+            }
+        }
+    }
+}
+
+mDNSlocal void FreeARElemCallback(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+    (void)m;  // unused
+    if (result == mStatus_MemFree)
+    {
+        // On shutdown, mDNS_Close automatically deregisters all records
+        // Since in this case no one has called DeregisterLocalOnlyDomainEnumPTR to cut the record
+        // from the LocalDomainEnumRecords list, we do this here before we free the memory.
+        // (This should actually no longer be necessary, now that we do the proper cleanup in
+        // udsserver_exit. To confirm this, we'll log an error message if we do find a record that
+        // hasn't been cut from the list yet. If these messages don't appear, we can delete this code.)
+        ARListElem **ptr = &LocalDomainEnumRecords;
+        while (*ptr && &(*ptr)->ar != rr) ptr = &(*ptr)->next;
+        if (*ptr) { *ptr = (*ptr)->next; LogMsg("FreeARElemCallback: Have to cut %s", ARDisplayString(m, rr)); }
+        mDNSPlatformMemFree(rr->RecordContext);
+    }
+}
+
+// RegisterLocalOnlyDomainEnumPTR and DeregisterLocalOnlyDomainEnumPTR largely duplicate code in
+// "FoundDomain" in uDNS.c for creating and destroying these special mDNSInterface_LocalOnly records.
+// We may want to turn the common code into a subroutine.
+
+mDNSlocal void RegisterLocalOnlyDomainEnumPTR(mDNS *m, const domainname *d, int type)
+{
+    // allocate/register legacy and non-legacy _browse PTR record
+    mStatus err;
+    ARListElem *ptr = mDNSPlatformMemAllocate(sizeof(*ptr));
+
+    debugf("Incrementing %s refcount for %##s",
+           (type == mDNS_DomainTypeBrowse         ) ? "browse domain   " :
+           (type == mDNS_DomainTypeRegistration   ) ? "registration dom" :
+           (type == mDNS_DomainTypeBrowseAutomatic) ? "automatic browse" : "?", d->c);
+
+    mDNS_SetupResourceRecord(&ptr->ar, mDNSNULL, mDNSInterface_LocalOnly, kDNSType_PTR, 7200, kDNSRecordTypeShared, AuthRecordLocalOnly, FreeARElemCallback, ptr);
+    MakeDomainNameFromDNSNameString(&ptr->ar.namestorage, mDNS_DomainTypeNames[type]);
+    AppendDNSNameString            (&ptr->ar.namestorage, "local");
+    AssignDomainName(&ptr->ar.resrec.rdata->u.name, d);
+    err = mDNS_Register(m, &ptr->ar);
+    if (err)
+    {
+        LogMsg("SetSCPrefsBrowseDomain: mDNS_Register returned error %d", err);
+        mDNSPlatformMemFree(ptr);
+    }
+    else
+    {
+        ptr->next = LocalDomainEnumRecords;
+        LocalDomainEnumRecords = ptr;
+    }
+}
+
+mDNSlocal void DeregisterLocalOnlyDomainEnumPTR(mDNS *m, const domainname *d, int type)
+{
+    ARListElem **ptr = &LocalDomainEnumRecords;
+    domainname lhs; // left-hand side of PTR, for comparison
+
+    debugf("Decrementing %s refcount for %##s",
+           (type == mDNS_DomainTypeBrowse         ) ? "browse domain   " :
+           (type == mDNS_DomainTypeRegistration   ) ? "registration dom" :
+           (type == mDNS_DomainTypeBrowseAutomatic) ? "automatic browse" : "?", d->c);
+
+    MakeDomainNameFromDNSNameString(&lhs, mDNS_DomainTypeNames[type]);
+    AppendDNSNameString            (&lhs, "local");
+
+    while (*ptr)
+    {
+        if (SameDomainName(&(*ptr)->ar.resrec.rdata->u.name, d) && SameDomainName((*ptr)->ar.resrec.name, &lhs))
+        {
+            ARListElem *rem = *ptr;
+            *ptr = (*ptr)->next;
+            mDNS_Deregister(m, &rem->ar);
+            return;
+        }
+        else ptr = &(*ptr)->next;
+    }
+}
+
+mDNSlocal void AddAutoBrowseDomain(const mDNSu32 uid, const domainname *const name)
+{
+    DNameListElem *new = mDNSPlatformMemAllocate(sizeof(DNameListElem));
+    if (!new) { LogMsg("ERROR: malloc"); return; }
+    AssignDomainName(&new->name, name);
+    new->uid = uid;
+    new->next = AutoBrowseDomains;
+    AutoBrowseDomains = new;
+    udsserver_automatic_browse_domain_changed(new, mDNStrue);
+}
+
+mDNSlocal void RmvAutoBrowseDomain(const mDNSu32 uid, const domainname *const name)
+{
+    DNameListElem **p = &AutoBrowseDomains;
+    while (*p && (!SameDomainName(&(*p)->name, name) || (*p)->uid != uid)) p = &(*p)->next;
+    if (!*p) LogMsg("RmvAutoBrowseDomain: Got remove event for domain %##s not in list", name->c);
+    else
+    {
+        DNameListElem *ptr = *p;
+        *p = ptr->next;
+        udsserver_automatic_browse_domain_changed(ptr, mDNSfalse);
+        mDNSPlatformMemFree(ptr);
+    }
+}
+
+mDNSlocal void SetPrefsBrowseDomains(mDNS *m, DNameListElem *browseDomains, mDNSBool add)
+{
+    DNameListElem *d;
+    for (d = browseDomains; d; d = d->next)
+    {
+        if (add)
+        {
+            RegisterLocalOnlyDomainEnumPTR(m, &d->name, mDNS_DomainTypeBrowse);
+            AddAutoBrowseDomain(d->uid, &d->name);
+        }
+        else
+        {
+            DeregisterLocalOnlyDomainEnumPTR(m, &d->name, mDNS_DomainTypeBrowse);
+            RmvAutoBrowseDomain(d->uid, &d->name);
+        }
+    }
+}
+
+#if APPLE_OSX_mDNSResponder
+
+mDNSlocal void UpdateDeviceInfoRecord(mDNS *const m)
+{
+    int num_autoname = 0;
+    request_state *req;
+    for (req = all_requests; req; req = req->next)
+        if (req->terminate == regservice_termination_callback && req->u.servicereg.autoname)
+            num_autoname++;
+
+    // If DeviceInfo record is currently registered, see if we need to deregister it
+    if (m->DeviceInfo.resrec.RecordType != kDNSRecordTypeUnregistered)
+        if (num_autoname == 0 || !SameDomainLabelCS(m->DeviceInfo.resrec.name->c, m->nicelabel.c))
+        {
+            LogOperation("UpdateDeviceInfoRecord Deregister %##s", m->DeviceInfo.resrec.name);
+            mDNS_Deregister(m, &m->DeviceInfo);
+        }
+
+    // If DeviceInfo record is not currently registered, see if we need to register it
+    if (m->DeviceInfo.resrec.RecordType == kDNSRecordTypeUnregistered)
+        if (num_autoname > 0)
+        {
+            mDNS_SetupResourceRecord(&m->DeviceInfo, mDNSNULL, mDNSNULL, kDNSType_TXT, kStandardTTL, kDNSRecordTypeAdvisory, AuthRecordAny, mDNSNULL, mDNSNULL);
+            ConstructServiceName(&m->DeviceInfo.namestorage, &m->nicelabel, &DeviceInfoName, &localdomain);
+            m->DeviceInfo.resrec.rdlength = initializeDeviceInfoTXT(m, m->DeviceInfo.resrec.rdata->u.data);
+            LogOperation("UpdateDeviceInfoRecord   Register %##s", m->DeviceInfo.resrec.name);
+            mDNS_Register(m, &m->DeviceInfo);
+        }
+}
+#else   // APPLE_OSX_mDNSResponder
+mDNSlocal void UpdateDeviceInfoRecord(mDNS *const m)
+{
+    (void)m; // unused
+}
+#endif  // APPLE_OSX_mDNSResponder
+
+mDNSexport void udsserver_handle_configchange(mDNS *const m)
+{
+    request_state *req;
+    service_instance *ptr;
+    DNameListElem *RegDomains = NULL;
+    DNameListElem *BrowseDomains = NULL;
+    DNameListElem *p;
+
+    UpdateDeviceInfoRecord(m);
+
+    // For autoname services, see if the default service name has changed, necessitating an automatic update
+    for (req = all_requests; req; req = req->next)
+        if (req->terminate == regservice_termination_callback)
+            if (req->u.servicereg.autoname && !SameDomainLabelCS(req->u.servicereg.name.c, m->nicelabel.c))
+            {
+                req->u.servicereg.name = m->nicelabel;
+                for (ptr = req->u.servicereg.instances; ptr; ptr = ptr->next)
+                {
+                    ptr->renameonmemfree = 1;
+                    if (ptr->clientnotified) SendServiceRemovalNotification(&ptr->srs);
+                    LogInfo("udsserver_handle_configchange: Calling deregister for Service %##s", ptr->srs.RR_PTR.resrec.name->c);
+                    if (mDNS_DeregisterService_drt(m, &ptr->srs, mDNS_Dereg_rapid))
+                        regservice_callback(m, &ptr->srs, mStatus_MemFree); // If service deregistered already, we can re-register immediately
+                }
+            }
+
+    // Let the platform layer get the current DNS information
+    mDNS_Lock(m);
+    mDNSPlatformSetDNSConfig(m, mDNSfalse, mDNSfalse, mDNSNULL, &RegDomains, &BrowseDomains, mDNSfalse);
+    mDNS_Unlock(m);
+
+    // Any automatic registration domains are also implicitly automatic browsing domains
+    if (RegDomains) SetPrefsBrowseDomains(m, RegDomains, mDNStrue);                             // Add the new list first
+    if (AutoRegistrationDomains) SetPrefsBrowseDomains(m, AutoRegistrationDomains, mDNSfalse);  // Then clear the old list
+
+    // Add any new domains not already in our AutoRegistrationDomains list
+    for (p=RegDomains; p; p=p->next)
+    {
+        DNameListElem **pp = &AutoRegistrationDomains;
+        while (*pp && ((*pp)->uid != p->uid || !SameDomainName(&(*pp)->name, &p->name))) pp = &(*pp)->next;
+        if (!*pp)       // If not found in our existing list, this is a new default registration domain
+        {
+            RegisterLocalOnlyDomainEnumPTR(m, &p->name, mDNS_DomainTypeRegistration);
+            udsserver_default_reg_domain_changed(p, mDNStrue);
+        }
+        else            // else found same domainname in both old and new lists, so no change, just delete old copy
+        {
+            DNameListElem *del = *pp;
+            *pp = (*pp)->next;
+            mDNSPlatformMemFree(del);
+        }
+    }
+
+    // Delete any domains in our old AutoRegistrationDomains list that are now gone
+    while (AutoRegistrationDomains)
+    {
+        DNameListElem *del = AutoRegistrationDomains;
+        AutoRegistrationDomains = AutoRegistrationDomains->next;        // Cut record from list FIRST,
+        DeregisterLocalOnlyDomainEnumPTR(m, &del->name, mDNS_DomainTypeRegistration);
+        udsserver_default_reg_domain_changed(del, mDNSfalse);           // before calling udsserver_default_reg_domain_changed()
+        mDNSPlatformMemFree(del);
+    }
+
+    // Now we have our new updated automatic registration domain list
+    AutoRegistrationDomains = RegDomains;
+
+    // Add new browse domains to internal list
+    if (BrowseDomains) SetPrefsBrowseDomains(m, BrowseDomains, mDNStrue);
+
+    // Remove old browse domains from internal list
+    if (SCPrefBrowseDomains)
+    {
+        SetPrefsBrowseDomains(m, SCPrefBrowseDomains, mDNSfalse);
+        while (SCPrefBrowseDomains)
+        {
+            DNameListElem *fptr = SCPrefBrowseDomains;
+            SCPrefBrowseDomains = SCPrefBrowseDomains->next;
+            mDNSPlatformMemFree(fptr);
+        }
+    }
+
+    // Replace the old browse domains array with the new array
+    SCPrefBrowseDomains = BrowseDomains;
+}
+
+mDNSlocal void AutomaticBrowseDomainChange(mDNS *const m, DNSQuestion *q, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    (void)m; // unused;
+    (void)q; // unused
+
+    LogOperation("AutomaticBrowseDomainChange: %s automatic browse domain %##s",
+                 AddRecord ? "Adding" : "Removing", answer->rdata->u.name.c);
+
+    if (AddRecord) AddAutoBrowseDomain(0, &answer->rdata->u.name);
+    else RmvAutoBrowseDomain(0, &answer->rdata->u.name);
+}
+
+mDNSlocal mStatus handle_browse_request(request_state *request)
+{
+    char regtype[MAX_ESCAPED_DOMAIN_NAME], domain[MAX_ESCAPED_DOMAIN_NAME];
+    domainname typedn, d, temp;
+    mDNSs32 NumSubTypes;
+    char *AnonData = mDNSNULL;
+    mStatus err = mStatus_NoError;
+    int AnonDataLen;
+
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (interfaceIndex && !InterfaceID) return(mStatus_BadParamErr);
+
+    if (get_string(&request->msgptr, request->msgend, regtype, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        get_string(&request->msgptr, request->msgend, domain, MAX_ESCAPED_DOMAIN_NAME) < 0) return(mStatus_BadParamErr);
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceBrowse(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    request->flags = flags;
+    typedn.c[0] = 0;
+    NumSubTypes = ChopSubTypes(regtype, &AnonData);    // Note: Modifies regtype string to remove trailing subtypes
+    if (NumSubTypes < 0 || NumSubTypes > 1)
+        return(mStatus_BadParamErr);
+    AnonDataLen = 0;
+    if (AnonData)
+    {
+        AnonDataLen = strlen(AnonData);
+        if (AnonDataLen > MAX_ANONYMOUS_DATA)
+        {
+            LogMsg("handle_browse_request: AnonDataLen %d", AnonDataLen);
+            return(mStatus_BadParamErr);
+        }
+        // Account for the null byte
+        AnonDataLen += 1;
+    }
+    if (NumSubTypes == 1)
+    {
+        if (!AppendDNSNameString(&typedn, regtype + strlen(regtype) + 1 + AnonDataLen))
+            return(mStatus_BadParamErr);
+    }
+
+    if (!regtype[0] || !AppendDNSNameString(&typedn, regtype)) return(mStatus_BadParamErr);
+
+    if (!MakeDomainNameFromDNSNameString(&temp, regtype)) return(mStatus_BadParamErr);
+    // For over-long service types, we only allow domain "local"
+    if (temp.c[0] > 15 && domain[0] == 0) mDNSPlatformStrCopy(domain, "local.");
+
+    // Set up browser info
+    request->u.browser.ForceMCast = (flags & kDNSServiceFlagsForceMulticast) != 0;
+    request->u.browser.interface_id = InterfaceID;
+    AssignDomainName(&request->u.browser.regtype, &typedn);
+    request->u.browser.default_domain = !domain[0];
+    request->u.browser.browsers = NULL;
+
+    LogOperation("%3d: DNSServiceBrowse(%X, %d, \"%##s\", \"%s\") START PID[%d](%s)", 
+    request->sd, request->flags, interfaceIndex, request->u.browser.regtype.c, domain, request->process_id, request->pid_name);
+
+    if (request->u.browser.default_domain)
+    {
+        // Start the domain enumeration queries to discover the WAB browse domains
+        LogInfo("%3d: DNSServiceBrowse Start WAB PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+        uDNS_StartWABQueries(&mDNSStorage, UDNS_WAB_LBROWSE_QUERY);
+    }
+    request->u.browser.AnonData = mDNSNULL;
+    if (AnonData)
+    {
+        int len = strlen(AnonData) + 1;
+        request->u.browser.AnonData = mallocL("Anonymous", len);
+        if (!request->u.browser.AnonData)
+            return mStatus_NoMemoryErr;
+        else
+            mDNSPlatformMemCopy((void *)request->u.browser.AnonData, AnonData, len);
+    }
+    // We need to unconditionally set request->terminate, because even if we didn't successfully
+    // start any browses right now, subsequent configuration changes may cause successful
+    // browses to be added, and we'll need to cancel them before freeing this memory.
+    request->terminate = browse_termination_callback;
+
+    if (domain[0])
+    {
+        if (!MakeDomainNameFromDNSNameString(&d, domain)) return(mStatus_BadParamErr);
+        err = add_domain_to_browser(request, &d);
+    }
+    else
+    {
+        DNameListElem *sdom;
+        for (sdom = AutoBrowseDomains; sdom; sdom = sdom->next)
+            if (!sdom->uid || SystemUID(request->uid) || request->uid == sdom->uid)
+            {
+                err = add_domain_to_browser(request, &sdom->name);
+                if (err)
+                {
+                    if (SameDomainName(&sdom->name, &localdomain)) break;
+                    else err = mStatus_NoError;  // suppress errors for non-local "default" domains
+                }
+            }
+    }
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceResolve
+#endif
+
+mDNSlocal void resolve_result_callback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    size_t len = 0;
+    char fullname[MAX_ESCAPED_DOMAIN_NAME], target[MAX_ESCAPED_DOMAIN_NAME];
+    char *data;
+    reply_state *rep;
+    request_state *req = question->QuestionContext;
+    (void)m; // Unused
+
+    LogOperation("%3d: DNSServiceResolve(%##s) %s %s", req->sd, question->qname.c, AddRecord ? "ADD" : "RMV", RRDisplayString(m, answer));
+
+    if (!AddRecord)
+    {
+        if (req->u.resolve.srv == answer) req->u.resolve.srv = mDNSNULL;
+        if (req->u.resolve.txt == answer) req->u.resolve.txt = mDNSNULL;
+        return;
+    }
+
+    if (answer->rrtype == kDNSType_SRV) req->u.resolve.srv = answer;
+    if (answer->rrtype == kDNSType_TXT) req->u.resolve.txt = answer;
+
+    if (!req->u.resolve.txt || !req->u.resolve.srv) return;     // only deliver result to client if we have both answers
+
+    ConvertDomainNameToCString(answer->name, fullname);
+    ConvertDomainNameToCString(&req->u.resolve.srv->rdata->u.srv.target, target);
+
+    // calculate reply length
+    len += sizeof(DNSServiceFlags);
+    len += sizeof(mDNSu32);  // interface index
+    len += sizeof(DNSServiceErrorType);
+    len += strlen(fullname) + 1;
+    len += strlen(target) + 1;
+    len += 2 * sizeof(mDNSu16);  // port, txtLen
+    len += req->u.resolve.txt->rdlength;
+
+    // allocate/init reply header
+    rep = create_reply(resolve_reply_op, len, req);
+    rep->rhdr->flags = dnssd_htonl(0);
+    rep->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(m, answer->InterfaceID, mDNSfalse));
+    rep->rhdr->error = dnssd_htonl(kDNSServiceErr_NoError);
+
+    data = (char *)&rep->rhdr[1];
+
+    // write reply data to message
+    put_string(fullname, &data);
+    put_string(target, &data);
+    *data++ =  req->u.resolve.srv->rdata->u.srv.port.b[0];
+    *data++ =  req->u.resolve.srv->rdata->u.srv.port.b[1];
+    put_uint16(req->u.resolve.txt->rdlength, &data);
+    put_rdata (req->u.resolve.txt->rdlength, req->u.resolve.txt->rdata->u.data, &data);
+
+    LogOperation("%3d: DNSServiceResolve(%s) RESULT   %s:%d", req->sd, fullname, target, mDNSVal16(req->u.resolve.srv->rdata->u.srv.port));
+    append_reply(req, rep);
+}
+
+mDNSlocal void resolve_termination_callback(request_state *request)
+{
+    LogOperation("%3d: DNSServiceResolve(%##s) STOP PID[%d](%s)", request->sd, request->u.resolve.qtxt.qname.c, request->process_id, request->pid_name);
+    mDNS_StopQuery(&mDNSStorage, &request->u.resolve.qtxt);
+    mDNS_StopQuery(&mDNSStorage, &request->u.resolve.qsrv);
+    LogMcastQ(&mDNSStorage, &request->u.resolve.qsrv, request, q_stop);
+    if (request->u.resolve.external_advertise) 
+        external_stop_resolving_service(request->u.resolve.qsrv.InterfaceID, &request->u.resolve.qsrv.qname, request->flags);
+}
+
+mDNSlocal mStatus handle_resolve_request(request_state *request)
+{
+    char name[256], regtype[MAX_ESCAPED_DOMAIN_NAME], domain[MAX_ESCAPED_DOMAIN_NAME];
+    domainname fqdn;
+    mStatus err;
+
+    // extract the data from the message
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID;
+
+    // Map kDNSServiceInterfaceIndexP2P to kDNSServiceInterfaceIndexAny with the kDNSServiceFlagsIncludeP2P
+    // flag set so that the resolve will run over P2P interfaces that are not yet created.
+    if (interfaceIndex == kDNSServiceInterfaceIndexP2P)
+    {
+        LogOperation("handle_resolve_request: mapping kDNSServiceInterfaceIndexP2P to kDNSServiceInterfaceIndexAny + kDNSServiceFlagsIncludeP2P");
+        flags |= kDNSServiceFlagsIncludeP2P;
+        interfaceIndex = kDNSServiceInterfaceIndexAny;
+    }
+
+    InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (interfaceIndex && !InterfaceID)
+    { LogMsg("ERROR: handle_resolve_request bad interfaceIndex %d", interfaceIndex); return(mStatus_BadParamErr); }
+
+    if (get_string(&request->msgptr, request->msgend, name, 256) < 0 ||
+        get_string(&request->msgptr, request->msgend, regtype, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        get_string(&request->msgptr, request->msgend, domain, MAX_ESCAPED_DOMAIN_NAME) < 0)
+    { LogMsg("ERROR: handle_resolve_request - Couldn't read name/regtype/domain"); return(mStatus_BadParamErr); }
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceResolve(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    if (build_domainname_from_strings(&fqdn, name, regtype, domain) < 0)
+    { LogMsg("ERROR: handle_resolve_request bad “%s” “%s” “%s”", name, regtype, domain); return(mStatus_BadParamErr); }
+
+    mDNSPlatformMemZero(&request->u.resolve, sizeof(request->u.resolve));
+
+    request->flags = flags;
+
+    // format questions
+    request->u.resolve.qsrv.InterfaceID      = InterfaceID;
+    request->u.resolve.qsrv.flags            = flags;
+    request->u.resolve.qsrv.Target           = zeroAddr;
+    AssignDomainName(&request->u.resolve.qsrv.qname, &fqdn);
+    request->u.resolve.qsrv.qtype            = kDNSType_SRV;
+    request->u.resolve.qsrv.qclass           = kDNSClass_IN;
+    request->u.resolve.qsrv.LongLived        = (flags & kDNSServiceFlagsLongLivedQuery     ) != 0;
+    request->u.resolve.qsrv.ExpectUnique     = mDNStrue;
+    request->u.resolve.qsrv.ForceMCast       = (flags & kDNSServiceFlagsForceMulticast     ) != 0;
+    request->u.resolve.qsrv.ReturnIntermed   = (flags & kDNSServiceFlagsReturnIntermediates) != 0;
+    request->u.resolve.qsrv.SuppressUnusable = mDNSfalse;
+    request->u.resolve.qsrv.SearchListIndex  = 0;
+    request->u.resolve.qsrv.AppendSearchDomains = 0;
+    request->u.resolve.qsrv.RetryWithSearchDomains = mDNSfalse;
+    request->u.resolve.qsrv.TimeoutQuestion  = 0;
+    request->u.resolve.qsrv.WakeOnResolve    = (flags & kDNSServiceFlagsWakeOnResolve) != 0;
+    request->u.resolve.qsrv.UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    request->u.resolve.qsrv.ValidationRequired = 0;
+    request->u.resolve.qsrv.ValidatingResponse = 0;
+    request->u.resolve.qsrv.ProxyQuestion    = 0;
+    request->u.resolve.qsrv.qnameOrig        = mDNSNULL;
+    request->u.resolve.qsrv.AnonInfo         = mDNSNULL;
+    request->u.resolve.qsrv.pid              = request->process_id;
+    request->u.resolve.qsrv.QuestionCallback = resolve_result_callback;
+    request->u.resolve.qsrv.QuestionContext  = request;
+
+    request->u.resolve.qtxt.InterfaceID      = InterfaceID;
+    request->u.resolve.qtxt.flags            = flags;
+    request->u.resolve.qtxt.Target           = zeroAddr;
+    AssignDomainName(&request->u.resolve.qtxt.qname, &fqdn);
+    request->u.resolve.qtxt.qtype            = kDNSType_TXT;
+    request->u.resolve.qtxt.qclass           = kDNSClass_IN;
+    request->u.resolve.qtxt.LongLived        = (flags & kDNSServiceFlagsLongLivedQuery     ) != 0;
+    request->u.resolve.qtxt.ExpectUnique     = mDNStrue;
+    request->u.resolve.qtxt.ForceMCast       = (flags & kDNSServiceFlagsForceMulticast     ) != 0;
+    request->u.resolve.qtxt.ReturnIntermed   = (flags & kDNSServiceFlagsReturnIntermediates) != 0;
+    request->u.resolve.qtxt.SuppressUnusable = mDNSfalse;
+    request->u.resolve.qtxt.SearchListIndex  = 0;
+    request->u.resolve.qtxt.AppendSearchDomains = 0;
+    request->u.resolve.qtxt.RetryWithSearchDomains = mDNSfalse;
+    request->u.resolve.qtxt.TimeoutQuestion  = 0;
+    request->u.resolve.qtxt.WakeOnResolve    = 0;
+    request->u.resolve.qtxt.UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    request->u.resolve.qtxt.ValidationRequired = 0;
+    request->u.resolve.qtxt.ValidatingResponse = 0;
+    request->u.resolve.qtxt.ProxyQuestion    = 0;
+    request->u.resolve.qtxt.qnameOrig        = mDNSNULL;
+    request->u.resolve.qtxt.AnonInfo         = mDNSNULL;
+    request->u.resolve.qtxt.pid              = request->process_id;
+    request->u.resolve.qtxt.QuestionCallback = resolve_result_callback;
+    request->u.resolve.qtxt.QuestionContext  = request;
+
+    request->u.resolve.ReportTime            = NonZeroTime(mDNS_TimeNow(&mDNSStorage) + 130 * mDNSPlatformOneSecond);
+
+    request->u.resolve.external_advertise    = mDNSfalse;
+
+#if 0
+    if (!AuthorizedDomain(request, &fqdn, AutoBrowseDomains)) return(mStatus_NoError);
+#endif
+
+    // ask the questions
+    LogOperation("%3d: DNSServiceResolve(%X %d %##s) START PID[%d](%s)", request->sd, flags, interfaceIndex, 
+    	         request->u.resolve.qsrv.qname.c, request->process_id, request->pid_name);
+    err = mDNS_StartQuery(&mDNSStorage, &request->u.resolve.qsrv);
+    
+    if (!err)
+    {
+        err = mDNS_StartQuery(&mDNSStorage, &request->u.resolve.qtxt);
+        if (err)
+        { 
+            mDNS_StopQuery(&mDNSStorage, &request->u.resolve.qsrv);
+        }
+        else
+        {
+            request->terminate = resolve_termination_callback;
+            LogMcastQ(&mDNSStorage, &request->u.resolve.qsrv, request, q_start);
+            if (callExternalHelpers(InterfaceID, &fqdn, flags))
+            {
+                request->u.resolve.external_advertise    = mDNStrue;
+                LogInfo("handle_resolve_request: calling external_start_resolving_service()");
+                external_start_resolving_service(InterfaceID, &fqdn, flags);
+            }
+        }
+    }
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceQueryRecord
+#endif
+
+// mDNS operation functions. Each operation has 3 associated functions - a request handler that parses
+// the client's request and makes the appropriate mDNSCore call, a result handler (passed as a callback
+// to the mDNSCore routine) that sends results back to the client, and a termination routine that aborts
+// the mDNSCore operation if the client dies or closes its socket.
+
+// Returns -1 to tell the caller that it should not try to reissue the query anymore
+// Returns 1 on successfully appending a search domain and the caller should reissue the new query
+// Returns 0 when there are no more search domains and the caller should reissue the query
+mDNSlocal int AppendNewSearchDomain(mDNS *const m, DNSQuestion *question)
+{
+    domainname *sd;
+    mStatus err;
+
+    // Sanity check: The caller already checks this. We use -1 to indicate that we have searched all
+    // the domains and should try the single label query directly on the wire.
+    if (question->SearchListIndex == -1)
+    {
+        LogMsg("AppendNewSearchDomain: question %##s (%s) SearchListIndex is -1", question->qname.c, DNSTypeName(question->qtype));
+        return -1;
+    }
+
+    if (!question->AppendSearchDomains)
+    {
+        LogMsg("AppendNewSearchDomain: question %##s (%s) AppendSearchDoamins is 0", question->qname.c, DNSTypeName(question->qtype));
+        return -1;
+    }
+
+    // Save the original name, before we modify them below.
+    if (!question->qnameOrig)
+    {
+        question->qnameOrig =  mallocL("AppendNewSearchDomain", sizeof(domainname));
+        if (!question->qnameOrig) { LogMsg("AppendNewSearchDomain: ERROR!!  malloc failure"); return -1; }
+        question->qnameOrig->c[0] = 0;
+        AssignDomainName(question->qnameOrig, &question->qname);
+        LogInfo("AppendSearchDomain: qnameOrig %##s", question->qnameOrig->c);
+    }
+
+    sd = uDNS_GetNextSearchDomain(m, question->InterfaceID, &question->SearchListIndex, !question->AppendLocalSearchDomains);
+    // We use -1 to indicate that we have searched all the domains and should try the single label
+    // query directly on the wire. uDNS_GetNextSearchDomain should never return a negative value
+    if (question->SearchListIndex == -1)
+    {
+        LogMsg("AppendNewSearchDomain: ERROR!! uDNS_GetNextSearchDomain returned -1");
+        return -1;
+    }
+
+    // Not a common case. Perhaps, we should try the next search domain if it exceeds ?
+    if (sd && (DomainNameLength(question->qnameOrig) + DomainNameLength(sd)) > MAX_DOMAIN_NAME)
+    {
+        LogMsg("AppendNewSearchDomain: ERROR!! exceeding max domain length for %##s (%s) SearchDomain %##s length %d, Question name length %d", question->qnameOrig->c, DNSTypeName(question->qtype), sd->c, DomainNameLength(question->qnameOrig), DomainNameLength(sd));
+        return -1;
+    }
+
+    // if there are no more search domains and we have already tried this question
+    // without appending search domains, then we are done.
+    if (!sd && !ApplySearchDomainsFirst(question))
+    {
+        LogInfo("AppnedNewSearchDomain: No more search domains for question with name %##s (%s), not trying anymore", question->qname.c, DNSTypeName(question->qtype));
+        return -1;
+    }
+
+    // Stop the question before changing the name as negative cache entries could be pointing at this question.
+    // Even if we don't change the question in the case of returning 0, the caller is going to restart the
+    // question.
+    err = mDNS_StopQuery(&mDNSStorage, question);
+    if (err) { LogMsg("AppendNewSearchDomain: ERROR!! %##s %s mDNS_StopQuery: %d, while retrying with search domains", question->qname.c, DNSTypeName(question->qtype), (int)err); }
+
+    AssignDomainName(&question->qname, question->qnameOrig);
+    if (sd)
+    {
+        AppendDomainName(&question->qname, sd);
+        LogInfo("AppnedNewSearchDomain: Returning question with name %##s, SearchListIndex %d", question->qname.c, question->SearchListIndex);
+        return 1;
+    }
+
+    // Try the question as single label
+    LogInfo("AppnedNewSearchDomain: No more search domains for question with name %##s (%s), trying one last time", question->qname.c, DNSTypeName(question->qtype));
+    return 0;
+}
+
+#if APPLE_OSX_mDNSResponder
+
+mDNSlocal mDNSBool DomainInSearchList(const domainname *domain, mDNSBool excludeLocal)
+{
+    const SearchListElem *s;
+    int qcount, scount;
+
+    qcount = CountLabels(domain);
+    for (s=SearchList; s; s=s->next)
+    {
+        if (excludeLocal && SameDomainName(&s->domain, &localdomain))
+            continue;
+        scount = CountLabels(&s->domain);
+        if (qcount >= scount)
+        {
+            // Note: When qcount == scount, we do a complete match of the domain
+            // which is expected by the callers.
+            const domainname *d = SkipLeadingLabels(domain, (qcount - scount));
+            if (SameDomainName(&s->domain, d))
+            {
+                return mDNStrue;
+            }
+        }
+    }
+    return mDNSfalse;
+}
+
+// The caller already checks that this is a dotlocal question.
+mDNSlocal mDNSBool ShouldDeliverNegativeResponse(mDNS *const m, DNSQuestion *question)
+{
+    mDNSu16 qtype;
+
+    // If the question matches the search domain exactly or the search domain is a
+    // subdomain of the question, it is most likely a valid unicast domain and hence
+    // don't suppress negative responses.
+    //
+    // If the user has configured ".local" as a search domain, we don't want
+    // to deliver a negative response for names ending in ".local" as that would
+    // prevent bonjour discovery. Passing mDNStrue for the last argument excludes
+    // ".local" search domains.
+    if (DomainInSearchList(&question->qname, mDNStrue))
+    {
+        LogOperation("ShouldDeliverNegativeResponse: Question %##s (%s) in SearchList", question->qname.c, DNSTypeName(question->qtype));
+        return mDNStrue;
+    }
+
+    // Deliver negative response for A/AAAA if there was a positive response for AAAA/A respectively.
+    if (question->qtype != kDNSType_A && question->qtype != kDNSType_AAAA)
+    {
+        LogOperation("ShouldDeliverNegativeResponse: Question %##s (%s) not answering local question with negative unicast response",
+            question->qname.c, DNSTypeName(question->qtype));
+        return mDNSfalse;
+    }
+    qtype = (question->qtype == kDNSType_A ? kDNSType_AAAA : kDNSType_A);
+    if (!mDNS_CheckForCacheRecord(m, question, qtype))
+    {
+        LogOperation("ShouldDeliverNegativeResponse:Question %##s (%s) not answering local question with negative unicast response"
+            " (can't find positive record)", question->qname.c, DNSTypeName(question->qtype));
+        return mDNSfalse;
+    }
+    LogOperation("ShouldDeliverNegativeResponse:Question %##s (%s) answering local with negative unicast response (found positive record)",
+        question->qname.c, DNSTypeName(question->qtype));
+    return mDNStrue;
+}
+
+// Workaround for networks using Microsoft Active Directory using "local" as a private internal
+// top-level domain
+mDNSlocal mStatus SendAdditionalQuery(DNSQuestion *q, request_state *request, mStatus err)
+{
+#ifndef UNICAST_DISABLED
+    extern domainname ActiveDirectoryPrimaryDomain;
+    DNSQuestion **question2;
+    #define VALID_MSAD_SRV_TRANSPORT(T) (SameDomainLabel((T)->c, (const mDNSu8 *)"\x4_tcp") || SameDomainLabel((T)->c, (const mDNSu8 *)"\x4_udp"))
+    #define VALID_MSAD_SRV(Q) ((Q)->qtype == kDNSType_SRV && VALID_MSAD_SRV_TRANSPORT(SecondLabel(&(Q)->qname)))
+
+    question2 = mDNSNULL;
+    if (request->hdr.op == query_request)
+        question2 = &request->u.queryrecord.q2;
+    else if (request->hdr.op == addrinfo_request)
+    {
+        if (q->qtype == kDNSType_A)
+            question2 = &request->u.addrinfo.q42;
+        else if (q->qtype == kDNSType_AAAA)
+            question2 = &request->u.addrinfo.q62;
+    }
+    if (!question2)
+    {
+        LogMsg("SendAdditionalQuery: question2 NULL for %##s (%s)", q->qname.c, DNSTypeName(q->qtype));
+        return mStatus_BadParamErr;
+    }
+
+    // Sanity check: If we already sent an additonal query, we don't need to send one more.
+    //
+    // 1. When the application calls DNSServiceQueryRecord or DNSServiceGetAddrInfo with a .local name, this function
+    // is called to see whether a unicast query should be sent or not.
+    //
+    // 2. As a result of appending search domains, the question may be end up with a .local suffix even though it
+    // was not a .local name to start with. In that case, queryrecord_result_callback calls this function to
+    // send the additional query.
+    //
+    // Thus, it should not be called more than once.
+    if (*question2)
+    {
+        LogInfo("SendAdditionalQuery: question2 already sent for %##s (%s), no more q2", q->qname.c, DNSTypeName(q->qtype));
+        return err;
+    }
+
+    if (!q->ForceMCast && SameDomainLabel(LastLabel(&q->qname), (const mDNSu8 *)&localdomain))
+        if (q->qtype == kDNSType_A || q->qtype == kDNSType_AAAA || VALID_MSAD_SRV(q))
+        {
+            DNSQuestion *q2;
+            int labels = CountLabels(&q->qname);
+            q2 = mallocL("DNSQuestion", sizeof(DNSQuestion));
+            if (!q2) FatalError("ERROR: SendAdditionalQuery malloc");
+            *question2        = q2;
+            *q2               = *q;
+            q2->InterfaceID   = mDNSInterface_Unicast;
+            q2->ExpectUnique  = mDNStrue;
+            // Always set the QuestionContext to indicate that this question should be stopped
+            // before freeing. Don't rely on "q".
+            q2->QuestionContext = request;
+            // If the query starts as a single label e.g., somehost, and we have search domains with .local,
+            // queryrecord_result_callback calls this function when .local is appended to "somehost".
+            // At that time, the name in "q" is pointing at somehost.local and its qnameOrig pointing at
+            // "somehost". We need to copy that information so that when we retry with a different search
+            // domain e.g., mycompany.local, we get "somehost.mycompany.local".
+            if (q->qnameOrig)
+            {
+                (*question2)->qnameOrig =  mallocL("SendAdditionalQuery", DomainNameLength(q->qnameOrig));
+                if (!(*question2)->qnameOrig) { LogMsg("SendAdditionalQuery: ERROR!!  malloc failure"); return mStatus_NoMemoryErr; }
+                (*question2)->qnameOrig->c[0] = 0;
+                AssignDomainName((*question2)->qnameOrig, q->qnameOrig);
+                LogInfo("SendAdditionalQuery: qnameOrig %##s", (*question2)->qnameOrig->c);
+            }
+            // For names of the form "<one-or-more-labels>.bar.local." we always do a second unicast query in parallel.
+            // For names of the form "<one-label>.local." it's less clear whether we should do a unicast query.
+            // If the name being queried is exactly the same as the name in the DHCP "domain" option (e.g. the DHCP
+            // "domain" is my-small-company.local, and the user types "my-small-company.local" into their web browser)
+            // then that's a hint that it's worth doing a unicast query. Otherwise, we first check to see if the
+            // site's DNS server claims there's an SOA record for "local", and if so, that's also a hint that queries
+            // for names in the "local" domain will be safely answered privately before they hit the root name servers.
+            // Note that in the "my-small-company.local" example above there will typically be an SOA record for
+            // "my-small-company.local" but *not* for "local", which is why the "local SOA" check would fail in that case.
+            // We need to check against both ActiveDirectoryPrimaryDomain and SearchList. If it matches against either
+            // of those, we don't want do the SOA check for the local
+            if (labels == 2 && !SameDomainName(&q->qname, &ActiveDirectoryPrimaryDomain) && !DomainInSearchList(&q->qname, mDNSfalse))
+            {
+                AssignDomainName(&q2->qname, &localdomain);
+                q2->qtype          = kDNSType_SOA;
+                q2->LongLived      = mDNSfalse;
+                q2->ForceMCast     = mDNSfalse;
+                q2->ReturnIntermed = mDNStrue;
+                // Don't append search domains for the .local SOA query
+                q2->AppendSearchDomains = 0;
+                q2->AppendLocalSearchDomains = 0;
+                q2->RetryWithSearchDomains = mDNSfalse;
+                q2->SearchListIndex = 0;
+                q2->TimeoutQuestion = 0;
+                q2->AnonInfo        = mDNSNULL;
+                q2->pid             = request->process_id;
+            }
+            LogOperation("%3d: DNSServiceQueryRecord(%##s, %s) unicast", request->sd, q2->qname.c, DNSTypeName(q2->qtype));
+            err = mDNS_StartQuery(&mDNSStorage, q2);
+            if (err) LogMsg("%3d: ERROR: DNSServiceQueryRecord %##s %s mDNS_StartQuery: %d", request->sd, q2->qname.c, DNSTypeName(q2->qtype), (int)err);
+        }
+    return(err);
+#else // !UNICAST_DISABLED
+    (void) q;
+    (void) request;
+    (void) err;
+    
+    return mStatus_NoError;
+#endif // !UNICAST_DISABLED
+}
+#endif // APPLE_OSX_mDNSResponder
+
+// This function tries to append a search domain if valid and possible. If so, returns true.
+mDNSlocal mDNSBool RetryQuestionWithSearchDomains(mDNS *const m, DNSQuestion *question, request_state *req, QC_result AddRecord)
+{
+    int result;
+    // RetryWithSearchDomains tells the core to call us back so that we can retry with search domains if there is no
+    // answer in the cache or /etc/hosts. In the first call back from the core, we clear RetryWithSearchDomains so
+    // that we don't get called back repeatedly. If we got an answer from the cache or /etc/hosts, we don't touch
+    // RetryWithSearchDomains which may or may not be set.
+    //
+    // If we get e.g., NXDOMAIN and the query is neither suppressed nor exhausted the domain search list and
+    // is a valid question for appending search domains, retry by appending domains
+
+    if ((AddRecord != QC_suppressed) && question->SearchListIndex != -1 && question->AppendSearchDomains)
+    {
+        question->RetryWithSearchDomains = 0;
+        result = AppendNewSearchDomain(m, question);
+        // As long as the result is either zero or 1, we retry the question. If we exahaust the search
+        // domains (result is zero) we try the original query (as it was before appending the search
+        // domains) as such on the wire as a last resort if we have not tried them before. For queries
+        // with more than one label, we have already tried them before appending search domains and
+        // hence don't retry again
+        if (result != -1)
+        {
+            mStatus err;
+            err = mDNS_StartQuery(m, question);
+            if (!err)
+            {
+                LogOperation("%3d: RetryQuestionWithSearchDomains(%##s, %s), retrying after appending search domain", req->sd, question->qname.c, DNSTypeName(question->qtype));
+                // If the result was zero, it meant that there are no search domains and we just retried the question
+                // as a single label and we should not retry with search domains anymore.
+                if (!result) question->SearchListIndex = -1;
+                return mDNStrue;
+            }
+            else
+            {
+                LogMsg("%3d: ERROR: RetryQuestionWithSearchDomains %##s %s mDNS_StartQuery: %d, while retrying with search domains", req->sd, question->qname.c, DNSTypeName(question->qtype), (int)err);
+                // We have already stopped the query and could not restart. Reset the appropriate pointers
+                // so that we don't call stop again when the question terminates
+                question->QuestionContext = mDNSNULL;
+            }
+        }
+    }
+    else
+    {
+        LogInfo("%3d: RetryQuestionWithSearchDomains: Not appending search domains - SuppressQuery %d, SearchListIndex %d, AppendSearchDomains %d", req->sd, AddRecord, question->SearchListIndex, question->AppendSearchDomains);
+    }
+    return mDNSfalse;
+}
+
+mDNSlocal void queryrecord_result_reply(mDNS *const m, request_state *req, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord,
+    DNSServiceErrorType error)
+{
+    char name[MAX_ESCAPED_DOMAIN_NAME];
+    size_t len;
+    DNSServiceFlags flags = 0;
+    reply_state *rep;
+    char *data;
+
+    ConvertDomainNameToCString(answer->name, name);
+
+    LogOperation("%3d: %s(%##s, %s) %s %s", req->sd,
+                 req->hdr.op == query_request ? "DNSServiceQueryRecord" : "DNSServiceGetAddrInfo",
+                 question->qname.c, DNSTypeName(question->qtype), AddRecord ? "ADD" : "RMV", RRDisplayString(m, answer));
+
+    len = sizeof(DNSServiceFlags);  // calculate reply data length
+    len += sizeof(mDNSu32);     // interface index
+    len += sizeof(DNSServiceErrorType);
+    len += strlen(name) + 1;
+    len += 3 * sizeof(mDNSu16); // type, class, rdlen
+    len += answer->rdlength;
+    len += sizeof(mDNSu32);     // TTL
+
+    rep = create_reply(req->hdr.op == query_request ? query_reply_op : addrinfo_reply_op, len, req);
+
+    if (AddRecord)
+        flags |= kDNSServiceFlagsAdd;    
+    if (question->ValidationStatus != 0)
+    {
+        error =   kDNSServiceErr_NoError;
+        if (question->ValidationRequired && question->ValidationState == DNSSECValDone)
+        {
+            switch (question->ValidationStatus) //Set the dnssec flags to be passed on to the Apps here
+            {
+            case DNSSEC_Secure:
+                flags |= kDNSServiceFlagsSecure;
+                break;
+            case DNSSEC_Insecure:
+                flags |= kDNSServiceFlagsInsecure;
+                break;
+            case DNSSEC_Indeterminate:
+                flags |= kDNSServiceFlagsIndeterminate;
+                break;
+            case DNSSEC_Bogus:
+                flags |= kDNSServiceFlagsBogus;
+                break;
+            default:
+                LogMsg("queryrecord_result_reply unknown status %d for %##s", question->ValidationStatus, question->qname.c);
+            }
+        }
+    }
+    
+    rep->rhdr->flags = dnssd_htonl(flags);
+    // Call mDNSPlatformInterfaceIndexfromInterfaceID, but suppressNetworkChange (last argument). Otherwise, if the
+    // InterfaceID is not valid, then it simulates a "NetworkChanged" which in turn makes questions
+    // to be stopped and started including  *this* one. Normally the InterfaceID is valid. But when we
+    // are using the /etc/hosts entries to answer a question, the InterfaceID may not be known to the
+    // mDNS core . Eventually, we should remove the calls to "NetworkChanged" in
+    // mDNSPlatformInterfaceIndexfromInterfaceID when it can't find InterfaceID as ResourceRecords
+    // should not have existed to answer this question if the corresponding interface is not valid.
+    rep->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(m, answer->InterfaceID, mDNStrue));
+    rep->rhdr->error = dnssd_htonl(error);
+
+    data = (char *)&rep->rhdr[1];
+
+    put_string(name,             &data);
+    put_uint16(answer->rrtype,   &data);
+    put_uint16(answer->rrclass,  &data);
+    put_uint16(answer->rdlength, &data);
+    // We need to use putRData here instead of the crude put_rdata function, because the crude put_rdata
+    // function just does a blind memory copy without regard to structures that may have holes in them.
+    if (answer->rdlength)
+        if (!putRData(mDNSNULL, (mDNSu8 *)data, (mDNSu8 *)rep->rhdr + len, answer))
+            LogMsg("queryrecord_result_reply putRData failed %d", (mDNSu8 *)rep->rhdr + len - (mDNSu8 *)data);
+    data += answer->rdlength;
+    put_uint32(AddRecord ? answer->rroriginalttl : 0, &data);
+
+    append_reply(req, rep);
+    // Stop the question, if we just timed out
+    if (error == kDNSServiceErr_Timeout)
+    {
+        mDNS_StopQuery(m, question);
+        // Reset the pointers so that we don't call stop on termination
+        question->QuestionContext = mDNSNULL;
+    }
+    else if ((AddRecord == QC_add) && req->hdr.op == addrinfo_request)
+    {
+        // Note: We count all answers including LocalOnly e.g., /etc/hosts. If we
+        // exclude that, v4ans/v6ans will be zero and we would wrongly think that
+        // we did not answer questions and setup the status to deliver triggers.
+        if (question->qtype == kDNSType_A)
+            req->u.addrinfo.v4ans = 1;
+        if (question->qtype == kDNSType_AAAA)
+            req->u.addrinfo.v6ans = 1;
+    }
+    else if ((AddRecord == QC_add) && req->hdr.op == query_request)
+    {
+        if (question->qtype == kDNSType_A || question->qtype == kDNSType_AAAA)
+            req->u.queryrecord.ans = 1;
+    }
+
+#if APPLE_OSX_mDNSResponder
+#if !NO_WCF
+    CHECK_WCF_FUNCTION(WCFIsServerRunning)
+    {
+        struct xucred x;
+        socklen_t xucredlen = sizeof(x);
+
+        if (WCFIsServerRunning((WCFConnection *)m->WCF) && answer->rdlength != 0)
+        {
+            if (getsockopt(req->sd, 0, LOCAL_PEERCRED, &x, &xucredlen) >= 0 &&
+                (x.cr_version == XUCRED_VERSION))
+            {
+                struct sockaddr_storage addr;
+                const RDataBody2 *const rdb = (RDataBody2 *)answer->rdata->u.data;
+                addr.ss_len = 0;
+                if (answer->rrtype == kDNSType_A || answer->rrtype == kDNSType_AAAA)
+                {
+                    if (answer->rrtype == kDNSType_A)
+                    {
+                        struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
+                        sin->sin_port = 0;
+                        if (!putRData(mDNSNULL, (mDNSu8 *)&sin->sin_addr, (mDNSu8 *)(&sin->sin_addr + sizeof(rdb->ipv4)), answer))
+                            LogMsg("queryrecord_result_reply: WCF AF_INET putRData failed");
+                        else
+                        {
+                            addr.ss_len = sizeof (struct sockaddr_in);
+                            addr.ss_family = AF_INET;
+                        }
+                    }
+                    else if (answer->rrtype == kDNSType_AAAA)
+                    {
+                        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
+                        sin6->sin6_port = 0;
+                        if (!putRData(mDNSNULL, (mDNSu8 *)&sin6->sin6_addr, (mDNSu8 *)(&sin6->sin6_addr + sizeof(rdb->ipv6)), answer))
+                            LogMsg("queryrecord_result_reply: WCF AF_INET6 putRData failed");
+                        else
+                        {
+                            addr.ss_len = sizeof (struct sockaddr_in6);
+                            addr.ss_family = AF_INET6;
+                        }
+                    }
+                    if (addr.ss_len)
+                    {
+                        debugf("queryrecord_result_reply: Name %s, uid %u, addr length %d", name, x.cr_uid, addr.ss_len);
+                        CHECK_WCF_FUNCTION((WCFConnection *)WCFNameResolvesToAddr)
+                        {
+                            WCFNameResolvesToAddr(m->WCF, name, (struct sockaddr *)&addr, x.cr_uid);
+                        }
+                    }
+                }
+                else if (answer->rrtype == kDNSType_CNAME)
+                {
+                    domainname cname;
+                    char cname_cstr[MAX_ESCAPED_DOMAIN_NAME];
+                    if (!putRData(mDNSNULL, cname.c, (mDNSu8 *)(cname.c + MAX_DOMAIN_NAME), answer))
+                        LogMsg("queryrecord_result_reply: WCF CNAME putRData failed");
+                    else
+                    {
+                        ConvertDomainNameToCString(&cname, cname_cstr);
+                        CHECK_WCF_FUNCTION((WCFConnection *)WCFNameResolvesToAddr)
+                        {
+                            WCFNameResolvesToName(m->WCF, name, cname_cstr, x.cr_uid);
+                        }
+                    }
+                }
+            }
+            else my_perror("queryrecord_result_reply: ERROR: getsockopt LOCAL_PEERCRED");
+        }
+    }
+#endif
+#endif
+}
+
+mDNSlocal void queryrecord_result_callback(mDNS *const m, DNSQuestion *question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    request_state *req = question->QuestionContext;
+    DNSServiceErrorType error = kDNSServiceErr_NoError;
+    DNSQuestion *q = mDNSNULL;
+
+#if APPLE_OSX_mDNSResponder
+    {
+        // Sanity check: QuestionContext is set to NULL after we stop the question and hence we should not
+        // get any callbacks from the core after this.
+        if (!req)
+        {
+            LogMsg("queryrecord_result_callback: ERROR!! QuestionContext NULL for %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+            return;
+        }
+        if (req->hdr.op == query_request && question == req->u.queryrecord.q2)
+            q = &req->u.queryrecord.q;
+        else if (req->hdr.op == addrinfo_request && question == req->u.addrinfo.q42)
+            q = &req->u.addrinfo.q4;
+        else if (req->hdr.op == addrinfo_request && question == req->u.addrinfo.q62)
+            q = &req->u.addrinfo.q6;
+
+        if (q && question->qtype != q->qtype && !SameDomainName(&question->qname, &q->qname))
+        {
+            mStatus err;
+            domainname *orig = question->qnameOrig;
+
+            LogInfo("queryrecord_result_callback: Stopping q2 local %##s", question->qname.c);
+            mDNS_StopQuery(m, question);
+            question->QuestionContext = mDNSNULL;
+
+            // We got a negative response for the SOA record indicating that .local does not exist.
+            // But we might have other search domains (that does not end in .local) that can be
+            // appended to this question. In that case, we want to retry the question. Otherwise,
+            // we don't want to try this question as unicast.
+            if (answer->RecordType == kDNSRecordTypePacketNegative && !q->AppendSearchDomains)
+            {
+                LogInfo("queryrecord_result_callback: question %##s AppendSearchDomains zero", q->qname.c);
+                return;
+            }
+
+            // If we got a non-negative answer for our "local SOA" test query, start an additional parallel unicast query
+            //
+            // Note: When we copy the original question, we copy everything including the AppendSearchDomains,
+            // RetryWithSearchDomains except for qnameOrig which can be non-NULL if the original question is
+            // e.g., somehost and then we appended e.g., ".local" and retried that question. See comment in
+            // SendAdditionalQuery as to how qnameOrig gets initialized.
+            *question              = *q;
+            question->InterfaceID  = mDNSInterface_Unicast;
+            question->ExpectUnique = mDNStrue;
+            question->qnameOrig    = orig;
+
+            LogOperation("%3d: DNSServiceQueryRecord(%##s, %s) unicast, context %p", req->sd, question->qname.c, DNSTypeName(question->qtype), question->QuestionContext);
+
+            // If the original question timed out, its QuestionContext would already be set to NULL and that's what we copied above.
+            // Hence, we need to set it explicitly here.
+            question->QuestionContext = req;
+            err = mDNS_StartQuery(m, question);
+            if (err) LogMsg("%3d: ERROR: queryrecord_result_callback %##s %s mDNS_StartQuery: %d", req->sd, question->qname.c, DNSTypeName(question->qtype), (int)err);
+
+            // If we got a positive response to local SOA, then try the .local question as unicast
+            if (answer->RecordType != kDNSRecordTypePacketNegative) return;
+
+            // Fall through and get the next search domain. The question is pointing at .local
+            // and we don't want to try that. Try the next search domain. Don't try with local
+            // search domains for the unicast question anymore.
+            //
+            // Note: we started the question above which will be stopped immediately (never sent on the wire)
+            // before we pick the next search domain below. RetryQuestionWithSearchDomains assumes that the
+            // question has already started.
+            question->AppendLocalSearchDomains = 0;
+        }
+
+        if (q && AddRecord && AddRecord != QC_dnssec && (question->InterfaceID == mDNSInterface_Unicast) && !answer->rdlength)
+        {
+            // If we get a negative response to the unicast query that we sent above, retry after appending search domains
+            // Note: We could have appended search domains below (where do it for regular unicast questions) instead of doing it here.
+            // As we ignore negative unicast answers below, we would never reach the code where the search domains are appended.
+            // To keep things simple, we handle unicast ".local" separately here.
+            LogInfo("queryrecord_result_callback: Retrying .local question %##s (%s) as unicast after appending search domains", question->qname.c, DNSTypeName(question->qtype));
+            if (RetryQuestionWithSearchDomains(m, question, req, AddRecord))
+                return;
+            if (question->AppendSearchDomains && !question->AppendLocalSearchDomains && IsLocalDomain(&question->qname))
+            {
+                // If "local" is the last search domain, we need to stop the question so that we don't send the "local"
+                // question on the wire as we got a negative response for the local SOA. But, we can't stop the question
+                // yet as we may have to timeout the question (done by the "core") for which we need to leave the question
+                // in the list. We leave it disabled so that it does not hit the wire.
+                LogInfo("queryrecord_result_callback: Disabling .local question %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+                question->ThisQInterval = 0;
+            }
+        }
+        // If we are here it means that either "question" is not "q2" OR we got a positive response for "q2" OR we have no more search
+        // domains to append for "q2". In all cases, fall through and deliver the response
+    }
+#endif // APPLE_OSX_mDNSResponder
+
+    // If a query is being suppressed for some reason, we don't have to do any other
+    // processing.
+    //
+    // Note: We don't check for "SuppressQuery" and instead use QC_suppressed because
+    // the "core" needs to temporarily turn off SuppressQuery to answer this query.
+    if (AddRecord == QC_suppressed)
+    {
+        LogInfo("queryrecord_result_callback: Suppressed question %##s (%s)", question->qname.c, DNSTypeName(question->qtype));
+        queryrecord_result_reply(m, req, question, answer, AddRecord, kDNSServiceErr_NoSuchRecord);
+        return;
+    }
+
+    if (answer->RecordType == kDNSRecordTypePacketNegative)
+    {
+        // If this question needs to be timed out and we have reached the stop time, mark
+        // the error as timeout. It is possible that we might get a negative response from an
+        // external DNS server at the same time when this question reaches its stop time. We
+        // can't tell the difference as there is no indication in the callback. This should
+        // be okay as we will be timing out this query anyway.
+        mDNS_Lock(m);
+        if (question->TimeoutQuestion)
+        {
+            if ((m->timenow - question->StopTime) >= 0)
+            {
+                LogInfo("queryrecord_result_callback:Question %##s (%s) timing out, InterfaceID %p", question->qname.c, DNSTypeName(question->qtype), question->InterfaceID);
+                error = kDNSServiceErr_Timeout;
+            }
+        }
+        mDNS_Unlock(m);
+        // When we're doing parallel unicast and multicast queries for dot-local names (for supporting Microsoft
+        // Active Directory sites) we need to ignore negative unicast answers. Otherwise we'll generate negative
+        // answers for just about every single multicast name we ever look up, since the Microsoft Active Directory
+        // server is going to assert that pretty much every single multicast name doesn't exist.
+        //
+        // If we are timing out this query, we need to deliver the negative answer to the application
+        if (error != kDNSServiceErr_Timeout)
+        {
+            if (!answer->InterfaceID && IsLocalDomain(answer->name))
+            {
+                // Sanity check: "q" will be set only if "question" is the .local unicast query.
+                if (!q)
+                {
+                    LogMsg("queryrecord_result_callback: ERROR!! answering multicast question %s with unicast cache record",
+                        RRDisplayString(m, answer));
+                    return;
+                }
+#if APPLE_OSX_mDNSResponder
+                if (!ShouldDeliverNegativeResponse(m, question))
+                {
+                    return;
+                }
+#endif  // APPLE_OSX_mDNSResponder
+                LogInfo("queryrecord_result_callback:Question %##s (%s) answering local with negative unicast response", question->qname.c,
+                    DNSTypeName(question->qtype));
+            }
+            error = kDNSServiceErr_NoSuchRecord;
+        }
+    }
+    // If we get a negative answer, try appending search domains. Don't append search domains
+    // - if we are timing out this question
+    // - if the negative response was received as a result of a multicast query
+    // - if this is an additional query (q2), we already appended search domains above (indicated by "!q" below)
+    // - if this response is forced e.g., dnssec validation result
+    if (error != kDNSServiceErr_Timeout)
+    {
+        if (!q && !answer->InterfaceID && !answer->rdlength && AddRecord && AddRecord != QC_dnssec)
+        {
+            // If the original question did not end in .local, we did not send an SOA query
+            // to figure out whether we should send an additional unicast query or not. If we just
+            // appended .local, we need to see if we need to send an additional query. This should
+            // normally happen just once because after we append .local, we ignore all negative
+            // responses for .local above.
+            LogInfo("queryrecord_result_callback: Retrying question %##s (%s) after appending search domains", question->qname.c, DNSTypeName(question->qtype));
+            if (RetryQuestionWithSearchDomains(m, question, req, AddRecord))
+            {
+                // Note: We need to call SendAdditionalQuery every time after appending a search domain as .local could
+                // be anywhere in the search domain list.
+#if APPLE_OSX_mDNSResponder
+                mStatus err = mStatus_NoError;
+                err = SendAdditionalQuery(question, req, err);
+                if (err) LogMsg("queryrecord_result_callback: Sending .local SOA query failed, after appending domains");
+#endif // APPLE_OSX_mDNSResponder
+                return;
+            }
+        }
+    }
+    queryrecord_result_reply(m, req, question, answer, AddRecord, error);
+}
+
+mDNSlocal void queryrecord_termination_callback(request_state *request)
+{
+    LogOperation("%3d: DNSServiceQueryRecord(%##s, %s) STOP PID[%d](%s)",
+		request->sd, request->u.queryrecord.q.qname.c, DNSTypeName(request->u.queryrecord.q.qtype), request->process_id, request->pid_name);
+    if (request->u.queryrecord.q.QuestionContext)
+    {
+        mDNS_StopQuery(&mDNSStorage, &request->u.queryrecord.q);  // no need to error check
+        LogMcastQ(&mDNSStorage, &request->u.queryrecord.q, request, q_stop);
+        request->u.queryrecord.q.QuestionContext = mDNSNULL;
+    }
+    else
+    {
+        DNSQuestion *question = &request->u.queryrecord.q;
+        LogInfo("queryrecord_termination_callback: question %##s (%s) already stopped, InterfaceID %p", question->qname.c, DNSTypeName(question->qtype), question->InterfaceID);
+    }
+
+    if (request->u.queryrecord.q.qnameOrig)
+    {
+        freeL("QueryTermination", request->u.queryrecord.q.qnameOrig);
+        request->u.queryrecord.q.qnameOrig = mDNSNULL;
+    }
+
+    if (callExternalHelpers(request->u.queryrecord.q.InterfaceID, &request->u.queryrecord.q.qname, request->flags))
+    {
+        LogInfo("queryrecord_termination_callback: calling external_stop_browsing_for_service()");
+        external_stop_browsing_for_service(request->u.queryrecord.q.InterfaceID, &request->u.queryrecord.q.qname, request->u.queryrecord.q.qtype, request->flags);
+    }
+    if (request->u.queryrecord.q2)
+    {
+        if (request->u.queryrecord.q2->QuestionContext)
+        {
+            LogInfo("queryrecord_termination_callback: Stopping q2 %##s", request->u.queryrecord.q2->qname.c);
+            mDNS_StopQuery(&mDNSStorage, request->u.queryrecord.q2);
+            LogMcastQ(&mDNSStorage, request->u.queryrecord.q2, request, q_stop);
+        }
+        else
+        {
+            DNSQuestion *question = request->u.queryrecord.q2;
+            LogInfo("queryrecord_termination_callback: q2 %##s (%s) already stopped, InterfaceID %p", question->qname.c, DNSTypeName(question->qtype), question->InterfaceID);
+        }
+        if (request->u.queryrecord.q2->qnameOrig)
+        {
+            LogInfo("queryrecord_termination_callback: freeing q2 qnameOrig %##s", request->u.queryrecord.q2->qnameOrig->c);
+            freeL("QueryTermination q2", request->u.queryrecord.q2->qnameOrig);
+            request->u.queryrecord.q2->qnameOrig = mDNSNULL;
+        }
+        freeL("queryrecord Q2", request->u.queryrecord.q2);
+        request->u.queryrecord.q2 = mDNSNULL;
+    }
+#if APPLE_OSX_mDNSResponder
+    {
+        if (request->u.queryrecord.ans)
+        {
+            DNSQuestion *v4q, *v6q;
+            // If we are receiving poisitive answers, provide the hint to the
+            // upper layer.
+            v4q = v6q = mDNSNULL;
+            if (request->u.queryrecord.q.qtype == kDNSType_A)
+                v4q = &request->u.queryrecord.q;
+            else if (request->u.queryrecord.q.qtype == kDNSType_AAAA)
+                v6q = &request->u.queryrecord.q;
+            mDNSPlatformTriggerDNSRetry(&mDNSStorage, v4q, v6q);
+        }
+    }
+#endif // APPLE_OSX_mDNSResponder
+}
+
+mDNSlocal void SetQuestionPolicy(DNSQuestion *q, request_state *req)
+{
+    int i;
+
+    // The policy is either based on pid or UUID. Pass a zero pid
+    // to the "core" if the UUID is valid. If we always pass the pid,
+    // then the "core" needs to determine whether the uuid is valid 
+    // by examining all the 16 bytes at the time of the policy
+    // check and also when setting the delegate socket option. Also, it
+    // requires that we zero out the uuid wherever the question is
+    // initialized to make sure that it is not interpreted as valid.
+    // To prevent these intrusive changes, just pass a zero pid to indicate
+    // that pid is not valid when uuid is valid. In future if we need the
+    // pid in the question, we will reevaluate this strategy.
+    if (req->validUUID)
+    {
+        for (i = 0; i < UUID_SIZE; i++)
+        {
+            q->uuid[i] = req->uuid[i];
+        }
+        q->pid = 0;
+    }
+    else
+    {
+        q->pid = req->process_id;
+    }
+}
+
+mDNSlocal mStatus handle_queryrecord_request(request_state *request)
+{
+    DNSQuestion *const q = &request->u.queryrecord.q;
+    char name[256];
+    mDNSu16 rrtype, rrclass;
+    mStatus err;
+
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (interfaceIndex && !InterfaceID) return(mStatus_BadParamErr);
+
+    if (get_string(&request->msgptr, request->msgend, name, 256) < 0) return(mStatus_BadParamErr);
+    rrtype  = get_uint16(&request->msgptr, request->msgend);
+    rrclass = get_uint16(&request->msgptr, request->msgend);
+
+    if (!request->msgptr)
+    { LogMsg("%3d: DNSServiceQueryRecord(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    request->flags = flags;
+    mDNSPlatformMemZero(&request->u.queryrecord, sizeof(request->u.queryrecord));
+
+    q->InterfaceID      = InterfaceID;
+    q->flags            = flags;
+    q->Target           = zeroAddr;
+    if (!MakeDomainNameFromDNSNameString(&q->qname, name)) return(mStatus_BadParamErr);
+#if 0
+    if (!AuthorizedDomain(request, &q->qname, AutoBrowseDomains)) return (mStatus_NoError);
+#endif
+    q->qtype            = rrtype;
+    q->qclass           = rrclass;
+    q->LongLived        = (flags & kDNSServiceFlagsLongLivedQuery     ) != 0;
+    q->ExpectUnique     = mDNSfalse;
+    q->ForceMCast       = (flags & kDNSServiceFlagsForceMulticast     ) != 0;
+    q->ReturnIntermed   = (flags & kDNSServiceFlagsReturnIntermediates) != 0;
+    q->SuppressUnusable = (flags & kDNSServiceFlagsSuppressUnusable   ) != 0;
+    q->TimeoutQuestion  = (flags & kDNSServiceFlagsTimeout            ) != 0;
+    q->WakeOnResolve    = 0;
+    q->UseBackgroundTrafficClass = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    if ((flags & kDNSServiceFlagsValidate) != 0)
+        q->ValidationRequired = DNSSEC_VALIDATION_SECURE;
+    else if ((flags & kDNSServiceFlagsValidateOptional) != 0)
+        q->ValidationRequired = DNSSEC_VALIDATION_SECURE_OPTIONAL;
+    q->ValidatingResponse = 0;
+    q->ProxyQuestion    = 0;
+    q->AnonInfo = mDNSNULL;
+    q->QuestionCallback = queryrecord_result_callback;
+    q->QuestionContext  = request;
+    q->SearchListIndex  = 0;
+
+    q->DNSSECAuthInfo = mDNSNULL;
+    q->DAIFreeCallback = mDNSNULL;
+
+    //Turn off dnssec validation for local domains and Question Types: RRSIG/ANY(ANY Type is not supported yet)
+    if ((IsLocalDomain(&q->qname)) || (q->qtype == kDNSServiceType_RRSIG) || (q->qtype == kDNSServiceType_ANY))
+        q->ValidationRequired = 0;
+          
+    // Don't append search domains for fully qualified domain names including queries
+    // such as e.g., "abc." that has only one label. We convert all names to FQDNs as internally
+    // we only deal with FQDNs. Hence, we cannot look at qname to figure out whether we should
+    // append search domains or not.  So, we record that information in AppendSearchDomains.
+    //
+    // We append search domains only for queries that are a single label. If overriden using command line 
+    // argument "AlwaysAppendSearchDomains", then we do it for any query which is not fully qualified.
+    // For DNSSEC questions, append search domains only if kDNSServiceFlagsValidateOptional is set.
+
+    if ((!(q->ValidationRequired == DNSSEC_VALIDATION_SECURE)) && (!(q->ValidationRequired == DNSSEC_VALIDATION_INSECURE)) 
+        && (rrtype == kDNSType_A || rrtype == kDNSType_AAAA) && name[strlen(name) - 1] != '.' &&
+        (AlwaysAppendSearchDomains || CountLabels(&q->qname) == 1)) 
+    {
+        q->AppendSearchDomains = 1;
+        q->AppendLocalSearchDomains = 1;
+    }
+    else
+    {
+        q->AppendSearchDomains = 0;
+        q->AppendLocalSearchDomains = 0;
+    }
+
+    // For single label queries that are not fully qualified, look at /etc/hosts, cache and try
+    // search domains before trying them on the wire as a single label query. RetryWithSearchDomains
+    // tell the core to call back into the UDS layer if there is no valid response in /etc/hosts or
+    // the cache
+    q->RetryWithSearchDomains = ApplySearchDomainsFirst(q) ? 1 : 0;
+    q->qnameOrig        = mDNSNULL;
+    SetQuestionPolicy(q, request);
+
+    LogOperation("%3d: DNSServiceQueryRecord(%X, %d, %##s, %s) START PID[%d](%s)", 
+		request->sd, flags, interfaceIndex, q->qname.c, DNSTypeName(q->qtype), request->process_id, request->pid_name);
+    err = mDNS_StartQuery(&mDNSStorage, q);
+   
+    if (err) 
+        LogMsg("%3d: ERROR: DNSServiceQueryRecord %##s %s mDNS_StartQuery: %d", request->sd, q->qname.c, DNSTypeName(q->qtype), (int)err);
+    else
+    {
+        request->terminate = queryrecord_termination_callback;
+        LogMcastQ(&mDNSStorage, q, request, q_start);
+        if (callExternalHelpers(q->InterfaceID, &q->qname, flags))
+        {
+            LogInfo("handle_queryrecord_request: calling external_start_browsing_for_service()");
+            external_start_browsing_for_service(q->InterfaceID, &q->qname, q->qtype, flags);
+        }
+    }
+
+#if APPLE_OSX_mDNSResponder
+    err = SendAdditionalQuery(q, request, err);
+#endif // APPLE_OSX_mDNSResponder
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceEnumerateDomains
+#endif
+
+mDNSlocal reply_state *format_enumeration_reply(request_state *request,
+                                                const char *domain, DNSServiceFlags flags, mDNSu32 ifi, DNSServiceErrorType err)
+{
+    size_t len;
+    reply_state *reply;
+    char *data;
+
+    len = sizeof(DNSServiceFlags);
+    len += sizeof(mDNSu32);
+    len += sizeof(DNSServiceErrorType);
+    len += strlen(domain) + 1;
+
+    reply = create_reply(enumeration_reply_op, len, request);
+    reply->rhdr->flags = dnssd_htonl(flags);
+    reply->rhdr->ifi   = dnssd_htonl(ifi);
+    reply->rhdr->error = dnssd_htonl(err);
+    data = (char *)&reply->rhdr[1];
+    put_string(domain, &data);
+    return reply;
+}
+
+mDNSlocal void enum_termination_callback(request_state *request)
+{
+    // Stop the domain enumeration queries to discover the WAB Browse/Registration domains
+    if (request->u.enumeration.flags & kDNSServiceFlagsRegistrationDomains)
+    {
+        LogInfo("%3d: DNSServiceEnumeration Cancel WAB Registration PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+        uDNS_StopWABQueries(&mDNSStorage, UDNS_WAB_REG_QUERY);
+    }
+    else
+    {
+        LogInfo("%3d: DNSServiceEnumeration Cancel WAB Browse PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+        uDNS_StopWABQueries(&mDNSStorage, UDNS_WAB_BROWSE_QUERY);
+    }
+    mDNS_StopGetDomains(&mDNSStorage, &request->u.enumeration.q_all);
+    mDNS_StopGetDomains(&mDNSStorage, &request->u.enumeration.q_default);
+}
+
+mDNSlocal void enum_result_callback(mDNS *const m,
+                                    DNSQuestion *const question, const ResourceRecord *const answer, QC_result AddRecord)
+{
+    char domain[MAX_ESCAPED_DOMAIN_NAME];
+    request_state *request = question->QuestionContext;
+    DNSServiceFlags flags = 0;
+    reply_state *reply;
+    (void)m; // Unused
+
+    if (answer->rrtype != kDNSType_PTR) return;
+
+#if 0
+    if (!AuthorizedDomain(request, &answer->rdata->u.name, request->u.enumeration.flags ? AutoRegistrationDomains : AutoBrowseDomains)) return;
+#endif
+
+    // We only return add/remove events for the browse and registration lists
+    // For the default browse and registration answers, we only give an "ADD" event
+    if (question == &request->u.enumeration.q_default && !AddRecord) return;
+
+    if (AddRecord)
+    {
+        flags |= kDNSServiceFlagsAdd;
+        if (question == &request->u.enumeration.q_default) flags |= kDNSServiceFlagsDefault;
+    }
+
+    ConvertDomainNameToCString(&answer->rdata->u.name, domain);
+    // Note that we do NOT propagate specific interface indexes to the client - for example, a domain we learn from
+    // a machine's system preferences may be discovered on the LocalOnly interface, but should be browsed on the
+    // network, so we just pass kDNSServiceInterfaceIndexAny
+    reply = format_enumeration_reply(request, domain, flags, kDNSServiceInterfaceIndexAny, kDNSServiceErr_NoError);
+    if (!reply) { LogMsg("ERROR: enum_result_callback, format_enumeration_reply"); return; }
+
+    LogOperation("%3d: DNSServiceEnumerateDomains(%#2s) RESULT %s: %s", request->sd, question->qname.c, AddRecord ? "Add" : "Rmv", domain);
+
+    append_reply(request, reply);
+}
+
+mDNSlocal mStatus handle_enum_request(request_state *request)
+{
+    mStatus err;
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    DNSServiceFlags reg = flags & kDNSServiceFlagsRegistrationDomains;
+    mDNS_DomainType t_all     = reg ? mDNS_DomainTypeRegistration        : mDNS_DomainTypeBrowse;
+    mDNS_DomainType t_default = reg ? mDNS_DomainTypeRegistrationDefault : mDNS_DomainTypeBrowseDefault;
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    if (interfaceIndex && !InterfaceID) return(mStatus_BadParamErr);
+
+    if (!request->msgptr)
+    { LogMsg("%3d: DNSServiceEnumerateDomains(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    // mark which kind of enumeration we're doing so that we know what domain enumeration queries to stop
+    request->u.enumeration.flags = reg;
+
+    // enumeration requires multiple questions, so we must link all the context pointers so that
+    // necessary context can be reached from the callbacks
+    request->u.enumeration.q_all.QuestionContext = request;
+    request->u.enumeration.q_default.QuestionContext = request;
+
+    // if the caller hasn't specified an explicit interface, we use local-only to get the system-wide list.
+    if (!InterfaceID) InterfaceID = mDNSInterface_LocalOnly;
+
+    // make the calls
+    LogOperation("%3d: DNSServiceEnumerateDomains(%X=%s)", request->sd, flags,
+                 (flags & kDNSServiceFlagsBrowseDomains      ) ? "kDNSServiceFlagsBrowseDomains" :
+                 (flags & kDNSServiceFlagsRegistrationDomains) ? "kDNSServiceFlagsRegistrationDomains" : "<<Unknown>>");
+    err = mDNS_GetDomains(&mDNSStorage, &request->u.enumeration.q_all, t_all, NULL, InterfaceID, enum_result_callback, request);
+    if (!err)
+    {
+        err = mDNS_GetDomains(&mDNSStorage, &request->u.enumeration.q_default, t_default, NULL, InterfaceID, enum_result_callback, request);
+        if (err) mDNS_StopGetDomains(&mDNSStorage, &request->u.enumeration.q_all);
+        else request->terminate = enum_termination_callback;
+    }
+    if (!err)
+    {
+        // Start the domain enumeration queries to discover the WAB Browse/Registration domains
+        if (reg)
+        {
+            LogInfo("%3d: DNSServiceEnumerateDomains Start WAB Registration PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+            uDNS_StartWABQueries(&mDNSStorage, UDNS_WAB_REG_QUERY);
+        }
+        else 
+        {
+            LogInfo("%3d: DNSServiceEnumerateDomains Start WAB Browse PID[%d](%s)", request->sd, request->process_id, request->pid_name);
+            uDNS_StartWABQueries(&mDNSStorage, UDNS_WAB_BROWSE_QUERY);
+        }
+    }
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceReconfirmRecord & Misc
+#endif
+
+mDNSlocal mStatus handle_reconfirm_request(request_state *request)
+{
+    mStatus status = mStatus_BadParamErr;
+    AuthRecord *rr = read_rr_from_ipc_msg(request, 0, 0);
+    if (rr)
+    {
+        status = mDNS_ReconfirmByValue(&mDNSStorage, &rr->resrec);
+        LogOperation(
+            (status == mStatus_NoError) ?
+            "%3d: DNSServiceReconfirmRecord(%s) interface %d initiated" :
+            "%3d: DNSServiceReconfirmRecord(%s) interface %d failed: %d",
+            request->sd, RRDisplayString(&mDNSStorage, &rr->resrec),
+            mDNSPlatformInterfaceIndexfromInterfaceID(&mDNSStorage, rr->resrec.InterfaceID, mDNSfalse), status);
+        freeL("AuthRecord/handle_reconfirm_request", rr);
+    }
+    return(status);
+}
+
+#if APPLE_OSX_mDNSResponder
+
+mDNSlocal mStatus handle_release_request(request_state *request)
+{
+    mStatus err = 0;
+    char name[256], regtype[MAX_ESCAPED_DOMAIN_NAME], domain[MAX_ESCAPED_DOMAIN_NAME];
+    domainname instance;
+
+    // extract the data from the message
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+
+    if (get_string(&request->msgptr, request->msgend, name, 256) < 0 ||
+        get_string(&request->msgptr, request->msgend, regtype, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        get_string(&request->msgptr, request->msgend, domain, MAX_ESCAPED_DOMAIN_NAME) < 0)
+    {
+        LogMsg("ERROR: handle_release_request - Couldn't read name/regtype/domain");
+        return(mStatus_BadParamErr);
+    }
+
+    if (!request->msgptr)
+    {
+        LogMsg("%3d: PeerConnectionRelease(unreadable parameters)", request->sd);
+        return(mStatus_BadParamErr);
+    }
+
+    if (build_domainname_from_strings(&instance, name, regtype, domain) < 0)
+    {
+        LogMsg("ERROR: handle_release_request bad “%s” “%s” “%s”", name, regtype, domain);
+        return(mStatus_BadParamErr);
+    }
+
+    LogOperation("%3d: PeerConnectionRelease(%X %##s) START PID[%d](%s)",
+                 request->sd, flags, instance.c, request->process_id, request->pid_name);
+    
+    external_connection_release(&instance);
+    return(err);
+}
+
+#else   // APPLE_OSX_mDNSResponder
+
+mDNSlocal mStatus handle_release_request(request_state *request)
+{
+    (void) request; 
+    return mStatus_UnsupportedErr;
+}
+
+#endif  // APPLE_OSX_mDNSResponder
+
+mDNSlocal mStatus handle_setdomain_request(request_state *request)
+{
+    char domainstr[MAX_ESCAPED_DOMAIN_NAME];
+    domainname domain;
+    DNSServiceFlags flags = get_flags(&request->msgptr, request->msgend);
+    (void)flags; // Unused
+    if (get_string(&request->msgptr, request->msgend, domainstr, MAX_ESCAPED_DOMAIN_NAME) < 0 ||
+        !MakeDomainNameFromDNSNameString(&domain, domainstr))
+    { LogMsg("%3d: DNSServiceSetDefaultDomainForUser(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    LogOperation("%3d: DNSServiceSetDefaultDomainForUser(%##s)", request->sd, domain.c);
+    return(mStatus_NoError);
+}
+
+typedef packedstruct
+{
+    mStatus err;
+    mDNSu32 len;
+    mDNSu32 vers;
+} DaemonVersionReply;
+
+mDNSlocal void handle_getproperty_request(request_state *request)
+{
+    const mStatus BadParamErr = dnssd_htonl((mDNSu32)mStatus_BadParamErr);
+    char prop[256];
+    if (get_string(&request->msgptr, request->msgend, prop, sizeof(prop)) >= 0)
+    {
+        LogOperation("%3d: DNSServiceGetProperty(%s)", request->sd, prop);
+        if (!strcmp(prop, kDNSServiceProperty_DaemonVersion))
+        {
+            DaemonVersionReply x = { 0, dnssd_htonl(4), dnssd_htonl(_DNS_SD_H) };
+            send_all(request->sd, (const char *)&x, sizeof(x));
+            return;
+        }
+    }
+
+    // If we didn't recogize the requested property name, return BadParamErr
+    send_all(request->sd, (const char *)&BadParamErr, sizeof(BadParamErr));
+}
+
+#ifdef APPLE_OSX_mDNSResponder
+// The caller can specify either the pid or the uuid. If the pid is not specified,
+// update the effective uuid. Don't overwrite the pid which is used for debugging
+// purposes and initialized when the socket is opened.
+mDNSlocal void handle_connection_delegate_request(request_state *request)
+{
+    mDNSs32 pid;
+    socklen_t len;
+
+    len = 0;
+    pid = get_uint32(&request->msgptr, request->msgend);
+#ifdef LOCAL_PEEREPID
+    if (pid)
+    {
+        len = sizeof(pid);
+        if (getsockopt(request->sd, SOL_LOCAL, LOCAL_PEEREPID, &request->process_id, &len) != 0)
+            return;
+        // to extract the process name from the pid value
+        if (proc_pidinfo(request->process_id, PROC_PIDT_SHORTBSDINFO, 1, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) == 0)
+            return;
+        mDNSPlatformStrCopy(request->pid_name, proc.pbsi_comm);
+        //LogMsg("handle_connection_delegate_request: process id %d, name %s", request->process_id, request->pid_name);
+    }
+#endif
+#ifdef LOCAL_PEEREUUID
+    if (!pid)
+    {
+        len = UUID_SIZE;
+        if (getsockopt(request->sd, SOL_LOCAL, LOCAL_PEEREUUID, request->uuid, &len) != 0)
+            return;
+        request->validUUID = mDNStrue;
+    }
+#endif
+}
+#else
+mDNSlocal void handle_connection_delegate_request(request_state *request)
+{
+    (void) request;
+}
+#endif
+
+typedef packedstruct
+{
+    mStatus err;
+    mDNSs32 pid;
+} PIDInfo;
+
+mDNSlocal void handle_getpid_request(request_state *request)
+{
+    const request_state *req;
+    mDNSs32 pid = -1;
+    mDNSu16 srcport = get_uint16(&request->msgptr, request->msgend);
+    const DNSQuestion *q = NULL;
+    PIDInfo pi;
+
+    LogOperation("%3d: DNSServiceGetPID START", request->sd);
+
+    for (req = all_requests; req; req=req->next)
+    {
+        if (req->hdr.op == query_request)
+            q = &req->u.queryrecord.q;
+        else if (req->hdr.op == addrinfo_request)
+            q = &req->u.addrinfo.q4;
+        else if (req->hdr.op == addrinfo_request)
+            q = &req->u.addrinfo.q6;
+
+        if (q && q->LocalSocket != NULL)
+        {
+            mDNSu16 port = mDNSPlatformGetUDPPort(q->LocalSocket);
+            if (port == srcport)
+            {
+                pid = req->process_id;
+                LogInfo("DNSServiceGetPID: srcport %d, pid %d [%s] question %##s", htons(srcport), pid, req->pid_name, q->qname.c);
+                break;
+            }
+        }
+    }
+    // If we cannot find in the client requests, look to see if this was
+    // started by mDNSResponder.
+    if (pid == -1)
+    {
+        for (q = mDNSStorage.Questions; q; q = q->next)
+        {
+            if (q && q->LocalSocket != NULL)
+            {
+                mDNSu16 port = mDNSPlatformGetUDPPort(q->LocalSocket);
+                if (port == srcport)
+                {
+#if APPLE_OSX_mDNSResponder
+                    pid = getpid();
+#endif // APPLE_OSX_mDNSResponder
+                    LogInfo("DNSServiceGetPID: srcport %d, pid %d [%s], question %##s", htons(srcport), pid, "_mDNSResponder", q->qname.c);
+                    break;
+                }
+            }
+        }
+    }
+        
+    pi.err = 0;
+    pi.pid = pid;
+    send_all(request->sd, (const char *)&pi, sizeof(PIDInfo));
+    LogOperation("%3d: DNSServiceGetPID STOP", request->sd);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceNATPortMappingCreate
+#endif
+
+#define DNSServiceProtocol(X) ((X) == NATOp_AddrRequest ? 0 : (X) == NATOp_MapUDP ? kDNSServiceProtocol_UDP : kDNSServiceProtocol_TCP)
+
+mDNSlocal void port_mapping_termination_callback(request_state *request)
+{
+    LogOperation("%3d: DNSServiceNATPortMappingCreate(%X, %u, %u, %d) STOP PID[%d](%s)", request->sd,
+                 DNSServiceProtocol(request->u.pm.NATinfo.Protocol),
+                 mDNSVal16(request->u.pm.NATinfo.IntPort), mDNSVal16(request->u.pm.ReqExt), request->u.pm.NATinfo.NATLease, 
+		         request->process_id, request->pid_name);
+    mDNS_StopNATOperation(&mDNSStorage, &request->u.pm.NATinfo);
+}
+
+// Called via function pointer when we get a NAT Traversal (address request or port mapping) response
+mDNSlocal void port_mapping_create_request_callback(mDNS *m, NATTraversalInfo *n)
+{
+    request_state *request = (request_state *)n->clientContext;
+    reply_state *rep;
+    int replyLen;
+    char *data;
+
+    if (!request) { LogMsg("port_mapping_create_request_callback called with unknown request_state object"); return; }
+
+    // calculate reply data length
+    replyLen = sizeof(DNSServiceFlags);
+    replyLen += 3 * sizeof(mDNSu32);  // if index + addr + ttl
+    replyLen += sizeof(DNSServiceErrorType);
+    replyLen += 2 * sizeof(mDNSu16);  // Internal Port + External Port
+    replyLen += sizeof(mDNSu8);       // protocol
+
+    rep = create_reply(port_mapping_reply_op, replyLen, request);
+
+    rep->rhdr->flags = dnssd_htonl(0);
+    rep->rhdr->ifi   = dnssd_htonl(mDNSPlatformInterfaceIndexfromInterfaceID(m, n->InterfaceID, mDNSfalse));
+    rep->rhdr->error = dnssd_htonl(n->Result);
+
+    data = (char *)&rep->rhdr[1];
+
+    *data++ = request->u.pm.NATinfo.ExternalAddress.b[0];
+    *data++ = request->u.pm.NATinfo.ExternalAddress.b[1];
+    *data++ = request->u.pm.NATinfo.ExternalAddress.b[2];
+    *data++ = request->u.pm.NATinfo.ExternalAddress.b[3];
+    *data++ = DNSServiceProtocol(request->u.pm.NATinfo.Protocol);
+    *data++ = request->u.pm.NATinfo.IntPort.b[0];
+    *data++ = request->u.pm.NATinfo.IntPort.b[1];
+    *data++ = request->u.pm.NATinfo.ExternalPort.b[0];
+    *data++ = request->u.pm.NATinfo.ExternalPort.b[1];
+    put_uint32(request->u.pm.NATinfo.Lifetime, &data);
+
+    LogOperation("%3d: DNSServiceNATPortMappingCreate(%X, %u, %u, %d) RESULT %.4a:%u TTL %u", request->sd,
+                 DNSServiceProtocol(request->u.pm.NATinfo.Protocol),
+                 mDNSVal16(request->u.pm.NATinfo.IntPort), mDNSVal16(request->u.pm.ReqExt), request->u.pm.NATinfo.NATLease,
+                 &request->u.pm.NATinfo.ExternalAddress, mDNSVal16(request->u.pm.NATinfo.ExternalPort), request->u.pm.NATinfo.Lifetime);
+
+    append_reply(request, rep);
+}
+
+mDNSlocal mStatus handle_port_mapping_request(request_state *request)
+{
+    mDNSu32 ttl = 0;
+    mStatus err = mStatus_NoError;
+
+    DNSServiceFlags flags          = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+    mDNSInterfaceID InterfaceID    = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    mDNSu8 protocol       = (mDNSu8)get_uint32(&request->msgptr, request->msgend);
+    (void)flags; // Unused
+    if (interfaceIndex && !InterfaceID) return(mStatus_BadParamErr);
+    if (request->msgptr + 8 > request->msgend) request->msgptr = NULL;
+    else
+    {
+        request->u.pm.NATinfo.IntPort.b[0] = *request->msgptr++;
+        request->u.pm.NATinfo.IntPort.b[1] = *request->msgptr++;
+        request->u.pm.ReqExt.b[0]          = *request->msgptr++;
+        request->u.pm.ReqExt.b[1]          = *request->msgptr++;
+        ttl = get_uint32(&request->msgptr, request->msgend);
+    }
+
+    if (!request->msgptr)
+    { LogMsg("%3d: DNSServiceNATPortMappingCreate(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    if (protocol == 0)  // If protocol == 0 (i.e. just request public address) then IntPort, ExtPort, ttl must be zero too
+    {
+        if (!mDNSIPPortIsZero(request->u.pm.NATinfo.IntPort) || !mDNSIPPortIsZero(request->u.pm.ReqExt) || ttl) return(mStatus_BadParamErr);
+    }
+    else
+    {
+        if (mDNSIPPortIsZero(request->u.pm.NATinfo.IntPort)) return(mStatus_BadParamErr);
+        if (!(protocol & (kDNSServiceProtocol_UDP | kDNSServiceProtocol_TCP))) return(mStatus_BadParamErr);
+    }
+
+    request->u.pm.NATinfo.Protocol       = !protocol ? NATOp_AddrRequest : (protocol == kDNSServiceProtocol_UDP) ? NATOp_MapUDP : NATOp_MapTCP;
+    //       u.pm.NATinfo.IntPort        = already set above
+    request->u.pm.NATinfo.RequestedPort  = request->u.pm.ReqExt;
+    request->u.pm.NATinfo.NATLease       = ttl;
+    request->u.pm.NATinfo.clientCallback = port_mapping_create_request_callback;
+    request->u.pm.NATinfo.clientContext  = request;
+
+    LogOperation("%3d: DNSServiceNATPortMappingCreate(%X, %u, %u, %d) START PID[%d](%s)", request->sd,
+                 protocol, mDNSVal16(request->u.pm.NATinfo.IntPort), mDNSVal16(request->u.pm.ReqExt), request->u.pm.NATinfo.NATLease, 
+		         request->process_id, request->pid_name);
+    err = mDNS_StartNATOperation(&mDNSStorage, &request->u.pm.NATinfo);
+    if (err) LogMsg("ERROR: mDNS_StartNATOperation: %d", (int)err);
+    else request->terminate = port_mapping_termination_callback;
+
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - DNSServiceGetAddrInfo
+#endif
+
+mDNSlocal void addrinfo_termination_callback(request_state *request)
+{
+    LogOperation("%3d: DNSServiceGetAddrInfo(%##s) STOP PID[%d](%s)", request->sd, request->u.addrinfo.q4.qname.c,
+		          request->process_id, request->pid_name);
+
+    if (request->u.addrinfo.q4.QuestionContext)
+    {
+        mDNS_StopQuery(&mDNSStorage, &request->u.addrinfo.q4);
+        LogMcastQ(&mDNSStorage, &request->u.addrinfo.q4, request, q_stop);
+        request->u.addrinfo.q4.QuestionContext = mDNSNULL;
+    }
+    if (request->u.addrinfo.q4.qnameOrig)
+    {
+        freeL("QueryTermination", request->u.addrinfo.q4.qnameOrig);
+        request->u.addrinfo.q4.qnameOrig = mDNSNULL;
+    }
+    if (request->u.addrinfo.q42)
+    {
+        if (request->u.addrinfo.q42->QuestionContext)
+        {
+            LogInfo("addrinfo_termination_callback: Stopping q42 %##s", request->u.addrinfo.q42->qname.c);
+            mDNS_StopQuery(&mDNSStorage, request->u.addrinfo.q42);
+            LogMcastQ(&mDNSStorage, request->u.addrinfo.q42, request, q_stop);
+        }
+        if (request->u.addrinfo.q42->qnameOrig)
+        {
+            LogInfo("addrinfo_termination_callback: freeing q42 qnameOrig %##s", request->u.addrinfo.q42->qnameOrig->c);
+            freeL("QueryTermination q42", request->u.addrinfo.q42->qnameOrig);
+            request->u.addrinfo.q42->qnameOrig = mDNSNULL;
+        }
+        freeL("addrinfo Q42", request->u.addrinfo.q42);
+        request->u.addrinfo.q42 = mDNSNULL;
+    }
+
+    if (request->u.addrinfo.q6.QuestionContext)
+    {
+        mDNS_StopQuery(&mDNSStorage, &request->u.addrinfo.q6);
+        LogMcastQ(&mDNSStorage, &request->u.addrinfo.q6, request, q_stop);
+        request->u.addrinfo.q6.QuestionContext = mDNSNULL;
+    }
+    if (request->u.addrinfo.q6.qnameOrig)
+    {
+        freeL("QueryTermination", request->u.addrinfo.q6.qnameOrig);
+        request->u.addrinfo.q6.qnameOrig = mDNSNULL;
+    }
+    if (request->u.addrinfo.q62)
+    {
+        if (request->u.addrinfo.q62->QuestionContext)
+        {
+            LogInfo("addrinfo_termination_callback: Stopping q62 %##s", request->u.addrinfo.q62->qname.c);
+            mDNS_StopQuery(&mDNSStorage, request->u.addrinfo.q62);
+            LogMcastQ(&mDNSStorage, request->u.addrinfo.q62, request, q_stop);
+        }
+        if (request->u.addrinfo.q62->qnameOrig)
+        {
+            LogInfo("addrinfo_termination_callback: freeing q62 qnameOrig %##s", request->u.addrinfo.q62->qnameOrig->c);
+            freeL("QueryTermination q62", request->u.addrinfo.q62->qnameOrig);
+            request->u.addrinfo.q62->qnameOrig = mDNSNULL;
+        }
+        freeL("addrinfo Q62", request->u.addrinfo.q62);
+        request->u.addrinfo.q62 = mDNSNULL;
+    }
+#if APPLE_OSX_mDNSResponder
+    {
+        DNSQuestion *v4q, *v6q;
+        v4q = v6q = mDNSNULL;
+        if (request->u.addrinfo.protocol & kDNSServiceProtocol_IPv4)
+        {
+            // If we are not delivering answers, we may be timing out prematurely.
+            // Note down the current state so that we know to retry when we see a
+            // valid response again.
+            if (request->u.addrinfo.q4.TimeoutQuestion && !request->u.addrinfo.v4ans)
+            {
+                mDNSPlatformUpdateDNSStatus(&mDNSStorage, &request->u.addrinfo.q4);
+            }
+            // If we have a v4 answer and if we timed out prematurely before, provide
+            // a trigger to the upper layer so that it can retry questions if needed.
+            if (request->u.addrinfo.v4ans)
+                v4q = &request->u.addrinfo.q4;
+        }
+        if (request->u.addrinfo.protocol & kDNSServiceProtocol_IPv6)
+        {
+            if (request->u.addrinfo.q6.TimeoutQuestion && !request->u.addrinfo.v6ans)
+            {
+                mDNSPlatformUpdateDNSStatus(&mDNSStorage, &request->u.addrinfo.q6);
+            }
+            if (request->u.addrinfo.v6ans)
+                v6q = &request->u.addrinfo.q6;
+        }
+        mDNSPlatformTriggerDNSRetry(&mDNSStorage, v4q, v6q);
+    }
+#endif // APPLE_OSX_mDNSResponder
+}
+
+mDNSlocal mStatus handle_addrinfo_request(request_state *request)
+{
+    char hostname[256];
+    domainname d;
+    mStatus err = 0;
+
+    DNSServiceFlags flags  = get_flags(&request->msgptr, request->msgend);
+    mDNSu32 interfaceIndex = get_uint32(&request->msgptr, request->msgend);
+
+    mDNSPlatformMemZero(&request->u.addrinfo, sizeof(request->u.addrinfo));
+    request->u.addrinfo.interface_id = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
+    request->u.addrinfo.flags        = flags;
+    request->u.addrinfo.protocol     = get_uint32(&request->msgptr, request->msgend);
+
+    if (interfaceIndex && !request->u.addrinfo.interface_id) return(mStatus_BadParamErr);
+    if (request->u.addrinfo.protocol > (kDNSServiceProtocol_IPv4|kDNSServiceProtocol_IPv6)) return(mStatus_BadParamErr);
+
+    if (get_string(&request->msgptr, request->msgend, hostname, 256) < 0) return(mStatus_BadParamErr);
+
+    if (!request->msgptr) { LogMsg("%3d: DNSServiceGetAddrInfo(unreadable parameters)", request->sd); return(mStatus_BadParamErr); }
+
+    if (!MakeDomainNameFromDNSNameString(&d, hostname))
+    { LogMsg("ERROR: handle_addrinfo_request: bad hostname: %s", hostname); return(mStatus_BadParamErr); }
+
+#if 0
+    if (!AuthorizedDomain(request, &d, AutoBrowseDomains)) return (mStatus_NoError);
+#endif
+
+    if (!request->u.addrinfo.protocol)
+    {
+        flags |= kDNSServiceFlagsSuppressUnusable;
+        request->u.addrinfo.protocol = (kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6);
+    }
+
+    request->u.addrinfo.q4.InterfaceID      = request->u.addrinfo.q6.InterfaceID      = request->u.addrinfo.interface_id;
+    request->u.addrinfo.q4.flags            = request->u.addrinfo.q6.flags            = flags;
+    request->u.addrinfo.q4.Target           = request->u.addrinfo.q6.Target           = zeroAddr;
+    request->u.addrinfo.q4.qname            = request->u.addrinfo.q6.qname            = d;
+    request->u.addrinfo.q4.qclass           = request->u.addrinfo.q6.qclass           = kDNSServiceClass_IN;
+    request->u.addrinfo.q4.LongLived        = request->u.addrinfo.q6.LongLived        = (flags & kDNSServiceFlagsLongLivedQuery     ) != 0;
+    request->u.addrinfo.q4.ExpectUnique     = request->u.addrinfo.q6.ExpectUnique     = mDNSfalse;
+    request->u.addrinfo.q4.ForceMCast       = request->u.addrinfo.q6.ForceMCast       = (flags & kDNSServiceFlagsForceMulticast     ) != 0;
+    request->u.addrinfo.q4.ReturnIntermed   = request->u.addrinfo.q6.ReturnIntermed   = (flags & kDNSServiceFlagsReturnIntermediates) != 0;
+    request->u.addrinfo.q4.SuppressUnusable = request->u.addrinfo.q6.SuppressUnusable = (flags & kDNSServiceFlagsSuppressUnusable   ) != 0;
+    request->u.addrinfo.q4.TimeoutQuestion  = request->u.addrinfo.q6.TimeoutQuestion  = (flags & kDNSServiceFlagsTimeout            ) != 0;
+    request->u.addrinfo.q4.WakeOnResolve    = request->u.addrinfo.q6.WakeOnResolve    = 0;
+    request->u.addrinfo.q4.UseBackgroundTrafficClass = request->u.addrinfo.q6.UseBackgroundTrafficClass  = (flags & kDNSServiceFlagsBackgroundTrafficClass) != 0;
+    if ((flags & kDNSServiceFlagsValidate) != 0)
+        request->u.addrinfo.q4.ValidationRequired = request->u.addrinfo.q6.ValidationRequired = DNSSEC_VALIDATION_SECURE;
+    else if ((flags & kDNSServiceFlagsValidateOptional) != 0)
+        request->u.addrinfo.q4.ValidationRequired = request->u.addrinfo.q6.ValidationRequired = DNSSEC_VALIDATION_SECURE_OPTIONAL;
+    request->u.addrinfo.q4.ValidatingResponse = request->u.addrinfo.q6.ValidatingResponse = 0;
+    request->u.addrinfo.q4.ProxyQuestion      = request->u.addrinfo.q6.ProxyQuestion      = 0;
+    request->u.addrinfo.q4.qnameOrig          = request->u.addrinfo.q6.qnameOrig          = mDNSNULL;
+    request->u.addrinfo.q4.AnonInfo           = request->u.addrinfo.q6.AnonInfo           = mDNSNULL;
+
+    SetQuestionPolicy(&request->u.addrinfo.q4, request);
+    SetQuestionPolicy(&request->u.addrinfo.q6, request);
+
+    request->u.addrinfo.q4.DNSSECAuthInfo = request->u.addrinfo.q6.DNSSECAuthInfo = mDNSNULL;
+    request->u.addrinfo.q4.DAIFreeCallback = request->u.addrinfo.q6.DAIFreeCallback = mDNSNULL;
+
+    //Turn off dnssec validation for local domains
+    if (IsLocalDomain(&d))
+        request->u.addrinfo.q4.ValidationRequired = request->u.addrinfo.q6.ValidationRequired = 0;
+
+    if (request->u.addrinfo.protocol & kDNSServiceProtocol_IPv6)
+    {
+        request->u.addrinfo.q6.qtype            = kDNSServiceType_AAAA;
+        request->u.addrinfo.q6.SearchListIndex  = 0;
+        // For DNSSEC questions, append search domains only if kDNSServiceFlagsValidateOptional is set
+        if ((!(request->u.addrinfo.q6.ValidationRequired == DNSSEC_VALIDATION_SECURE)) && (!(request->u.addrinfo.q6.ValidationRequired == DNSSEC_VALIDATION_INSECURE)) 
+            && hostname[strlen(hostname) - 1] != '.' && (AlwaysAppendSearchDomains || CountLabels(&d) == 1))
+        {
+            request->u.addrinfo.q6.AppendSearchDomains = 1;
+            request->u.addrinfo.q6.AppendLocalSearchDomains = 1;
+        }
+        else
+        {
+            request->u.addrinfo.q6.AppendSearchDomains = 0;
+            request->u.addrinfo.q6.AppendLocalSearchDomains = 0;
+        }
+        request->u.addrinfo.q6.RetryWithSearchDomains = (ApplySearchDomainsFirst(&request->u.addrinfo.q6) ? 1 : 0);
+        request->u.addrinfo.q6.QuestionCallback = queryrecord_result_callback;
+        request->u.addrinfo.q6.QuestionContext  = request;
+        err = mDNS_StartQuery(&mDNSStorage, &request->u.addrinfo.q6);
+        if (err != mStatus_NoError)
+        {
+            LogMsg("ERROR: mDNS_StartQuery: %d", (int)err);
+            request->u.addrinfo.q6.QuestionContext = mDNSNULL;
+        }
+        #if APPLE_OSX_mDNSResponder
+        err = SendAdditionalQuery(&request->u.addrinfo.q6, request, err);
+        #endif // APPLE_OSX_mDNSResponder
+        if (!err)
+        { 
+            request->terminate = addrinfo_termination_callback;
+            LogMcastQ(&mDNSStorage, &request->u.addrinfo.q6, request, q_start);
+        }
+    }
+
+    if (!err && (request->u.addrinfo.protocol & kDNSServiceProtocol_IPv4))
+    {
+        request->u.addrinfo.q4.qtype            = kDNSServiceType_A;
+        request->u.addrinfo.q4.SearchListIndex  = 0;
+
+        // We append search domains only for queries that are a single label. If overriden using cmd line arg
+        // "AlwaysAppendSearchDomains", then we do it for any query which is not fully qualified.
+        // For DNSSEC questions, append search domains only if kDNSServiceFlagsValidateOptional is set.
+
+        if ((!(request->u.addrinfo.q4.ValidationRequired == DNSSEC_VALIDATION_SECURE)) && (!(request->u.addrinfo.q4.ValidationRequired == DNSSEC_VALIDATION_INSECURE)) 
+            && hostname[strlen(hostname) - 1] != '.' && (AlwaysAppendSearchDomains || CountLabels(&d) == 1))
+        {
+            request->u.addrinfo.q4.AppendSearchDomains = 1;
+            request->u.addrinfo.q4.AppendLocalSearchDomains = 1;
+        }
+        else
+        {
+            request->u.addrinfo.q4.AppendSearchDomains = 0;
+            request->u.addrinfo.q4.AppendLocalSearchDomains = 0;
+        }
+        request->u.addrinfo.q4.RetryWithSearchDomains = (ApplySearchDomainsFirst(&request->u.addrinfo.q4) ? 1 : 0);
+        request->u.addrinfo.q4.QuestionCallback = queryrecord_result_callback;
+        request->u.addrinfo.q4.QuestionContext  = request;
+        err = mDNS_StartQuery(&mDNSStorage, &request->u.addrinfo.q4);
+        if (err != mStatus_NoError)
+        {
+            LogMsg("ERROR: mDNS_StartQuery: %d", (int)err);
+            request->u.addrinfo.q4.QuestionContext = mDNSNULL;
+            if (request->u.addrinfo.protocol & kDNSServiceProtocol_IPv6)
+            {    
+                // If we started a query for IPv6, we need to cancel it                                                                                                           
+                mDNS_StopQuery(&mDNSStorage, &request->u.addrinfo.q6);
+                request->u.addrinfo.q6.QuestionContext = mDNSNULL;
+            }    
+        }
+        #if APPLE_OSX_mDNSResponder
+        err = SendAdditionalQuery(&request->u.addrinfo.q4, request, err);
+        #endif // APPLE_OSX_mDNSResponder
+        if (!err)
+        {
+            request->terminate = addrinfo_termination_callback;
+            LogMcastQ(&mDNSStorage, &request->u.addrinfo.q4, request, q_start);
+        }        
+    }
+
+    LogOperation("%3d: DNSServiceGetAddrInfo(%X, %d, %d, %##s) START PID[%d](%s)", request->sd, flags, interfaceIndex, 
+                 request->u.addrinfo.protocol, d.c, request->process_id, request->pid_name);
+    return(err);
+}
+
+// ***************************************************************************
+#if COMPILER_LIKES_PRAGMA_MARK
+#pragma mark -
+#pragma mark - Main Request Handler etc.
+#endif
+
+mDNSlocal request_state *NewRequest(void)
+{
+    request_state **p = &all_requests;
+    while (*p) 
+        p=&(*p)->next;
+    *p = mallocL("request_state", sizeof(request_state));
+    if (!*p) 
+        FatalError("ERROR: malloc");
+    mDNSPlatformMemZero(*p, sizeof(request_state));
+    return(*p);
+}
+
+// read_msg may be called any time when the transfer state (req->ts) is t_morecoming.
+// if there is no data on the socket, the socket will be closed and t_terminated will be returned
+mDNSlocal void read_msg(request_state *req)
+{
+    if (req->ts == t_terminated || req->ts == t_error)
+    { LogMsg("%3d: ERROR: read_msg called with transfer state terminated or error", req->sd); req->ts = t_error; return; }
+
+    if (req->ts == t_complete)  // this must be death or something is wrong
+    {
+        char buf[4];    // dummy for death notification
+        int nread = udsSupportReadFD(req->sd, buf, 4, 0, req->platform_data);
+        if (!nread) { req->ts = t_terminated; return; }
+        if (nread < 0) goto rerror;
+        LogMsg("%3d: ERROR: read data from a completed request", req->sd);
+        req->ts = t_error;
+        return;
+    }
+
+    if (req->ts != t_morecoming)
+    { LogMsg("%3d: ERROR: read_msg called with invalid transfer state (%d)", req->sd, req->ts); req->ts = t_error; return; }
+
+    if (req->hdr_bytes < sizeof(ipc_msg_hdr))
+    {
+        mDNSu32 nleft = sizeof(ipc_msg_hdr) - req->hdr_bytes;
+        int nread = udsSupportReadFD(req->sd, (char *)&req->hdr + req->hdr_bytes, nleft, 0, req->platform_data);
+        if (nread == 0) { req->ts = t_terminated; return; }
+        if (nread < 0) goto rerror;
+        req->hdr_bytes += nread;
+        if (req->hdr_bytes > sizeof(ipc_msg_hdr))
+        { LogMsg("%3d: ERROR: read_msg - read too many header bytes", req->sd); req->ts = t_error; return; }
+
+        // only read data if header is complete
+        if (req->hdr_bytes == sizeof(ipc_msg_hdr))
+        {
+            ConvertHeaderBytes(&req->hdr);
+            if (req->hdr.version != VERSION)
+            { LogMsg("%3d: ERROR: client version 0x%08X daemon version 0x%08X", req->sd, req->hdr.version, VERSION); req->ts = t_error; return; }
+
+            // Largest conceivable single request is a DNSServiceRegisterRecord() or DNSServiceAddRecord()
+            // with 64kB of rdata. Adding 1009 byte for a maximal domain name, plus a safety margin
+            // for other overhead, this means any message above 70kB is definitely bogus.
+            if (req->hdr.datalen > 70000)
+            { LogMsg("%3d: ERROR: read_msg: hdr.datalen %u (0x%X) > 70000", req->sd, req->hdr.datalen, req->hdr.datalen); req->ts = t_error; return; }
+            req->msgbuf = mallocL("request_state msgbuf", req->hdr.datalen + MSG_PAD_BYTES);
+            if (!req->msgbuf) { my_perror("ERROR: malloc"); req->ts = t_error; return; }
+            req->msgptr = req->msgbuf;
+            req->msgend = req->msgbuf + req->hdr.datalen;
+            mDNSPlatformMemZero(req->msgbuf, req->hdr.datalen + MSG_PAD_BYTES);
+        }
+    }
+
+    // If our header is complete, but we're still needing more body data, then try to read it now
+    // Note: For cancel_request req->hdr.datalen == 0, but there's no error return socket for cancel_request
+    // Any time we need to get the error return socket we know we'll have at least one data byte
+    // (even if only the one-byte empty C string placeholder for the old ctrl_path parameter)
+    if (req->hdr_bytes == sizeof(ipc_msg_hdr) && req->data_bytes < req->hdr.datalen)
+    {
+        mDNSu32 nleft = req->hdr.datalen - req->data_bytes;
+        int nread;
+#if !defined(_WIN32)
+        struct iovec vec = { req->msgbuf + req->data_bytes, nleft };    // Tell recvmsg where we want the bytes put
+        struct msghdr msg;
+        struct cmsghdr *cmsg;
+        char cbuf[CMSG_SPACE(4 * sizeof(dnssd_sock_t))];
+        msg.msg_name       = 0;
+        msg.msg_namelen    = 0;
+        msg.msg_iov        = &vec;
+        msg.msg_iovlen     = 1;
+        msg.msg_control    = cbuf;
+        msg.msg_controllen = sizeof(cbuf);
+        msg.msg_flags      = 0;
+        nread = recvmsg(req->sd, &msg, 0);
+#else
+        nread = udsSupportReadFD(req->sd, (char *)req->msgbuf + req->data_bytes, nleft, 0, req->platform_data);
+#endif
+        if (nread == 0) { req->ts = t_terminated; return; }
+        if (nread < 0) goto rerror;
+        req->data_bytes += nread;
+        if (req->data_bytes > req->hdr.datalen)
+        { LogMsg("%3d: ERROR: read_msg - read too many data bytes", req->sd); req->ts = t_error; return; }
+#if !defined(_WIN32)
+        cmsg = CMSG_FIRSTHDR(&msg);
+#if DEBUG_64BIT_SCM_RIGHTS
+        LogMsg("%3d: Expecting %d %d %d %d", req->sd, sizeof(cbuf),       sizeof(cbuf),   SOL_SOCKET,       SCM_RIGHTS);
+        LogMsg("%3d: Got       %d %d %d %d", req->sd, msg.msg_controllen, cmsg->cmsg_len, cmsg->cmsg_level, cmsg->cmsg_type);
+#endif // DEBUG_64BIT_SCM_RIGHTS
+        if (msg.msg_controllen != 0 &&
+            cmsg->cmsg_level   == SOL_SOCKET &&
+            cmsg->cmsg_type    == SCM_RIGHTS)
+        {
+#if APPLE_OSX_mDNSResponder
+            // Strictly speaking BPF_fd belongs solely in the platform support layer, but because
+            // of privilege separation on Mac OS X we need to get BPF_fd from mDNSResponderHelper,
+            // and it's convenient to repurpose the existing fd-passing code here for that task
+            if (req->hdr.op == send_bpf)
+            {
+                dnssd_sock_t x = *(dnssd_sock_t *)CMSG_DATA(cmsg);
+                LogOperation("%3d: Got len %d, BPF %d", req->sd, cmsg->cmsg_len, x);
+                mDNSPlatformReceiveBPF_fd(&mDNSStorage, x);
+            }
+            else
+#endif // APPLE_OSX_mDNSResponder
+            req->errsd = *(dnssd_sock_t *)CMSG_DATA(cmsg);
+#if DEBUG_64BIT_SCM_RIGHTS
+            LogMsg("%3d: read req->errsd %d", req->sd, req->errsd);
+#endif // DEBUG_64BIT_SCM_RIGHTS
+            if (req->data_bytes < req->hdr.datalen)
+            {
+                LogMsg("%3d: Client(PID [%d](%s)) sent error socket %d via SCM_RIGHTS with req->data_bytes %d < req->hdr.datalen %d",
+                       req->sd, req->process_id, req->pid_name, req->errsd, req->data_bytes, req->hdr.datalen);
+                req->ts = t_error;
+                return;
+            }
+        }
+#endif
+    }
+
+    // If our header and data are both complete, see if we need to make our separate error return socket
+    if (req->hdr_bytes == sizeof(ipc_msg_hdr) && req->data_bytes == req->hdr.datalen)
+    {
+        if (req->terminate && req->hdr.op != cancel_request)
+        {
+            dnssd_sockaddr_t cliaddr;
+#if defined(USE_TCP_LOOPBACK)
+            mDNSOpaque16 port;
+            u_long opt = 1;
+            port.b[0] = req->msgptr[0];
+            port.b[1] = req->msgptr[1];
+            req->msgptr += 2;
+            cliaddr.sin_family      = AF_INET;
+            cliaddr.sin_port        = port.NotAnInteger;
+            cliaddr.sin_addr.s_addr = inet_addr(MDNS_TCP_SERVERADDR);
+#else
+            char ctrl_path[MAX_CTLPATH];
+            get_string(&req->msgptr, req->msgend, ctrl_path, MAX_CTLPATH);  // path is first element in message buffer
+            mDNSPlatformMemZero(&cliaddr, sizeof(cliaddr));
+            cliaddr.sun_family = AF_LOCAL;
+            mDNSPlatformStrCopy(cliaddr.sun_path, ctrl_path);
+            // If the error return path UDS name is empty string, that tells us
+            // that this is a new version of the library that's going to pass us
+            // the error return path socket via sendmsg/recvmsg
+            if (ctrl_path[0] == 0)
+            {
+                if (req->errsd == req->sd)
+                { LogMsg("%3d: read_msg: ERROR failed to get errsd via SCM_RIGHTS", req->sd); req->ts = t_error; return; }
+                goto got_errfd;
+            }
+#endif
+
+            req->errsd = socket(AF_DNSSD, SOCK_STREAM, 0);
+            if (!dnssd_SocketValid(req->errsd)) 
+            { 
+                my_throttled_perror("ERROR: socket");
+                req->ts = t_error;
+                return;
+            }
+
+            if (connect(req->errsd, (struct sockaddr *)&cliaddr, sizeof(cliaddr)) < 0)
+            {
+#if !defined(USE_TCP_LOOPBACK)
+                struct stat sb;
+                LogMsg("%3d: read_msg: Couldn't connect to error return path socket “%s” errno %d (%s)",
+                       req->sd, cliaddr.sun_path, dnssd_errno, dnssd_strerror(dnssd_errno));
+                if (stat(cliaddr.sun_path, &sb) < 0)
+                    LogMsg("%3d: read_msg: stat failed “%s” errno %d (%s)", req->sd, cliaddr.sun_path, dnssd_errno, dnssd_strerror(dnssd_errno));
+                else
+                    LogMsg("%3d: read_msg: file “%s” mode %o (octal) uid %d gid %d", req->sd, cliaddr.sun_path, sb.st_mode, sb.st_uid, sb.st_gid);
+#endif
+                req->ts = t_error;
+                return;
+            }
+
+#if !defined(USE_TCP_LOOPBACK)
+got_errfd:
+#endif
+            LogOperation("%3d: Error socket %d created %08X %08X", req->sd, req->errsd, req->hdr.client_context.u32[1], req->hdr.client_context.u32[0]);
+#if defined(_WIN32)
+            if (ioctlsocket(req->errsd, FIONBIO, &opt) != 0)
+#else
+            if (fcntl(req->errsd, F_SETFL, fcntl(req->errsd, F_GETFL, 0) | O_NONBLOCK) != 0)
+#endif
+            {
+                LogMsg("%3d: ERROR: could not set control socket to non-blocking mode errno %d (%s)",
+                       req->sd, dnssd_errno, dnssd_strerror(dnssd_errno));
+                req->ts = t_error;
+                return;
+            }
+        }
+
+        req->ts = t_complete;
+    }
+
+    return;
+
+rerror:
+    if (dnssd_errno == dnssd_EWOULDBLOCK || dnssd_errno == dnssd_EINTR) return;
+    LogMsg("%3d: ERROR: read_msg errno %d (%s)", req->sd, dnssd_errno, dnssd_strerror(dnssd_errno));
+    req->ts = t_error;
+}
+
+#define RecordOrientedOp(X) \
+    ((X) == reg_record_request || (X) == add_record_request || (X) == update_record_request || (X) == remove_record_request)
+
+// The lightweight operations are the ones that don't need a dedicated request_state structure allocated for them
+#define LightweightOp(X) (RecordOrientedOp(X) || (X) == cancel_request)
+
+mDNSlocal void request_callback(int fd, short filter, void *info)
+{
+    mStatus err = 0;
+    request_state *req = info;
+    mDNSs32 min_size = sizeof(DNSServiceFlags);
+    (void)fd; // Unused
+    (void)filter; // Unused
+
+    for (;;)
+    {
+        read_msg(req);
+        if (req->ts == t_morecoming) 
+            return;
+        if (req->ts == t_terminated || req->ts == t_error) 
+        { 
+            AbortUnlinkAndFree(req); 
+            return; 
+        }
+        if (req->ts != t_complete) 
+        { 
+            LogMsg("request_callback: req->ts %d != t_complete PID[%d][%s]", req->ts, req->process_id, req->pid_name); 
+            AbortUnlinkAndFree(req); 
+            return; 
+        }
+        if (req->hdr.version != VERSION)
+        {
+            LogMsg("request_callback: ERROR: client IPC version %d incompatible with daemon IPC version %d PID[%d][%s]", 
+                   req->hdr.version, VERSION, req->process_id, req->pid_name);
+            AbortUnlinkAndFree(req);
+            return;
+        }
+
+        switch(req->hdr.op)            //          Interface       + other data
+        {
+            case connection_request:       min_size = 0;                                                                           break;
+            case connection_delegate_request: min_size = 4; /* pid */                                                              break;
+            case reg_service_request:      min_size += sizeof(mDNSu32) + 4 /* name, type, domain, host */ + 4 /* port, textlen */; break;
+            case add_record_request:       min_size +=                   4 /* type, rdlen */              + 4 /* ttl */;           break;
+            case update_record_request:    min_size +=                   2 /* rdlen */                    + 4 /* ttl */;           break;
+            case remove_record_request:                                                                                            break;
+            case browse_request:           min_size += sizeof(mDNSu32) + 2 /* type, domain */;                                     break;
+            case resolve_request:          min_size += sizeof(mDNSu32) + 3 /* type, type, domain */;                               break;
+            case query_request:            min_size += sizeof(mDNSu32) + 1 /* name */                     + 4 /* type, class*/;    break;
+            case enumeration_request:      min_size += sizeof(mDNSu32);                                                            break;
+            case reg_record_request:       min_size += sizeof(mDNSu32) + 1 /* name */ + 6 /* type, class, rdlen */ + 4 /* ttl */;  break;
+            case reconfirm_record_request: min_size += sizeof(mDNSu32) + 1 /* name */ + 6 /* type, class, rdlen */;                break;
+            case setdomain_request:        min_size +=                   1 /* domain */;                                           break;
+            case getproperty_request:      min_size = 2;                                                                           break;
+            case getpid_request:           min_size = 2;                                                                           break;
+            case port_mapping_request:     min_size += sizeof(mDNSu32) + 4 /* udp/tcp */ + 4 /* int/ext port */    + 4 /* ttl */;  break;
+            case addrinfo_request:         min_size += sizeof(mDNSu32) + 4 /* v4/v6 */   + 1 /* hostname */;                       break;
+            case send_bpf:                 // Same as cancel_request below
+            case cancel_request:           min_size = 0;                                                                           break;
+            case release_request:          min_size += sizeof(mDNSu32) + 3 /* type, type, domain */;                               break;
+            default: LogMsg("request_callback: ERROR: validate_message - unsupported req type: %d PID[%d][%s]", 
+                            req->hdr.op, req->process_id, req->pid_name); 
+                     min_size = -1;                                                                                                break;
+        }
+
+        if ((mDNSs32)req->data_bytes < min_size)
+        { 
+            LogMsg("request_callback: Invalid message %d bytes; min for %d is %d PID[%d][%s]", 
+                    req->data_bytes, req->hdr.op, min_size, req->process_id, req->pid_name); 
+            AbortUnlinkAndFree(req); 
+            return; 
+        }
+        if (LightweightOp(req->hdr.op) && !req->terminate)
+        { 
+            LogMsg("request_callback: Reg/Add/Update/Remove %d require existing connection PID[%d][%s]", 
+                    req->hdr.op, req->process_id, req->pid_name);                  
+            AbortUnlinkAndFree(req); 
+            return; 
+        }
+
+        // check if client wants silent operation
+        if (req->hdr.ipc_flags & IPC_FLAGS_NOREPLY) req->no_reply = 1;
+
+        // If req->terminate is already set, this means this operation is sharing an existing connection
+        if (req->terminate && !LightweightOp(req->hdr.op))
+        {
+            request_state *newreq = NewRequest();
+            newreq->primary = req;
+            newreq->sd      = req->sd;
+            newreq->errsd   = req->errsd;
+            newreq->uid     = req->uid;
+            newreq->hdr     = req->hdr;
+            newreq->msgbuf  = req->msgbuf;
+            newreq->msgptr  = req->msgptr;
+            newreq->msgend  = req->msgend;
+            // if the parent request is a delegate connection, copy the
+            // relevant bits
+            if (req->validUUID)
+            {
+                int i;
+                newreq->validUUID = mDNStrue;
+                for (i = 0; i < UUID_SIZE; i++)
+                {
+                    newreq->uuid[i] = req->uuid[i];
+                }
+            }
+            else
+            {
+                if (req->process_id)
+                {
+                    newreq->process_id = req->process_id;
+                }
+                else
+                {
+                    set_peer_pid(newreq);
+                }
+            }
+            req = newreq;
+        }
+
+        // If we're shutting down, don't allow new client requests
+        // We do allow "cancel" and "getproperty" during shutdown
+        if (mDNSStorage.ShutdownTime && req->hdr.op != cancel_request && req->hdr.op != getproperty_request)
+        {
+            err = mStatus_ServiceNotRunning;
+        }
+        else
+        { 
+            switch(req->hdr.op)
+            {
+                // These are all operations that have their own first-class request_state object
+                case connection_request:
+                            LogOperation("%3d: DNSServiceCreateConnection START PID[%d](%s)",
+                                req->sd, req->process_id, req->pid_name);
+                            req->terminate = connection_termination;
+                            break;
+                case connection_delegate_request:
+                            LogOperation("%3d: DNSServiceCreateDelegateConnection START PID[%d](%s)",
+                                req->sd, req->process_id, req->pid_name);
+                            req->terminate = connection_termination;
+                            handle_connection_delegate_request(req);
+                            break;
+                case resolve_request:              err = handle_resolve_request     (req);  break;
+                case query_request:                err = handle_queryrecord_request (req);  break;
+                case browse_request:               err = handle_browse_request      (req);  break;
+                case reg_service_request:          err = handle_regservice_request  (req);  break;
+                case enumeration_request:          err = handle_enum_request        (req);  break;
+                case reconfirm_record_request:     err = handle_reconfirm_request   (req);  break;
+                case setdomain_request:            err = handle_setdomain_request   (req);  break;
+                case getproperty_request:                handle_getproperty_request (req);  break;
+                case getpid_request:                     handle_getpid_request      (req);  break;
+                case port_mapping_request:         err = handle_port_mapping_request(req);  break;
+                case addrinfo_request:             err = handle_addrinfo_request    (req);  break;
+                case send_bpf:                     /* Do nothing for send_bpf */            break;
+
+                // These are all operations that work with an existing request_state object
+                case reg_record_request:           err = handle_regrecord_request   (req);  break;
+                case add_record_request:           err = handle_add_request         (req);  break;
+                case update_record_request:        err = handle_update_request      (req);  break;
+                case remove_record_request:        err = handle_removerecord_request(req);  break;
+                case cancel_request:                     handle_cancel_request      (req);  break;
+                case release_request:              err = handle_release_request     (req);  break;
+                default: LogMsg("request_callback: %3d:ERROR: Unsupported UDS req:%d PID[%d][%s]", 
+                                req->sd, req->hdr.op, req->process_id, req->pid_name);      break;
+            }
+        }
+        // req->msgbuf may be NULL, e.g. for connection_request or remove_record_request
+        if (req->msgbuf) freeL("request_state msgbuf", req->msgbuf);
+
+        // There's no return data for a cancel request (DNSServiceRefDeallocate returns no result)
+        // For a DNSServiceGetProperty call, the handler already generated the response, so no need to do it again here
+        if (req->hdr.op != cancel_request && req->hdr.op != getproperty_request && req->hdr.op != send_bpf && req->hdr.op != getpid_request)
+        {
+            const mStatus err_netorder = dnssd_htonl(err);
+            send_all(req->errsd, (const char *)&err_netorder, sizeof(err_netorder));
+            if (req->errsd != req->sd)
+            {
+                LogOperation("%3d: Error socket %d closed  %08X %08X (%d)",
+                             req->sd, req->errsd, req->hdr.client_context.u32[1], req->hdr.client_context.u32[0], err);
+                dnssd_close(req->errsd);
+                req->errsd = req->sd;
+                // Also need to reset the parent's errsd, if this is a subordinate operation
+                if (req->primary) req->primary->errsd = req->primary->sd;
+            }
+        }
+
+        // Reset ready to accept the next req on this pipe
+        if (req->primary) req = req->primary;
+        req->ts         = t_morecoming;
+        req->hdr_bytes  = 0;
+        req->data_bytes = 0;
+        req->msgbuf     = mDNSNULL;
+        req->msgptr     = mDNSNULL;
+        req->msgend     = 0;
+    }
+}
+
+mDNSlocal void connect_callback(int fd, short filter, void *info)
+{
+    dnssd_sockaddr_t cliaddr;
+    dnssd_socklen_t len = (dnssd_socklen_t) sizeof(cliaddr);
+    dnssd_sock_t sd = accept(fd, (struct sockaddr*) &cliaddr, &len);
+#if defined(SO_NOSIGPIPE) || defined(_WIN32)
+    unsigned long optval = 1;
+#endif
+
+    (void)filter; // Unused
+    (void)info; // Unused
+
+    if (!dnssd_SocketValid(sd))
+    {
+        if (dnssd_errno != dnssd_EWOULDBLOCK) 
+            my_throttled_perror("ERROR: accept");
+        return;
+    }
+
+#ifdef SO_NOSIGPIPE
+    // Some environments (e.g. OS X) support turning off SIGPIPE for a socket
+    if (setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval)) < 0)
+        LogMsg("%3d: WARNING: setsockopt - SO_NOSIGPIPE %d (%s)", sd, dnssd_errno, dnssd_strerror(dnssd_errno));
+#endif
+
+#if defined(_WIN32)
+    if (ioctlsocket(sd, FIONBIO, &optval) != 0)
+#else
+    if (fcntl(sd, F_SETFL, fcntl(sd, F_GETFL, 0) | O_NONBLOCK) != 0)
+#endif
+    {
+        my_perror("ERROR: fcntl(sd, F_SETFL, O_NONBLOCK) - aborting client");
+        dnssd_close(sd);
+        return;
+    }
+    else
+    {
+        request_state *request = NewRequest();
+        request->ts    = t_morecoming;
+        request->sd    = sd;
+        request->errsd = sd;
+        set_peer_pid(request);
+#if APPLE_OSX_mDNSResponder
+        struct xucred x;
+        socklen_t xucredlen = sizeof(x);
+        if (getsockopt(sd, 0, LOCAL_PEERCRED, &x, &xucredlen) >= 0 && x.cr_version == XUCRED_VERSION) request->uid = x.cr_uid;
+        else my_perror("ERROR: getsockopt, LOCAL_PEERCRED");
+        debugf("LOCAL_PEERCRED %d %u %u %d", xucredlen, x.cr_version, x.cr_uid, x.cr_ngroups);
+#endif // APPLE_OSX_mDNSResponder
+        LogOperation("%3d: Adding FD for uid %u", request->sd, request->uid);
+        udsSupportAddFDToEventLoop(sd, request_callback, request, &request->platform_data);
+    }
+}
+
+mDNSlocal mDNSBool uds_socket_setup(dnssd_sock_t skt)
+{
+#if defined(SO_NP_EXTENSIONS)
+    struct      so_np_extensions sonpx;
+    socklen_t optlen = sizeof(struct so_np_extensions);
+    sonpx.npx_flags = SONPX_SETOPTSHUT;
+    sonpx.npx_mask  = SONPX_SETOPTSHUT;
+    if (setsockopt(skt, SOL_SOCKET, SO_NP_EXTENSIONS, &sonpx, optlen) < 0)
+        my_perror("WARNING: could not set sockopt - SO_NP_EXTENSIONS");
+#endif
+#if defined(_WIN32)
+    // SEH: do we even need to do this on windows?
+    // This socket will be given to WSAEventSelect which will automatically set it to non-blocking
+    u_long opt = 1;
+    if (ioctlsocket(skt, FIONBIO, &opt) != 0)
+#else
+    if (fcntl(skt, F_SETFL, fcntl(skt, F_GETFL, 0) | O_NONBLOCK) != 0)
+#endif
+    {
+        my_perror("ERROR: could not set listen socket to non-blocking mode");
+        return mDNSfalse;
+    }
+
+    if (listen(skt, LISTENQ) != 0)
+    {
+        my_perror("ERROR: could not listen on listen socket");
+        return mDNSfalse;
+    }
+
+    if (mStatus_NoError != udsSupportAddFDToEventLoop(skt, connect_callback, (void *) NULL, (void **) NULL))
+    {
+        my_perror("ERROR: could not add listen socket to event loop");
+        return mDNSfalse;
+    }
+    else
+    { 
+        LogMsg("%3d: Listening for incoming Unix Domain Socket client requests", skt);
+        mDNSStorage.uds_listener_skt = skt;
+    }
+    return mDNStrue;
+}
+
+mDNSexport int udsserver_init(dnssd_sock_t skts[], mDNSu32 count)
+{
+    dnssd_sockaddr_t laddr;
+    int ret;
+    mDNSu32 i = 0;
+
+    LogInfo("udsserver_init: %d %d", _DNS_SD_H, mDNSStorage.mDNS_plat);
+
+    // If a particular platform wants to opt out of having a PID file, define PID_FILE to be ""
+    if (PID_FILE[0])
+    {
+        FILE *fp = fopen(PID_FILE, "w");
+        if (fp != NULL)
+        {
+            fprintf(fp, "%d\n", getpid());
+            fclose(fp);
+        }
+    }
+
+    if (skts)
+    {
+        for (i = 0; i < count; i++)
+            if (dnssd_SocketValid(skts[i]) && !uds_socket_setup(skts[i]))
+                goto error;
+    }
+    else
+    {
+        listenfd = socket(AF_DNSSD, SOCK_STREAM, 0);
+        if (!dnssd_SocketValid(listenfd))
+        {
+            my_perror("ERROR: socket(AF_DNSSD, SOCK_STREAM, 0); failed");
+            goto error;
+        }
+
+        mDNSPlatformMemZero(&laddr, sizeof(laddr));
+
+        #if defined(USE_TCP_LOOPBACK)
+        {
+            laddr.sin_family = AF_INET;
+            laddr.sin_port = htons(MDNS_TCP_SERVERPORT);
+            laddr.sin_addr.s_addr = inet_addr(MDNS_TCP_SERVERADDR);
+            ret = bind(listenfd, (struct sockaddr *) &laddr, sizeof(laddr));
+            if (ret < 0)
+            {
+                my_perror("ERROR: bind(listenfd, (struct sockaddr *) &laddr, sizeof(laddr)); failed");
+                goto error;
+            }
+        }
+        #else
+        {
+            mode_t mask = umask(0);
+            unlink(MDNS_UDS_SERVERPATH);  // OK if this fails
+            laddr.sun_family = AF_LOCAL;
+            #ifndef NOT_HAVE_SA_LEN
+            // According to Stevens (section 3.2), there is no portable way to
+            // determine whether sa_len is defined on a particular platform.
+            laddr.sun_len = sizeof(struct sockaddr_un);
+            #endif
+            if (strlen(MDNS_UDS_SERVERPATH) >= sizeof(laddr.sun_path))
+            {
+                LogMsg("ERROR: MDNS_UDS_SERVERPATH must be < %d characters", (int)sizeof(laddr.sun_path));
+                goto error;
+            }
+            mDNSPlatformStrCopy(laddr.sun_path, MDNS_UDS_SERVERPATH);
+            ret = bind(listenfd, (struct sockaddr *) &laddr, sizeof(laddr));
+            umask(mask);
+            if (ret < 0)
+            {
+                my_perror("ERROR: bind(listenfd, (struct sockaddr *) &laddr, sizeof(laddr)); failed");
+                goto error;
+            }
+        }
+        #endif
+
+        if (!uds_socket_setup(listenfd)) goto error;
+    }
+
+#if !defined(PLATFORM_NO_RLIMIT)
+    {
+        // Set maximum number of open file descriptors
+    #define MIN_OPENFILES 10240
+        struct rlimit maxfds, newfds;
+
+        // Due to bugs in OS X (<rdar://problem/2941095>, <rdar://problem/3342704>, <rdar://problem/3839173>)
+        // you have to get and set rlimits once before getrlimit will return sensible values
+        if (getrlimit(RLIMIT_NOFILE, &maxfds) < 0) { my_perror("ERROR: Unable to get file descriptor limit"); return 0; }
+        if (setrlimit(RLIMIT_NOFILE, &maxfds) < 0) my_perror("ERROR: Unable to set maximum file descriptor limit");
+
+        if (getrlimit(RLIMIT_NOFILE, &maxfds) < 0) { my_perror("ERROR: Unable to get file descriptor limit"); return 0; }
+        newfds.rlim_max = (maxfds.rlim_max > MIN_OPENFILES) ? maxfds.rlim_max : MIN_OPENFILES;
+        newfds.rlim_cur = (maxfds.rlim_cur > MIN_OPENFILES) ? maxfds.rlim_cur : MIN_OPENFILES;
+        if (newfds.rlim_max != maxfds.rlim_max || newfds.rlim_cur != maxfds.rlim_cur)
+            if (setrlimit(RLIMIT_NOFILE, &newfds) < 0) my_perror("ERROR: Unable to set maximum file descriptor limit");
+
+        if (getrlimit(RLIMIT_NOFILE, &maxfds) < 0) { my_perror("ERROR: Unable to get file descriptor limit"); return 0; }
+        debugf("maxfds.rlim_max %d", (long)maxfds.rlim_max);
+        debugf("maxfds.rlim_cur %d", (long)maxfds.rlim_cur);
+    }
+#endif
+
+    // We start a "LocalOnly" query looking for Automatic Browse Domain records.
+    // When Domain Enumeration in uDNS.c finds an "lb" record from the network, its "FoundDomain" routine
+    // creates a "LocalOnly" record, which results in our AutomaticBrowseDomainChange callback being invoked
+    mDNS_GetDomains(&mDNSStorage, &mDNSStorage.AutomaticBrowseDomainQ, mDNS_DomainTypeBrowseAutomatic,
+                    mDNSNULL, mDNSInterface_LocalOnly, AutomaticBrowseDomainChange, mDNSNULL);
+
+    // Add "local" as recommended registration domain ("dns-sd -E"), recommended browsing domain ("dns-sd -F"), and automatic browsing domain
+    RegisterLocalOnlyDomainEnumPTR(&mDNSStorage, &localdomain, mDNS_DomainTypeRegistration);
+    RegisterLocalOnlyDomainEnumPTR(&mDNSStorage, &localdomain, mDNS_DomainTypeBrowse);
+    AddAutoBrowseDomain(0, &localdomain);
+
+    udsserver_handle_configchange(&mDNSStorage);
+    return 0;
+
+error:
+
+    my_perror("ERROR: udsserver_init");
+    return -1;
+}
+
+mDNSexport int udsserver_exit(void)
+{
+    // Cancel all outstanding client requests
+    while (all_requests) AbortUnlinkAndFree(all_requests);
+
+    // Clean up any special mDNSInterface_LocalOnly records we created, both the entries for "local" we
+    // created in udsserver_init, and others we created as a result of reading local configuration data
+    while (LocalDomainEnumRecords)
+    {
+        ARListElem *rem = LocalDomainEnumRecords;
+        LocalDomainEnumRecords = LocalDomainEnumRecords->next;
+        mDNS_Deregister(&mDNSStorage, &rem->ar);
+    }
+
+    // If the launching environment created no listening socket,
+    // that means we created it ourselves, so we should clean it up on exit
+    if (dnssd_SocketValid(listenfd))
+    {
+        dnssd_close(listenfd);
+#if !defined(USE_TCP_LOOPBACK)
+        // Currently, we're unable to remove /var/run/mdnsd because we've changed to userid "nobody"
+        // to give up unnecessary privilege, but we need to be root to remove this Unix Domain Socket.
+        // It would be nice if we could find a solution to this problem
+        if (unlink(MDNS_UDS_SERVERPATH))
+            debugf("Unable to remove %s", MDNS_UDS_SERVERPATH);
+#endif
+    }
+
+    if (PID_FILE[0]) unlink(PID_FILE);
+
+    return 0;
+}
+
+mDNSlocal void LogClientInfo(mDNS *const m, request_state *req)
+{
+    char prefix[16];
+    if (req->primary) 
+        mDNS_snprintf(prefix, sizeof(prefix), " -> ");
+    else 
+        mDNS_snprintf(prefix, sizeof(prefix), "%3d:", req->sd);
+
+    if (!req->terminate)
+        LogMsgNoIdent("%s No operation yet on this socket", prefix);
+    else if (req->terminate == connection_termination)
+    {
+        int num_records = 0, num_ops = 0;
+        const registered_record_entry *p;
+        request_state *r;
+        for (p = req->u.reg_recs; p; p=p->next) num_records++;
+        for (r = req->next; r; r=r->next) if (r->primary == req) num_ops++;
+        LogMsgNoIdent("%s DNSServiceCreateConnection: %d registered record%s, %d kDNSServiceFlagsShareConnection operation%s PID[%d](%s)", 
+		               prefix, num_records, num_records != 1 ? "s" : "", num_ops,     num_ops     != 1 ? "s" : "", 
+                       req->process_id, req->pid_name);
+        for (p = req->u.reg_recs; p; p=p->next)
+            LogMsgNoIdent(" ->  DNSServiceRegisterRecord %3d %s PID[%d](%s)", p->key, ARDisplayString(m, p->rr), 
+                          req->process_id, req->pid_name);
+        for (r = req->next; r; r=r->next) if (r->primary == req) LogClientInfo(m, r);
+    }
+    else if (req->terminate == regservice_termination_callback)
+    {
+        service_instance *ptr;
+        char anonstr[256];
+        for (ptr = req->u.servicereg.instances; ptr; ptr = ptr->next)
+            LogMsgNoIdent("%s DNSServiceRegister         %##s%s %u/%u PID[%d](%s)",
+                    (ptr == req->u.servicereg.instances) ? prefix : "    ", ptr->srs.RR_SRV.resrec.name->c,
+                    AnonDataToString(ptr->srs.AnonData, 0, anonstr, sizeof(anonstr)), mDNSVal16(req->u.servicereg.port),
+                    SRS_PORT(&ptr->srs), req->process_id, req->pid_name);
+    }
+    else if (req->terminate == browse_termination_callback)
+    {
+        browser_t *blist;
+        char anonstr[256];
+        for (blist = req->u.browser.browsers; blist; blist = blist->next)
+            LogMsgNoIdent("%s DNSServiceBrowse           %##s%s PID[%d](%s)", 
+		    (blist == req->u.browser.browsers) ? prefix : "    ",blist->q.qname.c,
+            AnonDataToString(req->u.browser.AnonData, 0, anonstr, sizeof(anonstr)), req->process_id, req->pid_name);
+    }
+    else if (req->terminate == resolve_termination_callback)
+        LogMsgNoIdent("%s DNSServiceResolve          %##s PID[%d](%s)", 
+		prefix, req->u.resolve.qsrv.qname.c, req->process_id, req->pid_name);
+    else if (req->terminate == queryrecord_termination_callback)
+        LogMsgNoIdent("%s DNSServiceQueryRecord      %##s (%s) PID[%d](%s)", 
+		prefix, req->u.queryrecord.q.qname.c, DNSTypeName(req->u.queryrecord.q.qtype), req->process_id, req->pid_name);
+    else if (req->terminate == enum_termination_callback)
+        LogMsgNoIdent("%s DNSServiceEnumerateDomains %##s PID[%d](%s)", prefix, req->u.enumeration.q_all.qname.c, 
+                       req->process_id, req->pid_name);
+    else if (req->terminate == port_mapping_termination_callback)
+        LogMsgNoIdent("%s DNSServiceNATPortMapping   %s%s Int %5d Req %5d Ext %.4a:%5d Req TTL %5d Granted TTL %5d PID[%d](%s)",
+                      prefix,
+                      req->u.pm.NATinfo.Protocol & NATOp_MapTCP ? "TCP" : "   ",
+                      req->u.pm.NATinfo.Protocol & NATOp_MapUDP ? "UDP" : "   ",
+                      mDNSVal16(req->u.pm.NATinfo.IntPort),
+                      mDNSVal16(req->u.pm.ReqExt),
+                      &req->u.pm.NATinfo.ExternalAddress,
+                      mDNSVal16(req->u.pm.NATinfo.ExternalPort),
+                      req->u.pm.NATinfo.NATLease,
+                      req->u.pm.NATinfo.Lifetime,
+		              req->process_id, req->pid_name);
+    else if (req->terminate == addrinfo_termination_callback)
+        LogMsgNoIdent("%s DNSServiceGetAddrInfo      %s%s %##s PID[%d](%s)", prefix,
+                      req->u.addrinfo.protocol & kDNSServiceProtocol_IPv4 ? "v4" : "  ",
+                      req->u.addrinfo.protocol & kDNSServiceProtocol_IPv6 ? "v6" : "  ",
+                      req->u.addrinfo.q4.qname.c, req->process_id, req->pid_name);
+    else
+        LogMsgNoIdent("%s Unrecognized operation %p", prefix, req->terminate);
+}
+
+mDNSlocal void GetMcastClients(request_state *req)
+{
+    if (req->terminate == connection_termination)
+    {
+        int num_records = 0, num_ops = 0;
+        const registered_record_entry *p;
+        request_state *r;
+        for (p = req->u.reg_recs; p; p=p->next) 
+            num_records++;
+        for (r = req->next; r; r=r->next) 
+            if (r->primary == req) 
+                num_ops++;
+        for (p = req->u.reg_recs; p; p=p->next)
+        {
+            if (!AuthRecord_uDNS(p->rr))
+                n_mrecords++;
+        }
+        for (r = req->next; r; r=r->next) 
+            if (r->primary == req) 
+                GetMcastClients(r);
+    }
+    else if (req->terminate == regservice_termination_callback)
+    {
+        service_instance *ptr;
+        for (ptr = req->u.servicereg.instances; ptr; ptr = ptr->next)
+        {
+            if (!AuthRecord_uDNS(&ptr->srs.RR_SRV))
+                n_mrecords++; 
+        }
+    }
+    else if (req->terminate == browse_termination_callback)
+    {
+        browser_t *blist;
+        for (blist = req->u.browser.browsers; blist; blist = blist->next)
+        {
+            if (mDNSOpaque16IsZero(blist->q.TargetQID))
+                n_mquests++;
+        }
+    }
+    else if (req->terminate == resolve_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.resolve.qsrv.TargetQID)) && (req->u.resolve.qsrv.ThisQInterval > 0))
+            n_mquests++;
+    }
+    else if (req->terminate == queryrecord_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.queryrecord.q.TargetQID)) && (req->u.queryrecord.q.ThisQInterval > 0))
+            n_mquests++;
+    }
+    else if (req->terminate == addrinfo_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.addrinfo.q4.TargetQID)) && (req->u.addrinfo.q4.ThisQInterval > 0))
+            n_mquests++;
+    }
+    else
+    {
+        return;
+    }
+}
+
+
+mDNSlocal void LogMcastClientInfo(request_state *req)
+{
+    if (!req->terminate)
+        LogMcastNoIdent("No operation yet on this socket");
+    else if (req->terminate == connection_termination)
+    {
+        int num_records = 0, num_ops = 0;
+        const registered_record_entry *p;
+        request_state *r;
+        for (p = req->u.reg_recs; p; p=p->next) 
+            num_records++;
+        for (r = req->next; r; r=r->next) 
+            if (r->primary == req) 
+                num_ops++;
+        for (p = req->u.reg_recs; p; p=p->next)
+        {
+            if (!AuthRecord_uDNS(p->rr))
+                LogMcastNoIdent("R: ->  DNSServiceRegisterRecord:  %##s %s PID[%d](%s)", p->rr->resrec.name->c, 
+                                DNSTypeName(p->rr->resrec.rrtype), req->process_id, req->pid_name, i_mcount++);
+        }
+        for (r = req->next; r; r=r->next) 
+            if (r->primary == req) 
+                LogMcastClientInfo(r);
+    }
+    else if (req->terminate == regservice_termination_callback)
+    {
+        service_instance *ptr;
+        for (ptr = req->u.servicereg.instances; ptr; ptr = ptr->next)
+        {
+            if (!AuthRecord_uDNS(&ptr->srs.RR_SRV)) 
+                LogMcastNoIdent("R: DNSServiceRegister:  %##s %u/%u PID[%d](%s)", ptr->srs.RR_SRV.resrec.name->c, mDNSVal16(req->u.servicereg.port), 
+                                SRS_PORT(&ptr->srs), req->process_id, req->pid_name, i_mcount++);
+        }
+    }
+    else if (req->terminate == browse_termination_callback)
+    {
+        browser_t *blist;
+        for (blist = req->u.browser.browsers; blist; blist = blist->next)
+        {
+            if (mDNSOpaque16IsZero(blist->q.TargetQID))
+                LogMcastNoIdent("Q: DNSServiceBrowse  %##s %s PID[%d](%s)", blist->q.qname.c, DNSTypeName(blist->q.qtype),
+                                req->process_id, req->pid_name, i_mcount++);
+        }
+    }
+    else if (req->terminate == resolve_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.resolve.qsrv.TargetQID)) && (req->u.resolve.qsrv.ThisQInterval > 0))
+            LogMcastNoIdent("Q: DNSServiceResolve  %##s %s PID[%d](%s)", req->u.resolve.qsrv.qname.c, DNSTypeName(req->u.resolve.qsrv.qtype),
+                            req->process_id, req->pid_name, i_mcount++);
+    }
+    else if (req->terminate == queryrecord_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.queryrecord.q.TargetQID)) && (req->u.queryrecord.q.ThisQInterval > 0))
+            LogMcastNoIdent("Q: DNSServiceQueryRecord  %##s %s PID[%d](%s)", req->u.queryrecord.q.qname.c, DNSTypeName(req->u.queryrecord.q.qtype), 
+                          req->process_id, req->pid_name, i_mcount++);
+    }
+    else if (req->terminate == addrinfo_termination_callback)
+    {
+        if ((mDNSOpaque16IsZero(req->u.addrinfo.q4.TargetQID)) && (req->u.addrinfo.q4.ThisQInterval > 0))
+            LogMcastNoIdent("Q: DNSServiceGetAddrInfo  %s%s %##s PID[%d](%s)",
+                          req->u.addrinfo.protocol & kDNSServiceProtocol_IPv4 ? "v4" : "  ",
+                          req->u.addrinfo.protocol & kDNSServiceProtocol_IPv6 ? "v6" : "  ",
+                          req->u.addrinfo.q4.qname.c, req->process_id, req->pid_name, i_mcount++);
+    }
+    else
+    {
+        return;
+    }
+    
+}
+
+mDNSlocal char *RecordTypeName(mDNSu8 rtype)
+{
+    switch (rtype)
+    {
+    case kDNSRecordTypeUnregistered:  return ("Unregistered ");
+    case kDNSRecordTypeDeregistering: return ("Deregistering");
+    case kDNSRecordTypeUnique:        return ("Unique       ");
+    case kDNSRecordTypeAdvisory:      return ("Advisory     ");
+    case kDNSRecordTypeShared:        return ("Shared       ");
+    case kDNSRecordTypeVerified:      return ("Verified     ");
+    case kDNSRecordTypeKnownUnique:   return ("KnownUnique  ");
+    default: return("Unknown");
+    }
+}
+
+mDNSlocal void LogEtcHosts(mDNS *const m)
+{
+    mDNSBool showheader = mDNStrue;
+    const AuthRecord *ar;
+    mDNSu32 slot;
+    AuthGroup *ag;
+    int count = 0;
+    int authslot = 0;
+    mDNSBool truncated = 0;
+
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+    {
+        if (m->rrauth.rrauth_hash[slot]) authslot++;
+        for (ag = m->rrauth.rrauth_hash[slot]; ag; ag = ag->next)
+            for (ar = ag->members; ar; ar = ar->next)
+            {
+                if (ar->RecordCallback != FreeEtcHosts) continue;
+                if (showheader) { showheader = mDNSfalse; LogMsgNoIdent("  State       Interface"); }
+
+                // Print a maximum of 50 records
+                if (count++ >= 50) { truncated = mDNStrue; continue; }
+                if (ar->ARType == AuthRecordLocalOnly)
+                {
+                    if (ar->resrec.InterfaceID == mDNSInterface_LocalOnly)
+                        LogMsgNoIdent(" %s   LO %s", RecordTypeName(ar->resrec.RecordType), ARDisplayString(m, ar));
+                    else
+                    {
+                        mDNSu32 scopeid  = (mDNSu32)(uintptr_t)ar->resrec.InterfaceID;
+                        LogMsgNoIdent(" %s   %u  %s", RecordTypeName(ar->resrec.RecordType), scopeid, ARDisplayString(m, ar));
+                    }
+                }
+            }
+    }
+
+    if (showheader) LogMsgNoIdent("<None>");
+    else if (truncated) LogMsgNoIdent("<Truncated: to 50 records, Total records %d, Total Auth Groups %d, Auth Slots %d>", count, m->rrauth.rrauth_totalused, authslot);
+}
+
+mDNSlocal void LogLocalOnlyAuthRecords(mDNS *const m)
+{
+    mDNSBool showheader = mDNStrue;
+    const AuthRecord *ar;
+    mDNSu32 slot;
+    AuthGroup *ag;
+
+    for (slot = 0; slot < AUTH_HASH_SLOTS; slot++)
+    {
+        for (ag = m->rrauth.rrauth_hash[slot]; ag; ag = ag->next)
+            for (ar = ag->members; ar; ar = ar->next)
+            {
+                if (ar->RecordCallback == FreeEtcHosts) continue;
+                if (showheader) { showheader = mDNSfalse; LogMsgNoIdent("  State       Interface"); }
+
+                // Print a maximum of 400 records
+                if (ar->ARType == AuthRecordLocalOnly)
+                    LogMsgNoIdent(" %s   LO %s", RecordTypeName(ar->resrec.RecordType), ARDisplayString(m, ar));
+                else if (ar->ARType == AuthRecordP2P)
+                    LogMsgNoIdent(" %s   PP %s", RecordTypeName(ar->resrec.RecordType), ARDisplayString(m, ar));
+            }
+    }
+
+    if (showheader) LogMsgNoIdent("<None>");
+}
+
+mDNSlocal char *AnonInfoToString(AnonymousInfo *ai, char *anonstr, int anstrlen)
+{
+    anonstr[0] = 0;
+    if (ai && ai->AnonData)
+    {
+        return (AnonDataToString(ai->AnonData, ai->AnonDataLen, anonstr, anstrlen));
+    }
+    return anonstr;
+}
+
+mDNSlocal void LogOneAuthRecord(mDNS *const m, const AuthRecord *ar, mDNSs32 now, const char *const ifname)
+{
+    char anstr[256];
+    if (AuthRecord_uDNS(ar))
+    {
+        LogMsgNoIdent("%7d %7d %7d %7d %s",
+                      ar->ThisAPInterval / mDNSPlatformOneSecond,
+                      (ar->LastAPTime + ar->ThisAPInterval - now) / mDNSPlatformOneSecond,
+                      ar->expire ? (ar->expire - now) / mDNSPlatformOneSecond : 0,
+                      ar->state, ARDisplayString(m, ar));
+    }
+    else
+    {
+        LogMsgNoIdent("%7d %7d %7d %7s %s%s",
+                      ar->ThisAPInterval / mDNSPlatformOneSecond,
+                      ar->AnnounceCount ? (ar->LastAPTime + ar->ThisAPInterval - now) / mDNSPlatformOneSecond : 0,
+                      ar->TimeExpire    ? (ar->TimeExpire                      - now) / mDNSPlatformOneSecond : 0,
+                      ifname ? ifname : "ALL",
+                      ARDisplayString(m, ar), AnonInfoToString(ar->resrec.AnonInfo, anstr, sizeof(anstr)));
+    }
+}
+
+mDNSlocal void LogAuthRecords(mDNS *const m, const mDNSs32 now, AuthRecord *ResourceRecords, int *proxy)
+{
+    mDNSBool showheader = mDNStrue;
+    const AuthRecord *ar;
+    OwnerOptData owner = zeroOwner;
+    for (ar = ResourceRecords; ar; ar=ar->next)
+    {
+        const char *const ifname = InterfaceNameForID(m, ar->resrec.InterfaceID);
+        if ((ar->WakeUp.HMAC.l[0] != 0) == (proxy != mDNSNULL))
+        {
+            if (showheader) { showheader = mDNSfalse; LogMsgNoIdent("    Int    Next  Expire   State"); }
+            if (proxy) (*proxy)++;
+            if (!mDNSPlatformMemSame(&owner, &ar->WakeUp, sizeof(owner)))
+            {
+                owner = ar->WakeUp;
+                if (owner.password.l[0])
+                    LogMsgNoIdent("Proxying for H-MAC %.6a I-MAC %.6a Password %.6a seq %d", &owner.HMAC, &owner.IMAC, &owner.password, owner.seq);
+                else if (!mDNSSameEthAddress(&owner.HMAC, &owner.IMAC))
+                    LogMsgNoIdent("Proxying for H-MAC %.6a I-MAC %.6a seq %d",               &owner.HMAC, &owner.IMAC,                  owner.seq);
+                else
+                    LogMsgNoIdent("Proxying for %.6a seq %d",                                &owner.HMAC,                               owner.seq);
+            }
+            if (AuthRecord_uDNS(ar))
+            {
+                LogOneAuthRecord(m, ar, now, ifname);
+            }
+            else if (ar->ARType == AuthRecordLocalOnly)
+            {
+                LogMsgNoIdent("                             LO %s", ARDisplayString(m, ar));
+            }
+            else if (ar->ARType == AuthRecordP2P)
+            {
+                LogMsgNoIdent("                             PP %s", ARDisplayString(m, ar));
+            }
+            else
+            {
+                LogOneAuthRecord(m, ar, now, ifname);
+                if (ar->resrec.AnonInfo)
+                {
+                    ResourceRecord *nsec3 = ar->resrec.AnonInfo->nsec3RR;
+                    // We just print the values from the AuthRecord to keep it nicely aligned though
+                    // all we want here is the nsec3 information.
+                    LogMsgNoIdent("%7d %7d %7d %7s %s",
+                                  ar->ThisAPInterval / mDNSPlatformOneSecond,
+                                  ar->AnnounceCount ? (ar->LastAPTime + ar->ThisAPInterval - now) / mDNSPlatformOneSecond : 0,
+                                  ar->TimeExpire    ? (ar->TimeExpire                      - now) / mDNSPlatformOneSecond : 0,
+                                  ifname ? ifname : "ALL",
+                                  RRDisplayString(m, nsec3));
+                }
+            }
+        }
+    }
+    if (showheader) LogMsgNoIdent("<None>");
+}
+
+mDNSlocal void PrintOneCacheRecord(mDNS *const m, const CacheRecord *cr, mDNSu32 slot, const mDNSu32 remain, const char *ifname, mDNSu32 *CacheUsed)
+{
+    LogMsgNoIdent("%3d %s%8d %-7s%s %-6s%s",
+                  slot,
+                  cr->CRActiveQuestion ? "*" : " ",
+                  remain,
+                  ifname ? ifname : "-U-",
+                  (cr->resrec.RecordType == kDNSRecordTypePacketNegative)  ? "-" :
+                  (cr->resrec.RecordType & kDNSRecordTypePacketUniqueMask) ? " " : "+",
+                  DNSTypeName(cr->resrec.rrtype),
+                  CRDisplayString(m, cr));
+    (*CacheUsed)++;
+}
+
+mDNSlocal void PrintCachedRecords(mDNS *const m, const CacheRecord *cr, mDNSu32 slot, const mDNSu32 remain, const char *ifname, mDNSu32 *CacheUsed)
+{
+    CacheRecord *nsec;
+    CacheRecord *soa;
+    nsec = cr->nsec;
+
+    // The records that are cached under the main cache record like nsec, soa don't have
+    // their own lifetime. If the main cache record expires, they also expire.
+    while (nsec)
+    {
+        PrintOneCacheRecord(m, nsec, slot, remain, ifname, CacheUsed);
+        nsec = nsec->next;
+    }
+    soa = cr->soa;
+    if (soa)
+    {
+        PrintOneCacheRecord(m, soa, slot, remain, ifname, CacheUsed);
+    }
+    if (cr->resrec.AnonInfo)
+    {
+        ResourceRecord *nsec3 = cr->resrec.AnonInfo->nsec3RR;
+        // Even though it is a resource record, we print the sameway
+        // as a cache record so that it aligns properly.
+        if (nsec3)
+        {
+            LogMsgNoIdent("%3d %s%8d %-7s%s %-6s%s",
+                          slot,
+                          " ",
+                          remain,
+                          ifname ? ifname : "-U-",
+                          (nsec3->RecordType == kDNSRecordTypePacketNegative)  ? "-" :
+                          (nsec3->RecordType & kDNSRecordTypePacketUniqueMask) ? " " : "+",
+                          DNSTypeName(nsec3->rrtype),
+                          RRDisplayString(m, nsec3));
+        }
+    }
+}
+
+mDNSlocal char *AnonDataToString(const mDNSu8 *ad, int adlen, char *adstr, int adstrlen)
+{
+    adstr[0] = 0;
+    if (ad)
+    {
+        int len;
+        char *orig = adstr;
+
+        // If the caller is lazy to compute the length, we do it for them.
+        if (!adlen)
+            len = strlen((const char *)ad);
+        else
+            len = adlen;
+
+        // Print the anondata within brackets. Hence, we need space for two
+        // brackets and a NULL byte.
+        if (len > (adstrlen - 3))
+            len = adstrlen - 3;
+
+        *adstr++ = '(';
+        mDNSPlatformMemCopy(adstr, ad, len);
+        adstr[len] = ')';
+        adstr[len+1] = 0;
+        return orig;
+    }
+    return adstr;
+}
+
+mDNSexport void LogMDNSStatistics(mDNS *const m)
+{
+    LogMsgNoIdent("--- MDNS Statistics ---");
+    
+    LogMsgNoIdent("Name Conflicts                 %u", m->mDNSStats.NameConflicts);
+    LogMsgNoIdent("KnownUnique Name Conflicts     %u", m->mDNSStats.KnownUniqueNameConflicts);
+    LogMsgNoIdent("Duplicate Query Suppressions   %u", m->mDNSStats.DupQuerySuppressions);
+    LogMsgNoIdent("KA Suppressions                %u", m->mDNSStats.KnownAnswerSuppressions);
+    LogMsgNoIdent("KA Multiple Packets            %u", m->mDNSStats.KnownAnswerMultiplePkts);
+    LogMsgNoIdent("Poof Cache Deletions           %u", m->mDNSStats.PoofCacheDeletions);
+    LogMsgNoIdent("--------------------------------");
+
+    LogMsgNoIdent("Multicast packets Sent         %u", m->MulticastPacketsSent);
+    LogMsgNoIdent("Multicast packets Received     %u", m->MPktNum);
+    LogMsgNoIdent("Remote Subnet packets          %u", m->RemoteSubnet);
+    LogMsgNoIdent("QU questions  received         %u", m->mDNSStats.UnicastBitInQueries);
+    LogMsgNoIdent("Normal multicast questions     %u", m->mDNSStats.NormalQueries);
+    LogMsgNoIdent("Answers for questions          %u", m->mDNSStats.MatchingAnswersForQueries);
+    LogMsgNoIdent("Unicast responses              %u", m->mDNSStats.UnicastResponses);
+    LogMsgNoIdent("Multicast responses            %u", m->mDNSStats.MulticastResponses);
+    LogMsgNoIdent("Unicast response Demotions     %u", m->mDNSStats.UnicastDemotedToMulticast);
+    LogMsgNoIdent("--------------------------------");
+
+    LogMsgNoIdent("Sleeps                         %u", m->mDNSStats.Sleeps);
+    LogMsgNoIdent("Wakeups                        %u", m->mDNSStats.Wakes);
+    LogMsgNoIdent("Interface UP events            %u", m->mDNSStats.InterfaceUp);
+    LogMsgNoIdent("Interface UP Flap events       %u", m->mDNSStats.InterfaceUpFlap);
+    LogMsgNoIdent("Interface Down events          %u", m->mDNSStats.InterfaceDown);
+    LogMsgNoIdent("Interface DownFlap events      %u", m->mDNSStats.InterfaceDownFlap);
+    LogMsgNoIdent("Cache refresh queries          %u", m->mDNSStats.CacheRefreshQueries);
+    LogMsgNoIdent("Cache refreshed                %u", m->mDNSStats.CacheRefreshed);
+    LogMsgNoIdent("Wakeup on Resolves             %u", m->mDNSStats.WakeOnResolves);
+}
+
+mDNSexport void udsserver_info(mDNS *const m)
+{
+    const mDNSs32 now = mDNS_TimeNow(m);
+    mDNSu32 CacheUsed = 0, CacheActive = 0, slot;
+    int ProxyA = 0, ProxyD = 0;
+    const CacheGroup *cg;
+    const CacheRecord *cr;
+    const DNSQuestion *q;
+    const DNameListElem *d;
+    const SearchListElem *s;
+
+    LogMsgNoIdent("Timenow 0x%08lX (%d)", (mDNSu32)now, now);
+
+    LogMsgNoIdent("------------ Cache -------------");
+    LogMsgNoIdent("Slt Q     TTL if     U Type rdlen");
+    for (slot = 0; slot < CACHE_HASH_SLOTS; slot++)
+    {
+        for (cg = m->rrcache_hash[slot]; cg; cg=cg->next)
+        {
+            CacheUsed++;    // Count one cache entity for the CacheGroup object
+            for (cr = cg->members; cr; cr=cr->next)
+            {
+                const mDNSs32 remain = cr->resrec.rroriginalttl - (now - cr->TimeRcvd) / mDNSPlatformOneSecond;
+                const char *ifname;
+                mDNSInterfaceID InterfaceID = cr->resrec.InterfaceID;
+                if (!InterfaceID && cr->resrec.rDNSServer && cr->resrec.rDNSServer->scoped)
+                    InterfaceID = cr->resrec.rDNSServer->interface;
+                ifname = InterfaceNameForID(m, InterfaceID);
+                if (cr->CRActiveQuestion) CacheActive++;
+                PrintOneCacheRecord(m, cr, slot, remain, ifname, &CacheUsed);
+                PrintCachedRecords(m, cr, slot, remain, ifname, &CacheUsed);
+            }
+        }
+    }
+
+    if (m->rrcache_totalused != CacheUsed)
+        LogMsgNoIdent("Cache use mismatch: rrcache_totalused is %lu, true count %lu", m->rrcache_totalused, CacheUsed);
+    if (m->rrcache_active != CacheActive)
+        LogMsgNoIdent("Cache use mismatch: rrcache_active is %lu, true count %lu", m->rrcache_active, CacheActive);
+    LogMsgNoIdent("Cache currently contains %lu entities; %lu referenced by active questions", CacheUsed, CacheActive);
+
+    LogMsgNoIdent("--------- Auth Records ---------");
+    LogAuthRecords(m, now, m->ResourceRecords, mDNSNULL);
+
+    LogMsgNoIdent("--------- LocalOnly, P2P Auth Records ---------");
+    LogLocalOnlyAuthRecords(m);
+
+    LogMsgNoIdent("--------- /etc/hosts ---------");
+    LogEtcHosts(m);
+
+    LogMsgNoIdent("------ Duplicate Records -------");
+    LogAuthRecords(m, now, m->DuplicateRecords, mDNSNULL);
+
+    LogMsgNoIdent("----- Auth Records Proxied -----");
+    LogAuthRecords(m, now, m->ResourceRecords, &ProxyA);
+
+    LogMsgNoIdent("-- Duplicate Records Proxied ---");
+    LogAuthRecords(m, now, m->DuplicateRecords, &ProxyD);
+
+    LogMsgNoIdent("---------- Questions -----------");
+    if (!m->Questions) LogMsgNoIdent("<None>");
+    else
+    {
+        char anonstr[256];
+        CacheUsed = 0;
+        CacheActive = 0;
+        LogMsgNoIdent("   Int  Next if     T  NumAns VDNS    Qptr     DupOf    SU SQ Type Name");
+        for (q = m->Questions; q; q=q->next)
+        {
+            mDNSs32 i = q->ThisQInterval / mDNSPlatformOneSecond;
+            mDNSs32 n = (NextQSendTime(q) - now) / mDNSPlatformOneSecond;
+            char *ifname = InterfaceNameForID(m, q->InterfaceID);
+            CacheUsed++;
+            if (q->ThisQInterval) CacheActive++;
+            LogMsgNoIdent("%6d%6d %-7s%s%s %5d 0x%x%x 0x%p 0x%p %1d %2d %-5s%##s%s%s",
+                          i, n,
+                          ifname ? ifname : mDNSOpaque16IsZero(q->TargetQID) ? "" : "-U-",
+                          mDNSOpaque16IsZero(q->TargetQID) ? (q->LongLived ? "l" : " ") : (q->LongLived ? "L" : "O"),
+                          PrivateQuery(q)    ? "P" : q->ValidationRequired ? "V" : q->ValidatingResponse ? "R" : " ",
+                          q->CurrentAnswers, q->validDNSServers.l[1], q->validDNSServers.l[0], q, q->DuplicateOf,
+                          q->SuppressUnusable, q->SuppressQuery, DNSTypeName(q->qtype), q->qname.c,
+                          AnonInfoToString(q->AnonInfo, anonstr, sizeof(anonstr)),
+                          q->DuplicateOf ? " (dup)" : "");
+        }
+        LogMsgNoIdent("%lu question%s; %lu active", CacheUsed, CacheUsed > 1 ? "s" : "", CacheActive);
+    }
+
+    LogMsgNoIdent("----- Local-Only Questions -----");
+    if (!m->LocalOnlyQuestions) LogMsgNoIdent("<None>");
+    else for (q = m->LocalOnlyQuestions; q; q=q->next)
+            LogMsgNoIdent("                       %5d  %-6s%##s%s",
+                          q->CurrentAnswers, DNSTypeName(q->qtype), q->qname.c, q->DuplicateOf ? " (dup)" : "");
+
+    LogMsgNoIdent("---- Active UDS Client Requests ----");
+    if (!all_requests) LogMsgNoIdent("<None>");
+    else
+    {
+        request_state *req, *r;
+        for (req = all_requests; req; req=req->next)
+        {
+            if (req->primary)   // If this is a subbordinate operation, check that the parent is in the list
+            {
+                for (r = all_requests; r && r != req; r=r->next) if (r == req->primary) goto foundparent;
+                LogMsgNoIdent("%3d: Orhpan operation %p; parent %p not found in request list", req->sd);
+            }
+            // For non-subbordinate operations, and subbordinate operations that have lost their parent, write out their info
+            LogClientInfo(m, req);
+foundparent:;
+        }
+    }
+
+    LogMsgNoIdent("-------- NAT Traversals --------");
+    LogMsgNoIdent("ExtAddress %.4a Retry %d Interval %d",
+                  &m->ExtAddress,
+                  m->retryGetAddr ? (m->retryGetAddr - now) / mDNSPlatformOneSecond : 0,
+                  m->retryIntervalGetAddr / mDNSPlatformOneSecond);
+    if (m->NATTraversals)
+    {
+        const NATTraversalInfo *nat;
+        for (nat = m->NATTraversals; nat; nat=nat->next)
+        {
+            LogMsgNoIdent("%p %s Int %5d %s Err %d Retry %5d Interval %5d Expire %5d Req %.4a:%d Ext %.4a:%d",
+                          nat,
+                          nat->Protocol ? (nat->Protocol == NATOp_MapTCP ? "TCP" : "UDP") : "ADD",
+                          mDNSVal16(nat->IntPort),
+                          (nat->lastSuccessfulProtocol == NATTProtocolNone    ? "None    " :
+                           nat->lastSuccessfulProtocol == NATTProtocolNATPMP  ? "NAT-PMP " :
+                           nat->lastSuccessfulProtocol == NATTProtocolUPNPIGD ? "UPnP/IGD" :
+                           nat->lastSuccessfulProtocol == NATTProtocolPCP     ? "PCP     " :
+                           /* else */                                           "Unknown " ),
+                          nat->Result,
+                          nat->retryPortMap ? (nat->retryPortMap - now) / mDNSPlatformOneSecond : 0,
+                          nat->retryInterval / mDNSPlatformOneSecond,
+                          nat->ExpiryTime ? (nat->ExpiryTime - now) / mDNSPlatformOneSecond : 0,
+                          &nat->NewAddress, mDNSVal16(nat->RequestedPort),
+                          &nat->ExternalAddress, mDNSVal16(nat->ExternalPort));
+        }
+    }
+
+    LogMsgNoIdent("--------- AuthInfoList ---------");
+    if (!m->AuthInfoList) LogMsgNoIdent("<None>");
+    else
+    {
+        const DomainAuthInfo *a;
+        for (a = m->AuthInfoList; a; a = a->next)
+        {
+            LogMsgNoIdent("%##s %##s %##s %d %d %.16a%s",
+                          a->domain.c, a->keyname.c,
+                          a->hostname.c, (a->port.b[0] << 8 | a->port.b[1]),
+                          (a->deltime ? (a->deltime - now) : 0),
+                          &a->AutoTunnelInnerAddress, a->AutoTunnel ? " AutoTunnel" : "");
+        }
+    }
+
+    #if APPLE_OSX_mDNSResponder
+    LogMsgNoIdent("--------- TunnelClients --------");
+    if (!m->TunnelClients) LogMsgNoIdent("<None>");
+    else
+    {
+        const ClientTunnel *c;
+        for (c = m->TunnelClients; c; c = c->next)
+            LogMsgNoIdent("%##s local %.16a %.4a %.16a remote %.16a %.4a %5d %.16a interval %d",
+                          c->dstname.c, &c->loc_inner, &c->loc_outer, &c->loc_outer6, &c->rmt_inner, &c->rmt_outer, mDNSVal16(c->rmt_outer_port), &c->rmt_outer6, c->q.ThisQInterval);
+    }
+    #endif // APPLE_OSX_mDNSResponder
+
+    LogMsgNoIdent("---------- Misc State ----------");
+
+    LogMsgNoIdent("PrimaryMAC:   %.6a", &m->PrimaryMAC);
+
+    LogMsgNoIdent("m->SleepState %d (%s) seq %d",
+                  m->SleepState,
+                  m->SleepState == SleepState_Awake        ? "Awake"        :
+                  m->SleepState == SleepState_Transferring ? "Transferring" :
+                  m->SleepState == SleepState_Sleeping     ? "Sleeping"     : "?",
+                  m->SleepSeqNum);
+
+    if (!m->SPSSocket) LogMsgNoIdent("Not offering Sleep Proxy Service");
+#ifndef SPC_DISABLED
+    else LogMsgNoIdent("Offering Sleep Proxy Service: %#s", m->SPSRecords.RR_SRV.resrec.name->c);
+#endif
+    if (m->ProxyRecords == ProxyA + ProxyD) LogMsgNoIdent("ProxyRecords: %d + %d = %d", ProxyA, ProxyD, ProxyA + ProxyD);
+    else LogMsgNoIdent("ProxyRecords: MISMATCH %d + %d = %d ≠ %d", ProxyA, ProxyD, ProxyA + ProxyD, m->ProxyRecords);
+
+    LogMsgNoIdent("------ Auto Browse Domains -----");
+    if (!AutoBrowseDomains) LogMsgNoIdent("<None>");
+    else for (d=AutoBrowseDomains; d; d=d->next) LogMsgNoIdent("%##s", d->name.c);
+
+    LogMsgNoIdent("--- Auto Registration Domains --");
+    if (!AutoRegistrationDomains) LogMsgNoIdent("<None>");
+    else for (d=AutoRegistrationDomains; d; d=d->next) LogMsgNoIdent("%##s", d->name.c);
+
+    LogMsgNoIdent("--- Search Domains --");
+    if (!SearchList) LogMsgNoIdent("<None>");
+    else
+    {
+        for (s=SearchList; s; s=s->next)
+        {
+            char *ifname = InterfaceNameForID(m, s->InterfaceID);
+            LogMsgNoIdent("%##s %s", s->domain.c, ifname ? ifname : "");
+        }
+    }
+    LogInfo("--- Trust Anchors ---");
+    if (!m->TrustAnchors) 
+    {
+        LogInfo("<None>");
+    }
+    else
+    {
+        TrustAnchor *ta;
+        mDNSu8 fromTimeBuf[64];
+        mDNSu8 untilTimeBuf[64];
+
+        for (ta=m->TrustAnchors; ta; ta=ta->next)
+        {
+            mDNSPlatformFormatTime((unsigned long)ta->validFrom, fromTimeBuf, sizeof(fromTimeBuf));
+            mDNSPlatformFormatTime((unsigned long)ta->validUntil, untilTimeBuf, sizeof(untilTimeBuf));
+            LogInfo("%##s %d %d %d %d %s %s", ta->zone.c, ta->rds.keyTag,
+                ta->rds.alg, ta->rds.digestType, ta->digestLen, fromTimeBuf, untilTimeBuf);
+        }
+    }
+
+    LogInfo("--- DNSSEC Statistics ---");
+
+    LogInfo("Next Stats Time                 %u", m->NextStatLogTime - mDNSPlatformUTC());
+    LogMsgNoIdent("Unicast Cache size              %u", m->rrcache_totalused_unicast);
+    LogInfo("DNSSEC  Cache size              %u", m->DNSSECStats.TotalMemUsed);
+    if (m->rrcache_totalused_unicast)
+        LogInfo("DNSSEC  usage percentage        %u", ((unsigned long)(m->DNSSECStats.TotalMemUsed * 100))/m->rrcache_totalused_unicast);
+    LogInfo("DNSSEC  Extra Packets (0 to 2)  %u", m->DNSSECStats.ExtraPackets0);
+    LogInfo("DNSSEC  Extra Packets (3 to 6)  %u", m->DNSSECStats.ExtraPackets3);
+    LogInfo("DNSSEC  Extra Packets (7 to 9)  %u", m->DNSSECStats.ExtraPackets7);
+    LogInfo("DNSSEC  Extra Packets ( >= 10)  %u", m->DNSSECStats.ExtraPackets10);
+
+    LogInfo("DNSSEC  Latency (0 to 4ms)      %u", m->DNSSECStats.Latency0);
+    LogInfo("DNSSEC  Latency (4 to 9ms)      %u", m->DNSSECStats.Latency5);
+    LogInfo("DNSSEC  Latency (10 to 19ms)    %u", m->DNSSECStats.Latency10);
+    LogInfo("DNSSEC  Latency (20 to 49ms)    %u", m->DNSSECStats.Latency20);
+    LogInfo("DNSSEC  Latency (50 to 99ms)    %u", m->DNSSECStats.Latency50);
+    LogInfo("DNSSEC  Latency (   >=100ms)    %u", m->DNSSECStats.Latency100);
+
+    LogInfo("DNSSEC  Secure Status           %u", m->DNSSECStats.SecureStatus);
+    LogInfo("DNSSEC  Insecure Status         %u", m->DNSSECStats.InsecureStatus);
+    LogInfo("DNSSEC  Indeterminate Status    %u", m->DNSSECStats.IndeterminateStatus);
+    LogInfo("DNSSEC  Bogus Status            %u", m->DNSSECStats.BogusStatus);
+    LogInfo("DNSSEC  NoResponse Status       %u", m->DNSSECStats.NoResponseStatus);
+    LogInfo("DNSSEC  Probes sent             %u", m->DNSSECStats.NumProbesSent);
+    LogInfo("DNSSEC  Msg Size (<=1024)       %u", m->DNSSECStats.MsgSize0);
+    LogInfo("DNSSEC  Msg Size (<=2048)       %u", m->DNSSECStats.MsgSize1);
+    LogInfo("DNSSEC  Msg Size (> 2048)       %u", m->DNSSECStats.MsgSize2);
+
+    LogMDNSStatistics(m);
+
+    LogMsgNoIdent("---- Task Scheduling Timers ----");
+
+    if (!m->NewQuestions)
+        LogMsgNoIdent("NewQuestion <NONE>");
+    else
+        LogMsgNoIdent("NewQuestion DelayAnswering %d %d %##s (%s)",
+                      m->NewQuestions->DelayAnswering, m->NewQuestions->DelayAnswering-now,
+                      m->NewQuestions->qname.c, DNSTypeName(m->NewQuestions->qtype));
+
+    if (!m->NewLocalOnlyQuestions)
+        LogMsgNoIdent("NewLocalOnlyQuestions <NONE>");
+    else
+        LogMsgNoIdent("NewLocalOnlyQuestions %##s (%s)",
+                      m->NewLocalOnlyQuestions->qname.c, DNSTypeName(m->NewLocalOnlyQuestions->qtype));
+
+    if (!m->NewLocalRecords)
+        LogMsgNoIdent("NewLocalRecords <NONE>");
+    else
+        LogMsgNoIdent("NewLocalRecords %02X %s", m->NewLocalRecords->resrec.RecordType, ARDisplayString(m, m->NewLocalRecords));
+
+    LogMsgNoIdent("SPSProxyListChanged%s", m->SPSProxyListChanged ? "" : " <NONE>");
+    LogMsgNoIdent("LocalRemoveEvents%s",   m->LocalRemoveEvents   ? "" : " <NONE>");
+    LogMsgNoIdent("m->AutoTunnelRelayAddr %.16a", &m->AutoTunnelRelayAddr);
+    LogMsgNoIdent("m->WABBrowseQueriesCount %d", m->WABBrowseQueriesCount);
+    LogMsgNoIdent("m->WABLBrowseQueriesCount %d", m->WABLBrowseQueriesCount);
+    LogMsgNoIdent("m->WABRegQueriesCount %d", m->WABRegQueriesCount);
+    LogMsgNoIdent("m->mDNSOppCaching %d", m->mDNSOppCaching);
+    LogMsgNoIdent("m->AutoTargetServices %d", m->AutoTargetServices);
+
+#define LogTimer(MSG,T) LogMsgNoIdent( MSG " %08X %11d  %08X %11d", (T), (T), (T)-now, (T)-now)
+
+    LogMsgNoIdent("                         ABS (hex)  ABS (dec)  REL (hex)  REL (dec)");
+    LogMsgNoIdent("m->timenow               %08X %11d", now, now);
+    LogMsgNoIdent("m->timenow_adjust        %08X %11d", m->timenow_adjust, m->timenow_adjust);
+    LogTimer("m->NextScheduledEvent   ", m->NextScheduledEvent);
+
+#ifndef UNICAST_DISABLED
+    LogTimer("m->NextuDNSEvent        ", m->NextuDNSEvent);
+    LogTimer("m->NextSRVUpdate        ", m->NextSRVUpdate);
+    LogTimer("m->NextScheduledNATOp   ", m->NextScheduledNATOp);
+    LogTimer("m->retryGetAddr         ", m->retryGetAddr);
+#endif
+
+    LogTimer("m->NextCacheCheck       ", m->NextCacheCheck);
+    LogTimer("m->NextScheduledSPS     ", m->NextScheduledSPS);
+    LogTimer("m->NextScheduledKA      ", m->NextScheduledKA);
+    LogTimer("m->NextScheduledSPRetry ", m->NextScheduledSPRetry);
+    LogTimer("m->DelaySleep           ", m->DelaySleep);
+
+    LogTimer("m->NextScheduledQuery   ", m->NextScheduledQuery);
+    LogTimer("m->NextScheduledProbe   ", m->NextScheduledProbe);
+    LogTimer("m->NextScheduledResponse", m->NextScheduledResponse);
+
+    LogTimer("m->SuppressSending      ", m->SuppressSending);
+    LogTimer("m->SuppressProbes       ", m->SuppressProbes);
+    LogTimer("m->ProbeFailTime        ", m->ProbeFailTime);
+    LogTimer("m->DelaySleep           ", m->DelaySleep);
+    LogTimer("m->SleepLimit           ", m->SleepLimit);
+    LogTimer("m->NextScheduledStopTime ", m->NextScheduledStopTime);
+}
+
+#if APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+mDNSexport void uds_validatelists(void)
+{
+    const request_state *req, *p;
+    for (req = all_requests; req; req=req->next)
+    {
+        if (req->next == (request_state *)~0 || (req->sd < 0 && req->sd != -2))
+            LogMemCorruption("UDS request list: %p is garbage (%d)", req, req->sd);
+
+        if (req->primary == req)
+            LogMemCorruption("UDS request list: req->primary should not point to self %p/%d", req, req->sd);
+
+        if (req->primary && req->replies)
+            LogMemCorruption("UDS request list: Subordinate request %p/%d/%p should not have replies (%p)",
+                             req, req->sd, req->primary && req->replies);
+
+        p = req->primary;
+        if ((long)p & 3)
+            LogMemCorruption("UDS request list: req %p primary %p is misaligned (%d)", req, p, req->sd);
+        else if (p && (p->next == (request_state *)~0 || (p->sd < 0 && p->sd != -2)))
+            LogMemCorruption("UDS request list: req %p primary %p is garbage (%d)", req, p, p->sd);
+
+        reply_state *rep;
+        for (rep = req->replies; rep; rep=rep->next)
+            if (rep->next == (reply_state *)~0)
+                LogMemCorruption("UDS req->replies: %p is garbage", rep);
+
+        if (req->terminate == connection_termination)
+        {
+            registered_record_entry *r;
+            for (r = req->u.reg_recs; r; r=r->next)
+                if (r->next == (registered_record_entry *)~0)
+                    LogMemCorruption("UDS req->u.reg_recs: %p is garbage", r);
+        }
+        else if (req->terminate == regservice_termination_callback)
+        {
+            service_instance *s;
+            for (s = req->u.servicereg.instances; s; s=s->next)
+                if (s->next == (service_instance *)~0)
+                    LogMemCorruption("UDS req->u.servicereg.instances: %p is garbage", s);
+        }
+        else if (req->terminate == browse_termination_callback)
+        {
+            browser_t *b;
+            for (b = req->u.browser.browsers; b; b=b->next)
+                if (b->next == (browser_t *)~0)
+                    LogMemCorruption("UDS req->u.browser.browsers: %p is garbage", b);
+        }
+    }
+
+    DNameListElem *d;
+    for (d = SCPrefBrowseDomains; d; d=d->next)
+        if (d->next == (DNameListElem *)~0 || d->name.c[0] > 63)
+            LogMemCorruption("SCPrefBrowseDomains: %p is garbage (%d)", d, d->name.c[0]);
+
+    ARListElem *b;
+    for (b = LocalDomainEnumRecords; b; b=b->next)
+        if (b->next == (ARListElem *)~0 || b->ar.resrec.name->c[0] > 63)
+            LogMemCorruption("LocalDomainEnumRecords: %p is garbage (%d)", b, b->ar.resrec.name->c[0]);
+
+    for (d = AutoBrowseDomains; d; d=d->next)
+        if (d->next == (DNameListElem *)~0 || d->name.c[0] > 63)
+            LogMemCorruption("AutoBrowseDomains: %p is garbage (%d)", d, d->name.c[0]);
+
+    for (d = AutoRegistrationDomains; d; d=d->next)
+        if (d->next == (DNameListElem *)~0 || d->name.c[0] > 63)
+            LogMemCorruption("AutoRegistrationDomains: %p is garbage (%d)", d, d->name.c[0]);
+}
+#endif // APPLE_OSX_mDNSResponder && MACOSX_MDNS_MALLOC_DEBUGGING
+
+mDNSlocal int send_msg(request_state *const req)
+{
+    reply_state *const rep = req->replies;      // Send the first waiting reply
+    ssize_t nwriten;
+    if (req->no_reply) return(t_complete);
+
+    ConvertHeaderBytes(rep->mhdr);
+    nwriten = send(req->sd, (char *)&rep->mhdr + rep->nwriten, rep->totallen - rep->nwriten, 0);
+    ConvertHeaderBytes(rep->mhdr);
+
+    if (nwriten < 0)
+    {
+        if (dnssd_errno == dnssd_EINTR || dnssd_errno == dnssd_EWOULDBLOCK) nwriten = 0;
+        else
+        {
+#if !defined(PLATFORM_NO_EPIPE)
+            if (dnssd_errno == EPIPE)
+                return(req->ts = t_terminated);
+            else
+#endif
+            {
+                LogMsg("send_msg ERROR: failed to write %d of %d bytes to fd %d errno %d (%s)",
+                       rep->totallen - rep->nwriten, rep->totallen, req->sd, dnssd_errno, dnssd_strerror(dnssd_errno));
+                return(t_error);
+            }
+        }
+    }
+    rep->nwriten += nwriten;
+    return (rep->nwriten == rep->totallen) ? t_complete : t_morecoming;
+}
+
+mDNSexport mDNSs32 udsserver_idle(mDNSs32 nextevent)
+{
+    mDNSs32 now = mDNS_TimeNow(&mDNSStorage);
+    request_state **req = &all_requests;
+
+    while (*req)
+    {
+        request_state *const r = *req;
+
+        if (r->terminate == resolve_termination_callback)
+            if (r->u.resolve.ReportTime && now - r->u.resolve.ReportTime >= 0)
+            {
+                r->u.resolve.ReportTime = 0;
+                LogMsgNoIdent("Client application bug PID[%d](%s) : DNSServiceResolve(%##s) active for over two minutes. "
+                              "This places considerable burden on the network.", r->process_id, r->pid_name, r->u.resolve.qsrv.qname.c);
+            }
+
+        // Note: Only primary req's have reply lists, not subordinate req's.
+        while (r->replies)      // Send queued replies
+        {
+            transfer_state result;
+            if (r->replies->next) 
+                r->replies->rhdr->flags |= dnssd_htonl(kDNSServiceFlagsMoreComing);
+            result = send_msg(r);   // Returns t_morecoming if buffer full because client is not reading
+            if (result == t_complete)
+            {
+                reply_state *fptr = r->replies;
+                r->replies = r->replies->next;
+                freeL("reply_state/udsserver_idle", fptr);
+                r->time_blocked = 0; // reset failure counter after successful send
+                r->unresponsiveness_reports = 0;
+                continue;
+            }
+            else if (result == t_terminated || result == t_error)
+            {
+                LogMsg("%3d: Could not write data to clientPID[%d](%s)  because of error - aborting connection", r->sd, r->process_id, r->pid_name);
+                LogClientInfo(&mDNSStorage, r);
+                abort_request(r);
+            }
+            break;
+        }
+
+        if (r->replies)     // If we failed to send everything, check our time_blocked timer
+        {
+            if (nextevent - now > mDNSPlatformOneSecond) 
+                nextevent = now + mDNSPlatformOneSecond;
+
+            if (mDNSStorage.SleepState != SleepState_Awake) 
+                r->time_blocked = 0;
+            else if (!r->time_blocked) 
+                r->time_blocked = NonZeroTime(now);
+            else if (now - r->time_blocked >= 10 * mDNSPlatformOneSecond * (r->unresponsiveness_reports+1))
+            {
+                int num = 0;
+                struct reply_state *x = r->replies;
+                while (x) 
+                { 
+                    num++; 
+                    x=x->next; 
+                }
+                LogMsg("%3d: Could not write data to client PID[%d](%s) after %ld seconds, %d repl%s waiting",
+                       r->sd, r->process_id, r->pid_name, (now - r->time_blocked) / mDNSPlatformOneSecond, num, num == 1 ? "y" : "ies");
+                if (++r->unresponsiveness_reports >= 60)
+                {
+                    LogMsg("%3d: Client PID[%d](%s) unresponsive; aborting connection", r->sd, r->process_id, r->pid_name);
+                    LogClientInfo(&mDNSStorage, r);
+                    abort_request(r);
+                }
+            }
+        }
+
+        if (!dnssd_SocketValid(r->sd)) // If this request is finished, unlink it from the list and free the memory
+        {
+            // Since we're already doing a list traversal, we unlink the request directly instead of using AbortUnlinkAndFree()
+            *req = r->next;
+            freeL("request_state/udsserver_idle", r);
+        }
+        else
+            req = &r->next;
+    }
+    return nextevent;
+}
+
+struct CompileTimeAssertionChecks_uds_daemon
+{
+    // Check our structures are reasonable sizes. Including overly-large buffers, or embedding
+    // other overly-large structures instead of having a pointer to them, can inadvertently
+    // cause structure sizes (and therefore memory usage) to balloon unreasonably.
+    char sizecheck_request_state          [(sizeof(request_state)           <= 2000) ? 1 : -1];
+    char sizecheck_registered_record_entry[(sizeof(registered_record_entry) <=   60) ? 1 : -1];
+    char sizecheck_service_instance       [(sizeof(service_instance)        <= 6552) ? 1 : -1];
+    char sizecheck_browser_t              [(sizeof(browser_t)               <= 1096) ? 1 : -1];
+    char sizecheck_reply_hdr              [(sizeof(reply_hdr)               <=   12) ? 1 : -1];
+    char sizecheck_reply_state            [(sizeof(reply_state)             <=   64) ? 1 : -1];
+};
diff --git a/mDNSResponder/mDNSShared/uds_daemon.h b/mDNSResponder/mDNSShared/uds_daemon.h
new file mode 100644
index 00000000..ca361172
--- /dev/null
+++ b/mDNSResponder/mDNSShared/uds_daemon.h
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    File:		uds_daemon.h
+
+    Contains:	Interfaces necessary to talk to uds_daemon.c.
+
+    Version:	1.0
+
+ */
+
+#include "mDNSEmbeddedAPI.h"
+#include "dnssd_ipc.h"
+
+/* Client interface: */
+
+#define SRS_PORT(S) mDNSVal16((S)->RR_SRV.resrec.rdata->u.srv.port)
+
+extern int udsserver_init(dnssd_sock_t skts[], mDNSu32 count);
+extern mDNSs32 udsserver_idle(mDNSs32 nextevent);
+extern void udsserver_info(mDNS *const m);  // print out info about current state
+extern void udsserver_handle_configchange(mDNS *const m);
+extern int udsserver_exit(void);    // should be called prior to app exit
+extern void LogMcastStateInfo(mDNS *const m, mDNSBool mflag, mDNSBool start, mDNSBool mstatelog);
+#define LogMcastQ       (mDNS_McastLoggingEnabled == 0) ? ((void)0) : LogMcastQuestion
+#define LogMcastS       (mDNS_McastLoggingEnabled == 0) ? ((void)0) : LogMcastService
+#define LogMcast        (mDNS_McastLoggingEnabled == 0) ? ((void)0) : LogMsg
+#define LogMcastNoIdent (mDNS_McastLoggingEnabled == 0) ? ((void)0) : LogMsgNoIdent
+
+/* Routines that uds_daemon expects to link against: */
+
+typedef void (*udsEventCallback)(int fd, short filter, void *context);
+extern mStatus udsSupportAddFDToEventLoop(dnssd_sock_t fd, udsEventCallback callback, void *context, void **platform_data);
+extern int     udsSupportReadFD(dnssd_sock_t fd, char* buf, int len, int flags, void *platform_data);
+extern mStatus udsSupportRemoveFDFromEventLoop(dnssd_sock_t fd, void *platform_data); // Note: This also CLOSES the file descriptor as well
+
+extern void RecordUpdatedNiceLabel(mDNS *const m, mDNSs32 delay);
+
+// Globals and functions defined in uds_daemon.c and also shared with the old "daemon.c" on OS X
+
+extern mDNS mDNSStorage;
+extern DNameListElem *AutoRegistrationDomains;
+extern DNameListElem *AutoBrowseDomains;
+
+extern mDNSs32 ChopSubTypes(char *regtype, char **AnonData);
+extern AuthRecord *AllocateSubTypes(mDNSs32 NumSubTypes, char *p, char **AnonData);
+extern int CountExistingRegistrations(domainname *srv, mDNSIPPort port);
+extern void FreeExtraRR(mDNS *const m, AuthRecord *const rr, mStatus result);
+extern int CountPeerRegistrations(mDNS *const m, ServiceRecordSet *const srs);
+
+#if APPLE_OSX_mDNSResponder
+
+extern void machserver_automatic_browse_domain_changed(const domainname *d, mDNSBool add);
+extern void machserver_automatic_registration_domain_changed(const domainname *d, mDNSBool add);
+// D2D interface support
+extern void external_start_browsing_for_service(mDNSInterfaceID InterfaceID, const domainname *const type, DNS_TypeValues qtype, DNSServiceFlags flags);
+extern void external_stop_browsing_for_service(mDNSInterfaceID InterfaceID, const domainname *const type, DNS_TypeValues qtype, DNSServiceFlags flags);
+extern void external_start_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags);
+extern void external_stop_advertising_service(const ResourceRecord *const resourceRecord, DNSServiceFlags flags);
+extern void external_start_resolving_service(mDNSInterfaceID InterfaceID, const domainname *const fqdn, DNSServiceFlags flags);
+extern void external_stop_resolving_service(mDNSInterfaceID InterfaceID, const domainname *const fqdn, DNSServiceFlags flags);
+extern void external_connection_release(const domainname *instance);
+
+#else   // APPLE_OSX_mDNSResponder
+
+#define external_start_browsing_for_service(A,B,C,D) (void)(A)
+#define external_stop_browsing_for_service(A,B,C,D)  (void)(A)
+#define external_start_advertising_service(A,B)      (void)(A)
+#define external_stop_advertising_service(A,B)       (void)(A)
+#define external_start_resolving_service(A,B,C)      (void)(A)
+#define external_stop_resolving_service(A,B,C)       (void)(A)
+#define external_connection_release(A)               (void)(A)
+
+#endif // APPLE_OSX_mDNSResponder
+
+extern const char mDNSResponderVersionString_SCCS[];
+#define mDNSResponderVersionString (mDNSResponderVersionString_SCCS+5)
diff --git a/mDNSResponder/mDNSVxWorks/README.txt b/mDNSResponder/mDNSVxWorks/README.txt
new file mode 100644
index 00000000..f0ea01ef
--- /dev/null
+++ b/mDNSResponder/mDNSVxWorks/README.txt
@@ -0,0 +1,8 @@
+These are the platform support files for running mDNSCore on VxWorks.
+
+Please note, most of the developers working on the mDNSResponder code do
+not have access to a VxWorks development environment, so they are not able
+to personally verify that the VxWorks compiles and runs successfully after
+every single change to the mDNSCore code. We do try to take care not to
+make careless changes that would break the VxWorks build, but if you do
+find that something is broken, let us know and we'll fix it.
diff --git a/mDNSResponder/mDNSVxWorks/mDNSVxWorks.c b/mDNSResponder/mDNSVxWorks/mDNSVxWorks.c
new file mode 100644
index 00000000..685dbf76
--- /dev/null
+++ b/mDNSResponder/mDNSVxWorks/mDNSVxWorks.c
@@ -0,0 +1,2147 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if 0
+#pragma mark == Configuration ==
+#endif
+
+//===========================================================================================================================
+//	Configuration
+//===========================================================================================================================
+
+#define DEBUG_NAME                          "[mDNS] "
+#define MDNS_AAAA_OVER_IPV4                 1   // 1=Send AAAA & A records over IPv4 & IPv6, 0=Send AAAA over IPv6, A over IPv4.
+#define MDNS_EXCLUDE_IPV4_ROUTABLE_IPV6     1   // 1=Don't use IPv6 socket if non-link-local IPv4 available on same interface.
+#define MDNS_ENABLE_PPP                     0   // 1=Enable Unicast DNS over PPP interfaces. 0=Don't enable it.
+#define MDNS_DEBUG_PACKETS                  1   // 1=Enable debug output for packet send/recv if debug level high enough.
+#define MDNS_DEBUG_SHOW                     1   // 1=Enable console show routines.
+#define DEBUG_USE_DEFAULT_CATEGORY          1   // Set up to use the default category (see DebugServices.h for details).
+
+#include    <stdarg.h>
+#include    <stddef.h>
+#include    <stdio.h>
+#include    <stdlib.h>
+#include    <string.h>
+#include    <time.h>
+
+#include    "vxWorks.h"
+#include    "config.h"
+
+#include    <sys/types.h>
+
+#include    <arpa/inet.h>
+#include    <net/if.h>
+#include    <net/if_dl.h>
+#include    <net/if_types.h>
+#include    <net/ifaddrs.h>
+#include    <netinet6/in6_var.h>
+#include    <netinet/if_ether.h>
+#include    <netinet/in.h>
+#include    <netinet/ip.h>
+#include    <sys/ioctl.h>
+#include    <sys/socket.h>
+#include    <unistd.h>
+
+#include    "ifLib.h"
+#include    "inetLib.h"
+#include    "pipeDrv.h"
+#include    "selectLib.h"
+#include    "semLib.h"
+#include    "sockLib.h"
+#include    "sysLib.h"
+#include    "taskLib.h"
+#include    "tickLib.h"
+
+#include    "CommonServices.h"
+#include    "DebugServices.h"
+#include    "DNSCommon.h"
+#include    "mDNSEmbeddedAPI.h"
+
+#include    "mDNSVxWorks.h"
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+typedef uint8_t MDNSPipeCommandCode;
+
+#define kMDNSPipeCommandCodeInvalid         0
+#define kMDNSPipeCommandCodeReschedule      1
+#define kMDNSPipeCommandCodeReconfigure     2
+#define kMDNSPipeCommandCodeQuit            3
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+#if ( DEBUG )
+mDNSlocal void  DebugMsg( DebugLevel inLevel, const char *inFormat, ... );
+
+    #define dmsg( LEVEL, ARGS... )  DebugMsg( LEVEL, ## ARGS )
+#else
+    #define dmsg( LEVEL, ARGS... )
+#endif
+
+#if ( DEBUG && MDNS_DEBUG_PACKETS )
+    #define dpkt( LEVEL, ARGS... )  DebugMsg( LEVEL, ## ARGS )
+#else
+    #define dpkt( LEVEL, ARGS... )
+#endif
+
+#define ForgetSem( X )      do { if( *( X ) ) { semDelete( ( *X ) ); *( X ) = 0; } } while( 0 )
+#define ForgetSocket( X )   do { if( IsValidSocket( *( X ) ) ) { close_compat( *( X ) ); *( X ) = kInvalidSocketRef; } } while( 0 )
+
+// Interfaces
+
+mDNSlocal mStatus   UpdateInterfaceList( mDNS *const inMDNS, mDNSs32 inUTC );
+mDNSlocal NetworkInterfaceInfoVxWorks * AddInterfaceToList( mDNS *const inMDNS, struct ifaddrs *inIFA, mDNSs32 inUTC );
+mDNSlocal int   SetupActiveInterfaces( mDNS *const inMDNS, mDNSs32 inUTC );
+mDNSlocal void  MarkAllInterfacesInactive( mDNS *const inMDNS, mDNSs32 inUTC );
+mDNSlocal int   ClearInactiveInterfaces( mDNS *const inMDNS, mDNSs32 inUTC, mDNSBool inClosing );
+mDNSlocal NetworkInterfaceInfoVxWorks * FindRoutableIPv4( mDNS *const inMDNS, mDNSu32 inScopeID );
+mDNSlocal NetworkInterfaceInfoVxWorks * FindInterfaceByIndex( mDNS *const inMDNS, int inFamily, mDNSu32 inIndex );
+mDNSlocal mStatus   SetupSocket( mDNS *const inMDNS, const mDNSAddr *inAddr, mDNSBool inMcast, int inFamily, SocketSet *inSS );
+mDNSlocal mStatus   SockAddrToMDNSAddr( const struct sockaddr * const inSA, mDNSAddr *outIP );
+
+// Commands
+
+mDNSlocal mStatus   SetupCommandPipe( mDNS * const inMDNS );
+mDNSlocal mStatus   TearDownCommandPipe( mDNS * const inMDNS );
+mDNSlocal mStatus   SendCommand( const mDNS * const inMDNS, MDNSPipeCommandCode inCommandCode );
+mDNSlocal mStatus   ProcessCommand( mDNS * const inMDNS );
+
+// Threads
+
+mDNSlocal void      Task( mDNS *inMDNS );
+mDNSlocal mStatus   TaskInit( mDNS *inMDNS );
+mDNSlocal void      TaskTerm( mDNS *inMDNS );
+mDNSlocal void      TaskSetupSelect( mDNS *inMDNS, fd_set *outSet, int *outMaxFd, mDNSs32 inNextEvent, struct timeval *outTimeout );
+mDNSlocal void      TaskProcessPackets( mDNS *inMDNS, SocketSet *inSS, SocketRef inSock );
+mDNSlocal ssize_t
+mDNSRecvMsg(
+    SocketRef inSock,
+    void *      inBuffer,
+    size_t inBufferSize,
+    void *      outFrom,
+    size_t inFromSize,
+    size_t *    outFromSize,
+    mDNSAddr *  outDstAddr,
+    uint32_t *  outIndex );
+
+// DNSServices compatibility. When all clients move to DNS-SD, this section can be removed.
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+typedef struct mDNSPlatformInterfaceInfo mDNSPlatformInterfaceInfo;
+struct  mDNSPlatformInterfaceInfo
+{
+    const char *        name;
+    mDNSAddr ip;
+};
+
+mDNSexport mStatus  mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID );
+mDNSexport mStatus  mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo );
+
+#ifdef  __cplusplus
+}
+#endif
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+debug_log_new_default_category( mdns );
+
+mDNSexport mDNSs32 mDNSPlatformOneSecond;
+mDNSlocal mDNSs32 gMDNSTicksToMicro       = 0;
+mDNSlocal mDNS *                    gMDNSPtr                = NULL;
+mDNSlocal mDNS_PlatformSupport gMDNSPlatformSupport;
+mDNSlocal mDNSBool gMDNSDeferIPv4          = mDNSfalse;
+#if ( DEBUG )
+DebugLevel gMDNSDebugOverrideLevel = kDebugLevelMax;
+#endif
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	mDNSReconfigure
+//===========================================================================================================================
+
+void    mDNSReconfigure( void )
+{
+    if( gMDNSPtr ) SendCommand( gMDNSPtr, kMDNSPipeCommandCodeReconfigure );
+}
+
+//===========================================================================================================================
+//	mDNSDeferIPv4
+//===========================================================================================================================
+
+void    mDNSDeferIPv4( mDNSBool inDefer )
+{
+    gMDNSDeferIPv4 = inDefer;
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	mDNSPlatformInit
+//===========================================================================================================================
+
+mStatus mDNSPlatformInit( mDNS * const inMDNS )
+{
+    mStatus err;
+    int id;
+
+    mDNSPlatformOneSecond   = sysClkRateGet();
+    gMDNSTicksToMicro       = ( 1000000L / mDNSPlatformOneSecond );
+
+    // Do minimal initialization to get the task started and so we can cleanup safely if an error occurs.
+
+    mDNSPlatformMemZero( &gMDNSPlatformSupport, sizeof( gMDNSPlatformSupport ) );
+    if( !inMDNS->p ) inMDNS->p  = &gMDNSPlatformSupport;
+    inMDNS->p->unicastSS.info   = NULL;
+    inMDNS->p->unicastSS.sockV4 = kInvalidSocketRef;
+    inMDNS->p->unicastSS.sockV6 = kInvalidSocketRef;
+    inMDNS->p->initErr          = mStatus_NotInitializedErr;
+    inMDNS->p->commandPipe      = ERROR;
+    inMDNS->p->taskID           = ERROR;
+
+    inMDNS->p->lock = semMCreate( SEM_Q_FIFO );
+    require_action( inMDNS->p->lock, exit, err = mStatus_NoMemoryErr );
+
+    inMDNS->p->initEvent = semBCreate( SEM_Q_FIFO, SEM_EMPTY );
+    require_action( inMDNS->p->initEvent, exit, err = mStatus_NoMemoryErr );
+
+    inMDNS->p->quitEvent = semBCreate( SEM_Q_FIFO, SEM_EMPTY );
+    require_action( inMDNS->p->quitEvent, exit, err = mStatus_NoMemoryErr );
+
+    // Start the task and wait for it to initialize. The task does the full initialization from its own context
+    // to avoid potential issues with stack space and APIs that key off the current task (e.g. watchdog timers).
+    // We wait here until the init is complete because it needs to be ready to use as soon as this function returns.
+
+    id = taskSpawn( "tMDNS", 102, 0, 16384, (FUNCPTR) Task, (int) inMDNS, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
+    err = translate_errno( id != ERROR, errno_compat(), mStatus_NoMemoryErr );
+    require_noerr( err, exit );
+
+    err = semTake( inMDNS->p->initEvent, WAIT_FOREVER );
+    if( err == OK ) err = inMDNS->p->initErr;
+    require_noerr( err, exit );
+
+    gMDNSPtr = inMDNS;
+    mDNSCoreInitComplete( inMDNS, err );
+
+exit:
+    if( err ) mDNSPlatformClose( inMDNS );
+    return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformClose
+//===========================================================================================================================
+
+void    mDNSPlatformClose( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    check( inMDNS );
+
+    gMDNSPtr = NULL;
+
+    // Signal the task to quit and wait for it to signal back that it exited. Timeout in 10 seconds to handle a hung thread.
+
+    if( inMDNS->p->taskID != ERROR )
+    {
+        SendCommand( inMDNS, kMDNSPipeCommandCodeQuit );
+        if( inMDNS->p->quitEvent )
+        {
+            err = semTake( inMDNS->p->quitEvent, sysClkRateGet() * 10 );
+            check_noerr( err );
+        }
+        inMDNS->p->taskID = ERROR;
+    }
+
+    // Clean up resources set up in mDNSPlatformInit. All other resources should have been cleaned up already by TaskTerm.
+
+    ForgetSem( &inMDNS->p->quitEvent );
+    ForgetSem( &inMDNS->p->initEvent );
+    ForgetSem( &inMDNS->p->lock );
+
+    dmsg( kDebugLevelNotice, DEBUG_NAME "CLOSED\n" );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformSendUDP
+//===========================================================================================================================
+
+mStatus
+mDNSPlatformSendUDP(
+    const mDNS * const inMDNS,
+    const void * const inMsg,
+    const mDNSu8 * const inEnd,
+    mDNSInterfaceID inInterfaceID,
+    const mDNSAddr *            inDstIP,
+    mDNSIPPort inDstPort )
+{
+    mStatus err;
+    NetworkInterfaceInfoVxWorks *       info;
+    SocketRef sock;
+    struct sockaddr_storage to;
+    int n;
+
+    // Set up the sockaddr to sent to and the socket to send on.
+
+    info = (NetworkInterfaceInfoVxWorks *) inInterfaceID;
+    if( inDstIP->type == mDNSAddrType_IPv4 )
+    {
+        struct sockaddr_in *        sa4;
+
+        sa4 = (struct sockaddr_in *) &to;
+        sa4->sin_len            = sizeof( *sa4 );
+        sa4->sin_family         = AF_INET;
+        sa4->sin_port           = inDstPort.NotAnInteger;
+        sa4->sin_addr.s_addr    = inDstIP->ip.v4.NotAnInteger;
+        sock = info ? info->ss.sockV4 : inMDNS->p->unicastSS.sockV4;
+    }
+    else if( inDstIP->type == mDNSAddrType_IPv6 )
+    {
+        struct sockaddr_in6 *       sa6;
+
+        sa6 = (struct sockaddr_in6 *) &to;
+        sa6->sin6_len       = sizeof( *sa6 );
+        sa6->sin6_family    = AF_INET6;
+        sa6->sin6_port      = inDstPort.NotAnInteger;
+        sa6->sin6_flowinfo  = 0;
+        sa6->sin6_addr      = *( (struct in6_addr *) &inDstIP->ip.v6 );
+        sa6->sin6_scope_id  = info ? info->scopeID : 0;
+        sock = info ? info->ss.sockV6 : inMDNS->p->unicastSS.sockV6;
+    }
+    else
+    {
+        dmsg( kDebugLevelError, DEBUG_NAME "%s: ERROR! destination is not an IPv4 or IPv6 address\n", __ROUTINE__ );
+        err = mStatus_BadParamErr;
+        goto exit;
+    }
+
+    // Send the packet if we've got a valid socket of this type. Note: mDNSCore may ask us to send an IPv4 packet and then
+    // an IPv6 multicast packet. If we don't have the corresponding type of socket available, quietly return an error.
+
+    n = (int)( (mDNSu8 *) inEnd - (mDNSu8 *) inMsg );
+    if( !IsValidSocket( sock ) )
+    {
+        dpkt( kDebugLevelChatty - 1,
+              DEBUG_NAME "DROP: %4d bytes,                                                     DST=[%#39a]:%5hu, IF=%8s(%u) %#p\n",
+              n, inDstIP, mDNSVal16( inDstPort ), info ? info->ifinfo.ifname : "unicast", info ? info->scopeID : 0, info );
+        err = mStatus_Invalid;
+        goto exit;
+    }
+
+    dpkt( kDebugLevelChatty,
+          DEBUG_NAME "SEND %4d bytes,                                                      DST=[%#39a]:%5hu, IF=%8s(%u) %#p\n",
+          n, inDstIP, mDNSVal16( inDstPort ), info ? info->ifinfo.ifname : "unicast", info ? info->scopeID : 0, info );
+
+    n = sendto( sock, (mDNSu8 *) inMsg, n, 0, (struct sockaddr *) &to, to.ss_len );
+    if( n < 0 )
+    {
+        // Don't warn about ARP failures or no route to host for unicast destinations.
+
+        err = errno_compat();
+        if( ( ( err == EHOSTDOWN ) || ( err == ENETDOWN ) || ( err == EHOSTUNREACH ) ) && !mDNSAddressIsAllDNSLinkGroup( inDstIP ) )
+        {
+            goto exit;
+        }
+
+        dmsg( kDebugLevelError, "%s: ERROR! sendto failed on %8s(%u) to %#a:%d, sock %d, err %d, time %u\n",
+              __ROUTINE__, info ? info->ifinfo.ifname : "unicast", info ? info->scopeID : 0, inDstIP, mDNSVal16( inDstPort ),
+              sock, err, (unsigned int) inMDNS->timenow );
+        if( err == 0 ) err = mStatus_UnknownErr;
+        goto exit;
+    }
+    err = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	Connection-oriented (TCP) functions
+//===========================================================================================================================
+
+mDNSexport mStatus mDNSPlatformTCPConnect(const mDNSAddr *dst, mDNSOpaque16 dstport, mDNSInterfaceID InterfaceID,
+                                          TCPConnectionCallback callback, void *context, int *descriptor)
+{
+    (void)dst;          // Unused
+    (void)dstport;      // Unused
+    (void)InterfaceID;  // Unused
+    (void)callback;     // Unused
+    (void)context;      // Unused
+    (void)descriptor;   // Unused
+    return(mStatus_UnsupportedErr);
+}
+
+mDNSexport void mDNSPlatformTCPCloseConnection(int sd)
+{
+    (void)sd;           // Unused
+}
+
+mDNSexport long mDNSPlatformReadTCP(int sd, void *buf, unsigned long buflen)
+{
+    (void)sd;           // Unused
+    (void)buf;          // Unused
+    (void)buflen;       // Unused
+    return(0);
+}
+
+mDNSexport long mDNSPlatformWriteTCP(int sd, const char *msg, unsigned long len)
+{
+    (void)sd;           // Unused
+    (void)msg;          // Unused
+    (void)len;          // Unused
+    return(0);
+}
+
+//===========================================================================================================================
+//	mDNSPlatformLock
+//===========================================================================================================================
+
+void    mDNSPlatformLock( const mDNS * const inMDNS )
+{
+    check_string( inMDNS->p && ( inMDNS->p->taskID != ERROR ), "mDNS task not started" );
+
+#if ( DEBUG )
+    if( semTake( inMDNS->p->lock, 60 * sysClkRateGet() ) != OK )
+    {
+        dmsg( kDebugLevelTragic, "\n### DEADLOCK DETECTED ### (sem=%#p, task=%#p)\n\n", inMDNS->p->lock, taskIdSelf() );
+        debug_stack_trace();            // 1) Print Stack Trace.
+        semShow( inMDNS->p->lock, 1 );  // 2) Print semaphore info, including which tasks are pending on it.
+        taskSuspend( 0 );               // 3) Suspend task. Can be resumed from the console for debugging.
+    }
+#else
+    semTake( inMDNS->p->lock, WAIT_FOREVER );
+#endif
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUnlock
+//===========================================================================================================================
+
+void    mDNSPlatformUnlock( const mDNS * const inMDNS )
+{
+    check_string( inMDNS->p && ( inMDNS->p->taskID != ERROR ), "mDNS task not started" );
+
+    // Wake up the mDNS task to handle any work initiated by an API call and to calculate the next event time.
+    // We only need to wake up if we're not already inside the task. This avoids filling up the command queue.
+
+    if( taskIdSelf() != inMDNS->p->taskID )
+    {
+        SendCommand( inMDNS, kMDNSPipeCommandCodeReschedule );
+    }
+    semGive( inMDNS->p->lock );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrLen
+//===========================================================================================================================
+
+mDNSu32 mDNSPlatformStrLen( const void *inSrc )
+{
+    check( inSrc );
+
+    return( (mDNSu32) strlen( (const char *) inSrc ) );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrCopy
+//===========================================================================================================================
+
+void    mDNSPlatformStrCopy( void *inDst, const void *inSrc )
+{
+    check( inSrc );
+    check( inDst );
+
+    strcpy( (char *) inDst, (const char*) inSrc );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemCopy
+//===========================================================================================================================
+
+void    mDNSPlatformMemCopy( void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+    check( inSrc );
+    check( inDst );
+
+    memcpy( inDst, inSrc, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemSame
+//===========================================================================================================================
+
+mDNSBool    mDNSPlatformMemSame( const void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+    check( inSrc );
+    check( inDst );
+
+    return( memcmp( inSrc, inDst, inSize ) == 0 );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemZero
+//===========================================================================================================================
+
+void    mDNSPlatformMemZero( void *inDst, mDNSu32 inSize )
+{
+    check( inDst );
+
+    memset( inDst, 0, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemAllocate
+//===========================================================================================================================
+
+mDNSexport void *   mDNSPlatformMemAllocate( mDNSu32 inSize )
+{
+    void *      mem;
+
+    check( inSize > 0 );
+
+    mem = malloc( inSize );
+    check( mem );
+
+    return( mem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemFree
+//===========================================================================================================================
+
+mDNSexport void mDNSPlatformMemFree( void *inMem )
+{
+    check( inMem );
+    if( inMem ) free( inMem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRandomSeed
+//===========================================================================================================================
+
+mDNSexport mDNSu32  mDNSPlatformRandomSeed( void )
+{
+    return( tickGet() );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTimeInit
+//===========================================================================================================================
+
+mDNSexport mStatus  mDNSPlatformTimeInit( void )
+{
+    // No special setup is required on VxWorks -- we just use tickGet().
+
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRawTime
+//===========================================================================================================================
+
+mDNSs32 mDNSPlatformRawTime( void )
+{
+    return( (mDNSs32) tickGet() );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUTC
+//===========================================================================================================================
+
+mDNSexport mDNSs32  mDNSPlatformUTC( void )
+{
+    return( (mDNSs32) time( NULL ) );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIDfromInterfaceIndex
+//===========================================================================================================================
+
+mDNSexport mDNSInterfaceID  mDNSPlatformInterfaceIDfromInterfaceIndex( mDNS *const inMDNS, mDNSu32 inIndex )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    if( inIndex == (mDNSu32) -1 ) return( mDNSInterface_LocalOnly );
+    if( inIndex != 0 )
+    {
+        for( i = inMDNS->p->interfaceList; i; i = i->next )
+        {
+            // Don't get tricked by inactive interfaces with no InterfaceID set.
+
+            if( i->ifinfo.InterfaceID && ( i->scopeID == inIndex ) ) return( i->ifinfo.InterfaceID );
+        }
+    }
+    return( NULL );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIndexfromInterfaceID
+//===========================================================================================================================
+
+mDNSexport mDNSu32  mDNSPlatformInterfaceIndexfromInterfaceID( mDNS *const inMDNS, mDNSInterfaceID inID )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    if( inID == mDNSInterface_LocalOnly ) return( (mDNSu32) -1 );
+    if( inID )
+    {
+        // Don't use i->ifinfo.InterfaceID here, because we DO want to find inactive interfaces.
+
+        for( i = inMDNS->p->interfaceList; i && ( (mDNSInterfaceID) i != inID ); i = i->next ) {}
+        if( i ) return( i->scopeID );
+    }
+    return( 0 );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceNameToID
+//===========================================================================================================================
+
+mStatus mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        // Don't get tricked by inactive interfaces with no InterfaceID set.
+
+        if( i->ifinfo.InterfaceID && ( strcmp( i->ifinfo.ifname, inName ) == 0 ) )
+        {
+            *outID = (mDNSInterfaceID) i;
+            return( mStatus_NoError );
+        }
+    }
+    return( mStatus_NoSuchNameErr );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIDToInfo
+//===========================================================================================================================
+
+mStatus mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    // Don't use i->ifinfo.InterfaceID here, because we DO want to find inactive interfaces.
+
+    for( i = inMDNS->p->interfaceList; i && ( (mDNSInterfaceID) i != inID ); i = i->next ) {}
+    if( !i ) return( mStatus_NoSuchNameErr );
+
+    outInfo->name   = i->ifinfo.ifname;
+    outInfo->ip     = i->ifinfo.ip;
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	debugf_
+//===========================================================================================================================
+
+#if ( MDNS_DEBUGMSGS > 0 )
+mDNSexport void debugf_( const char *inFormat, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+
+    va_start( args, inFormat );
+    mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+    va_end( args );
+
+    dlog( kDebugLevelInfo, "%s\n", buffer );
+}
+#endif
+
+//===========================================================================================================================
+//	verbosedebugf_
+//===========================================================================================================================
+
+#if ( MDNS_DEBUGMSGS > 1 )
+mDNSexport void verbosedebugf_( const char *inFormat, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+
+    va_start( args, inFormat );
+    mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+    va_end( args );
+
+    dlog( kDebugLevelVerbose, "%s\n", buffer );
+}
+#endif
+
+//===========================================================================================================================
+//	LogMsg
+//===========================================================================================================================
+
+mDNSexport void LogMsg( const char *inFormat, ... )
+{
+#if ( DEBUG )
+    char buffer[ 512 ];
+    va_list args;
+
+    va_start( args, inFormat );
+    mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+    va_end( args );
+
+    dlog( kDebugLevelWarning, "%s\n", buffer );
+#else
+    DEBUG_UNUSED( inFormat );
+#endif
+}
+
+#if ( DEBUG )
+//===========================================================================================================================
+//	DebugMsg
+//===========================================================================================================================
+
+mDNSlocal void  DebugMsg( DebugLevel inLevel, const char *inFormat, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+
+    va_start( args, inFormat );
+    mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+    va_end( args );
+
+    if( inLevel >= gMDNSDebugOverrideLevel ) inLevel = kDebugLevelMax;
+    dlog( inLevel, "%s", buffer );
+}
+#endif
+
+#if 0
+#pragma mark -
+#pragma mark == Interfaces ==
+#endif
+
+//===========================================================================================================================
+//	UpdateInterfaceList
+//===========================================================================================================================
+
+#if ( MDNS_ENABLE_PPP )
+
+// Note: This includes PPP dial-in interfaces (pppXYZ), but not PPP dial-out interface (pppdXYZ).
+
+    #define IsCompatibleInterface( IFA )                                                                        \
+    ( ( ( IFA )->ifa_flags & IFF_UP )                                                                   &&  \
+      ( ( ( IFA )->ifa_addr->sa_family == AF_INET ) || ( ( IFA )->ifa_addr->sa_family == AF_INET6 ) )   &&  \
+      ( ( IFA )->ifa_netmask && ( ( IFA )->ifa_addr->sa_family == ( IFA )->ifa_netmask->sa_family ) )   &&  \
+      ( !( ( IFA )->ifa_flags & IFF_POINTOPOINT ) || ( strncmp( ( IFA )->ifa_name, "pppd", 4 ) != 0 ) ) )
+#else
+    #define IsCompatibleInterface( IFA )                                                                                \
+    ( ( ( ( IFA )->ifa_flags & ( IFF_UP | IFF_MULTICAST | IFF_POINTOPOINT ) ) == ( IFF_UP | IFF_MULTICAST ) )   &&  \
+      ( ( ( IFA )->ifa_addr->sa_family == AF_INET ) || ( ( IFA )->ifa_addr->sa_family == AF_INET6 ) )           &&  \
+      ( ( IFA )->ifa_netmask && ( ( IFA )->ifa_addr->sa_family == ( IFA )->ifa_netmask->sa_family ) ) )
+#endif
+
+#define IsLinkLocalSockAddr( SA )                                                                   \
+    ( ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET )                                 \
+      ? ( ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 0 ] == 169 ) &&   \
+          ( ( (uint8_t *)( &( (const struct sockaddr_in *)( SA ) )->sin_addr ) )[ 1 ] == 254 ) )    \
+      : IN6_IS_ADDR_LINKLOCAL( &( (const struct sockaddr_in6 *)( SA ) )->sin6_addr ) )
+
+#define FamilyToString( X )                 \
+    ( ( ( X ) == AF_INET )  ? "AF_INET"  :  \
+      ( ( ( X ) == AF_INET6 ) ? "AF_INET6" :  \
+        ( ( ( X ) == AF_LINK )  ? "AF_LINK"  :  \
+        "UNKNOWN" ) ) )
+
+mDNSlocal mStatus   UpdateInterfaceList( mDNS *const inMDNS, mDNSs32 inUTC )
+{
+    mStatus err;
+    struct ifaddrs *                    ifaList;
+    struct ifaddrs *                    ifa;
+    int family;
+    mDNSBool foundV4;
+    mDNSBool foundV6;
+    struct ifaddrs *                    loopbackV4;
+    struct ifaddrs *                    loopbackV6;
+    mDNSEthAddr primaryMAC;
+    SocketRef infoSock;
+    char defaultName[ 64 ];
+    NetworkInterfaceInfoVxWorks *       i;
+    domainlabel nicelabel;
+    domainlabel hostlabel;
+    domainlabel tmp;
+
+    ifaList     = NULL;
+    foundV4     = mDNSfalse;
+    foundV6     = mDNSfalse;
+    loopbackV4  = NULL;
+    loopbackV6  = NULL;
+    primaryMAC  = zeroEthAddr;
+
+    // Set up an IPv6 socket so we can check the state of interfaces using SIOCGIFAFLAG_IN6.
+
+    infoSock = socket( AF_INET6, SOCK_DGRAM, 0 );
+    check_translated_errno( IsValidSocket( infoSock ), errno_compat(), kUnknownErr );
+
+    // Run through the entire list of interfaces.
+
+    err = getifaddrs( &ifaList );
+    check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+
+    for( ifa = ifaList; ifa; ifa = ifa->ifa_next )
+    {
+        int flags;
+
+        family = ifa->ifa_addr->sa_family;
+        dmsg( kDebugLevelVerbose, DEBUG_NAME "%s: %8s(%d), Flags 0x%08X, Family %8s(%2d)\n", __ROUTINE__,
+              ifa->ifa_name, if_nametoindex( ifa->ifa_name ), ifa->ifa_flags, FamilyToString( family ), family );
+
+        // Save off the MAC address of the first Ethernet-ish interface.
+
+        if( family == AF_LINK )
+        {
+            struct sockaddr_dl *        sdl;
+
+            sdl = (struct sockaddr_dl *) ifa->ifa_addr;
+            if( ( sdl->sdl_type == IFT_ETHER ) && ( sdl->sdl_alen == sizeof( primaryMAC ) &&
+                                                    mDNSSameEthAddress( &primaryMAC, &zeroEthAddr ) ) )
+            {
+                memcpy( primaryMAC.b, sdl->sdl_data + sdl->sdl_nlen, 6 );
+            }
+        }
+
+        if( !IsCompatibleInterface( ifa ) ) continue;
+
+        // If this is a link-local address and there's a non-link-local address on this interface, skip this alias.
+
+        if( IsLinkLocalSockAddr( ifa->ifa_addr ) )
+        {
+            struct ifaddrs *        ifaLL;
+
+            for( ifaLL = ifaList; ifaLL; ifaLL = ifaLL->ifa_next )
+            {
+                if( ifaLL->ifa_addr->sa_family != family ) continue;
+                if( !IsCompatibleInterface( ifaLL ) ) continue;
+                if( strcmp( ifaLL->ifa_name, ifa->ifa_name ) != 0 ) continue;
+                if( !IsLinkLocalSockAddr( ifaLL->ifa_addr ) ) break;
+            }
+            if( ifaLL )
+            {
+                dmsg( kDebugLevelInfo, DEBUG_NAME "%s: %8s(%d) skipping link-local alias\n", __ROUTINE__,
+                      ifa->ifa_name, if_nametoindex( ifa->ifa_name ) );
+                continue;
+            }
+        }
+
+        // If this is an IPv6 interface, perform additional checks to make sure it is really ready for use.
+        // If this is a loopback interface, save it off since we may add it later if there are no other interfaces.
+        // Otherwise, add the interface to the list.
+
+        flags = 0;
+        if( ( family == AF_INET6 ) && IsValidSocket( infoSock ) )
+        {
+            struct sockaddr_in6 *       sa6;
+            struct in6_ifreq ifr6;
+
+            sa6 = (struct sockaddr_in6 *) ifa->ifa_addr;
+            mDNSPlatformMemZero( &ifr6, sizeof( ifr6 ) );
+            strcpy( ifr6.ifr_name, ifa->ifa_name );
+            ifr6.ifr_addr = *sa6;
+            if( ioctl( infoSock, SIOCGIFAFLAG_IN6, (int) &ifr6 ) != -1 )
+            {
+                flags = ifr6.ifr_ifru.ifru_flags6;
+            }
+        }
+
+        // HACK: This excludes interfaces with IN6_IFF_DUPLICATED set instead of using IN6_IFF_NOTREADY (which is
+        // HACK: IN6_IFF_TENTATIVE | IN6_IFF_DUPLICATED) because we currently do not get a notification when an
+        // HACK: interface goes from the tentative state to the fully ready state. So as a short-term workaround,
+        // HACK: this allows tentative interfaces to be registered. We should revisit if we get notification hooks.
+
+        if( flags & ( IN6_IFF_DUPLICATED | IN6_IFF_DETACHED | IN6_IFF_DEPRECATED | IN6_IFF_TEMPORARY ) )
+        {
+            dmsg( kDebugLevelNotice, DEBUG_NAME "%s: %8s(%d), SIOCGIFAFLAG_IN6 not ready yet (0x%X)\n", __ROUTINE__,
+                  ifa->ifa_name, if_nametoindex( ifa->ifa_name ), flags );
+            continue;
+        }
+        if( ifa->ifa_flags & IFF_LOOPBACK )
+        {
+            if( family == AF_INET ) loopbackV4 = ifa;
+            else loopbackV6 = ifa;
+        }
+        else
+        {
+            if( ( family == AF_INET ) && gMDNSDeferIPv4 && IsLinkLocalSockAddr( ifa->ifa_addr ) ) continue;
+            i = AddInterfaceToList( inMDNS, ifa, inUTC );
+            if( i && i->multicast )
+            {
+                if( family == AF_INET ) foundV4 = mDNStrue;
+                else foundV6 = mDNStrue;
+            }
+        }
+    }
+
+    // For efficiency, we don't register a loopback interface when other interfaces of that family are available.
+
+    if( !foundV4 && loopbackV4 ) AddInterfaceToList( inMDNS, loopbackV4, inUTC );
+    if( !foundV6 && loopbackV6 ) AddInterfaceToList( inMDNS, loopbackV6, inUTC );
+    freeifaddrs( ifaList );
+    if( IsValidSocket( infoSock ) ) close_compat( infoSock );
+
+    // The list is complete. Set the McastTxRx setting for each interface. We always send and receive using IPv4.
+    // To reduce traffic, we send and receive using IPv6 only on interfaces that have no routable IPv4 address.
+    // Having a routable IPv4 address assigned is a reasonable indicator of being on a large, configured network,
+    // which means there's a good chance that most or all the other devices on that network should also have v4.
+    // By doing this we lose the ability to talk to true v6-only devices on that link, but we cut the packet rate in half.
+    // At this time, reducing the packet rate is more important than v6-only devices on a large configured network,
+    // so we are willing to make that sacrifice.
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        if( i->exists )
+        {
+            mDNSBool txrx;
+
+            txrx = i->multicast && ( ( i->ifinfo.ip.type == mDNSAddrType_IPv4 ) || !FindRoutableIPv4( inMDNS, i->scopeID ) );
+            if( i->ifinfo.McastTxRx != txrx )
+            {
+                i->ifinfo.McastTxRx = txrx;
+                i->exists           = 2;    // 2=state change; need to de-register and re-register this interface.
+            }
+        }
+    }
+
+    // Set up the user-specified, friendly name, which is allowed to be full UTF-8.
+
+    mDNS_snprintf( defaultName, sizeof( defaultName ), "Device-%02X:%02X:%02X:%02X:%02X:%02X",
+                   primaryMAC.b[ 0 ], primaryMAC.b[ 1 ], primaryMAC.b[ 2 ], primaryMAC.b[ 3 ], primaryMAC.b[ 4 ], primaryMAC.b[ 5 ] );
+
+    MakeDomainLabelFromLiteralString( &nicelabel, "Put Nice Name Here" ); // $$$ Implementers: Fill in nice name of device.
+    if( nicelabel.c[ 0 ] == 0 ) MakeDomainLabelFromLiteralString( &nicelabel, defaultName );
+
+    // Set up the RFC 1034-compliant label. If not set or it is not RFC 1034 compliant, try the user-specified nice name.
+
+    MakeDomainLabelFromLiteralString( &tmp, "Put-DNS-Name-Here" ); // $$$ Implementers: Fill in DNS name of device.
+    ConvertUTF8PstringToRFC1034HostLabel( tmp.c, &hostlabel );
+    if( hostlabel.c[ 0 ] == 0 ) ConvertUTF8PstringToRFC1034HostLabel( nicelabel.c, &hostlabel );
+    if( hostlabel.c[ 0 ] == 0 ) MakeDomainLabelFromLiteralString( &hostlabel, defaultName );
+
+    // Update our globals and mDNS with the new labels.
+
+    if( !SameDomainLabelCS( inMDNS->p->userNiceLabel.c, nicelabel.c ) )
+    {
+        dmsg( kDebugLevelInfo, DEBUG_NAME "Updating nicelabel to \"%#s\"\n", nicelabel.c );
+        inMDNS->p->userNiceLabel    = nicelabel;
+        inMDNS->nicelabel           = nicelabel;
+    }
+    if( !SameDomainLabelCS( inMDNS->p->userHostLabel.c, hostlabel.c ) )
+    {
+        dmsg( kDebugLevelInfo, DEBUG_NAME "Updating hostlabel to \"%#s\"\n", hostlabel.c );
+        inMDNS->p->userHostLabel    = hostlabel;
+        inMDNS->hostlabel           = hostlabel;
+        mDNS_SetFQDN( inMDNS );
+    }
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	AddInterfaceToList
+//===========================================================================================================================
+
+mDNSlocal NetworkInterfaceInfoVxWorks * AddInterfaceToList( mDNS *const inMDNS, struct ifaddrs *inIFA, mDNSs32 inUTC )
+{
+    mStatus err;
+    mDNSAddr ip;
+    mDNSAddr mask;
+    mDNSu32 scopeID;
+    NetworkInterfaceInfoVxWorks **      p;
+    NetworkInterfaceInfoVxWorks *       i;
+
+    i = NULL;
+
+    err = SockAddrToMDNSAddr( inIFA->ifa_addr, &ip );
+    require_noerr( err, exit );
+
+    err = SockAddrToMDNSAddr( inIFA->ifa_netmask, &mask );
+    require_noerr( err, exit );
+
+    // Search for an existing interface with the same info. If found, just return that one.
+
+    scopeID = if_nametoindex( inIFA->ifa_name );
+    check( scopeID );
+    for( p = &inMDNS->p->interfaceList; *p; p = &( *p )->next )
+    {
+        if( ( scopeID == ( *p )->scopeID ) && mDNSSameAddress( &ip, &( *p )->ifinfo.ip ) )
+        {
+            dmsg( kDebugLevelInfo, DEBUG_NAME "%s: Found existing interface %u with address %#a at %#p\n", __ROUTINE__,
+                  scopeID, &ip, *p );
+            ( *p )->exists = mDNStrue;
+            i = *p;
+            goto exit;
+        }
+    }
+
+    // Allocate the new interface info and fill it out.
+
+    i = (NetworkInterfaceInfoVxWorks *) calloc( 1, sizeof( *i ) );
+    require( i, exit );
+
+    dmsg( kDebugLevelInfo, DEBUG_NAME "%s: Making   new   interface %u with address %#a at %#p\n", __ROUTINE__, scopeID, &ip, i );
+    strncpy( i->ifinfo.ifname, inIFA->ifa_name, sizeof( i->ifinfo.ifname ) );
+    i->ifinfo.ifname[ sizeof( i->ifinfo.ifname ) - 1 ] = '\0';
+    i->ifinfo.InterfaceID   = NULL;
+    i->ifinfo.ip            = ip;
+    i->ifinfo.mask          = mask;
+    i->ifinfo.Advertise     = inMDNS->AdvertiseLocalAddresses;
+    i->ifinfo.McastTxRx     = mDNSfalse; // For now; will be set up later at the end of UpdateInterfaceList.
+
+    i->next                 = NULL;
+    i->exists               = mDNStrue;
+    i->lastSeen             = inUTC;
+    i->scopeID              = scopeID;
+    i->family               = inIFA->ifa_addr->sa_family;
+    i->multicast            = ( inIFA->ifa_flags & IFF_MULTICAST ) && !( inIFA->ifa_flags & IFF_POINTOPOINT );
+
+    i->ss.info              = i;
+    i->ss.sockV4            = kInvalidSocketRef;
+    i->ss.sockV6            = kInvalidSocketRef;
+    *p = i;
+
+exit:
+    return( i );
+}
+
+//===========================================================================================================================
+//	SetupActiveInterfaces
+//
+//	Returns a count of non-link local IPv4 addresses registered.
+//===========================================================================================================================
+
+#define mDNSAddressIsNonLinkLocalIPv4( X )  \
+    ( ( ( X )->type == mDNSAddrType_IPv4 ) && ( ( ( X )->ip.v4.b[ 0 ] != 169 ) || ( ( X )->ip.v4.b[ 1 ] != 254 ) ) )
+
+mDNSlocal int   SetupActiveInterfaces( mDNS *const inMDNS, mDNSs32 inUTC )
+{
+    int count;
+    NetworkInterfaceInfoVxWorks *       i;
+
+    count = 0;
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        NetworkInterfaceInfo *              n;
+        NetworkInterfaceInfoVxWorks *       primary;
+
+        if( !i->exists ) continue;
+
+        // Search for the primary interface and sanity check it.
+
+        n = &i->ifinfo;
+        primary = FindInterfaceByIndex( inMDNS, i->family, i->scopeID );
+        if( !primary )
+        {
+            dmsg( kDebugLevelError, DEBUG_NAME "%s: ERROR! didn't find %s(%u)\n", __ROUTINE__, i->ifinfo.ifname, i->scopeID );
+            continue;
+        }
+        if( n->InterfaceID && ( n->InterfaceID != (mDNSInterfaceID) primary ) )
+        {
+            dmsg( kDebugLevelError, DEBUG_NAME "%s: ERROR! n->InterfaceID %#p != primary %#p\n", __ROUTINE__,
+                  n->InterfaceID, primary );
+            n->InterfaceID = NULL;
+        }
+
+        // If n->InterfaceID is set, it means we've already called mDNS_RegisterInterface() for this interface.
+        // so we don't need to call it again. Otherwise, register the interface with mDNS.
+
+        if( !n->InterfaceID )
+        {
+            mDNSBool flapping;
+
+            n->InterfaceID = (mDNSInterfaceID) primary;
+
+            // If lastSeen == inUTC, then this is a brand-new interface, or an interface that never went away.
+            // If lastSeen != inUTC, then this is an old interface, that went away for (inUTC - lastSeen) seconds.
+            // If it's is an old one that went away and came back in less than a minute, we're in a flapping scenario.
+
+            flapping = ( ( inUTC - i->lastSeen ) > 0 ) && ( ( inUTC - i->lastSeen ) < 60 );
+            mDNS_RegisterInterface( inMDNS, n, flapping );
+            if( mDNSAddressIsNonLinkLocalIPv4( &i->ifinfo.ip ) ) ++count;
+
+            dmsg( kDebugLevelInfo, DEBUG_NAME "%s:   Registered    %8s(%u) InterfaceID %#p %#a%s%s\n", __ROUTINE__,
+                  i->ifinfo.ifname, i->scopeID, primary, &n->ip,
+                  flapping            ? " (Flapping)" : "",
+                  n->InterfaceActive  ? " (Primary)"  : "" );
+        }
+
+        // Set up a socket if it's not already set up. If multicast is not enabled on this interface then we
+        // don't need a socket since unicast traffic will be handled on the unicast socket.
+
+        if( n->McastTxRx )
+        {
+            mStatus err;
+
+            if( ( ( i->family == AF_INET  ) && !IsValidSocket( primary->ss.sockV4 ) ) ||
+                ( ( i->family == AF_INET6 ) && !IsValidSocket( primary->ss.sockV6 ) ) )
+            {
+                err = SetupSocket( inMDNS, &i->ifinfo.ip, mDNStrue, i->family, &primary->ss );
+                check_noerr( err );
+            }
+        }
+        else
+        {
+            dmsg( kDebugLevelInfo, DEBUG_NAME "%s:   No Tx/Rx on   %8s(%u) InterfaceID %#p %#a\n", __ROUTINE__,
+                  i->ifinfo.ifname, i->scopeID, primary, &n->ip );
+        }
+    }
+    return( count );
+}
+
+//===========================================================================================================================
+//	MarkAllInterfacesInactive
+//===========================================================================================================================
+
+mDNSlocal void  MarkAllInterfacesInactive( mDNS *const inMDNS, mDNSs32 inUTC )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        if( !i->exists ) continue;
+        i->lastSeen = inUTC;
+        i->exists   = mDNSfalse;
+    }
+}
+
+//===========================================================================================================================
+//	ClearInactiveInterfaces
+//
+//	Returns count of non-link local IPv4 addresses de-registered.
+//===========================================================================================================================
+
+mDNSlocal int   ClearInactiveInterfaces( mDNS *const inMDNS, mDNSs32 inUTC, mDNSBool inClosing )
+{
+    int count;
+    NetworkInterfaceInfoVxWorks *       i;
+    NetworkInterfaceInfoVxWorks **      p;
+
+    // First pass:
+    // If an interface is going away, then de-register it from mDNSCore.
+    // We also have to de-register it if the primary interface that it's using for its InterfaceID is going away.
+    // We have to do this because mDNSCore will use that InterfaceID when sending packets, and if the memory
+    // it refers to has gone away, we'll crash. Don't actually close the sockets or free the memory yet though:
+    // When the last representative of an interface goes away mDNSCore may want to send goodbye packets on that
+    // interface. (Not yet implemented, but a good idea anyway.).
+
+    count = 0;
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        NetworkInterfaceInfoVxWorks *       primary;
+
+        // 1. If this interface is no longer active, or its InterfaceID is changing, de-register it.
+
+        if( !i->ifinfo.InterfaceID ) continue;
+        primary = FindInterfaceByIndex( inMDNS, i->family, i->scopeID );
+        if( ( i->exists == 0 ) || ( i->exists == 2 ) || ( i->ifinfo.InterfaceID != (mDNSInterfaceID) primary ) )
+        {
+            dmsg( kDebugLevelInfo, DEBUG_NAME "%s: Deregistering %8s(%u) InterfaceID %#p %#a%s\n", __ROUTINE__,
+                  i->ifinfo.ifname, i->scopeID, i->ifinfo.InterfaceID, &i->ifinfo.ip,
+                  i->ifinfo.InterfaceActive ? " (Primary)" : "" );
+
+            mDNS_DeregisterInterface( inMDNS, &i->ifinfo, mDNSfalse );
+            i->ifinfo.InterfaceID = NULL;
+            if( mDNSAddressIsNonLinkLocalIPv4( &i->ifinfo.ip ) ) ++count;
+        }
+    }
+
+    // Second pass:
+    // Now that everything that's going to de-register has done so, we can close sockets and free the memory.
+
+    p = &inMDNS->p->interfaceList;
+    while( *p )
+    {
+        i = *p;
+
+        // 2. Close all our sockets. We'll recreate them later as needed.
+        // (We may have previously had both v4 and v6, and we may not need both any more.).
+
+        ForgetSocket( &i->ss.sockV4 );
+        ForgetSocket( &i->ss.sockV6 );
+
+        // 3. If no longer active, remove the interface from the list and free its memory.
+
+        if( !i->exists )
+        {
+            mDNSBool deleteIt;
+
+            if( inClosing )
+            {
+                check_string( NumCacheRecordsForInterfaceID( inMDNS, (mDNSInterfaceID) i ) == 0, "closing with in-use records!" );
+                deleteIt = mDNStrue;
+            }
+            else
+            {
+                if( i->lastSeen == inUTC ) i->lastSeen = inUTC - 1;
+                deleteIt = ( NumCacheRecordsForInterfaceID( inMDNS, (mDNSInterfaceID) i ) == 0 ) && ( ( inUTC - i->lastSeen ) >= 60 );
+            }
+            dmsg( kDebugLevelInfo, DEBUG_NAME "%s: %-13s %8s(%u) InterfaceID %#p %#a Age %d%s\n", __ROUTINE__,
+                  deleteIt ? "Deleting" : "Holding", i->ifinfo.ifname, i->scopeID, i->ifinfo.InterfaceID, &i->ifinfo.ip,
+                  inUTC - i->lastSeen, i->ifinfo.InterfaceActive ? " (Primary)" : "" );
+            if( deleteIt )
+            {
+                *p = i->next;
+                free( i );
+                continue;
+            }
+        }
+        p = &i->next;
+    }
+    return( count );
+}
+
+//===========================================================================================================================
+//	FindRoutableIPv4
+//===========================================================================================================================
+
+mDNSlocal NetworkInterfaceInfoVxWorks * FindRoutableIPv4( mDNS *const inMDNS, mDNSu32 inScopeID )
+{
+#if ( MDNS_EXCLUDE_IPV4_ROUTABLE_IPV6 )
+    NetworkInterfaceInfoVxWorks *       i;
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        if( i->exists && ( i->scopeID == inScopeID ) && mDNSAddressIsNonLinkLocalIPv4( &i->ifinfo.ip ) )
+        {
+            break;
+        }
+    }
+    return( i );
+#else
+    DEBUG_UNUSED( inMDNS );
+    DEBUG_UNUSED( inScopeID );
+
+    return( NULL );
+#endif
+}
+
+//===========================================================================================================================
+//	FindInterfaceByIndex
+//===========================================================================================================================
+
+mDNSlocal NetworkInterfaceInfoVxWorks * FindInterfaceByIndex( mDNS *const inMDNS, int inFamily, mDNSu32 inIndex )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+
+    check( inIndex != 0 );
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        if( i->exists && ( i->scopeID == inIndex ) &&
+            ( MDNS_AAAA_OVER_IPV4                                                           ||
+              ( ( inFamily == AF_INET  ) && ( i->ifinfo.ip.type == mDNSAddrType_IPv4 ) )    ||
+              ( ( inFamily == AF_INET6 ) && ( i->ifinfo.ip.type == mDNSAddrType_IPv6 ) ) ) )
+        {
+            return( i );
+        }
+    }
+    return( NULL );
+}
+
+//===========================================================================================================================
+//	SetupSocket
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupSocket( mDNS *const inMDNS, const mDNSAddr *inAddr, mDNSBool inMcast, int inFamily, SocketSet *inSS )
+{
+    mStatus err;
+    SocketRef *     sockPtr;
+    mDNSIPPort port;
+    SocketRef sock;
+    const int on = 1;
+
+    check( inAddr );
+    check( inSS );
+
+    sockPtr = ( inFamily == AF_INET ) ? &inSS->sockV4 : &inSS->sockV6;
+    port    = ( inMcast || inMDNS->CanReceiveUnicastOn5353 ) ? MulticastDNSPort : zeroIPPort;
+
+    sock = socket( inFamily, SOCK_DGRAM, IPPROTO_UDP );
+    err = translate_errno( IsValidSocket( sock ), errno_compat(), mStatus_UnknownErr );
+    require_noerr( err, exit );
+
+    // Allow multiple listeners if this is a multicast port.
+
+    if( port.NotAnInteger )
+    {
+        err = setsockopt( sock, SOL_SOCKET, SO_REUSEPORT, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+    }
+
+    // Set up the socket based on the family (IPv4 or IPv6).
+
+    if( inFamily == AF_INET )
+    {
+        const int ttlV4       = 255;
+        const u_char ttlV4Mcast  = 255;
+        struct sockaddr_in sa4;
+
+        // Receive destination addresses so we know which address the packet was sent to.
+
+        err = setsockopt( sock, IPPROTO_IP, IP_RECVDSTADDR, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Receive interface indexes so we know which interface received the packet.
+
+        err = setsockopt( sock, IPPROTO_IP, IP_RECVIF, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Join the multicast group on this interface and specify the outgoing interface, if it's for multicast receiving.
+
+        if( inMcast )
+        {
+            struct in_addr addrV4;
+            struct ip_mreq mreqV4;
+
+            addrV4.s_addr               = inAddr->ip.v4.NotAnInteger;
+            mreqV4.imr_multiaddr.s_addr = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+            mreqV4.imr_interface        = addrV4;
+            err = setsockopt( sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &mreqV4, sizeof( mreqV4 ) );
+            check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+            err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_IF, (char *) &addrV4, sizeof( addrV4 ) );
+            check_translated_errno( err == 0, errno_compat(), kOptionErr );
+        }
+
+        // Send unicast packets with TTL 255 (helps against spoofing).
+
+        err = setsockopt( sock, IPPROTO_IP, IP_TTL, (char *) &ttlV4, sizeof( ttlV4 ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Send multicast packets with TTL 255 (helps against spoofing).
+
+        err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &ttlV4Mcast, sizeof( ttlV4Mcast ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Start listening for packets.
+
+        mDNSPlatformMemZero( &sa4, sizeof( sa4 ) );
+        sa4.sin_len         = sizeof( sa4 );
+        sa4.sin_family      = AF_INET;
+        sa4.sin_port        = port.NotAnInteger;
+        sa4.sin_addr.s_addr = htonl( INADDR_ANY ); // We want to receive multicasts AND unicasts on this socket.
+        err = bind( sock, (struct sockaddr *) &sa4, sizeof( sa4 ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+    }
+    else if( inFamily == AF_INET6 )
+    {
+        struct sockaddr_in6 sa6;
+        const int ttlV6 = 255;
+
+        // Receive destination addresses and interface index so we know where the packet was received and intended.
+
+        err = setsockopt( sock, IPPROTO_IPV6, IPV6_PKTINFO, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Receive only IPv6 packets because otherwise, we may get IPv4 addresses as IPv4-mapped IPv6 addresses.
+
+        err = setsockopt( sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Join the multicast group on this interface and specify the outgoing interface, if it's for multicast receiving.
+
+        if( inMcast )
+        {
+            u_int ifindex;
+            struct ipv6_mreq mreqV6;
+
+            ifindex                 = inSS->info->scopeID;
+            mreqV6.ipv6mr_interface = ifindex;
+            mreqV6.ipv6mr_multiaddr = *( (struct in6_addr * ) &AllDNSLinkGroup_v6.ip.v6 );
+            err = setsockopt( sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *) &mreqV6, sizeof( mreqV6 ) );
+            check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+            err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, (char *) &ifindex, sizeof( ifindex ) );
+            check_translated_errno( err == 0, errno_compat(), kOptionErr );
+        }
+
+        // Send unicast packets with TTL 255 (helps against spoofing).
+
+        err = setsockopt( sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, (char *) &ttlV6, sizeof( ttlV6 ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Send multicast packets with TTL 255 (helps against spoofing).
+
+        err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &ttlV6, sizeof( ttlV6 ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Receive our own packets for same-machine operation.
+
+        err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &on, sizeof( on ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+        // Start listening for packets.
+
+        mDNSPlatformMemZero( &sa6, sizeof( sa6 ) );
+        sa6.sin6_len        = sizeof( sa6 );
+        sa6.sin6_family     = AF_INET6;
+        sa6.sin6_port       = port.NotAnInteger;
+        sa6.sin6_flowinfo   = 0;
+        sa6.sin6_addr       = in6addr_any; // We want to receive multicasts AND unicasts on this socket.
+        sa6.sin6_scope_id   = 0;
+        err = bind( sock, (struct sockaddr *) &sa6, sizeof( sa6 ) );
+        check_translated_errno( err == 0, errno_compat(), kOptionErr );
+    }
+    else
+    {
+        dmsg( kDebugLevelError, DEBUG_NAME "%s: unsupport socket family (%d)\n", __ROUTINE__, inFamily );
+        err = kUnsupportedErr;
+        goto exit;
+    }
+
+    // Make the socket non-blocking so we can potentially get multiple packets per select call.
+
+    err = ioctl( sock, FIONBIO, (int) &on );
+    check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+    *sockPtr = sock;
+    sock = kInvalidSocketRef;
+    err = mStatus_NoError;
+
+exit:
+    if( IsValidSocket( sock ) ) close_compat( sock );
+    return( err );
+}
+
+//===========================================================================================================================
+//	SockAddrToMDNSAddr
+//===========================================================================================================================
+
+mDNSlocal mStatus   SockAddrToMDNSAddr( const struct sockaddr * const inSA, mDNSAddr *outIP )
+{
+    mStatus err;
+
+    check( inSA );
+    check( outIP );
+
+    if( inSA->sa_family == AF_INET )
+    {
+        struct sockaddr_in *        sa4;
+
+        sa4 = (struct sockaddr_in *) inSA;
+        outIP->type                 = mDNSAddrType_IPv4;
+        outIP->ip.v4.NotAnInteger   = sa4->sin_addr.s_addr;
+        err = mStatus_NoError;
+    }
+    else if( inSA->sa_family == AF_INET6 )
+    {
+        struct sockaddr_in6 *       sa6;
+
+        sa6 = (struct sockaddr_in6 *) inSA;
+        outIP->type     = mDNSAddrType_IPv6;
+        outIP->ip.v6    = *( (mDNSv6Addr *) &sa6->sin6_addr );
+        if( IN6_IS_ADDR_LINKLOCAL( &sa6->sin6_addr ) ) outIP->ip.v6.w[ 1 ] = 0;
+        err = mStatus_NoError;
+    }
+    else
+    {
+        dmsg( kDebugLevelError, DEBUG_NAME "%s: invalid sa_family (%d)\n", __ROUTINE__, inSA->sa_family );
+        err = mStatus_BadParamErr;
+    }
+    return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Commands ==
+#endif
+
+//===========================================================================================================================
+//	SetupCommandPipe
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupCommandPipe( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    err = pipeDevCreate( "/pipe/mDNS", 32, 1 );
+    check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+
+    inMDNS->p->commandPipe = open( "/pipe/mDNS", O_RDWR, 0 );
+    err = translate_errno( inMDNS->p->commandPipe != ERROR, errno_compat(), mStatus_UnsupportedErr );
+    require_noerr( err, exit );
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	TearDownCommandPipe
+//===========================================================================================================================
+
+mDNSlocal mStatus   TearDownCommandPipe( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    if( inMDNS->p->commandPipe != ERROR )
+    {
+        err = close( inMDNS->p->commandPipe );
+        check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+        inMDNS->p->commandPipe = ERROR;
+
+        err = pipeDevDelete( "/pipe/mDNS", FALSE );
+        check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+    }
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	SendCommand
+//===========================================================================================================================
+
+mDNSlocal mStatus   SendCommand( const mDNS * const inMDNS, MDNSPipeCommandCode inCommandCode )
+{
+    mStatus err;
+
+    require_action_quiet( inMDNS->p->commandPipe != ERROR, exit, err = mStatus_NotInitializedErr );
+
+    err = write( inMDNS->p->commandPipe, &inCommandCode, sizeof( inCommandCode ) );
+    err = translate_errno( err >= 0, errno_compat(), kWriteErr );
+    require_noerr( err, exit );
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	ProcessCommand
+//===========================================================================================================================
+
+mDNSlocal mStatus   ProcessCommand( mDNS * const inMDNS )
+{
+    mStatus err;
+    MDNSPipeCommandCode cmd;
+    mDNSs32 utc;
+
+    err = read( inMDNS->p->commandPipe, &cmd, sizeof( cmd ) );
+    err = translate_errno( err >= 0, errno_compat(), kReadErr );
+    require_noerr( err, exit );
+
+    switch( cmd )
+    {
+    case kMDNSPipeCommandCodeReschedule:        // Reschedule: just break out to re-run mDNS_Execute.
+        break;
+
+    case kMDNSPipeCommandCodeReconfigure:       // Reconfigure: rebuild the interface list after a config change.
+        dmsg( kDebugLevelInfo, DEBUG_NAME "***   NETWORK CONFIGURATION CHANGE   ***\n" );
+        mDNSPlatformLock( inMDNS );
+
+        utc = mDNSPlatformUTC();
+        MarkAllInterfacesInactive( inMDNS, utc );
+        UpdateInterfaceList( inMDNS, utc );
+        ClearInactiveInterfaces( inMDNS, utc, mDNSfalse );
+        SetupActiveInterfaces( inMDNS, utc );
+
+        mDNSPlatformUnlock( inMDNS );
+        mDNS_ConfigChanged(inMDNS);
+        break;
+
+    case kMDNSPipeCommandCodeQuit:              // Quit: just set a flag so the task exits cleanly.
+        inMDNS->p->quit = mDNStrue;
+        break;
+
+    default:
+        dmsg( kDebugLevelError, DEBUG_NAME "unknown pipe command (%d)\n", cmd );
+        err = mStatus_BadParamErr;
+        goto exit;
+    }
+
+exit:
+    return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Threads ==
+#endif
+
+//===========================================================================================================================
+//	Task
+//===========================================================================================================================
+
+mDNSlocal void  Task( mDNS *inMDNS )
+{
+    mStatus err;
+    mDNSs32 nextEvent;
+    fd_set readSet;
+    int maxFd;
+    struct timeval timeout;
+    NetworkInterfaceInfoVxWorks *       i;
+    int fd;
+    int n;
+
+    check( inMDNS );
+
+    err = TaskInit( inMDNS );
+    require_noerr( err, exit );
+
+    while( !inMDNS->p->quit )
+    {
+        // Let mDNSCore do its work then wait for an event. On idle timeouts (n == 0), just loop back to mDNS_Exceute.
+
+        nextEvent = mDNS_Execute( inMDNS );
+        TaskSetupSelect( inMDNS, &readSet, &maxFd, nextEvent, &timeout );
+        n = select( maxFd + 1, &readSet, NULL, NULL, &timeout );
+        check_translated_errno( n >= 0, errno_compat(), kUnknownErr );
+        if( n == 0 ) continue;
+
+        // Process interface-specific sockets with pending data.
+
+        n = 0;
+        for( i = inMDNS->p->interfaceList; i; i = i->next )
+        {
+            fd = i->ss.sockV4;
+            if( IsValidSocket( fd ) && FD_ISSET( fd, &readSet ) )
+            {
+                TaskProcessPackets( inMDNS, &i->ss, fd );
+                ++n;
+            }
+            fd = i->ss.sockV6;
+            if( IsValidSocket( fd ) && FD_ISSET( fd, &readSet ) )
+            {
+                TaskProcessPackets( inMDNS, &i->ss, fd );
+                ++n;
+            }
+        }
+
+        // Process unicast sockets with pending data.
+
+        fd = inMDNS->p->unicastSS.sockV4;
+        if( IsValidSocket( fd ) && FD_ISSET( fd, &readSet ) )
+        {
+            TaskProcessPackets( inMDNS, &inMDNS->p->unicastSS, fd );
+            ++n;
+        }
+        fd = inMDNS->p->unicastSS.sockV6;
+        if( IsValidSocket( fd ) && FD_ISSET( fd, &readSet ) )
+        {
+            TaskProcessPackets( inMDNS, &inMDNS->p->unicastSS, fd );
+            ++n;
+        }
+
+        // Processing pending commands.
+
+        fd = inMDNS->p->commandPipe;
+        check( fd >= 0 );
+        if( FD_ISSET( fd, &readSet ) )
+        {
+            ProcessCommand( inMDNS );
+            ++n;
+        }
+        check_string( n > 0, "select said something was readable, but nothing was" );
+    }
+
+exit:
+    TaskTerm( inMDNS );
+}
+
+//===========================================================================================================================
+//	TaskInit
+//===========================================================================================================================
+
+mDNSlocal mStatus   TaskInit( mDNS *inMDNS )
+{
+    mStatus err;
+    mDNSs32 utc;
+    socklen_t len;
+
+    inMDNS->p->taskID = taskIdSelf();
+
+    err = SetupCommandPipe( inMDNS );
+    require_noerr( err, exit );
+
+    inMDNS->CanReceiveUnicastOn5353 = mDNStrue;
+
+    // Set up the HINFO string using the description property (e.g. "Device V1.0").
+
+    inMDNS->HIHardware.c[ 0 ] = 11;
+    memcpy( &inMDNS->HIHardware.c[ 1 ], "Device V1.0", inMDNS->HIHardware.c[ 0 ] ); // $$$ Implementers: Fill in real info.
+
+    // Set up the unicast sockets.
+
+    err = SetupSocket( inMDNS, &zeroAddr, mDNSfalse, AF_INET, &inMDNS->p->unicastSS );
+    check_noerr( err );
+    if( err == mStatus_NoError )
+    {
+        struct sockaddr_in sa4;
+
+        len = sizeof( sa4 );
+        err = getsockname( inMDNS->p->unicastSS.sockV4, (struct sockaddr *) &sa4, &len );
+        check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+        if( err == 0 ) inMDNS->UnicastPort4.NotAnInteger = sa4.sin_port;
+    }
+
+    err = SetupSocket( inMDNS, &zeroAddr, mDNSfalse, AF_INET6, &inMDNS->p->unicastSS );
+    check_noerr( err );
+    if( err == mStatus_NoError )
+    {
+        struct sockaddr_in6 sa6;
+
+        len = sizeof( sa6 );
+        err = getsockname( inMDNS->p->unicastSS.sockV6, (struct sockaddr *) &sa6, &len );
+        check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+        if( err == 0 ) inMDNS->UnicastPort6.NotAnInteger = sa6.sin6_port;
+    }
+
+    // Set up the interfaces.
+
+    utc = mDNSPlatformUTC();
+    UpdateInterfaceList( inMDNS, utc );
+    SetupActiveInterfaces( inMDNS, utc );
+    err = mStatus_NoError;
+
+exit:
+    // Signal the "ready" semaphore to indicate the task initialization code has completed (success or not).
+
+    inMDNS->p->initErr = err;
+    semGive( inMDNS->p->initEvent );
+    return( err );
+}
+
+//===========================================================================================================================
+//	TaskTerm
+//===========================================================================================================================
+
+mDNSlocal void  TaskTerm( mDNS *inMDNS )
+{
+    mStatus err;
+    mDNSs32 utc;
+
+    // Tear down all interfaces.
+
+    utc = mDNSPlatformUTC();
+    MarkAllInterfacesInactive( inMDNS, utc );
+    ClearInactiveInterfaces( inMDNS, utc, mDNStrue );
+    check_string( !inMDNS->p->interfaceList, "LEAK: closing without deleting all interfaces" );
+
+    // Close unicast sockets.
+
+    ForgetSocket( &inMDNS->p->unicastSS.sockV4);
+    ForgetSocket( &inMDNS->p->unicastSS.sockV6 );
+
+    // Tear down everything else that was set up in TaskInit then signal back that we're done.
+
+    err = TearDownCommandPipe( inMDNS );
+    check_noerr( err );
+
+    err = semGive( inMDNS->p->quitEvent );
+    check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+}
+
+//===========================================================================================================================
+//	TaskSetupSelect
+//===========================================================================================================================
+
+mDNSlocal void  TaskSetupSelect( mDNS *inMDNS, fd_set *outSet, int *outMaxFd, mDNSs32 inNextEvent, struct timeval *outTimeout )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+    int maxFd;
+    int fd;
+    mDNSs32 delta;
+
+    FD_ZERO( outSet );
+    maxFd = -1;
+
+    // Add the interface-specific sockets.
+
+    for( i = inMDNS->p->interfaceList; i; i = i->next )
+    {
+        fd = i->ss.sockV4;
+        if( IsValidSocket( fd ) )
+        {
+            FD_SET( fd, outSet );
+            if( fd > maxFd ) maxFd = fd;
+        }
+
+        fd = i->ss.sockV6;
+        if( IsValidSocket( fd ) )
+        {
+            FD_SET( fd, outSet );
+            if( fd > maxFd ) maxFd = fd;
+        }
+    }
+
+    // Add the unicast sockets.
+
+    fd = inMDNS->p->unicastSS.sockV4;
+    if( IsValidSocket( fd ) )
+    {
+        FD_SET( fd, outSet );
+        if( fd > maxFd ) maxFd = fd;
+    }
+
+    fd = inMDNS->p->unicastSS.sockV6;
+    if( IsValidSocket( fd ) )
+    {
+        FD_SET( fd, outSet );
+        if( fd > maxFd ) maxFd = fd;
+    }
+
+    // Add the command pipe.
+
+    fd = inMDNS->p->commandPipe;
+    check( fd >= 0 );
+    FD_SET( fd, outSet );
+    if( fd > maxFd ) maxFd = fd;
+
+    check( maxFd > 0 );
+    *outMaxFd = maxFd;
+
+    // Calculate how long to wait before performing idle processing.
+
+    delta = inNextEvent - mDNS_TimeNow( inMDNS );
+    if( delta <= 0 )
+    {
+        // The next task time is now or in the past. Set the timeout to fire immediately.
+
+        outTimeout->tv_sec  = 0;
+        outTimeout->tv_usec = 0;
+    }
+    else
+    {
+        // Calculate the seconds and microseconds until the timeout should occur. Add one to the ticks remainder
+        // before multiplying to account for integer rounding error and avoid firing the timeout too early.
+
+        outTimeout->tv_sec  = delta / mDNSPlatformOneSecond;
+        outTimeout->tv_usec = ( ( delta % mDNSPlatformOneSecond ) + 1 ) * gMDNSTicksToMicro;
+        if( outTimeout->tv_usec >= 1000000L )
+        {
+            outTimeout->tv_sec += 1;
+            outTimeout->tv_usec = 0;
+        }
+    }
+}
+
+//===========================================================================================================================
+//	TaskProcessPackets
+//===========================================================================================================================
+
+mDNSlocal void  TaskProcessPackets( mDNS *inMDNS, SocketSet *inSS, SocketRef inSock )
+{
+    mDNSu32 ifindex;
+    ssize_t n;
+    mDNSu8 *                    buf;
+    size_t size;
+    struct sockaddr_storage from;
+    size_t fromSize;
+    mDNSAddr destAddr;
+    mDNSAddr senderAddr;
+    mDNSIPPort senderPort;
+    mDNSInterfaceID id;
+
+    buf  = (mDNSu8 *) &inMDNS->imsg;
+    size = sizeof( inMDNS->imsg );
+    for( ;; )
+    {
+        ifindex = 0;
+        n = mDNSRecvMsg( inSock, buf, size, &from, sizeof( from ), &fromSize, &destAddr, &ifindex );
+        if( n < 0 ) break;
+        if( from.ss_family == AF_INET )
+        {
+            struct sockaddr_in *        sa4;
+
+            sa4 = (struct sockaddr_in *) &from;
+            senderAddr.type                 = mDNSAddrType_IPv4;
+            senderAddr.ip.v4.NotAnInteger   = sa4->sin_addr.s_addr;
+            senderPort.NotAnInteger         = sa4->sin_port;
+        }
+        else if( from.ss_family == AF_INET6 )
+        {
+            struct sockaddr_in6 *       sa6;
+
+            sa6 = (struct sockaddr_in6 *) &from;
+            senderAddr.type         = mDNSAddrType_IPv6;
+            senderAddr.ip.v6        = *( (mDNSv6Addr *) &sa6->sin6_addr );
+            senderPort.NotAnInteger = sa6->sin6_port;
+        }
+        else
+        {
+            dmsg( kDebugLevelWarning, DEBUG_NAME "%s: WARNING! from addr unknown family %d\n", __ROUTINE__, from.ss_family );
+            continue;
+        }
+
+        // Even though we indicated a specific interface when joining the multicast group, a weirdness of the
+        // sockets API means that even though this socket has only officially joined the multicast group
+        // on one specific interface, the kernel will still deliver multicast packets to it no matter which
+        // interface they arrive on. According to the official Unix Powers That Be, this is Not A Bug.
+        // To work around this weirdness, we use the IP_RECVIF/IPV6_PKTINFO options to find the interface
+        // on which the packet arrived, and ignore the packet if it really arrived on some other interface.
+
+        if( mDNSAddrIsDNSMulticast( &destAddr ) )
+        {
+            if( !inSS->info || !inSS->info->exists )
+            {
+                dpkt( kDebugLevelChatty - 3, DEBUG_NAME "  ignored mcast, src=[%#39a],       dst=[%#39a],       if= unicast socket %d\n",
+                      &senderAddr, &destAddr, inSock );
+                continue;
+            }
+            if( ifindex != inSS->info->scopeID )
+            {
+                #if ( DEBUG && MDNS_DEBUG_PACKETS )
+                char ifname[ IF_NAMESIZE ];
+                #endif
+
+                dpkt( kDebugLevelChatty - 3,
+                      DEBUG_NAME "  ignored mcast, src=[%#39a]        dst=[%#39a],       if=%8s(%u) -- really for %8s(%u)\n",
+                      &senderAddr, &destAddr, inSS->info->ifinfo.ifname, inSS->info->scopeID,
+                      if_indextoname( ifindex, ifname ), ifindex );
+                continue;
+            }
+
+            id = inSS->info->ifinfo.InterfaceID;
+            dpkt( kDebugLevelChatty - 2, DEBUG_NAME "recv %4d bytes, src=[%#39a]:%5hu, dst=[%#39a],       if=%8s(%u) %#p\n",
+                  n, &senderAddr, mDNSVal16( senderPort ), &destAddr, inSS->info->ifinfo.ifname, inSS->info->scopeID, id );
+        }
+        else
+        {
+            NetworkInterfaceInfoVxWorks *       i;
+
+            // For unicast packets, try to find the matching interface.
+
+            for( i = inMDNS->p->interfaceList; i && ( i->scopeID != ifindex ); i = i->next ) {}
+            if( i ) id = i->ifinfo.InterfaceID;
+            else id = NULL;
+        }
+        mDNSCoreReceive( inMDNS, buf, buf + n, &senderAddr, senderPort, &destAddr, MulticastDNSPort, id );
+    }
+}
+
+//===========================================================================================================================
+//	mDNSRecvMsg
+//===========================================================================================================================
+
+mDNSlocal ssize_t
+mDNSRecvMsg(
+    SocketRef inSock,
+    void *      inBuffer,
+    size_t inBufferSize,
+    void *      outFrom,
+    size_t inFromSize,
+    size_t *    outFromSize,
+    mDNSAddr *  outDstAddr,
+    uint32_t *  outIndex )
+{
+    struct msghdr msg;
+    struct iovec iov;
+    ssize_t n;
+    char ancillary[ 1024 ];
+    struct cmsghdr *        cmPtr;
+    int err;
+
+    // Read a packet and any ancillary data. Note: EWOULDBLOCK errors are expected when we've read all pending packets.
+
+    iov.iov_base        = (char *) inBuffer;
+    iov.iov_len         = inBufferSize;
+    msg.msg_name        = (caddr_t) outFrom;
+    msg.msg_namelen     = inFromSize;
+    msg.msg_iov         = &iov;
+    msg.msg_iovlen      = 1;
+    msg.msg_control     = (caddr_t) &ancillary;
+    msg.msg_controllen  = sizeof( ancillary );
+    msg.msg_flags       = 0;
+    n = recvmsg( inSock, &msg, 0 );
+    if( n < 0 )
+    {
+        err = errno_compat();
+        if( err != EWOULDBLOCK ) dmsg( kDebugLevelWarning, DEBUG_NAME "%s: recvmsg(%d) returned %d, errno %d\n",
+                                       __ROUTINE__, inSock, n, err );
+        goto exit;
+    }
+    if( msg.msg_controllen < sizeof( struct cmsghdr ) )
+    {
+        dmsg( kDebugLevelWarning, DEBUG_NAME "%s: recvmsg(%d) msg_controllen %d < sizeof( struct cmsghdr ) %u\n",
+              __ROUTINE__, inSock, msg.msg_controllen, sizeof( struct cmsghdr ) );
+        n = mStatus_UnknownErr;
+        goto exit;
+    }
+    if( msg.msg_flags & MSG_CTRUNC )
+    {
+        dmsg( kDebugLevelWarning, DEBUG_NAME "%s: recvmsg(%d) MSG_CTRUNC (%d recv'd)\n", __ROUTINE__, inSock, n );
+        n = mStatus_BadFlagsErr;
+        goto exit;
+    }
+    *outFromSize = msg.msg_namelen;
+
+    // Parse each option out of the ancillary data.
+
+    for( cmPtr = CMSG_FIRSTHDR( &msg ); cmPtr; cmPtr = CMSG_NXTHDR( &msg, cmPtr ) )
+    {
+        if( ( cmPtr->cmsg_level == IPPROTO_IP ) && ( cmPtr->cmsg_type == IP_RECVDSTADDR ) )
+        {
+            outDstAddr->type                = mDNSAddrType_IPv4;
+            outDstAddr->ip.v4.NotAnInteger  = *( (mDNSu32 *) CMSG_DATA( cmPtr ) );
+        }
+        else if( ( cmPtr->cmsg_level == IPPROTO_IP ) && ( cmPtr->cmsg_type == IP_RECVIF ) )
+        {
+            struct sockaddr_dl *        sdl;
+
+            sdl = (struct sockaddr_dl *) CMSG_DATA( cmPtr );
+            *outIndex = sdl->sdl_index;
+        }
+        else if( ( cmPtr->cmsg_level == IPPROTO_IPV6 ) && ( cmPtr->cmsg_type == IPV6_PKTINFO ) )
+        {
+            struct in6_pktinfo *        pi6;
+
+            pi6 = (struct in6_pktinfo *) CMSG_DATA( cmPtr );
+            outDstAddr->type    = mDNSAddrType_IPv6;
+            outDstAddr->ip.v6   = *( (mDNSv6Addr *) &pi6->ipi6_addr );
+            *outIndex           = pi6->ipi6_ifindex;
+        }
+    }
+
+exit:
+    return( n );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Debugging ==
+#endif
+
+#if ( DEBUG && MDNS_DEBUG_SHOW )
+//===========================================================================================================================
+//	mDNSShow
+//===========================================================================================================================
+
+void    mDNSShow( void );
+
+void    mDNSShow( void )
+{
+    NetworkInterfaceInfoVxWorks *       i;
+    int num;
+    AuthRecord *                        r;
+    mDNSs32 utc;
+
+    // Globals
+
+    dmsg( kDebugLevelMax, "\n-- mDNS globals --\n" );
+    dmsg( kDebugLevelMax, "    sizeof( mDNS )           = %d\n", (int) sizeof( mDNS ) );
+    dmsg( kDebugLevelMax, "    sizeof( ResourceRecord ) = %d\n", (int) sizeof( ResourceRecord ) );
+    dmsg( kDebugLevelMax, "    sizeof( AuthRecord )     = %d\n", (int) sizeof( AuthRecord ) );
+    dmsg( kDebugLevelMax, "    sizeof( CacheRecord )    = %d\n", (int) sizeof( CacheRecord ) );
+    dmsg( kDebugLevelMax, "    mDNSPlatformOneSecond    = %ld\n", mDNSPlatformOneSecond );
+    dmsg( kDebugLevelMax, "    gMDNSTicksToMicro        = %ld\n", gMDNSTicksToMicro );
+    dmsg( kDebugLevelMax, "    gMDNSPtr                 = %#p\n", gMDNSPtr );
+    if( !gMDNSPtr )
+    {
+        dmsg( kDebugLevelMax, "### mDNS not initialized\n" );
+        return;
+    }
+    dmsg( kDebugLevelMax, "    nicelabel                = \"%#s\"\n", gMDNSPtr->nicelabel.c );
+    dmsg( kDebugLevelMax, "    hostLabel                = \"%#s\"\n", gMDNSPtr->hostlabel.c );
+    dmsg( kDebugLevelMax, "    MulticastHostname        = \"%##s\"\n", gMDNSPtr->MulticastHostname.c );
+    dmsg( kDebugLevelMax, "    HIHardware               = \"%#s\"\n", gMDNSPtr->HIHardware.c );
+    dmsg( kDebugLevelMax, "    HISoftware               = \"%#s\"\n", gMDNSPtr->HISoftware.c );
+    dmsg( kDebugLevelMax, "    UnicastPort4/6           = %d/%d\n",
+          mDNSVal16( gMDNSPtr->UnicastPort4 ), mDNSVal16( gMDNSPtr->UnicastPort6 ) );
+    dmsg( kDebugLevelMax, "    unicastSS.sockV4/V6      = %d/%d\n",
+          gMDNSPtr->p->unicastSS.sockV4, gMDNSPtr->p->unicastSS.sockV6 );
+    dmsg( kDebugLevelMax, "    lock                     = %#p\n", gMDNSPtr->p->lock );
+    dmsg( kDebugLevelMax, "    initEvent                = %#p\n", gMDNSPtr->p->initEvent );
+    dmsg( kDebugLevelMax, "    initErr                  = %ld\n", gMDNSPtr->p->initErr );
+    dmsg( kDebugLevelMax, "    quitEvent                = %#p\n", gMDNSPtr->p->quitEvent );
+    dmsg( kDebugLevelMax, "    commandPipe              = %d\n", gMDNSPtr->p->commandPipe );
+    dmsg( kDebugLevelMax, "    taskID                   = %#p\n", gMDNSPtr->p->taskID );
+    dmsg( kDebugLevelMax, "\n" );
+
+    // Interfaces
+
+    utc = mDNSPlatformUTC();
+    dmsg( kDebugLevelMax, "-- mDNS interfaces --\n" );
+    num = 0;
+    for( i = gMDNSPtr->p->interfaceList; i; i = i->next )
+    {
+        dmsg( kDebugLevelMax, "    interface %2d %8s(%u) [%#39a] %s, sockV4 %2d, sockV6 %2d, Age %d\n",
+              num, i->ifinfo.ifname, i->scopeID, &i->ifinfo.ip,
+              i->ifinfo.InterfaceID ? "      REGISTERED" : "*NOT* registered",
+              i->ss.sockV4, i->ss.sockV6, utc - i->lastSeen );
+        ++num;
+    }
+    dmsg( kDebugLevelMax, "\n" );
+
+    // Resource Records
+
+    dmsg( kDebugLevelMax, "-- mDNS resource records --\n" );
+    num = 0;
+    for( r = gMDNSPtr->ResourceRecords; r; r = r->next )
+    {
+        i = (NetworkInterfaceInfoVxWorks *) r->resrec.InterfaceID;
+        if( r->resrec.rrtype == kDNSType_TXT )
+        {
+            RDataBody *         rd;
+            const mDNSu8 *      txt;
+            const mDNSu8 *      end;
+            mDNSu8 size;
+            int nEntries;
+
+            rd = &r->resrec.rdata->u;
+            dmsg( kDebugLevelMax, "    record %2d: %#p %8s(%u): %4d %##s %s:\n", num, i,
+                  i ? i->ifinfo.ifname    : "<any>",
+                  i ? i->scopeID          : 0,
+                  r->resrec.rdlength, r->resrec.name->c, DNSTypeName( r->resrec.rrtype ) );
+
+            nEntries = 0;
+            txt = rd->txt.c;
+            end = txt + r->resrec.rdlength;
+            while( txt < end )
+            {
+                size = *txt++;
+                if( ( txt + size ) > end )
+                {
+                    dmsg( kDebugLevelMax, "        ### ERROR! txt length byte too big (%u, %u max)\n", size, end - txt );
+                    break;
+                }
+                dmsg( kDebugLevelMax, "        string %2d (%3d bytes): \"%.*s\"\n", nEntries, size, size, txt );
+                txt += size;
+                ++nEntries;
+            }
+        }
+        else
+        {
+            dmsg( kDebugLevelMax, "    record %2d: %#p %8s(%u): %s\n", num, i,
+                  i ? i->ifinfo.ifname    : "<any>",
+                  i ? i->scopeID          : 0,
+                  ARDisplayString( gMDNSPtr, r ) );
+        }
+        ++num;
+    }
+    dmsg( kDebugLevelMax, "\n");
+}
+#endif  // DEBUG && MDNS_DEBUG_SHOW
diff --git a/mDNSResponder/mDNSVxWorks/mDNSVxWorks.h b/mDNSResponder/mDNSVxWorks/mDNSVxWorks.h
new file mode 100644
index 00000000..afd41e36
--- /dev/null
+++ b/mDNSResponder/mDNSVxWorks/mDNSVxWorks.h
@@ -0,0 +1,122 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MDNS_VXWORKS_H__
+#define __MDNS_VXWORKS_H__
+
+#include    "vxWorks.h"
+#include    "config.h"
+
+#include    "semLib.h"
+
+#include    "CommonServices.h"
+#include    "DebugServices.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+// Forward Declarations
+
+typedef struct  NetworkInterfaceInfoVxWorks NetworkInterfaceInfoVxWorks;
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		SocketSet
+
+    @abstract	Data for IPv4 and IPv6 sockets.
+ */
+
+typedef struct  SocketSet SocketSet;
+struct  SocketSet
+{
+    NetworkInterfaceInfoVxWorks *       info;
+    SocketRef sockV4;
+    SocketRef sockV6;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		NetworkInterfaceInfoVxWorks
+
+    @abstract	Interface info for VxWorks.
+ */
+
+struct  NetworkInterfaceInfoVxWorks
+{
+    NetworkInterfaceInfo ifinfo;                    // MUST be the first element in this structure.
+    NetworkInterfaceInfoVxWorks *       next;
+    mDNSu32 exists;                                 // 1 = currently exists in getifaddrs list; 0 = doesn't.
+                                                    // 2 = exists, but McastTxRx state changed.
+    mDNSs32 lastSeen;                               // If exists == 0, last time this interface appeared in getifaddrs list.
+    mDNSu32 scopeID;                                // Interface index / IPv6 scope ID.
+    int family;                                     // Socket address family of the primary socket.
+    mDNSBool multicast;
+    SocketSet ss;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		mDNS_PlatformSupport_struct
+
+    @abstract	Data for mDNS platform plugin.
+ */
+
+struct  mDNS_PlatformSupport_struct
+{
+    NetworkInterfaceInfoVxWorks *       interfaceList;
+    SocketSet unicastSS;
+    domainlabel userNiceLabel;
+    domainlabel userHostLabel;
+
+    SEM_ID lock;
+    SEM_ID initEvent;
+    mStatus initErr;
+    SEM_ID quitEvent;
+    int commandPipe;
+    int taskID;
+    mDNSBool quit;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	mDNSReconfigure
+
+    @abstract	Tell mDNS that the configuration has changed. Call when IP address changes, link goes up after being down, etc.
+
+    @discussion
+
+    VxWorks does not provide a generic mechanism for getting notified when network interfaces change so this routines
+    provides a way for BSP-specific code to signal mDNS that something has changed and it should re-build its interfaces.
+ */
+
+void    mDNSReconfigure( void );
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	mDNSDeferIPv4
+
+    @abstract	Tells mDNS whether to defer advertising of IPv4 interfaces.
+
+    @discussion
+
+    To workaround problems with clients getting a link-local IPv4 address before a DHCP address is acquired, this allows
+    external code to defer advertising of IPv4 addresses until a DHCP lease has been acquired (or it times out).
+ */
+
+void    mDNSDeferIPv4( mDNSBool inDefer );
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // __MDNS_VXWORKS_H__
diff --git a/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.c b/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.c
new file mode 100644
index 00000000..efb1f7a3
--- /dev/null
+++ b/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.c
@@ -0,0 +1,2088 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    Contains:	mDNS platform plugin for VxWorks.
+
+    Copyright:  Copyright (C) 2002-2004 Apple Computer, Inc., All Rights Reserved.
+
+    Notes for non-Apple platforms:
+
+        TARGET_NON_APPLE should be defined to 1 to avoid relying on Apple-only header files, macros, or functions.
+
+    To Do:
+
+        - Add support for IPv6 (needs VxWorks IPv6 support).
+ */
+
+// Set up the debug library to use the default category (see DebugServicesLite.h for details).
+
+#if ( !TARGET_NON_APPLE )
+    #define DEBUG_USE_DEFAULT_CATEGORY      1
+#endif
+
+#include    <stdarg.h>
+#include    <stddef.h>
+#include    <stdio.h>
+#include    <stdlib.h>
+#include    <string.h>
+
+#include    <sys/types.h>
+#include    <arpa/inet.h>
+#include    <fcntl.h>
+#include    <netinet/if_ether.h>
+#include    <netinet/in.h>
+#include    <netinet/ip.h>
+#include    <sys/ioctl.h>
+#include    <sys/socket.h>
+#include    <unistd.h>
+
+#include    "vxWorks.h"
+#include    "ifLib.h"
+#include    "inetLib.h"
+#include    "pipeDrv.h"
+#include    "selectLib.h"
+#include    "semLib.h"
+#include    "sockLib.h"
+#include    "sysLib.h"
+#include    "taskLib.h"
+#include    "tickLib.h"
+
+#include    "config.h"
+
+#if ( !TARGET_NON_APPLE )
+    #include    "ACP/ACPUtilities.h"
+    #include    "Support/DebugServicesLite.h"
+    #include    "Support/MiscUtilities.h"
+#endif
+
+#include    "mDNSEmbeddedAPI.h"
+
+#include    "mDNSVxWorks.h"
+
+#if 0
+#pragma mark == Preprocessor ==
+#endif
+
+//===========================================================================================================================
+//	Preprocessor
+//===========================================================================================================================
+
+#if ( !TARGET_NON_APPLE )
+debug_log_new_default_category( mdns );
+#endif
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#define DEBUG_NAME                      "[mDNS] "
+
+#define kMDNSDefaultName                "My-Device"
+
+#define kMDNSTaskName                   "tMDNS"
+#define kMDNSTaskPriority               102
+#define kMDNSTaskStackSize              49152
+
+#define kMDNSPipeName                   "/pipe/mDNS"
+#define kMDNSPipeMessageQueueSize       32
+#define kMDNSPipeMessageSize            1
+
+#define kInvalidSocketRef               -1
+
+typedef uint8_t MDNSPipeCommandCode;
+enum
+{
+    kMDNSPipeCommandCodeInvalid         = 0,
+    kMDNSPipeCommandCodeReschedule      = 1,
+    kMDNSPipeCommandCodeReconfigure     = 2,
+    kMDNSPipeCommandCodeQuit            = 3
+};
+
+#if 0
+#pragma mark == Structures ==
+#endif
+
+//===========================================================================================================================
+//	Structures
+//===========================================================================================================================
+
+typedef int MDNSSocketRef;
+
+struct  MDNSInterfaceItem
+{
+    MDNSInterfaceItem *         next;
+    char name[ 32 ];
+    MDNSSocketRef multicastSocketRef;
+    MDNSSocketRef sendingSocketRef;
+    NetworkInterfaceInfo hostSet;
+    mDNSBool hostRegistered;
+
+    int sendMulticastCounter;
+    int sendUnicastCounter;
+    int sendErrorCounter;
+
+    int recvCounter;
+    int recvErrorCounter;
+    int recvLoopCounter;
+};
+
+#if 0
+#pragma mark == Macros ==
+#endif
+
+//===========================================================================================================================
+//	Macros
+//===========================================================================================================================
+
+#if ( TARGET_NON_APPLE )
+
+// Do-nothing versions of the debugging macros for non-Apple platforms.
+
+    #define check(assertion)
+    #define check_string( assertion, cstring )
+    #define check_noerr(err)
+    #define check_noerr_string( error, cstring )
+    #define check_errno( assertion, errno_value )
+    #define debug_string( cstring )
+    #define require( assertion, label )                                     do { if( !(assertion) ) goto label;} while(0)
+    #define require_string( assertion, label, string )                      require(assertion, label)
+    #define require_quiet( assertion, label )                               require( assertion, label )
+    #define require_noerr( error, label )                                   do { if( (error) != 0 ) goto label;} while(0)
+    #define require_noerr_quiet( assertion, label )                         require_noerr( assertion, label )
+    #define require_noerr_action( error, label, action )                    do { if( (error) != 0 ) { {action;}; goto label; } } while(0)
+    #define require_noerr_action_quiet( assertion, label, action )          require_noerr_action( assertion, label, action )
+    #define require_action( assertion, label, action )                      do { if( !(assertion) ) { {action;}; goto label; } } while(0)
+    #define require_action_quiet( assertion, label, action )                require_action( assertion, label, action )
+    #define require_action_string( assertion, label, action, cstring )      do { if( !(assertion) ) { {action;}; goto label; } } while(0)
+    #define require_errno( assertion, errno_value, label )                  do { if( !(assertion) ) goto label;} while(0)
+    #define require_errno_action( assertion, errno_value, label, action )   do { if( !(assertion) ) { {action;}; goto label; } } while(0)
+
+    #define dlog( ARGS... )
+
+    #define DEBUG_UNUSED( X )           (void)( X )
+#endif
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+// ifIndexToIfp is in net/if.c, but not exported by net/if.h so provide it here.
+
+extern struct ifnet * ifIndexToIfp(int ifIndex);
+
+// Platform Internals
+
+mDNSlocal void      SetupNames( mDNS * const inMDNS );
+mDNSlocal mStatus   SetupInterfaceList( mDNS * const inMDNS );
+mDNSlocal mStatus   TearDownInterfaceList( mDNS * const inMDNS );
+mDNSlocal mStatus   SetupInterface( mDNS * const inMDNS, const struct ifaddrs *inAddr, MDNSInterfaceItem **outItem );
+mDNSlocal mStatus   TearDownInterface( mDNS * const inMDNS, MDNSInterfaceItem *inItem );
+mDNSlocal mStatus
+SetupSocket(
+    mDNS * const inMDNS,
+    const struct ifaddrs *  inAddr,
+    mDNSIPPort inPort,
+    MDNSSocketRef *         outSocketRef );
+
+// Commands
+
+mDNSlocal mStatus   SetupCommandPipe( mDNS * const inMDNS );
+mDNSlocal mStatus   TearDownCommandPipe( mDNS * const inMDNS );
+mDNSlocal mStatus   SendCommand( const mDNS * const inMDNS, MDNSPipeCommandCode inCommandCode );
+mDNSlocal mStatus   ProcessCommand( mDNS * const inMDNS );
+mDNSlocal void      ProcessCommandReconfigure( mDNS *inMDNS );
+
+// Threads
+
+mDNSlocal mStatus   SetupTask( mDNS * const inMDNS );
+mDNSlocal mStatus   TearDownTask( mDNS * const inMDNS );
+mDNSlocal void      Task( mDNS *inMDNS );
+mDNSlocal mStatus   TaskInit( mDNS *inMDNS );
+mDNSlocal void      TaskSetupReadSet( mDNS *inMDNS, fd_set *outReadSet, int *outMaxSocket );
+mDNSlocal void      TaskSetupTimeout( mDNS *inMDNS, mDNSs32 inNextTaskTime, struct timeval *outTimeout );
+mDNSlocal void      TaskProcessPacket( mDNS *inMDNS, MDNSInterfaceItem *inItem, MDNSSocketRef inSocketRef );
+
+// Utilities
+
+#if ( TARGET_NON_APPLE )
+mDNSlocal void  GenerateUniqueHostName( char *outName, long *ioSeed );
+mDNSlocal void  GenerateUniqueDNSName( char *outName, long *ioSeed );
+#endif
+
+// Platform Accessors
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+typedef struct mDNSPlatformInterfaceInfo mDNSPlatformInterfaceInfo;
+struct  mDNSPlatformInterfaceInfo
+{
+    const char *        name;
+    mDNSAddr ip;
+};
+
+mDNSexport mStatus  mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID );
+mDNSexport mStatus  mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo );
+
+#ifdef  __cplusplus
+}
+#endif
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+mDNSlocal mDNS *                    gMDNSPtr                            = NULL;
+mDNSlocal mDNS_PlatformSupport gMDNSPlatformSupport;
+mDNSlocal mDNSs32 gMDNSTicksToMicrosecondsMultiplier  = 0;
+
+// Platform support
+
+mDNSs32 mDNSPlatformOneSecond;
+
+#if 0
+#pragma mark -
+#pragma mark == Public APIs ==
+#endif
+
+//===========================================================================================================================
+//	mDNSReconfigure
+//===========================================================================================================================
+
+void    mDNSReconfigure( void )
+{
+    // Send a "reconfigure" command to the MDNS task.
+
+    if( gMDNSPtr )
+    {
+        SendCommand( gMDNSPtr, kMDNSPipeCommandCodeReconfigure );
+    }
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Platform Support ==
+#endif
+
+//===========================================================================================================================
+//	mDNSPlatformInit
+//===========================================================================================================================
+
+mStatus mDNSPlatformInit( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "platform init\n" );
+
+    // Initialize variables.
+
+    mDNSPlatformMemZero( &gMDNSPlatformSupport, sizeof( gMDNSPlatformSupport ) );
+    inMDNS->p                           = &gMDNSPlatformSupport;
+    inMDNS->p->commandPipe              = ERROR;
+    inMDNS->p->task                     = ERROR;
+    inMDNS->p->rescheduled              = 1;        // Default to rescheduled until fully initialized.
+    mDNSPlatformOneSecond               = sysClkRateGet();
+    gMDNSTicksToMicrosecondsMultiplier  = ( 1000000L / mDNSPlatformOneSecond );
+
+    // Allocate semaphores.
+
+    inMDNS->p->lockID = semMCreate( SEM_Q_FIFO );
+    require_action( inMDNS->p->lockID, exit, err = mStatus_NoMemoryErr );
+
+    inMDNS->p->readyEvent = semBCreate( SEM_Q_FIFO, SEM_EMPTY );
+    require_action( inMDNS->p->readyEvent, exit, err = mStatus_NoMemoryErr );
+
+    inMDNS->p->quitEvent = semBCreate( SEM_Q_FIFO, SEM_EMPTY );
+    require_action( inMDNS->p->quitEvent, exit, err = mStatus_NoMemoryErr );
+
+    gMDNSPtr = inMDNS;
+
+    // Set up the task and wait for it to initialize. Initialization is done from the task instead of here to avoid
+    // stack space issues. Some of the initialization may require a larger stack than the current task supports.
+
+    err = SetupTask( inMDNS );
+    require_noerr( err, exit );
+
+    err = semTake( inMDNS->p->readyEvent, WAIT_FOREVER );
+    require_noerr( err, exit );
+    err = inMDNS->p->taskInitErr;
+    require_noerr( err, exit );
+
+    mDNSCoreInitComplete( inMDNS, err );
+
+exit:
+    if( err )
+    {
+        mDNSPlatformClose( inMDNS );
+    }
+    dlog( kDebugLevelInfo, DEBUG_NAME "platform init done (err=%ld)\n", err );
+    return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformClose
+//===========================================================================================================================
+
+void    mDNSPlatformClose( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "platform close\n" );
+    check( inMDNS );
+
+    // Tear everything down.
+
+    err = TearDownTask( inMDNS );
+    check_noerr( err );
+
+    err = TearDownInterfaceList( inMDNS );
+    check_noerr( err );
+
+    err = TearDownCommandPipe( inMDNS );
+    check_noerr( err );
+
+    gMDNSPtr = NULL;
+
+    // Release semaphores.
+
+    if( inMDNS->p->quitEvent )
+    {
+        semDelete( inMDNS->p->quitEvent );
+        inMDNS->p->quitEvent = 0;
+    }
+    if( inMDNS->p->readyEvent )
+    {
+        semDelete( inMDNS->p->readyEvent );
+        inMDNS->p->readyEvent = 0;
+    }
+    if( inMDNS->p->lockID )
+    {
+        semDelete( inMDNS->p->lockID );
+        inMDNS->p->lockID = 0;
+    }
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "platform close done\n" );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformSendUDP
+//===========================================================================================================================
+
+mStatus
+mDNSPlatformSendUDP(
+    const mDNS * const inMDNS,
+    const void * const inMsg,
+    const mDNSu8 * const inMsgEnd,
+    mDNSInterfaceID inInterfaceID,
+    const mDNSAddr *            inDstIP,
+    mDNSIPPort inDstPort )
+{
+    mStatus err;
+    MDNSInterfaceItem *     item;
+    struct sockaddr_in addr;
+    int n;
+
+    dlog( kDebugLevelChatty, DEBUG_NAME "platform send UDP\n" );
+
+    // Check parameters.
+
+    check( inMDNS );
+    check( inMsg );
+    check( inMsgEnd );
+    check( inInterfaceID );
+    check( inDstIP );
+    if( inDstIP->type != mDNSAddrType_IPv4 )
+    {
+        err = mStatus_BadParamErr;
+        goto exit;
+    }
+
+#if ( DEBUG )
+    // Make sure the InterfaceID is valid.
+
+    for( item = inMDNS->p->interfaceList; item; item = item->next )
+    {
+        if( item == (MDNSInterfaceItem *) inInterfaceID )
+        {
+            break;
+        }
+    }
+    require_action( item, exit, err = mStatus_NoSuchNameErr );
+#endif
+
+    // Send the packet.
+
+    item = (MDNSInterfaceItem *) inInterfaceID;
+    check( item->sendingSocketRef != kInvalidSocketRef );
+
+    mDNSPlatformMemZero( &addr, sizeof( addr ) );
+    addr.sin_family         = AF_INET;
+    addr.sin_port           = inDstPort.NotAnInteger;
+    addr.sin_addr.s_addr    = inDstIP->ip.v4.NotAnInteger;
+
+    n = inMsgEnd - ( (const mDNSu8 * const) inMsg );
+    n = sendto( item->sendingSocketRef, (char *) inMsg, n, 0, (struct sockaddr *) &addr, sizeof( addr ) );
+    check_errno( n, errno );
+
+    item->sendErrorCounter      += ( n < 0 );
+    item->sendMulticastCounter  += ( inDstPort.NotAnInteger == MulticastDNSPort.NotAnInteger );
+    item->sendUnicastCounter    += ( inDstPort.NotAnInteger != MulticastDNSPort.NotAnInteger );
+
+    dlog( kDebugLevelChatty, DEBUG_NAME "sent (to=%u.%u.%u.%u:%hu)\n",
+          inDstIP->ip.v4.b[ 0 ], inDstIP->ip.v4.b[ 1 ], inDstIP->ip.v4.b[ 2 ], inDstIP->ip.v4.b[ 3 ],
+          htons( inDstPort.NotAnInteger ) );
+    err = mStatus_NoError;
+
+exit:
+    dlog( kDebugLevelChatty, DEBUG_NAME "platform send UDP done\n" );
+    return( err );
+}
+
+//===========================================================================================================================
+//	Connection-oriented (TCP) functions
+//===========================================================================================================================
+
+mDNSexport mStatus mDNSPlatformTCPConnect(const mDNSAddr *dst, mDNSOpaque16 dstport, mDNSInterfaceID InterfaceID,
+                                          TCPConnectionCallback callback, void *context, int *descriptor)
+{
+    (void)dst;          // Unused
+    (void)dstport;      // Unused
+    (void)InterfaceID;  // Unused
+    (void)callback;     // Unused
+    (void)context;      // Unused
+    (void)descriptor;   // Unused
+    return(mStatus_UnsupportedErr);
+}
+
+mDNSexport void mDNSPlatformTCPCloseConnection(int sd)
+{
+    (void)sd;           // Unused
+}
+
+mDNSexport long mDNSPlatformReadTCP(int sd, void *buf, unsigned long buflen)
+{
+    (void)sd;           // Unused
+    (void)buf;          // Unused
+    (void)buflen;           // Unused
+    return(0);
+}
+
+mDNSexport long mDNSPlatformWriteTCP(int sd, const char *msg, unsigned long len)
+{
+    (void)sd;           // Unused
+    (void)msg;          // Unused
+    (void)len;          // Unused
+    return(0);
+}
+
+//===========================================================================================================================
+//	mDNSPlatformLock
+//===========================================================================================================================
+
+void    mDNSPlatformLock( const mDNS * const inMDNS )
+{
+    check( inMDNS->p->lockID );
+
+    if( inMDNS->p->lockID )
+    {
+        #if ( TARGET_NON_APPLE )
+        semTake( inMDNS->p->lockID, WAIT_FOREVER );
+        #else
+        semTakeDeadlockDetect( inMDNS->p->lockID, WAIT_FOREVER );
+        #endif
+    }
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUnlock
+//===========================================================================================================================
+
+void    mDNSPlatformUnlock( const mDNS * const inMDNS )
+{
+    check( inMDNS );
+    check( inMDNS->p );
+    check( inMDNS->p->lockID );
+    check_string( inMDNS->p->task != ERROR, "mDNS task not started" );
+
+    // When an API routine is called, "m->NextScheduledEvent" is reset to "timenow" before calling mDNSPlatformUnlock()
+    // Since our main mDNS_Execute() loop is on a different thread, we need to wake up that thread to:
+    // (a) handle immediate work (if any) resulting from this API call
+    // (b) calculate the next sleep time between now and the next interesting event
+
+    if( ( mDNS_TimeNow(inMDNS) - inMDNS->NextScheduledEvent ) >= 0 )
+    {
+        // We only need to send the reschedule event when called from a task other than the mDNS task since if we are
+        // called from mDNS task, we'll loop back and call mDNS_Execute. This avoids filling up the command queue.
+
+        if( ( inMDNS->p->rescheduled++ == 0 ) && ( taskIdSelf() != inMDNS->p->task ) )
+        {
+            SendCommand( inMDNS, kMDNSPipeCommandCodeReschedule );
+        }
+    }
+
+    if( inMDNS->p->lockID )
+    {
+        semGive( inMDNS->p->lockID );
+    }
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrLen
+//===========================================================================================================================
+
+mDNSu32  mDNSPlatformStrLen( const void *inSrc )
+{
+    check( inSrc );
+
+    return( (mDNSu32) strlen( (const char *) inSrc ) );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrCopy
+//===========================================================================================================================
+
+void    mDNSPlatformStrCopy( void *inDst, const void *inSrc )
+{
+    check( inSrc );
+    check( inDst );
+
+    strcpy( (char *) inDst, (const char*) inSrc );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemCopy
+//===========================================================================================================================
+
+void    mDNSPlatformMemCopy( void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+    check( inSrc );
+    check( inDst );
+
+    memcpy( inDst, inSrc, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemSame
+//===========================================================================================================================
+
+mDNSBool    mDNSPlatformMemSame( const void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+    check( inSrc );
+    check( inDst );
+
+    return( memcmp( inSrc, inDst, inSize ) == 0 );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemZero
+//===========================================================================================================================
+
+void    mDNSPlatformMemZero( void *inDst, mDNSu32 inSize )
+{
+    check( inDst );
+
+    memset( inDst, 0, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemAllocate
+//===========================================================================================================================
+
+mDNSexport void *   mDNSPlatformMemAllocate( mDNSu32 inSize )
+{
+    void *      mem;
+
+    check( inSize > 0 );
+
+    mem = malloc( inSize );
+    check( mem );
+
+    return( mem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemFree
+//===========================================================================================================================
+
+mDNSexport void mDNSPlatformMemFree( void *inMem )
+{
+    check( inMem );
+
+    free( inMem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRandomSeed
+//===========================================================================================================================
+
+mDNSexport mDNSu32 mDNSPlatformRandomSeed(void)
+{
+    return( tickGet() );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTimeInit
+//===========================================================================================================================
+
+mDNSexport mStatus mDNSPlatformTimeInit( void )
+{
+    // No special setup is required on VxWorks -- we just use tickGet().
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRawTime
+//===========================================================================================================================
+
+mDNSs32 mDNSPlatformRawTime( void )
+{
+    return( (mDNSs32) tickGet() );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUTC
+//===========================================================================================================================
+
+mDNSexport mDNSs32  mDNSPlatformUTC( void )
+{
+    return( -1 );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceNameToID
+//===========================================================================================================================
+
+mStatus mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID )
+{
+    mStatus err;
+    MDNSInterfaceItem *     ifd;
+
+    check( inMDNS );
+    check( inMDNS->p );
+    check( inName );
+
+    // Search for an interface with the specified name,
+
+    for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+    {
+        if( strcmp( ifd->name, inName ) == 0 )
+        {
+            break;
+        }
+    }
+    if( !ifd )
+    {
+        err = mStatus_NoSuchNameErr;
+        goto exit;
+    }
+
+    // Success!
+
+    if( outID )
+    {
+        *outID = (mDNSInterfaceID) ifd;
+    }
+    err = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIDToInfo
+//===========================================================================================================================
+
+mStatus mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo )
+{
+    mStatus err;
+    MDNSInterfaceItem *     ifd;
+
+    check( inMDNS );
+    check( inID );
+    check( outInfo );
+
+    // Search for an interface with the specified ID,
+
+    for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+    {
+        if( ifd == (MDNSInterfaceItem *) inID )
+        {
+            break;
+        }
+    }
+    if( !ifd )
+    {
+        err = mStatus_NoSuchNameErr;
+        goto exit;
+    }
+
+    // Success!
+
+    outInfo->name   = ifd->name;
+    outInfo->ip     = ifd->hostSet.ip;
+    err             = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	debugf_
+//===========================================================================================================================
+
+#if ( MDNS_DEBUGMSGS )
+mDNSexport void debugf_( const char *format, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+    mDNSu32 length;
+
+    va_start( args, format );
+    length = mDNS_vsnprintf( buffer, sizeof( buffer ), format, args );
+    va_end( args );
+
+    dlog( kDebugLevelInfo, "%s\n", buffer );
+}
+#endif
+
+//===========================================================================================================================
+//	verbosedebugf_
+//===========================================================================================================================
+
+#if ( MDNS_DEBUGMSGS > 1 )
+mDNSexport void verbosedebugf_( const char *format, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+    mDNSu32 length;
+
+    va_start( args, format );
+    length = mDNS_vsnprintf( buffer, sizeof( buffer ), format, args );
+    va_end( args );
+
+    dlog( kDebugLevelVerbose, "%s\n", buffer );
+}
+#endif
+
+//===========================================================================================================================
+//	LogMsg
+//===========================================================================================================================
+
+void LogMsg( const char *inFormat, ... )
+{
+    char buffer[ 512 ];
+    va_list args;
+    mDNSu32 length;
+
+    va_start( args, inFormat );
+    length = mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+    va_end( args );
+
+    dlog( kDebugLevelWarning, "%s\n", buffer );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Platform Internals ==
+#endif
+
+//===========================================================================================================================
+//	SetupNames
+//===========================================================================================================================
+
+mDNSlocal void  SetupNames( mDNS * const inMDNS )
+{
+    char tempCString[ 128 ];
+    mDNSu8 tempPString[ 128 ];
+    mDNSu8 *        namePtr;
+
+    // Set up the host name.
+
+    tempCString[ 0 ] = '\0';
+    GenerateUniqueHostName( tempCString, NULL );
+    check( tempCString[ 0 ] != '\0' );
+    if( tempCString[ 0 ] == '\0' )
+    {
+        // No name so use the default.
+
+        strcpy( tempCString, kMDNSDefaultName );
+    }
+    inMDNS->nicelabel.c[ 0 ] = strlen( tempCString );
+    memcpy( &inMDNS->nicelabel.c[ 1 ], tempCString, inMDNS->nicelabel.c[ 0 ] );
+    check( inMDNS->nicelabel.c[ 0 ] > 0 );
+
+    // Set up the DNS name.
+
+    tempCString[ 0 ] = '\0';
+    GenerateUniqueDNSName( tempCString, NULL );
+    if( tempCString[ 0 ] != '\0' )
+    {
+        tempPString[ 0 ] = strlen( tempCString );
+        memcpy( &tempPString[ 1 ], tempCString, tempPString[ 0 ] );
+        namePtr = tempPString;
+    }
+    else
+    {
+        // No DNS name so use the host name.
+
+        namePtr = inMDNS->nicelabel.c;
+    }
+    ConvertUTF8PstringToRFC1034HostLabel( namePtr, &inMDNS->hostlabel );
+    if( inMDNS->hostlabel.c[ 0 ] == 0 )
+    {
+        // Nice name has no characters that are representable as an RFC 1034 name (e.g. Japanese) so use the default.
+
+        MakeDomainLabelFromLiteralString( &inMDNS->hostlabel, kMDNSDefaultName );
+    }
+    check( inMDNS->hostlabel.c[ 0 ] > 0 );
+
+    mDNS_SetFQDN( inMDNS );
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "nice name \"%.*s\"\n", inMDNS->nicelabel.c[ 0 ], &inMDNS->nicelabel.c[ 1 ] );
+    dlog( kDebugLevelInfo, DEBUG_NAME "host name \"%.*s\"\n", inMDNS->hostlabel.c[ 0 ], &inMDNS->hostlabel.c[ 1 ] );
+}
+
+//===========================================================================================================================
+//	SetupInterfaceList
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupInterfaceList( mDNS * const inMDNS )
+{
+    mStatus err;
+    struct ifaddrs *            addrs;
+    struct ifaddrs *            p;
+    uint32_t flagMask;
+    uint32_t flagTest;
+    MDNSInterfaceItem **        next;
+    MDNSInterfaceItem *         item;
+
+    addrs = NULL;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up interface list\n" );
+    check( inMDNS );
+
+    // Tear down any existing interfaces that may be set up.
+
+    TearDownInterfaceList( inMDNS );
+    inMDNS->p->interfaceList = NULL;
+    next = &inMDNS->p->interfaceList;
+
+    // Set up each interface that is active, multicast-capable, and not the loopback interface or point-to-point.
+
+    flagMask = IFF_UP | IFF_MULTICAST | IFF_LOOPBACK | IFF_POINTOPOINT;
+    flagTest = IFF_UP | IFF_MULTICAST;
+
+    err = getifaddrs( &addrs );
+    require_noerr( err, exit );
+
+    for( p = addrs; p; p = p->ifa_next )
+    {
+        if( ( p->ifa_flags & flagMask ) == flagTest )
+        {
+            err = SetupInterface( inMDNS, p, &item );
+            require_noerr( err, exit );
+
+            *next = item;
+            next = &item->next;
+        }
+    }
+    err = mStatus_NoError;
+
+exit:
+    if( addrs )
+    {
+        freeifaddrs( addrs );
+    }
+    if( err )
+    {
+        TearDownInterfaceList( inMDNS );
+    }
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up interface list done (err=%ld)\n", err );
+    return( err );
+}
+
+//===========================================================================================================================
+//	TearDownInterfaceList
+//===========================================================================================================================
+
+mDNSlocal mStatus   TearDownInterfaceList( mDNS * const inMDNS )
+{
+    dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down interface list\n" );
+    check( inMDNS );
+
+    // Tear down all the interfaces.
+
+    while( inMDNS->p->interfaceList )
+    {
+        MDNSInterfaceItem *     item;
+
+        item = inMDNS->p->interfaceList;
+        inMDNS->p->interfaceList = item->next;
+
+        TearDownInterface( inMDNS, item );
+    }
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down interface list done\n" );
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	SetupInterface
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupInterface( mDNS * const inMDNS, const struct ifaddrs *inAddr, MDNSInterfaceItem **outItem )
+{
+    mStatus err;
+    MDNSInterfaceItem *             item;
+    MDNSSocketRef socketRef;
+    const struct sockaddr_in *      ipv4, *mask;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up interface (name=%s)\n", inAddr->ifa_name );
+    check( inMDNS );
+    check( inAddr );
+    check( inAddr->ifa_addr );
+    ipv4 = (const struct sockaddr_in *) inAddr->ifa_addr;
+    mask = (const struct sockaddr_in *) inAddr->ifa_netmask;
+    check( outItem );
+
+    // Allocate memory for the info item.
+
+    item = (MDNSInterfaceItem *) calloc( 1, sizeof( *item ) );
+    require_action( item, exit, err = mStatus_NoMemoryErr );
+    strcpy( item->name, inAddr->ifa_name );
+    item->multicastSocketRef    = kInvalidSocketRef;
+    item->sendingSocketRef      = kInvalidSocketRef;
+
+    // Set up the multicast DNS (port 5353) socket for this interface.
+
+    err = SetupSocket( inMDNS, inAddr, MulticastDNSPort, &socketRef );
+    require_noerr( err, exit );
+    item->multicastSocketRef = socketRef;
+
+    // Set up the sending socket for this interface.
+
+    err = SetupSocket( inMDNS, inAddr, zeroIPPort, &socketRef );
+    require_noerr( err, exit );
+    item->sendingSocketRef = socketRef;
+
+    // Register this interface with mDNS.
+
+    item->hostSet.InterfaceID             = (mDNSInterfaceID) item;
+    item->hostSet.ip.type               = mDNSAddrType_IPv4;
+    item->hostSet.ip.ip.v4.NotAnInteger = ipv4->sin_addr.s_addr;
+    item->hostSet.mask.type               = mDNSAddrType_IPv4;
+    item->hostSet.mask.ip.v4.NotAnInteger = mask->sin_addr.s_addr;
+    item->hostSet.ifname[0]               = 0;
+    item->hostSet.Advertise               = inMDNS->AdvertiseLocalAddresses;
+    item->hostSet.McastTxRx               = mDNStrue;
+
+    err = mDNS_RegisterInterface( inMDNS, &item->hostSet, mDNSfalse );
+    require_noerr( err, exit );
+    item->hostRegistered = mDNStrue;
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "Registered IP address: %u.%u.%u.%u\n",
+          item->hostSet.ip.ip.v4.b[ 0 ], item->hostSet.ip.ip.v4.b[ 1 ],
+          item->hostSet.ip.ip.v4.b[ 2 ], item->hostSet.ip.ip.v4.b[ 3 ] );
+
+    // Success!
+
+    *outItem = item;
+    item = NULL;
+
+exit:
+    if( item )
+    {
+        TearDownInterface( inMDNS, item );
+    }
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up interface done (name=%s, err=%ld)\n", inAddr->ifa_name, err );
+    return( err );
+}
+
+//===========================================================================================================================
+//	TearDownInterface
+//===========================================================================================================================
+
+mDNSlocal mStatus   TearDownInterface( mDNS * const inMDNS, MDNSInterfaceItem *inItem )
+{
+    MDNSSocketRef socketRef;
+
+    check( inMDNS );
+    check( inItem );
+
+    // Deregister this interface with mDNS.
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "Deregistering IP address: %u.%u.%u.%u\n",
+          inItem->hostSet.ip.ip.v4.b[ 0 ], inItem->hostSet.ip.ip.v4.b[ 1 ],
+          inItem->hostSet.ip.ip.v4.b[ 2 ], inItem->hostSet.ip.ip.v4.b[ 3 ] );
+
+    if( inItem->hostRegistered )
+    {
+        inItem->hostRegistered = mDNSfalse;
+        mDNS_DeregisterInterface( inMDNS, &inItem->hostSet, mDNSfalse );
+    }
+
+    // Close the multicast socket.
+
+    socketRef = inItem->multicastSocketRef;
+    inItem->multicastSocketRef = kInvalidSocketRef;
+    if( socketRef != kInvalidSocketRef )
+    {
+        dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down multicast socket %d\n", socketRef );
+        close( socketRef );
+    }
+
+    // Close the sending socket.
+
+    socketRef = inItem->sendingSocketRef;
+    inItem->sendingSocketRef = kInvalidSocketRef;
+    if( socketRef != kInvalidSocketRef )
+    {
+        dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down sending socket %d\n", socketRef );
+        close( socketRef );
+    }
+
+    // Free the memory used by the interface info.
+
+    free( inItem );
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	SetupSocket
+//===========================================================================================================================
+
+mDNSlocal mStatus
+SetupSocket(
+    mDNS * const inMDNS,
+    const struct ifaddrs *  inAddr,
+    mDNSIPPort inPort,
+    MDNSSocketRef *         outSocketRef  )
+{
+    mStatus err;
+    MDNSSocketRef socketRef;
+    int option;
+    unsigned char optionByte;
+    struct ip_mreq mreq;
+    const struct sockaddr_in *      ipv4;
+    struct sockaddr_in addr;
+    mDNSv4Addr ip;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up socket done\n" );
+    check( inMDNS );
+    check( inAddr );
+    check( inAddr->ifa_addr );
+    ipv4 = (const struct sockaddr_in *) inAddr->ifa_addr;
+    check( outSocketRef );
+
+    // Set up a UDP socket for multicast DNS.
+
+    socketRef = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    require_errno_action( socketRef, errno, exit, err = mStatus_UnknownErr );
+
+    // A port of zero means this socket is for sending and should be set up for sending. Otherwise, it is for receiving
+    // and should be set up for receiving. The reason for separate sending vs receiving sockets is to workaround problems
+    // with VxWorks IP stack when using dynamic IP configuration such as DHCP (problems binding to wildcard IP when the
+    // IP address later changes). Since we have to bind the Multicast DNS address to workaround these issues we have to
+    // use a separate sending socket since it is illegal to send a packet with a multicast source address (RFC 1122).
+
+    if( inPort.NotAnInteger != zeroIPPort.NotAnInteger )
+    {
+        // Turn on reuse port option so multiple servers can listen for Multicast DNS packets.
+
+        option = 1;
+        err = setsockopt( socketRef, SOL_SOCKET, SO_REUSEADDR, (char *) &option, sizeof( option ) );
+        check_errno( err, errno );
+
+        // Join the all-DNS multicast group so we receive Multicast DNS packets.
+
+        ip.NotAnInteger             = ipv4->sin_addr.s_addr;
+        mreq.imr_multiaddr.s_addr   = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+        mreq.imr_interface.s_addr   = ip.NotAnInteger;
+        err = setsockopt( socketRef, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &mreq, sizeof( mreq ) );
+        check_errno( err, errno );
+
+        // Bind to the multicast DNS address and port 5353.
+
+        mDNSPlatformMemZero( &addr, sizeof( addr ) );
+        addr.sin_family         = AF_INET;
+        addr.sin_port           = inPort.NotAnInteger;
+        addr.sin_addr.s_addr    = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+        err = bind( socketRef, (struct sockaddr *) &addr, sizeof( addr ) );
+        check_errno( err, errno );
+
+        dlog( kDebugLevelVerbose, DEBUG_NAME "setting up socket done (%s, %u.%u.%u.%u:%u, %d)\n",
+              inAddr->ifa_name, ip.b[ 0 ], ip.b[ 1 ], ip.b[ 2 ], ip.b[ 3 ], ntohs( inPort.NotAnInteger ), socketRef );
+    }
+    else
+    {
+        // Bind to the interface address and multicast DNS port.
+
+        ip.NotAnInteger         = ipv4->sin_addr.s_addr;
+        mDNSPlatformMemZero( &addr, sizeof( addr ) );
+        addr.sin_family         = AF_INET;
+        addr.sin_port           = MulticastDNSPort.NotAnInteger;
+        addr.sin_addr.s_addr    = ip.NotAnInteger;
+        err = bind( socketRef, (struct sockaddr *) &addr, sizeof( addr ) );
+        check_errno( err, errno );
+
+        // Direct multicast packets to the specified interface.
+
+        addr.sin_addr.s_addr = ip.NotAnInteger;
+        err = setsockopt( socketRef, IPPROTO_IP, IP_MULTICAST_IF, (char *) &addr.sin_addr, sizeof( addr.sin_addr ) );
+        check_errno( err, errno );
+
+        // Set the TTL of outgoing unicast packets to 255 (helps against spoofing).
+
+        option = 255;
+        err = setsockopt( socketRef, IPPROTO_IP, IP_TTL, (char *) &option, sizeof( option ) );
+        check_errno( err, errno );
+
+        // Set the TTL of outgoing multicast packets to 255 (helps against spoofing).
+
+        optionByte = 255;
+        err = setsockopt( socketRef, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &optionByte, sizeof( optionByte ) );
+        check_errno( err, errno );
+
+        // WARNING: Setting this option causes unicast responses to be routed to the wrong interface so they are
+        // WARNING: disabled. These options were only hints to improve 802.11 performance (and not implemented) anyway.
+
+#if 0
+        // Mark packets as high-throughput/low-delay (i.e. lowest reliability) to maximize 802.11 multicast rate.
+
+        option = IPTOS_LOWDELAY | IPTOS_THROUGHPUT;
+        err = setsockopt( socketRef, IPPROTO_IP, IP_TOS, (char *) &option, sizeof( option ) );
+        check_errno( err, errno );
+#endif
+
+        dlog( kDebugLevelVerbose, DEBUG_NAME "setting up sending socket done (%s, %u.%u.%u.%u, %d)\n",
+              inAddr->ifa_name, ip.b[ 0 ], ip.b[ 1 ], ip.b[ 2 ], ip.b[ 3 ], socketRef );
+    }
+
+    // Success!
+
+    *outSocketRef = socketRef;
+    socketRef = kInvalidSocketRef;
+    err = mStatus_NoError;
+
+exit:
+    if( socketRef != kInvalidSocketRef )
+    {
+        close( socketRef );
+    }
+    return( err );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Commands ==
+#endif
+
+//===========================================================================================================================
+//	SetupCommandPipe
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupCommandPipe( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    // Clean up any leftover command pipe.
+
+    TearDownCommandPipe( inMDNS );
+
+    // Create the pipe device and open it.
+
+    pipeDevCreate( kMDNSPipeName, kMDNSPipeMessageQueueSize, kMDNSPipeMessageSize );
+
+    inMDNS->p->commandPipe = open( kMDNSPipeName, O_RDWR, 0 );
+    require_errno_action( inMDNS->p->commandPipe, errno, exit, err = mStatus_UnsupportedErr );
+
+    err = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	TearDownCommandPipe
+//===========================================================================================================================
+
+mDNSlocal mStatus   TearDownCommandPipe( mDNS * const inMDNS )
+{
+    if( inMDNS->p->commandPipe != ERROR )
+    {
+        close( inMDNS->p->commandPipe );
+#ifdef _WRS_VXWORKS_5_X
+        // pipeDevDelete is not defined in older versions of VxWorks
+        pipeDevDelete( kMDNSPipeName, FALSE );
+#endif
+        inMDNS->p->commandPipe = ERROR;
+    }
+    return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	SendCommand
+//===========================================================================================================================
+
+mDNSlocal mStatus   SendCommand( const mDNS * const inMDNS, MDNSPipeCommandCode inCommandCode )
+{
+    mStatus err;
+
+    require_action( inMDNS->p->commandPipe != ERROR, exit, err = mStatus_NotInitializedErr );
+
+    err = write( inMDNS->p->commandPipe, &inCommandCode, sizeof( inCommandCode ) );
+    require_errno( err, errno, exit );
+
+    err = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	ProcessCommand
+//===========================================================================================================================
+
+mDNSlocal mStatus   ProcessCommand( mDNS * const inMDNS )
+{
+    mStatus err;
+    MDNSPipeCommandCode commandCode;
+
+    require_action( inMDNS->p->commandPipe != ERROR, exit, err = mStatus_NotInitializedErr );
+
+    // Read the command code from the pipe and dispatch it.
+
+    err = read( inMDNS->p->commandPipe, &commandCode, sizeof( commandCode ) );
+    require_errno( err, errno, exit );
+
+    switch( commandCode )
+    {
+    case kMDNSPipeCommandCodeReschedule:
+
+        // Reschedule event. Do nothing here, but this will cause mDNS_Execute to run before waiting again.
+
+        dlog( kDebugLevelChatty, DEBUG_NAME "reschedule\n" );
+        break;
+
+    case kMDNSPipeCommandCodeReconfigure:
+        ProcessCommandReconfigure( inMDNS );
+        break;
+
+    case kMDNSPipeCommandCodeQuit:
+
+        // Quit requested. Set quit flag and bump the config ID to let the thread exit normally.
+
+        dlog( kDebugLevelVerbose, DEBUG_NAME "processing pipe quit command\n" );
+        inMDNS->p->quit = mDNStrue;
+        ++inMDNS->p->configID;
+        break;
+
+    default:
+        dlog( kDebugLevelError, DEBUG_NAME "unknown pipe command code (code=0x%08X)\n", commandCode );
+        err = mStatus_BadParamErr;
+        goto exit;
+        break;
+    }
+    err = mStatus_NoError;
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	ProcessCommandReconfigure
+//===========================================================================================================================
+
+mDNSlocal void  ProcessCommandReconfigure( mDNS *inMDNS )
+{
+    mStatus err;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "processing pipe reconfigure command\n" );
+
+    // Tear down the existing interfaces and set up new ones using the new IP info.
+
+    mDNSPlatformLock( inMDNS );
+
+    err = TearDownInterfaceList( inMDNS );
+    check_noerr( err );
+
+    err = SetupInterfaceList( inMDNS );
+    check_noerr( err );
+
+    mDNSPlatformUnlock( inMDNS );
+
+    // Inform clients of the change.
+
+    mDNS_ConfigChanged(m);
+
+    // Force mDNS to update.
+
+    mDNSCoreMachineSleep( inMDNS, mDNSfalse ); // What is this for? Mac OS X does not do this
+
+    // Bump the config ID so the main processing loop detects the configuration change.
+
+    ++inMDNS->p->configID;
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Threads ==
+#endif
+
+//===========================================================================================================================
+//	SetupTask
+//===========================================================================================================================
+
+mDNSlocal mStatus   SetupTask( mDNS * const inMDNS )
+{
+    mStatus err;
+    int task;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up thread\n" );
+    check( inMDNS );
+
+    // Create our main thread. Note: The task will save off its ID in the globals. We cannot do it here because the
+    // task invokes code that needs it and the task may begin execution before taskSpawn returns the task ID.
+    // This also means code in this thread context cannot rely on the task ID until the task has fully initialized.
+
+    task = taskSpawn( kMDNSTaskName, kMDNSTaskPriority, 0, kMDNSTaskStackSize, (FUNCPTR) Task,
+                      (int) inMDNS, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
+    require_action( task != ERROR, exit, err = mStatus_NoMemoryErr );
+
+    err = mStatus_NoError;
+
+exit:
+    dlog( kDebugLevelVerbose, DEBUG_NAME "setting up thread done (err=%ld, id=%d)\n", err, task );
+    return( err );
+}
+
+//===========================================================================================================================
+//	TearDownTask
+//===========================================================================================================================
+
+mDNSlocal mStatus   TearDownTask( mDNS * const inMDNS )
+{
+    mStatus err;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down thread\n" );
+    check( inMDNS );
+
+    // Send a quit command to cause the thread to exit.
+
+    SendCommand( inMDNS, kMDNSPipeCommandCodeQuit );
+
+    // Wait for the thread to signal it has exited. Timeout in 10 seconds to handle a hung thread.
+
+    if( inMDNS->p->quitEvent )
+    {
+        err = semTake( inMDNS->p->quitEvent, sysClkRateGet() * 10 );
+        check_noerr( err );
+    }
+    err = mStatus_NoError;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "tearing down thread done (err=%ld)\n", err );
+    return( err );
+}
+
+//===========================================================================================================================
+//	Task
+//===========================================================================================================================
+
+mDNSlocal void  Task( mDNS *inMDNS )
+{
+    mStatus err;
+    fd_set allReadSet;
+    MDNSInterfaceItem *     item;
+    int maxSocket;
+    long configID;
+    struct timeval timeout;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "task starting\n" );
+    check( inMDNS );
+
+    // Set up everything up.
+
+    err = TaskInit( inMDNS );
+    require_noerr( err, exit );
+
+    // Main Processing Loop.
+
+    while( !inMDNS->p->quit )
+    {
+        // Set up the read set here to avoid the overhead of setting it up each iteration of the main processing loop.
+        // If the configuration changes, the server ID will be bumped, causing this code to set up the read set again.
+
+        TaskSetupReadSet( inMDNS, &allReadSet, &maxSocket );
+        configID = inMDNS->p->configID;
+        dlog( kDebugLevelVerbose, DEBUG_NAME "task starting processing loop (configID=%ld)\n", configID );
+
+        while( configID == inMDNS->p->configID )
+        {
+            mDNSs32 nextTaskTime;
+            fd_set readSet;
+            int n;
+
+            // Give the mDNS core a chance to do its work. Reset the rescheduled flag before calling mDNS_Execute
+            // so anything that needs processing during or after causes a re-schedule to wake up the thread. The
+            // reschedule flag is set to 1 after processing a waking up to prevent redundant reschedules while
+            // processing packets. This introduces a window for a race condition because the thread wake-up and
+            // reschedule set are not atomic, but this would be benign. Even if the reschedule flag is "corrupted"
+            // like this, it would only result in a redundant reschedule since it will loop back to mDNS_Execute.
+
+            inMDNS->p->rescheduled = 0;
+            nextTaskTime = mDNS_Execute( inMDNS );
+            TaskSetupTimeout( inMDNS, nextTaskTime, &timeout );
+
+            // Wait until something occurs (e.g. command, incoming packet, or timeout).
+
+            readSet = allReadSet;
+            n = select( maxSocket + 1, &readSet, NULL, NULL, &timeout );
+            inMDNS->p->rescheduled = 1;
+            check_errno( n, errno );
+            dlog( kDebugLevelChatty - 1, DEBUG_NAME "task select result = %d\n", n );
+            if( n == 0 )
+            {
+                // Next task timeout occurred. Loop back up to give mDNS core a chance to work.
+
+                dlog( kDebugLevelChatty, DEBUG_NAME "next task timeout occurred (%ld)\n", mDNS_TimeNow(inMDNS) );
+                continue;
+            }
+
+            // Scan the read set to determine if any sockets have something pending and process them.
+
+            n = 0;
+            for( item = inMDNS->p->interfaceList; item; item = item->next )
+            {
+                if( FD_ISSET( item->multicastSocketRef, &readSet ) )
+                {
+                    TaskProcessPacket( inMDNS, item, item->multicastSocketRef );
+                    ++n;
+                }
+            }
+
+            // Check for a pending command and process it.
+
+            if( FD_ISSET( inMDNS->p->commandPipe, &readSet ) )
+            {
+                ProcessCommand( inMDNS );
+                ++n;
+            }
+            check( n > 0 );
+        }
+    }
+
+exit:
+    // Signal we've quit.
+
+    check( inMDNS->p->quitEvent );
+    semGive( inMDNS->p->quitEvent );
+
+    dlog( kDebugLevelInfo, DEBUG_NAME "task ended\n" );
+}
+
+//===========================================================================================================================
+//	TaskInit
+//===========================================================================================================================
+
+mDNSlocal mStatus   TaskInit( mDNS *inMDNS )
+{
+    mStatus err;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "task init\n" );
+    check( inMDNS->p->readyEvent );
+
+    inMDNS->p->task = taskIdSelf();
+
+    err = SetupCommandPipe( inMDNS );
+    require_noerr( err, exit );
+
+    SetupNames( inMDNS );
+
+    err = SetupInterfaceList( inMDNS );
+    require_noerr( err, exit );
+
+exit:
+    // Signal the "ready" semaphore to indicate the task initialization code has completed (success or not).
+
+    inMDNS->p->taskInitErr = err;
+    semGive( inMDNS->p->readyEvent );
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "task init done (err=%ld)\n", err );
+    return( err );
+}
+
+//===========================================================================================================================
+//	TaskSetupReadSet
+//===========================================================================================================================
+
+mDNSlocal void  TaskSetupReadSet( mDNS *inMDNS, fd_set *outReadSet, int *outMaxSocket )
+{
+    MDNSInterfaceItem *     item;
+    int maxSocket;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "task setting up read set\n" );
+    check( inMDNS );
+    check( outReadSet );
+    check( outMaxSocket );
+
+    // Initialize the read set. Default the max socket to -1 so "maxSocket + 1" (as needed by select) is zero. This
+    // should never happen since we should always have at least one interface, but it's just to be safe.
+
+    FD_ZERO( outReadSet );
+    maxSocket = -1;
+
+    // Add all the receiving sockets to the read set.
+
+    for( item = inMDNS->p->interfaceList; item; item = item->next )
+    {
+        FD_SET( item->multicastSocketRef, outReadSet );
+        if( item->multicastSocketRef > maxSocket )
+        {
+            maxSocket = item->multicastSocketRef;
+        }
+    }
+
+    // Add the command pipe to the read set.
+
+    FD_SET( inMDNS->p->commandPipe, outReadSet );
+    if( inMDNS->p->commandPipe > maxSocket )
+    {
+        maxSocket = inMDNS->p->commandPipe;
+    }
+    check( maxSocket > 0 );
+    *outMaxSocket = maxSocket;
+
+    dlog( kDebugLevelVerbose, DEBUG_NAME "task setting up read set done (maxSocket=%d)\n", maxSocket );
+}
+
+//===========================================================================================================================
+//	TaskSetupTimeout
+//===========================================================================================================================
+
+mDNSlocal void  TaskSetupTimeout( mDNS *inMDNS, mDNSs32 inNextTaskTime, struct timeval *outTimeout )
+{
+    mDNSs32 delta;
+
+    // Calculate how long to wait before performing idle processing.
+
+    delta = inNextTaskTime - mDNS_TimeNow(inMDNS);
+    if( delta <= 0 )
+    {
+        // The next task time is now or in the past. Set the timeout to fire immediately.
+
+        outTimeout->tv_sec  = 0;
+        outTimeout->tv_usec = 0;
+    }
+    else
+    {
+        // Calculate the seconds and microseconds until the timeout should occur. Add one to the ticks remainder
+        // before multiplying to account for integer rounding error and avoid firing the timeout too early.
+
+        outTimeout->tv_sec  = delta / mDNSPlatformOneSecond;
+        outTimeout->tv_usec = ( ( delta % mDNSPlatformOneSecond ) + 1 ) * gMDNSTicksToMicrosecondsMultiplier;
+
+        // Check if the microseconds is more than 1 second. If so, bump the seconds instead.
+
+        if( outTimeout->tv_usec >= 1000000L )
+        {
+            outTimeout->tv_sec += 1;
+            outTimeout->tv_usec = 0;
+        }
+    }
+
+    dlog( kDebugLevelChatty, DEBUG_NAME "next task in %ld:%ld seconds (%ld)\n",
+          outTimeout->tv_sec, outTimeout->tv_usec, inNextTaskTime );
+}
+//===========================================================================================================================
+//	TaskProcessPacket
+//===========================================================================================================================
+
+mDNSlocal void  TaskProcessPacket( mDNS *inMDNS, MDNSInterfaceItem *inItem, MDNSSocketRef inSocketRef )
+{
+    int n;
+    DNSMessage packet;
+    struct sockaddr_in addr;
+    int addrSize;
+    mDNSu8 *                packetEndPtr;
+    mDNSAddr srcAddr;
+    mDNSIPPort srcPort;
+    mDNSAddr dstAddr;
+    mDNSIPPort dstPort;
+
+    // Receive the packet.
+
+    addrSize = sizeof( addr );
+    n = recvfrom( inSocketRef, (char *) &packet, sizeof( packet ), 0, (struct sockaddr *) &addr, &addrSize );
+    check( n >= 0 );
+    if( n >= 0 )
+    {
+        // Set up the src/dst/interface info.
+
+        srcAddr.type                = mDNSAddrType_IPv4;
+        srcAddr.ip.v4.NotAnInteger  = addr.sin_addr.s_addr;
+        srcPort.NotAnInteger        = addr.sin_port;
+        dstAddr.type                = mDNSAddrType_IPv4;
+        dstAddr.ip.v4               = AllDNSLinkGroup_v4.ip.v4;
+        dstPort                     = MulticastDNSPort;
+
+        dlog( kDebugLevelChatty, DEBUG_NAME "packet received\n" );
+        dlog( kDebugLevelChatty, DEBUG_NAME "    size      = %d\n", n );
+        dlog( kDebugLevelChatty, DEBUG_NAME "    src       = %u.%u.%u.%u:%hu\n",
+              srcAddr.ip.v4.b[ 0 ], srcAddr.ip.v4.b[ 1 ], srcAddr.ip.v4.b[ 2 ], srcAddr.ip.v4.b[ 3 ],
+              ntohs( srcPort.NotAnInteger ) );
+        dlog( kDebugLevelChatty, DEBUG_NAME "    dst       = %u.%u.%u.%u:%hu\n",
+              dstAddr.ip.v4.b[ 0 ], dstAddr.ip.v4.b[ 1 ], dstAddr.ip.v4.b[ 2 ], dstAddr.ip.v4.b[ 3 ],
+              ntohs( dstPort.NotAnInteger ) );
+        dlog( kDebugLevelChatty, DEBUG_NAME "    interface = 0x%08X\n", (int) inItem->hostSet.InterfaceID );
+        dlog( kDebugLevelChatty, DEBUG_NAME "--\n" );
+
+        // Dispatch the packet to mDNS.
+
+        packetEndPtr = ( (mDNSu8 *) &packet ) + n;
+        mDNSCoreReceive( inMDNS, &packet, packetEndPtr, &srcAddr, srcPort, &dstAddr, dstPort, inItem->hostSet.InterfaceID );
+    }
+
+    // Update counters.
+
+    inItem->recvCounter         += 1;
+    inItem->recvErrorCounter    += ( n < 0 );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Utilities ==
+#endif
+
+#if ( TARGET_NON_APPLE )
+//===========================================================================================================================
+//	GenerateUniqueHostName
+//
+//	Non-Apple platform stub routine to generate a unique name for the device. Should be implemented to return a unique name.
+//===========================================================================================================================
+
+mDNSlocal void  GenerateUniqueHostName( char *outName, long *ioSeed )
+{
+    DEBUG_UNUSED( ioSeed );
+
+    // $$$ Non-Apple Platforms: Fill in appropriate name for device.
+
+    mDNSPlatformStrCopy( outName, kMDNSDefaultName );
+}
+
+//===========================================================================================================================
+//	GenerateUniqueDNSName
+//
+//	Non-Apple platform stub routine to generate a unique RFC 1034-compatible DNS name for the device. Should be
+//	implemented to return a unique name.
+//===========================================================================================================================
+
+mDNSlocal void  GenerateUniqueDNSName( char *outName, long *ioSeed )
+{
+    DEBUG_UNUSED( ioSeed );
+
+    // $$$ Non-Apple Platforms: Fill in appropriate DNS name for device.
+
+    mDNSPlatformStrCopy( outName, kMDNSDefaultName );
+}
+#endif
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	getifaddrs
+//===========================================================================================================================
+
+int getifaddrs( struct ifaddrs **outAddrs )
+{
+    int err;
+    struct ifaddrs *        head;
+    struct ifaddrs **       next;
+    struct ifaddrs *        ifa;
+    int i;
+    struct ifnet *          ifp;
+    char ipString[ INET_ADDR_LEN ];
+    int n;
+
+    head = NULL;
+    next = &head;
+
+    i = 1;
+    for( ;; )
+    {
+        ifp = ifIndexToIfp( i );
+        if( !ifp )
+        {
+            break;
+        }
+        ++i;
+
+        // Allocate and initialize the ifaddrs structure and attach it to the linked list.
+
+        ifa = (struct ifaddrs *) calloc( 1, sizeof( struct ifaddrs ) );
+        require_action( ifa, exit, err = ENOMEM );
+
+        *next = ifa;
+        next  = &ifa->ifa_next;
+
+        // Fetch the name.
+
+        ifa->ifa_name = (char *) malloc( 16 );
+        require_action( ifa->ifa_name, exit, err = ENOMEM );
+
+        n = sprintf( ifa->ifa_name, "%s%d", ifp->if_name, ifp->if_unit );
+        require_action( n < 16, exit, err = ENOBUFS );
+
+        // Fetch the address.
+
+        ifa->ifa_addr = (struct sockaddr *) calloc( 1, sizeof( struct sockaddr_in ) );
+        require_action( ifa->ifa_addr, exit, err = ENOMEM );
+
+        ipString[ 0 ] = '\0';
+        #if ( TARGET_NON_APPLE )
+        err = ifAddrGet( ifa->ifa_name, ipString );
+        require_noerr( err, exit );
+        #else
+        err = ifAddrGetNonAlias( ifa->ifa_name, ipString );
+        require_noerr( err, exit );
+        #endif
+
+        err = sock_pton( ipString, AF_INET, ifa->ifa_addr, 0, NULL );
+        require_noerr( err, exit );
+
+        // Fetch flags.
+
+        ifa->ifa_flags = ifp->if_flags;
+    }
+
+    // Success!
+
+    if( outAddrs )
+    {
+        *outAddrs = head;
+        head = NULL;
+    }
+    err = 0;
+
+exit:
+    if( head )
+    {
+        freeifaddrs( head );
+    }
+    return( err );
+}
+
+//===========================================================================================================================
+//	freeifaddrs
+//===========================================================================================================================
+
+void    freeifaddrs( struct ifaddrs *inAddrs )
+{
+    struct ifaddrs *        p;
+    struct ifaddrs *        q;
+
+    // Free each piece of the structure. Set to null after freeing to handle macro-aliased fields.
+
+    for( p = inAddrs; p; p = q )
+    {
+        q = p->ifa_next;
+
+        if( p->ifa_name )
+        {
+            free( p->ifa_name );
+            p->ifa_name = NULL;
+        }
+        if( p->ifa_addr )
+        {
+            free( p->ifa_addr );
+            p->ifa_addr = NULL;
+        }
+        if( p->ifa_netmask )
+        {
+            free( p->ifa_netmask );
+            p->ifa_netmask = NULL;
+        }
+        if( p->ifa_dstaddr )
+        {
+            free( p->ifa_dstaddr );
+            p->ifa_dstaddr = NULL;
+        }
+        if( p->ifa_data )
+        {
+            free( p->ifa_data );
+            p->ifa_data = NULL;
+        }
+        free( p );
+    }
+}
+
+//===========================================================================================================================
+//	sock_pton
+//===========================================================================================================================
+
+int sock_pton( const char *inString, int inFamily, void *outAddr, size_t inAddrSize, size_t *outAddrSize )
+{
+    int err;
+
+    if( inFamily == AF_INET )
+    {
+        struct sockaddr_in *        ipv4;
+
+        if( inAddrSize == 0 )
+        {
+            inAddrSize = sizeof( struct sockaddr_in );
+        }
+        if( inAddrSize < sizeof( struct sockaddr_in ) )
+        {
+            err = EINVAL;
+            goto exit;
+        }
+
+        ipv4 = (struct sockaddr_in *) outAddr;
+        err = inet_aton( (char *) inString, &ipv4->sin_addr );
+        if( err == 0 )
+        {
+            ipv4->sin_family = AF_INET;
+            if( outAddrSize )
+            {
+                *outAddrSize = sizeof( struct sockaddr_in );
+            }
+        }
+    }
+#if ( defined( AF_INET6 ) )
+    else if( inFamily == AF_INET6 )     // $$$ TO DO: Add IPv6 support.
+    {
+        err = EAFNOSUPPORT;
+        goto exit;
+    }
+#endif
+    else
+    {
+        err = EAFNOSUPPORT;
+        goto exit;
+    }
+
+exit:
+    return( err );
+}
+
+//===========================================================================================================================
+//	sock_ntop
+//===========================================================================================================================
+
+char *  sock_ntop( const void *inAddr, size_t inAddrSize, char *inBuffer, size_t inBufferSize )
+{
+    const struct sockaddr *     addr;
+
+    addr = (const struct sockaddr *) inAddr;
+    if( addr->sa_family == AF_INET )
+    {
+        struct sockaddr_in *        ipv4;
+
+        if( inAddrSize == 0 )
+        {
+            inAddrSize = sizeof( struct sockaddr_in );
+        }
+        if( inAddrSize < sizeof( struct sockaddr_in ) )
+        {
+            errno = EINVAL;
+            inBuffer = NULL;
+            goto exit;
+        }
+        if( inBufferSize < 16 )
+        {
+            errno = ENOBUFS;
+            inBuffer = NULL;
+            goto exit;
+        }
+
+        ipv4 = (struct sockaddr_in *) addr;
+        inet_ntoa_b( ipv4->sin_addr, inBuffer );
+    }
+#if ( defined( AF_INET6 ) )
+    else if( addr->sa_family == AF_INET6 )  // $$$ TO DO: Add IPv6 support.
+    {
+        errno = EAFNOSUPPORT;
+        inBuffer = NULL;
+        goto exit;
+    }
+#endif
+    else
+    {
+        errno = EAFNOSUPPORT;
+        inBuffer = NULL;
+        goto exit;
+    }
+
+exit:
+    return( inBuffer );
+}
+
+#if 0
+#pragma mark -
+#pragma mark == Debugging ==
+#endif
+
+#if ( DEBUG )
+
+void    mDNSShow( BOOL inShowRecords );
+void    mDNSShowRecords( void );
+void    mDNSShowTXT( const void *inTXT, size_t inTXTSize );
+
+//===========================================================================================================================
+//	mDNSShow
+//===========================================================================================================================
+
+void    mDNSShow( BOOL inShowRecords )
+{
+    MDNSInterfaceItem *     item;
+    mDNSAddr ip;
+    int n;
+
+    if( !gMDNSPtr )
+    {
+        printf( "### mDNS not initialized\n" );
+        return;
+    }
+
+    // Globals
+
+    printf( "\n-- mDNS globals --\n" );
+    printf( "    sizeof( mDNS )                     = %d\n", (int) sizeof( mDNS ) );
+    printf( "    sizeof( ResourceRecord )           = %d\n", (int) sizeof( ResourceRecord ) );
+    printf( "    sizeof( AuthRecord )               = %d\n", (int) sizeof( AuthRecord ) );
+    printf( "    sizeof( CacheRecord )              = %d\n", (int) sizeof( CacheRecord ) );
+    printf( "    gMDNSPtr                           = 0x%08lX\n", (unsigned long) gMDNSPtr );
+    printf( "    gMDNSTicksToMicrosecondsMultiplier = %ld\n", gMDNSTicksToMicrosecondsMultiplier );
+    printf( "    lockID                             = 0x%08lX\n", (unsigned long) gMDNSPtr->p->lockID );
+    printf( "    readyEvent                         = 0x%08lX\n", (unsigned long) gMDNSPtr->p->readyEvent );
+    printf( "    taskInitErr                        = %ld\n", gMDNSPtr->p->taskInitErr );
+    printf( "    quitEvent                          = 0x%08lX\n", (unsigned long) gMDNSPtr->p->quitEvent );
+    printf( "    commandPipe                        = %d\n", gMDNSPtr->p->commandPipe );
+    printf( "    task                               = 0x%08lX\n", (unsigned long) gMDNSPtr->p->task );
+    printf( "    quit                               = %d\n", gMDNSPtr->p->quit );
+    printf( "    configID                           = %ld\n", gMDNSPtr->p->configID );
+    printf( "    rescheduled                        = %d\n", gMDNSPtr->p->rescheduled );
+    printf( "    nicelabel                          = \"%.*s\"\n", gMDNSPtr->nicelabel.c[ 0 ], (char *) &gMDNSPtr->nicelabel.c[ 1 ] );
+    printf( "    hostLabel                          = \"%.*s\"\n", gMDNSPtr->hostlabel.c[ 0 ], (char *) &gMDNSPtr->hostlabel.c[ 1 ] );
+    printf( "\n");
+
+    // Interfaces
+
+    printf( "\n-- mDNS interfaces --\n" );
+    n = 1;
+    for( item = gMDNSPtr->p->interfaceList; item; item = item->next )
+    {
+        printf( "    -- interface %u --\n", n );
+        printf( "        name                           = \"%s\"\n", item->name );
+        printf( "        multicastSocketRef             = %d\n", item->multicastSocketRef );
+        printf( "        sendingSocketRef               = %d\n", item->sendingSocketRef );
+        ip = item->hostSet.ip;
+        printf( "        hostSet.ip                     = %u.%u.%u.%u\n", ip.ip.v4.b[ 0 ], ip.ip.v4.b[ 1 ],
+                ip.ip.v4.b[ 2 ], ip.ip.v4.b[ 3 ] );
+        printf( "        hostSet.advertise              = %s\n", item->hostSet.Advertise ? "YES" : "NO" );
+        printf( "        hostRegistered                 = %s\n", item->hostRegistered ? "YES" : "NO" );
+        printf( "        --\n" );
+        printf( "        sendMulticastCounter           = %d\n", item->sendMulticastCounter );
+        printf( "        sendUnicastCounter             = %d\n", item->sendUnicastCounter );
+        printf( "        sendErrorCounter               = %d\n", item->sendErrorCounter );
+        printf( "        recvCounter                    = %d\n", item->recvCounter );
+        printf( "        recvErrorCounter               = %d\n", item->recvErrorCounter );
+        printf( "        recvLoopCounter                = %d\n", item->recvLoopCounter );
+        printf( "\n" );
+        ++n;
+    }
+
+    // Resource Records
+
+    if( inShowRecords )
+    {
+        mDNSShowRecords();
+    }
+}
+
+//===========================================================================================================================
+//	mDNSShowRecords
+//===========================================================================================================================
+
+void    mDNSShowRecords( void )
+{
+    MDNSInterfaceItem *     item;
+    int n;
+    AuthRecord *            record;
+    char name[ MAX_ESCAPED_DOMAIN_NAME ];
+
+    printf( "\n-- mDNS resource records --\n" );
+    n = 1;
+    for( record = gMDNSPtr->ResourceRecords; record; record = record->next )
+    {
+        item = (MDNSInterfaceItem *) record->resrec.InterfaceID;
+        ConvertDomainNameToCString( &record->resrec.name, name );
+        printf( "    -- record %d --\n", n );
+        printf( "        interface = 0x%08X (%s)\n", (int) item, item ? item->name : "<any>" );
+        printf( "        name      = \"%s\"\n", name );
+        printf( "\n" );
+        ++n;
+    }
+    printf( "\n");
+}
+
+//===========================================================================================================================
+//	mDNSShowTXT
+//===========================================================================================================================
+
+void    mDNSShowTXT( const void *inTXT, size_t inTXTSize )
+{
+    const mDNSu8 *      p;
+    const mDNSu8 *      end;
+    int i;
+    mDNSu8 size;
+
+    printf( "\nTXT record (%u bytes):\n\n", inTXTSize );
+
+    p   = (const mDNSu8 *) inTXT;
+    end = p + inTXTSize;
+    i   = 0;
+
+    while( p < end )
+    {
+        size = *p++;
+        if( ( p + size ) > end )
+        {
+            printf( "\n### MALFORMED TXT RECORD (length byte too big for record)\n\n" );
+            break;
+        }
+        printf( "%2d (%3d bytes): \"%.*s\"\n", i, size, size, p );
+        p += size;
+        ++i;
+    }
+    printf( "\n" );
+}
+#endif  // DEBUG
diff --git a/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.h b/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.h
new file mode 100644
index 00000000..ecde894a
--- /dev/null
+++ b/mDNSResponder/mDNSVxWorks/mDNSVxWorksIPv4Only.h
@@ -0,0 +1,129 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+    Contains:	mDNS platform plugin for VxWorks.
+
+    Copyright:  Copyright (C) 2002-2003 Apple Computer, Inc., All Rights Reserved.
+
+ */
+
+#ifndef __MDNS_VXWORKS__
+#define __MDNS_VXWORKS__
+
+#include    "vxWorks.h"
+#include    "semLib.h"
+
+#include    "mDNSEmbeddedAPI.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+// Forward Declarations
+
+typedef struct  MDNSInterfaceItem MDNSInterfaceItem;
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		mDNS_PlatformSupport_struct
+
+    @abstract	Structure containing platform-specific data.
+ */
+
+struct  mDNS_PlatformSupport_struct
+{
+    SEM_ID lockID;
+    SEM_ID readyEvent;
+    mStatus taskInitErr;
+    SEM_ID quitEvent;
+    MDNSInterfaceItem *     interfaceList;
+    int commandPipe;
+    int task;
+    mDNSBool quit;
+    long configID;
+    int rescheduled;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	mDNSReconfigure
+
+    @abstract	Tell mDNS that the configuration has changed. Call when IP address changes, link goes up after being down, etc.
+
+    @discussion
+
+    VxWorks does not provide a generic mechanism for getting notified when network interfaces change so this routines
+    provides a way for BSP-specific code to signal mDNS that something has changed and it should re-build its interfaces.
+ */
+
+void    mDNSReconfigure( void );
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		ifaddrs
+
+    @abstract	Interface information
+ */
+
+struct ifaddrs
+{
+    struct ifaddrs *    ifa_next;
+    char *              ifa_name;
+    u_int ifa_flags;
+    struct sockaddr *   ifa_addr;
+    struct sockaddr *   ifa_netmask;
+    struct sockaddr *   ifa_dstaddr;
+    void *              ifa_data;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	getifaddrs
+
+    @abstract	Builds a linked list of interfaces. Caller must free using freeifaddrs if successful.
+ */
+
+int getifaddrs( struct ifaddrs **outAddrs );
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	freeifaddrs
+
+    @abstract	Frees a linked list of interfaces built with getifaddrs.
+ */
+
+void    freeifaddrs( struct ifaddrs *inAddrs );
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	sock_pton
+
+    @abstract	Converts a 'p'resentation address string into a 'n'umeric sockaddr structure.
+
+    @result		0 if successful or an error code on failure.
+ */
+
+int sock_pton( const char *inString, int inFamily, void *outAddr, size_t inAddrSize, size_t *outAddrSize );
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@function	sock_ntop
+
+    @abstract	Converts a 'n'umeric sockaddr structure into a 'p'resentation address string.
+
+    @result		Ptr to 'p'resentation address string buffer if successful or NULL on failure.
+ */
+
+char *  sock_ntop( const void *inAddr, size_t inAddrSize, char *inBuffer, size_t inBufferSize );
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // __MDNS_VXWORKS__
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.cpp b/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.cpp
new file mode 100755
index 00000000..084cf1bc
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.cpp
@@ -0,0 +1,441 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "BrowsingPage.h"
+#include "resource.h"
+
+#include "ConfigPropertySheet.h"
+
+#include <WinServices.h>
+    
+#define MAX_KEY_LENGTH 255
+
+
+IMPLEMENT_DYNCREATE(CBrowsingPage, CPropertyPage)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::CBrowsingPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CBrowsingPage::CBrowsingPage()
+:
+	CPropertyPage(CBrowsingPage::IDD)
+{
+	//{{AFX_DATA_INIT(CBrowsingPage)
+	//}}AFX_DATA_INIT
+
+	m_firstTime = true;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::~CBrowsingPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CBrowsingPage::~CBrowsingPage()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CBrowsingPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CBrowsingPage)
+	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_BROWSE_LIST, m_browseListCtrl);
+	DDX_Control(pDX, IDC_REMOVE_BROWSE_DOMAIN, m_removeButton);
+}
+
+BEGIN_MESSAGE_MAP(CBrowsingPage, CPropertyPage)
+	//{{AFX_MSG_MAP(CBrowsingPage)
+	//}}AFX_MSG_MAP
+	ON_BN_CLICKED(IDC_ADD_BROWSE_DOMAIN, OnBnClickedAddBrowseDomain)
+	ON_BN_CLICKED(IDC_REMOVE_BROWSE_DOMAIN, OnBnClickedRemoveBrowseDomain)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_BROWSE_LIST, OnLvnItemchangedBrowseList)
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::SetModified
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CBrowsingPage::SetModified( BOOL bChanged )
+{
+	m_modified = bChanged;
+
+	CPropertyPage::SetModified( bChanged );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::OnSetActive
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CBrowsingPage::OnSetActive()
+{
+	CConfigPropertySheet	*	psheet;
+	HKEY						key = NULL;
+	HKEY						subKey = NULL;
+	DWORD						dwSize;
+	DWORD						enabled;
+	DWORD						err;
+	TCHAR						subKeyName[MAX_KEY_LENGTH];
+	DWORD						cSubKeys = 0;
+	DWORD						cbMaxSubKey;
+	DWORD						cchMaxClass;
+	int							nIndex;
+    DWORD						i; 
+	BOOL						b = CPropertyPage::OnSetActive();
+
+	psheet = reinterpret_cast<CConfigPropertySheet*>(GetParent());
+	require_quiet( psheet, exit );
+	
+	m_modified = FALSE;
+
+	if ( m_firstTime )
+	{
+		m_browseListCtrl.SetExtendedStyle((m_browseListCtrl.GetStyle() & (~LVS_EX_GRIDLINES))|LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
+
+		m_browseListCtrl.InsertColumn(0, L"", LVCFMT_LEFT, 20 );
+		m_browseListCtrl.InsertColumn(1, L"", LVCFMT_LEFT, 345);
+
+		m_firstTime = false;
+	}
+
+	m_initialized = false;
+
+	// Clear out what's there
+
+	m_browseListCtrl.DeleteAllItems();
+
+	// Now populate the browse domain box
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\Setup\\" kServiceDynDNSBrowseDomains, 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	// Get information about this node
+
+    err = RegQueryInfoKey( key, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+	require_noerr( err, exit );
+
+	for ( i = 0; i < cSubKeys; i++)
+	{	
+		dwSize = MAX_KEY_LENGTH;
+            
+		err = RegEnumKeyEx( key, i, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+		require_noerr( err, exit );
+
+		err = RegOpenKey( key, subKeyName, &subKey );
+		require_noerr( err, exit );
+
+		dwSize = sizeof( DWORD );
+		err = RegQueryValueEx( subKey, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+		require_noerr( err, exit );
+
+		nIndex = m_browseListCtrl.InsertItem( m_browseListCtrl.GetItemCount(), L"");
+		m_browseListCtrl.SetItemText( nIndex, 1, subKeyName );
+		m_browseListCtrl.SetCheck( nIndex, enabled );
+
+		RegCloseKey( subKey );
+		subKey = NULL;
+    }
+
+	m_browseListCtrl.SortItems( SortFunc, (DWORD_PTR) this );
+
+	m_removeButton.EnableWindow( FALSE );
+ 
+exit:
+
+	if ( subKey )
+	{
+		RegCloseKey( subKey );
+	}
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	m_initialized = true;
+
+	return b;
+}
+
+ 
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::OnOK
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CBrowsingPage::OnOK()
+{
+	if ( m_modified )
+	{
+		Commit();
+	}
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CBrowsingPage::Commit()
+{
+	HKEY		key		= NULL;
+	HKEY		subKey	= NULL;
+	TCHAR		subKeyName[MAX_KEY_LENGTH];
+	DWORD		cSubKeys = 0;
+	DWORD		cbMaxSubKey;
+	DWORD		cchMaxClass;
+	DWORD		dwSize;
+	int			i;
+	DWORD		err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\Setup\\" kServiceDynDNSBrowseDomains, 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	// First, remove all the entries that are there
+
+    err = RegQueryInfoKey( key, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+	require_noerr( err, exit );
+
+	for ( i = 0; i < (int) cSubKeys; i++ )
+	{	
+		dwSize = MAX_KEY_LENGTH;
+            
+		err = RegEnumKeyEx( key, 0, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+		require_noerr( err, exit );
+			
+		err = RegDeleteKey( key, subKeyName );
+		require_noerr( err, exit );
+	}
+
+	// Now re-populate
+
+	for ( i = 0; i < m_browseListCtrl.GetItemCount(); i++ )
+	{
+		DWORD enabled = (DWORD) m_browseListCtrl.GetCheck( i );
+
+		err = RegCreateKeyEx( key, m_browseListCtrl.GetItemText( i, 1 ), 0,
+		                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &subKey, NULL );
+		require_noerr( err, exit );
+
+		err = RegSetValueEx( subKey, L"Enabled", NULL, REG_DWORD, (LPBYTE) &enabled, sizeof( enabled ) );
+		require_noerr( err, exit );
+
+		RegCloseKey( subKey );
+		subKey = NULL;
+	}
+	
+exit:
+
+	if ( subKey )
+	{
+		RegCloseKey( subKey );
+	}
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::OnBnClickedAddBrowseDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CBrowsingPage::OnBnClickedAddBrowseDomain()
+{
+	CAddBrowseDomain dlg( GetParent() );
+
+	if ( ( dlg.DoModal() == IDOK ) && ( dlg.m_text.GetLength() > 0 ) )
+	{
+		int nIndex;
+
+		nIndex = m_browseListCtrl.InsertItem( m_browseListCtrl.GetItemCount(), L"");
+		m_browseListCtrl.SetItemText( nIndex, 1, dlg.m_text );
+		m_browseListCtrl.SetCheck( nIndex, 1 );
+
+		m_browseListCtrl.SortItems( SortFunc, (DWORD_PTR) this );
+
+		m_browseListCtrl.Invalidate();
+
+		SetModified( TRUE );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage::OnBnClickedRemoveBrowseDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CBrowsingPage::OnBnClickedRemoveBrowseDomain()
+{
+	UINT	selectedCount = m_browseListCtrl.GetSelectedCount();
+	int		nItem = -1;
+	UINT	i;
+
+	// Update all of the selected items.
+
+	for ( i = 0; i < selectedCount; i++ )
+	{
+		nItem = m_browseListCtrl.GetNextItem( -1, LVNI_SELECTED );
+		check( nItem != -1 );
+
+		m_browseListCtrl.DeleteItem( nItem );
+
+		SetModified( TRUE );
+	}
+
+	m_removeButton.EnableWindow( FALSE );
+}
+
+
+void
+CBrowsingPage::OnLvnItemchangedBrowseList(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	if ( m_browseListCtrl.GetSelectedCount() )
+	{
+		m_removeButton.EnableWindow( TRUE );
+	}
+
+	if ( m_initialized )
+	{
+		NM_LISTVIEW * pNMListView = (NM_LISTVIEW*)pNMHDR; 
+	 
+		BOOL bPrevState = (BOOL) ( ( ( pNMListView->uOldState & LVIS_STATEIMAGEMASK ) >> 12 ) - 1 ); 
+	 
+		if ( bPrevState < 0 )
+		{
+			bPrevState = 0;
+		}
+
+
+		BOOL bChecked = ( BOOL ) ( ( ( pNMListView->uNewState & LVIS_STATEIMAGEMASK ) >> 12) - 1 ); 
+	 
+		if ( bChecked < 0 )
+		{
+			bChecked = 0;
+		}
+
+		if ( bPrevState != bChecked )
+		{
+			SetModified( TRUE );
+		}
+	}
+
+	*pResult = 0;
+}
+
+
+
+int CALLBACK 
+CBrowsingPage::SortFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+{
+	CString str1;
+	CString	str2;
+	int		ret = 0;
+
+	CBrowsingPage * self = reinterpret_cast<CBrowsingPage*>( lParamSort );
+	require_quiet( self, exit );
+
+	str1 = self->m_browseListCtrl.GetItemText( (int) lParam1, 1 );
+	str2 = self->m_browseListCtrl.GetItemText( (int) lParam2, 1 );
+
+	ret = str1.Compare( str2 );
+
+exit:
+
+	return ret;
+}
+
+
+// CAddBrowseDomain dialog
+
+IMPLEMENT_DYNAMIC(CAddBrowseDomain, CDialog)
+CAddBrowseDomain::CAddBrowseDomain(CWnd* pParent /*=NULL*/)
+	: CDialog(CAddBrowseDomain::IDD, pParent)
+{
+}
+
+CAddBrowseDomain::~CAddBrowseDomain()
+{
+}
+
+void CAddBrowseDomain::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_COMBO1, m_comboBox);
+}
+
+
+BOOL
+CAddBrowseDomain::OnInitDialog()
+{
+	CConfigPropertySheet	*	psheet;
+	CConfigPropertySheet::StringList::iterator		it;
+	
+	BOOL b = CDialog::OnInitDialog();
+
+	psheet = reinterpret_cast<CConfigPropertySheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	for ( it = psheet->m_browseDomains.begin(); it != psheet->m_browseDomains.end(); it++ )
+	{
+		CString text = *it;
+
+		if ( m_comboBox.FindStringExact( -1, *it ) == CB_ERR )
+		{
+			m_comboBox.AddString( *it );
+		}
+	}
+
+exit:
+
+	return b;
+}
+
+
+void
+CAddBrowseDomain::OnOK()
+{
+	m_comboBox.GetWindowText( m_text );
+
+	CDialog::OnOK();
+}
+
+
+
+BEGIN_MESSAGE_MAP(CAddBrowseDomain, CDialog)
+END_MESSAGE_MAP()
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.h b/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.h
new file mode 100755
index 00000000..4711b368
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/BrowsingPage.h
@@ -0,0 +1,156 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+#include <list>
+#include "afxcmn.h"
+
+#include "afxwin.h"
+
+
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CBrowsingPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CBrowsingPage : public CPropertyPage
+{
+public:
+	CBrowsingPage();
+	~CBrowsingPage();
+
+protected:
+
+	//{{AFX_DATA(CBrowsingPage)
+	enum { IDD = IDR_APPLET_PAGE3 };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CBrowsingPage)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CBrowsingPage)
+
+	//{{AFX_MSG(CBrowsingPage)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+	
+private:
+	
+	typedef std::list<CString> StringList;
+
+	afx_msg BOOL
+	OnSetActive();
+	
+	afx_msg void
+	OnOK();
+	
+	void
+	SetModified( BOOL bChanged = TRUE );
+	
+	void
+	Commit();
+
+	BOOL			m_modified;
+
+public:
+private:
+
+	static int CALLBACK 
+
+	SortFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
+
+
+
+	CListCtrl	m_browseListCtrl;
+
+	bool		m_initialized;
+
+	bool		m_firstTime;
+
+
+
+public:
+
+
+
+	afx_msg void OnBnClickedAddBrowseDomain();
+
+	afx_msg void OnBnClickedRemoveBrowseDomain();
+
+	afx_msg void OnLvnItemchangedBrowseList(NMHDR *pNMHDR, LRESULT *pResult);
+
+	CButton m_removeButton;
+
+};
+
+
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CAddBrowseDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+
+class CAddBrowseDomain : public CDialog
+
+{
+
+	DECLARE_DYNAMIC(CAddBrowseDomain)
+
+
+
+public:
+
+	CAddBrowseDomain(CWnd* pParent = NULL);   // standard constructor
+
+	virtual ~CAddBrowseDomain();
+
+
+
+// Dialog Data
+
+	enum { IDD = IDR_ADD_BROWSE_DOMAIN };
+
+
+
+protected:
+
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	virtual BOOL OnInitDialog();
+
+	virtual void OnOK();
+
+	DECLARE_MESSAGE_MAP()
+
+public:
+
+	CComboBox	m_comboBox;
+
+	CString		m_text;
+
+};
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.cpp b/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.cpp
new file mode 100755
index 00000000..ad590660
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.cpp
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include "ConfigDialog.h"
+#include "ControlPanel.h"
+
+
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+IMPLEMENT_DYNCREATE(CConfigDialog, CDialog)
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigDialog::CConfigDialog
+//---------------------------------------------------------------------------------------------------------------------------
+
+CConfigDialog::CConfigDialog()
+	: CDialog(CConfigDialog::IDD, NULL)
+{
+	//{{AFX_DATA_INIT(CConfigDialog)
+	//}}AFX_DATA_INIT
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigDialog::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CConfigDialog::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CConfigDialog)
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CConfigDialog, CDialog)
+	//{{AFX_MSG_MAP(CConfigDialog)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.h b/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.h
new file mode 100644
index 00000000..fa8df5f9
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ConfigDialog.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigDialog
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CConfigDialog : public CDialog
+{
+public:
+
+	CConfigDialog();
+
+protected:
+
+	//{{AFX_DATA(CConfigDialog)
+	enum { IDD = IDR_APPLET };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CConfigDialog)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	//{{AFX_MSG(CConfigDialog)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+	DECLARE_DYNCREATE(CConfigDialog)
+};
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.cpp b/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.cpp
new file mode 100755
index 00000000..5fae9555
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.cpp
@@ -0,0 +1,301 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ConfigPropertySheet.h"
+#include <WinServices.h>
+extern "C"
+{
+#include <ClientCommon.h>
+}
+#include <process.h>
+
+// Custom events
+
+#define WM_DATAREADY		( WM_USER + 0x100 )
+
+
+IMPLEMENT_DYNCREATE(CConfigPropertySheet, CPropertySheet)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::CConfigPropertySheet
+//---------------------------------------------------------------------------------------------------------------------------
+
+CConfigPropertySheet::CConfigPropertySheet()
+:
+	CPropertySheet(),
+	m_browseDomainsRef( NULL ),
+	m_thread( NULL ),
+	m_threadExited( NULL )
+{
+	AddPage(&m_firstPage );
+	AddPage(&m_secondPage);
+	AddPage(&m_thirdPage);
+
+	InitializeCriticalSection( &m_lock );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::~CConfigPropertySheet
+//---------------------------------------------------------------------------------------------------------------------------
+
+CConfigPropertySheet::~CConfigPropertySheet()
+{
+	DeleteCriticalSection( &m_lock );
+}
+
+
+BEGIN_MESSAGE_MAP(CConfigPropertySheet, CPropertySheet)
+	//{{AFX_MSG_MAP(CConfigPropertySheet)
+	//}}AFX_MSG_MAP
+	ON_MESSAGE( WM_DATAREADY, OnDataReady )
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::OnInitDialog
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CConfigPropertySheet::OnInitDialog()
+{
+	OSStatus err;
+
+	BOOL b = CPropertySheet::OnInitDialog();
+
+	err = SetupBrowsing();
+	require_noerr( err, exit );
+
+exit:
+
+	return b;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::OnCommand
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CConfigPropertySheet::OnCommand(WPARAM wParam, LPARAM lParam)
+{
+   // Check if OK or Cancel was hit
+
+   if ( ( wParam == ID_WIZFINISH ) || ( wParam == IDOK ) || ( wParam == IDCANCEL ) ) 
+   {
+      OnEndDialog();
+   }
+
+   return CPropertySheet::OnCommand(wParam, lParam);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::OnDataReady
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CConfigPropertySheet::OnDataReady(WPARAM inWParam, LPARAM inLParam)
+{
+	if (WSAGETSELECTERROR(inLParam) && !(HIWORD(inLParam)))
+	{
+		dlog( kDebugLevelError, "OnSocket: window error\n" );
+	}
+	else
+	{
+		SOCKET sock = (SOCKET) inWParam;
+
+		if ( m_browseDomainsRef && DNSServiceRefSockFD( m_browseDomainsRef ) == (int) sock )
+		{
+			DNSServiceProcessResult( m_browseDomainsRef );
+		}
+	}
+
+	return 0;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::OnEndDialog
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CConfigPropertySheet::OnEndDialog()
+{
+	OSStatus err;
+
+	err = TearDownBrowsing();
+	check_noerr( err );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::SetupBrowsing
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CConfigPropertySheet::SetupBrowsing()
+{
+	OSStatus err;
+
+	// Start browsing for browse domains
+
+	err = DNSServiceEnumerateDomains( &m_browseDomainsRef, kDNSServiceFlagsBrowseDomains, 0, BrowseDomainsReply, this );
+	require_noerr( err, exit );
+
+	err = WSAAsyncSelect( DNSServiceRefSockFD( m_browseDomainsRef ), m_hWnd, WM_DATAREADY, FD_READ|FD_CLOSE );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( err )
+	{
+		TearDownBrowsing();
+	}
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::TearDownBrowsing
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CConfigPropertySheet::TearDownBrowsing()
+{
+	OSStatus err = kNoErr;
+
+	if ( m_browseDomainsRef )
+	{
+		err = WSAAsyncSelect( DNSServiceRefSockFD( m_browseDomainsRef ), m_hWnd, 0, 0 );
+		check_noerr( err );
+
+		DNSServiceRefDeallocate( m_browseDomainsRef );
+	
+		m_browseDomainsRef = NULL;
+	}
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::DecodeDomainName
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CConfigPropertySheet::DecodeDomainName( const char * raw, CString & decoded )
+{
+	char nextLabel[128] = "\0";
+	char decodedDomainString[kDNSServiceMaxDomainName];
+    char * buffer = (char *) raw;
+    int labels = 0, i;
+    char text[64];
+	const char *label[128];
+	OSStatus	err;
+    
+	// Initialize
+
+	decodedDomainString[0] = '\0';
+
+    // Count the labels
+
+	while ( *buffer )
+	{
+		label[labels++] = buffer;
+		buffer = (char *) GetNextLabel(buffer, text);
+    }
+        
+    buffer = (char*) raw;
+
+    for (i = 0; i < labels; i++)
+	{
+		buffer = (char *)GetNextLabel(buffer, nextLabel);
+        strcat(decodedDomainString, nextLabel);
+        strcat(decodedDomainString, ".");
+    }
+    
+    // Remove trailing dot from domain name.
+    
+	decodedDomainString[ strlen( decodedDomainString ) - 1 ] = '\0';
+
+	// Convert to Unicode
+
+	err = UTF8StringToStringObject( decodedDomainString, decoded );
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet::BrowseDomainsReply
+//---------------------------------------------------------------------------------------------------------------------------
+
+void DNSSD_API
+CConfigPropertySheet::BrowseDomainsReply
+							(
+							DNSServiceRef			sdRef,
+							DNSServiceFlags			flags,
+							uint32_t				interfaceIndex,
+							DNSServiceErrorType		errorCode,
+							const char			*	replyDomain,
+							void				*	context
+							)
+{
+	CConfigPropertySheet	*	self = reinterpret_cast<CConfigPropertySheet*>(context);
+	CString						decoded;
+	OSStatus					err;
+
+	DEBUG_UNUSED( sdRef );
+	DEBUG_UNUSED( interfaceIndex );
+
+	if ( errorCode )
+	{
+		goto exit;
+	}
+
+	check( replyDomain );
+	
+	// Ignore local domains
+
+	if ( strcmp( replyDomain, "local." ) == 0 )
+	{
+		goto exit;
+	}
+
+	err = self->DecodeDomainName( replyDomain, decoded );
+	require_noerr( err, exit );
+
+	// Remove trailing '.'
+
+	decoded.TrimRight( '.' );
+
+	if ( flags & kDNSServiceFlagsAdd )
+	{
+		self->m_browseDomains.push_back( decoded );
+	}
+	else
+	{
+		self->m_browseDomains.remove( decoded );
+	}
+
+exit:
+
+	return;
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.h b/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.h
new file mode 100755
index 00000000..9e4fda81
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ConfigPropertySheet.h
@@ -0,0 +1,105 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ConfigPropertySheet_h
+#define _ConfigPropertySheet_h
+
+#include "stdafx.h"
+#include "ServicesPage.h"
+#include "RegistrationPage.h"
+#include "BrowsingPage.h"
+
+#include <RegNames.h>
+#include <dns_sd.h>
+#include <list>
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CConfigPropertySheet
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CConfigPropertySheet : public CPropertySheet
+{
+public:
+
+	CConfigPropertySheet();
+	virtual ~CConfigPropertySheet();
+
+	typedef std::list<CString> StringList;
+
+	StringList	m_browseDomains;
+
+protected:
+
+	CServicesPage		m_firstPage;
+	CRegistrationPage	m_secondPage;
+	CBrowsingPage		m_thirdPage;
+
+	//{{AFX_VIRTUAL(CConfigPropertySheet)
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CConfigPropertySheet)
+
+	//{{AFX_MSG(CConfigPropertySheet)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+	afx_msg BOOL	OnInitDialog();
+	afx_msg BOOL	OnCommand( WPARAM wParam, LPARAM lParam );
+	afx_msg LRESULT	OnDataReady( WPARAM inWParam, LPARAM inLParam );
+	afx_msg LRESULT	OnRegistryChanged( WPARAM inWParam, LPARAM inLParam );
+	void			OnEndDialog();
+
+private:
+
+	OSStatus
+	SetupBrowsing();
+
+	OSStatus
+	TearDownBrowsing();
+
+	OSStatus
+	DecodeDomainName( const char * raw, CString & decoded );
+
+	static void DNSSD_API
+	BrowseDomainsReply
+				(
+				DNSServiceRef			sdRef,
+				DNSServiceFlags			flags,
+				uint32_t				interfaceIndex,
+				DNSServiceErrorType		errorCode,
+				const char			*	replyDomain,
+				void				*	context
+				);
+
+	// This thread will watch for registry changes
+
+	static unsigned WINAPI
+	WatchRegistry
+				(
+				LPVOID inParam
+				);
+
+	HKEY				m_statusKey;
+	HANDLE				m_thread;
+	HANDLE				m_threadExited;
+	DNSServiceRef		m_browseDomainsRef;
+	CRITICAL_SECTION	m_lock;
+};
+
+
+#endif
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.cpp b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.cpp
new file mode 100755
index 00000000..4bf5df37
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.cpp
@@ -0,0 +1,380 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+#include "ControlPanel.h"
+#include "ConfigDialog.h"
+#include "ConfigPropertySheet.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
+static CCPApp theApp;
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	GetControlPanelApp
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApp*
+GetControlPanelApp()
+{
+	CCPApp * pApp = (CCPApp*) AfxGetApp();
+
+	check( pApp );
+	check( pApp->IsKindOf( RUNTIME_CLASS( CCPApp ) ) );
+
+	return pApp;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CPlApplet
+//---------------------------------------------------------------------------------------------------------------------------
+
+LONG APIENTRY
+CPlApplet(HWND hWndCPl, UINT uMsg, LONG lParam1, LONG lParam2)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+
+	CCPApp * pApp = GetControlPanelApp();
+
+	return ( LONG ) pApp->OnCplMsg(hWndCPl, uMsg, lParam1, lParam2);
+}
+
+
+IMPLEMENT_DYNAMIC(CCPApplet, CCmdTarget);
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::CCPApplet
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApplet::CCPApplet(UINT resourceId, UINT descId, CRuntimeClass * uiClass)
+:
+	m_resourceId(resourceId),
+	m_descId(descId),
+	m_uiClass(uiClass),
+	m_pageNumber(0)
+{
+	check( uiClass );
+	check( uiClass->IsDerivedFrom( RUNTIME_CLASS( CDialog ) ) || 
+	       uiClass->IsDerivedFrom( RUNTIME_CLASS( CPropertySheet ) ) );
+
+	m_name.LoadString(resourceId);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::~CCPApplet
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApplet::~CCPApplet()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnStartParms
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnStartParms(CWnd * pParentWnd, LPCTSTR extra)
+{
+	DEBUG_UNUSED( pParentWnd );
+
+	if ( extra )
+	{
+		m_pageNumber = ::_ttoi( extra ) - 1;
+	}
+
+	return 0;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnRun
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnRun(CWnd* pParentWnd)
+{
+	LRESULT		lResult = 1;
+	CWnd	*	pWnd;
+
+	InitCommonControls();
+
+	pWnd = (CWnd*) m_uiClass->CreateObject(); 
+
+	if ( pWnd )
+	{
+		lResult = ERROR_SUCCESS;
+
+		if ( pWnd->IsKindOf( RUNTIME_CLASS( CPropertySheet ) ) )
+		{
+			CPropertySheet * pSheet = (CPropertySheet*) pWnd;
+
+			pSheet->Construct(m_name, pParentWnd, m_pageNumber);
+
+			pSheet->DoModal();
+		}
+		else
+		{
+			check( pWnd->IsKindOf( RUNTIME_CLASS( CDialog ) ) );
+
+			CDialog * pDialog = (CDialog*) pWnd;
+
+      		pDialog->DoModal();
+    	}
+
+		delete pWnd;
+  	}
+
+	return lResult;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnInquire
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnInquire(CPLINFO* pInfo)
+{
+	pInfo->idIcon = m_resourceId;
+	pInfo->idName = m_resourceId;
+	pInfo->idInfo = m_descId;
+	pInfo->lData  = reinterpret_cast<LONG>(this);
+
+	return 0;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnNewInquire
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnNewInquire(NEWCPLINFO* pInfo)
+{
+	DEBUG_UNUSED( pInfo );
+
+	return 1;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnSelect
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnSelect()
+{
+	return 0;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet::OnStop
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApplet::OnStop()
+{
+	return 0;
+}
+
+
+IMPLEMENT_DYNAMIC(CCPApp, CWinApp);
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::CCPApp
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApp::CCPApp()
+{
+	debug_initialize( kDebugOutputTypeWindowsEventLog, "DNS-SD Control Panel", GetModuleHandle( NULL ) );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelInfo );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::~CCPApp
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApp::~CCPApp()
+{
+	while ( !m_applets.IsEmpty() )
+	{
+    	delete m_applets.RemoveHead();
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::AddApplet
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CCPApp::AddApplet( CCPApplet * applet )
+{
+	check( applet );
+
+	m_applets.AddTail( applet );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::OnInit
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApp::OnInit()
+{
+	CCPApplet * applet;
+
+	try
+	{
+		applet = new CCPApplet( IDR_APPLET, IDS_APPLET_DESCRIPTION, RUNTIME_CLASS( CConfigPropertySheet ) );
+	}
+	catch (...)
+	{
+		applet = NULL;
+	}
+   
+	require_action( applet, exit, kNoMemoryErr );
+	
+	AddApplet( applet );
+
+exit:
+
+	return m_applets.GetCount();
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::OnExit
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApp::OnExit()
+{
+  return 1;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::OnCplMsg
+//---------------------------------------------------------------------------------------------------------------------------
+
+LRESULT
+CCPApp::OnCplMsg(HWND hWndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
+{
+	LRESULT lResult = 1;
+
+	switch ( uMsg )
+	{
+		case CPL_INIT:
+		{
+			lResult = OnInit();
+		}
+		break;
+
+		case CPL_EXIT:
+		{
+			lResult = OnExit();
+		}
+		break;
+
+		case CPL_GETCOUNT:
+		{      
+    		lResult = m_applets.GetCount();
+  		}
+		break;
+
+		default:
+  		{
+    		POSITION pos = m_applets.FindIndex( lParam1 );
+			check( pos );
+
+			CCPApplet * applet = m_applets.GetAt( pos );  
+			check( applet );
+
+    		switch (uMsg)
+    		{
+      			case CPL_INQUIRE:
+      			{
+					LPCPLINFO pInfo = reinterpret_cast<LPCPLINFO>(lParam2);
+        			lResult = applet->OnInquire(pInfo);
+				}  
+        		break;
+
+				case CPL_NEWINQUIRE:
+      			{
+        			LPNEWCPLINFO pInfo = reinterpret_cast<LPNEWCPLINFO>(lParam2);
+					lResult = applet->OnNewInquire(pInfo);
+				}  
+        		break;
+
+				case CPL_STARTWPARMS:
+      			{
+        			CWnd * pParentWnd = CWnd::FromHandle(hWndCPl);
+        			LPCTSTR lpszExtra = reinterpret_cast<LPCTSTR>(lParam2);
+        			lResult = applet->OnStartParms(pParentWnd, lpszExtra);
+				}
+				break;
+
+				case CPL_DBLCLK:
+				{
+        			CWnd* pParentWnd = CWnd::FromHandle(hWndCPl);
+        			lResult = applet->OnRun(pParentWnd);
+				}
+        		break;
+
+				case CPL_SELECT:
+				{
+        			lResult = applet->OnSelect();
+				}
+				break;
+
+				case CPL_STOP:
+				{
+					lResult = applet->OnStop();
+				}
+				break;
+
+				default:
+				{
+					// TRACE(_T("Warning, Received an unknown control panel message:%d\n"), uMsg);
+					lResult = 1;
+				}
+				break;
+    		}
+  		}
+		break;
+	}
+
+	return lResult;
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.def b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.def
new file mode 100644
index 00000000..3cb05eb4
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.def
@@ -0,0 +1,20 @@
+; -*- tab-width: 4 -*-
+;
+; Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+    
+LIBRARY	"Bonjour"
+
+EXPORTS
+	CPlApplet
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.h b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.h
new file mode 100644
index 00000000..dec5e583
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+#pragma once
+
+#include "stdafx.h"
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApplet
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CCPApplet : public CCmdTarget
+{
+public:
+
+	CCPApplet( UINT nResourceID, UINT nDescriptionID, CRuntimeClass* pUIClass );
+
+	virtual ~CCPApplet();
+
+protected:
+
+	virtual LRESULT OnRun(CWnd* pParentWnd);
+	virtual LRESULT OnStartParms(CWnd* pParentWnd, LPCTSTR lpszExtra);
+	virtual LRESULT OnInquire(CPLINFO* pInfo);
+	virtual LRESULT OnNewInquire(NEWCPLINFO* pInfo);
+	virtual LRESULT OnSelect();
+	virtual LRESULT OnStop();
+
+	CRuntimeClass	*	m_uiClass;
+	UINT				m_resourceId;
+	UINT				m_descId;
+	CString				m_name;
+	int					m_pageNumber;
+  
+	friend class CCPApp;
+
+	DECLARE_DYNAMIC(CCPApplet);
+};
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CCPApp : public CWinApp
+{
+public:
+
+	CCPApp();
+	virtual ~CCPApp();
+
+	void AddApplet( CCPApplet* pApplet );
+
+protected:
+
+	CList<CCPApplet*, CCPApplet*&> m_applets;
+
+	friend LONG APIENTRY
+	CPlApplet(HWND hWndCPl, UINT uMsg, LONG lParam1, LONG lParam2);
+
+	virtual LRESULT OnCplMsg(HWND hWndCPl, UINT msg, LPARAM lp1, LPARAM lp2);
+	virtual LRESULT OnInit();
+	virtual LRESULT OnExit();
+
+	DECLARE_DYNAMIC(CCPApp);
+};
+
+
+CCPApp * GetControlPanelApp();
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.rc b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.rc
new file mode 100644
index 00000000..1df3e900
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.rc
@@ -0,0 +1,141 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDR_APPLET              ICON                    "res\\controlpanel.ico"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Control Panel"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ControlPanel.cpl"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ControlPanel.cpl"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE

+BEGIN

+	IDS_REINSTALL    "Bonjour Control Panel cannot run because some of its required files are missing.  Please reinstall Bonjour Control Panel."

+	IDS_REINSTALL_CAPTION "Bonjour"

+END

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcproj
new file mode 100755
index 00000000..2f2d0ab0
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcproj
@@ -0,0 +1,727 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ControlPanel"

+	ProjectGUID="{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}"

+	RootNamespace="ControlPanel"

+	Keyword="MFCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderThrough=""

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4311;4312"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderThrough=""

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4311;4312"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="ConfigDialog.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="ConfigPropertySheet.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\ControlPanelExe.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\ServicesPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath="RegistrationPage.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\loclibrary.c"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="BrowsingPage.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="ConfigDialog.h"

+				>

+			</File>

+			<File

+				RelativePath="ConfigPropertySheet.h"

+				>

+			</File>

+			<File

+				RelativePath=".\ControlPanelExe.h"

+				>

+			</File>

+			<File

+				RelativePath=".\ServicesPage.h"

+				>

+			</File>

+			<File

+				RelativePath="RegistrationPage.h"

+				>

+			</File>

+			<File

+				RelativePath="..\loclibrary.h"

+				>

+			</File>

+			<File

+				RelativePath="Resource.h"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.h"

+				>

+			</File>

+			<File

+				RelativePath="BrowsingPage.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath="res\configurator.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\controlpanel.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\ControlPanel.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\res\ControlPanel.rc2"

+				>

+			</File>

+			<File

+				RelativePath=".\res\EnergySaver.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\failure.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\success.ico"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Support"

+			>

+			<File

+				RelativePath="..\..\Clients\ClientCommon.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\Clients\ClientCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dns_sd.h"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.c"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.h"

+				>

+			</File>

+			<File

+				RelativePath="..\WinServices.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\WinServices.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj
new file mode 100755
index 00000000..c341d42e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}</ProjectGuid>

+    <RootNamespace>ControlPanel</RootNamespace>

+    <Keyword>MFCProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;../../mDNSCore;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderFile>

+      </PrecompiledHeaderFile>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4311;4312;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanel.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)ControlPanel.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ControlPanel.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;../../mDNSCore;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderFile>

+      </PrecompiledHeaderFile>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+      <DisableSpecificWarnings>4311;4312;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanel.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)ControlPanel.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ControlPanel64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..;../../mDNSCore;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanel.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ProgramDatabaseFile>$(OutDir)ControlPanel.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ControlPanel.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..;../../mDNSCore;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc80.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanel.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ProgramDatabaseFile>$(OutDir)ControlPanel.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\ControlPanel64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="ConfigDialog.cpp">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="ConfigPropertySheet.cpp">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="ControlPanelExe.cpp" />

+    <ClCompile Include="ServicesPage.cpp" />

+    <ClCompile Include="RegistrationPage.cpp">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="..\loclibrary.c" />

+    <ClCompile Include="stdafx.cpp">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="BrowsingPage.cpp" />

+    <ClCompile Include="..\..\Clients\ClientCommon.c" />

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="..\Secret.c" />

+    <ClCompile Include="..\WinServices.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="ConfigDialog.h" />

+    <ClInclude Include="ConfigPropertySheet.h" />

+    <ClInclude Include="ControlPanelExe.h" />

+    <ClInclude Include="ServicesPage.h" />

+    <ClInclude Include="RegistrationPage.h" />

+    <ClInclude Include="..\loclibrary.h" />

+    <ClInclude Include="Resource.h" />

+    <ClInclude Include="stdafx.h" />

+    <ClInclude Include="BrowsingPage.h" />

+    <ClInclude Include="..\..\Clients\ClientCommon.h" />

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h" />

+    <ClInclude Include="..\Secret.h" />

+    <ClInclude Include="..\WinServices.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\configurator.ico" />

+    <None Include="res\controlpanel.ico" />

+    <None Include="res\ControlPanel.rc2" />

+    <None Include="res\EnergySaver.ico" />

+    <None Include="res\failure.ico" />

+    <None Include="res\success.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanel.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\DLLStub\DLLStub.vcxproj">

+      <Project>{3a2b6325-3053-4236-84bd-aa9be2e323e5}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj.filters b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj.filters
new file mode 100755
index 00000000..846d6a47
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanel.vcxproj.filters
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{d534a12a-5d97-4d9e-87ba-898c97da20fb}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{e7514699-1b61-4910-a465-8950dd4c3fad}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{dad601b4-0fa4-4692-8c01-8cbb407b5a32}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+    <Filter Include="Support">

+      <UniqueIdentifier>{ada5b5c6-cf44-4574-94a0-0e576fda469d}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="ConfigDialog.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ConfigPropertySheet.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ControlPanelExe.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ServicesPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="RegistrationPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\loclibrary.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="BrowsingPage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\Clients\ClientCommon.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\Secret.c">

+      <Filter>Support</Filter>

+    </ClCompile>

+    <ClCompile Include="..\WinServices.cpp">

+      <Filter>Support</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="ConfigDialog.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ConfigPropertySheet.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ControlPanelExe.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ServicesPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="RegistrationPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\loclibrary.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="BrowsingPage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\Clients\ClientCommon.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\Secret.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+    <ClInclude Include="..\WinServices.h">

+      <Filter>Support</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\configurator.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\controlpanel.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\ControlPanel.rc2">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\EnergySaver.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\failure.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\success.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanel.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelDll.rc b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelDll.rc
new file mode 100644
index 00000000..5d1f4957
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelDll.rc
@@ -0,0 +1,123 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Configuration Applet"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "Bonjour.cpl"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "Bonjour.cpl"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#include ""ControlPanel.rc""\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+#endif    // English (U.S.) resources

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"         // Standard components

+#include "ControlPanel.rc"

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.cpp b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.cpp
new file mode 100755
index 00000000..36447d11
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.cpp
@@ -0,0 +1,373 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+#include "ControlPanelExe.h"
+#include "ConfigDialog.h"
+#include "ConfigPropertySheet.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+#include "loclibrary.h"
+
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#ifndef HeapEnableTerminationOnCorruption
+#	define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS) 1
+#endif
+
+
+// Stash away pointers to our resource DLLs
+
+static HINSTANCE g_nonLocalizedResources	= NULL;
+static HINSTANCE g_localizedResources		= NULL;
+
+
+HINSTANCE	GetNonLocalizedResources()
+{
+	return g_nonLocalizedResources;
+}
+
+
+HINSTANCE	GetLocalizedResources()
+{
+	return g_localizedResources;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	Static Declarations
+//---------------------------------------------------------------------------------------------------------------------------
+DEFINE_GUID(CLSID_ControlPanel, 
+
+0x1207552c, 0xe59, 0x4d9f, 0x85, 0x54, 0xf1, 0xf8, 0x6, 0xcd, 0x7f, 0xa9);
+
+static LPCTSTR g_controlPanelGUID			=	TEXT( "{1207552C-0E59-4d9f-8554-F1F806CD7FA9}" );
+static LPCTSTR g_controlPanelName			=	TEXT( "Bonjour" );
+static LPCTSTR g_controlPanelCanonicalName	=	TEXT( "Apple.Bonjour" );
+static LPCTSTR g_controlPanelCategory		=	TEXT( "3,8" );
+
+static CCPApp theApp;
+
+//===========================================================================================================================
+//	MyRegDeleteKey
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus MyRegDeleteKey( HKEY hKeyRoot, LPTSTR lpSubKey )
+{
+    LPTSTR lpEnd;
+    OSStatus err;
+    DWORD dwSize;
+    TCHAR szName[MAX_PATH];
+    HKEY hKey;
+    FILETIME ftWrite;
+
+    // First, see if we can delete the key without having to recurse.
+
+    err = RegDeleteKey( hKeyRoot, lpSubKey );
+
+    if ( !err )
+	{
+		goto exit;
+	}
+
+    err = RegOpenKeyEx( hKeyRoot, lpSubKey, 0, KEY_READ, &hKey );
+	require_noerr( err, exit );
+
+    // Check for an ending slash and add one if it is missing.
+
+    lpEnd = lpSubKey + lstrlen(lpSubKey);
+
+    if ( *( lpEnd - 1 ) != TEXT( '\\' ) ) 
+    {
+        *lpEnd =  TEXT('\\');
+        lpEnd++;
+        *lpEnd =  TEXT('\0');
+    }
+
+    // Enumerate the keys
+
+    dwSize = MAX_PATH;
+    err = RegEnumKeyEx(hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite);
+
+    if ( !err ) 
+    {
+        do
+		{
+            lstrcpy (lpEnd, szName);
+
+            if ( !MyRegDeleteKey( hKeyRoot, lpSubKey ) )
+			{
+                break;
+            }
+
+            dwSize = MAX_PATH;
+
+            err = RegEnumKeyEx( hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite );
+
+        }
+		while ( !err );
+    }
+
+    lpEnd--;
+    *lpEnd = TEXT('\0');
+
+    RegCloseKey( hKey );
+
+    // Try again to delete the key.
+
+    err = RegDeleteKey(hKeyRoot, lpSubKey);
+	require_noerr( err, exit );
+
+exit:
+
+	return err;
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::CCPApp
+//---------------------------------------------------------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC(CCPApp, CWinApp);
+
+CCPApp::CCPApp()
+{
+	debug_initialize( kDebugOutputTypeWindowsEventLog, "DNS-SD Control Panel", GetModuleHandle( NULL ) );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelInfo );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CCPApp::~CCPApp
+//---------------------------------------------------------------------------------------------------------------------------
+
+CCPApp::~CCPApp()
+{
+}
+
+
+void
+CCPApp::Register( LPCTSTR inClsidString, LPCTSTR inName, LPCTSTR inCanonicalName, LPCTSTR inCategory, LPCTSTR inLocalizedName, LPCTSTR inInfoTip, LPCTSTR inIconPath, LPCTSTR inExePath )
+{
+	typedef struct	RegistryBuilder		RegistryBuilder;
+	
+	struct	RegistryBuilder
+	{
+		HKEY		rootKey;
+		LPCTSTR		subKey;
+		LPCTSTR		valueName;
+		DWORD		valueType;
+		LPCTSTR		data;
+	};
+	
+	OSStatus			err;
+	size_t				n;
+	size_t				i;
+	HKEY				key;
+	TCHAR				keyName[ MAX_PATH ];
+	RegistryBuilder		entries[] = 
+	{
+		{ HKEY_LOCAL_MACHINE,	TEXT( "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\%s" ),	NULL,									REG_SZ,		inName },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),																			NULL,									NULL,		NULL },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),																			TEXT( "System.ApplicationName" ),		REG_SZ,		inCanonicalName },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),																			TEXT( "System.ControlPanel.Category" ),	REG_SZ,		inCategory },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),																			TEXT( "LocalizedString" ),				REG_SZ,		inLocalizedName },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s" ),																			TEXT( "InfoTip" ),						REG_SZ,		inInfoTip },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\DefaultIcon" ),																NULL,									REG_SZ,		inIconPath },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\Shell" ),																		NULL,									NULL,		NULL },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\Shell\\Open" ),																NULL,									NULL,		NULL },
+		{ HKEY_CLASSES_ROOT,	TEXT( "CLSID\\%s\\Shell\\Open\\Command" ),														NULL,									REG_SZ,		inExePath }
+	};
+	DWORD				size;
+	
+	// Register the registry entries.
+
+	n = sizeof_array( entries );
+	for( i = 0; i < n; ++i )
+	{
+		wsprintf( keyName, entries[ i ].subKey, inClsidString );		
+		err = RegCreateKeyEx( entries[ i ].rootKey, keyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL );
+		require_noerr( err, exit );
+		
+		if ( entries[ i ].data )
+		{
+			size = (DWORD)( ( lstrlen( entries[ i ].data ) + 1 ) * sizeof( TCHAR ) );
+			err = RegSetValueEx( key, entries[ i ].valueName, 0, entries[ i ].valueType, (LPBYTE) entries[ i ].data, size );
+			require_noerr( err, exit );
+		}
+
+		RegCloseKey( key );
+	}
+	
+exit:
+	return;
+}
+
+
+//-----------------------------------------------------------
+//	CCPApp::Unregister
+//-----------------------------------------------------------
+void
+CCPApp::Unregister( LPCTSTR clsidString )
+{
+	TCHAR keyName[ MAX_PATH * 2 ];
+
+	wsprintf( keyName, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\%s", clsidString );							
+	MyRegDeleteKey( HKEY_LOCAL_MACHINE, keyName );
+
+	wsprintf( keyName, L"CLSID\\%s", clsidString );
+	MyRegDeleteKey( HKEY_CLASSES_ROOT, keyName );
+}
+
+
+
+//-----------------------------------------------------------
+//	CCPApp::InitInstance
+//-----------------------------------------------------------
+
+BOOL
+CCPApp::InitInstance()
+{
+	CCommandLineInfo	commandLine;
+	wchar_t				resource[MAX_PATH];
+	CString				errorMessage;
+	CString				errorCaption;
+	int					res;
+	OSStatus			err = kNoErr;
+
+	HeapSetInformation( NULL, HeapEnableTerminationOnCorruption, NULL, 0 );
+
+	//
+	// initialize the debugging framework
+	//
+	debug_initialize( kDebugOutputTypeWindowsDebugger, "ControlPanel", NULL );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelTrace );
+
+	// Before we load the resources, let's load the error string
+
+	errorMessage.LoadString( IDS_REINSTALL );
+	errorCaption.LoadString( IDS_REINSTALL_CAPTION );
+
+	res = PathForResource( NULL, L"ControlPanelResources.dll", resource, MAX_PATH );
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_nonLocalizedResources = LoadLibrary( resource );
+	translate_errno( g_nonLocalizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	res = PathForResource( NULL, L"ControlPanelLocalized.dll", resource, MAX_PATH );
+	err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
+	require_noerr( err, exit );
+
+	g_localizedResources = LoadLibrary( resource );
+	translate_errno( g_localizedResources, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	AfxSetResourceHandle( g_localizedResources );
+
+	// InitCommonControls() is required on Windows XP if an application
+	// manifest specifies use of ComCtl32.dll version 6 or later to enable
+	// visual styles.  Otherwise, any window creation will fail.
+
+	InitCommonControls();
+
+	CWinApp::InitInstance();
+
+	AfxEnableControlContainer();
+
+	ParseCommandLine( commandLine );
+
+	if ( commandLine.m_nShellCommand == CCommandLineInfo::AppRegister )
+	{
+		CString		localizedName;
+		CString		toolTip;
+		TCHAR		iconPath[ MAX_PATH + 12 ]	= TEXT( "" );
+		TCHAR		exePath[ MAX_PATH ]			= TEXT( "" );
+		DWORD		nChars;
+		OSStatus	err;
+
+		nChars = GetModuleFileName( NULL, exePath, sizeof_array( exePath ) );
+
+		err = translate_errno( nChars > 0, (OSStatus) GetLastError(), kUnknownErr );
+
+		require_noerr( err, exit );
+
+		wsprintf( iconPath, L"%s,-%d", exePath, IDR_APPLET );
+
+		localizedName.LoadString( IDS_APPLET_NAME );
+		toolTip.LoadString( IDS_APPLET_TOOLTIP );
+
+		Register( g_controlPanelGUID, g_controlPanelName, g_controlPanelCanonicalName, g_controlPanelCategory, localizedName, toolTip, iconPath, exePath );
+	}
+	else if ( commandLine.m_nShellCommand == CCommandLineInfo::AppUnregister )
+	{
+		Unregister( g_controlPanelGUID );
+	}
+	else
+	{
+		CString					name;
+		CConfigPropertySheet	dlg;
+		
+		name.LoadString( IDR_APPLET );
+		dlg.Construct( name, NULL, 0 );
+
+		m_pMainWnd = &dlg;
+
+		try
+		{
+			INT_PTR nResponse = dlg.DoModal();
+		
+			if (nResponse == IDOK)
+			{
+				// TODO: Place code here to handle when the dialog is
+				//  dismissed with OK
+			}
+			else if (nResponse == IDCANCEL)
+			{
+				// TODO: Place code here to handle when the dialog is
+				//  dismissed with Cancel
+			}
+		}
+		catch (...)
+		{
+			MessageBox(NULL, L"", L"", MB_OK|MB_ICONEXCLAMATION);
+		}
+	}
+
+	if ( err )
+	{
+		MessageBox( NULL, L"", L"", MB_ICONERROR | MB_OK );
+	}
+
+exit:
+
+	if ( err )
+	{
+		MessageBox( NULL, errorMessage, errorCaption, MB_ICONERROR | MB_OK );
+	}
+
+	// Since the dialog has been closed, return FALSE so that we exit the
+	//  application, rather than start the application's message pump.
+	return FALSE;
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.h b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.h
new file mode 100644
index 00000000..865ebc1a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+#pragma once
+
+#include "stdafx.h"
+
+extern HINSTANCE	GetNonLocalizedResources();
+extern HINSTANCE	GetLocalizedResources();
+
+//-------------------------------------------------
+//	CCPApp
+//-------------------------------------------------
+
+class CCPApp : public CWinApp
+{
+public:
+
+	CCPApp();
+	virtual ~CCPApp();
+
+protected:
+
+	virtual BOOL    InitInstance();
+
+	void
+	Register( LPCTSTR inClsidString, LPCTSTR inName, LPCTSTR inCanonicalName, LPCTSTR inCategory, LPCTSTR inLocalizedName, LPCTSTR inInfoTip, LPCTSTR inIconPath, LPCTSTR inExePath );
+
+	void
+	Unregister( LPCTSTR clsidString );
+
+	DECLARE_DYNAMIC(CCPApp);
+};
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.rc b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.rc
new file mode 100644
index 00000000..4ea5f954
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.rc
@@ -0,0 +1,123 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Configuration Applet"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ControlPanel.exe"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ControlPanel.exe"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#include ""ControlPanel.rc""\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+#endif    // English (U.S.) resources

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"         // Standard components

+#include "ControlPanel.rc"

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.vcproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.vcproj
new file mode 100755
index 00000000..8bc0b29b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelExe.vcproj
@@ -0,0 +1,764 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ControlPanel (Vista)"

+	ProjectGUID="{0DF09484-B4C2-4AB4-9FC0-7B091ADEAFEB}"

+	Keyword="MFCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderThrough=""

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4311;4312"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1;UNICODE;_UNICODE;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderThrough=""

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+				DisableSpecificWarnings="4311;4312"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="ExeBuild\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..;../../mDNSCore;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="false"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ObjectFile="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DisableSpecificWarnings="4702"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)/ControlPanel.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="$(OutDir)\ControlPanel.pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				EntryPointSymbol="wWinMainCRTStartup"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\ControlPanel64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="ConfigDialog.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="ConfigPropertySheet.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\ControlPanelExe.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\FifthPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath="FirstPage.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\FourthPage.cpp"

+				>

+			</File>

+			<File

+				RelativePath="SecondPage.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="SharedSecret.cpp"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="ThirdPage.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="ConfigDialog.h"

+				>

+			</File>

+			<File

+				RelativePath="ConfigPropertySheet.h"

+				>

+			</File>

+			<File

+				RelativePath=".\ControlPanelExe.h"

+				>

+			</File>

+			<File

+				RelativePath=".\FifthPage.h"

+				>

+			</File>

+			<File

+				RelativePath="FirstPage.h"

+				>

+			</File>

+			<File

+				RelativePath=".\FourthPage.h"

+				>

+			</File>

+			<File

+				RelativePath="Resource.h"

+				>

+			</File>

+			<File

+				RelativePath="SecondPage.h"

+				>

+			</File>

+			<File

+				RelativePath="SharedSecret.h"

+				>

+			</File>

+			<File

+				RelativePath="stdafx.h"

+				>

+			</File>

+			<File

+				RelativePath="ThirdPage.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+			>

+			<File

+				RelativePath="res\configurator.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\controlpanel.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\res\ControlPanel.rc2"

+				>

+			</File>

+			<File

+				RelativePath=".\ControlPanelExe.rc"

+				>

+			</File>

+			<File

+				RelativePath="res\failure.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\success.ico"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Support"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dns_sd.h"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.c"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.h"

+				>

+			</File>

+			<File

+				RelativePath="..\WinServices.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\WinServices.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.rc b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.rc
new file mode 100755
index 00000000..4ba22b40
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.rc
@@ -0,0 +1,270 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ControlPanelLocalized.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ControlPanelLocalized.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+IDR_APPLET_PAGE1 DIALOGEX 0, 0, 262, 140

+STYLE DS_SETFONT | WS_CHILD | WS_CAPTION

+CAPTION "Registration"

+FONT 8, "MS Sans Serif", 0, 0, 0x0

+BEGIN

+    LTEXT           "Hostname:",IDC_STATIC,13,22,35,8

+    EDITTEXT        IDC_HOSTNAME,55,20,184,12,ES_AUTOHSCROLL

+    LTEXT           "User:",IDC_STATIC,13,38,35,8

+    EDITTEXT        IDC_USERNAME,55,36,184,12,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC,13,54,35,8

+    EDITTEXT        IDC_PASSWORD,55,52,184,12,ES_PASSWORD | ES_AUTOHSCROLL

+    CONTROL         "Advertise services in this domain using Bonjour",IDC_ADVERTISE_SERVICES,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,80,199,8

+END

+

+IDR_APPLET_PAGE3 DIALOGEX 0, 0, 262, 140

+STYLE DS_SETFONT | WS_CHILD | WS_CAPTION

+CAPTION "Browsing"

+FONT 8, "MS Sans Serif", 0, 0, 0x0

+BEGIN

+    LTEXT           "Choose which domains to browse using wide-area Bonjour",

+                    -1,7,16,248,12

+    CONTROL         "",IDC_BROWSE_LIST,"SysListView32",LVS_REPORT | 

+                    LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | 

+                    WS_TABSTOP,7,37,248,57

+    PUSHBUTTON      "Add",IDC_ADD_BROWSE_DOMAIN,152,100,50,14

+    PUSHBUTTON      "Remove",IDC_REMOVE_BROWSE_DOMAIN,205,100,50,14

+END

+

+IDR_APPLET_PAGE5 DIALOGEX 0, 0, 262, 140

+STYLE DS_SETFONT | WS_CHILD | WS_CAPTION

+CAPTION "Services"

+FONT 8, "MS Sans Serif", 0, 0, 0x0

+BEGIN

+    CONTROL         "Advertise shared folders using Bonjour",IDC_ADVERTISE_SMB,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,199,8

+    CONTROL         "Enable Wake on Demand",IDC_POWER_MANAGEMENT,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,34,199,8

+END

+

+IDR_POWER_MANAGEMENT_WARNING DIALOGEX 0, 0, 230, 95

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

+    WS_SYSMENU

+CAPTION "Power Management"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    DEFPUSHBUTTON   "OK",IDOK,173,74,50,14

+    LTEXT           "When 'Wake On Demand' is enabled, you may hear your computer wake up occasionally.",

+					IDC_STATIC,50,12,175,26

+    LTEXT           "This informs other devices that your computer is still available on the network.",

+                    IDC_STATIC,50,38,175,26

+    ICON            IDI_ENERGY_SAVER,IDC_ENERGY_SAVER,2,10,64,64,SS_REALSIZEIMAGE

+END

+

+IDR_ADD_BROWSE_DOMAIN DIALOGEX 0, 0, 230, 95

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

+    WS_SYSMENU

+CAPTION "Add Browse Domain"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    DEFPUSHBUTTON   "OK",IDOK,117,74,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,173,74,50,14

+    COMBOBOX        IDC_COMBO1,35,42,188,100,CBS_DROPDOWN | CBS_SORT | 

+                    WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Domain:",IDC_STATIC,7,43,27,8

+    LTEXT           "The following domain will be added to your list of Bonjour browse domains.",

+                    IDC_STATIC,7,15,216,16

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+GUIDELINES DESIGNINFO 

+BEGIN

+    IDR_APPLET_PAGE1, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 255

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 133

+    END

+

+    IDR_APPLET_PAGE2, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 255

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 133

+    END

+

+    IDR_SECRET, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 244

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 83

+    END

+

+    IDR_APPLET_PAGE3, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 255

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 133

+    END

+

+	IDR_POWER_MANAGEMENT_WARNING, DIALOG

+	BEGIN

+		LEFTMARGIN, 7

+		RIGHTMARGIN, 223

+		TOPMARGIN, 7,

+		BOTTOMMARGIN, 88

+	END

+

+    IDR_ADD_BROWSE_DOMAIN, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 223

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 88

+    END

+END

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDR_APPLET              "Bonjour"

+	IDS_APPLET_NAME			"Bonjour"

+    IDS_APPLET_DESCRIPTION  "Bonjour"

+	IDS_APPLET_TOOLTIP		"Change Bonjour settings for this computer."

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcproj
new file mode 100755
index 00000000..cdcee9b6
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcproj
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ControlPanelLocRes"

+	ProjectGUID="{4490229E-025A-478F-A2CF-51154DA83E39}"

+	RootNamespace="ControlPanelLocRes"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;if not exist $(OutDir)\ControlPanel.Resources\en.lproj mkdir $(OutDir)\ControlPanel.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ControlPanel.Resources\en.lproj\ControlPanelLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;if not exist $(OutDir)\ControlPanel.Resources\en.lproj mkdir $(OutDir)\ControlPanel.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ControlPanel.Resources\en.lproj\ControlPanelLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;if not exist $(OutDir)\ControlPanel.Resources\en.lproj mkdir $(OutDir)\ControlPanel.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ControlPanel.Resources\en.lproj\ControlPanelLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                          &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;if not exist $(OutDir)\ControlPanel.Resources\en.lproj mkdir $(OutDir)\ControlPanel.Resources\en.lproj&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				AdditionalDependencies=""

+				OutputFile="$(OutDir)\ControlPanel.Resources\en.lproj\ControlPanelLocalized.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                                          &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources\en.lproj&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_loc_res.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="ControlPanelLocRes.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="ControlPanelLocRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj
new file mode 100755
index 00000000..bc51708d
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{4490229E-025A-478F-A2CF-51154DA83E39}</ProjectGuid>

+    <RootNamespace>ControlPanelLocRes</RootNamespace>

+    <ProjectName>ControlPanelLocRes</ProjectName>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\en.lproj\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ControlPanelLocalized</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ControlPanelLocalized</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">ControlPanelLocalized</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ControlPanelLocalized</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ControlPanelLocalized</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">ControlPanelLocalized</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+if not exist $(OutDir)ControlPanel.Resources\en.lproj mkdir $(OutDir)ControlPanel.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanelLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+if not exist $(OutDir)ControlPanel.Resources\en.lproj mkdir $(OutDir)ControlPanel.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanelLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+if not exist $(OutDir)ControlPanel.Resources\en.lproj mkdir $(OutDir)ControlPanel.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanelLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+if not exist $(OutDir)ControlPanel.Resources\en.lproj mkdir $(OutDir)ControlPanel.Resources\en.lproj

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)ControlPanelLocalized.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"

+xcopy /I/Y "$(TargetPath)"                                                                                                                          "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources\en.lproj"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_res.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanelLocRes.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="ControlPanelLocRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj.filters b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj.filters
new file mode 100755
index 00000000..7398eada
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelLocRes.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{acc11657-b2ba-42ef-9f3e-c4c55cb6d9e9}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{7625f01d-dd41-4ede-9371-d3993f0779ac}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_loc_res.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanelLocRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.rc b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.rc
new file mode 100755
index 00000000..b74c59b9
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.rc
@@ -0,0 +1,134 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#include ""afxres.rc""     // Standard components\r\n"

+    "#endif\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour Resource Module"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "ControlPanelResources.dll"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "ControlPanelResources.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDR_APPLET              ICON                    "res\\controlpanel.ico"

+IDI_FAILURE             ICON                    "res\\failure.ico"

+IDI_SUCCESS             ICON                    "res\\success.ico"

+IDI_ENERGY_SAVER	ICON			"res\\EnergySaver.ico"

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#include "afxres.rc"     // Standard components

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcproj
new file mode 100755
index 00000000..3e36161f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcproj
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="ControlPanelRes"

+	ProjectGUID="{5254AA9C-3D2E-4539-86D9-5EB0F4151215}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ControlPanel.Resources\ControlPanelResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400"

+				StringPooling="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ControlPanel.Resources\ControlPanelResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(OutDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;.."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ControlPanel.Resources\ControlPanelResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                            &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)/$(ProjectName).tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				OmitFramePointers="true"

+				AdditionalIncludeDirectories="..\..\mDNSShared;.."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0400"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="false"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				WarnAsError="false"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=".."

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Building Output Directories"

+				CommandLine="if not exist $(OutDir)\ControlPanel.Resources mkdir $(OutDir)\ControlPanel.Resources&#x0D;&#x0A;"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 "

+				OutputFile="$(OutDir)\ControlPanel.Resources\ControlPanelResources.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				IgnoreDefaultLibraryNames=""

+				ModuleDefinitionFile=""

+				ProgramDatabaseFile=""

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				ResourceOnlyDLL="true"

+				ImportLibrary="$(IntDir)/$(ProjectName).lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                                            &quot;$(DSTROOT)\Program Files\Bonjour SDK\bin\$(PlatformName)\ControlPanel.Resources&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

+			<File

+				RelativePath="resource_res.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

+			<File

+				RelativePath="res\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath=".\about.bmp"

+				>

+			</File>

+			<File

+				RelativePath="res\button-2k.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\button-xp.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\res\cold.ico"

+				>

+			</File>

+			<File

+				RelativePath="ControlPanelRes.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\hot.ico"

+				>

+			</File>

+			<File

+				RelativePath="res\logo.bmp"

+				>

+			</File>

+			<File

+				RelativePath=".\logo.bmp"

+				>

+			</File>

+			<File

+				RelativePath="Web.ico"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="ControlPanelRes.rc"

+		/>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj
new file mode 100755
index 00000000..321e5eeb
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|Win32">

+      <Configuration>Template</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Template|x64">

+      <Configuration>Template</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{5254AA9C-3D2E-4539-86D9-5EB0F4151215}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>Static</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\ControlPanel.Resources\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Template|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|x64'">ControlPanelResources</TargetName>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Template|x64'">.dll</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG=1;ENABLE_DOT_LOCAL_NAMES;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                            "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>false</TreatWarningAsError>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <PreLinkEvent>

+      <Message>Building Output Directories</Message>

+      <Command>if not exist $(OutDir)ControlPanel.Resources mkdir $(OutDir)ControlPanel.Resources

+</Command>

+    </PreLinkEvent>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 /IGNORE:4089  %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <ProgramDatabaseFile>

+      </ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <NoEntryPoint>true</NoEntryPoint>

+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"   mkdir "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"

+xcopy /I/Y "$(TargetPath)"                                                                                                            "$(DSTROOT)\Program Files\Bonjour SDK\bin\$(Platform)\ControlPanel.Resources"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">

+    <Link>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">

+    <Link>

+      <OutputFile>$(OutDir)ControlPanelResources.dll</OutputFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_res.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp" />

+    <None Include="about.bmp" />

+    <None Include="res\button-2k.ico" />

+    <None Include="res\button-xp.ico" />

+    <None Include="res\cold.ico" />

+    <None Include="hot.ico" />

+    <None Include="res\logo.bmp" />

+    <None Include="logo.bmp" />

+    <None Include="Web.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanelRes.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+  <ProjectExtensions>

+    <VisualStudio>

+      <UserProperties RESOURCE_FILE="ControlPanelRes.rc" />

+    </VisualStudio>

+  </ProjectExtensions>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj.filters b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj.filters
new file mode 100755
index 00000000..42f13923
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ControlPanelRes.vcxproj.filters
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{46e7bad9-15a3-43d9-ad60-c91ea9693b5d}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{6f549e07-210f-4cd6-96ae-8eda3aaae73b}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="resource_res.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="about.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\button-2k.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\button-xp.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\cold.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="hot.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\logo.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="logo.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="Web.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ControlPanelRes.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.cpp b/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.cpp
new file mode 100755
index 00000000..b6c8d15d
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.cpp
@@ -0,0 +1,197 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "FourthPage.h"
+#include "resource.h"
+
+#include "ConfigPropertySheet.h"
+#include "SharedSecret.h"
+
+#include <WinServices.h>
+    
+#define MAX_KEY_LENGTH 255
+
+
+IMPLEMENT_DYNCREATE(CFourthPage, CPropertyPage)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::CFourthPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CFourthPage::CFourthPage()
+:
+	CPropertyPage(CFourthPage::IDD)
+{
+	//{{AFX_DATA_INIT(CFourthPage)
+	//}}AFX_DATA_INIT
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::~CFourthPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CFourthPage::~CFourthPage()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CFourthPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CFourthPage)
+	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_POWER_MANAGEMENT, m_checkBox);
+}
+
+BEGIN_MESSAGE_MAP(CFourthPage, CPropertyPage)
+	//{{AFX_MSG_MAP(CFourthPage)
+	//}}AFX_MSG_MAP
+
+	ON_BN_CLICKED(IDC_POWER_MANAGEMENT, &CFourthPage::OnBnClickedPowerManagement)
+
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::SetModified
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CFourthPage::SetModified( BOOL bChanged )
+{
+	m_modified = bChanged;
+
+	CPropertyPage::SetModified( bChanged );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::OnSetActive
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CFourthPage::OnSetActive()
+{
+	CConfigPropertySheet	*	psheet;
+	HKEY						key = NULL;
+	DWORD						dwSize;
+	DWORD						enabled;
+	DWORD						err;
+	BOOL						b = CPropertyPage::OnSetActive();
+
+	psheet = reinterpret_cast<CConfigPropertySheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	m_checkBox.SetCheck( 0 );
+
+	// Now populate the browse domain box
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Power Management", 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	dwSize = sizeof( DWORD );
+	err = RegQueryValueEx( key, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+	require_noerr( err, exit );
+
+	m_checkBox.SetCheck( enabled );
+ 
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return b;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::OnOK
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CFourthPage::OnOK()
+{
+	if ( m_modified )
+	{
+		Commit();
+	}
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CFourthPage::Commit()
+{
+	HKEY		key		= NULL;
+	DWORD		enabled;
+	DWORD		err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Power Management", 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	enabled = m_checkBox.GetCheck();
+	err = RegSetValueEx( key, L"Enabled", NULL, REG_DWORD, (LPBYTE) &enabled, sizeof( enabled ) );
+	require_noerr( err, exit );
+	
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage::OnBnClickedRemoveBrowseDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+
+
+void CFourthPage::OnBnClickedPowerManagement()
+
+{
+
+	char buf[ 256 ];
+
+
+
+	sprintf( buf, "check box: %d", m_checkBox.GetCheck() );
+
+	OutputDebugStringA( buf );
+
+	// TODO: Add your control notification handler code here
+
+
+
+	SetModified( TRUE );
+
+}
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.h b/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.h
new file mode 100755
index 00000000..d5952916
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/FourthPage.h
@@ -0,0 +1,87 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+#include <list>
+#include "afxcmn.h"
+
+#include "afxwin.h"
+
+
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CFourthPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CFourthPage : public CPropertyPage
+{
+public:
+	CFourthPage();
+	~CFourthPage();
+
+protected:
+
+	//{{AFX_DATA(CFourthPage)
+	enum { IDD = IDR_APPLET_PAGE4 };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CFourthPage)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CFourthPage)
+
+	//{{AFX_MSG(CFourthPage)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+	
+private:
+	
+	typedef std::list<CString> StringList;
+
+	afx_msg BOOL
+	OnSetActive();
+	
+	afx_msg void
+	OnOK();
+	
+	void
+	SetModified( BOOL bChanged = TRUE );
+	
+	void
+	Commit();
+
+	BOOL			m_modified;
+
+public:
+private:
+
+	CButton m_checkBox;
+
+public:
+
+
+	afx_msg void OnBnClickedPowerManagement();
+
+};
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.cpp b/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.cpp
new file mode 100755
index 00000000..55755f01
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.cpp
@@ -0,0 +1,387 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <Secret.h>
+#include "RegistrationPage.h"
+#include "resource.h"
+
+#include "ConfigPropertySheet.h"
+extern "C"
+{
+#include <ClientCommon.h>
+}
+#include <WinServices.h>
+
+#define MAX_KEY_LENGTH 255
+
+
+IMPLEMENT_DYNCREATE(CRegistrationPage, CPropertyPage)
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::CRegistrationPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CRegistrationPage::CRegistrationPage()
+:
+	CPropertyPage(CRegistrationPage::IDD),
+	m_ignoreChanges( false ),
+	m_hostnameSetupKey( NULL ),
+	m_registrationSetupKey( NULL ),
+	m_statusKey( NULL )
+{
+	//{{AFX_DATA_INIT(CRegistrationPage)
+	//}}AFX_DATA_INIT
+
+	OSStatus err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\Setup\\Hostnames", 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &m_hostnameSetupKey, NULL );
+	check_noerr( err );
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\Setup\\" kServiceDynDNSRegistrationDomains, 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &m_registrationSetupKey, NULL );
+	check_noerr( err );
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\State\\Hostnames", 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &m_statusKey, NULL );
+	check_noerr( err );
+
+	
+}
+
+CRegistrationPage::~CRegistrationPage()
+{
+	if ( m_hostnameSetupKey )
+	{
+		RegCloseKey( m_hostnameSetupKey );
+		m_hostnameSetupKey = NULL;
+	}
+
+	if ( m_registrationSetupKey )
+	{
+		RegCloseKey( m_registrationSetupKey );
+		m_registrationSetupKey = NULL;
+	}
+
+	if ( m_statusKey )
+	{
+		RegCloseKey( m_statusKey );
+		m_statusKey = NULL;
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CRegistrationPage)
+	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_HOSTNAME, m_hostnameControl);
+	DDX_Control(pDX, IDC_USERNAME, m_usernameControl);
+	DDX_Control(pDX, IDC_PASSWORD, m_passwordControl);
+	DDX_Control(pDX, IDC_ADVERTISE_SERVICES, m_advertiseServices);
+}
+
+BEGIN_MESSAGE_MAP(CRegistrationPage, CPropertyPage)
+	//{{AFX_MSG_MAP(CRegistrationPage)
+	//}}AFX_MSG_MAP
+	ON_EN_CHANGE(IDC_HOSTNAME, OnEnChangeHostname)
+	ON_EN_CHANGE(IDC_USERNAME, OnEnChangeUsername)
+	ON_EN_CHANGE(IDC_PASSWORD, OnEnChangePassword)
+	ON_BN_CLICKED(IDC_ADVERTISE_SERVICES, OnBnClickedAdvertiseServices)
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnEnChangedHostname
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::OnEnChangeHostname()
+{
+	if ( !m_ignoreChanges )
+	{
+		SetModified( TRUE );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnEnChangedUsername
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::OnEnChangeUsername()
+{
+	if ( !m_ignoreChanges )
+	{
+		SetModified( TRUE );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnEnChangedPassword
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::OnEnChangePassword()
+{
+	if ( !m_ignoreChanges )
+	{
+		SetModified( TRUE );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnBnClickedAdvertiseServices
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::OnBnClickedAdvertiseServices()
+{
+	if ( !m_ignoreChanges )
+	{
+		SetModified( TRUE );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::SetModified
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CRegistrationPage::SetModified( BOOL bChanged )
+{
+	m_modified = bChanged ? true : false;
+
+	CPropertyPage::SetModified( bChanged );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnSetActive
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CRegistrationPage::OnSetActive()
+{
+	TCHAR	name[kDNSServiceMaxDomainName + 1];
+	DWORD	nameLen = ( kDNSServiceMaxDomainName + 1 ) * sizeof( TCHAR );
+	DWORD	err;
+
+	BOOL b = CPropertyPage::OnSetActive();
+
+	m_ignoreChanges = true;
+	m_modified = FALSE;
+	
+	if ( m_hostnameSetupKey )
+	{
+		err = RegQueryValueEx( m_hostnameSetupKey, L"", NULL, NULL, (LPBYTE) name, &nameLen );
+
+		if ( !err )
+		{
+			char	hostnameUTF8[ 256 ];
+			char	outDomain[ 256 ];
+			char	outUsername[ 256 ];
+			char	outPassword[ 256 ];
+			CString hostname = name;
+			CString username;
+			CString password;
+
+			m_hostnameControl.SetWindowText( hostname );
+
+			StringObjectToUTF8String( hostname, hostnameUTF8, sizeof( hostnameUTF8 ) );
+
+			if ( LsaGetSecret( hostnameUTF8, outDomain, sizeof( outDomain ) / sizeof( TCHAR ), outUsername, sizeof( outUsername ) / sizeof( TCHAR ), outPassword, sizeof( outPassword ) / sizeof( TCHAR ) ) )
+			{
+				username = outUsername;
+				m_usernameControl.SetWindowText( username );
+
+				password = outPassword;
+				m_passwordControl.SetWindowText( password );
+			}
+		}
+	}
+
+	m_advertiseServices.SetCheck( 0 );
+
+	if ( m_registrationSetupKey )
+	{
+		HKEY		subKey = NULL;
+		DWORD		dwSize;
+		DWORD		enabled = 0;
+		TCHAR		subKeyName[MAX_KEY_LENGTH];
+		DWORD		cSubKeys = 0;
+		DWORD		cbMaxSubKey;
+		DWORD		cchMaxClass;
+		OSStatus	err;
+
+		err = RegQueryInfoKey( m_registrationSetupKey, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+		if ( !err )
+		{
+			if ( cSubKeys > 0 )
+			{	
+				dwSize = MAX_KEY_LENGTH;
+	            
+				err = RegEnumKeyEx( m_registrationSetupKey, 0, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+				if ( !err )
+				{
+					err = RegOpenKey( m_registrationSetupKey, subKeyName, &subKey );
+					if ( !err )
+					{
+						dwSize = sizeof( DWORD );
+						err = RegQueryValueEx( subKey, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+						if ( !err && enabled )
+						{
+							m_advertiseServices.SetCheck( enabled );
+						}
+
+						RegCloseKey( subKey );
+						subKey = NULL;
+					}
+				}
+			}
+		}
+	}
+
+	m_ignoreChanges = false;
+
+	return b;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::OnOK
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CRegistrationPage::OnOK()
+{
+	if ( m_modified )
+	{
+		Commit();
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CRegistrationPage::Commit()
+{
+	CString	hostname;
+	char	hostnameUTF8[ 256 ];
+	CString username;
+	char	usernameUTF8[ 256 ];
+	CString password;
+	char	passwordUTF8[ 256 ];
+	DWORD	enabled = 1;
+	BOOL	secret = FALSE;
+	DWORD	err;
+
+	m_hostnameControl.GetWindowText( hostname );
+	hostname.MakeLower();
+	hostname.TrimRight( '.' );
+	StringObjectToUTF8String( hostname, hostnameUTF8, sizeof( hostnameUTF8 ) );
+	
+	m_usernameControl.GetWindowText( username );
+	m_passwordControl.GetWindowText( password );
+	
+	if ( username.GetLength() && password.GetLength() )
+	{
+		StringObjectToUTF8String( username, usernameUTF8, sizeof( usernameUTF8 ) );	
+		StringObjectToUTF8String( password, passwordUTF8, sizeof( passwordUTF8 ) );
+		secret = TRUE;
+	}
+
+	if ( m_hostnameSetupKey != NULL )
+	{
+		err = RegSetValueEx( m_hostnameSetupKey, L"", 0, REG_SZ, (LPBYTE) (LPCTSTR) hostname, ( hostname.GetLength() + 1 ) * sizeof( TCHAR ) );
+		require_noerr( err, exit );
+		
+		err = RegSetValueEx( m_hostnameSetupKey, L"Enabled", 0, REG_DWORD, (LPBYTE) &enabled, sizeof( DWORD ) );
+		require_noerr( err, exit );
+
+		if ( secret )
+		{
+			LsaSetSecret( hostnameUTF8, usernameUTF8, passwordUTF8 );
+		}
+	}
+
+	if ( m_registrationSetupKey != NULL )
+	{
+		TCHAR		subKeyName[MAX_KEY_LENGTH];
+		DWORD		cSubKeys = 0;
+		DWORD		cbMaxSubKey;
+		DWORD		cchMaxClass;
+		DWORD		dwSize;
+		int			i;
+		OSStatus	err = kNoErr;
+
+		// First, remove all the entries that are there
+
+		err = RegQueryInfoKey( m_registrationSetupKey, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+		if ( !err )
+		{
+			for ( i = 0; i < (int) cSubKeys; i++ )
+			{	
+				dwSize = MAX_KEY_LENGTH;
+		            
+				err = RegEnumKeyEx( m_registrationSetupKey, 0, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+				require_noerr( err, exit );
+					
+				err = RegDeleteKey( m_registrationSetupKey, subKeyName );
+				require_noerr( err, exit );
+			}
+		}
+
+		if ( m_advertiseServices.GetCheck() )
+		{
+			const char	* domainUTF8;
+			CString		  domain;
+			char		  label[ 64 ];
+			HKEY		  subKey = NULL;
+
+			domainUTF8	= GetNextLabel( hostnameUTF8, label );
+			domain		= domainUTF8;
+
+			err = RegCreateKeyEx( m_registrationSetupKey, domain, 0,
+									 NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &subKey, NULL );
+			if ( !err )
+			{
+				err = RegSetValueEx( subKey, L"Enabled", 0, REG_DWORD, (LPBYTE) &enabled, sizeof( DWORD ) );
+				check_noerr( err );
+
+				RegCloseKey( subKey );
+				subKey = NULL;
+			}
+
+			if ( secret )
+			{
+				LsaSetSecret( domainUTF8, usernameUTF8, passwordUTF8 );
+			}
+		}
+	}
+
+exit:
+
+	return;
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.h b/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.h
new file mode 100755
index 00000000..935a4181
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/RegistrationPage.h
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+#include <DebugServices.h>
+#include "afxwin.h"
+
+    
+//---------------------------------------------------------------------------------------------------------------------------
+//	CRegistrationPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CRegistrationPage : public CPropertyPage
+{
+public:
+	CRegistrationPage();
+	~CRegistrationPage();
+
+protected:
+	//{{AFX_DATA(CRegistrationPage)
+	enum { IDD = IDR_APPLET_PAGE1 };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CRegistrationPage)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CRegistrationPage)
+
+	//{{AFX_MSG(CRegistrationPage)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+private:
+
+	afx_msg BOOL	OnSetActive();
+	afx_msg void	OnOK();
+
+	void			SetModified( BOOL bChanged = TRUE );
+	void			Commit();
+
+	CEdit			m_hostnameControl;
+	CEdit			m_usernameControl;
+	CEdit			m_passwordControl;
+	CButton			m_advertiseServices;
+	bool			m_ignoreChanges;
+	bool			m_modified;
+	HKEY			m_hostnameSetupKey;
+	HKEY			m_registrationSetupKey;
+	HKEY			m_statusKey;
+	
+public:
+	
+	afx_msg void OnEnChangeHostname();
+	afx_msg void OnEnChangeUsername();
+	afx_msg void OnEnChangePassword();
+	afx_msg void OnBnClickedAdvertiseServices();
+};
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.cpp b/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.cpp
new file mode 100755
index 00000000..b6cf4ffc
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.cpp
@@ -0,0 +1,544 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SecondPage.h"
+#include "resource.h"
+
+#include "ConfigPropertySheet.h"
+#include "SharedSecret.h"
+
+#include <WinServices.h>
+    
+#define MAX_KEY_LENGTH 255
+
+IMPLEMENT_DYNCREATE(CSecondPage, CPropertyPage)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::CSecondPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CSecondPage::CSecondPage()
+:
+	CPropertyPage(CSecondPage::IDD),
+	m_setupKey( NULL )
+{
+	//{{AFX_DATA_INIT(CSecondPage)
+	//}}AFX_DATA_INIT
+
+	OSStatus err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\DynDNS\\Setup\\" kServiceDynDNSRegistrationDomains, 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &m_setupKey, NULL );
+	check_noerr( err );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::~CSecondPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CSecondPage::~CSecondPage()
+{
+	if ( m_setupKey )
+	{
+		RegCloseKey( m_setupKey );
+		m_setupKey = NULL;
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CSecondPage)
+	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_CHECK1, m_advertiseServicesButton);
+	DDX_Control(pDX, IDC_BUTTON1, m_sharedSecretButton);
+	DDX_Control(pDX, IDC_COMBO2, m_regDomainsBox);
+}
+
+BEGIN_MESSAGE_MAP(CSecondPage, CPropertyPage)
+	//{{AFX_MSG_MAP(CSecondPage)
+	//}}AFX_MSG_MAP
+	ON_BN_CLICKED(IDC_BUTTON1, OnBnClickedSharedSecret)
+	ON_BN_CLICKED(IDC_CHECK1, OnBnClickedAdvertise)
+	ON_CBN_SELCHANGE(IDC_COMBO1, OnCbnSelChange)
+	ON_CBN_EDITCHANGE(IDC_COMBO1, OnCbnEditChange)
+	ON_CBN_EDITCHANGE(IDC_COMBO2, OnCbnEditChange)
+	ON_CBN_SELCHANGE(IDC_COMBO2, OnCbnSelChange)
+	
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::SetModified
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::SetModified( BOOL bChanged )
+{
+	m_modified = bChanged;
+
+	CPropertyPage::SetModified( bChanged );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnSetActive
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CSecondPage::OnSetActive()
+{
+	CConfigPropertySheet	*	psheet;
+	DWORD						err;
+	BOOL						b = CPropertyPage::OnSetActive();
+
+	psheet = reinterpret_cast<CConfigPropertySheet*>(GetParent());
+	require_quiet( psheet, exit );
+	
+	m_modified = FALSE;
+
+	// Clear out what's there
+
+	EmptyComboBox( m_regDomainsBox );
+
+	// Now populate the registration domain box
+
+	err = Populate( m_regDomainsBox, m_setupKey, psheet->m_regDomains );
+	check_noerr( err );
+
+exit:
+
+	return b;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnOK
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSecondPage::OnOK()
+{
+	if ( m_modified )
+	{
+		Commit();
+	}
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSecondPage::Commit()
+{
+	DWORD err;
+
+	if ( m_setupKey != NULL )
+	{
+		err = Commit( m_regDomainsBox, m_setupKey, m_advertiseServicesButton.GetCheck() == BST_CHECKED );
+		check_noerr( err );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CSecondPage::Commit( CComboBox & box, HKEY key, DWORD enabled )
+{
+	CString		selected;
+	HKEY		subKey	= NULL;
+	TCHAR		subKeyName[MAX_KEY_LENGTH];
+	DWORD		cSubKeys = 0;
+	DWORD		cbMaxSubKey;
+	DWORD		cchMaxClass;
+	DWORD		dwSize;
+	int			i;
+	OSStatus	err = kNoErr;
+
+	// First, remove all the entries that are there
+
+    err = RegQueryInfoKey( key, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+	require_noerr( err, exit );
+
+	for ( i = 0; i < (int) cSubKeys; i++ )
+	{	
+		dwSize = MAX_KEY_LENGTH;
+            
+		err = RegEnumKeyEx( key, 0, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+		require_noerr( err, exit );
+			
+		err = RegDeleteKey( key, subKeyName );
+		require_noerr( err, exit );
+	}
+
+	// Get selected text
+	
+	box.GetWindowText( selected );
+	
+	// If we haven't seen this string before, add the string to the box and
+	// the registry
+	
+	if ( ( selected.GetLength() > 0 ) && ( box.FindStringExact( -1, selected ) == CB_ERR ) )
+	{
+		CString string;
+
+		box.AddString( selected );
+
+		err = RegQueryString( key, L"UserDefined", string );
+		check_noerr( err );
+
+		if ( string.GetLength() )
+		{
+			string += L"," + selected;
+		}
+		else
+		{
+			string = selected;
+		}
+
+		err = RegSetValueEx( key, L"UserDefined", 0, REG_SZ, (LPBYTE) (LPCTSTR) string, ( string.GetLength() + 1) * sizeof( TCHAR ) );
+		check_noerr ( err );
+	}
+
+	// Save selected text in registry.  This will trigger mDNSResponder to setup
+	// DynDNS config again
+
+	err = RegCreateKeyEx( key, selected, 0,
+	                      NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &subKey, NULL );
+	require_noerr( err, exit );
+
+	err = RegSetValueEx( subKey, L"Enabled", 0, REG_DWORD, (LPBYTE) &enabled, sizeof( DWORD ) );
+	check_noerr( err );
+
+exit:
+
+	if ( subKey )
+	{
+		RegCloseKey( subKey );
+		subKey = NULL;
+	}
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnBnClickedSharedSecret
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::OnBnClickedSharedSecret()
+{
+	CString name;
+
+	m_regDomainsBox.GetWindowText( name );
+
+	CSharedSecret dlg;
+
+	dlg.Load( name );
+
+	if ( dlg.DoModal() == IDOK )
+	{
+		DWORD		wakeup = 0;
+		DWORD		dwSize = sizeof( DWORD );
+		OSStatus	err;
+
+		dlg.Commit( name );
+
+		// We have now updated the secret, however the system service
+		// doesn't know about it yet.  So we're going to update the
+		// registry with a dummy value which will cause the system
+		// service to re-initialize it's DynDNS setup
+		//
+
+		RegQueryValueEx( m_setupKey, L"Wakeup", NULL, NULL, (LPBYTE) &wakeup, &dwSize );      
+
+		wakeup++;
+		
+		err = RegSetValueEx( m_setupKey, L"Wakeup", 0, REG_DWORD, (LPBYTE) &wakeup, sizeof( DWORD ) );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	return;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnBnClickedAdvertise
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::OnBnClickedAdvertise()
+{
+	int state;
+
+	state = m_advertiseServicesButton.GetCheck();
+
+	m_regDomainsBox.EnableWindow( state );
+	m_sharedSecretButton.EnableWindow( state );
+
+	SetModified( TRUE );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnCbnSelChange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::OnCbnSelChange()
+{
+	SetModified( TRUE );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnCbnEditChange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSecondPage::OnCbnEditChange()
+{
+	SetModified( TRUE );
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnAddRegistrationDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSecondPage::OnAddRegistrationDomain( CString & domain )
+{
+	int index = m_regDomainsBox.FindStringExact( -1, domain );
+
+	if ( index == CB_ERR )
+	{
+		m_regDomainsBox.AddString( domain );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::OnRemoveRegistrationDomain
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSecondPage::OnRemoveRegistrationDomain( CString & domain )
+{
+	int index = m_regDomainsBox.FindStringExact( -1, domain );
+
+	if ( index != CB_ERR )
+	{
+		m_regDomainsBox.DeleteString( index );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::EmptyComboBox
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSecondPage::EmptyComboBox( CComboBox & box )
+{
+	while ( box.GetCount() > 0 )
+	{
+		box.DeleteString( 0 );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::Populate
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CSecondPage::Populate( CComboBox & box, HKEY key, StringList & l )
+{
+	CString		string;
+	HKEY		subKey = NULL;
+	DWORD		dwSize;
+	DWORD		enabled = 0;
+	TCHAR		subKeyName[MAX_KEY_LENGTH];
+	DWORD		cSubKeys = 0;
+	DWORD		cbMaxSubKey;
+	DWORD		cchMaxClass;
+	OSStatus	err;
+
+	err = RegQueryString( key, L"UserDefined", string );
+
+	if ( !err && string.GetLength() )
+	{
+		bool done = false;
+
+		while ( !done )
+		{
+			CString tok;
+
+			tok = string.SpanExcluding( L"," );
+
+			box.AddString( tok );
+
+			if ( tok != string )
+			{
+				// Get rid of that string and comma
+
+				string = string.Right( string.GetLength() - tok.GetLength() - 1 );
+			}
+			else
+			{
+				done = true;
+			}
+		}
+	}
+
+	StringList::iterator it;
+
+	for ( it = l.begin(); it != l.end(); it++ )
+	{
+		if ( box.FindStringExact( -1, *it ) == CB_ERR )
+		{
+			box.AddString( *it );
+		}
+	}
+
+	err = RegQueryInfoKey( key, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+	require_noerr( err, exit );
+
+	if ( cSubKeys > 0 )
+	{	
+		dwSize = MAX_KEY_LENGTH;
+            
+		err = RegEnumKeyEx( key, 0, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+		require_noerr( err, exit );
+
+		err = RegOpenKey( key, subKeyName, &subKey );
+		require_noerr( err, exit );
+
+		dwSize = sizeof( DWORD );
+		err = RegQueryValueEx( subKey, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+		require_noerr( err, exit );
+
+		// See if it's there
+
+		if ( box.SelectString( -1, subKeyName ) == CB_ERR )
+		{
+			// If not, add it
+
+			box.AddString( subKeyName );
+		}
+
+		box.SelectString( -1, subKeyName );
+
+		RegCloseKey( subKey );
+		subKey = NULL;
+	}
+
+exit:
+
+	m_advertiseServicesButton.SetCheck( ( !err && enabled ) ? BST_CHECKED : BST_UNCHECKED );
+	m_regDomainsBox.EnableWindow( ( !err && enabled ) );
+	m_sharedSecretButton.EnableWindow( (!err && enabled ) );
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::CreateKey
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CSecondPage::CreateKey( CString & name, DWORD enabled )
+{
+	HKEY		key = NULL;
+	OSStatus	err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, (LPCTSTR) name, 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	err = RegSetValueEx( key, L"Enabled", 0, REG_DWORD, (LPBYTE) &enabled, sizeof( DWORD ) );
+	check_noerr( err );
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return err;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage::RegQueryString
+//---------------------------------------------------------------------------------------------------------------------------
+
+OSStatus
+CSecondPage::RegQueryString( HKEY key, CString valueName, CString & value )
+{
+	TCHAR	*	string;
+	DWORD		stringLen;
+	int			i;
+	OSStatus	err;
+
+	stringLen	= 1024;
+	string		= NULL;
+	i			= 0;
+
+	do
+	{
+		if ( string )
+		{
+			free( string );
+		}
+
+		string = (TCHAR*) malloc( stringLen );
+		require_action( string, exit, err = kUnknownErr );
+		*string = '\0';
+
+		err = RegQueryValueEx( key, valueName, 0, NULL, (LPBYTE) string, &stringLen );
+
+		i++;
+	}
+	while ( ( err == ERROR_MORE_DATA ) && ( i < 100 ) );
+
+	value = string;
+
+exit:
+
+	if ( string )
+	{
+		free( string );
+	}
+
+	return err;
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.h b/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.h
new file mode 100755
index 00000000..3bd9e744
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/SecondPage.h
@@ -0,0 +1,107 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+#include <list>
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSecondPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CSecondPage : public CPropertyPage
+{
+public:
+	CSecondPage();
+	~CSecondPage();
+
+protected:
+
+	//{{AFX_DATA(CSecondPage)
+	enum { IDD = IDR_APPLET_PAGE2 };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CSecondPage)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CSecondPage)
+
+	//{{AFX_MSG(CSecondPage)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+public:
+	
+	afx_msg void	OnBnClickedSharedSecret();
+	afx_msg void	OnBnClickedAdvertise();
+
+	void			OnAddRegistrationDomain( CString & domain );
+	void			OnRemoveRegistrationDomain( CString & domain );
+	
+private:
+	
+	typedef std::list<CString> StringList;
+
+	afx_msg BOOL
+	OnSetActive();
+	
+	afx_msg void
+	OnOK();
+
+	void
+	EmptyComboBox
+			(
+			CComboBox	&	box
+			);
+
+	OSStatus
+	Populate(
+			CComboBox	&	box,
+			HKEY			key,
+			StringList	&	l
+			);
+	
+	void
+	SetModified( BOOL bChanged = TRUE );
+	
+	void
+	Commit();
+
+	OSStatus
+	Commit( CComboBox & box, HKEY key, DWORD enabled );
+
+	OSStatus
+	CreateKey( CString & name, DWORD enabled );
+
+	OSStatus
+	RegQueryString( HKEY key, CString valueName, CString & value );
+
+	CComboBox		m_regDomainsBox;
+	CButton			m_advertiseServicesButton;
+	CButton			m_sharedSecretButton;
+	BOOL			m_modified;
+	HKEY			m_setupKey;
+
+public:
+	afx_msg void OnCbnSelChange();
+	afx_msg void OnCbnEditChange();
+}; 
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.cpp b/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.cpp
new file mode 100755
index 00000000..4269fa63
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.cpp
@@ -0,0 +1,273 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ServicesPage.h"
+#include "resource.h"
+
+#include "ControlPanelExe.h"
+#include "ConfigPropertySheet.h"
+
+#include <WinServices.h>
+    
+#define MAX_KEY_LENGTH 255
+
+
+IMPLEMENT_DYNCREATE(CServicesPage, CPropertyPage)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::CServicesPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CServicesPage::CServicesPage()
+:
+	CPropertyPage(CServicesPage::IDD)
+{
+	//{{AFX_DATA_INIT(CServicesPage)
+	//}}AFX_DATA_INIT
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::~CServicesPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+CServicesPage::~CServicesPage()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CServicesPage::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CServicesPage)
+	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_ADVERTISE_SMB, m_SMBCheckBox);
+	DDX_Control(pDX, IDC_POWER_MANAGEMENT, m_powerManagementCheckBox);
+}
+
+BEGIN_MESSAGE_MAP(CServicesPage, CPropertyPage)
+	//{{AFX_MSG_MAP(CServicesPage)
+	//}}AFX_MSG_MAP
+
+	ON_BN_CLICKED(IDC_ADVERTISE_SMB, &CServicesPage::OnBnClickedAdvertiseSMB)
+	ON_BN_CLICKED(IDC_POWER_MANAGEMENT, &CServicesPage::OnBnClickedPowerManagement)
+
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::SetModified
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CServicesPage::SetModified( BOOL bChanged )
+{
+	m_modified = bChanged;
+
+	CPropertyPage::SetModified( bChanged );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::OnSetActive
+//---------------------------------------------------------------------------------------------------------------------------
+
+BOOL
+CServicesPage::OnSetActive()
+{
+	CConfigPropertySheet	*	psheet;
+	HKEY						key = NULL;
+	DWORD						dwSize;
+	DWORD						enabled;
+	DWORD						err;
+	BOOL						b = CPropertyPage::OnSetActive();
+
+	psheet = reinterpret_cast<CConfigPropertySheet*>(GetParent());
+	require_quiet( psheet, exit );
+
+	m_SMBCheckBox.SetCheck( 0 );
+
+	// Now populate the browse domain box
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Services\\SMB", 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	dwSize = sizeof( DWORD );
+	err = RegQueryValueEx( key, L"Advertise", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+	require_noerr( err, exit );
+
+	m_SMBCheckBox.SetCheck( enabled );
+
+	RegCloseKey( key );
+	key = NULL;
+
+	m_powerManagementCheckBox.SetCheck( 0 );
+
+	// Now populate the browse domain box
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Power Management", 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	dwSize = sizeof( DWORD );
+	err = RegQueryValueEx( key, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+	require_noerr( err, exit );
+
+	m_powerManagementCheckBox.SetCheck( enabled );
+ 
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return b;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::OnOK
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CServicesPage::OnOK()
+{
+	if ( m_modified )
+	{
+		Commit();
+	}
+}
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CServicesPage::Commit()
+{
+	HKEY		key		= NULL;
+	DWORD		enabled;
+	DWORD		err;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Services\\SMB", 0,
+	                   	NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	enabled = m_SMBCheckBox.GetCheck();
+	err = RegSetValueEx( key, L"Advertise", NULL, REG_DWORD, (LPBYTE) &enabled, sizeof( enabled ) );
+	require_noerr( err, exit );
+
+	RegCloseKey( key );
+	key = NULL;
+
+	err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Power Management", 0,
+		                  NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &key, NULL );
+	require_noerr( err, exit );
+
+	enabled = m_powerManagementCheckBox.GetCheck();
+	err = RegSetValueEx( key, L"Enabled", NULL, REG_DWORD, (LPBYTE) &enabled, sizeof( enabled ) );
+	require_noerr( err, exit );
+	
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::OnBnClickedAdvertiseSMB
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CServicesPage::OnBnClickedAdvertiseSMB()
+{
+	SetModified( TRUE );
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage::OnBnClickedPowerManagement
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CServicesPage::OnBnClickedPowerManagement()
+{
+	SetModified( TRUE );
+
+	if ( m_powerManagementCheckBox.GetCheck() )
+	{
+		CPowerManagementWarning dlg( GetParent() );
+
+		dlg.DoModal();
+	}
+}
+
+
+// CPowerManagementWarning dialog
+
+IMPLEMENT_DYNAMIC(CPowerManagementWarning, CDialog)
+CPowerManagementWarning::CPowerManagementWarning(CWnd* pParent /*=NULL*/)
+	: CDialog(CPowerManagementWarning::IDD, pParent)
+{
+}
+
+CPowerManagementWarning::~CPowerManagementWarning()
+{
+}
+
+void CPowerManagementWarning::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_ENERGY_SAVER, m_energySaverIcon);
+}
+
+
+BOOL
+CPowerManagementWarning::OnInitDialog()
+{	
+	BOOL b = CDialog::OnInitDialog();
+
+	const HICON hIcon = ( HICON ) ::LoadImage( GetNonLocalizedResources(), MAKEINTRESOURCE( IDI_ENERGY_SAVER ), IMAGE_ICON, 0, 0, 0);
+	
+	if ( hIcon )
+	{
+		m_energySaverIcon.SetIcon( hIcon );
+	}
+
+	return b;
+}
+
+
+void
+CPowerManagementWarning::OnOK()
+{
+	CDialog::OnOK();
+}
+
+
+BEGIN_MESSAGE_MAP(CPowerManagementWarning, CDialog)
+END_MESSAGE_MAP()
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.h b/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.h
new file mode 100755
index 00000000..d593a724
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/ServicesPage.h
@@ -0,0 +1,123 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "stdafx.h"
+#include "resource.h"
+
+#include <DebugServices.h>
+#include <list>
+#include "afxcmn.h"
+
+#include "afxwin.h"
+
+
+
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CServicesPage
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CServicesPage : public CPropertyPage
+{
+public:
+	CServicesPage();
+	~CServicesPage();
+
+protected:
+
+	//{{AFX_DATA(CServicesPage)
+	enum { IDD = IDR_APPLET_PAGE5 };
+	//}}AFX_DATA
+
+	//{{AFX_VIRTUAL(CServicesPage)
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+	DECLARE_DYNCREATE(CServicesPage)
+
+	//{{AFX_MSG(CServicesPage)
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+	
+private:
+	
+	typedef std::list<CString> StringList;
+
+	afx_msg BOOL
+	OnSetActive();
+	
+	afx_msg void
+	OnOK();
+	
+	void
+	SetModified( BOOL bChanged = TRUE );
+	
+	void
+	Commit();
+
+	BOOL			m_modified;
+
+public:
+private:
+
+	CButton m_SMBCheckBox;
+	CButton m_powerManagementCheckBox;
+
+public:
+
+
+	afx_msg void OnBnClickedAdvertiseSMB();
+	afx_msg void OnBnClickedPowerManagement();
+};
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CPowerManagementWarning
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CPowerManagementWarning : public CDialog
+{
+	DECLARE_DYNAMIC(CPowerManagementWarning)
+
+public:
+
+	CPowerManagementWarning(CWnd* pParent = NULL);   // standard constructor
+
+	virtual ~CPowerManagementWarning();
+
+// Dialog Data
+
+	enum { IDD = IDR_POWER_MANAGEMENT_WARNING };
+
+protected:
+
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	virtual BOOL OnInitDialog();
+
+	virtual void OnOK();
+
+	DECLARE_MESSAGE_MAP()
+
+public:
+
+	CStatic m_energySaverIcon;
+};
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.cpp b/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.cpp
new file mode 100644
index 00000000..3d192958
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.cpp
@@ -0,0 +1,115 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+// SharedSecret.cpp : implementation file
+//
+
+
+#include <Secret.h>
+#include "stdafx.h"
+#include "SharedSecret.h"
+#include <WinServices.h>
+
+#include <DebugServices.h>
+
+
+// SharedSecret dialog
+
+IMPLEMENT_DYNAMIC(CSharedSecret, CDialog)
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret::CSharedSecret
+//---------------------------------------------------------------------------------------------------------------------------
+
+CSharedSecret::CSharedSecret(CWnd* pParent /*=NULL*/)
+	: CDialog(CSharedSecret::IDD, pParent)
+	, m_key(_T(""))
+	, m_secret(_T(""))
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret::~CSharedSecret
+//---------------------------------------------------------------------------------------------------------------------------
+
+CSharedSecret::~CSharedSecret()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret::DoDataExchange
+//---------------------------------------------------------------------------------------------------------------------------
+
+void CSharedSecret::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Text(pDX, IDC_KEY, m_key );
+	DDX_Text(pDX, IDC_SECRET, m_secret );
+}
+
+
+BEGIN_MESSAGE_MAP(CSharedSecret, CDialog)
+END_MESSAGE_MAP()
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret::Load
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSharedSecret::Load( CString zone )
+{
+	char	zoneUTF8[ 256 ];
+	char	outDomain[ 256 ];
+	char	outKey[ 256 ];
+	char	outSecret[ 256 ];
+
+	StringObjectToUTF8String( zone, zoneUTF8, sizeof( zoneUTF8 ) );
+
+	if ( LsaGetSecret( zoneUTF8, outDomain, sizeof( outDomain ) / sizeof( TCHAR ), outKey, sizeof( outKey ) / sizeof( TCHAR ), outSecret, sizeof( outSecret ) / sizeof( TCHAR ) ) )
+	{
+		m_key		= outKey;
+		m_secret	= outSecret;
+	}
+	else
+	{
+		m_key = zone;
+	}
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret::Commit
+//---------------------------------------------------------------------------------------------------------------------------
+
+void
+CSharedSecret::Commit( CString zone )
+{
+	char	zoneUTF8[ 256 ];
+	char	keyUTF8[ 256 ];
+	char	secretUTF8[ 256 ];
+
+	StringObjectToUTF8String( zone, zoneUTF8, sizeof( zoneUTF8 ) );
+	StringObjectToUTF8String( m_key, keyUTF8, sizeof( keyUTF8 ) );
+	StringObjectToUTF8String( m_secret, secretUTF8, sizeof( secretUTF8 ) );
+
+	LsaSetSecret( zoneUTF8, keyUTF8, secretUTF8 );
+}
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.h b/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.h
new file mode 100644
index 00000000..be82d8b8
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/SharedSecret.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+    
+#pragma once
+
+#include "resource.h"
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+//	CSharedSecret
+//---------------------------------------------------------------------------------------------------------------------------
+
+class CSharedSecret : public CDialog
+{
+	DECLARE_DYNAMIC(CSharedSecret)
+
+public:
+	CSharedSecret(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CSharedSecret();
+
+// Dialog Data
+	enum { IDD = IDR_SECRET };
+
+	void
+	Load( CString zone );
+
+	void
+	Commit( CString zone );
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+
+public:
+
+	CString m_key;
+	CString m_secret;
+};
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.dll.manifest b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.dll.manifest
new file mode 100644
index 00000000..903b02ba
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.dll.manifest
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.ControlPanel" type="win32"/>
+	<description>Control Panel applet for configuring Wide-Area Bonjour.</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.exe.manifest b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.exe.manifest
new file mode 100644
index 00000000..48792150
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.exe.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.ControlPanel" type="win32"/>
+	<description>Control Panel applet for configuring Wide-Area Bonjour.</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.manifest b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.manifest
new file mode 100644
index 00000000..48792150
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.ControlPanel" type="win32"/>
+	<description>Control Panel applet for configuring Wide-Area Bonjour.</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.rc2 b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.rc2
new file mode 100755
index 00000000..e3f7422c
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel.rc2
@@ -0,0 +1,13 @@
+//

+// CPL_PP.RC2 - resources Microsoft Visual C++ does not edit directly

+//

+

+#ifdef APSTUDIO_INVOKED

+	#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+// Add manually edited resources here...

+

+/////////////////////////////////////////////////////////////////////////////

diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel64.manifest b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel64.manifest
new file mode 100644
index 00000000..a47a4e24
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/ControlPanel64.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.ControlPanel" type="win32"/>
+	<description>Control Panel applet for configuring Wide-Area Bonjour.</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/EnergySaver.ico b/mDNSResponder/mDNSWindows/ControlPanel/res/EnergySaver.ico
new file mode 100755
index 00000000..c2b935b7
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/EnergySaver.ico
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/controlpanel.ico b/mDNSResponder/mDNSWindows/ControlPanel/res/controlpanel.ico
new file mode 100755
index 00000000..7ef6ebba
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/controlpanel.ico
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/failure.ico b/mDNSResponder/mDNSWindows/ControlPanel/res/failure.ico
new file mode 100755
index 00000000..f0b8f2bd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/failure.ico
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/res/success.ico b/mDNSResponder/mDNSWindows/ControlPanel/res/success.ico
new file mode 100755
index 00000000..9b97584c
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/res/success.ico
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/resource.h b/mDNSResponder/mDNSWindows/ControlPanel/resource.h
new file mode 100644
index 00000000..fec673fa
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/resource.h
@@ -0,0 +1,56 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ControlPanel.rc
+//
+#define IDR_APPLET                      131
+#define IDR_APPLET_PAGE1                131
+#define IDS_APPLET_DESCRIPTION          132
+#define IDR_APPLET_PAGE2                132
+#define IDR_SECRET                      133
+#define IDR_APPLET_PAGE3                134
+#define IDR_APPLET_PAGE4                135
+#define IDR_APPLET_PAGE5                136
+#define IDI_FAILURE                     140
+#define IDI_SUCCESS                     141
+#define IDI_ENERGY_SAVER				142
+#define IDR_ADD_BROWSE_DOMAIN           143
+#define IDR_POWER_MANAGEMENT_WARNING	144
+#define IDS_REINSTALL					145
+#define IDS_REINSTALL_CAPTION			146
+#define IDS_APPLET_NAME					147
+#define IDS_APPLET_TOOLTIP				148
+#define IDC_HOSTNAME                    1000
+#define IDC_USERNAME					1001
+#define IDC_PASSWORD					1002
+#define IDC_ADVERTISE_SERVICES			1003
+#define IDC_BUTTON1                     1004
+#define IDC_COMBO1                      1005
+#define IDC_CHECK1                      1006
+#define IDC_COMBO2                      1007
+#define IDC_EDIT2                       1008
+#define IDC_SECRET                      1009
+#define IDC_COMBO3                      1010
+#define IDC_FAILURE                     1011
+#define IDC_SUCCESS                     1012
+#define IDC_SECRET_NAME                 1013
+#define IDC_NAME                        1014
+#define IDC_KEY                         1015
+#define IDC_LIST1                       1016
+#define IDC_BROWSE_LIST                 1017
+#define IDC_BUTTON2                     1018
+#define IDC_REMOVE_BROWSE_DOMAIN        1019
+#define IDC_ADD_BROWSE_DOMAIN           1020
+#define IDC_POWER_MANAGEMENT            1021
+#define IDC_ADVERTISE_SMB	            1022
+#define IDC_ENERGY_SAVER				1023
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        149
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1024
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/stdafx.cpp b/mDNSResponder/mDNSWindows/ControlPanel/stdafx.cpp
new file mode 100755
index 00000000..e05ec3d1
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/stdafx.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+
+
diff --git a/mDNSResponder/mDNSWindows/ControlPanel/stdafx.h b/mDNSResponder/mDNSWindows/ControlPanel/stdafx.h
new file mode 100755
index 00000000..246752e3
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/ControlPanel/stdafx.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#endif
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
+#define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#endif
+
+#ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
+#define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#endif						
+
+#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+// Step 3: We want to see one image, but not a tile
+#ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
+#define _WIN32_IE 0x0500	// Change this to the appropriate value to target IE 5.0 or later.
+#endif
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+
+// turns off MFC's hiding of some common and often safely ignored warning messages
+#define _AFX_ALL_WARNINGS
+
+#if !defined(_WSPIAPI_COUNTOF)
+#	define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#endif
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdisp.h>        // MFC Automation classes
+
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+#include <afxdlgs.h>
+
+#include <cpl.h>            // Control Panel Applet functions and defines
+
+#include <afxtempl.h>       // MFC Template support
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/AssemblyInfo.cpp b/mDNSResponder/mDNSWindows/DLL.NET/AssemblyInfo.cpp
new file mode 100755
index 00000000..40f0b5db
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/AssemblyInfo.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+#include "stdafx.h"
+#include "WinVersRes.h"
+
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("dnssd.NET")];
+[assembly:AssemblyDescriptionAttribute(".NET wrapper for DNS-SD services")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("Apple Inc.")];
+[assembly:AssemblyProductAttribute("")];
+[assembly:AssemblyCopyrightAttribute("Apple Inc.")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute(MASTER_PROD_VERS_STR2)];
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly
+// signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name)
+//       utility
+//        When specifying the KeyFile, the location of the KeyFile should be
+//        relative to the project directory.
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly:AssemblyDelaySignAttribute(false)];
+[assembly:AssemblyKeyFileAttribute("dnssd_NET.snk")];
+[assembly:AssemblyKeyNameAttribute("")];
+
+[assembly:ComVisible(false)];
+[assembly:CLSCompliantAttribute(true)];
+[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/PString.h b/mDNSResponder/mDNSWindows/DLL.NET/PString.h
new file mode 100755
index 00000000..0249c05c
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/PString.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+#pragma once
+
+using namespace System;
+using namespace System::Text;
+
+namespace Apple
+{
+	__gc class PString
+	{
+	public:
+
+		PString(String* string)
+		{
+			if (string != NULL)
+			{
+				Byte unicodeBytes[] = Encoding::Unicode->GetBytes(string);
+				Byte utf8Bytes[] = Encoding::Convert(Encoding::Unicode, Encoding::UTF8, unicodeBytes);
+				m_p = Marshal::AllocHGlobal(utf8Bytes->Length + 1);
+
+				Byte __pin * p = &utf8Bytes[0];
+				char * hBytes = static_cast<char*>(m_p.ToPointer());
+				memcpy(hBytes, p, utf8Bytes->Length);
+				hBytes[utf8Bytes->Length] = '\0';
+			}
+			else
+			{
+				m_p = NULL;
+			}
+		}
+
+		~PString()
+		{
+			Marshal::FreeHGlobal(m_p);
+		}
+
+		const char*
+		c_str()
+		{
+			if (m_p != NULL)
+			{
+				return static_cast<const char*>(m_p.ToPointer());
+			}
+			else
+			{
+				return NULL;
+			}
+		}
+		
+	protected:
+
+		IntPtr m_p;
+	};
+}
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.cpp b/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.cpp
new file mode 100755
index 00000000..ef03e217
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.cpp
@@ -0,0 +1,22 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+// stdafx.cpp : source file that includes just the standard includes
+// dotNET.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.h b/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.h
new file mode 100755
index 00000000..d2e5c1a8
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/Stdafx.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+
+#pragma once
+
+#if !defined(_WSPIAPI_COUNTOF)
+#	define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#endif
+
+#using <mscorlib.dll>
+#using <System.dll>
+
+struct _DNSServiceRef_t {};
+struct _DNSRecordRef_t {};
+
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.cpp b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.cpp
new file mode 100755
index 00000000..3e22146e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.cpp
@@ -0,0 +1,1234 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+// This is the main DLL file.
+
+#include "stdafx.h"
+
+#include "dnssd_NET.h"
+#include "DebugServices.h"
+#include "PString.h"
+
+
+using namespace System::Net::Sockets;
+using namespace System::Diagnostics;
+using namespace Apple;
+using namespace Apple::DNSSD;
+
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#define	DEBUG_NAME	"[dnssd.NET] "
+
+//
+// ConvertToString
+//
+static String*
+ConvertToString(const char * utf8String)
+{
+	return __gc new String(utf8String, 0, strlen(utf8String), __gc new UTF8Encoding(true, true));
+}
+
+
+//
+// class ServiceRef
+//
+// ServiceRef serves as the base class for all DNSService operations.
+//
+// It manages the DNSServiceRef, and implements processing the
+// result
+//
+ServiceRef::ServiceRef(Object * callback)
+:
+	m_bDisposed(false),
+	m_callback(callback),
+	m_thread(NULL)
+{
+	m_impl = new ServiceRefImpl(this);
+}
+
+
+ServiceRef::~ServiceRef()
+{
+}
+
+
+//
+// StartThread
+//
+// Starts the main processing thread
+//
+void
+ServiceRef::StartThread()
+{
+	check( m_impl != NULL );
+
+	m_impl->SetupEvents();
+
+	m_thread		=	new Thread(new ThreadStart(this, &Apple::DNSSD::ServiceRef::ProcessingThread));
+	m_thread->Name	=	S"DNSService Thread";
+	m_thread->IsBackground = true;
+	
+	m_thread->Start();
+}
+
+
+//
+// ProcessingThread
+//
+// The Thread class can only invoke methods in MC++ types.  So we
+// make a ProcessingThread method that forwards to the impl
+//
+void
+ServiceRef::ProcessingThread()
+{
+	m_impl->ProcessingThread();
+}
+
+
+//
+// Dispose
+//
+// Calls impl-Dispose().  This ultimately will call DNSServiceRefDeallocate()
+//
+void
+ServiceRef::Dispose()
+{
+	check(m_impl != NULL);
+	check(m_bDisposed == false);
+
+	if (!m_bDisposed)
+	{
+		m_bDisposed = true;
+
+		//
+		// Call Dispose.  This won't call DNSServiceRefDeallocate()
+		// necessarily. It depends on what thread this is being
+		// called in.
+		//
+		m_impl->Dispose();
+		m_impl = NULL;
+
+		m_thread = NULL;
+
+		GC::SuppressFinalize(this);  
+	}
+}
+
+
+//
+// EnumerateDomainsDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::EnumerateDomainsDispatch
+						(
+						ServiceFlags	flags,
+						int				interfaceIndex,
+						ErrorCode		errorCode,
+						String		*	replyDomain
+						)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::EnumerateDomainsReply * OnEnumerateDomainsReply = static_cast<DNSService::EnumerateDomainsReply*>(m_callback);
+		OnEnumerateDomainsReply(this, flags, interfaceIndex, errorCode, replyDomain);
+	}
+}
+
+
+//
+// RegisterDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::RegisterDispatch
+				(
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+ 				String		*	name,
+				String		*	regtype,
+				String		*	domain
+				)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::RegisterReply * OnRegisterReply = static_cast<DNSService::RegisterReply*>(m_callback);
+		OnRegisterReply(this, flags, errorCode, name, regtype, domain);
+	}
+}
+
+
+//
+// BrowseDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::BrowseDispatch
+			(
+			ServiceFlags	flags,
+			int				interfaceIndex,
+			ErrorCode		errorCode,
+			String		*	serviceName,
+			String		*	regtype,
+			String		*	replyDomain
+			)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::BrowseReply * OnBrowseReply = static_cast<DNSService::BrowseReply*>(m_callback);
+		OnBrowseReply(this, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain);
+	}
+}
+
+
+//
+// ResolveDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::ResolveDispatch
+			(
+			ServiceFlags	flags,
+			int				interfaceIndex,
+			ErrorCode		errorCode,
+			String		*	fullname,
+			String		*	hosttarget,
+			int				port,
+			Byte			txtRecord[]
+			)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::ResolveReply * OnResolveReply = static_cast<DNSService::ResolveReply*>(m_callback);
+		OnResolveReply(this, flags, interfaceIndex, errorCode, fullname, hosttarget, port, txtRecord);
+	}
+}
+
+
+//
+// RegisterRecordDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::RegisterRecordDispatch
+				(
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+				RecordRef	*	record
+				)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::RegisterRecordReply * OnRegisterRecordReply = static_cast<DNSService::RegisterRecordReply*>(m_callback);
+		OnRegisterRecordReply(this, flags, errorCode, record);
+	}
+}
+
+
+//
+// QueryRecordDispatch
+//
+// Dispatch a reply to the delegate.
+//
+void
+ServiceRef::QueryRecordDispatch
+					(
+					ServiceFlags	flags,
+					int				interfaceIndex,
+					ErrorCode		errorCode,
+					String		*	fullname,
+					int				rrtype,
+					int				rrclass,
+					Byte			rdata[],
+					int				ttl
+					)
+{
+	if ((m_callback != NULL) && (m_impl != NULL))
+	{
+		DNSService::QueryRecordReply * OnQueryRecordReply = static_cast<DNSService::QueryRecordReply*>(m_callback);
+		OnQueryRecordReply(this, flags, interfaceIndex, errorCode, fullname, rrtype, rrclass, rdata, ttl);
+	}
+}
+
+
+//
+// ServiceRefImpl::ServiceRefImpl()
+//
+// Constructs a new ServiceRefImpl.  We save the pointer to our enclosing
+// class in a gcroot handle.  This satisfies the garbage collector as
+// the outer class is a managed type
+//
+ServiceRef::ServiceRefImpl::ServiceRefImpl(ServiceRef * outer)
+:
+	m_socketEvent(NULL),
+	m_stopEvent(NULL),
+	m_disposed(false),
+	m_outer(outer),
+	m_ref(NULL)
+{
+	m_threadId = GetCurrentThreadId();
+}
+
+
+//
+// ServiceRefImpl::~ServiceRefImpl()
+//
+// Deallocate all resources associated with the ServiceRefImpl
+//
+ServiceRef::ServiceRefImpl::~ServiceRefImpl()
+{
+	if (m_socketEvent != NULL)
+	{
+		CloseHandle(m_socketEvent);
+		m_socketEvent = NULL;
+	}
+
+	if (m_stopEvent != NULL)
+	{
+		CloseHandle(m_stopEvent);
+		m_stopEvent = NULL;
+	}
+
+	if (m_ref != NULL)
+	{
+		DNSServiceRefDeallocate(m_ref);
+		m_ref = NULL;
+	}
+}
+
+
+//
+// ServiceRefImpl::SetupEvents()
+//
+// Setup the events necessary to manage multi-threaded dispatch
+// of DNSService Events
+//
+void
+ServiceRef::ServiceRefImpl::SetupEvents()
+{
+	check(m_ref != NULL);
+
+	m_socket		=	(SOCKET) DNSServiceRefSockFD(m_ref);
+	check(m_socket != INVALID_SOCKET);
+
+	m_socketEvent	=	CreateEvent(NULL, 0, 0, NULL);
+
+	if (m_socketEvent == NULL)
+	{
+		throw new DNSServiceException(Unknown);
+	}
+
+	int err = WSAEventSelect(m_socket, m_socketEvent, FD_READ|FD_CLOSE);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(Unknown);
+	}
+
+	m_stopEvent = CreateEvent(NULL, 0, 0, NULL);
+
+	if (m_stopEvent == NULL)
+	{
+		throw new DNSServiceException(Unknown);
+	}
+}
+
+
+//
+// ServiceRefImpl::ProcessingThread()
+//
+// Wait for socket events on the DNSServiceRefSockFD().  Also wait
+// for stop events
+//
+void
+ServiceRef::ServiceRefImpl::ProcessingThread()
+{
+	check( m_socketEvent != NULL );
+	check( m_stopEvent != NULL );
+	check( m_ref != NULL );
+	
+	HANDLE handles[2];
+
+	handles[0] = m_socketEvent;
+	handles[1] = m_stopEvent;
+
+	while (m_disposed == false)
+	{
+		int ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+
+		//
+		// it's a socket event
+		//
+		if (ret == WAIT_OBJECT_0)
+		{
+			DNSServiceProcessResult(m_ref);
+		}
+		//
+		// else it's a stop event
+		//
+		else if (ret == WAIT_OBJECT_0 + 1)
+		{
+			break;
+		}
+		else
+		{
+			//
+			// unexpected wait result
+			//
+			dlog( kDebugLevelWarning, DEBUG_NAME "%s: unexpected wait result (result=0x%08X)\n", __ROUTINE__, ret );
+		}
+	}
+
+	delete this;
+}
+
+
+//
+// ServiceRefImpl::Dispose()
+//
+// Calls DNSServiceRefDeallocate()
+//
+void
+ServiceRef::ServiceRefImpl::Dispose()
+{
+	OSStatus	err;
+	BOOL		ok;
+
+	check(m_disposed == false);
+
+	m_disposed = true;
+
+	ok = SetEvent(m_stopEvent);
+	err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+
+	return;
+}
+
+
+//
+// ServiceRefImpl::EnumerateDomainsCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::EnumerateDomainsCallback
+											(
+											DNSServiceRef			sdRef,
+											DNSServiceFlags			flags,
+											uint32_t				interfaceIndex,
+											DNSServiceErrorType		errorCode,
+											const char			*	replyDomain,
+											void				*	context
+											)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+
+	if (self->m_disposed == false)
+	{
+		self->m_outer->EnumerateDomainsDispatch((ServiceFlags) flags, interfaceIndex, (ErrorCode) errorCode, ConvertToString(replyDomain));
+	}
+}
+
+
+//
+// ServiceRefImpl::RegisterCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::RegisterCallback
+							(
+							DNSServiceRef			sdRef,
+							DNSServiceFlags			flags,
+							DNSServiceErrorType		errorCode,
+							const char			*	name,
+							const char			*	regtype,
+							const char			*	domain,
+							void				*	context
+							)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+	
+	if (self->m_disposed == false)
+	{
+		self->m_outer->RegisterDispatch((ServiceFlags) flags, (ErrorCode) errorCode, ConvertToString(name), ConvertToString(regtype), ConvertToString(domain));
+	}
+}
+
+
+//
+// ServiceRefImpl::BrowseCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::BrowseCallback
+							(
+							DNSServiceRef			sdRef,
+   							DNSServiceFlags			flags,
+							uint32_t				interfaceIndex,
+							DNSServiceErrorType		errorCode,
+							const char			*	serviceName,
+							const char			*	regtype,
+							const char			*	replyDomain,
+							void				*	context
+							)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+	
+	if (self->m_disposed == false)
+	{
+		self->m_outer->BrowseDispatch((ServiceFlags) flags, interfaceIndex, (ErrorCode) errorCode, ConvertToString(serviceName), ConvertToString(regtype), ConvertToString(replyDomain));
+	}
+}
+
+
+//
+// ServiceRefImpl::ResolveCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::ResolveCallback
+							(
+							DNSServiceRef			sdRef,
+							DNSServiceFlags			flags,
+							uint32_t				interfaceIndex,
+							DNSServiceErrorType		errorCode,
+							const char			*	fullname,
+							const char			*	hosttarget,
+							uint16_t				notAnIntPort,
+							uint16_t				txtLen,
+							const char			*	txtRecord,
+							void				*	context
+							)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+	
+	if (self->m_disposed == false)
+	{
+		Byte txtRecordBytes[];
+
+		txtRecordBytes = NULL;
+
+		if (txtLen > 0)
+		{
+			//
+			// copy raw memory into managed byte array
+			//
+			txtRecordBytes		=	new Byte[txtLen];
+			Byte __pin	*	p	=	&txtRecordBytes[0];
+			memcpy(p, txtRecord, txtLen);
+		}
+
+		self->m_outer->ResolveDispatch((ServiceFlags) flags, interfaceIndex, (ErrorCode) errorCode, ConvertToString(fullname), ConvertToString(hosttarget), ntohs(notAnIntPort), txtRecordBytes);
+	}	
+}
+
+
+//
+// ServiceRefImpl::RegisterRecordCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::RegisterRecordCallback
+								(
+								DNSServiceRef		sdRef,
+								DNSRecordRef		rrRef,
+								DNSServiceFlags		flags,
+								DNSServiceErrorType	errorCode,
+								void			*	context
+								)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+	
+	if (self->m_disposed == false)
+	{
+		RecordRef * record = NULL;
+
+		if (errorCode == 0)
+		{
+			record = new RecordRef;
+
+			record->m_impl->m_ref = rrRef;
+		}
+
+		self->m_outer->RegisterRecordDispatch((ServiceFlags) flags, (ErrorCode) errorCode, record);
+	}
+}
+
+
+//
+// ServiceRefImpl::QueryRecordCallback()
+//
+// This is the callback from dnssd.dll.  We pass this up to our outer, managed type
+//
+void DNSSD_API
+ServiceRef::ServiceRefImpl::QueryRecordCallback
+								(
+								DNSServiceRef			DNSServiceRef,
+								DNSServiceFlags			flags,
+								uint32_t				interfaceIndex,
+								DNSServiceErrorType		errorCode,
+								const char			*	fullname,
+								uint16_t				rrtype,
+								uint16_t				rrclass,
+								uint16_t				rdlen,
+								const void			*	rdata,
+								uint32_t				ttl,
+								void				*	context
+								)
+{
+	ServiceRef::ServiceRefImpl * self = static_cast<ServiceRef::ServiceRefImpl*>(context);
+
+	check( self != NULL );
+	check( self->m_outer != NULL );
+	
+	if (self->m_disposed == false)
+	{
+		Byte rdataBytes[];
+
+		if (rdlen)
+		{
+			rdataBytes			=	new Byte[rdlen];
+			Byte __pin * p		=	&rdataBytes[0];
+			memcpy(p, rdata, rdlen);
+		}
+
+		self->m_outer->QueryRecordDispatch((ServiceFlags) flags, (int) interfaceIndex, (ErrorCode) errorCode, ConvertToString(fullname), rrtype, rrclass, rdataBytes, ttl);
+	}
+}
+
+
+/*
+ * EnumerateDomains()
+ *
+ * This maps to DNSServiceEnumerateDomains().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::EnumerateDomains
+		(
+		int							flags,
+		int							interfaceIndex,
+		EnumerateDomainsReply	*	callback
+		)
+{
+	ServiceRef * sdRef = new ServiceRef(callback);
+	int			 err;
+
+	err = DNSServiceEnumerateDomains(&sdRef->m_impl->m_ref, flags, interfaceIndex, ServiceRef::ServiceRefImpl::EnumerateDomainsCallback, sdRef->m_impl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * Register()
+ *
+ * This maps to DNSServiceRegister().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::Register
+				(
+				int					flags,
+				int					interfaceIndex,
+				String			*	name,
+				String			*	regtype,
+				String			*	domain,
+				String			*	host,
+				int					port,
+				Byte				txtRecord[],
+				RegisterReply	*	callback
+				)
+{
+	ServiceRef	*	sdRef	=	new ServiceRef(callback);
+	PString		*	pName	=	new PString(name);
+	PString		*	pType	=	new PString(regtype);
+	PString		*	pDomain =	new PString(domain);
+	PString		*	pHost	=	new PString(host);
+	int				len		=	0;
+	Byte __pin	*	p		=	NULL;
+	void		*	v		=	NULL;
+
+	if ((txtRecord != NULL) && (txtRecord->Length > 0))
+	{
+		len		= txtRecord->Length;
+		p		= &txtRecord[0];
+		v		= (void*) p;
+	}
+
+	int err = DNSServiceRegister(&sdRef->m_impl->m_ref, flags, interfaceIndex, pName->c_str(), pType->c_str(), pDomain->c_str(), pHost->c_str(), htons(port), len, v, ServiceRef::ServiceRefImpl::RegisterCallback, sdRef->m_impl );
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * AddRecord()
+ *
+ * This maps to DNSServiceAddRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+RecordRef*
+DNSService::AddRecord
+				(
+				ServiceRef	*	sdRef,
+				int				flags,
+				int				rrtype,
+				Byte			rdata[],
+				int				ttl
+				)
+{
+	int				len		=	0;
+	Byte __pin	*	p		=	NULL;
+	void		*	v		=	NULL;
+
+	if ((rdata != NULL) && (rdata->Length > 0))
+	{
+		len = rdata->Length;
+		p	= &rdata[0];
+		v	= (void*) p;
+	}
+
+	RecordRef * record = new RecordRef;
+
+	int err = DNSServiceAddRecord(sdRef->m_impl->m_ref, &record->m_impl->m_ref, flags, rrtype, len, v, ttl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	return record;
+}
+
+
+/*
+ * UpdateRecord()
+ *
+ * This maps to DNSServiceUpdateRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+void
+DNSService::UpdateRecord
+				(
+				ServiceRef	*	sdRef,
+				RecordRef	*	record,
+				int				flags,
+				Byte			rdata[],
+				int				ttl
+				)
+{
+	int				len		=	0;
+	Byte __pin	*	p		=	NULL;
+	void		*	v		=	NULL;
+
+	if ((rdata != NULL) && (rdata->Length > 0))
+	{
+		len	= rdata->Length;
+		p	= &rdata[0];
+		v	= (void*) p;
+	}
+
+	int err = DNSServiceUpdateRecord(sdRef->m_impl->m_ref, record ? record->m_impl->m_ref : NULL, flags, len, v, ttl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+}
+
+
+/*
+ * RemoveRecord()
+ *
+ * This maps to DNSServiceRemoveRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+void
+DNSService::RemoveRecord
+		(
+		ServiceRef	*	sdRef,
+		RecordRef	*	record,
+		int				flags
+		)
+{
+	int err = DNSServiceRemoveRecord(sdRef->m_impl->m_ref, record->m_impl->m_ref, flags);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+}	
+
+
+/*
+ * Browse()
+ *
+ * This maps to DNSServiceBrowse().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::Browse
+	(
+	int				flags,
+	int				interfaceIndex,
+	String		*	regtype,
+	String		*	domain,
+	BrowseReply	*	callback
+	)
+{
+	ServiceRef	*	sdRef	= new ServiceRef(callback);
+	PString		*	pType	= new PString(regtype);
+	PString		*	pDomain	= new PString(domain);
+
+	int err = DNSServiceBrowse(&sdRef->m_impl->m_ref, flags, interfaceIndex, pType->c_str(), pDomain->c_str(),(DNSServiceBrowseReply) ServiceRef::ServiceRefImpl::BrowseCallback, sdRef->m_impl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * Resolve()
+ *
+ * This maps to DNSServiceResolve().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::Resolve
+	(
+	int					flags,
+	int					interfaceIndex,
+	String			*	name,
+	String			*	regtype,
+	String			*	domain,
+	ResolveReply	*	callback	
+	)
+{
+	ServiceRef	*	sdRef	= new ServiceRef(callback);
+	PString		*	pName	= new PString(name);
+	PString		*	pType	= new PString(regtype);
+	PString		*	pDomain	= new PString(domain);
+
+	int err = DNSServiceResolve(&sdRef->m_impl->m_ref, flags, interfaceIndex, pName->c_str(), pType->c_str(), pDomain->c_str(),(DNSServiceResolveReply) ServiceRef::ServiceRefImpl::ResolveCallback, sdRef->m_impl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * CreateConnection()
+ *
+ * This maps to DNSServiceCreateConnection().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::CreateConnection
+			(
+			RegisterRecordReply * callback
+			)
+{
+	ServiceRef * sdRef = new ServiceRef(callback);
+
+	int err = DNSServiceCreateConnection(&sdRef->m_impl->m_ref);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * RegisterRecord()
+ *
+ * This maps to DNSServiceRegisterRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+
+RecordRef*
+DNSService::RegisterRecord
+			(
+			ServiceRef			*	sdRef,
+			ServiceFlags			flags,
+			int						interfaceIndex,
+			String				*	fullname,
+			int						rrtype,
+			int						rrclass,
+			Byte					rdata[],
+			int						ttl
+			)
+{
+	RecordRef	*	record	= new RecordRef;
+	int				len		= 0;
+	Byte __pin	*	p		= NULL;
+	void		*	v		= NULL;
+
+	PString * pFullname = new PString(fullname);
+
+	if ((rdata != NULL) && (rdata->Length > 0))
+	{
+		len		= rdata->Length;
+		p		= &rdata[0];
+		v		= (void*) p;
+	}
+
+	int err = DNSServiceRegisterRecord(sdRef->m_impl->m_ref, &record->m_impl->m_ref, flags, interfaceIndex, pFullname->c_str(), rrtype, rrclass, len, v, ttl, (DNSServiceRegisterRecordReply) ServiceRef::ServiceRefImpl::RegisterRecordCallback, sdRef->m_impl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	return record;
+}
+
+/*
+ * QueryRecord()
+ *
+ * This maps to DNSServiceQueryRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+ServiceRef*
+DNSService::QueryRecord
+		(
+		ServiceFlags			flags,
+		int						interfaceIndex,
+		String				*	fullname,
+		int						rrtype,
+		int						rrclass,
+		QueryRecordReply	*	callback
+		)
+{
+	ServiceRef	*	sdRef		= new ServiceRef(callback);
+	PString		*	pFullname	= new PString(fullname);
+
+	int err = DNSServiceQueryRecord(&sdRef->m_impl->m_ref, flags, interfaceIndex, pFullname->c_str(), rrtype, rrclass, (DNSServiceQueryRecordReply) ServiceRef::ServiceRefImpl::QueryRecordCallback, sdRef->m_impl);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	sdRef->StartThread();
+
+	return sdRef;
+}
+
+
+/*
+ * ReconfirmRecord()
+ *
+ * This maps to DNSServiceReconfirmRecord().  Returns an
+ * initialized ServiceRef on success, throws an exception
+ * on failure.
+ */
+void
+DNSService::ReconfirmRecord
+		(
+		ServiceFlags	flags,
+		int				interfaceIndex,
+		String		*	fullname,
+		int				rrtype,
+		int				rrclass,
+		Byte			rdata[]
+		)
+{
+	int				len	= 0;
+	Byte __pin	*	p	= NULL;
+	void		*	v	= NULL;
+
+	PString * pFullname = new PString(fullname);
+
+	if ((rdata != NULL) && (rdata->Length > 0))
+	{
+		len	= rdata->Length;
+		p	= &rdata[0];
+		v	= (void*) p;
+	}
+
+	DNSServiceReconfirmRecord(flags, interfaceIndex, pFullname->c_str(), rrtype, rrclass, len, v);
+}
+
+
+void
+TextRecord::SetValue
+		(
+		String	*	key,
+		Byte		value[]            /* may be NULL */
+		)
+{
+	PString			*	pKey = new PString(key);
+	int					len		=	0;
+	Byte __pin		*	p		=	NULL;
+	void			*	v		=	NULL;
+	DNSServiceErrorType	err;
+
+	if (value && (value->Length > 0))
+	{
+		len	=	value->Length;
+		p	=	&value[0];
+		v	=	(void*) p;
+	}
+
+	err = TXTRecordSetValue(&m_impl->m_ref, pKey->c_str(), len, v);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+}
+
+
+void
+TextRecord::RemoveValue
+		(
+		String	*	key
+		)
+{
+	PString			*	pKey = new PString(key);
+	DNSServiceErrorType	err;
+
+	err = TXTRecordRemoveValue(&m_impl->m_ref, pKey->c_str());
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+}
+
+
+int
+TextRecord::GetLength
+		(
+		)
+{
+	return TXTRecordGetLength(&m_impl->m_ref);
+}
+
+
+Byte
+TextRecord::GetBytes
+		(
+		) __gc[]
+{
+	const void	*	noGCBytes = NULL;
+	Byte			gcBytes[] = NULL;		
+
+	noGCBytes		=	TXTRecordGetBytesPtr(&m_impl->m_ref);
+	int			len	=	GetLength();
+
+	if (noGCBytes && len)
+	{
+		gcBytes				=	new Byte[len];
+		Byte __pin	*	p	=	&gcBytes[0];
+		memcpy(p, noGCBytes, len);
+	}
+
+	return gcBytes;
+}
+
+
+bool
+TextRecord::ContainsKey
+		(
+		Byte		txtRecord[],
+		String	*	key
+		)
+{
+	PString		*	pKey	= new PString(key);
+	Byte __pin	*	p		= &txtRecord[0];
+	
+	return (TXTRecordContainsKey(txtRecord->Length, p, pKey->c_str()) > 0) ? true : false;
+}
+
+
+Byte
+TextRecord::GetValueBytes
+		(
+		Byte		txtRecord[],
+		String	*	key
+		) __gc[]
+{
+	uint8_t			valueLen;
+	Byte			ret[]	= NULL;
+	PString		*	pKey	= new PString(key);
+	Byte __pin	*	p1		= &txtRecord[0];
+	const void	*	v;
+
+	v = TXTRecordGetValuePtr(txtRecord->Length, p1, pKey->c_str(), &valueLen);
+
+	if (v != NULL)
+	{
+		ret					= new Byte[valueLen];
+		Byte __pin	*	p2	= &ret[0];
+
+		memcpy(p2, v, valueLen);
+	}
+
+	return ret;
+}
+
+
+int
+TextRecord::GetCount
+		(
+		Byte txtRecord[]
+		)
+{
+	Byte __pin	*	p	= &txtRecord[0];
+
+	return TXTRecordGetCount(txtRecord->Length, p);
+}
+
+
+Byte
+TextRecord::GetItemAtIndex
+		(
+		Byte				txtRecord[],
+		int					index,
+		[Out] String	**	key
+		) __gc[]
+{
+	char				keyBuf[255];
+	uint8_t				keyBufLen = 255;
+	uint8_t				valueLen;
+	void			*	value;
+	Byte				ret[]	= NULL;
+	DNSServiceErrorType	err;
+	Byte __pin		*	p1		= &txtRecord[0];
+	
+
+	err = TXTRecordGetItemAtIndex(txtRecord->Length, p1, index, keyBufLen, keyBuf, &valueLen, (const void**) &value);
+
+	if (err != 0)
+	{
+		throw new DNSServiceException(err);
+	}
+
+	*key = ConvertToString(keyBuf);
+
+	if (valueLen)
+	{
+		ret					= new Byte[valueLen];
+		Byte __pin	*	p2	= &ret[0];
+
+		memcpy(p2, value, valueLen);
+	}
+
+	return ret;
+}
+
+
+//
+// DNSServiceException::DNSServiceException()
+//
+// Constructs an exception with an error code
+//
+DNSServiceException::DNSServiceException
+				(
+				int _err
+				)
+:
+	err(_err)
+{
+}
+
+
+//
+// This version of the constructor is useful for instances in which
+// an inner exception is thrown, caught, and then a new exception
+// is thrown in it's place
+//
+DNSServiceException::DNSServiceException
+				(	
+				String				*	message,
+				System::Exception	*	innerException
+				)
+{
+}
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.h b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.h
new file mode 100755
index 00000000..3e0196d2
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.h
@@ -0,0 +1,1392 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+ * 
+ * NOTE:
+ * 
+ * These .Net APIs are a work in progress, currently being discussed and refined.
+ * If you plan to build an application based on these APIs, you may wish to
+ * statically link this code into your application, or otherwise distribute
+ * the DLL so that it installs into the same folder as your application
+ * (not into any common system area where it might interfere with other
+ * applications using a future completed version of these APIs).
+ * If you plan to do this, please be sure to inform us by sending email
+ * to bonjour@apple.com to let us know.
+ * You may want to discuss what you're doing on the Bonjour mailing
+ * list to see if others in similar positions have any suggestions for you:
+ * 
+ * <http://lists.apple.com/bonjour-dev/>
+ * 
+ */
+    
+#pragma once
+
+#include <dns_sd.h>
+#include <vcclr.h>
+#include <memory>
+#include <winsock2.h>
+
+using namespace System;
+using namespace System::Net;
+using namespace System::Runtime::InteropServices;
+using namespace System::Threading;
+using namespace System::Collections;
+
+
+namespace Apple
+{
+	namespace DNSSD
+	{
+		public __gc class ServiceRef;
+
+		public __value enum ServiceFlags : int
+		{
+			MoreComing			=	1,
+			/* MoreComing indicates to a callback that at least one more result is
+				* queued and will be delivered following immediately after this one.
+				* Applications should not update their UI to display browse
+				* results when the MoreComing flag is set, because this would
+				* result in a great deal of ugly flickering on the screen.
+				* Applications should instead wait until until MoreComing is not set,
+				* and then update their UI.
+				* When MoreComing is not set, that doesn't mean there will be no more
+				* answers EVER, just that there are no more answers immediately
+				* available right now at this instant. If more answers become available
+				* in the future they will be delivered as usual.
+				*/
+
+			Add					=	2,
+			Default				=	4,
+			/* Flags for domain enumeration and browse/query reply callbacks.
+				* "Default" applies only to enumeration and is only valid in
+				* conjuction with "Add".  An enumeration callback with the "Add"
+				* flag NOT set indicates a "Remove", i.e. the domain is no longer
+				* valid.
+				*/
+
+			NoAutoRename		=	8,
+			/* Flag for specifying renaming behavior on name conflict when registering
+				* non-shared records. By default, name conflicts are automatically handled
+				* by renaming the service.  NoAutoRename overrides this behavior - with this
+				* flag set, name conflicts will result in a callback.  The NoAutorename flag
+				* is only valid if a name is explicitly specified when registering a service
+				* (i.e. the default name is not used.)
+				*/
+
+			Shared				=	16,
+			Unique				=	32,
+			/* Flag for registering individual records on a connected
+				* DNSServiceRef.  Shared indicates that there may be multiple records
+				* with this name on the network (e.g. PTR records).  Unique indicates that
+	the
+				* record's name is to be unique on the network (e.g. SRV records).
+				*/
+
+			BrowseDomains		=	64,
+			RegistrationDomains	=	128,
+			/* Flags for specifying domain enumeration type in DNSServiceEnumerateDomain
+	s.
+				* BrowseDomains enumerates domains recommended for browsing, RegistrationDo
+	mains
+				* enumerates domains recommended for registration.
+				*/
+		};
+
+
+		public __value enum ErrorCode : int
+		{
+			NoError				=	0,
+			Unknown				=	-65537,
+			NoSuchName			=	-65538,
+			NoMemory			=	-65539,
+			BadParam			=	-65540,
+			BadReference		=	-65541,
+			BadState			=	-65542,
+			BadFlags			=	-65543,
+			Unsupported			=	-65544,
+			AlreadyRegistered	=	-65547,
+			NameConflict		=	-65548,
+			Invalid				=	-65549,
+			Incompatible		=	-65551,
+			BadinterfaceIndex	=	-65552
+
+			/*
+				* mDNS Error codes are in the range
+				* FFFE FF00 (-65792) to FFFE FFFF (-65537)
+				*/
+		};
+
+		public __gc class DNSServiceException
+		:
+			public Exception
+		{
+		public:
+
+			DNSServiceException
+				(
+				int err
+				);
+
+			DNSServiceException
+				(	
+				String				*	message,
+				System::Exception	*	innerException
+				);
+
+			int err;
+		};
+
+
+		/*
+		* class RecordRef
+		*
+		* This is a thin MC++ class facade on top of a DNSRecordRef
+		*/
+		public __gc class RecordRef
+		{
+		public:
+
+			RecordRef()
+			{
+				m_impl = new RecordRefImpl;
+				m_impl->m_ref = NULL;
+			}
+
+			~RecordRef()
+			{
+				delete m_impl;
+			}
+
+			__nogc class RecordRefImpl
+			{
+			public:
+
+				DNSRecordRef m_ref;
+			};
+
+			RecordRefImpl * m_impl;
+		};			
+
+
+		/*
+		* class ServiceRef
+		*
+		* This is a thin MC++ class facade on top of a DNSServiceRef
+		*/
+		public __gc class ServiceRef : public IDisposable
+		{
+		public:
+
+			ServiceRef(Object * callback);
+
+			~ServiceRef();
+
+			/*
+			* This does an underlying DNSServiceRefDeallocate().  After
+			* calling Dispose, the ServiceRef is no longer usable.
+			*/
+			void
+			Dispose();
+
+			/*
+			* Internal - Dispatch an EnumerateDomains callback
+			*/
+			void
+			EnumerateDomainsDispatch
+				(
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	replyDomain
+				);
+
+			/*
+			* Internal - Dispatch a Register callback
+			*/
+			void
+			RegisterDispatch
+				(
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+ 				String		*	name,
+				String		*	regtype,
+				String		*	domain
+				);
+
+			/*
+			* Internal - Dispatch a Browse callback
+			*/
+			void
+			BrowseDispatch
+				(
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	serviceName,
+				String		*	regtype,
+				String		*	replyDomain
+				);
+
+			/*
+			* Internal - Dispatch a Resolve callback
+			*/
+			void
+			ResolveDispatch
+				(
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	fullname,
+				String		*	hosttarget,
+				int				port,
+				Byte			txtRecord[]
+				);
+			
+			/*
+			* Internal - Dispatch a RegisterRecord callback
+			*/
+			void
+			RegisterRecordDispatch
+				(
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+				RecordRef	*	record
+				);
+
+			/*
+			* Internal - Dispatch a QueryRecord callback
+			*/
+			void
+			QueryRecordDispatch
+				(
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	fullname,
+				int				rrtype,
+				int				rrclass,
+				Byte			rdata[],
+				int				ttl
+				);
+
+			/*
+			* Internal - A non managed class to wrap a DNSServiceRef
+			*/
+			__nogc class ServiceRefImpl
+			{
+			public:
+
+				ServiceRefImpl
+					(
+					ServiceRef * outer
+					);
+
+				~ServiceRefImpl();
+
+				/*
+				* Sets up events for threaded operation
+				*/
+				void
+				SetupEvents();
+
+				/*
+				* Main processing thread
+				*/
+				void
+				ProcessingThread();
+
+				/*
+				* Calls DNSServiceRefDeallocate()
+				*/
+				void
+				Dispose();
+
+				/*
+				* Called from dnssd.dll
+				*/
+				static void DNSSD_API
+				EnumerateDomainsCallback
+					(
+					DNSServiceRef			sdRef,
+					DNSServiceFlags			flags,
+					uint32_t				interfaceIndex,
+					DNSServiceErrorType		errorCode,
+					const char			*	replyDomain,
+					void				*	context
+					);
+
+				static void DNSSD_API
+				RegisterCallback
+					(
+					DNSServiceRef			ref,
+					DNSServiceFlags			flags,
+					DNSServiceErrorType		errorCode,
+ 					const char			*	name,
+					const char			*	regtype,
+					const char			*	domain,
+					void				*	context
+					);
+
+				static void DNSSD_API
+				BrowseCallback
+					(
+					DNSServiceRef			sdRef,
+   					DNSServiceFlags			flags,
+					uint32_t				interfaceIndex,
+					DNSServiceErrorType		errorCode,
+					const char			*	serviceName,
+					const char			*	regtype,
+					const char			*	replyDomain,
+					void				*	context
+					);
+
+				static void DNSSD_API
+				ResolveCallback
+					(
+					DNSServiceRef			sdRef,
+					DNSServiceFlags			flags,
+					uint32_t				interfaceIndex,
+					DNSServiceErrorType		errorCode,
+					const char			*	fullname,
+					const char			*	hosttarget,
+					uint16_t				notAnIntPort,
+					uint16_t				txtLen,
+					const char			*	txtRecord,
+					void				*	context
+					);
+
+				static void DNSSD_API
+				RegisterRecordCallback
+					( 
+					DNSServiceRef		sdRef,
+					DNSRecordRef		RecordRef,
+					DNSServiceFlags		flags,
+					DNSServiceErrorType	errorCode,
+					void			*	context
+					);
+
+				static void DNSSD_API
+				QueryRecordCallback
+					(
+					DNSServiceRef			DNSServiceRef,
+					DNSServiceFlags			flags,
+					uint32_t				interfaceIndex,
+					DNSServiceErrorType		errorCode,
+					const char			*	fullname,
+					uint16_t				rrtype,
+					uint16_t				rrclass,
+					uint16_t				rdlen,
+					const void			*	rdata,
+					uint32_t				ttl,
+					void				*	context
+					);
+
+				SOCKET				m_socket;
+				HANDLE				m_socketEvent;
+				HANDLE				m_stopEvent;
+				DWORD				m_threadId;
+				bool				m_disposed;
+				DNSServiceRef		m_ref;
+				gcroot<ServiceRef*> m_outer;
+			};
+
+			void
+			StartThread();
+
+			void
+			ProcessingThread();
+
+			bool				m_bDisposed;
+			Object			*	m_callback;
+			Thread			*	m_thread;
+			ServiceRefImpl	*	m_impl;
+		};
+			
+		/*********************************************************************************************
+		*
+		*   TXT Record Construction Functions
+		*
+		*********************************************************************************************/
+
+		/*
+		* A typical calling sequence for TXT record construction is something like:
+		*
+		* DNSService.TextRecord tr = new DNSService.TextRecord(1024);
+		* tr.SetValue();
+		* tr.SetValue();
+		* tr.SetValue();
+		* ...
+		* DNSServiceRegister( ... tr.GetLength(), tr.GetBytes() ... );
+		*/
+
+
+		/* TextRecord
+		*
+		* Opaque internal data type.
+		* Note: Represents a DNS-SD TXT record.
+		*/
+
+
+		/* TextRecord::TextRecord()
+		*
+		* Creates a new empty TextRecord .
+		*
+		*/
+
+		public __gc class TextRecord
+		{
+		public:
+
+			TextRecord()
+			{
+				m_impl = new TextRecordImpl();
+				TXTRecordCreate(&m_impl->m_ref, 0, NULL);
+			}
+
+			~TextRecord()
+			{
+				TXTRecordDeallocate(&m_impl->m_ref);
+				delete m_impl;
+			}
+
+			__nogc class TextRecordImpl
+			{
+			public:
+
+				TXTRecordRef m_ref;
+			};
+
+			TextRecordImpl * m_impl;
+
+
+			/* SetValue()
+			*
+			* Adds a key (optionally with value) to a TextRecord. If the "key" already
+			* exists in the TextRecord, then the current value will be replaced with
+			* the new value.
+			* Keys may exist in four states with respect to a given TXT record:
+			*  - Absent (key does not appear at all)
+			*  - Present with no value ("key" appears alone)
+			*  - Present with empty value ("key=" appears in TXT record)
+			*  - Present with non-empty value ("key=value" appears in TXT record)
+			* For more details refer to "Data Syntax for DNS-SD TXT Records" in
+			* <http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt>
+			*
+			* key:             A null-terminated string which only contains printable ASCII
+			*                  values (0x20-0x7E), excluding '=' (0x3D). Keys should be
+			*                  14 characters or less (not counting the terminating null).
+			*
+			* value:           Any binary value. For values that represent
+			*                  textual data, UTF-8 is STRONGLY recommended.
+			*                  For values that represent textual data, valueSize
+			*                  should NOT include the terminating null (if any)
+			*                  at the end of the string.
+			*                  If NULL, then "key" will be added with no value.
+			*                  If non-NULL but valueSize is zero, then "key=" will be
+			*                  added with empty value.
+			*
+			* exceptions:      Throws kDNSServiceErr_Invalid if the "key" string contains
+			*                  illegal characters.
+			*                  Throws kDNSServiceErr_NoMemory if adding this key would
+			*                  exceed the available storage.
+			*/
+
+			void
+			SetValue
+				(
+				String	*	key,
+				Byte		value[]  /* may be NULL */
+				);
+
+
+			/* RemoveValue()
+			*
+			* Removes a key from a TextRecord.  The "key" must be an
+			* ASCII string which exists in the TextRecord.
+			*
+			* key:             A key name which exists in the TextRecord.
+			*
+			* exceptions:      Throws kDNSServiceErr_NoSuchKey if the "key" does not
+			*                  exist in the TextRecord.
+			*
+			*/
+
+			void
+			RemoveValue
+				(
+				String	*	key
+				);
+
+
+			/* GetLength()
+			*
+			* Allows you to determine the length of the raw bytes within a TextRecord.
+			*
+			* return value :     Returns the size of the raw bytes inside a TextRecord
+			*                  which you can pass directly to DNSServiceRegister() or
+			*                  to DNSServiceUpdateRecord().
+			*                  Returns 0 if the TextRecord is empty.
+			*
+			*/
+
+			int
+			GetLength
+				(
+				);
+
+
+			/* GetBytes()
+			*
+			* Allows you to retrieve a pointer to the raw bytes within a TextRecord.
+			*
+			* return value:    Returns a pointer to the bytes inside the TextRecord
+			*                  which you can pass directly to DNSServiceRegister() or
+			*                  to DNSServiceUpdateRecord().
+			*
+			*/
+
+			Byte
+			GetBytes
+				(
+				) __gc[];
+
+
+			/*********************************************************************************************
+			*
+			*   TXT Record Parsing Functions
+			*
+			*********************************************************************************************/
+
+			/*
+			* A typical calling sequence for TXT record parsing is something like:
+			*
+			* Receive TXT record data in DNSServiceResolve() callback
+			* if (TXTRecordContainsKey(txtLen, txtRecord, "key")) then do something
+			* val1ptr = DNSService.TextService.GetValue(txtRecord, "key1", &len1);
+			* val2ptr = DNSService.TextService.GetValue(txtRecord, "key2", &len2);
+			* ...
+			* return;
+			*
+			*/
+
+			/* ContainsKey()
+			*
+			* Allows you to determine if a given TXT Record contains a specified key.
+			*
+			* txtRecord:       Pointer to the received TXT Record bytes.
+			*
+			* key:             A null-terminated ASCII string containing the key name.
+			*
+			* return value:    Returns 1 if the TXT Record contains the specified key.
+			*                  Otherwise, it returns 0.
+			*
+			*/
+
+			static public bool
+			ContainsKey
+				(
+				Byte		txtRecord[],
+				String	*	key
+				);
+
+
+			/* GetValueBytes()
+			*
+			* Allows you to retrieve the value for a given key from a TXT Record.
+			*
+			* txtRecord:       Pointer to the received TXT Record bytes.
+			*
+			* key:             A null-terminated ASCII string containing the key name.
+			*
+			* return value:    Returns NULL if the key does not exist in this TXT record,
+			*                  or exists with no value (to differentiate between
+			*                  these two cases use ContainsKey()).
+			*                  Returns byte array 
+			*                  if the key exists with empty or non-empty value.
+			*                  For empty value, length of byte array will be zero.
+			*                  For non-empty value, it will be the length of value data.
+			*/
+
+			static public Byte
+			GetValueBytes
+				(
+				Byte		txtRecord[],
+				String	*	key
+				) __gc[];
+
+
+			/* GetCount()
+			*
+			* Returns the number of keys stored in the TXT Record.  The count
+			* can be used with TXTRecordGetItemAtIndex() to iterate through the keys.
+			*
+			* txtRecord:       Pointer to the received TXT Record bytes.
+			*
+			* return value:    Returns the total number of keys in the TXT Record.
+			*
+			*/
+
+			static public int
+			GetCount
+				(
+				Byte	txtRecord[]
+				);
+
+
+			/* GetItemAtIndex()
+			*
+			* Allows you to retrieve a key name and value pointer, given an index into
+			* a TXT Record.  Legal index values range from zero to TXTRecordGetCount()-1.
+			* It's also possible to iterate through keys in a TXT record by simply
+			* calling TXTRecordGetItemAtIndex() repeatedly, beginning with index zero
+			* and increasing until TXTRecordGetItemAtIndex() returns kDNSServiceErr_Invalid.
+			*
+			* On return:
+			* For keys with no value, *value is set to NULL and *valueLen is zero.
+			* For keys with empty value, *value is non-NULL and *valueLen is zero.
+			* For keys with non-empty value, *value is non-NULL and *valueLen is non-zero.
+			*
+			* txtRecord:       Pointer to the received TXT Record bytes.
+			*
+			* index:           An index into the TXT Record.
+			*
+			* key:             A string buffer used to store the key name.
+			*                  On return, the buffer contains a string
+			*                  giving the key name. DNS-SD TXT keys are usually
+			*                  14 characters or less. 
+			*
+			* return value:    Record bytes that holds the value data.
+			*
+			* exceptions:      Throws kDNSServiceErr_Invalid if index is greater than
+			*                  GetCount()-1.
+			*/
+
+			static public Byte
+			GetItemAtIndex
+				(
+				Byte				txtRecord[],
+				int					index,
+				[Out] String	**	key
+				) __gc[];
+		};
+
+
+		public __abstract __gc class DNSService
+		{
+		public:
+
+			/*********************************************************************************************
+			*
+			* Domain Enumeration
+			*
+			*********************************************************************************************/
+
+			/* DNSServiceEnumerateDomains()
+			*
+			* Asynchronously enumerate domains available for browsing and registration.
+			* Currently, the only domain returned is "local.", but other domains will be returned in future.
+			*
+			* The enumeration MUST be cancelled via DNSServiceRefDeallocate() when no more domains
+			* are to be found.
+			*
+			*
+			* EnumerateDomainsReply Delegate
+			*
+			* This Delegate is invoked upon a reply from an EnumerateDomains call.
+			*
+			* sdRef:           The DNSServiceRef initialized by DNSServiceEnumerateDomains().
+			*
+			* flags:           Possible values are:
+			*                  MoreComing
+			*                  Add
+			*                  Default
+			*
+			* interfaceIndex:  Specifies the interface on which the domain exists.  (The index for a given
+			*                  interface is determined via the if_nametoindex() family of calls.)
+			*
+			* errorCode:       Will be NoError (0) on success, otherwise indicates
+			*                  the failure that occurred (other parameters are undefined if errorCode is nonzero).
+			*
+			* replyDomain:     The name of the domain.
+			*
+			*/
+
+			__delegate void
+			EnumerateDomainsReply
+				(
+				ServiceRef	*	sdRef,
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	replyDomain
+				);
+
+			/* DNSServiceEnumerateDomains() Parameters:
+			*
+			*
+			* flags:           Possible values are:
+			*                  BrowseDomains to enumerate domains recommended for browsing.
+			*                  RegistrationDomains to enumerate domains recommended
+			*                  for registration.
+			*
+			* interfaceIndex:  If non-zero, specifies the interface on which to look for domains.
+			*                  (the index for a given interface is determined via the if_nametoindex()
+			*                  family of calls.)  Most applications will pass 0 to enumerate domains on
+			*                  all interfaces.
+			*
+			* callback:        The delegate to be called when a domain is found or the call asynchronously
+			*                  fails.
+			*
+			*
+			* return value:    Returns initialize ServiceRef on succeses (any subsequent, asynchronous
+			*                  errors are delivered to the delegate), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is not invoked and the ServiceRef
+			*                  is not initialized.)
+			*/
+
+			static public ServiceRef*
+			EnumerateDomains
+				(
+				int							flags,
+				int							interfaceIndex,
+				EnumerateDomainsReply	*	callback
+				);
+
+			/*********************************************************************************************
+			*
+			*  Service Registration
+			*
+			*********************************************************************************************/
+
+			/* Register a service that is discovered via Browse() and Resolve() calls.
+			* 
+			* RegisterReply() Callback Parameters:
+			*
+			* sdRef:           The ServiceRef initialized by Register().
+			*
+			* flags:           Currently unused, reserved for future use.
+			*
+			* errorCode:       Will be NoError on success, otherwise will
+			*                  indicate the failure that occurred (including name conflicts, if the
+			*                  NoAutoRename flag was passed to the
+			*                  callout.)  Other parameters are undefined if errorCode is nonzero.
+			*
+			* name:            The service name registered (if the application did not specify a name in
+			*                  DNSServiceRegister(), this indicates what name was automatically chosen).
+			*
+			* regtype:         The type of service registered, as it was passed to the callout.
+			*
+			* domain:          The domain on which the service was registered (if the application did not
+			*                  specify a domain in Register(), this indicates the default domain
+			*                  on which the service was registered).
+			*
+			*/
+
+			__delegate void
+			RegisterReply
+				(
+				ServiceRef	*	sdRef,
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+				String		*	name,
+				String		*	regtype,
+				String		*	domain
+				);
+
+			/* Register()  Parameters:
+			*
+			* flags:           Indicates the renaming behavior on name conflict (most applications
+			*                  will pass 0).  See flag definitions above for details.
+			*
+			* interfaceIndex:  If non-zero, specifies the interface on which to register the service
+			*                  (the index for a given interface is determined via the if_nametoindex()
+			*                  family of calls.)  Most applications will pass 0 to register on all
+			*                  available interfaces.  Pass -1 to register a service only on the local
+			*                  machine (service will not be visible to remote hosts.)
+			*
+			* name:            If non-NULL, specifies the service name to be registered.
+			*                  Most applications will not specify a name, in which case the
+			*                  computer name is used (this name is communicated to the client via
+			*                  the callback).
+			*
+			* regtype:         The service type followed by the protocol, separated by a dot
+			*                  (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+			*                  New service types should be registered at htp://www.dns-sd.org/ServiceTypes.html.
+			*
+			* domain:          If non-NULL, specifies the domain on which to advertise the service.
+			*                  Most applications will not specify a domain, instead automatically
+			*                  registering in the default domain(s).
+			*
+			* host:            If non-NULL, specifies the SRV target host name.  Most applications
+			*                  will not specify a host, instead automatically using the machine's
+			*                  default host name(s).  Note that specifying a non-NULL host does NOT
+			*                  create an address record for that host - the application is responsible
+			*                  for ensuring that the appropriate address record exists, or creating it
+			*                  via DNSServiceRegisterRecord().
+			*
+			* port:            The port, in host byte order, on which the service accepts connections.
+			*                  Pass 0 for a "placeholder" service (i.e. a service that will not be discovered
+			*                  by browsing, but will cause a name conflict if another client tries to
+			*                  register that same name).  Most clients will not use placeholder services.
+			*
+			* txtRecord:       The txt record rdata.  May be NULL.  Note that a non-NULL txtRecord
+			*                  MUST be a properly formatted DNS TXT record, i.e. <length byte> <data>
+			*                  <length byte> <data> ...
+			*
+			* callback:        The delegate to be called when the registration completes or asynchronously
+			*                  fails.  The client MAY pass NULL for the callback -  The client will NOT be notified
+			*                  of the default values picked on its behalf, and the client will NOT be notified of any
+			*                  asynchronous errors (e.g. out of memory errors, etc.) that may prevent the registration
+			*                  of the service.  The client may NOT pass the NoAutoRename flag if the callback is NULL.
+			*                  The client may still deregister the service at any time via DNSServiceRefDeallocate().
+			*
+			* return value:    Returns initialize ServiceRef (any subsequent, asynchronous
+			*                  errors are delivered to the callback), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is never invoked and the DNSServiceRef
+			*                  is not initialized.)
+			*
+			*/
+			static public ServiceRef*
+			Register
+				(
+				int					flags,
+				int					interfaceIndex,
+				String			*	name,
+				String			*	regtype,
+				String			*	domain,
+				String			*	host,
+				int					port,
+				Byte				txtRecord[],
+				RegisterReply	*	callback
+				);
+
+			/* AddRecord()
+			*
+			* Add a record to a registered service.  The name of the record will be the same as the
+			* registered service's name.
+			* The record can later be updated or deregistered by passing the RecordRef initialized
+			* by this function to UpdateRecord() or RemoveRecord().
+			*
+			*
+			* Parameters;
+			*
+			* sdRef:           A ServiceRef initialized by Register().
+			*
+			* RecordRef:       A pointer to an uninitialized RecordRef.  Upon succesfull completion of this
+			*                  call, this ref may be passed to UpdateRecord() or RemoveRecord().
+			*                  If the above ServiceRef is disposed, RecordRef is also
+			*                  invalidated and may not be used further.
+			*
+			* flags:           Currently ignored, reserved for future use.
+			*
+			* rrtype:          The type of the record (e.g. TXT, SRV, etc), as defined in nameser.h.
+			*
+			* rdata:           The raw rdata to be contained in the added resource record.
+			*
+			* ttl:             The time to live of the resource record, in seconds.
+			*
+			* return value:    Returns initialized RecordRef, otherwise throws
+			*                  an exception indicating the error that occurred (the RecordRef is not initialized).
+			*/
+
+			static public RecordRef*
+			AddRecord
+				(
+				ServiceRef	*	sref,
+				int				flags,
+				int				rrtype,
+				Byte			rdata[],
+				int				ttl
+				);
+
+			/* UpdateRecord
+			*
+			* Update a registered resource record.  The record must either be:
+			*   - The primary txt record of a service registered via Register()
+			*   - A record added to a registered service via AddRecord()
+			*   - An individual record registered by RegisterRecord()
+			*
+			*
+			* Parameters:
+			*
+			* sdRef:           A ServiceRef that was initialized by Register()
+			*                  or CreateConnection().
+			*
+			* RecordRef:       A RecordRef initialized by AddRecord, or NULL to update the
+			*                  service's primary txt record.
+			*
+			* flags:           Currently ignored, reserved for future use.
+			*
+			* rdata:           The new rdata to be contained in the updated resource record.
+			*
+			* ttl:             The time to live of the updated resource record, in seconds.
+			*
+			* return value:    No return value on success, otherwise throws an exception
+			*                  indicating the error that occurred.
+			*/
+			static public void
+			UpdateRecord
+				(
+				ServiceRef	*	sref,
+				RecordRef	*	record,
+				int				flags,
+				Byte			rdata[],
+				int				ttl
+				);
+
+			/* RemoveRecord
+			*
+			* Remove a record previously added to a service record set via AddRecord(), or deregister
+			* an record registered individually via RegisterRecord().
+			*
+			* Parameters:
+			*
+			* sdRef:           A ServiceRef initialized by Register() (if the
+			*                  record being removed was registered via AddRecord()) or by
+			*                  CreateConnection() (if the record being removed was registered via
+			*                  RegisterRecord()).
+			*
+			* recordRef:       A RecordRef initialized by a successful call to AddRecord()
+			*                  or RegisterRecord().
+			*
+			* flags:           Currently ignored, reserved for future use.
+			*
+			* return value:    Nothing on success, otherwise throws an
+			*                  exception indicating the error that occurred.
+			*/
+
+			static public void
+			RemoveRecord
+							(
+							ServiceRef	*	sref,
+							RecordRef	*	record,	
+							int				flags
+							);
+
+			/*********************************************************************************************
+			*
+			*  Service Discovery
+			*
+			*********************************************************************************************/
+
+			/* Browse for instances of a service.
+			*
+			*
+			* BrowseReply() Parameters:
+			*
+			* sdRef:           The DNSServiceRef initialized by Browse().
+			*
+			* flags:           Possible values are MoreComing and Add.
+			*                  See flag definitions for details.
+			*
+			* interfaceIndex:  The interface on which the service is advertised.  This index should
+			*                  be passed to Resolve() when resolving the service.
+			*
+			* errorCode:       Will be NoError (0) on success, otherwise will
+			*                  indicate the failure that occurred.  Other parameters are undefined if
+			*                  the errorCode is nonzero.
+			*
+			* serviceName:     The service name discovered.
+			*
+			* regtype:         The service type, as passed in to Browse().
+			* 
+			* domain:          The domain on which the service was discovered (if the application did not
+			*                  specify a domain in Browse(), this indicates the domain on which the
+			*                  service was discovered.)
+			*
+			*/
+
+			__delegate void
+			BrowseReply
+				(
+				ServiceRef	*	sdRef,
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	name,
+				String		*	type,
+				String		*	domain
+				);
+
+			/* DNSServiceBrowse() Parameters:
+			*
+			* sdRef:           A pointer to an uninitialized ServiceRef.  Call ServiceRef.Dispose()
+			*                  to terminate the browse.
+			*
+			* flags:           Currently ignored, reserved for future use.
+			*
+			* interfaceIndex:  If non-zero, specifies the interface on which to browse for services
+			*                  (the index for a given interface is determined via the if_nametoindex()
+			*                  family of calls.)  Most applications will pass 0 to browse on all available
+			*                  interfaces.  Pass -1 to only browse for services provided on the local host.
+			*
+			* regtype:         The service type being browsed for followed by the protocol, separated by a
+			*                  dot (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+			*
+			* domain:          If non-NULL, specifies the domain on which to browse for services.
+			*                  Most applications will not specify a domain, instead browsing on the
+			*                  default domain(s).
+			*
+			* callback:        The delegate to be called when an instance of the service being browsed for
+			*                  is found, or if the call asynchronously fails.
+			*
+			* return value:    Returns initialized ServiceRef on succeses (any subsequent, asynchronous
+			*                  errors are delivered to the callback), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is not invoked and the ServiceRef
+			*                  is not initialized.)
+			*/
+
+			static public ServiceRef*
+			Browse
+				(
+				int				flags,
+				int				interfaceIndex,
+				String		*	regtype,
+				String		*	domain,
+				BrowseReply	*	callback
+				);
+
+			/* ResolveReply() Parameters:
+			*
+			* Resolve a service name discovered via Browse() to a target host name, port number, and
+			* txt record.
+			*
+			* Note: Applications should NOT use Resolve() solely for txt record monitoring - use
+			* QueryRecord() instead, as it is more efficient for this task.
+			*
+			* Note: When the desired results have been returned, the client MUST terminate the resolve by calling
+			* ServiceRef.Dispose().
+			*
+			* Note: Resolve() behaves correctly for typical services that have a single SRV record and
+			* a single TXT record (the TXT record may be empty.)  To resolve non-standard services with multiple
+			* SRV or TXT records, QueryRecord() should be used.
+			*
+			* ResolveReply Callback Parameters:
+			*
+			* sdRef:           The DNSServiceRef initialized by Resolve().
+			*
+			* flags:           Currently unused, reserved for future use.
+			*
+			* interfaceIndex:  The interface on which the service was resolved.
+			*
+			* errorCode:       Will be NoError (0) on success, otherwise will
+			*                  indicate the failure that occurred.  Other parameters are undefined if
+			*                  the errorCode is nonzero.
+			*
+			* fullname:        The full service domain name, in the form <servicename>.<protocol>.<domain>.
+			*                  (Any literal dots (".") are escaped with a backslash ("\."), and literal
+			*                  backslashes are escaped with a second backslash ("\\"), e.g. a web server
+			*                  named "Dr. Pepper" would have the fullname  "Dr\.\032Pepper._http._tcp.local.").
+			*                  This is the appropriate format to pass to standard system DNS APIs such as
+			*                  res_query(), or to the special-purpose functions included in this API that
+			*                  take fullname parameters.
+			*
+			* hosttarget:      The target hostname of the machine providing the service.  This name can
+			*                  be passed to functions like gethostbyname() to identify the host's IP address.
+			*
+			* port:            The port, in host byte order, on which connections are accepted for this service.
+			*
+			* txtRecord:       The service's primary txt record, in standard txt record format.
+			*
+			*/
+
+			__delegate void
+			ResolveReply
+				(	
+				ServiceRef	*	sdRef,  
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,
+				String		*	fullName,
+				String		*	hostName,
+				int				port,
+				Byte			txtRecord[]
+				);
+
+			/* Resolve() Parameters
+			*
+			* flags:           Currently ignored, reserved for future use.
+			*
+			* interfaceIndex:  The interface on which to resolve the service.  The client should
+			*                  pass the interface on which the servicename was discovered, i.e.
+			*                  the interfaceIndex passed to the DNSServiceBrowseReply callback,
+			*                  or 0 to resolve the named service on all available interfaces.
+			*
+			* name:            The servicename to be resolved.
+			*
+			* regtype:         The service type being resolved followed by the protocol, separated by a
+			*                  dot (e.g. "_ftp._tcp").  The transport protocol must be "_tcp" or "_udp".
+			*
+			* domain:          The domain on which the service is registered, i.e. the domain passed
+			*                  to the DNSServiceBrowseReply callback.
+			*
+			* callback:        The delegate to be called when a result is found, or if the call
+			*                  asynchronously fails.
+			*
+			*
+			* return value:    Returns initialized ServiceRef on succeses (any subsequent, asynchronous
+			*                  errors are delivered to the callback), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is never invoked and the DNSServiceRef
+			*                  is not initialized.)
+			*/
+
+			static public ServiceRef*
+			Resolve
+				(
+				int					flags,
+				int					interfaceIndex,
+				String			*	name,
+				String			*	regtype,
+				String			*	domain,
+				ResolveReply	*	callback
+				);
+
+			/*********************************************************************************************
+			*
+			*  Special Purpose Calls (most applications will not use these)
+			*
+			*********************************************************************************************/
+
+			/* CreateConnection/RegisterRecord
+			*
+			* Register an individual resource record on a connected ServiceRef.
+			*
+			* Note that name conflicts occurring for records registered via this call must be handled
+			* by the client in the callback.
+			*
+			*
+			* RecordReply() parameters:
+			*
+			* sdRef:           The connected ServiceRef initialized by
+			*                  CreateConnection().
+			*
+			* RecordRef:       The RecordRef initialized by RegisterRecord().  If the above
+			*                  ServiceRef.Dispose is called, this RecordRef is
+			*                  invalidated, and may not be used further.
+			*
+			* flags:           Currently unused, reserved for future use.
+			*
+			* errorCode:       Will be NoError on success, otherwise will
+			*                  indicate the failure that occurred (including name conflicts.)
+			*                  Other parameters are undefined if errorCode is nonzero.
+			*
+			*/
+
+			__delegate void
+			RegisterRecordReply
+				(
+				ServiceRef	*	sdRef,
+				ServiceFlags	flags,
+				ErrorCode		errorCode,
+				RecordRef	*	record
+				);
+
+			/* CreateConnection()
+			*
+			* Create a connection to the daemon allowing efficient registration of
+			* multiple individual records.
+			*
+			*
+			* Parameters:
+			*
+			* callback:        The delegate to be called when a result is found, or if the call
+			*                  asynchronously fails (e.g. because of a name conflict.)
+			*
+			* return value:    Returns initialize ServiceRef on success, otherwise throws
+			*                  an exception indicating the specific failure that occurred (in which
+			*                  case the ServiceRef is not initialized).
+			*/
+
+			static public ServiceRef*
+			CreateConnection
+				(
+				RegisterRecordReply * callback
+				);
+
+
+			/* RegisterRecord() Parameters:
+			*
+			* sdRef:           A ServiceRef initialized by CreateConnection().
+			*
+			* RecordRef:       A pointer to an uninitialized RecordRef.  Upon succesfull completion of this
+			*                  call, this ref may be passed to UpdateRecord() or RemoveRecord().
+			*                  (To deregister ALL records registered on a single connected ServiceRef
+			*                  and deallocate each of their corresponding RecordRefs, call
+			*                  ServiceRef.Dispose()).
+			*
+			* flags:           Possible values are Shared or Unique
+			*                  (see flag type definitions for details).
+			*
+			* interfaceIndex:  If non-zero, specifies the interface on which to register the record
+			*                  (the index for a given interface is determined via the if_nametoindex()
+			*                  family of calls.)  Passing 0 causes the record to be registered on all interfaces.
+			*                  Passing -1 causes the record to only be visible on the local host.
+			*
+			* fullname:        The full domain name of the resource record.
+			*
+			* rrtype:          The numerical type of the resource record (e.g. PTR, SRV, etc), as defined
+			*                  in nameser.h.
+			*
+			* rrclass:         The class of the resource record, as defined in nameser.h (usually 1 for the
+			*                  Internet class).
+			*
+			* rdata:           A pointer to the raw rdata, as it is to appear in the DNS record.
+			*
+			* ttl:             The time to live of the resource record, in seconds.
+			*
+			*
+			* return value:    Returns initialize RecordRef on succeses (any subsequent, asynchronous
+			*                  errors are delivered to the callback), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is never invoked and the RecordRef is
+			*                  not initialized.)
+			*/
+			static public RecordRef*
+			RegisterRecord
+				(
+				ServiceRef			*	sdRef,
+				ServiceFlags			flags,
+				int						interfaceIndex,
+				String				*	fullname,
+				int						rrtype,
+				int						rrclass,
+				Byte					rdata[],
+				int						ttl
+				);
+
+
+			/* DNSServiceQueryRecord
+			*
+			* Query for an arbitrary DNS record.
+			*
+			*
+			* QueryRecordReply() Delegate Parameters:
+			*
+			* sdRef:           The ServiceRef initialized by QueryRecord().
+			*
+			* flags:           Possible values are MoreComing and
+			*                  Add.  The Add flag is NOT set for PTR records
+			*                  with a ttl of 0, i.e. "Remove" events.
+			*
+			* interfaceIndex:  The interface on which the query was resolved (the index for a given
+			*                  interface is determined via the if_nametoindex() family of calls).
+			*
+			* errorCode:       Will be kDNSServiceErr_NoError on success, otherwise will
+			*                  indicate the failure that occurred.  Other parameters are undefined if
+			*                  errorCode is nonzero.
+			*
+			* fullname:        The resource record's full domain name.
+			*
+			* rrtype:          The resource record's type (e.g. PTR, SRV, etc) as defined in nameser.h.
+			*
+			* rrclass:         The class of the resource record, as defined in nameser.h (usually 1).
+			*
+			* rdata:           The raw rdata of the resource record.
+			*
+			* ttl:             The resource record's time to live, in seconds.
+			*
+			*/
+
+			__delegate void
+			QueryRecordReply
+				(
+				ServiceRef	*	sdRef,
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				ErrorCode		errorCode,	
+				String		*	fullName,
+				int				rrtype,
+				int				rrclass,
+				Byte			rdata[],
+				int				ttl
+				);
+
+			/* QueryRecord() Parameters:
+			*
+			* flags:           Pass LongLivedQuery to create a "long-lived" unicast
+			*                  query in a non-local domain.  Without setting this flag, unicast queries
+			*                  will be one-shot - that is, only answers available at the time of the call
+			*                  will be returned.  By setting this flag, answers (including Add and Remove
+			*                  events) that become available after the initial call is made will generate
+			*                  callbacks.  This flag has no effect on link-local multicast queries.
+			*
+			* interfaceIndex:  If non-zero, specifies the interface on which to issue the query
+			*                  (the index for a given interface is determined via the if_nametoindex()
+			*                  family of calls.)  Passing 0 causes the name to be queried for on all
+			*                  interfaces.  Passing -1 causes the name to be queried for only on the
+			*                  local host.
+			*
+			* fullname:        The full domain name of the resource record to be queried for.
+			*
+			* rrtype:          The numerical type of the resource record to be queried for (e.g. PTR, SRV, etc)
+			*                  as defined in nameser.h.
+			*
+			* rrclass:         The class of the resource record, as defined in nameser.h
+			*                  (usually 1 for the Internet class).
+			*
+			* callback:        The delegate to be called when a result is found, or if the call
+			*                  asynchronously fails.
+			*
+			*
+			* return value:    Returns initialized ServiceRef on succeses (any subsequent, asynchronous
+			*                  errors are delivered to the callback), otherwise throws an exception indicating
+			*                  the error that occurred (the callback is never invoked and the ServiceRef
+			*                  is not initialized.)
+			*/
+
+			static public ServiceRef*
+			QueryRecord
+				(
+				ServiceFlags			flags,
+				int						interfaceIndex,
+				String				*	fullname,
+				int						rrtype,
+				int						rrclass,
+				QueryRecordReply	*	callback
+				);
+
+			/* ReconfirmRecord
+			*
+			* Instruct the daemon to verify the validity of a resource record that appears to
+			* be out of date (e.g. because tcp connection to a service's target failed.)
+			* Causes the record to be flushed from the daemon's cache (as well as all other
+			* daemons' caches on the network) if the record is determined to be invalid.
+			*
+			* Parameters:
+			*
+			* flags:           Currently unused, reserved for future use.
+			*
+			* fullname:        The resource record's full domain name.
+			*
+			* rrtype:          The resource record's type (e.g. PTR, SRV, etc) as defined in nameser.h.
+			*
+			* rrclass:         The class of the resource record, as defined in nameser.h (usually 1).
+			*
+			* rdata:           The raw rdata of the resource record.
+			*
+			*/
+			static public void
+			ReconfirmRecord
+				(
+				ServiceFlags	flags,
+				int				interfaceIndex,
+				String		*	fullname,
+				int				rrtype,
+				int				rrclass,
+				Byte			rdata[]
+				);
+		};
+	}
+}
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.ico b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.ico
new file mode 100755
index 00000000..3a5525fd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.ico
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.rc b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.rc
new file mode 100755
index 00000000..95df1cf0
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.rc
@@ -0,0 +1,113 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "WinVersRes.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+1                       ICON                    "dnssd_NET.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+    "\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "Bonjour.NET Client Library"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "dnssd.NET.dll"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "dnssd.NET.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.vcproj b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.vcproj
new file mode 100755
index 00000000..98cc63b5
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/dnssd_NET.vcproj
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="DLL.NET"

+	ProjectGUID="{2A2FFA97-AF60-494F-9384-BBAA283AA3F2}"

+	RootNamespace="DLL2NET"

+	Keyword="ManagedCProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			ManagedExtensions="4"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				Description="Generating keypair..."

+				CommandLine="sn -k dnssd_NET.snk"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;WIN32_LEAN_AND_MEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="2"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="../DLL/$(OutDir)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)\dnssd.NET.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				AssemblyDebug="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				EmbedManifest="false"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			ManagedExtensions="4"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				Description="Generating keypair..."

+				CommandLine="sn -k dnssd_NET.snk"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;WIN32_LEAN_AND_MEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="2"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="../DLL/$(OutDir)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)\dnssd.NET.dll"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				AssemblyDebug="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				EmbedManifest="false"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			ManagedExtensions="4"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				Description="Generating keypair..."

+				CommandLine="sn -k dnssd_NET.snk"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;WIN32_LEAN_AND_MEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="../DLL/$(OutDir)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)\dnssd.NET.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				EmbedManifest="false"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			ManagedExtensions="4"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				Description="Generating keypair..."

+				CommandLine="sn -k dnssd_NET.snk"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;WIN32_LEAN_AND_MEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="../DLL/$(OutDir)/dnssd.lib ws2_32.lib"

+				OutputFile="$(OutDir)\dnssd.NET.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				EmbedManifest="false"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+		<AssemblyReference

+			RelativePath="System.dll"

+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"

+		/>

+		<AssemblyReference

+			RelativePath="System.Data.dll"

+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"

+		/>

+		<AssemblyReference

+			RelativePath="System.XML.dll"

+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"

+		/>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\AssemblyInfo.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\dnssd_NET.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\dnssd_NET.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Stdafx.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\dnssd_NET.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\dnssd_NET.rc"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath=".\ReadMe.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/DLL.NET/resource.h b/mDNSResponder/mDNSWindows/DLL.NET/resource.h
new file mode 100755
index 00000000..9a14836a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL.NET/resource.h
@@ -0,0 +1,3 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dnssd_NET.rc
diff --git a/mDNSResponder/mDNSWindows/DLL/dll.aps b/mDNSResponder/mDNSWindows/DLL/dll.aps
new file mode 100644
index 00000000..31b4787e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dll.aps
diff --git a/mDNSResponder/mDNSWindows/DLL/dll.rc b/mDNSResponder/mDNSWindows/DLL/dll.rc
new file mode 100644
index 00000000..e76fb304
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dll.rc
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "WinVersRes.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""WinVersRes.h""\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "Bonjour Client Library"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "dnssd.dll"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "dnssd.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/DLL/dllmain.c b/mDNSResponder/mDNSWindows/DLL/dllmain.c
new file mode 100644
index 00000000..295e2ede
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dllmain.c
@@ -0,0 +1,113 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <windows.h>
+#include <DebugServices.h>
+#include <stdlib.h>
+
+BOOL APIENTRY	DllMain( HANDLE inModule, DWORD inReason, LPVOID inReserved )
+{
+	(void) inModule;
+	(void) inReserved;
+	
+	switch( inReason )
+	{
+		case DLL_PROCESS_ATTACH:
+		case DLL_THREAD_ATTACH:
+		case DLL_THREAD_DETACH:
+		case DLL_PROCESS_DETACH:
+			break;
+	}
+    return( TRUE );
+}
+
+
+BOOL
+IsSystemServiceDisabled()
+{
+	ENUM_SERVICE_STATUS	*	lpService = NULL;
+	SC_HANDLE					sc;
+	BOOL							ret = FALSE;
+	BOOL							ok;
+	DWORD							bytesNeeded = 0;
+	DWORD							srvCount;
+	DWORD							resumeHandle = 0;
+	DWORD							srvType;
+	DWORD							srvState;
+	DWORD							dwBytes = 0;
+	DWORD							i;
+	OSStatus						err;
+
+	sc = OpenSCManager( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE );
+	err = translate_errno( sc, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	srvType		=	SERVICE_WIN32;
+	srvState		=	SERVICE_STATE_ALL;
+
+	for ( ;; )
+	{
+		// Call EnumServicesStatus using the handle returned by OpenSCManager
+
+		ok = EnumServicesStatus ( sc, srvType, srvState, lpService, dwBytes, &bytesNeeded, &srvCount, &resumeHandle );
+
+		if ( ok || ( GetLastError() != ERROR_MORE_DATA ) )
+		{
+			break;
+		}
+
+		if ( lpService )
+		{
+			free( lpService );
+		}
+
+		dwBytes = bytesNeeded;
+
+		lpService = ( ENUM_SERVICE_STATUS* ) malloc( dwBytes );
+		require_action( lpService, exit, ret = FALSE );
+	}
+
+	err = translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	for ( i = 0; i < srvCount; i++ )
+	{
+		if ( strcmp( lpService[i].lpServiceName, "Bonjour Service" ) == 0 )
+		{
+			if ( ( lpService[i].ServiceStatus.dwCurrentState == SERVICE_PAUSED ) || ( lpService[i].ServiceStatus.dwCurrentState == SERVICE_STOPPED ) )
+			{
+				ret = TRUE;
+			}
+
+			break;
+		}
+	}
+
+exit:
+
+	if ( lpService )
+	{
+		free( lpService );
+	}
+
+	if ( sc )
+	{
+		CloseServiceHandle ( sc );
+	}
+
+	return ret;
+}
diff --git a/mDNSResponder/mDNSWindows/DLL/dnssd.def b/mDNSResponder/mDNSWindows/DLL/dnssd.def
new file mode 100644
index 00000000..160510b4
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dnssd.def
@@ -0,0 +1,48 @@
+; -*- tab-width: 4 -*-
+;
+; Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+LIBRARY		dnssd
+
+EXPORTS
+	DNSServiceRefSockFD
+	DNSServiceProcessResult
+	DNSServiceRefDeallocate
+	DNSServiceEnumerateDomains
+	DNSServiceRegister
+	DNSServiceAddRecord
+	DNSServiceUpdateRecord
+	DNSServiceRemoveRecord
+	DNSServiceBrowse
+	DNSServiceResolve
+	DNSServiceConstructFullName
+	DNSServiceCreateConnection
+	DNSServiceRegisterRecord
+	DNSServiceQueryRecord
+	DNSServiceReconfirmRecord
+	DNSServiceNATPortMappingCreate
+	DNSServiceGetAddrInfo
+	DNSServiceGetProperty
+	TXTRecordCreate
+	TXTRecordDeallocate
+	TXTRecordSetValue
+	TXTRecordRemoveValue
+	TXTRecordContainsKey
+	TXTRecordGetCount
+	TXTRecordGetLength
+	TXTRecordGetBytesPtr
+	TXTRecordGetValuePtr
+	TXTRecordGetItemAtIndex
diff --git a/mDNSResponder/mDNSWindows/DLL/dnssd.vcproj b/mDNSResponder/mDNSWindows/DLL/dnssd.vcproj
new file mode 100644
index 00000000..814a322e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dnssd.vcproj
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="DLL"

+	ProjectGUID="{AB581101-18F0-46F6-B56A-83A6B1EA657E}"

+	RootNamespace="DLL"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../mDNSCore;../../mDNSShared;../"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEBUG=1;NOT_HAVE_SA_LEN;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.dll.pdb"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+				DisableSpecificWarnings="4127;4204"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/dnssd.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile="dnssd.def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\dnssd.dll.pdb"

+				SubSystem="2"

+				BaseAddress="0x16000000"

+				ImportLibrary="$(OutDir)\dnssd.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../mDNSCore;../../mDNSShared;../"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEBUG=1;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.dll.pdb"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+				DisableSpecificWarnings="4127;4204"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/dnssd.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile="dnssd.def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\dnssd.dll.pdb"

+				SubSystem="2"

+				BaseAddress="0x16000000"

+				ImportLibrary="$(OutDir)\dnssd.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSCore;../../mDNSShared;../"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.dll.pdb"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+				DisableSpecificWarnings="4127;4204"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/dnssd.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile="dnssd.def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\dnssd.dll.pdb"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				BaseAddress="0x16000000"

+				ImportLibrary="$(OutDir)\dnssd.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;                     mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib&quot;                                     mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;     mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\include&quot;                            mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\include&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal&quot;                                                                   mkdir &quot;$(DSTROOT)\AppleInternal&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin&quot;                                                           mkdir &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;                           mkdir &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                           &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(OutDir)\dnssd.dll.pdb&quot;                                                                          &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(ProjectDir)..\..\mDNSShared\dns_sd.h&quot;                                             &quot;$(DSTROOT)\Program Files\Bonjour SDK\include&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../mDNSCore;../../mDNSShared;../"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.dll.pdb"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				CompileAs="0"

+				DisableSpecificWarnings="4127;4204"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/dnssd.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile="dnssd.def"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\dnssd.dll.pdb"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				BaseAddress="0x16000000"

+				ImportLibrary="$(OutDir)\dnssd.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;                     mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib&quot;                                     mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;     mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\include&quot;                            mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\include&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal&quot;                                                                   mkdir &quot;$(DSTROOT)\AppleInternal&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin&quot;                                                           mkdir &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;                           mkdir &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                                           &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(OutDir)\dnssd.dll.pdb&quot;                                                                         &quot;$(DSTROOT)\AppleInternal\bin\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath=".\dllmain.c"

+				>

+			</File>

+			<File

+				RelativePath=".\dnssd.def"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_clientlib.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_clientstub.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dns_sd.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\dll.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj b/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj
new file mode 100755
index 00000000..7438a3a8
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>DLL</ProjectName>

+    <ProjectGuid>{AB581101-18F0-46F6-B56A-83A6B1EA657E}</ProjectGuid>

+    <RootNamespace>DLL</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dnssd</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dnssd</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">dnssd</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dnssd</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSCore;../../mDNSShared;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DEBUG=1;NOT_HAVE_SA_LEN;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.dll.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4127;4204;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssd.dll</OutputFile>

+      <ModuleDefinitionFile>dnssd.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dnssd.dll.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <BaseAddress>0x16000000</BaseAddress>

+      <ImportLibrary>$(OutDir)dnssd.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../mDNSCore;../../mDNSShared;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DEBUG=1;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.dll.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4127;4204;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssd.dll</OutputFile>

+      <ModuleDefinitionFile>dnssd.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dnssd.dll.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <BaseAddress>0x16000000</BaseAddress>

+      <ImportLibrary>$(OutDir)dnssd.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../mDNSCore;../../mDNSShared;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.dll.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4127;4204;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssd.dll</OutputFile>

+      <ModuleDefinitionFile>dnssd.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dnssd.dll.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x16000000</BaseAddress>

+      <ImportLibrary>$(OutDir)dnssd.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"                     mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib"                                     mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"     mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\include"                            mkdir "$(DSTROOT)\Program Files\Bonjour SDK\include"

+if not exist "$(DSTROOT)\AppleInternal"                                                                   mkdir "$(DSTROOT)\AppleInternal"

+if not exist "$(DSTROOT)\AppleInternal\bin"                                                           mkdir "$(DSTROOT)\AppleInternal\bin"

+if not exist "$(DSTROOT)\AppleInternal\bin\$(Platform)"                           mkdir "$(DSTROOT)\AppleInternal\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                                           "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+xcopy /I/Y "$(OutDir)dnssd.dll.pdb"                                                                          "$(DSTROOT)\AppleInternal\bin\$(Platform)"

+xcopy /I/Y "$(ProjectDir)..\..\mDNSShared\dns_sd.h"                                             "$(DSTROOT)\Program Files\Bonjour SDK\include"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>../../mDNSCore;../../mDNSShared;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_DEBUGMSGS=0;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;NOT_HAVE_SA_LEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.dll.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4127;4204;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssd.dll</OutputFile>

+      <ModuleDefinitionFile>dnssd.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dnssd.dll.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x16000000</BaseAddress>

+      <ImportLibrary>$(OutDir)dnssd.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"                     mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib"                                     mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"     mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\include"                            mkdir "$(DSTROOT)\Program Files\Bonjour SDK\include"

+if not exist "$(DSTROOT)\AppleInternal"                                                                   mkdir "$(DSTROOT)\AppleInternal"

+if not exist "$(DSTROOT)\AppleInternal\bin"                                                           mkdir "$(DSTROOT)\AppleInternal\bin"

+if not exist "$(DSTROOT)\AppleInternal\bin\$(Platform)"                           mkdir "$(DSTROOT)\AppleInternal\bin\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                                           "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+xcopy /I/Y "$(OutDir)dnssd.dll.pdb"                                                                         "$(DSTROOT)\AppleInternal\bin\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="dllmain.c" />

+    <ClCompile Include="..\..\mDNSShared\dnssd_clientlib.c" />

+    <ClCompile Include="..\..\mDNSShared\dnssd_clientstub.c" />

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c" />

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="dnssd.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h" />

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h" />

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h" />

+    <ClInclude Include="resource.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="dll.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj.filters b/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj.filters
new file mode 100755
index 00000000..3920fd65
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/dnssd.vcxproj.filters
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="dllmain.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\dnssd_clientlib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\dnssd_clientstub.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="dnssd.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dns_sd.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="dll.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLL/resource.h b/mDNSResponder/mDNSWindows/DLL/resource.h
new file mode 100644
index 00000000..bdea251f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLL/resource.h
@@ -0,0 +1,27 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dll.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_WMDMLOGGER                  101
+#define IDS_LOG_SEV_INFO                201
+#define IDS_LOG_SEV_WARN                202
+#define IDS_LOG_SEV_ERROR               203
+#define IDS_LOG_DATETIME                204
+#define IDS_LOG_SRCNAME                 205
+#define IDS_DEF_LOGFILE                 301
+#define IDS_DEF_MAXSIZE                 302
+#define IDS_DEF_SHRINKTOSIZE            303
+#define IDS_DEF_LOGENABLED              304
+#define IDS_MUTEX_TIMEOUT               401
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/DLLStub/DLLStub.cpp b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.cpp
new file mode 100755
index 00000000..503465f2
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.cpp
@@ -0,0 +1,693 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "DLLStub.h"
+
+static int		g_defaultErrorCode = kDNSServiceErr_ServiceNotRunning;
+static DLLStub	g_glueLayer;
+
+
+// ------------------------------------------
+// DLLStub implementation
+// ------------------------------------------
+DLLStub * DLLStub::m_instance;
+
+DLLStub::DLLStub()
+:
+	m_library( LoadLibrary( TEXT( "dnssd.dll" ) ) )
+{
+	m_instance = this;
+}
+
+
+DLLStub::~DLLStub()
+{
+	if ( m_library != NULL )
+	{
+		FreeLibrary( m_library );
+		m_library = NULL;
+	}
+
+	m_instance = NULL;
+}
+
+
+bool
+DLLStub::GetProcAddress( FARPROC * func, LPCSTR lpProcName )
+{ 
+	if ( m_instance && m_instance->m_library )
+	{
+		// Only call ::GetProcAddress if *func is NULL. This allows
+		// the calling code to cache the funcptr value, and we get
+		// some performance benefit.
+
+		if ( *func == NULL )
+		{
+			*func = ::GetProcAddress( m_instance->m_library, lpProcName );
+		}
+	}
+	else
+	{
+		*func = NULL;
+	}
+
+	return ( *func != NULL );
+}
+
+
+int DNSSD_API
+DNSServiceRefSockFD(DNSServiceRef sdRef)
+{
+	typedef int (DNSSD_API * Func)(DNSServiceRef sdRef);
+	static Func func = NULL;
+	int ret = -1;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceProcessResult(DNSServiceRef sdRef)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef sdRef);
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef );
+	}
+	
+	return ret;
+}
+
+
+void DNSSD_API
+DNSServiceRefDeallocate(DNSServiceRef sdRef)
+{
+	typedef void (DNSSD_API * Func)(DNSServiceRef sdRef);
+	static Func func = NULL;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		func( sdRef );
+	}
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceEnumerateDomains
+		(
+		DNSServiceRef                       *sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		DNSServiceDomainEnumReply           callBack,
+		void                                *context
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, DNSServiceDomainEnumReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceRegister
+		(
+		DNSServiceRef                       *sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		const char                          *name,
+		const char                          *regtype,
+		const char                          *domain,
+		const char                          *host,
+		uint16_t                            port,
+		uint16_t                            txtLen,
+		const void                          *txtRecord,
+		DNSServiceRegisterReply             callBack,
+		void                                *context
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, const char*, const char*, const char*, const char*, uint16_t, uint16_t, const void*, DNSServiceRegisterReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceAddRecord
+		(
+		DNSServiceRef                       sdRef,
+		DNSRecordRef                        *RecordRef,
+		DNSServiceFlags                     flags,
+		uint16_t                            rrtype,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef, DNSRecordRef*, DNSServiceFlags, uint16_t, uint16_t, const void*, uint32_t );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceUpdateRecord
+		(
+		DNSServiceRef                       sdRef,
+		DNSRecordRef                        RecordRef,     /* may be NULL */
+		DNSServiceFlags                     flags,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef, DNSRecordRef, DNSServiceFlags, uint16_t, const void*, uint32_t );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, RecordRef, flags, rdlen, rdata, ttl );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceRemoveRecord
+		(
+		DNSServiceRef                 sdRef,
+		DNSRecordRef                  RecordRef,
+		DNSServiceFlags               flags
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef, DNSRecordRef, DNSServiceFlags );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, RecordRef, flags );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceBrowse
+		(
+		DNSServiceRef                       *sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		const char                          *regtype,
+		const char                          *domain,    /* may be NULL */
+		DNSServiceBrowseReply               callBack,
+		void                                *context    /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, const char*, const char*, DNSServiceBrowseReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, regtype, domain, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceResolve
+		(
+		DNSServiceRef                       *sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		const char                          *name,
+		const char                          *regtype,
+		const char                          *domain,
+		DNSServiceResolveReply              callBack,
+		void                                *context  /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, const char*, const char*, const char*, DNSServiceResolveReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceConstructFullName
+		(
+		char                            *fullName,
+		const char                      *service,      /* may be NULL */
+		const char                      *regtype,
+		const char                      *domain
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( char*, const char*, const char*, const char* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( fullName, service, regtype, domain );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceCreateConnection(DNSServiceRef *sdRef)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( DNSServiceRef* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceRegisterRecord
+		(
+		DNSServiceRef                       sdRef,
+		DNSRecordRef                        *RecordRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		const char                          *fullname,
+		uint16_t                            rrtype,
+		uint16_t                            rrclass,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl,
+		DNSServiceRegisterRecordReply       callBack,
+		void                                *context    /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef, DNSRecordRef*, DNSServiceFlags, uint32_t, const char*, uint16_t, uint16_t, uint16_t, const void*, uint16_t, DNSServiceRegisterRecordReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, RecordRef, flags, interfaceIndex, fullname, rrtype, rrclass, rdlen, rdata, ttl, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceQueryRecord
+		(
+		DNSServiceRef                       *sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		const char                          *fullname,
+		uint16_t                            rrtype,
+		uint16_t                            rrclass,
+		DNSServiceQueryRecordReply          callBack,
+		void                                *context  /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, const char*, uint16_t, uint16_t, DNSServiceQueryRecordReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceReconfirmRecord
+		(
+		DNSServiceFlags                    flags,
+		uint32_t                           interfaceIndex,
+		const char                         *fullname,
+		uint16_t                           rrtype,
+		uint16_t                           rrclass,
+		uint16_t                           rdlen,
+		const void                         *rdata
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( DNSServiceFlags, uint32_t, const char*, uint16_t, uint16_t, uint16_t, const void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( flags, interfaceIndex, fullname, rrtype, rrclass, rdlen, rdata );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceNATPortMappingCreate
+		(
+		DNSServiceRef                    *sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         interfaceIndex,
+		DNSServiceProtocol               protocol,          /* TCP and/or UDP          */
+		uint16_t                         internalPort,      /* network byte order      */
+		uint16_t                         externalPort,      /* network byte order      */
+		uint32_t                         ttl,               /* time to live in seconds */
+		DNSServiceNATPortMappingReply    callBack,
+		void                             *context           /* may be NULL             */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, DNSServiceProtocol, uint16_t, uint16_t, uint16_t, DNSServiceNATPortMappingReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, protocol, internalPort, externalPort, ttl, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceGetAddrInfo
+		(
+		DNSServiceRef                    *sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         interfaceIndex,
+		DNSServiceProtocol               protocol,
+		const char                       *hostname,
+		DNSServiceGetAddrInfoReply       callBack,
+		void                             *context          /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)(DNSServiceRef*, DNSServiceFlags, uint32_t, DNSServiceProtocol, const char*, DNSServiceGetAddrInfoReply, void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( sdRef, flags, interfaceIndex, protocol, hostname, callBack, context );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+DNSServiceGetProperty
+		(
+		const char *property,  /* Requested property (i.e. kDNSServiceProperty_DaemonVersion) */
+		void       *result,    /* Pointer to place to store result */
+		uint32_t   *size       /* size of result location */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( const char*, void*, uint32_t* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( property, result, size );
+	}
+	
+	return ret;
+}
+
+
+void DNSSD_API
+TXTRecordCreate
+		(
+		TXTRecordRef     *txtRecord,
+		uint16_t         bufferLen,
+		void             *buffer
+		)
+{
+	typedef void (DNSSD_API * Func)( TXTRecordRef*, uint16_t, void* );
+	static Func func = NULL;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		func( txtRecord, bufferLen, buffer );
+	}
+}
+
+
+void DNSSD_API
+TXTRecordDeallocate
+		(
+		TXTRecordRef     *txtRecord
+		)
+{
+	typedef void (DNSSD_API * Func)( TXTRecordRef* );
+	static Func func = NULL;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		func( txtRecord );
+	}
+}
+
+
+DNSServiceErrorType DNSSD_API
+TXTRecordSetValue
+		(
+		TXTRecordRef     *txtRecord,
+		const char       *key,
+		uint8_t          valueSize,        /* may be zero */
+		const void       *value            /* may be NULL */
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( TXTRecordRef*, const char*, uint8_t, const void* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtRecord, key, valueSize, value );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+TXTRecordRemoveValue
+		(
+		TXTRecordRef     *txtRecord,
+		const char       *key
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( TXTRecordRef*, const char* );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtRecord, key );
+	}
+	
+	return ret;
+}
+
+
+int DNSSD_API
+TXTRecordContainsKey
+		(
+		uint16_t         txtLen,
+		const void       *txtRecord,
+		const char       *key
+		)
+{
+	typedef int (DNSSD_API * Func)( uint16_t, const void*, const char* );
+	static Func func = NULL;
+	int ret = 0;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtLen, txtRecord, key );
+	}
+	
+	return ret;
+}
+
+
+uint16_t DNSSD_API
+TXTRecordGetCount
+		(
+		uint16_t         txtLen,
+		const void       *txtRecord
+		)
+{
+	typedef uint16_t (DNSSD_API * Func)( uint16_t, const void* );
+	static Func func = NULL;
+	uint16_t ret = 0;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtLen, txtRecord );
+	}
+	
+	return ret;
+}
+
+
+uint16_t DNSSD_API
+TXTRecordGetLength
+		(
+		const TXTRecordRef *txtRecord
+		)
+{
+	typedef uint16_t (DNSSD_API * Func)( const TXTRecordRef* );
+	static Func func = NULL;
+	uint16_t ret = 0;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtRecord );
+	}
+	
+	return ret;
+}
+
+
+const void * DNSSD_API
+TXTRecordGetBytesPtr
+		(
+		const TXTRecordRef *txtRecord
+		)
+{
+	typedef const void* (DNSSD_API * Func)( const TXTRecordRef* );
+	static Func func = NULL;
+	const void* ret = NULL;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtRecord );
+	}
+	
+	return ret;
+}
+
+
+const void * DNSSD_API
+TXTRecordGetValuePtr
+		(
+		uint16_t         txtLen,
+		const void       *txtRecord,
+		const char       *key,
+		uint8_t          *valueLen
+		)
+{
+	typedef const void* (DNSSD_API * Func)( uint16_t, const void*, const char*, uint8_t* );
+	static Func func = NULL;
+	const void* ret = NULL;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtLen, txtRecord, key, valueLen );
+	}
+	
+	return ret;
+}
+
+
+DNSServiceErrorType DNSSD_API
+TXTRecordGetItemAtIndex
+		(
+		uint16_t         txtLen,
+		const void       *txtRecord,
+		uint16_t         itemIndex,
+		uint16_t         keyBufLen,
+		char             *key,
+		uint8_t          *valueLen,
+		const void       **value
+		)
+{
+	typedef DNSServiceErrorType (DNSSD_API * Func)( uint16_t, const void*, uint16_t, uint16_t, char*, uint8_t*, const void** );
+	static Func func = NULL;
+	DNSServiceErrorType ret = g_defaultErrorCode;
+
+	if ( DLLStub::GetProcAddress( ( FARPROC* ) &func, __FUNCTION__ ) )
+	{
+		ret = func( txtLen, txtRecord, itemIndex, keyBufLen, key, valueLen, value );
+	}
+	
+	return ret;
+}
diff --git a/mDNSResponder/mDNSWindows/DLLStub/DLLStub.h b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.h
new file mode 100755
index 00000000..44f57d17
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009, Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of its
+ *     contributors may be used to endorse or promote products derived from this
+ *     software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DLLStub_h
+#define _DLLStub_h
+
+#include <windows.h>
+#include <dns_sd.h>
+
+class DLLStub
+{
+public:
+
+	DLLStub();
+	~DLLStub();
+
+	static bool
+	GetProcAddress( FARPROC * func, LPCSTR lpProcName );
+
+private:
+
+	static DLLStub	*	m_instance;
+	HMODULE				m_library;
+};
+
+
+#endif
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcproj b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcproj
new file mode 100755
index 00000000..dc682892
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcproj
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="DLLStub"

+	ProjectGUID="{3A2B6325-3053-4236-84BD-AA9BE2E323E5}"

+	RootNamespace="DLLStub"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			UseOfATL="0"

+			CharacterSet="1"

+			WholeProgramOptimization="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="false"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.pdb"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)\dnssdStatic.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			UseOfATL="0"

+			CharacterSet="1"

+			WholeProgramOptimization="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="false"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.pdb"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)\dnssdStatic.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			UseOfATL="0"

+			CharacterSet="1"

+			WholeProgramOptimization="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.lib.pdb"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)\dnssdStatic.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;echo F | xcopy /Y &quot;$(OutDir)\dnssdStatic.lib&quot;                                                        &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)\dnssd.lib&quot;&#x0D;&#x0A;xcopy /Y &quot;$(OutDir)\dnssd.lib.pdb&quot;                                                                         &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			UseOfATL="0"

+			CharacterSet="1"

+			WholeProgramOptimization="0"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				ProgramDataBaseFileName="$(IntDir)\dnssd.lib.pdb"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)\dnssdStatic.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot; mkdir &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;echo F | xcopy /I/Y &quot;$(OutDir)\dnssdStatic.lib&quot;                                                     &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)\dnssd.lib&quot;&#x0D;&#x0A;xcopy /Y &quot;$(OutDir)\dnssd.lib.pdb&quot;                                                                         &quot;$(DSTROOT)\Program Files\Bonjour SDK\lib\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\DLLStub.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\DLLStub.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+		<File

+			RelativePath=".\ReadMe.txt"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj
new file mode 100755
index 00000000..292d931f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{3A2B6325-3053-4236-84BD-AA9BE2E323E5}</ProjectGuid>

+    <RootNamespace>DLLStub</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dnssdStatic</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dnssdStatic</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">dnssdStatic</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dnssdStatic</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Lib>

+      <OutputFile>$(OutDir)dnssdStatic.lib</OutputFile>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Lib>

+      <OutputFile>$(OutDir)dnssdStatic.lib</OutputFile>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.lib.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Lib>

+      <OutputFile>$(OutDir)dnssdStatic.lib</OutputFile>

+    </Lib>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+echo F | xcopy /Y "$(OutDir)dnssdStatic.lib"                                                        "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)\dnssd.lib"

+xcopy /Y "$(OutDir)dnssd.lib.pdb"                                                                         "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <ProgramDataBaseFileName>$(IntDir)dnssd.lib.pdb</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Lib>

+      <OutputFile>$(OutDir)dnssdStatic.lib</OutputFile>

+    </Lib>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)" mkdir "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+echo F | xcopy /I/Y "$(OutDir)dnssdStatic.lib"                                                     "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)\dnssd.lib"

+xcopy /Y "$(OutDir)dnssd.lib.pdb"                                                                         "$(DSTROOT)\Program Files\Bonjour SDK\lib\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="DLLStub.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="DLLStub.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj.filters b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj.filters
new file mode 100755
index 00000000..8b6d8334
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLStub/DLLStub.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="DLLStub.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="DLLStub.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="ReadMe.txt" />

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.cpp b/mDNSResponder/mDNSWindows/DLLX/DLLX.cpp
new file mode 100755
index 00000000..77883ccd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.cpp
@@ -0,0 +1,208 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+#include "stdafx.h"
+
+#include "resource.h"
+
+#include "DLLX.h"
+
+#include "dlldatax.h"
+
+#include <DebugServices.h>
+
+
+
+
+
+class CDLLComponentModule : public CAtlDllModuleT< CDLLComponentModule >
+
+{
+
+public :
+
+	DECLARE_LIBID(LIBID_Bonjour)
+
+	DECLARE_REGISTRY_APPID_RESOURCEID(IDR_DLLX, "{56608F9C-223B-4CB6-813D-85EDCCADFB4B}")
+
+};
+
+
+
+CDLLComponentModule _AtlModule;
+
+
+
+
+
+#ifdef _MANAGED
+
+#pragma managed(push, off)
+
+#endif
+
+
+
+// DLL Entry Point
+
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+
+{
+
+	debug_initialize( kDebugOutputTypeWindowsDebugger );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelVerbose );
+
+
+
+#ifdef _MERGE_PROXYSTUB
+
+    if (!PrxDllMain(hInstance, dwReason, lpReserved))
+
+        return FALSE;
+
+#endif
+
+	hInstance;
+
+    return _AtlModule.DllMain(dwReason, lpReserved); 
+
+}
+
+
+
+#ifdef _MANAGED
+
+#pragma managed(pop)
+
+#endif
+
+
+
+
+
+
+
+
+
+// Used to determine whether the DLL can be unloaded by OLE
+
+STDAPI DllCanUnloadNow(void)
+
+{
+
+#ifdef _MERGE_PROXYSTUB
+
+    HRESULT hr = PrxDllCanUnloadNow();
+
+    if (hr != S_OK)
+
+        return hr;
+
+#endif
+
+    return _AtlModule.DllCanUnloadNow();
+
+}
+
+
+
+
+
+// Returns a class factory to create an object of the requested type
+
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+
+{
+
+#ifdef _MERGE_PROXYSTUB
+
+    if (PrxDllGetClassObject(rclsid, riid, ppv) == S_OK)
+
+        return S_OK;
+
+#endif
+
+    return _AtlModule.DllGetClassObject(rclsid, riid, ppv);
+
+}
+
+
+
+
+
+// DllRegisterServer - Adds entries to the system registry
+
+STDAPI DllRegisterServer(void)
+
+{
+
+    // registers object, typelib and all interfaces in typelib
+
+    HRESULT hr = _AtlModule.DllRegisterServer();
+
+#ifdef _MERGE_PROXYSTUB
+
+    if (FAILED(hr))
+
+        return hr;
+
+    hr = PrxDllRegisterServer();
+
+#endif
+
+	return hr;
+
+}
+
+
+
+
+
+// DllUnregisterServer - Removes entries from the system registry
+
+STDAPI DllUnregisterServer(void)
+
+{
+
+	HRESULT hr = _AtlModule.DllUnregisterServer();
+
+#ifdef _MERGE_PROXYSTUB
+
+    if (FAILED(hr))
+
+        return hr;
+
+    hr = PrxDllRegisterServer();
+
+    if (FAILED(hr))
+
+        return hr;
+
+    hr = PrxDllUnregisterServer();
+
+#endif
+
+	return hr;
+
+}
+
+
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.def b/mDNSResponder/mDNSWindows/DLLX/DLLX.def
new file mode 100755
index 00000000..698b1722
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.def
@@ -0,0 +1,35 @@
+; -*- Mode: C; tab-width: 4 -*-
+;
+; Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+
+
+
+
+LIBRARY      "dnssdX.DLL"
+
+
+
+EXPORTS
+
+	DllCanUnloadNow		PRIVATE
+
+	DllGetClassObject	PRIVATE
+
+	DllRegisterServer	PRIVATE
+
+	DllUnregisterServer	PRIVATE
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.idl b/mDNSResponder/mDNSWindows/DLLX/DLLX.idl
new file mode 100755
index 00000000..e44865b8
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.idl
@@ -0,0 +1,491 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+// This file will be processed by the MIDL tool to
+
+// produce the type library (DLLComponent.tlb) and marshalling code.
+
+
+
+typedef [ uuid(4085DD59-D0E1-4efe-B6EE-DDBF7631B9C0) ]
+
+enum DNSSDFlags
+
+{
+
+	kDNSSDFlagsMoreComing			= 0x0001,
+
+	kDNSSDFlagsDefault				= 0x0004,
+
+	kDNSSDFlagsNoAutoRename			= 0x0008,
+
+	kDNSSDFlagsShared				= 0x0010,
+
+	kDNSSDFlagsUnique				= 0x0020,
+
+	kDNSSDFlagsBrowseDomains		= 0x0040,
+
+	kDNSSDFlagsRegistrationDomains	= 0x0080,
+
+	kDNSSDFlagsLongLivedQuery		= 0x0100,
+
+	kDNSSDFlagsAllowRemoteQuery		= 0x0200,
+
+	kDNSSDFlagsForceMulticast		= 0x0400,
+
+	kDNSSDFlagsForce				= 0x0800,
+
+	kDNSSDFlagsReturnIntermediates	= 0x1000,
+
+	kDNSSDFlagsNonBrowsable			= 0x2000
+
+} DNSSDFlags;
+
+
+
+
+
+typedef [ uuid(30CDF335-CA52-4b17-AFF2-E83C64C450D4) ]
+
+enum DNSSDAddressFamily
+
+{
+
+	kDNSSDAddressFamily_IPv4 = 0x1,
+
+	kDNSSDAddressFamily_IPv6 = 0x2
+
+} DNSSDAddressFamily;
+
+
+
+
+
+typedef [ uuid(98FB4702-7374-4b16-A8DB-AD35BFB8364D) ]
+
+enum DNSSDProtocol
+
+{
+
+	kDNSSDProtocol_UDP	= 0x10,
+
+	kDNSSDProtocol_TCP	= 0x20
+
+} DNSSDProtocol;
+
+
+
+
+
+typedef [ uuid(72BF3EC3-19BC-47e5-8D95-3B73FF37D893) ]
+
+enum DNSSDRRClass
+
+{
+
+	kDNSSDClass_IN = 1
+
+} DNSSDRRClass;
+
+
+
+
+
+typedef [ uuid(08E362DF-5468-4c9a-AC66-FD4747B917BD) ]
+
+enum DNSSDRRType
+
+{
+
+	kDNSSDType_A         = 1,
+    kDNSSDType_NS        = 2,
+    kDNSSDType_MD        = 3,
+    kDNSSDType_MF        = 4,
+    kDNSSDType_CNAME     = 5,
+    kDNSSDType_SOA       = 6,
+    kDNSSDType_MB        = 7,
+    kDNSSDType_MG        = 8,
+    kDNSSDType_MR        = 9,
+    kDNSSDType_NULL      = 10,
+    kDNSSDType_WKS       = 11,
+    kDNSSDType_PTR       = 12,
+    kDNSSDType_HINFO     = 13,
+    kDNSSDType_MINFO     = 14,
+    kDNSSDType_MX        = 15,
+    kDNSSDType_TXT       = 16,
+    kDNSSDType_RP        = 17,
+    kDNSSDType_AFSDB     = 18,
+    kDNSSDType_X25       = 19,
+    kDNSSDType_ISDN      = 20,
+    kDNSSDType_RT        = 21,
+    kDNSSDType_NSAP      = 22,
+    kDNSSDType_NSAP_PTR  = 23,
+    kDNSSDType_SIG       = 24,
+    kDNSSDType_KEY       = 25,
+    kDNSSDType_PX        = 26,
+    kDNSSDType_GPOS      = 27,
+    kDNSSDType_AAAA      = 28,
+    kDNSSDType_LOC       = 29,
+    kDNSSDType_NXT       = 30,
+    kDNSSDType_EID       = 31,
+    kDNSSDType_NIMLOC    = 32,
+    kDNSSDType_SRV       = 33,
+    kDNSSDType_ATMA      = 34,
+    kDNSSDType_NAPTR     = 35,
+    kDNSSDType_KX        = 36,
+    kDNSSDType_CERT      = 37,
+    kDNSSDType_A6        = 38,
+    kDNSSDType_DNAME     = 39,
+    kDNSSDType_SINK      = 40,
+    kDNSSDType_OPT       = 41,
+    kDNSSDType_APL       = 42,
+    kDNSSDType_DS        = 43,
+    kDNSSDType_SSHFP     = 44,
+    kDNSSDType_IPSECKEY  = 45,
+    kDNSSDType_RRSIG     = 46,
+    kDNSSDType_NSEC      = 47,
+    kDNSSDType_DNSKEY    = 48,
+    kDNSSDType_DHCID     = 49,
+    kDNSSDType_NSEC3     = 50,
+    kDNSSDType_NSEC3PARAM= 51,
+    kDNSSDType_HIP       = 55,
+    kDNSSDType_SPF       = 99,
+    kDNSSDType_UINFO     = 100,
+    kDNSSDType_UID       = 101,
+    kDNSSDType_GID       = 102,
+    kDNSSDType_UNSPEC    = 103,
+    kDNSSDType_TKEY      = 249,
+    kDNSSDType_TSIG      = 250,
+    kDNSSDType_IXFR      = 251,
+    kDNSSDType_AXFR      = 252,
+    kDNSSDType_MAILB     = 253,
+    kDNSSDType_MAILA     = 254,
+    kDNSSDType_ANY       = 255
+
+} DNSSDRRType;
+
+
+
+
+
+typedef [ uuid(3B0059E7-5297-4301-9AAB-1522F31EC8A7) ]
+
+enum DNSSDError
+{
+	kDNSSDError_NoError                   = 0,
+	kDNSSDError_Unknown                   = -65537,
+	kDNSSDError_NoSuchName                = -65538,
+    kDNSSDError_NoMemory                  = -65539,
+    kDNSSDError_BadParam                  = -65540,
+    kDNSSDError_BadReference              = -65541,
+    kDNSSDError_BadState                  = -65542,
+    kDNSSDError_BadFlags                  = -65543,
+    kDNSSDError_Unsupported               = -65544,
+    kDNSSDError_NotInitialized            = -65545,
+    kDNSSDError_AlreadyRegistered         = -65547,
+    kDNSSDError_NameConflict              = -65548,
+    kDNSSDError_Invalid                   = -65549,
+    kDNSSDError_Firewall                  = -65550,
+    kDNSSDError_Incompatible              = -65551,
+    kDNSSDError_BadInterfaceIndex         = -65552,
+    kDNSSDError_Refused                   = -65553,
+    kDNSSDError_NoSuchRecord              = -65554,
+    kDNSSDError_NoAuth                    = -65555,
+    kDNSSDError_NoSuchKey                 = -65556,
+    kDNSSDError_NATTraversal              = -65557,
+    kDNSSDError_DoubleNAT                 = -65558,
+    kDNSSDError_BadTime                   = -65559,
+    kDNSSDError_BadSig                    = -65560,
+    kDNSSDError_BadKey                    = -65561,
+    kDNSSDError_Transient                 = -65562,
+    kDNSSDError_ServiceNotRunning         = -65563,  /* Background daemon not running */
+    kDNSSDError_NATPortMappingUnsupported = -65564,  /* NAT doesn't support PCP, NAT-PMP or UPnP */
+    kDNSSDError_NATPortMappingDisabled    = -65565,  /* NAT supports PCP, NAT-PMP or UPnP, but it's disabled by the administrator */
+    kDNSSDError_NoRouter                  = -65566,  /* No router currently configured (probably no network connectivity) */
+    kDNSSDError_PollingMode               = -65567
+} DNSSDError;
+
+
+
+import "oaidl.idl";
+
+import "ocidl.idl";
+
+
+
+
+
+[
+
+	object,
+
+	uuid(8FA0889C-5973-4FC9-970B-EC15C925D0CE),
+
+	dual,
+
+	nonextensible,
+
+	helpstring("ITXTRecord Interface"),
+
+	pointer_default(unique)
+
+]
+
+interface ITXTRecord : IDispatch{
+
+	[id(1), helpstring("method SetValue")] HRESULT SetValue([in] BSTR key, [in] VARIANT value);
+
+	[id(2), helpstring("method RemoveValue")] HRESULT RemoveValue([in] BSTR key);
+
+	[id(3), helpstring("method ContainsKey")] HRESULT ContainsKey([in] BSTR key, [out,retval] VARIANT_BOOL* retval);
+
+	[id(4), helpstring("method GetValueForKey")] HRESULT GetValueForKey([in] BSTR key, [out,retval] VARIANT* value);
+
+	[id(5), helpstring("method GetCount")] HRESULT GetCount([out,retval] ULONG* count);
+
+	[id(6), helpstring("method GetKeyAtIndex")] HRESULT GetKeyAtIndex([in] ULONG index, [out,retval] BSTR* retval);
+
+	[id(7), helpstring("method GetValueAtIndex")] HRESULT GetValueAtIndex([in] ULONG index, [out,retval] VARIANT* retval);
+
+};
+
+[
+
+	object,
+
+	uuid(9CE603A0-3365-4DA0-86D1-3F780ECBA110),
+
+	dual,
+
+	nonextensible,
+
+	helpstring("IDNSSDRecord Interface"),
+
+	pointer_default(unique)
+
+]
+
+interface IDNSSDRecord : IDispatch{
+
+	[id(1), helpstring("method Update")] HRESULT Update([in] DNSSDFlags flags, [in] VARIANT rdata, [in] ULONG ttl);
+
+	[id(2), helpstring("method Remove")] HRESULT Remove([in] DNSSDFlags flags);
+
+};
+
+[
+
+	object,
+
+	uuid(7FD72324-63E1-45AD-B337-4D525BD98DAD),
+
+	dual,
+
+	nonextensible,
+
+	helpstring("IDNSSDEventManager Interface"),
+
+	pointer_default(unique)
+
+]
+
+interface IDNSSDEventManager : IDispatch{
+
+};
+
+[
+
+	object,
+
+	uuid(29DE265F-8402-474F-833A-D4653B23458F),
+
+	dual,
+
+	nonextensible,
+
+	helpstring("IDNSSDService Interface"),
+
+	pointer_default(unique)
+
+]
+
+interface IDNSSDService : IDispatch{
+
+	[id(1), helpstring("method EnumerateDomains")] HRESULT EnumerateDomains([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(2), helpstring("method Browse"), local] HRESULT Browse([in] DNSSDFlags flags, [in] ULONG interfaceIndex, [in] BSTR regtype, [in] BSTR domain, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** sdref);
+
+	[id(3), helpstring("method Resolve")] HRESULT Resolve([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR serviceName, [in] BSTR regType, [in] BSTR domain, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(4), helpstring("method Register")] HRESULT Register([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR name, [in] BSTR regType, [in] BSTR domain, [in] BSTR host, [in] USHORT port, [in] ITXTRecord* record, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(5), helpstring("method QueryRecord")] HRESULT QueryRecord([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR fullname, [in] DNSSDRRType rrtype, [in] DNSSDRRClass rrclass, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(6), helpstring("method RegisterRecord")] HRESULT RegisterRecord([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR fullname, [in] DNSSDRRType rrtype, [in] DNSSDRRClass rrclass, [in] VARIANT rdata, [in] ULONG ttl, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDRecord** record);
+
+	[id(7), helpstring("method AddRecord")] HRESULT AddRecord([in] DNSSDFlags flags, [in] DNSSDRRType rrtype, [in] VARIANT rdata, [in] ULONG ttl, [out,retval] IDNSSDRecord** record);
+
+	[id(8), helpstring("method ReconfirmRecord")] HRESULT ReconfirmRecord([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR fullname, [in] DNSSDRRType rrtype, [in] DNSSDRRClass rrclass, [in] VARIANT rdata);
+
+	[id(9), helpstring("method GetProperty")] HRESULT GetProperty([in] BSTR prop, [in,out] VARIANT * value );	
+
+	[id(10), helpstring("method GetAddrInfo")] HRESULT GetAddrInfo([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] DNSSDAddressFamily addressFamily, [in] BSTR hostname, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(11), helpstring("method NATPortMappingCreate")] HRESULT NATPortMappingCreate([in] DNSSDFlags flags, [in] ULONG ifIndex, [in] DNSSDAddressFamily addressFamily, [in] DNSSDProtocol protocol, [in] USHORT internalPort, [in] USHORT externalPort, [in] ULONG ttl, [in] IDNSSDEventManager* eventManager, [out,retval] IDNSSDService** service);
+
+	[id(12), helpstring("method Stop"), local] HRESULT Stop(void);
+
+};
+
+[
+
+	uuid(18FBED6D-F2B7-4EC8-A4A4-46282E635308),
+
+	version(1.0),
+
+	helpstring("Apple Bonjour Library 1.0")
+
+]
+
+library Bonjour
+
+{
+
+	importlib("stdole2.tlb");
+
+	[
+
+		uuid(21AE8D7F-D5FE-45cf-B632-CFA2C2C6B498),
+
+		helpstring("_IDNSSDEvents Interface")
+
+	]
+
+	dispinterface _IDNSSDEvents
+
+	{
+
+		properties:
+
+		methods:
+
+		[id(1), helpstring("method DomainFound")] void DomainFound([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR domain);
+
+		[id(2), helpstring("method DomainLost")] void DomainLost([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR domain);
+
+		[id(3), helpstring("method ServiceFound")] void ServiceFound([in] IDNSSDService* browser, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR serviceName, [in] BSTR regType, [in] BSTR domain);
+
+		[id(4), helpstring("method ServiceLost")] void ServiceLost([in] IDNSSDService* browser, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR serviceName, [in] BSTR regType, [in] BSTR domain);
+
+		[id(5), helpstring("method ServiceResolved")] void ServiceResolved([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR fullName, [in] BSTR hostName, [in] USHORT port, [in] ITXTRecord* record);
+
+		[id(6), helpstring("method ServiceRegistered")] void ServiceRegistered([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] BSTR name, [in] BSTR regType, [in] BSTR domain);
+
+		[id(7), helpstring("method QueryRecordAnswered")] void QueryRecordAnswered([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR fullName, [in] DNSSDRRType rrtype, [in] DNSSDRRClass rrclass, [in] VARIANT rdata, [in] ULONG ttl);
+
+		[id(8), helpstring("method RecordRegistered")] void RecordRegistered([in] IDNSSDRecord* record, [in] DNSSDFlags flags);
+
+		[id(9), helpstring("method AddressFound")] void AddressFound([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] BSTR hostname, [in] DNSSDAddressFamily addressFamily, [in] BSTR address, [in] ULONG ttl);
+
+		[id(10), helpstring("method MappingCreated")] void MappingCreated([in] IDNSSDService* service, [in] DNSSDFlags flags, [in] ULONG ifIndex, [in] ULONG externalAddress, [in] DNSSDAddressFamily addressFamily, [in] DNSSDProtocol protocol, [in] USHORT internalPort, [in] USHORT externalPort, [in] ULONG ttl);
+
+		[id(11), helpstring("method OperationFailed")] void OperationFailed([in] IDNSSDService* service, [in] DNSSDError error);
+
+	};
+
+	[
+
+		uuid(24CD4DE9-FF84-4701-9DC1-9B69E0D1090A),
+
+		helpstring("DNSSDService Class")
+
+	]
+
+	coclass DNSSDService
+
+	{
+
+		[default] interface IDNSSDService;
+
+	};
+
+	[
+
+		uuid(AFEE063C-05BA-4248-A26E-168477F49734),
+
+		helpstring("TXTRecord Class")
+
+	]
+
+	coclass TXTRecord
+
+	{
+
+		[default] interface ITXTRecord;
+
+	};
+
+	[
+
+		uuid(5E93C5A9-7516-4259-A67B-41A656F6E01C),
+
+		helpstring("DNSSDRecord Class")
+
+	]
+
+	coclass DNSSDRecord
+
+	{
+
+		[default] interface IDNSSDRecord;
+
+	};
+
+	[
+
+		uuid(BEEB932A-8D4A-4619-AEFE-A836F988B221),
+
+		helpstring("DNSSDEventManager Class")
+
+	]
+
+	coclass DNSSDEventManager
+
+	{
+
+		[default] interface IDNSSDEventManager;
+
+		[default, source] dispinterface _IDNSSDEvents;
+
+	};
+
+	enum DNSSDFlags;
+
+	enum DNSSDAddressFamily;
+
+	enum DNSSDProtocol;
+
+	enum DNSSDRRClass;
+
+	enum DNSSDRRType;
+
+	enum DNSSDError;
+
+};
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.rc b/mDNSResponder/mDNSWindows/DLLX/DLLX.rc
new file mode 100755
index 00000000..4299b5ac
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.rc
@@ -0,0 +1,126 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "winres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""winres.h""\r\n"

+    "#include ""WinVersRes.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "1 TYPELIB ""BonjourLib.tlb""\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "Bonjour COM Component Library"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "InternalName", "dnssdX.dll"

+            VALUE "OriginalFilename", "dnssdX.dll"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// REGISTRY

+//

+

+IDR_DLLX		        REGISTRY                "DLLX.rgs"

+IDR_DNSSDSERVICE        REGISTRY                "DNSSDService.rgs"

+IDR_TXTRECORD           REGISTRY                "TXTRecord.rgs"

+IDR_DNSSDRECORD         REGISTRY                "DNSSDRecord.rgs"

+IDR_DNSSDEVENTMANAGER   REGISTRY                "DNSSDEventManager.rgs"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_PROJNAME            "BonjourLib"

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+1 TYPELIB "dnssdX.tlb"

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.rgs b/mDNSResponder/mDNSWindows/DLLX/DLLX.rgs
new file mode 100755
index 00000000..c55ee8dd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.rgs
@@ -0,0 +1,11 @@
+HKCR

+{

+	NoRemove AppID

+	{

+		'%APPID%' = s 'Bonjour'

+		'Bonjour.DLL'

+		{

+			val AppID = s '%APPID%'

+		}

+	}

+}

diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.vcproj b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcproj
new file mode 100755
index 00000000..7c58b0a7
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcproj
@@ -0,0 +1,625 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="DLLX"

+	ProjectGUID="{78FBFCC5-2873-4AE2-9114-A08082F71124}"

+	RootNamespace="DLLX"

+	Keyword="AtlProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			UseOfATL="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="1"

+				GenerateStublessProxies="true"

+				TypeLibraryName="$(IntDir)/dnssdX.tlb"

+				HeaderFileName="DLLX.h"

+				DLLDataFileName=""

+				InterfaceIdentifierFileName="DLLX_i.c"

+				ProxyFileName="DLLX_p.c"

+				ValidateParameters="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB;DEBUG=1;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..;&quot;$(IntDir)&quot;"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				RegisterOutput="true"

+				IgnoreImportLibrary="true"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\dnssdX.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile=".\DLLX.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			UseOfATL="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+				GenerateStublessProxies="true"

+				TypeLibraryName="$(IntDir)/dnssdX.tlb"

+				HeaderFileName="DLLX.h"

+				DLLDataFileName=""

+				InterfaceIdentifierFileName="DLLX_i.c"

+				ProxyFileName="DLLX_p.c"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB;DEBUG=1;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..;&quot;$(IntDir)&quot;"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				RegisterOutput="true"

+				IgnoreImportLibrary="true"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\dnssdX.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile=".\DLLX.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			UseOfATL="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="1"

+				GenerateStublessProxies="true"

+				TypeLibraryName="$(IntDir)/dnssdX.tlb"

+				HeaderFileName="DLLX.h"

+				DLLDataFileName=""

+				InterfaceIdentifierFileName="DLLX_i.c"

+				ProxyFileName="DLLX_p.c"

+				ValidateParameters="false"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..;&quot;$(IntDir)&quot;"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				RegisterOutput="false"

+				IgnoreImportLibrary="true"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\dnssdX.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile=".\DLLX.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;             mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                            &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			UseOfATL="1"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+				TargetEnvironment="3"

+				GenerateStublessProxies="true"

+				TypeLibraryName="$(IntDir)/dnssdX.tlb"

+				HeaderFileName="DLLX.h"

+				DLLDataFileName=""

+				InterfaceIdentifierFileName="DLLX_i.c"

+				ProxyFileName="DLLX_p.c"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				AdditionalIncludeDirectories="..\..\mDNSShared;..\..\mDNSWindows"

+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="..;&quot;$(IntDir)&quot;"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				RegisterOutput="false"

+				IgnoreImportLibrary="true"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib ../../mDNSWindows/DLLStub/$(PlatformName)/$(ConfigurationName)/dnssdStatic.lib"

+				OutputFile="$(OutDir)\dnssdX.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile=".\DLLX.def"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;             mkdir &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                            &quot;$(DSTROOT)\WINDOWS\system32\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath=".\dlldatax.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\DLLX.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\DLLX.def"

+				>

+			</File>

+			<File

+				RelativePath=".\DLLX.idl"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDEventManager.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDRecord.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDService.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\TXTRecord.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath=".\_IDNSSDEvents_CP.H"

+				>

+			</File>

+			<File

+				RelativePath=".\dlldatax.h"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDEventManager.h"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDRecord.h"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDService.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Resource.h"

+				>

+			</File>

+			<File

+				RelativePath=".\stdafx.h"

+				>

+			</File>

+			<File

+				RelativePath=".\TXTRecord.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\DLLX.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\DLLX.rgs"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDEventManager.rgs"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDRecord.rgs"

+				>

+			</File>

+			<File

+				RelativePath=".\DNSSDService.rgs"

+				>

+			</File>

+			<File

+				RelativePath=".\TXTRecord.rgs"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Generated Files"

+			SourceControlFiles="false"

+			>

+			<File

+				RelativePath=".\DLLX.h"

+				>

+			</File>

+			<File

+				RelativePath=".\DLLX_i.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Support Files"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath=".\StringServices.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\StringServices.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj
new file mode 100755
index 00000000..a57e4edf
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{78FBFCC5-2873-4AE2-9114-A08082F71124}</ProjectGuid>

+    <RootNamespace>DLLX</RootNamespace>

+    <Keyword>AtlProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfAtl>Static</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <UseOfAtl>Static</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfAtl>Static</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <UseOfAtl>Static</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dnssdX</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dnssdX</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">dnssdX</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dnssdX</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <GenerateStublessProxies>true</GenerateStublessProxies>

+      <TypeLibraryName>$(IntDir)dnssdX.tlb</TypeLibraryName>

+      <HeaderFileName>DLLX.h</HeaderFileName>

+      <DllDataFileName>

+      </DllDataFileName>

+      <InterfaceIdentifierFileName>DLLX_i.c</InterfaceIdentifierFileName>

+      <ProxyFileName>DLLX_p.c</ProxyFileName>

+      <ValidateAllParameters>false</ValidateAllParameters>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB;DEBUG=1;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <RegisterOutput>true</RegisterOutput>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssdX.dll</OutputFile>

+      <ModuleDefinitionFile>.\DLLX.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <GenerateStublessProxies>true</GenerateStublessProxies>

+      <TypeLibraryName>$(IntDir)dnssdX.tlb</TypeLibraryName>

+      <HeaderFileName>DLLX.h</HeaderFileName>

+      <DllDataFileName>

+      </DllDataFileName>

+      <InterfaceIdentifierFileName>DLLX_i.c</InterfaceIdentifierFileName>

+      <ProxyFileName>DLLX_p.c</ProxyFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB;DEBUG=1;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <RegisterOutput>false</RegisterOutput>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssdX.dll</OutputFile>

+      <ModuleDefinitionFile>.\DLLX.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <GenerateStublessProxies>true</GenerateStublessProxies>

+      <TypeLibraryName>$(IntDir)dnssdX.tlb</TypeLibraryName>

+      <HeaderFileName>DLLX.h</HeaderFileName>

+      <DllDataFileName>

+      </DllDataFileName>

+      <InterfaceIdentifierFileName>DLLX_i.c</InterfaceIdentifierFileName>

+      <ProxyFileName>DLLX_p.c</ProxyFileName>

+      <ValidateAllParameters>false</ValidateAllParameters>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <RegisterOutput>false</RegisterOutput>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssdX.dll</OutputFile>

+      <ModuleDefinitionFile>.\DLLX.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"             mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                            "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <GenerateStublessProxies>true</GenerateStublessProxies>

+      <TypeLibraryName>$(IntDir)dnssdX.tlb</TypeLibraryName>

+      <HeaderFileName>DLLX.h</HeaderFileName>

+      <DllDataFileName>

+      </DllDataFileName>

+      <InterfaceIdentifierFileName>DLLX_i.c</InterfaceIdentifierFileName>

+      <ProxyFileName>DLLX_p.c</ProxyFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <AdditionalIncludeDirectories>..\..\mDNSShared;..\..\mDNSWindows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>..;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <RegisterOutput>false</RegisterOutput>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;../../mDNSWindows/DLLStub/$(Platform)/$(Configuration)/dnssdStatic.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)dnssdX.dll</OutputFile>

+      <ModuleDefinitionFile>.\DLLX.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\WINDOWS\system32\$(Platform)"             mkdir "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                            "$(DSTROOT)\WINDOWS\system32\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="dlldatax.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="DLLX.cpp" />

+    <ClCompile Include="DNSSDEventManager.cpp" />

+    <ClCompile Include="DNSSDRecord.cpp" />

+    <ClCompile Include="DNSSDService.cpp" />

+    <ClCompile Include="TXTRecord.cpp" />

+    <ClCompile Include="DLLX_i.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="StringServices.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="DLLX.def" />

+    <None Include="DLLX.rgs" />

+    <None Include="DNSSDEventManager.rgs" />

+    <None Include="DNSSDRecord.rgs" />

+    <None Include="DNSSDService.rgs" />

+    <None Include="TXTRecord.rgs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Midl Include="DLLX.idl" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="_IDNSSDEvents_CP.H" />

+    <ClInclude Include="dlldatax.h" />

+    <ClInclude Include="DNSSDEventManager.h" />

+    <ClInclude Include="DNSSDRecord.h" />

+    <ClInclude Include="DNSSDService.h" />

+    <ClInclude Include="Resource.h" />

+    <ClInclude Include="stdafx.h" />

+    <ClInclude Include="TXTRecord.h" />

+    <ClInclude Include="DLLX.h" />

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="StringServices.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="DLLX.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj.filters b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj.filters
new file mode 100755
index 00000000..54f4be62
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DLLX.vcxproj.filters
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+    <Filter Include="Generated Files">

+      <UniqueIdentifier>{f6bd0810-64ce-4840-9a29-d80d06414fcf}</UniqueIdentifier>

+      <SourceControlFiles>False</SourceControlFiles>

+    </Filter>

+    <Filter Include="Support Files">

+      <UniqueIdentifier>{0756c4a0-cd93-4f7e-a376-dc55c520a2d0}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="dlldatax.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="DLLX.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="DNSSDEventManager.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="DNSSDRecord.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="DNSSDService.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="TXTRecord.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="DLLX_i.c">

+      <Filter>Generated Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Support Files</Filter>

+    </ClCompile>

+    <ClCompile Include="StringServices.cpp">

+      <Filter>Support Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="DLLX.def">

+      <Filter>Source Files</Filter>

+    </None>

+    <None Include="DLLX.rgs">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="DNSSDEventManager.rgs">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="DNSSDRecord.rgs">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="DNSSDService.rgs">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="TXTRecord.rgs">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <Midl Include="DLLX.idl">

+      <Filter>Source Files</Filter>

+    </Midl>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="_IDNSSDEvents_CP.H">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="dlldatax.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="DNSSDEventManager.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="DNSSDRecord.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="DNSSDService.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="TXTRecord.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="DLLX.h">

+      <Filter>Generated Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Support Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Support Files</Filter>

+    </ClInclude>

+    <ClInclude Include="StringServices.h">

+      <Filter>Support Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="DLLX.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSD.cpp b/mDNSResponder/mDNSWindows/DLLX/DNSSD.cpp
new file mode 100755
index 00000000..8813d2df
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSD.cpp
@@ -0,0 +1,892 @@
+// DNSSD.cpp : Implementation of CDNSSD
+
+#include "stdafx.h"
+#include "DNSSD.h"
+#include "DNSSDService.h"
+#include "TXTRecord.h"
+#include <dns_sd.h>
+#include <CommonServices.h>
+#include <DebugServices.h>
+#include "StringServices.h"
+
+
+// CDNSSD
+
+STDMETHODIMP CDNSSD::Browse(DNSSDFlags flags, ULONG ifIndex, BSTR regtype, BSTR domain, IBrowseListener* listener, IDNSSDService** browser )
+{
+	CComObject<CDNSSDService>	*	object		= NULL;
+	std::string						regtypeUTF8;
+	std::string						domainUTF8;
+	DNSServiceRef					sref		= NULL;
+	DNSServiceErrorType				err			= 0;
+	HRESULT							hr			= 0;
+	BOOL							ok;
+
+	// Initialize
+	*browser = NULL;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( regtype, regtypeUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( domain, domainUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceBrowse( &sref, flags, ifIndex, regtypeUTF8.c_str(), domainUTF8.c_str(), ( DNSServiceBrowseReply ) &BrowseReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*browser = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::Resolve(DNSSDFlags flags, ULONG ifIndex, BSTR serviceName, BSTR regType, BSTR domain, IResolveListener* listener, IDNSSDService** service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	std::string						serviceNameUTF8;
+	std::string						regTypeUTF8;
+	std::string						domainUTF8;
+	DNSServiceRef					sref			= NULL;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+	BOOL							ok;
+
+	// Initialize
+	*service = NULL;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( serviceName, serviceNameUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( regType, regTypeUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( domain, domainUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceResolve( &sref, flags, ifIndex, serviceNameUTF8.c_str(), regTypeUTF8.c_str(), domainUTF8.c_str(), ( DNSServiceResolveReply ) &ResolveReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::EnumerateDomains(DNSSDFlags flags, ULONG ifIndex, IDomainListener *listener, IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	DNSServiceRef					sref			= NULL;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+
+	// Initialize
+	*service = NULL;
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceEnumerateDomains( &sref, flags, ifIndex, ( DNSServiceDomainEnumReply ) &DomainEnumReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::Register(DNSSDFlags flags, ULONG ifIndex, BSTR serviceName, BSTR regType, BSTR domain, BSTR host, USHORT port, ITXTRecord *record, IRegisterListener *listener, IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	std::string						serviceNameUTF8;
+	std::string						regTypeUTF8;
+	std::string						domainUTF8;
+	std::string						hostUTF8;
+	const void					*	txtRecord		= NULL;
+	uint16_t						txtLen			= 0;
+	DNSServiceRef					sref			= NULL;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+	BOOL							ok;
+
+	// Initialize
+	*service = NULL;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( serviceName, serviceNameUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( regType, regTypeUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( domain, domainUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+	ok = BSTRToUTF8( host, hostUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	if ( record )
+	{
+		CComObject< CTXTRecord > * realTXTRecord;
+
+		realTXTRecord = ( CComObject< CTXTRecord >* ) record;
+
+		txtRecord	= realTXTRecord->GetBytes();
+		txtLen		= realTXTRecord->GetLen();
+	}
+
+	err = DNSServiceRegister( &sref, flags, ifIndex, serviceNameUTF8.c_str(), regTypeUTF8.c_str(), domainUTF8.c_str(), hostUTF8.c_str(), port, txtLen, txtRecord, ( DNSServiceRegisterReply ) &RegisterReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::QueryRecord(DNSSDFlags flags, ULONG ifIndex, BSTR fullname, DNSSDRRType rrtype, DNSSDRRClass rrclass, IQueryRecordListener *listener, IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	DNSServiceRef					sref			= NULL;
+	std::string						fullNameUTF8;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+	BOOL							ok;
+
+	// Initialize
+	*service = NULL;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( fullname, fullNameUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceQueryRecord( &sref, flags, ifIndex, fullNameUTF8.c_str(), ( uint16_t ) rrtype, ( uint16_t ) rrclass, ( DNSServiceQueryRecordReply ) &QueryRecordReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::GetAddrInfo(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, BSTR hostName, IGetAddrInfoListener *listener, IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	DNSServiceRef					sref			= NULL;
+	std::string						hostNameUTF8;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+	BOOL							ok;
+
+	// Initialize
+	*service = NULL;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( hostName, hostNameUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceGetAddrInfo( &sref, flags, ifIndex, addressFamily, hostNameUTF8.c_str(), ( DNSServiceGetAddrInfoReply ) &GetAddrInfoReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::CreateConnection(IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object	= NULL;
+	DNSServiceRef					sref	= NULL;
+	DNSServiceErrorType				err		= 0;
+	HRESULT							hr		= 0;
+
+	// Initialize
+	*service = NULL;
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	err = DNSServiceCreateConnection( &sref );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::NATPortMappingCreate(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, DNSSDProtocol protocol, USHORT internalPort, USHORT externalPort, ULONG ttl, INATPortMappingListener *listener, IDNSSDService **service)
+{
+	CComObject<CDNSSDService>	*	object			= NULL;
+	DNSServiceRef					sref			= NULL;
+	DNSServiceProtocol				prot			= 0;
+	DNSServiceErrorType				err				= 0;
+	HRESULT							hr				= 0;
+
+	// Initialize
+	*service = NULL;
+
+	try
+	{
+		object = new CComObject<CDNSSDService>();
+	}
+	catch ( ... )
+	{
+		object = NULL;
+	}
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+	hr = object->FinalConstruct();
+	require_action( hr == S_OK, exit, err = kDNSServiceErr_Unknown );
+	object->AddRef();
+
+	prot = ( addressFamily | protocol );
+
+	err = DNSServiceNATPortMappingCreate( &sref, flags, ifIndex, prot, internalPort, externalPort, ttl, ( DNSServiceNATPortMappingReply ) &NATPortMappingReply, object );
+	require_noerr( err, exit );
+
+	object->SetServiceRef( sref );
+	object->SetListener( listener );
+
+	err = object->Run();
+	require_noerr( err, exit );
+
+	*service = object;
+
+exit:
+
+	if ( err && object )
+	{
+		object->Release();
+	}
+
+	return err;
+}
+
+
+STDMETHODIMP CDNSSD::GetProperty(BSTR prop, VARIANT * value )
+{
+	std::string			propUTF8;
+	std::vector< BYTE >	byteArray;
+	SAFEARRAY		*	psa			= NULL;
+	BYTE			*	pData		= NULL;
+	uint32_t			elems		= 0;
+	DNSServiceErrorType	err			= 0;
+	BOOL				ok = TRUE;
+
+	// Convert BSTR params to utf8
+	ok = BSTRToUTF8( prop, propUTF8 );
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	// Setup the byte array
+	require_action( V_VT( value ) == ( VT_ARRAY|VT_UI1 ), exit, err = kDNSServiceErr_Unknown );
+	psa = V_ARRAY( value );
+	require_action( psa, exit, err = kDNSServiceErr_Unknown );
+	require_action( SafeArrayGetDim( psa ) == 1, exit, err = kDNSServiceErr_Unknown );
+	byteArray.reserve( psa->rgsabound[0].cElements );
+	byteArray.assign( byteArray.capacity(), 0 );
+	elems = ( uint32_t ) byteArray.capacity();
+
+	// Call the function and package the return value in the Variant
+	err = DNSServiceGetProperty( propUTF8.c_str(), &byteArray[ 0 ], &elems );
+	require_noerr( err, exit );
+	ok = ByteArrayToVariant( &byteArray[ 0 ], elems, value );
+	require_action( ok, exit, err = kDNSSDError_Unknown );
+
+exit:
+
+	if ( psa )
+	{
+		SafeArrayUnaccessData( psa );
+		psa = NULL;
+	}
+
+	return err;
+}
+
+
+void DNSSD_API
+CDNSSD::DomainEnumReply
+    (
+    DNSServiceRef                       sdRef,
+    DNSServiceFlags                     flags,
+    uint32_t                            ifIndex,
+    DNSServiceErrorType                 errorCode,
+    const char                          *replyDomainUTF8,
+    void                                *context
+    )
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IDomainListener	* listener;
+
+		listener = ( IDomainListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR replyDomain;
+		
+			UTF8ToBSTR( replyDomainUTF8, replyDomain );
+
+			if ( flags & kDNSServiceFlagsAdd )
+			{
+				listener->DomainFound( service, ( DNSSDFlags ) flags, ifIndex, replyDomain );
+			}
+			else
+			{
+				listener->DomainLost( service, ( DNSSDFlags ) flags, ifIndex, replyDomain );
+			}
+		}
+		else
+		{
+			listener->EnumDomainsFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::BrowseReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *serviceNameUTF8,
+		const char                          *regTypeUTF8,
+		const char                          *replyDomainUTF8,
+		void                                *context
+		)
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IBrowseListener	* listener;
+
+		listener = ( IBrowseListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR	serviceName;
+			CComBSTR	regType;
+			CComBSTR	replyDomain;
+		
+			UTF8ToBSTR( serviceNameUTF8, serviceName );
+			UTF8ToBSTR( regTypeUTF8, regType );
+			UTF8ToBSTR( replyDomainUTF8, replyDomain );
+
+			if ( flags & kDNSServiceFlagsAdd )
+			{
+				listener->ServiceFound( service, ( DNSSDFlags ) flags, ifIndex, serviceName, regType, replyDomain );
+			}
+			else
+			{
+				listener->ServiceLost( service, ( DNSSDFlags ) flags, ifIndex, serviceName, regType, replyDomain );
+			}
+		}
+		else
+		{
+			listener->BrowseFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::ResolveReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullNameUTF8,
+		const char                          *hostNameUTF8,
+		uint16_t                            port,
+		uint16_t                            txtLen,
+		const unsigned char                 *txtRecord,
+		void                                *context
+		)
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IResolveListener * listener;
+
+		listener = ( IResolveListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR					fullName;
+			CComBSTR					hostName;
+			CComBSTR					regType;
+			CComBSTR					replyDomain;
+			CComObject< CTXTRecord >*	record;
+			BOOL						ok;
+
+			ok = UTF8ToBSTR( fullNameUTF8, fullName );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+			ok = UTF8ToBSTR( hostNameUTF8, hostName );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+			try
+			{
+				record = new CComObject<CTXTRecord>();
+			}
+			catch ( ... )
+			{
+				record = NULL;
+			}
+
+			require_action( record, exit, err = kDNSServiceErr_NoMemory );
+			record->AddRef();
+
+			char buf[ 64 ];
+			sprintf( buf, "txtLen = %d", txtLen );
+			OutputDebugStringA( buf );
+
+			if ( txtLen > 0 )
+			{
+				record->SetBytes( txtRecord, txtLen );
+			}
+
+			listener->ServiceResolved( service, ( DNSSDFlags ) flags, ifIndex, fullName, hostName, port, record );
+		}
+		else
+		{
+			listener->ResolveFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::RegisterReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		DNSServiceErrorType                 errorCode,
+		const char                          *serviceNameUTF8,
+		const char                          *regTypeUTF8,
+		const char                          *domainUTF8,
+		void                                *context
+		)
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IRegisterListener * listener;
+
+		listener = ( IRegisterListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR					serviceName;
+			CComBSTR					regType;
+			CComBSTR					domain;
+			BOOL						ok;
+
+			ok = UTF8ToBSTR( serviceNameUTF8, serviceName );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+			ok = UTF8ToBSTR( regTypeUTF8, regType );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+			ok = UTF8ToBSTR( domainUTF8, domain );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+			listener->ServiceRegistered( service, ( DNSSDFlags ) flags, serviceName, regType, domain );
+		}
+		else
+		{
+			listener->ServiceRegisterFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::QueryRecordReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullNameUTF8,
+		uint16_t                            rrtype,
+		uint16_t                            rrclass,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl,
+		void                                *context
+		)
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IQueryRecordListener * listener;
+
+		listener = ( IQueryRecordListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR	fullName;
+			VARIANT		var;
+			BOOL		ok;
+
+			ok = UTF8ToBSTR( fullNameUTF8, fullName );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+			ok = ByteArrayToVariant( rdata, rdlen, &var );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+			listener->QueryRecordAnswered( service, ( DNSSDFlags ) flags, ifIndex, fullName, ( DNSSDRRType ) rrtype, ( DNSSDRRClass ) rrclass, var, ttl );
+		}
+		else
+		{
+			listener->QueryRecordFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::GetAddrInfoReply
+		(
+		DNSServiceRef                    sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         ifIndex,
+		DNSServiceErrorType              errorCode,
+		const char                       *hostNameUTF8,
+		const struct sockaddr            *rawAddress,
+		uint32_t                         ttl,
+		void                             *context
+		)
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		IGetAddrInfoListener * listener;
+
+		listener = ( IGetAddrInfoListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			CComBSTR			hostName;
+			DWORD				sockaddrLen;
+			DNSSDAddressFamily	addressFamily;
+			char				addressUTF8[INET6_ADDRSTRLEN];
+			DWORD				addressLen = sizeof( addressUTF8 );
+			CComBSTR			address;
+			BOOL				ok;
+
+			ok = UTF8ToBSTR( hostNameUTF8, hostName );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+			switch ( rawAddress->sa_family )
+			{
+				case AF_INET:
+				{
+					addressFamily	= kDNSSDAddressFamily_IPv4;
+					sockaddrLen		= sizeof( sockaddr_in );
+				}
+				break;
+
+				case AF_INET6:
+				{
+					addressFamily	= kDNSSDAddressFamily_IPv6;
+					sockaddrLen		= sizeof( sockaddr_in6 );
+				}
+				break;
+			}
+
+			err = WSAAddressToStringA( ( LPSOCKADDR ) rawAddress, sockaddrLen, NULL, addressUTF8, &addressLen );
+			require_noerr( err, exit );
+			ok = UTF8ToBSTR( addressUTF8, address );
+			require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+			listener->GetAddrInfoReply( service, ( DNSSDFlags ) flags, ifIndex, hostName, addressFamily, address, ttl );
+		}
+		else
+		{
+			listener->GetAddrInfoFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+void DNSSD_API
+CDNSSD::NATPortMappingReply
+    (
+    DNSServiceRef                    sdRef,
+    DNSServiceFlags                  flags,
+    uint32_t                         ifIndex,
+    DNSServiceErrorType              errorCode,
+    uint32_t                         externalAddress,   /* four byte IPv4 address in network byte order */
+    DNSServiceProtocol               protocol,
+    uint16_t                         internalPort,
+    uint16_t                         externalPort,      /* may be different than the requested port     */
+    uint32_t                         ttl,               /* may be different than the requested ttl      */
+    void                             *context
+    )
+{
+	CComObject<CDNSSDService> * service;
+	int err;
+	
+	service = ( CComObject< CDNSSDService>* ) context;
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+	if ( !service->Stopped() )
+	{
+		INATPortMappingListener * listener;
+
+		listener = ( INATPortMappingListener* ) service->GetListener();
+		require_action( listener, exit, err = kDNSServiceErr_Unknown );
+
+		if ( !errorCode )
+		{
+			listener->MappingCreated( service, ( DNSSDFlags ) flags, ifIndex, externalAddress, ( DNSSDAddressFamily ) ( protocol & 0x8 ), ( DNSSDProtocol ) ( protocol & 0x80 ), internalPort, externalPort, ttl  );
+		}
+		else
+		{
+			listener->MappingFailed( service, ( DNSSDError ) errorCode );
+		}
+	}
+
+exit:
+
+	return;
+}
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.cpp b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.cpp
new file mode 100755
index 00000000..310ced0e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.cpp
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#include "stdafx.h"
+
+#include "DNSSDEventManager.h"
+
+
+
+
+
+// CDNSSDEventManager
+
+
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.h b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.h
new file mode 100755
index 00000000..70aedfc9
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.h
@@ -0,0 +1,133 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+#include "resource.h"       // main symbols
+
+
+
+#include "DLLX.h"
+
+#include "_IDNSSDEvents_CP.H"
+
+
+
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+
+#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
+
+#endif
+
+
+
+
+
+
+
+// CDNSSDEventManager
+
+
+
+class ATL_NO_VTABLE CDNSSDEventManager :
+
+	public CComObjectRootEx<CComSingleThreadModel>,
+
+	public CComCoClass<CDNSSDEventManager, &CLSID_DNSSDEventManager>,
+
+	public IConnectionPointContainerImpl<CDNSSDEventManager>,
+
+	public CProxy_IDNSSDEvents<CDNSSDEventManager>,
+
+	public IDispatchImpl<IDNSSDEventManager, &IID_IDNSSDEventManager, &LIBID_Bonjour, /*wMajor =*/ 1, /*wMinor =*/ 0>
+
+{
+
+public:
+
+	CDNSSDEventManager()
+
+	{
+
+	}
+
+
+
+DECLARE_REGISTRY_RESOURCEID(IDR_DNSSDEVENTMANAGER)
+
+
+
+
+
+BEGIN_COM_MAP(CDNSSDEventManager)
+
+	COM_INTERFACE_ENTRY(IDNSSDEventManager)
+
+	COM_INTERFACE_ENTRY(IDispatch)
+
+	COM_INTERFACE_ENTRY(IConnectionPointContainer)
+
+END_COM_MAP()
+
+
+
+BEGIN_CONNECTION_POINT_MAP(CDNSSDEventManager)
+
+	CONNECTION_POINT_ENTRY(__uuidof(_IDNSSDEvents))
+
+END_CONNECTION_POINT_MAP()
+
+
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+
+
+	HRESULT FinalConstruct()
+
+	{
+
+		return S_OK;
+
+	}
+
+
+
+	void FinalRelease()
+
+	{
+
+	}
+
+
+
+public:
+
+
+
+};
+
+
+
+OBJECT_ENTRY_AUTO(__uuidof(DNSSDEventManager), CDNSSDEventManager)
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.rgs b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.rgs
new file mode 100755
index 00000000..91035124
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDEventManager.rgs
@@ -0,0 +1,27 @@
+HKCR

+{

+	Bonjour.DNSSDEventManager.1 = s 'DNSSDEventManager Class'

+	{

+		CLSID = s '{BEEB932A-8D4A-4619-AEFE-A836F988B221}'

+	}

+	Bonjour.DNSSDEventManager = s 'DNSSDEventManager Class'

+	{

+		CLSID = s '{BEEB932A-8D4A-4619-AEFE-A836F988B221}'

+		CurVer = s 'Bonjour.DNSSDEventManager.1'

+	}

+	NoRemove CLSID

+	{

+		ForceRemove {BEEB932A-8D4A-4619-AEFE-A836F988B221} = s 'DNSSDEventManager Class'

+		{

+			ProgID = s 'Bonjour.DNSSDEventManager.1'

+			VersionIndependentProgID = s 'Bonjour.DNSSDEventManager'

+			ForceRemove 'Programmable'

+			InprocServer32 = s '%MODULE%'

+			{

+				val ThreadingModel = s 'Apartment'

+			}

+			val AppID = s '%APPID%'

+			'TypeLib' = s '{18FBED6D-F2B7-4EC8-A4A4-46282E635308}'

+		}

+	}

+}

diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.cpp b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.cpp
new file mode 100755
index 00000000..a2727207
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.cpp
@@ -0,0 +1,101 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#include "stdafx.h"
+
+#include "DNSSDRecord.h"
+
+#include "StringServices.h"
+
+#include <DebugServices.h>
+
+
+
+
+
+// CDNSSDRecord
+
+
+
+STDMETHODIMP CDNSSDRecord::Update(DNSSDFlags flags, VARIANT rdata, ULONG ttl)
+
+{
+
+	std::vector< BYTE >	byteArray;
+
+	const void		*	byteArrayPtr	= NULL;
+
+	DNSServiceErrorType	err				= 0;
+
+	HRESULT				hr				= 0;
+
+	BOOL				ok;
+
+
+
+	// Convert the VARIANT
+
+	ok = VariantToByteArray( &rdata, byteArray );
+
+	require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	err = DNSServiceUpdateRecord( m_serviceObject->GetSubordRef(), m_rref, flags, ( uint16_t ) byteArray.size(), byteArray.size() > 0 ? &byteArray[ 0 ] : NULL, ttl );
+
+	require_noerr( err, exit );
+
+
+
+exit:
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDRecord::Remove(DNSSDFlags flags)
+
+{
+
+	DNSServiceErrorType	err = 0;
+
+
+
+	err = DNSServiceRemoveRecord( m_serviceObject->GetSubordRef(), m_rref, flags );
+
+	require_noerr( err, exit );
+
+
+
+exit:
+
+
+
+	return err;
+
+}
+
+
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.h b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.h
new file mode 100755
index 00000000..bdedda50
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.h
@@ -0,0 +1,185 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+#include "resource.h"       // main symbols
+
+
+
+#include "DLLX.h"
+
+#include "DNSSDService.h"
+
+#include <dns_sd.h>
+
+
+
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+
+#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
+
+#endif
+
+
+
+
+
+
+
+// CDNSSDRecord
+
+
+
+class ATL_NO_VTABLE CDNSSDRecord :
+
+	public CComObjectRootEx<CComSingleThreadModel>,
+
+	public CComCoClass<CDNSSDRecord, &CLSID_DNSSDRecord>,
+
+	public IDispatchImpl<IDNSSDRecord, &IID_IDNSSDRecord, &LIBID_Bonjour, /*wMajor =*/ 1, /*wMinor =*/ 0>
+
+{
+
+public:
+
+	CDNSSDRecord()
+
+	{
+
+	}
+
+
+
+DECLARE_REGISTRY_RESOURCEID(IDR_DNSSDRECORD)
+
+
+
+
+
+BEGIN_COM_MAP(CDNSSDRecord)
+
+	COM_INTERFACE_ENTRY(IDNSSDRecord)
+
+	COM_INTERFACE_ENTRY(IDispatch)
+
+END_COM_MAP()
+
+
+
+
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+
+
+	HRESULT FinalConstruct()
+
+	{
+
+		return S_OK;
+
+	}
+
+
+
+	void FinalRelease()
+
+	{
+
+	}
+
+
+
+	inline CDNSSDService*
+
+	GetServiceObject()
+
+	{
+
+		return m_serviceObject;
+
+	}
+
+
+
+	inline void
+
+	SetServiceObject( CDNSSDService * serviceObject )
+
+	{
+
+		m_serviceObject = serviceObject;
+
+	}
+
+
+
+	inline DNSRecordRef
+
+	GetRecordRef()
+
+	{
+
+		return m_rref;
+
+	}
+
+
+
+	inline void
+
+	SetRecordRef( DNSRecordRef rref )
+
+	{
+
+		m_rref = rref;
+
+	}
+
+
+
+public:
+
+
+
+	STDMETHOD(Update)(DNSSDFlags flags, VARIANT rdata, ULONG ttl);
+
+	STDMETHOD(Remove)(DNSSDFlags flags);
+
+
+
+private:
+
+
+
+	CDNSSDService *	m_serviceObject;
+
+	DNSRecordRef	m_rref;
+
+};
+
+
+
+OBJECT_ENTRY_AUTO(__uuidof(DNSSDRecord), CDNSSDRecord)
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.rgs b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.rgs
new file mode 100755
index 00000000..ee0a5a29
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDRecord.rgs
@@ -0,0 +1,27 @@
+HKCR

+{

+	Bonjour.DNSSDRecord.1 = s 'DNSSDRecord Class'

+	{

+		CLSID = s '{5E93C5A9-7516-4259-A67B-41A656F6E01C}'

+	}

+	Bonjour.DNSSDRecord = s 'DNSSDRecord Class'

+	{

+		CLSID = s '{5E93C5A9-7516-4259-A67B-41A656F6E01C}'

+		CurVer = s 'Bonjour.DNSSDRecord.1'

+	}

+	NoRemove CLSID

+	{

+		ForceRemove {5E93C5A9-7516-4259-A67B-41A656F6E01C} = s 'DNSSDRecord Class'

+		{

+			ProgID = s 'Bonjour.DNSSDRecord.1'

+			VersionIndependentProgID = s 'Bonjour.DNSSDRecord'

+			ForceRemove 'Programmable'

+			InprocServer32 = s '%MODULE%'

+			{

+				val ThreadingModel = s 'Apartment'

+			}

+			val AppID = s '%APPID%'

+			'TypeLib' = s '{18FBED6D-F2B7-4EC8-A4A4-46282E635308}'

+		}

+	}

+}

diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDService.cpp b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.cpp
new file mode 100755
index 00000000..b8ce49be
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.cpp
@@ -0,0 +1,2095 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma warning(disable:4995)
+
+
+
+#include "stdafx.h"
+
+#include <strsafe.h>
+
+#include "DNSSDService.h"
+
+#include "DNSSDEventManager.h"
+
+#include "DNSSDRecord.h"
+
+#include "TXTRecord.h"
+
+#include "StringServices.h"
+
+#include <DebugServices.h>
+
+
+
+
+
+#define WM_SOCKET (WM_APP + 100)
+
+
+
+
+
+// CDNSSDService
+
+
+
+BOOL						CDNSSDService::m_registeredWindowClass	= FALSE;
+
+HWND						CDNSSDService::m_hiddenWindow			= NULL;
+
+CDNSSDService::SocketMap	CDNSSDService::m_socketMap;
+
+
+
+
+
+HRESULT CDNSSDService::FinalConstruct()
+
+{
+
+	DNSServiceErrorType	err	= 0;
+
+	HRESULT				hr	= S_OK;
+
+
+
+	m_isPrimary = TRUE;
+
+	err = DNSServiceCreateConnection( &m_primary );
+
+	require_action( !err, exit, hr = E_FAIL );
+
+
+
+	if ( !m_hiddenWindow )
+
+	{
+
+		TCHAR windowClassName[ 256 ];
+
+
+
+		StringCchPrintf( windowClassName, sizeof( windowClassName ) / sizeof( TCHAR ), TEXT( "Bonjour Hidden Window %d" ), GetProcessId( NULL ) );
+
+
+
+		if ( !m_registeredWindowClass )
+
+		{
+
+			WNDCLASS	wc;
+
+			ATOM		atom;
+
+
+
+			wc.style			= 0;
+
+			wc.lpfnWndProc		= WndProc;
+
+			wc.cbClsExtra		= 0;
+
+			wc.cbWndExtra		= 0;
+
+			wc.hInstance		= NULL;
+
+			wc.hIcon			= NULL;
+
+			wc.hCursor			= NULL;
+
+			wc.hbrBackground	= NULL;
+
+			wc.lpszMenuName		= NULL;
+
+			wc.lpszClassName	= windowClassName;
+
+
+
+			atom = RegisterClass(&wc);
+
+			require_action( atom != NULL, exit, hr = E_FAIL );
+
+
+
+			m_registeredWindowClass = TRUE;
+
+		}
+
+
+
+		m_hiddenWindow = CreateWindow( windowClassName, windowClassName, WS_OVERLAPPED, 0, 0, 0, 0, NULL, NULL, GetModuleHandle( NULL ), NULL );
+
+		require_action( m_hiddenWindow != NULL, exit, hr = E_FAIL );
+
+	}
+
+
+
+	err = WSAAsyncSelect( DNSServiceRefSockFD( m_primary ), m_hiddenWindow, WM_SOCKET, FD_READ );
+
+	require_action( !err, exit, hr = E_FAIL );
+
+
+
+	m_socketMap[ DNSServiceRefSockFD( m_primary ) ] = this;
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+
+
+void CDNSSDService::FinalRelease()
+
+{
+
+	dlog( kDebugLevelTrace, "FinalRelease()\n" ); 
+
+	Stop();
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::EnumerateDomains(DNSSDFlags flags, ULONG ifIndex, IDNSSDEventManager *eventManager, IDNSSDService **service)
+
+{
+
+	CComObject<CDNSSDService>	*	object	= NULL;
+
+	DNSServiceRef					subord	= NULL;
+
+	DNSServiceErrorType				err		= 0;
+
+	HRESULT							hr		= 0;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceEnumerateDomains( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, ( DNSServiceDomainEnumReply ) &DomainEnumReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::Browse(DNSSDFlags flags, ULONG ifIndex, BSTR regtype, BSTR domain, IDNSSDEventManager* eventManager, IDNSSDService** service )
+
+{
+
+	CComObject<CDNSSDService>	*	object		= NULL;
+
+	std::string						regtypeUTF8;
+
+	std::string						domainUTF8;
+
+	DNSServiceRef					subord		= NULL;
+
+	DNSServiceErrorType				err			= 0;
+
+	HRESULT							hr			= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( regtype, regtypeUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( domain, domainUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceBrowse( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, regtypeUTF8.c_str(), ( domainUTF8.size() > 0 ) ? domainUTF8.c_str() : NULL, ( DNSServiceBrowseReply ) &BrowseReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::Resolve(DNSSDFlags flags, ULONG ifIndex, BSTR serviceName, BSTR regType, BSTR domain, IDNSSDEventManager* eventManager, IDNSSDService** service)
+
+{
+
+	CComObject<CDNSSDService>	*	object			= NULL;
+
+	std::string						serviceNameUTF8;
+
+	std::string						regTypeUTF8;
+
+	std::string						domainUTF8;
+
+	DNSServiceRef					subord			= NULL;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( serviceName, serviceNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( regType, regTypeUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( domain, domainUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceResolve( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, serviceNameUTF8.c_str(), regTypeUTF8.c_str(), domainUTF8.c_str(), ( DNSServiceResolveReply ) &ResolveReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::Register(DNSSDFlags flags, ULONG ifIndex, BSTR serviceName, BSTR regType, BSTR domain, BSTR host, USHORT port, ITXTRecord *record, IDNSSDEventManager *eventManager, IDNSSDService **service)
+
+{
+
+	CComObject<CDNSSDService>	*	object			= NULL;
+
+	std::string						serviceNameUTF8;
+
+	std::string						regTypeUTF8;
+
+	std::string						domainUTF8;
+
+	std::string						hostUTF8;
+
+	const void					*	txtRecord		= NULL;
+
+	uint16_t						txtLen			= 0;
+
+	DNSServiceRef					subord			= NULL;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( serviceName, serviceNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( regType, regTypeUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( domain, domainUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+	ok = BSTRToUTF8( host, hostUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	if ( record )
+
+	{
+
+		CComObject< CTXTRecord > * realTXTRecord;
+
+
+
+		realTXTRecord = ( CComObject< CTXTRecord >* ) record;
+
+
+
+		txtRecord	= realTXTRecord->GetBytes();
+
+		txtLen		= realTXTRecord->GetLen();
+
+	}
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceRegister( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, serviceNameUTF8.c_str(), regTypeUTF8.c_str(), ( domainUTF8.size() > 0 ) ? domainUTF8.c_str() : NULL, hostUTF8.c_str(), htons( port ), txtLen, txtRecord, ( DNSServiceRegisterReply ) &RegisterReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::QueryRecord(DNSSDFlags flags, ULONG ifIndex, BSTR fullname, DNSSDRRType rrtype, DNSSDRRClass rrclass, IDNSSDEventManager *eventManager, IDNSSDService **service)
+
+{
+
+	CComObject<CDNSSDService>	*	object			= NULL;
+
+	DNSServiceRef					subord			= NULL;
+
+	std::string						fullNameUTF8;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( fullname, fullNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceQueryRecord( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, fullNameUTF8.c_str(), ( uint16_t ) rrtype, ( uint16_t ) rrclass, ( DNSServiceQueryRecordReply ) &QueryRecordReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::RegisterRecord(DNSSDFlags flags, ULONG ifIndex, BSTR fullName, DNSSDRRType rrtype, DNSSDRRClass rrclass, VARIANT rdata, ULONG ttl, IDNSSDEventManager* eventManager, IDNSSDRecord** record)
+
+{
+
+	CComObject<CDNSSDRecord>	*	object			= NULL;
+
+	DNSRecordRef					rref			= NULL;
+
+	std::string						fullNameUTF8;
+
+	std::vector< BYTE >				byteArray;
+
+	const void					*	byteArrayPtr	= NULL;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*object = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( fullName, fullNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	// Convert the VARIANT
+
+	ok = VariantToByteArray( &rdata, byteArray );
+
+	require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDRecord>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	err = DNSServiceRegisterRecord( m_primary, &rref, flags, ifIndex, fullNameUTF8.c_str(), rrtype, rrclass, ( uint16_t ) byteArray.size(), byteArray.size() > 0 ? &byteArray[ 0 ] : NULL, ttl, &RegisterRecordReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetServiceObject( this );
+
+	object->SetRecordRef( rref );
+
+	this->SetEventManager( eventManager );
+
+
+
+	*record = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::AddRecord(DNSSDFlags flags, DNSSDRRType rrtype, VARIANT rdata, ULONG ttl, IDNSSDRecord ** record)
+
+{
+
+	CComObject<CDNSSDRecord>	*	object			= NULL;
+
+	DNSRecordRef					rref			= NULL;
+
+	std::vector< BYTE >				byteArray;
+
+	const void					*	byteArrayPtr	= NULL;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*object = NULL;
+
+
+
+	// Convert the VARIANT
+
+	ok = VariantToByteArray( &rdata, byteArray );
+
+	require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDRecord>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	err = DNSServiceAddRecord( m_primary, &rref, flags, rrtype, ( uint16_t ) byteArray.size(), byteArray.size() > 0 ? &byteArray[ 0 ] : NULL, ttl );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetServiceObject( this );
+
+	object->SetRecordRef( rref );
+
+
+
+	*record = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+STDMETHODIMP CDNSSDService::ReconfirmRecord(DNSSDFlags flags, ULONG ifIndex, BSTR fullName, DNSSDRRType rrtype, DNSSDRRClass rrclass, VARIANT rdata)
+
+{
+
+	std::string						fullNameUTF8;
+
+	std::vector< BYTE >				byteArray;
+
+	const void					*	byteArrayPtr	= NULL;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( fullName, fullNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	// Convert the VARIANT
+
+	ok = VariantToByteArray( &rdata, byteArray );
+
+	require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	err = DNSServiceReconfirmRecord( flags, ifIndex, fullNameUTF8.c_str(), rrtype, rrclass, ( uint16_t ) byteArray.size(), byteArray.size() > 0 ? &byteArray[ 0 ] : NULL );
+
+	require_noerr( err, exit );
+
+
+
+exit:
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::GetProperty(BSTR prop, VARIANT * value )
+
+{
+
+	std::string			propUTF8;
+
+	std::vector< BYTE >	byteArray;
+
+	SAFEARRAY		*	psa			= NULL;
+
+	BYTE			*	pData		= NULL;
+
+	uint32_t			elems		= 0;
+
+	DNSServiceErrorType	err			= 0;
+
+	BOOL				ok = TRUE;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( prop, propUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	// Setup the byte array
+
+	require_action( V_VT( value ) == ( VT_ARRAY|VT_UI1 ), exit, err = kDNSServiceErr_Unknown );
+
+	psa = V_ARRAY( value );
+
+	require_action( psa, exit, err = kDNSServiceErr_Unknown );
+
+	require_action( SafeArrayGetDim( psa ) == 1, exit, err = kDNSServiceErr_Unknown );
+
+	byteArray.reserve( psa->rgsabound[0].cElements );
+
+	byteArray.assign( byteArray.capacity(), 0 );
+
+	elems = ( uint32_t ) byteArray.capacity();
+
+
+
+	// Call the function and package the return value in the Variant
+
+	err = DNSServiceGetProperty( propUTF8.c_str(), &byteArray[ 0 ], &elems );
+
+	require_noerr( err, exit );
+
+	ok = ByteArrayToVariant( &byteArray[ 0 ], elems, value );
+
+	require_action( ok, exit, err = kDNSSDError_Unknown );
+
+
+
+exit:
+
+
+
+	if ( psa )
+
+	{
+
+		SafeArrayUnaccessData( psa );
+
+		psa = NULL;
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+STDMETHODIMP CDNSSDService::GetAddrInfo(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, BSTR hostName, IDNSSDEventManager *eventManager, IDNSSDService **service)
+
+{
+
+	CComObject<CDNSSDService>	*	object			= NULL;
+
+	DNSServiceRef					subord			= NULL;
+
+	std::string						hostNameUTF8;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+	BOOL							ok;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	// Convert BSTR params to utf8
+
+	ok = BSTRToUTF8( hostName, hostNameUTF8 );
+
+	require_action( ok, exit, err = kDNSServiceErr_BadParam );
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceGetAddrInfo( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, addressFamily, hostNameUTF8.c_str(), ( DNSServiceGetAddrInfoReply ) &GetAddrInfoReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::NATPortMappingCreate(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, DNSSDProtocol protocol, USHORT internalPort, USHORT externalPort, ULONG ttl, IDNSSDEventManager *eventManager, IDNSSDService **service)
+
+{
+
+	CComObject<CDNSSDService>	*	object			= NULL;
+
+	DNSServiceRef					subord			= NULL;
+
+	DNSServiceProtocol				prot			= 0;
+
+	DNSServiceErrorType				err				= 0;
+
+	HRESULT							hr				= 0;
+
+
+
+	check( m_primary );
+
+
+
+	// Initialize
+
+	*service = NULL;
+
+
+
+	try
+
+	{
+
+		object = new CComObject<CDNSSDService>();
+
+	}
+
+	catch ( ... )
+
+	{
+
+		object = NULL;
+
+	}
+
+
+
+	require_action( object != NULL, exit, err = kDNSServiceErr_NoMemory );
+
+	object->AddRef();
+
+
+
+	prot = ( addressFamily | protocol );
+
+
+
+	subord = m_primary;
+
+	err = DNSServiceNATPortMappingCreate( &subord, flags | kDNSServiceFlagsShareConnection, ifIndex, prot, htons( internalPort ), htons( externalPort ), ttl, ( DNSServiceNATPortMappingReply ) &NATPortMappingReply, object );
+
+	require_noerr( err, exit );
+
+
+
+	object->SetPrimaryRef( m_primary );
+
+	object->SetSubordRef( subord );
+
+	object->SetEventManager( eventManager );
+
+
+
+	*service = object;
+
+
+
+exit:
+
+
+
+	if ( err && object )
+
+	{
+
+		object->Release();
+
+	}
+
+
+
+	return err;
+
+}
+
+
+
+
+
+STDMETHODIMP CDNSSDService::Stop(void)
+
+{
+
+	if ( !m_stopped )
+
+	{
+
+		m_stopped = TRUE;
+
+
+
+		dlog( kDebugLevelTrace, "Stop()\n" );
+
+
+
+		if ( m_isPrimary && m_primary )
+
+		{
+
+			SocketMap::iterator it;
+
+
+
+			if ( m_hiddenWindow )
+
+			{
+
+				WSAAsyncSelect( DNSServiceRefSockFD( m_primary ), m_hiddenWindow, 0, 0 );
+
+			}
+
+
+
+			it = m_socketMap.find( DNSServiceRefSockFD( m_primary ) );
+
+
+
+			if ( it != m_socketMap.end() )
+
+			{
+
+				m_socketMap.erase( it );
+
+			}
+
+
+
+			DNSServiceRefDeallocate( m_primary );
+
+			m_primary = NULL;
+
+		}
+
+		else if ( m_subord )
+
+		{
+
+			DNSServiceRefDeallocate( m_subord );
+
+			m_subord = NULL;
+
+		}
+
+
+
+		if ( m_eventManager != NULL )
+
+		{
+
+			m_eventManager->Release();
+
+			m_eventManager = NULL;
+
+		}
+
+	}
+
+
+
+	return S_OK;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::DomainEnumReply
+    (
+    DNSServiceRef                       sdRef,
+    DNSServiceFlags                     flags,
+    uint32_t                            ifIndex,
+    DNSServiceErrorType                 errorCode,
+    const char                          *replyDomainUTF8,
+    void                                *context
+    )
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR replyDomain;
+
+		BOOL ok;
+
+		
+
+		ok = UTF8ToBSTR( replyDomainUTF8, replyDomain );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		if ( flags & kDNSServiceFlagsAdd )
+
+		{
+
+			eventManager->Fire_DomainFound( service, ( DNSSDFlags ) flags, ifIndex, replyDomain );
+
+		}
+
+		else
+
+		{
+
+			eventManager->Fire_DomainLost( service, ( DNSSDFlags ) flags, ifIndex, replyDomain );
+
+		}
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::BrowseReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *serviceNameUTF8,
+		const char                          *regTypeUTF8,
+		const char                          *replyDomainUTF8,
+		void                                *context
+		)
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR	serviceName;
+
+		CComBSTR	regType;
+
+		CComBSTR	replyDomain;
+
+	
+
+		UTF8ToBSTR( serviceNameUTF8, serviceName );
+
+		UTF8ToBSTR( regTypeUTF8, regType );
+
+		UTF8ToBSTR( replyDomainUTF8, replyDomain );
+
+
+
+		if ( flags & kDNSServiceFlagsAdd )
+
+		{
+
+			eventManager->Fire_ServiceFound( service, ( DNSSDFlags ) flags, ifIndex, serviceName, regType, replyDomain );
+
+		}
+
+		else
+
+		{
+
+			eventManager->Fire_ServiceLost( service, ( DNSSDFlags ) flags, ifIndex, serviceName, regType, replyDomain );
+
+		}
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+
+CDNSSDService::ResolveReply
+
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullNameUTF8,
+		const char                          *hostNameUTF8,
+		uint16_t                            port,
+		uint16_t                            txtLen,
+		const unsigned char                 *txtRecord,
+		void                                *context
+
+		)
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR					fullName;
+
+		CComBSTR					hostName;
+
+		CComBSTR					regType;
+
+		CComBSTR					replyDomain;
+
+		CComObject< CTXTRecord >*	record;
+
+		BOOL						ok;
+
+
+
+		ok = UTF8ToBSTR( fullNameUTF8, fullName );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+		ok = UTF8ToBSTR( hostNameUTF8, hostName );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		try
+
+		{
+
+			record = new CComObject<CTXTRecord>();
+
+		}
+
+		catch ( ... )
+
+		{
+
+			record = NULL;
+
+		}
+
+
+
+		require_action( record, exit, err = kDNSServiceErr_NoMemory );
+
+		record->AddRef();
+
+
+
+		if ( txtLen > 0 )
+
+		{
+
+			record->SetBytes( txtRecord, txtLen );
+
+		}
+
+
+
+		eventManager->Fire_ServiceResolved( service, ( DNSSDFlags ) flags, ifIndex, fullName, hostName, ntohs( port ), record );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::RegisterReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		DNSServiceErrorType                 errorCode,
+		const char                          *serviceNameUTF8,
+		const char                          *regTypeUTF8,
+		const char                          *domainUTF8,
+		void                                *context
+		)
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR					serviceName;
+
+		CComBSTR					regType;
+
+		CComBSTR					domain;
+
+		BOOL						ok;
+
+
+
+		ok = UTF8ToBSTR( serviceNameUTF8, serviceName );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+		ok = UTF8ToBSTR( regTypeUTF8, regType );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+		ok = UTF8ToBSTR( domainUTF8, domain );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		eventManager->Fire_ServiceRegistered( service, ( DNSSDFlags ) flags, serviceName, regType, domain );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::QueryRecordReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullNameUTF8,
+		uint16_t                            rrtype,
+		uint16_t                            rrclass,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl,
+		void                                *context
+		)
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR	fullName;
+
+		VARIANT		var;
+
+		BOOL		ok;
+
+
+
+		ok = UTF8ToBSTR( fullNameUTF8, fullName );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+		ok = ByteArrayToVariant( rdata, rdlen, &var );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		eventManager->Fire_QueryRecordAnswered( service, ( DNSSDFlags ) flags, ifIndex, fullName, ( DNSSDRRType ) rrtype, ( DNSSDRRClass ) rrclass, var, ttl );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::GetAddrInfoReply
+		(
+		DNSServiceRef                    sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         ifIndex,
+		DNSServiceErrorType              errorCode,
+		const char                       *hostNameUTF8,
+		const struct sockaddr            *rawAddress,
+		uint32_t                         ttl,
+		void                             *context
+		)
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		CComBSTR			hostName;
+
+		DWORD				sockaddrLen;
+
+		DNSSDAddressFamily	addressFamily;
+
+		char				addressUTF8[INET6_ADDRSTRLEN];
+
+		DWORD				addressLen = sizeof( addressUTF8 );
+
+		CComBSTR			address;
+
+		BOOL				ok;
+
+
+
+		ok = UTF8ToBSTR( hostNameUTF8, hostName );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		switch ( rawAddress->sa_family )
+
+		{
+
+			case AF_INET:
+
+			{
+
+				addressFamily	= kDNSSDAddressFamily_IPv4;
+
+				sockaddrLen		= sizeof( sockaddr_in );
+
+			}
+
+			break;
+
+
+
+			case AF_INET6:
+
+			{
+
+				addressFamily	= kDNSSDAddressFamily_IPv6;
+
+				sockaddrLen		= sizeof( sockaddr_in6 );
+
+			}
+
+			break;
+
+		}
+
+
+
+		err = WSAAddressToStringA( ( LPSOCKADDR ) rawAddress, sockaddrLen, NULL, addressUTF8, &addressLen );
+
+		require_noerr( err, exit );
+
+		ok = UTF8ToBSTR( addressUTF8, address );
+
+		require_action( ok, exit, err = kDNSServiceErr_Unknown );
+
+
+
+		eventManager->Fire_AddressFound( service, ( DNSSDFlags ) flags, ifIndex, hostName, addressFamily, address, ttl );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::NATPortMappingReply
+    (
+    DNSServiceRef                    sdRef,
+    DNSServiceFlags                  flags,
+    uint32_t                         ifIndex,
+    DNSServiceErrorType              errorCode,
+    uint32_t                         externalAddress,   /* four byte IPv4 address in network byte order */
+    DNSServiceProtocol               protocol,
+    uint16_t                         internalPort,
+    uint16_t                         externalPort,      /* may be different than the requested port     */
+    uint32_t                         ttl,               /* may be different than the requested ttl      */
+    void                             *context
+    )
+
+{
+
+	CComObject<CDNSSDService>	* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	service = ( CComObject< CDNSSDService>* ) context;
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		eventManager->Fire_MappingCreated( service, ( DNSSDFlags ) flags, ifIndex, externalAddress, ( DNSSDAddressFamily ) ( protocol & 0x8 ), ( DNSSDProtocol ) ( protocol & 0x80 ), ntohs( internalPort ), ntohs( externalPort ), ttl  );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+void DNSSD_API
+CDNSSDService::RegisterRecordReply
+		(
+		DNSServiceRef		sdRef,
+		DNSRecordRef		RecordRef,
+		DNSServiceFlags		flags,
+		DNSServiceErrorType	errorCode,
+		void				*context
+		)
+
+{
+
+	CComObject<CDNSSDRecord>	* record		= NULL;
+
+	CDNSSDService				* service		= NULL;
+
+	CDNSSDEventManager			* eventManager	= NULL;
+
+	int err = 0;
+
+	
+
+	record = ( CComObject< CDNSSDRecord >* ) context;
+
+	require_action( record, exit, err = kDNSServiceErr_Unknown );
+
+	service = record->GetServiceObject();
+
+	require_action( service, exit, err = kDNSServiceErr_Unknown );
+
+
+
+	if ( service->ShouldHandleReply( errorCode, eventManager ) )
+
+	{
+
+		eventManager->Fire_RecordRegistered( record, ( DNSSDFlags ) flags );
+
+	}
+
+
+
+exit:
+
+
+
+	return;
+
+}
+
+
+
+
+
+BOOL
+
+CDNSSDService::ShouldHandleReply( DNSServiceErrorType errorCode, CDNSSDEventManager *& eventManager )
+
+{
+
+	BOOL ok = FALSE;
+
+
+
+	if ( !this->Stopped() )
+
+	{
+
+		eventManager = this->GetEventManager();
+
+		require_action( eventManager, exit, ok = FALSE );
+
+
+
+		if ( !errorCode )
+
+		{
+
+			ok = TRUE;
+
+		}
+
+		else
+
+		{
+
+			eventManager->Fire_OperationFailed( this, ( DNSSDError ) errorCode );
+
+		}
+
+	}
+
+
+
+exit:
+
+
+
+	return ok;
+
+}
+
+
+
+
+
+LRESULT CALLBACK
+
+CDNSSDService::WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
+
+{
+
+	if ( msg == WM_SOCKET )
+
+	{
+
+		SocketMap::iterator it;
+
+			
+
+		it = m_socketMap.find( ( SOCKET ) wParam );
+
+		check( it != m_socketMap.end() );
+
+
+
+		if ( it != m_socketMap.end() )
+
+		{
+
+			DNSServiceProcessResult( it->second->m_primary );
+
+		}
+
+	}
+
+
+
+	return DefWindowProc(hWnd, msg, wParam, lParam);;
+
+}
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDService.h b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.h
new file mode 100755
index 00000000..5eb8dcbd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.h
@@ -0,0 +1,429 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+#include "resource.h"       // main symbols
+
+
+
+#include "DLLX.h"
+
+#include "DNSSDEventManager.h"
+
+#include <CommonServices.h>
+
+#include <DebugServices.h>
+
+#include <dns_sd.h>
+
+#include <map>
+
+
+
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+
+#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
+
+#endif
+
+
+
+
+
+
+
+// CDNSSDService
+
+
+
+class ATL_NO_VTABLE CDNSSDService :
+
+	public CComObjectRootEx<CComSingleThreadModel>,
+
+	public CComCoClass<CDNSSDService, &CLSID_DNSSDService>,
+
+	public IDispatchImpl<IDNSSDService, &IID_IDNSSDService, &LIBID_Bonjour, /*wMajor =*/ 1, /*wMinor =*/ 0>
+
+{
+
+public:
+
+
+
+	typedef CComObjectRootEx<CComSingleThreadModel> Super;
+
+
+
+	CDNSSDService()
+
+	:
+
+		m_isPrimary( FALSE ),
+
+		m_eventManager( NULL ),
+
+		m_stopped( FALSE ),
+
+		m_primary( NULL ),
+
+		m_subord( NULL )
+
+	{
+
+	}
+
+
+
+DECLARE_REGISTRY_RESOURCEID(IDR_DNSSDSERVICE)
+
+
+
+
+
+BEGIN_COM_MAP(CDNSSDService)
+
+	COM_INTERFACE_ENTRY(IDNSSDService)
+
+	COM_INTERFACE_ENTRY(IDispatch)
+
+END_COM_MAP()
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+
+
+	HRESULT
+
+	FinalConstruct();
+
+
+
+	void 
+
+	FinalRelease();
+
+
+
+public:
+
+
+
+	inline DNSServiceRef
+
+	GetPrimaryRef()
+
+	{
+
+		return m_primary;
+
+	}
+
+
+
+	inline void
+
+	SetPrimaryRef( DNSServiceRef primary )
+
+	{
+
+		m_primary = primary;
+
+	}
+
+
+
+	inline DNSServiceRef
+
+	GetSubordRef()
+
+	{
+
+		return m_subord;
+
+	}
+
+
+
+	inline void
+
+	SetSubordRef( DNSServiceRef subord )
+
+	{
+
+		m_subord = subord;
+
+	}
+
+
+
+	inline CDNSSDEventManager*
+
+	GetEventManager()
+
+	{
+
+		return m_eventManager;
+
+	}
+
+
+
+	inline void
+
+	SetEventManager( IDNSSDEventManager * eventManager )
+
+	{
+
+		if ( m_eventManager )
+
+		{
+
+			m_eventManager->Release();
+
+			m_eventManager = NULL;
+
+		}
+
+
+
+		if ( eventManager )
+
+		{
+
+			m_eventManager = dynamic_cast< CDNSSDEventManager* >( eventManager );
+
+			check( m_eventManager );
+
+			m_eventManager->AddRef();
+
+		}
+
+	}
+
+
+
+	inline BOOL
+
+	Stopped()
+
+	{
+
+		return m_stopped;
+
+	}
+
+
+
+private:
+
+
+
+	static void DNSSD_API
+	DomainEnumReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            ifIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *replyDomain,
+		void                                *context
+		);
+
+
+
+	static void DNSSD_API
+	BrowseReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *serviceName,
+		const char                          *regtype,
+		const char                          *replyDomain,
+		void                                *context
+		);
+
+
+
+	static void DNSSD_API
+
+	ResolveReply
+
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullname,
+		const char                          *hosttarget,
+		uint16_t                            port,
+		uint16_t                            txtLen,
+		const unsigned char                 *txtRecord,
+		void                                *context
+
+		);
+
+
+
+	static void DNSSD_API
+	RegisterReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		DNSServiceErrorType                 errorCode,
+		const char                          *name,
+		const char                          *regtype,
+		const char                          *domain,
+		void                                *context
+		);
+
+
+
+	static void DNSSD_API
+	QueryRecordReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSServiceFlags                     flags,
+		uint32_t                            interfaceIndex,
+		DNSServiceErrorType                 errorCode,
+		const char                          *fullname,
+		uint16_t                            rrtype,
+		uint16_t                            rrclass,
+		uint16_t                            rdlen,
+		const void                          *rdata,
+		uint32_t                            ttl,
+		void                                *context
+		);
+
+
+
+	static void DNSSD_API
+    GetAddrInfoReply
+		(
+		DNSServiceRef                    sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         interfaceIndex,
+		DNSServiceErrorType              errorCode,
+		const char                       *hostname,
+		const struct sockaddr            *address,
+		uint32_t                         ttl,
+		void                             *context
+		);
+
+
+
+	static void DNSSD_API
+	NATPortMappingReply
+		(
+		DNSServiceRef                    sdRef,
+		DNSServiceFlags                  flags,
+		uint32_t                         interfaceIndex,
+		DNSServiceErrorType              errorCode,
+		uint32_t                         externalAddress,   /* four byte IPv4 address in network byte order */
+		DNSServiceProtocol               protocol,
+		uint16_t                         internalPort,
+		uint16_t                         externalPort,      /* may be different than the requested port     */
+		uint32_t                         ttl,               /* may be different than the requested ttl      */
+		void                             *context
+		);
+
+
+
+	static void DNSSD_API
+	RegisterRecordReply
+		(
+		DNSServiceRef                       sdRef,
+		DNSRecordRef                        RecordRef,
+		DNSServiceFlags                     flags,
+		DNSServiceErrorType                 errorCode,
+		void                                *context
+		);
+
+
+
+	inline BOOL
+
+	ShouldHandleReply( DNSServiceErrorType errorCode, CDNSSDEventManager *& eventManager );
+
+	
+
+	static LRESULT CALLBACK
+
+	WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam );
+
+
+
+	typedef std::map< SOCKET, CDNSSDService* > SocketMap;
+
+
+
+	static BOOL				m_registeredWindowClass;
+
+	static HWND				m_hiddenWindow;
+
+	static SocketMap		m_socketMap;
+
+	CDNSSDEventManager	*	m_eventManager;
+
+	BOOL					m_stopped;
+
+	BOOL					m_isPrimary;
+
+	DNSServiceRef			m_primary;
+
+	DNSServiceRef			m_subord;
+
+public:
+
+	STDMETHOD(EnumerateDomains)(DNSSDFlags flags, ULONG ifIndex, IDNSSDEventManager *eventManager, IDNSSDService **service);  
+
+	STDMETHOD(Browse)(DNSSDFlags flags, ULONG interfaceIndex, BSTR regtype, BSTR domain, IDNSSDEventManager* eventManager, IDNSSDService** sdref);
+
+	STDMETHOD(Resolve)(DNSSDFlags flags, ULONG ifIndex, BSTR serviceName, BSTR regType, BSTR domain, IDNSSDEventManager* eventManager, IDNSSDService** service);
+
+	STDMETHOD(Register)(DNSSDFlags flags, ULONG ifIndex, BSTR name, BSTR regType, BSTR domain, BSTR host, USHORT port, ITXTRecord *record, IDNSSDEventManager *eventManager, IDNSSDService **service);
+
+	STDMETHOD(QueryRecord)(DNSSDFlags flags, ULONG ifIndex, BSTR fullname, DNSSDRRType rrtype, DNSSDRRClass rrclass, IDNSSDEventManager *eventManager, IDNSSDService **service);      
+
+	STDMETHOD(RegisterRecord)(DNSSDFlags flags, ULONG ifIndex, BSTR fullname, DNSSDRRType rrtype, DNSSDRRClass rrclass, VARIANT rdata, ULONG ttl, IDNSSDEventManager* eventManager, IDNSSDRecord** record);
+
+	STDMETHOD(AddRecord)(DNSSDFlags flags, DNSSDRRType rrtype, VARIANT rdata, ULONG ttl, IDNSSDRecord ** record);
+
+	STDMETHOD(ReconfirmRecord)(DNSSDFlags flags, ULONG ifIndex, BSTR fullname, DNSSDRRType rrtype, DNSSDRRClass rrclass, VARIANT rdata);
+
+	STDMETHOD(GetProperty)(BSTR prop, VARIANT * value);
+
+	STDMETHOD(GetAddrInfo)(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, BSTR hostname, IDNSSDEventManager *eventManager, IDNSSDService **service);      
+
+	STDMETHOD(NATPortMappingCreate)(DNSSDFlags flags, ULONG ifIndex, DNSSDAddressFamily addressFamily, DNSSDProtocol protocol, USHORT internalPort, USHORT externalPort, ULONG ttl, IDNSSDEventManager *eventManager, IDNSSDService **service);
+
+	STDMETHOD(Stop)(void);
+
+};
+
+
+
+OBJECT_ENTRY_AUTO(__uuidof(DNSSDService), CDNSSDService)
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/DNSSDService.rgs b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.rgs
new file mode 100755
index 00000000..8a842977
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/DNSSDService.rgs
@@ -0,0 +1,27 @@
+HKCR

+{

+	Bonjour.DNSSDService.1 = s 'DNSSDService Class'

+	{

+		CLSID = s '{24CD4DE9-FF84-4701-9DC1-9B69E0D1090A}'

+	}

+	Bonjour.DNSSDService = s 'DNSSDService Class'

+	{

+		CLSID = s '{24CD4DE9-FF84-4701-9DC1-9B69E0D1090A}'

+		CurVer = s 'Bonjour.DNSSDService.1'

+	}

+	NoRemove CLSID

+	{

+		ForceRemove {24CD4DE9-FF84-4701-9DC1-9B69E0D1090A} = s 'DNSSDService Class'

+		{

+			ProgID = s 'Bonjour.DNSSDService.1'

+			VersionIndependentProgID = s 'Bonjour.DNSSDService'

+			ForceRemove 'Programmable'

+			InprocServer32 = s '%MODULE%'

+			{

+				val ThreadingModel = s 'Apartment'

+			}

+			val AppID = s '%APPID%'

+			'TypeLib' = s '{18FBED6D-F2B7-4EC8-A4A4-46282E635308}'

+		}

+	}

+}

diff --git a/mDNSResponder/mDNSWindows/DLLX/StringServices.cpp b/mDNSResponder/mDNSWindows/DLLX/StringServices.cpp
new file mode 100755
index 00000000..87f7aa99
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/StringServices.cpp
@@ -0,0 +1,344 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#include "StringServices.h"
+
+#include <DebugServices.h>
+
+
+
+
+
+extern BOOL
+
+BSTRToUTF8
+
+	(
+
+	BSTR			inString,
+
+	std::string	&	outString
+
+	)
+
+{
+
+	USES_CONVERSION;
+
+	
+
+	char	*	utf8String	= NULL;
+
+	OSStatus    err			= kNoErr;
+
+
+
+	outString = "";
+
+	if ( inString )
+
+	{
+		TCHAR	*	utf16String	= NULL;
+		size_t      size		= 0;
+
+
+		utf16String = OLE2T( inString );
+
+		require_action( utf16String != NULL, exit, err = kUnknownErr );
+
+
+
+		if ( wcslen( utf16String ) > 0 )
+
+		{
+
+			size = (size_t) WideCharToMultiByte( CP_UTF8, 0, utf16String, ( int ) wcslen( utf16String ), NULL, 0, NULL, NULL );
+
+			err = translate_errno( size != 0, GetLastError(), kUnknownErr );
+
+			require_noerr( err, exit );
+
+
+
+			try
+
+			{
+
+				utf8String = new char[ size + 1 ];
+
+			}
+
+			catch ( ... )
+
+			{
+
+				utf8String = NULL;
+
+			}
+
+
+
+			require_action( utf8String != NULL, exit, err = kNoMemoryErr );
+
+			size = (size_t) WideCharToMultiByte( CP_UTF8, 0, utf16String, ( int ) wcslen( utf16String ), utf8String, (int) size, NULL, NULL);
+
+			err = translate_errno( size != 0, GetLastError(), kUnknownErr );
+
+			require_noerr( err, exit );
+
+
+
+			// have to add the trailing 0 because WideCharToMultiByte doesn't do it,
+
+			// although it does return the correct size
+
+
+
+			utf8String[size] = '\0';
+
+			outString = utf8String;
+
+		}
+	}
+
+
+
+exit:
+
+
+
+	if ( utf8String != NULL )
+
+	{
+
+		delete [] utf8String;
+
+	}
+
+
+
+	return ( !err ) ? TRUE : FALSE;
+
+}
+
+
+
+
+
+extern BOOL
+
+UTF8ToBSTR
+
+	(
+
+	const char	*	inString,
+
+	CComBSTR	&	outString
+
+	)
+
+{
+
+	wchar_t	*	unicode	= NULL;
+
+	OSStatus	err		= 0;
+
+
+
+	if ( inString )
+
+	{
+		int n;
+
+		n = MultiByteToWideChar( CP_UTF8, 0, inString, -1, NULL, 0 );
+
+	    
+
+		if ( n > 0 )
+
+		{
+
+			try
+
+			{
+
+				unicode = new wchar_t[ n ];
+
+			}
+
+			catch ( ... )
+
+			{
+
+				unicode = NULL;
+
+			}
+
+
+
+			require_action( unicode, exit, err = ERROR_INSUFFICIENT_BUFFER );
+
+
+
+			n = MultiByteToWideChar( CP_UTF8, 0, inString, -1, unicode, n );
+
+		}
+
+
+
+		outString = unicode;
+
+	}
+
+
+exit:
+
+
+
+    if ( unicode != NULL )
+
+    {
+
+        delete [] unicode;
+
+	}
+
+
+
+	return ( !err ) ? TRUE : FALSE;
+
+}
+
+
+
+
+
+BOOL
+
+ByteArrayToVariant
+
+	(
+
+	const void	*	inArray,
+
+	size_t			inArrayLen,
+
+	VARIANT		*	outVariant
+
+	)
+
+{
+
+	LPBYTE			buf	= NULL;
+
+	HRESULT			hr	= 0;
+
+	BOOL			ok	= TRUE;
+
+
+
+	VariantClear( outVariant );
+
+	outVariant->vt		= VT_ARRAY|VT_UI1;
+
+	outVariant->parray	= SafeArrayCreateVector( VT_UI1, 0, ( ULONG ) inArrayLen );
+
+	require_action( outVariant->parray, exit, ok = FALSE );
+
+	hr = SafeArrayAccessData( outVariant->parray, (LPVOID *)&buf );
+
+	require_action( hr == S_OK, exit, ok = FALSE );
+
+	memcpy( buf, inArray, inArrayLen );
+
+	hr = SafeArrayUnaccessData( outVariant->parray );
+
+	require_action( hr == S_OK, exit, ok = FALSE );
+
+
+
+exit:
+
+
+
+	return ok;
+
+}
+
+
+
+
+
+extern BOOL
+
+VariantToByteArray
+	(
+	VARIANT				*	inVariant,
+	std::vector< BYTE >	&	outArray
+	)
+{
+	BOOL ok = TRUE;
+
+	if ( V_VT( inVariant ) == VT_BSTR )
+	{
+		BSTR bstr = V_BSTR( inVariant );
+		std::string utf8;
+
+		BSTRToUTF8( bstr, utf8 );
+
+		outArray.reserve( utf8.size() );
+		outArray.assign( utf8.begin(), utf8.end() );
+	}
+	else if ( V_VT( inVariant ) == VT_ARRAY )
+	{
+		SAFEARRAY	*	psa			= NULL;
+		BYTE		*	pData		= NULL;
+		ULONG			cElements	= 0;
+		HRESULT			hr;
+		
+		psa = V_ARRAY( inVariant );
+
+		require_action( psa, exit, ok = FALSE );
+
+		require_action( SafeArrayGetDim( psa ) == 1, exit, ok = FALSE );
+
+		hr = SafeArrayAccessData( psa, ( LPVOID* )&pData );
+
+		require_action( hr == S_OK, exit, ok = FALSE );
+
+		cElements = psa->rgsabound[0].cElements;
+
+		outArray.reserve( cElements );
+
+		outArray.assign( cElements, 0 );
+
+		memcpy( &outArray[ 0 ], pData, cElements );
+
+		SafeArrayUnaccessData( psa );
+	}
+	else
+	{
+		ok = FALSE;
+	}
+
+exit:
+
+	return ok;
+
+}
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLX/StringServices.h b/mDNSResponder/mDNSWindows/DLLX/StringServices.h
new file mode 100755
index 00000000..12aa9968
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/StringServices.h
@@ -0,0 +1,102 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#ifndef _StringServices_h
+
+#define _StringServices_h
+
+
+
+#include <atlbase.h>
+
+#include <vector>
+
+#include <string>
+
+
+
+
+
+extern BOOL
+
+BSTRToUTF8
+
+	(
+
+	BSTR			inString,
+
+	std::string	&	outString
+
+	);
+
+
+
+
+
+extern BOOL
+
+UTF8ToBSTR
+
+	(
+
+	const char	*	inString,
+
+	CComBSTR	&	outString
+
+	);
+
+
+
+
+
+extern BOOL
+
+ByteArrayToVariant
+
+	(
+
+	const void	*	inArray,
+
+	size_t			inArrayLen,
+
+	VARIANT		*	outVariant
+
+	);
+
+
+
+
+
+extern BOOL
+
+VariantToByteArray
+
+	(
+
+	VARIANT				*	inVariant,
+
+	std::vector< BYTE >	&	outArray
+
+	);
+
+
+
+
+
+#endif
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DLLX/TXTRecord.cpp b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.cpp
new file mode 100755
index 00000000..2ebb67e0
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.cpp
@@ -0,0 +1,382 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#include "stdafx.h"
+
+#include "TXTRecord.h"
+
+#include "StringServices.h"
+
+#include <DebugServices.h>
+
+
+
+
+
+// CTXTRecord
+
+
+
+
+
+STDMETHODIMP CTXTRecord::SetValue(BSTR key, VARIANT value)
+
+{
+
+	std::string			keyUTF8;
+
+	ByteArray			valueArray;
+
+	BOOL				ok;
+
+	DNSServiceErrorType	err;
+
+	HRESULT				hr = S_OK;
+
+
+
+	if ( !m_allocated )
+
+	{
+
+		TXTRecordCreate( &m_tref, 0, NULL );
+
+		m_allocated = TRUE;
+
+	}
+
+
+
+	ok = BSTRToUTF8( key, keyUTF8 );
+
+	require_action( ok, exit, hr = S_FALSE );
+
+
+
+	ok = VariantToByteArray( &value, valueArray );
+
+	require_action( ok, exit, hr = S_FALSE );
+
+
+
+	err = TXTRecordSetValue( &m_tref, keyUTF8.c_str(), ( uint8_t ) valueArray.size(), &valueArray[ 0 ] );
+
+	require_action( !err, exit, hr = S_FALSE );
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::RemoveValue(BSTR key)
+
+{
+
+	HRESULT hr = S_OK;
+
+
+
+	if ( m_allocated )
+
+	{
+
+		std::string			keyUTF8;
+
+		BOOL				ok;
+
+		DNSServiceErrorType	err;
+
+
+
+		ok = BSTRToUTF8( key, keyUTF8 );
+
+		require_action( ok, exit, hr = S_FALSE );
+
+
+
+		err = TXTRecordRemoveValue( &m_tref, keyUTF8.c_str() );
+
+		require_action( !err, exit, hr = S_FALSE );
+
+	}
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::ContainsKey(BSTR key, VARIANT_BOOL* retval)
+
+{
+
+	std::string keyUTF8;
+
+	int			ret	= 0;
+
+	HRESULT		err	= S_OK;
+
+
+
+	if ( m_byteArray.size() > 0 )
+
+	{
+
+		BOOL ok;
+
+
+
+		ok = BSTRToUTF8( key, keyUTF8 );
+
+		require_action( ok, exit, err = S_FALSE );
+
+
+
+		ret = TXTRecordContainsKey( ( uint16_t ) m_byteArray.size(), &m_byteArray[ 0 ], keyUTF8.c_str() );
+
+	}
+
+
+
+	*retval = ( ret ) ? VARIANT_TRUE : VARIANT_FALSE;
+
+
+
+exit:
+
+
+
+	return err;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::GetValueForKey(BSTR key, VARIANT* value)
+
+{
+
+	std::string		keyUTF8;
+
+	const void	*	rawValue;
+
+	uint8_t			rawValueLen;
+
+	BOOL			ok	= TRUE;
+
+	HRESULT			hr	= S_OK;
+
+
+
+	VariantClear( value );
+
+
+
+	if ( m_byteArray.size() > 0 )
+
+	{
+
+		ok = BSTRToUTF8( key, keyUTF8 );
+
+		require_action( ok, exit, hr = S_FALSE );
+
+
+
+		rawValue = TXTRecordGetValuePtr( ( uint16_t ) m_byteArray.size(), &m_byteArray[ 0 ], keyUTF8.c_str(), &rawValueLen );
+
+
+
+		if ( rawValue )
+
+		{
+
+			ok = ByteArrayToVariant( rawValue, rawValueLen, value );
+
+			require_action( ok, exit, hr = S_FALSE );
+
+		}
+
+	}
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::GetCount(ULONG* count)
+
+{
+
+	*count = 0;
+
+	if ( m_allocated )
+	{
+		*count = TXTRecordGetCount( TXTRecordGetLength( &m_tref ), TXTRecordGetBytesPtr( &m_tref ) );
+	}
+	else if ( m_byteArray.size() > 0 )
+	{
+
+		*count = TXTRecordGetCount( ( uint16_t ) m_byteArray.size(), &m_byteArray[ 0 ] );
+
+	}
+
+
+
+	return S_OK;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::GetKeyAtIndex(ULONG index, BSTR* retval)
+
+{
+
+	char				keyBuf[ 64 ];
+
+	uint8_t				rawValueLen;
+
+	const void		*	rawValue;
+
+	CComBSTR			temp;
+
+	DNSServiceErrorType	err;
+
+	BOOL				ok;
+
+	HRESULT				hr = S_OK;
+
+
+
+	err = TXTRecordGetItemAtIndex( ( uint16_t ) m_byteArray.size(), &m_byteArray[ 0 ], ( uint16_t ) index, sizeof( keyBuf ), keyBuf, &rawValueLen, &rawValue );
+
+	require_action( !err, exit, hr = S_FALSE );
+
+
+
+	ok = UTF8ToBSTR( keyBuf, temp );
+
+	require_action( ok, exit, hr = S_FALSE );
+
+
+
+	*retval = temp;
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+STDMETHODIMP CTXTRecord::GetValueAtIndex(ULONG index, VARIANT* retval)
+
+{
+
+	char				keyBuf[ 64 ];
+
+	uint8_t				rawValueLen;
+
+	const void		*	rawValue;
+
+	CComBSTR			temp;
+
+	DNSServiceErrorType	err;
+
+	BOOL				ok;
+
+	HRESULT				hr = S_OK;
+
+
+
+	err = TXTRecordGetItemAtIndex( ( uint16_t ) m_byteArray.size(), &m_byteArray[ 0 ], ( uint16_t ) index, sizeof( keyBuf ), keyBuf, &rawValueLen, &rawValue );
+
+	require_action( !err, exit, hr = S_FALSE );
+
+
+
+	ok = ByteArrayToVariant( rawValue, rawValueLen, retval );
+
+	require_action( ok, exit, hr = S_FALSE );
+
+
+
+exit:
+
+
+
+	return hr;
+
+}
+
+
+
+
+
+void
+
+CTXTRecord::SetBytes
+
+	(
+
+	const unsigned char	*	bytes,
+
+	uint16_t				len
+
+	)
+
+{
+
+	check ( bytes != NULL );
+
+	check( len );
+
+
+
+	m_byteArray.reserve( len );
+
+	m_byteArray.assign( bytes, bytes + len );
+
+}
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/TXTRecord.h b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.h
new file mode 100755
index 00000000..67f3bdc3
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.h
@@ -0,0 +1,203 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+#include "resource.h"       // main symbols
+
+#include "DLLX.h"
+
+#include <vector>
+
+#include <dns_sd.h>
+
+
+
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+
+#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
+
+#endif
+
+
+
+
+
+
+
+// CTXTRecord
+
+
+
+class ATL_NO_VTABLE CTXTRecord :
+
+	public CComObjectRootEx<CComSingleThreadModel>,
+
+	public CComCoClass<CTXTRecord, &CLSID_TXTRecord>,
+
+	public IDispatchImpl<ITXTRecord, &IID_ITXTRecord, &LIBID_Bonjour, /*wMajor =*/ 1, /*wMinor =*/ 0>
+
+{
+
+public:
+
+	CTXTRecord()
+
+	:
+
+		m_allocated( FALSE )
+
+	{
+
+	}
+
+
+
+DECLARE_REGISTRY_RESOURCEID(IDR_TXTRECORD)
+
+
+
+
+
+BEGIN_COM_MAP(CTXTRecord)
+
+	COM_INTERFACE_ENTRY(ITXTRecord)
+
+	COM_INTERFACE_ENTRY(IDispatch)
+
+END_COM_MAP()
+
+
+
+
+
+
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+
+
+	HRESULT FinalConstruct()
+
+	{
+
+		return S_OK;
+
+	}
+
+
+
+	void FinalRelease()
+
+	{
+
+		if ( m_allocated )
+
+		{
+
+			TXTRecordDeallocate( &m_tref );
+
+		}
+
+	}
+
+
+
+public:
+
+
+
+	STDMETHOD(SetValue)(BSTR key, VARIANT value);
+
+	STDMETHOD(RemoveValue)(BSTR key);
+
+	STDMETHOD(ContainsKey)(BSTR key, VARIANT_BOOL* retval);
+
+	STDMETHOD(GetValueForKey)(BSTR key, VARIANT* value);
+
+	STDMETHOD(GetCount)(ULONG* count);
+
+	STDMETHOD(GetKeyAtIndex)(ULONG index, BSTR* retval);
+
+	STDMETHOD(GetValueAtIndex)(ULONG index, VARIANT* retval);
+
+
+
+private:
+
+
+
+	typedef std::vector< BYTE > ByteArray;
+
+	ByteArray		m_byteArray;
+
+	BOOL			m_allocated;
+
+	TXTRecordRef	m_tref;
+
+
+
+public:
+
+
+
+	uint16_t
+
+	GetLen()
+
+	{
+
+		return TXTRecordGetLength( &m_tref );
+
+	}
+
+
+
+	const void*
+
+	GetBytes()
+
+	{
+
+		return TXTRecordGetBytesPtr( &m_tref );
+
+	}
+
+
+
+	void
+
+	SetBytes
+
+		(
+
+		const unsigned char	*	bytes,
+
+		uint16_t				len
+
+		);
+
+};
+
+
+
+OBJECT_ENTRY_AUTO(__uuidof(TXTRecord), CTXTRecord)
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/TXTRecord.rgs b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.rgs
new file mode 100755
index 00000000..ce2fe1ec
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/TXTRecord.rgs
@@ -0,0 +1,27 @@
+HKCR

+{

+	Bonjour.TXTRecord.1 = s 'TXTRecord Class'

+	{

+		CLSID = s '{AFEE063C-05BA-4248-A26E-168477F49734}'

+	}

+	Bonjour.TXTRecord = s 'TXTRecord Class'

+	{

+		CLSID = s '{AFEE063C-05BA-4248-A26E-168477F49734}'

+		CurVer = s 'Bonjour.TXTRecord.1'

+	}

+	NoRemove CLSID

+	{

+		ForceRemove {AFEE063C-05BA-4248-A26E-168477F49734} = s 'TXTRecord Class'

+		{

+			ProgID = s 'Bonjour.TXTRecord.1'

+			VersionIndependentProgID = s 'Bonjour.TXTRecord'

+			ForceRemove 'Programmable'

+			InprocServer32 = s '%MODULE%'

+			{

+				val ThreadingModel = s 'Apartment'

+			}

+			val AppID = s '%APPID%'

+			'TypeLib' = s '{18FBED6D-F2B7-4EC8-A4A4-46282E635308}'

+		}

+	}

+}

diff --git a/mDNSResponder/mDNSWindows/DLLX/_IDNSSDEvents_CP.h b/mDNSResponder/mDNSWindows/DLLX/_IDNSSDEvents_CP.h
new file mode 100755
index 00000000..90d778fa
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/_IDNSSDEvents_CP.h
@@ -0,0 +1,358 @@
+
+// Wizard-generated connection point proxy class
+// WARNING: This file may be regenerated by the wizard
+
+
+#pragma once
+
+template<class T>
+class CProxy_IDNSSDEvents :
+	public IConnectionPointImpl<T, &__uuidof(_IDNSSDEvents)>
+{
+public:
+	HRESULT Fire_DomainFound( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  BSTR domain)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[4];
+				avarParams[3] = service;
+				avarParams[2] = flags;
+				avarParams[1] = ifIndex;
+				avarParams[1].vt = VT_UI4;
+				avarParams[0] = domain;
+				avarParams[0].vt = VT_BSTR;
+				DISPPARAMS params = { avarParams, NULL, 4, 0 };
+				hr = pConnection->Invoke(1, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_DomainLost( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  BSTR domain)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[4];
+				avarParams[3] = service;
+				avarParams[2] = flags;
+				avarParams[1] = ifIndex;
+				avarParams[1].vt = VT_UI4;
+				avarParams[0] = domain;
+				avarParams[0].vt = VT_BSTR;
+				DISPPARAMS params = { avarParams, NULL, 4, 0 };
+				hr = pConnection->Invoke(2, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_ServiceFound( IDNSSDService * browser,  DNSSDFlags flags,  ULONG ifIndex,  BSTR serviceName,  BSTR regType,  BSTR domain)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[6];
+				avarParams[5] = browser;
+				avarParams[4] = flags;
+				avarParams[3] = ifIndex;
+				avarParams[3].vt = VT_UI4;
+				avarParams[2] = serviceName;
+				avarParams[2].vt = VT_BSTR;
+				avarParams[1] = regType;
+				avarParams[1].vt = VT_BSTR;
+				avarParams[0] = domain;
+				avarParams[0].vt = VT_BSTR;
+				DISPPARAMS params = { avarParams, NULL, 6, 0 };
+				hr = pConnection->Invoke(3, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_ServiceLost( IDNSSDService * browser,  DNSSDFlags flags,  ULONG ifIndex,  BSTR serviceName,  BSTR regType,  BSTR domain)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[6];
+				avarParams[5] = browser;
+				avarParams[4] = flags;
+				avarParams[3] = ifIndex;
+				avarParams[3].vt = VT_UI4;
+				avarParams[2] = serviceName;
+				avarParams[2].vt = VT_BSTR;
+				avarParams[1] = regType;
+				avarParams[1].vt = VT_BSTR;
+				avarParams[0] = domain;
+				avarParams[0].vt = VT_BSTR;
+				DISPPARAMS params = { avarParams, NULL, 6, 0 };
+				hr = pConnection->Invoke(4, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_ServiceResolved( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  BSTR fullName,  BSTR hostName,  USHORT port,  ITXTRecord * record)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[7];
+				avarParams[6] = service;
+				avarParams[5] = flags;
+				avarParams[4] = ifIndex;
+				avarParams[4].vt = VT_UI4;
+				avarParams[3] = fullName;
+				avarParams[3].vt = VT_BSTR;
+				avarParams[2] = hostName;
+				avarParams[2].vt = VT_BSTR;
+				avarParams[1] = port;
+				avarParams[1].vt = VT_UI2;
+				avarParams[0] = record;
+				DISPPARAMS params = { avarParams, NULL, 7, 0 };
+				hr = pConnection->Invoke(5, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_ServiceRegistered( IDNSSDService * service,  DNSSDFlags flags,  BSTR name,  BSTR regType,  BSTR domain)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[5];
+				avarParams[4] = service;
+				avarParams[3] = flags;
+				avarParams[2] = name;
+				avarParams[2].vt = VT_BSTR;
+				avarParams[1] = regType;
+				avarParams[1].vt = VT_BSTR;
+				avarParams[0] = domain;
+				avarParams[0].vt = VT_BSTR;
+				DISPPARAMS params = { avarParams, NULL, 5, 0 };
+				hr = pConnection->Invoke(6, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_QueryRecordAnswered( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  BSTR fullName,  DNSSDRRType rrtype,  DNSSDRRClass rrclass,  VARIANT rdata,  ULONG ttl)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[8];
+				avarParams[7] = service;
+				avarParams[6] = flags;
+				avarParams[5] = ifIndex;
+				avarParams[5].vt = VT_UI4;
+				avarParams[4] = fullName;
+				avarParams[4].vt = VT_BSTR;
+				avarParams[3] = rrtype;
+				avarParams[2] = rrclass;
+				avarParams[1] = rdata;
+				avarParams[0] = ttl;
+				avarParams[0].vt = VT_UI4;
+				DISPPARAMS params = { avarParams, NULL, 8, 0 };
+				hr = pConnection->Invoke(7, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_RecordRegistered( IDNSSDRecord * record,  DNSSDFlags flags)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[2];
+				avarParams[1] = record;
+				avarParams[0] = flags;
+				DISPPARAMS params = { avarParams, NULL, 2, 0 };
+				hr = pConnection->Invoke(8, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_AddressFound( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  BSTR hostname,  DNSSDAddressFamily addressFamily,  BSTR address,  ULONG ttl)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[7];
+				avarParams[6] = service;
+				avarParams[5] = flags;
+				avarParams[4] = ifIndex;
+				avarParams[4].vt = VT_UI4;
+				avarParams[3] = hostname;
+				avarParams[3].vt = VT_BSTR;
+				avarParams[2] = addressFamily;
+				avarParams[1] = address;
+				avarParams[1].vt = VT_BSTR;
+				avarParams[0] = ttl;
+				avarParams[0].vt = VT_UI4;
+				DISPPARAMS params = { avarParams, NULL, 7, 0 };
+				hr = pConnection->Invoke(9, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_MappingCreated( IDNSSDService * service,  DNSSDFlags flags,  ULONG ifIndex,  ULONG externalAddress,  DNSSDAddressFamily addressFamily,  DNSSDProtocol protocol,  USHORT internalPort,  USHORT externalPort,  ULONG ttl)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[9];
+				avarParams[8] = service;
+				avarParams[7] = flags;
+				avarParams[6] = ifIndex;
+				avarParams[6].vt = VT_UI4;
+				avarParams[5] = externalAddress;
+				avarParams[5].vt = VT_UI4;
+				avarParams[4] = addressFamily;
+				avarParams[3] = protocol;
+				avarParams[2] = internalPort;
+				avarParams[2].vt = VT_UI2;
+				avarParams[1] = externalPort;
+				avarParams[1].vt = VT_UI2;
+				avarParams[0] = ttl;
+				avarParams[0].vt = VT_UI4;
+				DISPPARAMS params = { avarParams, NULL, 9, 0 };
+				hr = pConnection->Invoke(10, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+	HRESULT Fire_OperationFailed( IDNSSDService * service,  DNSSDError error)
+	{
+		HRESULT hr = S_OK;
+		T * pThis = static_cast<T *>(this);
+		int cConnections = m_vec.GetSize();
+
+		for (int iConnection = 0; iConnection < cConnections; iConnection++)
+		{
+			pThis->Lock();
+			CComPtr<IUnknown> punkConnection = m_vec.GetAt(iConnection);
+			pThis->Unlock();
+
+			IDispatch * pConnection = static_cast<IDispatch *>(punkConnection.p);
+
+			if (pConnection)
+			{
+				CComVariant avarParams[2];
+				avarParams[1] = service;
+				avarParams[0] = error;
+				DISPPARAMS params = { avarParams, NULL, 2, 0 };
+				hr = pConnection->Invoke(11, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL);
+			}
+		}
+		return hr;
+	}
+};
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/dlldatax.c b/mDNSResponder/mDNSWindows/DLLX/dlldatax.c
new file mode 100755
index 00000000..a5815325
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/dlldatax.c
@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#ifdef _MERGE_PROXYSTUB // merge proxy stub DLL
+
+
+
+#define REGISTER_PROXY_DLL //DllRegisterServer, etc.
+
+
+
+#define _WIN32_WINNT 0x0500	//for WinNT 4.0 or Win95 with DCOM
+
+#define USE_STUBLESS_PROXY	//defined only with MIDL switch /Oicf
+
+
+
+#pragma comment(lib, "rpcns4.lib")
+
+#pragma comment(lib, "rpcrt4.lib")
+
+
+
+#define ENTRY_PREFIX	Prx
+
+
+
+#include "dlldata.c"
+
+#include "DLLX_p.c"
+
+
+
+#endif //_MERGE_PROXYSTUB
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/dlldatax.h b/mDNSResponder/mDNSWindows/DLLX/dlldatax.h
new file mode 100755
index 00000000..f8816a39
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/dlldatax.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+
+
+#ifdef _MERGE_PROXYSTUB
+
+
+
+extern "C" 
+
+{
+
+BOOL WINAPI PrxDllMain(HINSTANCE hInstance, DWORD dwReason, 
+
+	LPVOID lpReserved);
+
+STDAPI PrxDllCanUnloadNow(void);
+
+STDAPI PrxDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv);
+
+STDAPI PrxDllRegisterServer(void);
+
+STDAPI PrxDllUnregisterServer(void);
+
+}
+
+
+
+#endif
+
diff --git a/mDNSResponder/mDNSWindows/DLLX/resource.h b/mDNSResponder/mDNSWindows/DLLX/resource.h
new file mode 100755
index 00000000..d8a0cbc8
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/resource.h
@@ -0,0 +1,30 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by DLLX.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_DLLX		                101
+#define IDR_DNSSD                       102
+#define IDR_DNSSDSERVICE                103
+#define IDR_BROWSELISTENER              104
+#define IDR_RESOLVELISTENER             105
+#define IDR_TXTRECORD                   106
+#define IDR_ENUMERATEDOMAINSLISTENER    107
+#define IDR_REGISTERLISTENER            108
+#define IDR_QUERYRECORDLISTENER         109
+#define IDR_GETADDRINFOLISTENER         110
+#define IDR_DNSSDRECORD                 111
+#define IDR_REGISTERRECORDLISTENER      112
+#define IDR_NATPORTMAPPINGLISTENER      113
+#define IDR_DNSSDEVENTMANAGER           114
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           115
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/DLLX/stdafx.h b/mDNSResponder/mDNSWindows/DLLX/stdafx.h
new file mode 100755
index 00000000..66fb37b9
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DLLX/stdafx.h
@@ -0,0 +1,88 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#pragma once
+
+
+
+#ifndef STRICT
+
+#define STRICT
+
+#endif
+
+
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+
+#ifndef WINVER				// Allow use of features specific to Windows XP or later.
+
+#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
+
+#endif
+
+
+
+#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
+
+#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
+
+#endif						
+
+
+
+#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+
+#endif
+
+
+
+#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
+
+#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
+
+#endif
+
+
+
+#define _ATL_APARTMENT_THREADED
+
+#define _ATL_NO_AUTOMATIC_NAMESPACE
+
+
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+
+
+
+
+
+#include "resource.h"
+
+#include <atlbase.h>
+
+#include <atlcom.h>
+
+
+
+using namespace ATL;
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.sln b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.sln
new file mode 100644
index 00000000..5ce1a0a2
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "ApplicationVS2002.vcproj", "{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Debug.ActiveCfg = Debug|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Debug.Build.0 = Debug|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Release.ActiveCfg = Release|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.vcproj b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.vcproj
new file mode 100644
index 00000000..c1a24241
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2002.vcproj
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="Application"
+	ProjectGUID="{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}"
+	Keyword="MFCProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\Resources;..\;..\..\..\;..\..\..\..\mDNSCore;..\..\..\DNSServices"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1"
+				StringPooling="TRUE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="StdAfx.h"
+				PrecompiledHeaderFile=".\Debug/Application.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="DNSServiceBrowser Debug.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="wsock32.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/Application.pdb"
+				SubSystem="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="FALSE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Application.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_AFXDLL;_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="1"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForWindowsApplication="FALSE"
+				AdditionalIncludeDirectories=".\Resources;..\;..\..\..\;..\..\..\..\mDNSCore;..\..\..\DNSServices"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="TRUE"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Release/Application.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				CompileAs="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="DNSServiceBrowser.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="wsock32.lib"
+				ProgramDatabaseFile=".\Release/Application.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Application.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_AFXDLL;NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="Sources\AboutDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\AboutDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\Application.cpp">
+			</File>
+			<File
+				RelativePath="Sources\Application.h">
+			</File>
+			<File
+				RelativePath="Sources\ChooserDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\ChooserDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\LoginDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\LoginDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\StdAfx.cpp">
+			</File>
+			<File
+				RelativePath="Sources\StdAfx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;rc">
+			<File
+				RelativePath="Resources\Application.ico">
+			</File>
+			<File
+				RelativePath="Resources\Application.rc">
+			</File>
+			<File
+				RelativePath="Resources\Application.rc2">
+			</File>
+			<File
+				RelativePath=".\Resources\Resource.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Support"
+			Filter="">
+			<File
+				RelativePath="..\..\..\CommonServices.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSCommon.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSCommon.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSDigest.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DNSServices\DNSServices.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DebugServices.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DebugServices.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNS.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNSClientAPI.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNSDebug.h">
+			</File>
+			<File
+				RelativePath="..\..\..\mDNSWin32.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\uDNS.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\uDNS.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.sln b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.sln
new file mode 100644
index 00000000..bdaaa3be
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "ApplicationVS2003.vcproj", "{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Debug.ActiveCfg = Debug|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Debug.Build.0 = Debug|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Release.ActiveCfg = Release|Win32
+		{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.vcproj b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.vcproj
new file mode 100644
index 00000000..3c8cb1c1
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/ApplicationVS2003.vcproj
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Application"
+	ProjectGUID="{EDE4B529-4CF5-4A49-9B6F-C10F0EA24278}"
+	Keyword="MFCProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\Resources;..\;..\..\..\;..\..\..\..\mDNSCore;..\..\..\DNSServices"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG=1"
+				StringPooling="TRUE"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="FALSE"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="StdAfx.h"
+				PrecompiledHeaderFile=".\Debug/Application.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="DNSServiceBrowser Debug.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="wsock32.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/Application.pdb"
+				SubSystem="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="FALSE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Application.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_AFXDLL;_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="1"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForWindowsApplication="FALSE"
+				AdditionalIncludeDirectories=".\Resources;..\;..\..\..\;..\..\..\..\mDNSCore;..\..\..\DNSServices"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="TRUE"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Release/Application.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				BrowseInformation="1"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /IGNORE:4089"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="DNSServiceBrowser.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="wsock32.lib"
+				ProgramDatabaseFile=".\Release/Application.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Application.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_AFXDLL;NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath="Sources\AboutDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\AboutDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\Application.cpp">
+			</File>
+			<File
+				RelativePath="Sources\Application.h">
+			</File>
+			<File
+				RelativePath="Sources\ChooserDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\ChooserDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\LoginDialog.cpp">
+			</File>
+			<File
+				RelativePath="Sources\LoginDialog.h">
+			</File>
+			<File
+				RelativePath="Sources\StdAfx.cpp">
+			</File>
+			<File
+				RelativePath="Sources\StdAfx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;rc">
+			<File
+				RelativePath="Resources\Application.ico">
+			</File>
+			<File
+				RelativePath="Resources\Application.rc">
+			</File>
+			<File
+				RelativePath="Resources\Application.rc2">
+			</File>
+			<File
+				RelativePath=".\Resources\Resource.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Support"
+			Filter="">
+			<File
+				RelativePath="..\..\..\CommonServices.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSCommon.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSCommon.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\DNSDigest.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DNSServices\DNSServices.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DebugServices.c">
+			</File>
+			<File
+				RelativePath="..\..\..\DebugServices.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNS.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNSClientAPI.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\mDNSDebug.h">
+			</File>
+			<File
+				RelativePath="..\..\..\mDNSWin32.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\uDNS.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\mDNSCore\uDNS.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.ico b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.ico
new file mode 100644
index 00000000..b0a86399
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.ico
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc
new file mode 100644
index 00000000..39431396
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc
@@ -0,0 +1,323 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "Resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "Resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif //_WIN32\r\n"
+    "#include ""Resources\\Application.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAIN_ICON           ICON                    "Application.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CHOOSER_DIALOG DIALOGEX 0, 0, 512, 316
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 
+    WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_APPWINDOW
+CAPTION "DNSServiceBrowser"
+MENU IDR_CHOOSER_DIALOG_MENU
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL         "",IDC_SERVICE_LIST,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | 
+                    LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,8,8,268,256
+    CONTROL         "",IDC_CHOOSER_LIST,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | 
+                    LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,282,8,224,170
+    CONTROL         "",IDC_DOMAIN_LIST,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | 
+                    LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,8,272,268,38
+    GROUPBOX        "Information",IDC_STATIC,282,182,224,128
+    RTEXT           "Name:",IDC_STATIC,288,195,38,8
+    EDITTEXT        IDC_INFO_NAME_TEXT,330,195,168,10,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+    RTEXT           "IP address:",IDC_STATIC,288,208,38,8
+    EDITTEXT        IDC_INFO_IP_TEXT,330,208,168,10,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+    RTEXT           "Interface:",IDC_STATIC,288,221,38,8
+    EDITTEXT        IDC_INFO_INTERFACE_TEXT,330,221,168,10,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+    RTEXT           "Host Name:",IDC_STATIC,287,234,38,8
+    EDITTEXT        IDC_INFO_HOST_NAME_TEXT,330,234,168,10,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
+    RTEXT           "Text:",IDC_STATIC,288,247,38,8
+    EDITTEXT        IDC_INFO_TEXT_TEXT,330,247,168,57,ES_MULTILINE | 
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT 
+                    WS_BORDER,WS_EX_STATICEDGE
+END
+
+IDD_ABOUT_DIALOG DIALOGEX 0, 0, 244, 73
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "About DNSServiceBrowser"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON            IDR_MAIN_ICON,IDC_ABOUT_APP_ICON,12,12,20,20
+    LTEXT           "DNSServiceBrowser",IDC_ABOUT_APP_NAME_TEXT,44,11,192,
+                    12
+    LTEXT           "Version 1.2d1",IDC_ABOUT_APP_VERSION_TEXT,44,25,192,8
+    LTEXT           "Copyright (C) 2002-2004 Apple Computer, Inc.",
+                    IDC_ABOUT_COPYRIGHT_TEXT,4,60,156,8
+    DEFPUSHBUTTON   "OK",IDOK,192,52,44,14
+END
+
+IDD_LOGIN DIALOGEX 0, 0, 180, 89
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Login"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "Enter a username and password. Leave blank to use the default username and/or password.",
+                    IDC_STATIC,8,8,156,16,NOT WS_GROUP
+    RTEXT           "Username:",IDC_STATIC,10,34,36,8,NOT WS_GROUP
+    EDITTEXT        IDC_LOGIN_USERNAME_TEXT,50,32,118,12,ES_AUTOHSCROLL
+    RTEXT           "Password:",IDC_STATIC,10,50,36,8,NOT WS_GROUP
+    EDITTEXT        IDC_LOGIN_PASSWORD_TEXT,50,48,118,12,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,129,70,44,14
+    PUSHBUTTON      "Cancel",IDCANCEL,77,70,44,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Apple Computer, Inc."
+            VALUE "FileDescription", "DNSServiceBrowser for Windows"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "DNSServiceBrowser for Windows"
+            VALUE "LegalCopyright", "Copyright (C) 2002-2004 Apple Computer, Inc."
+            VALUE "OriginalFilename", "DNSServiceBrowser.exe"
+            VALUE "ProductName", "DNSServiceBrowser for Windows"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_CHOOSER_DIALOG_MENU MENU 
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "Close &Window\tCtrl+W",       ID_FILE_CLOSE
+        MENUITEM SEPARATOR
+        MENUITEM "Exit",                        ID_FILE_EXIT
+    END
+    POPUP "Help"
+    BEGIN
+        MENUITEM "About DNSServiceBrowser...", ID_HELP_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_CHOOSER_DIALOG_MENU_ACCELERATORS ACCELERATORS 
+BEGIN
+    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
+    "W",            ID_FILE_CLOSE,          VIRTKEY, CONTROL, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// RT_MANIFEST
+//
+
+1 RT_MANIFEST 
+BEGIN
+    0x3f3c, 0x6d78, 0x206c, 0x6576, 0x7372, 0x6f69, 0x3d6e, 0x3122, 0x302e, 
+    0x2022, 0x6e65, 0x6f63, 0x6964, 0x676e, 0x223d, 0x5455, 0x2d46, 0x2238, 
+    0x7320, 0x6174, 0x646e, 0x6c61, 0x6e6f, 0x3d65, 0x7922, 0x7365, 0x3f22, 
+    0x203e, 0x0a0d, 0x613c, 0x7373, 0x6d65, 0x6c62, 0x2079, 0x0a0d, 0x2020, 
+    0x7820, 0x6c6d, 0x736e, 0x223d, 0x7275, 0x3a6e, 0x6373, 0x6568, 0x616d, 
+    0x2d73, 0x696d, 0x7263, 0x736f, 0x666f, 0x2d74, 0x6f63, 0x3a6d, 0x7361, 
+    0x2e6d, 0x3176, 0x2022, 0x0a0d, 0x2020, 0x6d20, 0x6e61, 0x6669, 0x7365, 
+    0x5674, 0x7265, 0x6973, 0x6e6f, 0x223d, 0x2e31, 0x2230, 0x0d3e, 0x3c0a, 
+    0x7361, 0x6573, 0x626d, 0x796c, 0x6449, 0x6e65, 0x6974, 0x7974, 0x0d20, 
+    0x200a, 0x2020, 0x7020, 0x6f72, 0x6563, 0x7373, 0x726f, 0x7241, 0x6863, 
+    0x7469, 0x6365, 0x7574, 0x6572, 0x223d, 0x3878, 0x2236, 0x0d20, 0x200a, 
+    0x2020, 0x7620, 0x7265, 0x6973, 0x6e6f, 0x223d, 0x2e35, 0x2e31, 0x2e30, 
+    0x2230, 0x0a0d, 0x2020, 0x2020, 0x7974, 0x6570, 0x223d, 0x6977, 0x336e, 
+    0x2232, 0x0a0d, 0x2020, 0x2020, 0x616e, 0x656d, 0x223d, 0x7041, 0x2e70, 
+    0x7865, 0x2265, 0x3e2f, 0x0a0d, 0x2020, 0x2020, 0x643c, 0x7365, 0x7263, 
+    0x7069, 0x6974, 0x6e6f, 0x413e, 0x7269, 0x6f50, 0x7472, 0x4120, 0x6d64, 
+    0x6e69, 0x5520, 0x6974, 0x696c, 0x7974, 0x2f3c, 0x6564, 0x6373, 0x6972, 
+    0x7470, 0x6f69, 0x3e6e, 0x0a0d, 0x2020, 0x2020, 0x643c, 0x7065, 0x6e65, 
+    0x6564, 0x636e, 0x3e79, 0x0a0d, 0x2020, 0x2020, 0x643c, 0x7065, 0x6e65, 
+    0x6564, 0x746e, 0x7341, 0x6573, 0x626d, 0x796c, 0x0d3e, 0x200a, 0x2020, 
+    0x3c20, 0x7361, 0x6573, 0x626d, 0x796c, 0x6449, 0x6e65, 0x6974, 0x7974, 
+    0x0a0d, 0x2020, 0x2020, 0x2020, 0x2020, 0x7420, 0x7079, 0x3d65, 0x7722, 
+    0x6e69, 0x3233, 0x0d22, 0x200a, 0x2020, 0x2020, 0x2020, 0x2020, 0x616e, 
+    0x656d, 0x223d, 0x694d, 0x7263, 0x736f, 0x666f, 0x2e74, 0x6957, 0x646e, 
+    0x776f, 0x2e73, 0x6f43, 0x6d6d, 0x6e6f, 0x432d, 0x6e6f, 0x7274, 0x6c6f, 
+    0x2273, 0x0a0d, 0x2020, 0x2020, 0x2020, 0x2020, 0x7620, 0x7265, 0x6973, 
+    0x6e6f, 0x223d, 0x2e36, 0x2e30, 0x2e30, 0x2230, 0x0a0d, 0x2020, 0x2020, 
+    0x2020, 0x2020, 0x7020, 0x6275, 0x696c, 0x4b63, 0x7965, 0x6f54, 0x656b, 
+    0x3d6e, 0x3622, 0x3935, 0x6235, 0x3436, 0x3431, 0x6334, 0x6663, 0x6431, 
+    0x2266, 0x0a0d, 0x2020, 0x2020, 0x2020, 0x2020, 0x6c20, 0x6e61, 0x7567, 
+    0x6761, 0x3d65, 0x2a22, 0x0d22, 0x200a, 0x2020, 0x2020, 0x2020, 0x2020, 
+    0x7270, 0x636f, 0x7365, 0x6f73, 0x4172, 0x6372, 0x6968, 0x6574, 0x7463, 
+    0x7275, 0x3d65, 0x7822, 0x3638, 0x2f22, 0x0d3e, 0x200a, 0x2020, 0x3c20, 
+    0x642f, 0x7065, 0x6e65, 0x6564, 0x746e, 0x7341, 0x6573, 0x626d, 0x796c, 
+    0x0d3e, 0x200a, 0x2020, 0x3c20, 0x642f, 0x7065, 0x6e65, 0x6564, 0x636e, 
+    0x3e79, 0x0a0d, 0x2f3c, 0x7361, 0x6573, 0x626d, 0x796c, 0x0d3e, "\012" 
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_CHOOSER_DIALOG, DIALOG
+    BEGIN
+        RIGHTMARGIN, 468
+    END
+
+    IDD_LOGIN, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 62
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_ABOUTBOX            "&About DNSServiceBrowser"
+    IDS_CHOOSER_DOMAIN_COLUMN_NAME "Domains"
+    IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
+    IDS_CHOOSER_SERVICE_COLUMN_TYPE "Services"
+    IDS_CHOOSER_CHOOSER_NAME_COLUMN_NAME "Name"
+    IDS_CHOOSER_CHOOSER_IP_COLUMN_NAME "IP Address"
+    IDS_CHOOSER_SERVICE_COLUMN_DESC "Description"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+#include "Resources\Application.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc2 b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc2
new file mode 100644
index 00000000..ec5e69fa
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Application.rc2
@@ -0,0 +1,20 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Resource.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Resource.h
new file mode 100644
index 00000000..62602a4f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Resources/Resource.h
@@ -0,0 +1,53 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Application.rc
+//
+#define IDS_ABOUTBOX                    101
+#define IDS_CHOOSER_DOMAIN_COLUMN_NAME  102
+#define IDP_SOCKETS_INIT_FAILED         103
+#define IDS_CHOOSER_SERVICE_COLUMN_NAME 104
+#define IDS_CHOOSER_SERVICE_COLUMN_TYPE 104
+#define IDS_CHOOSER_CHOOSER_NAME_COLUMN_NAME 105
+#define IDS_CHOOSER_CHOOSER_IP_COLUMN_NAME 106
+#define IDS_CHOOSER_SERVICE_COLUMN_DESC 107
+#define IDC_NAME_TEXT2                  124
+#define IDC_INFO_NAME_TEXT              124
+#define IDC_DESCRIPTION_TEXT2           125
+#define IDC_INFO_TEXT_TEXT              125
+#define IDC_IP_TEXT2                    126
+#define IDC_INFO_IP_TEXT                126
+#define IDC_IP_TEXT3                    127
+#define IDC_INFO_INTERFACE_TEXT         127
+#define IDR_MAIN_ICON                   128
+#define IDC_INFO_INTERFACE_TEXT2        128
+#define IDC_INFO_HOST_NAME_TEXT         128
+#define IDR_CHOOSER_DIALOG_MENU         136
+#define IDD_CHOOSER_DIALOG              143
+#define IDD_ABOUT_DIALOG                144
+#define IDD_LOGIN                       145
+#define IDR_CHOOSER_DIALOG_MENU_ACCELERATORS 146
+#define IDC_CHOOSER_LIST                1000
+#define IDC_SERVICE_LIST2               1001
+#define IDC_SERVICE_LIST                1001
+#define IDC_SERVICE_LIST3               1002
+#define IDC_DOMAIN_LIST                 1002
+#define IDC_ABOUT_APP_NAME_TEXT         1105
+#define IDC_ABOUT_APP_VERSION_TEXT      1106
+#define IDC_ABOUT_COPYRIGHT_TEXT        1107
+#define IDC_ABOUT_APP_ICON              1108
+#define IDC_LOGIN_USERNAME_TEXT         1182
+#define IDC_EDIT2                       1183
+#define IDC_LOGIN_PASSWORD_TEXT         1183
+#define ID_FILE_EXIT                    32771
+#define ID_HELP_ABOUT                   32806
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        164
+#define _APS_NEXT_COMMAND_VALUE         32809
+#define _APS_NEXT_CONTROL_VALUE         1185
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.cpp
new file mode 100644
index 00000000..8dd6b091
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.cpp
@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<stdlib.h>
+
+#include	"stdafx.h"
+
+#include	"AboutDialog.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP(AboutDialog, CDialog)
+	//{{AFX_MSG_MAP(AboutDialog)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+//===========================================================================================================================
+//	AboutDialog
+//===========================================================================================================================
+
+AboutDialog::AboutDialog(CWnd* pParent /*=NULL*/)
+	: CDialog(AboutDialog::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(AboutDialog)
+		// Note: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+//===========================================================================================================================
+//	OnInitDialog
+//===========================================================================================================================
+
+BOOL	AboutDialog::OnInitDialog() 
+{
+	CDialog::OnInitDialog();
+	return( true );
+}
+
+//===========================================================================================================================
+//	DoDataExchange
+//===========================================================================================================================
+
+void	AboutDialog::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(AboutDialog)
+		// Note: the ClassWizard will add DDX and DDV calls here
+	//}}AFX_DATA_MAP
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.h
new file mode 100644
index 00000000..cdd257cf
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/AboutDialog.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_ABOUTDIALOG_H__4B8A04B2_9735_4F4A_AFCA_15F85FB3D763__INCLUDED_)
+#define AFX_ABOUTDIALOG_H__4B8A04B2_9735_4F4A_AFCA_15F85FB3D763__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include	"Resource.h"
+
+//===========================================================================================================================
+//	AboutDialog
+//===========================================================================================================================
+
+class	AboutDialog : public CDialog
+{
+	public:
+		
+		// Creation/Deletion
+		
+		AboutDialog(CWnd* pParent = NULL);   // standard constructor
+		
+		//{{AFX_DATA(AboutDialog)
+		enum { IDD = IDD_ABOUT_DIALOG };
+			// Note: the ClassWizard will add data members here
+		//}}AFX_DATA
+		
+		// ClassWizard generated virtual function overrides
+		//{{AFX_VIRTUAL(AboutDialog)
+		protected:
+		virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+		//}}AFX_VIRTUAL
+
+	protected:
+
+		// Generated message map functions
+		//{{AFX_MSG(AboutDialog)
+		virtual BOOL OnInitDialog();
+		//}}AFX_MSG
+		DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_ABOUTDIALOG_H__4B8A04B2_9735_4F4A_AFCA_15F85FB3D763__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.cpp
new file mode 100644
index 00000000..f7f4b035
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.cpp
@@ -0,0 +1,111 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<assert.h>
+
+#include	"StdAfx.h"
+
+#include	"DNSServices.h"
+
+#include	"Application.h"
+
+#include	"ChooserDialog.h"
+
+#include	"stdafx.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP(Application, CWinApp)
+	//{{AFX_MSG_MAP(Application)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG
+	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+Application		gApp;
+
+//===========================================================================================================================
+//	Application
+//===========================================================================================================================
+
+Application::Application( void )
+{
+	//
+}
+
+//===========================================================================================================================
+//	InitInstance
+//===========================================================================================================================
+
+BOOL	Application::InitInstance()
+{
+	DNSStatus		err;
+	
+	// Standard MFC initialization.
+
+#if( !defined( AFX_DEPRECATED ) )
+	#ifdef _AFXDLL
+		Enable3dControls();			// Call this when using MFC in a shared DLL
+	#else
+		Enable3dControlsStatic();	// Call this when linking to MFC statically
+	#endif
+#endif
+
+	InitCommonControls();
+	
+	// Set up DNS Services.
+	
+	err = DNSServicesInitialize( 0, 512 );
+	assert( err == kDNSNoErr );
+	
+	// Create the chooser dialog.
+	
+	ChooserDialog *		dialog;
+	
+	m_pMainWnd = NULL;
+	dialog = new ChooserDialog;
+	dialog->Create( IDD_CHOOSER_DIALOG );
+	m_pMainWnd = dialog;
+	dialog->ShowWindow( SW_SHOW );
+	
+	return( true );
+}
+
+//===========================================================================================================================
+//	ExitInstance
+//===========================================================================================================================
+
+int	Application::ExitInstance( void )
+{
+	// Clean up DNS Services.
+	
+	DNSServicesFinalize();
+	return( 0 );
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.h
new file mode 100644
index 00000000..8368a49f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/Application.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_ADMIN_H__8663733F_6A15_439F_B568_F5A0125CD572__INCLUDED_)
+#define AFX_ADMIN_H__8663733F_6A15_439F_B568_F5A0125CD572__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include	"stdafx.h"
+
+#ifndef __AFXWIN_H__
+	#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include	"Resource.h"
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+extern class Application		gApp;
+
+//===========================================================================================================================
+//	Application
+//===========================================================================================================================
+
+class	Application : public CWinApp
+{
+	public:
+		
+		// Creation/Deletion
+		
+		Application();
+		
+		// ClassWizard generated virtual function overrides
+		//{{AFX_VIRTUAL(Application)
+		public:
+		virtual BOOL InitInstance();
+		virtual int ExitInstance( void );
+		//}}AFX_VIRTUAL
+		
+		//{{AFX_MSG(Application)
+			// NOTE - the ClassWizard will add and remove member functions here.
+			//    DO NOT EDIT what you see in these blocks of generated code !
+		//}}AFX_MSG
+		DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_ADMIN_H__8663733F_6A15_439F_B568_F5A0125CD572__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp
new file mode 100644
index 00000000..9e4db65b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp
@@ -0,0 +1,1426 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<assert.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<time.h>
+
+#include	<algorithm>
+#include	<memory>
+
+#include	"stdafx.h"
+
+#include	"DNSServices.h"
+
+#include	"Application.h"
+#include	"AboutDialog.h"
+#include	"LoginDialog.h"
+#include	"Resource.h"
+
+#include	"ChooserDialog.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+// Menus
+
+enum
+{
+	kChooserMenuIndexFile	= 0, 
+	kChooserMenuIndexHelp	= 1 
+};
+
+// Domain List
+	
+#define kDomainListDefaultDomainColumnWidth		 		164 
+	
+// Service List
+
+#define kServiceListDefaultServiceColumnTypeWidth		146
+#define kServiceListDefaultServiceColumnDescWidth		230
+	
+// Chooser List
+	
+#define kChooserListDefaultNameColumnWidth				190
+#define kChooserListDefaultIPColumnWidth				120
+
+// Windows User Messages
+
+#define	WM_USER_DOMAIN_ADD								( WM_USER + 0x100 )
+#define	WM_USER_DOMAIN_REMOVE							( WM_USER + 0x101 )
+#define	WM_USER_SERVICE_ADD								( WM_USER + 0x102 )
+#define	WM_USER_SERVICE_REMOVE							( WM_USER + 0x103 )
+#define	WM_USER_RESOLVE									( WM_USER + 0x104 )
+
+#if 0
+#pragma mark == Constants - Service Table ==
+#endif
+
+//===========================================================================================================================
+//	Constants - Service Table
+//===========================================================================================================================
+
+struct	KnownServiceEntry
+{
+	const char *		serviceType;
+	const char *		description;
+	const char *		urlScheme;
+	bool				useText;
+};
+
+static const KnownServiceEntry		kKnownServiceTable[] =
+{
+	{ "_accountedge._tcp.",	 		"MYOB AccountEdge", 										"", 			false },
+	{ "_aecoretech._tcp.", 			"Apple Application Engineering Services",					"", 			false },
+	{ "_afpovertcp._tcp.", 			"Apple File Sharing (AFP)", 								"afp://", 		false },
+	{ "_airport._tcp.", 			"AirPort Base Station",										"", 			false }, 
+	{ "_apple-sasl._tcp.", 			"Apple Password Server", 									"", 			false },
+	{ "_aquamon._tcp.", 			"AquaMon", 													"", 			false },
+	{ "_async._tcp", 				"address-o-sync", 											"", 			false },
+	{ "_auth._tcp.", 				"Authentication Service",									"", 			false },
+	{ "_bootps._tcp.", 				"Bootstrap Protocol Server",								"", 			false },
+	{ "_bousg._tcp.", 				"Bag Of Unusual Strategy Games",							"", 			false },
+	{ "_browse._udp.", 				"DNS Service Discovery",									"", 			false },
+	{ "_cheat._tcp.", 				"The Cheat",												"", 			false },
+	{ "_chess._tcp", 				"Project Gridlock", 										"", 			false },
+	{ "_chfts._tcp", 				"Fluid Theme Server", 										"", 			false },
+	{ "_clipboard._tcp", 			"Clipboard Sharing", 										"", 			false },
+	{ "_contactserver._tcp.", 		"Now Up-to-Date & Contact",									"", 			false },
+	{ "_cvspserver._tcp", 			"CVS PServer", 												"", 			false },
+	{ "_cytv._tcp.", 				"CyTV Network streaming for Elgato EyeTV",					"", 			false },
+	{ "_daap._tcp.", 				"Digital Audio Access Protocol (iTunes)",					"daap://",		false }, 
+	{ "_distcc._tcp", 				"Distributed Compiler", 									"", 			false },
+	{ "_dns-sd._udp", 				"DNS Service Discovery", 									"", 			false },
+	{ "_dpap._tcp.", 				"Digital Picture Access Protocol (iPhoto)",					"", 			false },
+	{ "_earphoria._tcp.", 			"Earphoria",												"", 			false },
+	{ "_ecbyesfsgksc._tcp.", 		"Net Monitor Anti-Piracy Service",							"",				false },
+	{ "_eheap._tcp.", 				"Interactive Room Software",								"",				false },
+	{ "_embrace._tcp.", 			"DataEnvoy",												"",				false },
+	{ "_eppc._tcp.", 				"Remote AppleEvents", 										"eppc://", 		false }, 
+	{ "_exec._tcp.", 				"Remote Process Execution",									"",				false },
+	{ "_facespan._tcp.", 			"FaceSpan",													"",				false },
+	{ "_fjork._tcp.", 				"Fjork",													"",				false },
+	{ "_ftp._tcp.", 				"File Transfer (FTP)", 										"ftp://", 		false }, 
+	{ "_ftpcroco._tcp.", 			"Crocodile FTP Server",										"",				false },
+	{ "_gbs-smp._tcp.", 			"SnapMail",													"",				false },
+	{ "_gbs-stp._tcp.", 			"SnapTalk",													"",				false },
+	{ "_grillezvous._tcp.", 		"Roxio ToastAnywhere(tm) Recorder Sharing",					"",				false },
+	{ "_h323._tcp.", 				"H.323",													"",				false },
+	{ "_hotwayd._tcp", 				"Hotwayd", 													"", 			false },
+	{ "_http._tcp.", 				"Web Server (HTTP)", 										"http://", 		true  }, 
+	{ "_hydra._tcp", 				"SubEthaEdit", 												"", 			false },
+	{ "_ica-networking._tcp.", 		"Image Capture Networking",									"", 			false }, 
+	{ "_ichalkboard._tcp.", 		"iChalk",													"", 			false }, 
+	{ "_ichat._tcp.", 				"iChat",				 									"ichat://",		false }, 
+	{ "_iconquer._tcp.",	 		"iConquer",													"", 			false }, 
+	{ "_imap._tcp.", 				"Internet Message Access Protocol",							"",				false },
+	{ "_imidi._tcp.", 				"iMidi",													"",				false },
+	{ "_ipp._tcp.", 				"Printer (IPP)", 											"ipp://", 		false },
+	{ "_ishare._tcp.", 				"iShare",													"",				false },
+	{ "_isparx._tcp.", 				"iSparx",													"",				false },
+	{ "_istorm._tcp", 				"iStorm", 													"", 			false },
+	{ "_iwork._tcp.", 				"iWork Server",												"",				false },
+	{ "_liaison._tcp.", 			"Liaison",													"",				false },
+	{ "_login._tcp.", 				"Remote Login a la Telnet",									"",				false },
+	{ "_lontalk._tcp.", 			"LonTalk over IP (ANSI 852)",								"",				false },
+	{ "_lonworks._tcp.", 			"Echelon LNS Remote Client",								"",				false },
+	{ "_macfoh-remote._tcp.", 		"MacFOH Remote",											"",				false },
+	{ "_moneyworks._tcp.", 			"MoneyWorks",												"",				false },
+	{ "_mp3sushi._tcp", 			"MP3 Sushi", 												"", 			false },
+	{ "_mttp._tcp.", 				"MenuTunes Sharing",										"",				false },
+	{ "_ncbroadcast._tcp.", 		"Network Clipboard Broadcasts",								"",				false },
+	{ "_ncdirect._tcp.", 			"Network Clipboard Direct Transfers",						"",				false },
+	{ "_ncsyncserver._tcp.", 		"Network Clipboard Sync Server",							"",				false },
+	{ "_newton-dock._tcp.", 		"Escale",													"",				false },
+	{ "_nfs._tcp", 					"NFS", 														"", 			false },
+	{ "_nssocketport._tcp.", 		"DO over NSSocketPort",										"",				false },
+	{ "_omni-bookmark._tcp.", 		"OmniWeb",													"",				false },
+	{ "_openbase._tcp.", 			"OpenBase SQL",												"",				false },
+	{ "_p2pchat._tcp.", 			"Peer-to-Peer Chat",										"",				false },
+	{ "_pdl-datastream._tcp.", 		"Printer (PDL)", 											"pdl://", 		false }, 
+	{ "_poch._tcp.", 				"Parallel OperatiOn and Control Heuristic",					"",				false },
+	{ "_pop_2_ambrosia._tcp.",		"Pop-Pop",													"",				false },
+	{ "_pop3._tcp", 				"POP3 Server", 												"", 			false },
+	{ "_postgresql._tcp", 			"PostgreSQL Server", 										"", 			false },
+	{ "_presence._tcp", 			"iChat AV", 												"", 			false },
+	{ "_printer._tcp.", 			"Printer (LPR)", 											"lpr://", 		false }, 
+	{ "_ptp._tcp.", 				"Picture Transfer (PTP)", 									"ptp://", 		false },
+	{ "_register._tcp", 			"DNS Service Discovery", 									"", 			false },
+	{ "_rfb._tcp.", 				"Remote Frame Buffer",										"",				false },
+	{ "_riousbprint._tcp.", 		"Remote I/O USB Printer Protocol",							"",				false },
+	{ "_rtsp._tcp.", 				"Real Time Stream Control Protocol",						"",				false },
+	{ "_safarimenu._tcp", 			"Safari Menu", 												"", 			false },
+	{ "_scone._tcp", 				"Scone", 													"", 			false },
+	{ "_sdsharing._tcp.", 			"Speed Download",											"",				false },
+	{ "_seeCard._tcp.", 			"seeCard",													"",				false },
+	{ "_services._udp.", 			"DNS Service Discovery",									"",				false },
+	{ "_shell._tcp.", 				"like exec, but automatic authentication",					"",				false },
+	{ "_shout._tcp.", 				"Shout",													"",				false },
+	{ "_shoutcast._tcp", 			"Nicecast", 												"", 			false },
+	{ "_smb._tcp.", 				"Windows File Sharing (SMB)", 								"smb://", 		false }, 
+	{ "_soap._tcp.", 				"Simple Object Access Protocol", 							"", 			false }, 
+	{ "_spincrisis._tcp.", 			"Spin Crisis",												"",				false },
+	{ "_spl-itunes._tcp.", 			"launchTunes",												"",				false },
+	{ "_spr-itunes._tcp.", 			"netTunes",													"",				false },
+	{ "_ssh._tcp.", 				"Secure Shell (SSH)", 										"ssh://", 		false }, 
+	{ "_ssscreenshare._tcp", 		"Screen Sharing", 											"", 			false },
+	{ "_sge-exec._tcp", 			"Sun Grid Engine (Execution Host)", 						"", 			false },
+	{ "_sge-qmaster._tcp", 			"Sun Grid Engine (Master)", 								"", 			false },
+	{ "_stickynotes._tcp", 			"Sticky Notes", 											"", 			false },
+	{ "_strateges._tcp", 			"Strateges", 												"", 			false },
+	{ "_sxqdea._tcp", 				"Synchronize! Pro X", 										"", 			false },
+	{ "_sybase-tds._tcp", 			"Sybase Server", 											"", 			false },
+	{ "_tce._tcp", 					"Power Card", 												"", 			false },
+	{ "_teamlist._tcp", 			"ARTIS Team Task",											"", 			false },
+	{ "_teleport._tcp", 			"teleport",													"", 			false },
+	{ "_telnet._tcp.", 				"Telnet", 													"telnet://", 	false }, 
+	{ "_tftp._tcp.", 				"Trivial File Transfer (TFTP)", 							"tftp://", 		false }, 
+	{ "_tinavigator._tcp.", 		"TI Navigator", 											"", 			false }, 
+	{ "_tivo_servemedia._tcp", 		"TiVo",														"", 			false },
+	{ "_upnp._tcp.", 				"Universal Plug and Play", 									"", 			false }, 
+	{ "_utest._tcp.", 				"uTest", 													"", 			false }, 
+	{ "_vue4rendercow._tcp",		"VueProRenderCow",											"", 			false },
+	{ "_webdav._tcp.", 				"WebDAV", 													"webdav://",	false }, 
+	{ "_whamb._tcp.", 				"Whamb", 													"",				false }, 
+	{ "_workstation._tcp", 			"Macintosh Manager",										"", 			false },
+	{ "_ws._tcp", 					"Web Services",												"", 			false },
+	{ "_xserveraid._tcp.", 			"Xserve RAID",												"xsr://", 		false }, 
+	{ "_xsync._tcp.",	 			"Xserve RAID Synchronization",								"",		 		false }, 
+	
+	{ "",	 						"",															"",		 		false }, 
+	
+	// Unofficial and invalid service types that will be phased out:
+	
+	{ "_clipboardsharing._tcp.",			"ClipboardSharing",									"",		 		false }, 
+	{ "_MacOSXDupSuppress._tcp.",			"Mac OS X Duplicate Suppression",					"",		 		false }, 
+	{ "_netmonitorserver._tcp.",			"Net Monitor Server",								"",		 		false }, 
+	{ "_networkclipboard._tcp.",			"Network Clipboard",								"",		 		false }, 
+	{ "_slimdevices_slimp3_cli._tcp.",		"SliMP3 Server Command-Line Interface",				"",		 		false }, 
+	{ "_slimdevices_slimp3_http._tcp.",		"SliMP3 Server Web Interface",						"",		 		false }, 
+	{ "_tieducationalhandhelddevice._tcp.",	"TI Connect Manager",								"",		 		false }, 
+	{ "_tivo_servemedia._tcp.",				"TiVo",												"",		 		false }, 
+	
+	{ NULL,							NULL,														NULL,			false }, 
+};
+
+#if 0
+#pragma mark == Structures ==
+#endif
+
+//===========================================================================================================================
+//	Structures
+//===========================================================================================================================
+
+struct	DomainEventInfo
+{
+	DNSBrowserEventType		eventType;
+	CString					domain;
+	DNSNetworkAddress		ifIP;
+};
+
+struct	ServiceEventInfo
+{
+	DNSBrowserEventType		eventType;
+	std::string				name;
+	std::string				type;
+	std::string				domain;
+	DNSNetworkAddress		ifIP;
+};
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+static void
+	BrowserCallBack( 
+		void *					inContext, 
+		DNSBrowserRef			inRef, 
+		DNSStatus				inStatusCode,
+		const DNSBrowserEvent *	inEvent );
+
+static char *	DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, char *outString );
+
+static DWORD	UTF8StringToStringObject( const char *inUTF8, CString &inObject );
+static DWORD	StringObjectToUTF8String( CString &inObject, std::string &outUTF8 );
+
+#if 0
+#pragma mark == Message Map ==
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP(ChooserDialog, CDialog)
+	//{{AFX_MSG_MAP(ChooserDialog)
+	ON_WM_SYSCOMMAND()
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_DOMAIN_LIST, OnDomainListChanged)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_SERVICE_LIST, OnServiceListChanged)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_CHOOSER_LIST, OnChooserListChanged)
+	ON_NOTIFY(NM_DBLCLK, IDC_CHOOSER_LIST, OnChooserListDoubleClick)
+	ON_COMMAND(ID_HELP_ABOUT, OnAbout)
+	ON_WM_INITMENUPOPUP()
+	ON_WM_ACTIVATE()
+	ON_COMMAND(ID_FILE_CLOSE, OnFileClose)
+	ON_COMMAND(ID_FILE_EXIT, OnExit)
+	ON_WM_CLOSE()
+	ON_WM_NCDESTROY()
+	//}}AFX_MSG_MAP
+	ON_MESSAGE( WM_USER_DOMAIN_ADD, OnDomainAdd )
+	ON_MESSAGE( WM_USER_DOMAIN_REMOVE, OnDomainRemove )
+	ON_MESSAGE( WM_USER_SERVICE_ADD, OnServiceAdd )
+	ON_MESSAGE( WM_USER_SERVICE_REMOVE, OnServiceRemove )
+	ON_MESSAGE( WM_USER_RESOLVE, OnResolve )
+END_MESSAGE_MAP()
+
+#if 0
+#pragma mark == Routines ==
+#endif
+
+//===========================================================================================================================
+//	ChooserDialog
+//===========================================================================================================================
+
+ChooserDialog::ChooserDialog( CWnd *inParent )
+	: CDialog( ChooserDialog::IDD, inParent)
+{
+	//{{AFX_DATA_INIT(ChooserDialog)
+		// Note: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+	
+	// Load menu accelerator table.
+
+	mMenuAcceleratorTable = ::LoadAccelerators( AfxGetInstanceHandle(), MAKEINTRESOURCE( IDR_CHOOSER_DIALOG_MENU_ACCELERATORS ) );
+	assert( mMenuAcceleratorTable );
+	
+	mBrowser 			= NULL;
+	mIsServiceBrowsing	= false;
+}
+
+//===========================================================================================================================
+//	~ChooserDialog
+//===========================================================================================================================
+
+ChooserDialog::~ChooserDialog( void )
+{
+	if( mBrowser )
+	{
+		DNSStatus		err;
+		
+		err = DNSBrowserRelease( mBrowser, 0 );
+		assert( err == kDNSNoErr );
+	}
+}
+
+//===========================================================================================================================
+//	DoDataExchange
+//===========================================================================================================================
+
+void ChooserDialog::DoDataExchange( CDataExchange *pDX )
+{
+	CDialog::DoDataExchange(pDX);
+
+	//{{AFX_DATA_MAP(ChooserDialog)
+	DDX_Control(pDX, IDC_SERVICE_LIST, mServiceList);
+	DDX_Control(pDX, IDC_DOMAIN_LIST, mDomainList);
+	DDX_Control(pDX, IDC_CHOOSER_LIST, mChooserList);
+	//}}AFX_DATA_MAP
+}
+
+//===========================================================================================================================
+//	OnInitDialog
+//===========================================================================================================================
+
+BOOL	ChooserDialog::OnInitDialog( void )
+{
+	HICON			icon;
+	BOOL			result;
+	CString			tempString;
+	DNSStatus		err;
+	
+	// Initialize our parent.
+
+	CDialog::OnInitDialog();
+	
+	// Set up the window icon.
+	
+	icon = AfxGetApp()->LoadIcon( IDR_MAIN_ICON );
+	assert( icon );
+	if( icon )
+	{
+		SetIcon( icon, TRUE );		// Set big icon
+		SetIcon( icon, FALSE );		// Set small icon
+	}
+	
+	// Set up the Domain List.
+	
+	result = tempString.LoadString( IDS_CHOOSER_DOMAIN_COLUMN_NAME );
+	assert( result );
+	mDomainList.InsertColumn( 0, tempString, LVCFMT_LEFT, kDomainListDefaultDomainColumnWidth );
+	
+	// Set up the Service List.
+	
+	result = tempString.LoadString( IDS_CHOOSER_SERVICE_COLUMN_TYPE );
+	assert( result );
+	mServiceList.InsertColumn( 0, tempString, LVCFMT_LEFT, kServiceListDefaultServiceColumnTypeWidth );
+	
+	result = tempString.LoadString( IDS_CHOOSER_SERVICE_COLUMN_DESC );
+	assert( result );
+	mServiceList.InsertColumn( 1, tempString, LVCFMT_LEFT, kServiceListDefaultServiceColumnDescWidth );
+	
+	PopulateServicesList();
+	
+	// Set up the Chooser List.
+	
+	result = tempString.LoadString( IDS_CHOOSER_CHOOSER_NAME_COLUMN_NAME );
+	assert( result );
+	mChooserList.InsertColumn( 0, tempString, LVCFMT_LEFT, kChooserListDefaultNameColumnWidth );
+	
+	result = tempString.LoadString( IDS_CHOOSER_CHOOSER_IP_COLUMN_NAME );
+	assert( result );
+	mChooserList.InsertColumn( 1, tempString, LVCFMT_LEFT, kChooserListDefaultIPColumnWidth );
+	
+	// Set up the other controls.
+	
+	UpdateInfoDisplay();
+	
+	// Start browsing for domains.
+	
+	err = DNSBrowserCreate( 0, BrowserCallBack, this, &mBrowser );
+	assert( err == kDNSNoErr );
+	
+	err = DNSBrowserStartDomainSearch( mBrowser, 0 );
+	assert( err == kDNSNoErr );
+	
+	return( true );
+}
+
+//===========================================================================================================================
+//	OnFileClose
+//===========================================================================================================================
+
+void ChooserDialog::OnFileClose() 
+{
+	OnClose();
+}
+
+//===========================================================================================================================
+//	OnActivate
+//===========================================================================================================================
+
+void ChooserDialog::OnActivate( UINT nState, CWnd* pWndOther, BOOL bMinimized )
+{
+	// Always make the active window the "main" window so modal dialogs work better and the app quits after closing 
+	// the last window.
+
+	gApp.m_pMainWnd = this;
+
+	CDialog::OnActivate(nState, pWndOther, bMinimized);
+}
+
+//===========================================================================================================================
+//	PostNcDestroy
+//===========================================================================================================================
+
+void	ChooserDialog::PostNcDestroy() 
+{
+	// Call the base class to do the normal cleanup.
+
+	delete this;
+}
+
+//===========================================================================================================================
+//	PreTranslateMessage
+//===========================================================================================================================
+
+BOOL	ChooserDialog::PreTranslateMessage(MSG* pMsg) 
+{
+	BOOL		result;
+	
+	result = false;
+	assert( mMenuAcceleratorTable );
+	if( mMenuAcceleratorTable )
+	{
+		result = ::TranslateAccelerator( m_hWnd, mMenuAcceleratorTable, pMsg );
+	}
+	if( !result )
+	{
+		result = CDialog::PreTranslateMessage( pMsg );
+	}
+	return( result );
+}
+
+//===========================================================================================================================
+//	OnInitMenuPopup
+//===========================================================================================================================
+
+void	ChooserDialog::OnInitMenuPopup( CMenu *pPopupMenu, UINT nIndex, BOOL bSysMenu ) 
+{
+	CDialog::OnInitMenuPopup( pPopupMenu, nIndex, bSysMenu );
+
+	switch( nIndex )
+	{
+		case kChooserMenuIndexFile:
+			break;
+
+		case kChooserMenuIndexHelp:
+			break;
+
+		default:
+			break;
+	}
+}
+
+//===========================================================================================================================
+//	OnExit
+//===========================================================================================================================
+
+void ChooserDialog::OnExit() 
+{
+	OnClose();
+}
+
+//===========================================================================================================================
+//	OnAbout
+//===========================================================================================================================
+
+void	ChooserDialog::OnAbout() 
+{
+	AboutDialog		dialog;
+	
+	dialog.DoModal();
+}
+
+//===========================================================================================================================
+//	OnSysCommand
+//===========================================================================================================================
+
+void	ChooserDialog::OnSysCommand( UINT inID, LPARAM inParam ) 
+{
+	CDialog::OnSysCommand( inID, inParam );
+}
+
+//===========================================================================================================================
+//	OnClose
+//===========================================================================================================================
+
+void ChooserDialog::OnClose() 
+{
+	StopBrowsing();
+	
+	gApp.m_pMainWnd = this;
+	DestroyWindow();
+}
+
+//===========================================================================================================================
+//	OnNcDestroy
+//===========================================================================================================================
+
+void ChooserDialog::OnNcDestroy() 
+{
+	gApp.m_pMainWnd = this;
+
+	CDialog::OnNcDestroy();
+}
+
+//===========================================================================================================================
+//	OnDomainListChanged
+//===========================================================================================================================
+
+void	ChooserDialog::OnDomainListChanged( NMHDR *pNMHDR, LRESULT *pResult ) 
+{
+	UNUSED_ALWAYS( pNMHDR );
+	
+	// Domain list changes have similar effects to service list changes so reuse that code path by calling it here.
+	
+	OnServiceListChanged( NULL, NULL );
+	
+	*pResult = 0;
+}
+
+//===========================================================================================================================
+//	OnServiceListChanged
+//===========================================================================================================================
+
+void	ChooserDialog::OnServiceListChanged( NMHDR *pNMHDR, LRESULT *pResult ) 
+{
+	int				selectedType;
+	int				selectedDomain;
+	
+	UNUSED_ALWAYS( pNMHDR );
+	
+	// Stop any existing service search.
+	
+	StopBrowsing();
+	
+	// If a domain and service type are selected, start searching for the service type on the domain.
+	
+	selectedType 	= mServiceList.GetNextItem( -1, LVNI_SELECTED );
+	selectedDomain 	= mDomainList.GetNextItem( -1, LVNI_SELECTED );
+	
+	if( ( selectedType >= 0 ) && ( selectedDomain >= 0 ) )
+	{
+		CString				s;
+		std::string			utf8;
+		const char *		type;
+		
+		s = mDomainList.GetItemText( selectedDomain, 0 );
+		StringObjectToUTF8String( s, utf8 );
+		type = mServiceTypes[ selectedType ].serviceType.c_str();
+		if( *type != '\0' )
+		{
+			StartBrowsing( type, utf8.c_str() );
+		}
+	}
+	
+	if( pResult )
+	{
+		*pResult = 0;
+	}
+}
+
+//===========================================================================================================================
+//	OnChooserListChanged
+//===========================================================================================================================
+
+void	ChooserDialog::OnChooserListChanged( NMHDR *pNMHDR, LRESULT *pResult ) 
+{
+	UNUSED_ALWAYS( pNMHDR );
+	
+	UpdateInfoDisplay();
+	*pResult = 0;
+}
+
+//===========================================================================================================================
+//	OnChooserListDoubleClick
+//===========================================================================================================================
+
+void	ChooserDialog::OnChooserListDoubleClick( NMHDR *pNMHDR, LRESULT *pResult )
+{
+	int		selectedItem;
+	
+	UNUSED_ALWAYS( pNMHDR );
+	
+	// Display the service instance if it is selected. Otherwise, clear all the info.
+	
+	selectedItem = mChooserList.GetNextItem( -1, LVNI_SELECTED );
+	if( selectedItem >= 0 )
+	{
+		ServiceInstanceInfo *			p;
+		CString							url;
+		const KnownServiceEntry *		service;
+		
+		assert( selectedItem < (int) mServiceInstances.size() );
+		p = &mServiceInstances[ selectedItem ];
+		
+		// Search for a known service type entry that matches.
+		
+		for( service = kKnownServiceTable; service->serviceType; ++service )
+		{
+			if( p->type == service->serviceType )
+			{
+				break;
+			}
+		}
+		if( service->serviceType )
+		{
+			const char *		text;
+			
+			// Create a URL representing the service instance.
+			
+			if( strcmp( service->serviceType, "_smb._tcp." ) == 0 )
+			{
+				// Special case for SMB (no port number).
+				
+				url.Format( TEXT( "%s%s/" ), service->urlScheme, (const char *) p->ip.c_str() ); 
+			}
+			else if( strcmp( service->serviceType, "_ftp._tcp." ) == 0 )
+			{
+				// Special case for FTP to get login info.
+
+				LoginDialog		dialog;
+				CString			username;
+				CString			password;
+				
+				if( !dialog.GetLogin( username, password ) )
+				{
+					goto exit;
+				}
+				
+				// Build URL in the following format:
+				//
+				// ftp://[username[:password]@]<ip>
+				
+				url += service->urlScheme;
+				if( username.GetLength() > 0 )
+				{
+					url += username;
+					if( password.GetLength() > 0 )
+					{
+						url += ':';
+						url += password;
+					}
+					url += '@';
+				}
+				url += p->ip.c_str();
+			}
+			else if( strcmp( service->serviceType, "_http._tcp." ) == 0 )
+			{
+				// Special case for HTTP to exclude "path=" if present.
+				
+				text = service->useText ? p->text.c_str() : "";
+				if( strncmp( text, "path=", 5 ) == 0 )
+				{
+					text += 5;
+				}
+				if( *text != '/' )
+				{
+					url.Format( TEXT( "%s%s/%s" ), service->urlScheme, (const char *) p->ip.c_str(), text );
+				}
+				else
+				{
+					url.Format( TEXT( "%s%s%s" ), service->urlScheme, (const char *) p->ip.c_str(), text );
+				}
+			}
+			else
+			{
+				text = service->useText ? p->text.c_str() : "";
+				url.Format( TEXT( "%s%s/%s" ), service->urlScheme, (const char *) p->ip.c_str(), text ); 
+			}
+			
+			// Let the system open the URL in the correct app.
+			
+			{
+				CWaitCursor		waitCursor;
+				
+				ShellExecute( NULL, TEXT( "open" ), url, TEXT( "" ), TEXT( "c:\\" ), SW_SHOWNORMAL );
+			}
+		}
+	}
+
+exit:
+	*pResult = 0;
+}
+
+//===========================================================================================================================
+//	OnCancel
+//===========================================================================================================================
+
+void ChooserDialog::OnCancel() 
+{
+	// Do nothing.
+}
+
+//===========================================================================================================================
+//	PopulateServicesList
+//===========================================================================================================================
+
+void	ChooserDialog::PopulateServicesList( void )
+{
+	ServiceTypeVector::iterator		i;
+	CString							type;
+	CString							desc;
+	std::string						tmp;
+	
+	// Add a fixed list of known services.
+	
+	if( mServiceTypes.empty() )
+	{
+		const KnownServiceEntry *		service;
+		
+		for( service = kKnownServiceTable; service->serviceType; ++service )
+		{
+			ServiceTypeInfo		info;
+			
+			info.serviceType 	= service->serviceType;
+			info.description 	= service->description;
+			info.urlScheme 		= service->urlScheme;
+			mServiceTypes.push_back( info );
+		}
+	}
+	
+	// Add each service to the list.
+	
+	for( i = mServiceTypes.begin(); i != mServiceTypes.end(); ++i )
+	{
+		const char *		p;
+		const char *		q;
+		
+		p  = ( *i ).serviceType.c_str();
+		if( *p == '_' ) ++p;							// Skip leading '_'.
+		q  = strchr( p, '.' );							// Find first '.'.
+		if( q )	tmp.assign( p, (size_t)( q - p ) );		// Use only up to the first '.'.
+		else	tmp.assign( p );						// No '.' so use the entire string.
+		UTF8StringToStringObject( tmp.c_str(), type );
+		UTF8StringToStringObject( ( *i ).description.c_str(), desc );
+		
+		int		n;
+		
+		n = mServiceList.GetItemCount();
+		mServiceList.InsertItem( n, type );
+		mServiceList.SetItemText( n, 1, desc );
+	}
+	
+	// Select the first service type by default.
+	
+	if( !mServiceTypes.empty() )
+	{
+		mServiceList.SetItemState( 0, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED );
+	}
+}
+
+//===========================================================================================================================
+//	UpdateInfoDisplay
+//===========================================================================================================================
+
+void	ChooserDialog::UpdateInfoDisplay( void )
+{
+	int							selectedItem;
+	std::string					name;
+	CString						s;
+	std::string					ip;
+	std::string					ifIP;
+	std::string					text;
+	std::string					textNewLines;
+	std::string					hostName;
+	CWnd *						item;
+	std::string::iterator		i;
+	
+	// Display the service instance if it is selected. Otherwise, clear all the info.
+	
+	selectedItem = mChooserList.GetNextItem( -1, LVNI_SELECTED );
+	if( selectedItem >= 0 )
+	{
+		ServiceInstanceInfo *		p;
+		
+		assert( selectedItem < (int) mServiceInstances.size() );
+		p = &mServiceInstances[ selectedItem ];
+		
+		name 		= p->name;
+		ip 			= p->ip;
+		ifIP 		= p->ifIP;
+		text 		= p->text;
+		hostName	= p->hostName;
+
+		// Sync up the list items with the actual data (IP address may change).
+		
+		UTF8StringToStringObject( ip.c_str(), s );
+		mChooserList.SetItemText( selectedItem, 1, s );
+	}
+	
+	// Name
+	
+	item = (CWnd *) this->GetDlgItem( IDC_INFO_NAME_TEXT );
+	assert( item );
+	UTF8StringToStringObject( name.c_str(), s );
+	item->SetWindowText( s );
+	
+	// IP
+	
+	item = (CWnd *) this->GetDlgItem( IDC_INFO_IP_TEXT );
+	assert( item );
+	UTF8StringToStringObject( ip.c_str(), s );
+	item->SetWindowText( s );
+	
+	// Interface
+	
+	item = (CWnd *) this->GetDlgItem( IDC_INFO_INTERFACE_TEXT );
+	assert( item );
+	UTF8StringToStringObject( ifIP.c_str(), s );
+	item->SetWindowText( s );
+	
+
+	item = (CWnd *) this->GetDlgItem( IDC_INFO_HOST_NAME_TEXT );
+	assert( item );
+	UTF8StringToStringObject( hostName.c_str(), s );
+	item->SetWindowText( s );
+
+	// Text
+	
+	item = (CWnd *) this->GetDlgItem( IDC_INFO_TEXT_TEXT );
+	assert( item );
+	for( i = text.begin(); i != text.end(); ++i )
+	{
+		if( *i == '\1' )
+		{
+			textNewLines += "\r\n";
+		}
+		else
+		{
+			textNewLines += *i;
+		}
+	}
+	UTF8StringToStringObject( textNewLines.c_str(), s );
+	item->SetWindowText( s );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	OnDomainAdd
+//===========================================================================================================================
+
+LONG	ChooserDialog::OnDomainAdd( WPARAM inWParam, LPARAM inLParam )
+{
+	DomainEventInfo *						p;
+	std::auto_ptr < DomainEventInfo >		pAutoPtr;
+	int										n;
+	int										i;
+	CString									domain;
+	CString									s;
+	bool									found;
+	
+	UNUSED_ALWAYS( inWParam );
+	
+	assert( inLParam );
+	p = reinterpret_cast <DomainEventInfo *> ( inLParam );
+	pAutoPtr.reset( p );
+	
+	// Search to see if we already know about this domain. If not, add it to the list.
+	
+	found = false;
+	domain = p->domain;
+	n = mDomainList.GetItemCount();
+	for( i = 0; i < n; ++i )
+	{
+		s = mDomainList.GetItemText( i, 0 );
+		if( s == domain )
+		{
+			found = true;
+			break;
+		}
+	}
+	if( !found )
+	{
+		int		selectedItem;
+		
+		mDomainList.InsertItem( n, domain );
+		
+		// If no domains are selected and the domain being added is a default domain, select it.
+		
+		selectedItem = mDomainList.GetNextItem( -1, LVNI_SELECTED );
+		if( ( selectedItem < 0 ) && ( p->eventType == kDNSBrowserEventTypeAddDefaultDomain ) )
+		{
+			mDomainList.SetItemState( n, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED );
+		}
+	}
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnDomainRemove
+//===========================================================================================================================
+
+LONG	ChooserDialog::OnDomainRemove( WPARAM inWParam, LPARAM inLParam )
+{
+	DomainEventInfo *						p;
+	std::auto_ptr < DomainEventInfo >		pAutoPtr;
+	int										n;
+	int										i;
+	CString									domain;
+	CString									s;
+	bool									found;
+	
+	UNUSED_ALWAYS( inWParam );
+	
+	assert( inLParam );
+	p = reinterpret_cast <DomainEventInfo *> ( inLParam );
+	pAutoPtr.reset( p );
+	
+	// Search to see if we know about this domain. If so, remove it from the list.
+	
+	found = false;
+	domain = p->domain;
+	n = mDomainList.GetItemCount();
+	for( i = 0; i < n; ++i )
+	{
+		s = mDomainList.GetItemText( i, 0 );
+		if( s == domain )
+		{
+			found = true;
+			break;
+		}
+	}
+	if( found )
+	{
+		mDomainList.DeleteItem( i );
+	}
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnServiceAdd
+//===========================================================================================================================
+
+LONG	ChooserDialog::OnServiceAdd( WPARAM inWParam, LPARAM inLParam )
+{
+	ServiceEventInfo *						p;
+	std::auto_ptr < ServiceEventInfo >		pAutoPtr;
+	
+	UNUSED_ALWAYS( inWParam );
+	
+	assert( inLParam );
+	p = reinterpret_cast <ServiceEventInfo *> ( inLParam );
+	pAutoPtr.reset( p );
+	
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnServiceRemove
+//===========================================================================================================================
+
+LONG	ChooserDialog::OnServiceRemove( WPARAM inWParam, LPARAM inLParam )
+{
+	ServiceEventInfo *						p;
+	std::auto_ptr < ServiceEventInfo >		pAutoPtr;
+	bool									found;
+	int										n;
+	int										i;
+	
+	UNUSED_ALWAYS( inWParam );
+	
+	assert( inLParam );
+	p = reinterpret_cast <ServiceEventInfo *> ( inLParam );
+	pAutoPtr.reset( p );
+	
+	// Search to see if we know about this service instance. If so, remove it from the list.
+	
+	found = false;
+	n = (int) mServiceInstances.size();
+	for( i = 0; i < n; ++i )
+	{
+		ServiceInstanceInfo *		q;
+		
+		// If the name, type, domain, and interface match, treat it as the same service instance.
+		
+		q = &mServiceInstances[ i ];
+		if( ( p->name 	== q->name ) 	&& 
+			( p->type 	== q->type ) 	&& 
+			( p->domain	== q->domain ) )
+		{
+			found = true;
+			break;
+		}
+	}
+	if( found )
+	{
+		mChooserList.DeleteItem( i );
+		assert( i < (int) mServiceInstances.size() );
+		mServiceInstances.erase( mServiceInstances.begin() + i );
+	}
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnResolve
+//===========================================================================================================================
+
+LONG	ChooserDialog::OnResolve( WPARAM inWParam, LPARAM inLParam )
+{
+	ServiceInstanceInfo *						p;
+	std::auto_ptr < ServiceInstanceInfo >		pAutoPtr;
+	int											selectedType;
+	int											n;
+	int											i;
+	bool										found;
+	
+	UNUSED_ALWAYS( inWParam );
+	
+	assert( inLParam );
+	p = reinterpret_cast <ServiceInstanceInfo *> ( inLParam );
+	pAutoPtr.reset( p );
+	
+	// Make sure it is for an item of the correct type. This handles any resolves that may have been queued up.
+	
+	selectedType = mServiceList.GetNextItem( -1, LVNI_SELECTED );
+	assert( selectedType >= 0 );
+	if( selectedType >= 0 )
+	{
+		assert( selectedType <= (int) mServiceTypes.size() );
+		if( p->type != mServiceTypes[ selectedType ].serviceType )
+		{
+			goto exit;
+		}
+	}
+	
+	// Search to see if we know about this service instance. If so, update its info. Otherwise, add it to the list.
+	
+	found = false;
+	n = (int) mServiceInstances.size();
+	for( i = 0; i < n; ++i )
+	{
+		ServiceInstanceInfo *		q;
+		
+		// If the name, type, domain, and interface matches, treat it as the same service instance.
+				
+		q = &mServiceInstances[ i ];
+		if( ( p->name 	== q->name ) 	&& 
+			( p->type 	== q->type ) 	&& 
+			( p->domain	== q->domain ) 	&& 
+			( p->ifIP 	== q->ifIP ) )
+		{
+			found = true;
+			break;
+		}
+	}
+	if( found )
+	{
+		mServiceInstances[ i ] = *p;
+	}
+	else
+	{
+		CString		s;
+		
+		mServiceInstances.push_back( *p );
+		UTF8StringToStringObject( p->name.c_str(), s );
+		mChooserList.InsertItem( n, s );
+		
+		UTF8StringToStringObject( p->ip.c_str(), s );
+		mChooserList.SetItemText( n, 1, s );
+		
+		// If this is the only item, select it.
+		
+		if( n == 0 )
+		{
+			mChooserList.SetItemState( n, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED );
+		}
+	}
+	UpdateInfoDisplay();
+
+exit:
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	StartBrowsing
+//===========================================================================================================================
+
+void	ChooserDialog::StartBrowsing( const char *inType, const char *inDomain )
+{
+	DNSStatus		err;
+	
+	assert( mServiceInstances.empty() );
+	assert( mChooserList.GetItemCount() == 0 );
+	assert( !mIsServiceBrowsing );
+	
+	mChooserList.DeleteAllItems();
+	mServiceInstances.clear();
+	
+	mIsServiceBrowsing = true;
+	err = DNSBrowserStartServiceSearch( mBrowser, kDNSBrowserFlagAutoResolve, inType, inDomain );
+	assert( err == kDNSNoErr );
+}
+
+//===========================================================================================================================
+//	StopBrowsing
+//===========================================================================================================================
+
+void	ChooserDialog::StopBrowsing( void )
+{
+	// If searching, stop.
+	
+	if( mIsServiceBrowsing )
+	{
+		DNSStatus		err;
+		
+		mIsServiceBrowsing = false;
+		err = DNSBrowserStopServiceSearch( mBrowser, 0 );
+		assert( err == kDNSNoErr );
+	}
+	
+	// Remove all service instances.
+	
+	mChooserList.DeleteAllItems();
+	assert( mChooserList.GetItemCount() == 0 );
+	mServiceInstances.clear();
+	assert( mServiceInstances.empty() );
+	UpdateInfoDisplay();
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	BrowserCallBack
+//===========================================================================================================================
+
+static void
+	BrowserCallBack( 
+		void *					inContext, 
+		DNSBrowserRef			inRef, 
+		DNSStatus				inStatusCode,
+		const DNSBrowserEvent *	inEvent )
+{
+	ChooserDialog *		dialog;
+	UINT 				message;
+	BOOL				posted;
+	
+	UNUSED_ALWAYS( inStatusCode );
+	UNUSED_ALWAYS( inRef );
+	
+	// Check parameters.
+	
+	assert( inContext );
+	dialog = reinterpret_cast <ChooserDialog *> ( inContext );
+	
+	try
+	{
+		switch( inEvent->type )
+		{
+			case kDNSBrowserEventTypeRelease:
+				break;
+			
+			// Domains
+			
+			case kDNSBrowserEventTypeAddDomain:
+			case kDNSBrowserEventTypeAddDefaultDomain:
+			case kDNSBrowserEventTypeRemoveDomain:
+			{
+				DomainEventInfo *						domain;
+				std::auto_ptr < DomainEventInfo >		domainAutoPtr;
+				
+				domain = new DomainEventInfo;
+				domainAutoPtr.reset( domain );
+				
+				domain->eventType 	= inEvent->type;
+				domain->domain 		= inEvent->data.addDomain.domain;
+				domain->ifIP		= inEvent->data.addDomain.interfaceIP;
+				
+				message = ( inEvent->type == kDNSBrowserEventTypeRemoveDomain ) ? WM_USER_DOMAIN_REMOVE : WM_USER_DOMAIN_ADD;
+				posted = ::PostMessage( dialog->GetSafeHwnd(), message, 0, (LPARAM) domain );
+				assert( posted );
+				if( posted )
+				{
+					domainAutoPtr.release();
+				}
+				break;
+			}
+			
+			// Services
+			
+			case kDNSBrowserEventTypeAddService:
+			case kDNSBrowserEventTypeRemoveService:
+			{
+				ServiceEventInfo *						service;
+				std::auto_ptr < ServiceEventInfo >		serviceAutoPtr;
+				
+				service = new ServiceEventInfo;
+				serviceAutoPtr.reset( service );
+				
+				service->eventType 	= inEvent->type;
+				service->name 		= inEvent->data.addService.name;
+				service->type 		= inEvent->data.addService.type;
+				service->domain		= inEvent->data.addService.domain;
+				service->ifIP		= inEvent->data.addService.interfaceIP;
+				
+				message = ( inEvent->type == kDNSBrowserEventTypeAddService ) ? WM_USER_SERVICE_ADD : WM_USER_SERVICE_REMOVE;
+				posted = ::PostMessage( dialog->GetSafeHwnd(), message, 0, (LPARAM) service );
+				assert( posted );
+				if( posted )
+				{
+					serviceAutoPtr.release();
+				}
+				break;
+			}
+			
+			// Resolves
+			
+			case kDNSBrowserEventTypeResolved:
+				if( inEvent->data.resolved->address.addressType == kDNSNetworkAddressTypeIPv4  )
+				{
+					ServiceInstanceInfo *						serviceInstance;
+					std::auto_ptr < ServiceInstanceInfo >		serviceInstanceAutoPtr;
+					char										s[ 32 ];
+					
+					serviceInstance = new ServiceInstanceInfo;
+					serviceInstanceAutoPtr.reset( serviceInstance );
+					
+					serviceInstance->name 		= inEvent->data.resolved->name;
+					serviceInstance->type 		= inEvent->data.resolved->type;
+					serviceInstance->domain		= inEvent->data.resolved->domain;
+					serviceInstance->ip			= DNSNetworkAddressToString( &inEvent->data.resolved->address, s );
+					serviceInstance->ifIP		= DNSNetworkAddressToString( &inEvent->data.resolved->interfaceIP, s );
+					serviceInstance->text 		= inEvent->data.resolved->textRecord;
+					serviceInstance->hostName	= inEvent->data.resolved->hostName;
+
+					posted = ::PostMessage( dialog->GetSafeHwnd(), WM_USER_RESOLVE, 0, (LPARAM) serviceInstance );
+					assert( posted );
+					if( posted )
+					{
+						serviceInstanceAutoPtr.release();
+					}
+				}
+				break;
+			
+			default:
+				break;
+		}
+	}
+	catch( ... )
+	{
+		// Don't let exceptions escape.
+	}
+}
+
+//===========================================================================================================================
+//	DNSNetworkAddressToString
+//
+//	Note: Currently only supports IPv4 network addresses.
+//===========================================================================================================================
+
+static char *	DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, char *outString )
+{
+	const DNSUInt8 *		p;
+	DNSUInt16				port;
+	
+	p = inAddr->u.ipv4.addr.v8;
+	port = ntohs( inAddr->u.ipv4.port.v16 );
+	if( port != kDNSPortInvalid )
+	{
+		sprintf( outString, "%u.%u.%u.%u:%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ], port );
+	}
+	else
+	{
+		sprintf( outString, "%u.%u.%u.%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ] );
+	}
+	return( outString );
+}
+
+//===========================================================================================================================
+//	UTF8StringToStringObject
+//===========================================================================================================================
+
+static DWORD	UTF8StringToStringObject( const char *inUTF8, CString &inObject )
+{
+	DWORD		err;
+	int			n;
+	BSTR		unicode;
+	
+	unicode = NULL;
+	
+	n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, NULL, 0 );
+	if( n > 0 )
+	{
+		unicode = (BSTR) malloc( (size_t)( n * sizeof( wchar_t ) ) );
+		if( !unicode )
+		{
+			err = ERROR_INSUFFICIENT_BUFFER;
+			goto exit;
+		}
+
+		n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, unicode, n );
+		try
+		{
+			inObject = unicode;
+		}
+		catch( ... )
+		{
+			err = ERROR_NO_UNICODE_TRANSLATION;
+			goto exit;
+		}
+	}
+	else
+	{
+		inObject = "";
+	}
+	err = 0;
+	
+exit:
+	if( unicode )
+	{
+		free( unicode );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	StringObjectToUTF8String
+//===========================================================================================================================
+
+static DWORD	StringObjectToUTF8String( CString &inObject, std::string &outUTF8 )
+{
+	DWORD		err;
+	BSTR		unicode;
+	int			nUnicode;
+	int			n;
+	char *		utf8;
+	
+	unicode = NULL;
+	utf8	= NULL;
+	
+	nUnicode = inObject.GetLength();
+	if( nUnicode > 0 )
+	{
+		unicode = inObject.AllocSysString();
+		n = WideCharToMultiByte( CP_UTF8, 0, unicode, nUnicode, NULL, 0, NULL, NULL );
+		assert( n > 0 );
+		
+		utf8 = (char *) malloc( (size_t) n );
+		assert( utf8 );
+		if( !utf8 ) { err = ERROR_INSUFFICIENT_BUFFER; goto exit; }
+		
+		n = WideCharToMultiByte( CP_UTF8, 0, unicode, nUnicode, utf8, n, NULL, NULL );
+		assert( n > 0 );
+		
+		try
+		{
+			outUTF8.assign( utf8, n );
+		}
+		catch( ... )
+		{
+			err = ERROR_NO_UNICODE_TRANSLATION;
+			goto exit;
+		}
+	}
+	else
+	{
+		outUTF8.clear();
+	}
+	err = 0;
+	
+exit:
+	if( unicode )
+	{
+		SysFreeString( unicode );
+	}
+	if( utf8 )
+	{
+		free( utf8 );
+	}
+	return( err );
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.h
new file mode 100644
index 00000000..41fd8275
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.h
@@ -0,0 +1,131 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_CHOOSERDIALOG_H__AC258704_B307_4901_9F98_A0AC022FD8AC__INCLUDED_)
+#define AFX_CHOOSERDIALOG_H__AC258704_B307_4901_9F98_A0AC022FD8AC__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include	<string>
+#include	<vector>
+
+#include	"afxcmn.h"
+
+#include	"Resource.h"
+
+#include	"DNSServices.h"
+
+//===========================================================================================================================
+//	Structures
+//===========================================================================================================================
+
+struct	ServiceInstanceInfo
+{
+	std::string		name;
+	std::string		type;
+	std::string		domain;
+	std::string		ip;
+	std::string		text;
+	std::string		ifIP;
+	std::string		hostName;
+};
+
+struct	ServiceTypeInfo
+{
+	std::string		serviceType;
+	std::string		description;
+	std::string		urlScheme;
+};
+
+//===========================================================================================================================
+//	ChooserDialog
+//===========================================================================================================================
+
+class	ChooserDialog : public CDialog
+{
+	public:
+
+		ChooserDialog(CWnd* pParent = NULL);
+		virtual	~ChooserDialog( void );
+		
+		//{{AFX_DATA(ChooserDialog)
+		enum { IDD = IDD_CHOOSER_DIALOG };
+		CListCtrl mServiceList;
+		CListCtrl mDomainList;
+		CListCtrl mChooserList;
+		//}}AFX_DATA
+
+		// ClassWizard generated virtual function overrides
+		//{{AFX_VIRTUAL(ChooserDialog)
+		public:
+		virtual BOOL PreTranslateMessage(MSG* pMsg);
+		protected:
+		virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+		virtual void PostNcDestroy();
+		//}}AFX_VIRTUAL
+
+	protected:
+		
+		typedef std::vector < ServiceInstanceInfo >		ServiceInstanceVector;
+		typedef std::vector < ServiceTypeInfo >			ServiceTypeVector;
+		
+		HACCEL						mMenuAcceleratorTable;
+		DNSBrowserRef				mBrowser;
+		BOOL						mIsServiceBrowsing;
+		ServiceInstanceVector		mServiceInstances;
+		ServiceTypeVector			mServiceTypes;
+		
+	public:
+
+		void	PopulateServicesList( void );
+		void	UpdateInfoDisplay( void );
+		
+		void	StartBrowsing( const char *inType, const char *inDomain );
+		void	StopBrowsing( void );
+
+	protected:
+
+		//{{AFX_MSG(ChooserDialog)
+		virtual BOOL OnInitDialog();
+		afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
+		afx_msg void OnDomainListChanged(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnServiceListChanged(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnChooserListChanged(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnChooserListDoubleClick(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg void OnAbout();
+		afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+		afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
+		afx_msg void OnFileClose();
+		virtual void OnCancel();
+		afx_msg void OnExit();
+		afx_msg void OnClose();
+		afx_msg void OnNcDestroy();
+		//}}AFX_MSG
+		afx_msg LONG OnDomainAdd( WPARAM inWParam, LPARAM inLParam );
+		afx_msg LONG OnDomainRemove( WPARAM inWParam, LPARAM inLParam );
+		afx_msg LONG OnServiceAdd( WPARAM inWParam, LPARAM inLParam );
+		afx_msg LONG OnServiceRemove( WPARAM inWParam, LPARAM inLParam );
+		afx_msg LONG OnResolve( WPARAM inWParam, LPARAM inLParam );
+		DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CHOOSERDIALOG_H__AC258704_B307_4901_9F98_A0AC022FD8AC__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.cpp
new file mode 100644
index 00000000..b9a9ec93
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.cpp
@@ -0,0 +1,109 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<assert.h>
+#include	<stdlib.h>
+
+#include	"stdafx.h"
+
+#include	"LoginDialog.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP( LoginDialog, CDialog )
+END_MESSAGE_MAP()
+
+//===========================================================================================================================
+//	LoginDialog
+//===========================================================================================================================
+
+LoginDialog::LoginDialog( CWnd *inParent )
+	: CDialog( LoginDialog::IDD, inParent )
+{
+	//
+}
+
+//===========================================================================================================================
+//	OnInitDialog
+//===========================================================================================================================
+
+BOOL	LoginDialog::OnInitDialog( void )
+{
+	CDialog::OnInitDialog();
+	return( TRUE );
+}
+
+//===========================================================================================================================
+//	DoDataExchange
+//===========================================================================================================================
+
+void	LoginDialog::DoDataExchange( CDataExchange *inDX )
+{
+	CDialog::DoDataExchange( inDX );
+}
+
+//===========================================================================================================================
+//	OnOK
+//===========================================================================================================================
+
+void	LoginDialog::OnOK( void )
+{
+	const CWnd *		control;
+		
+	// Username
+	
+	control = GetDlgItem( IDC_LOGIN_USERNAME_TEXT );
+	assert( control );
+	if( control )
+	{
+		control->GetWindowText( mUsername );
+	}
+	
+	// Password
+	
+	control = GetDlgItem( IDC_LOGIN_PASSWORD_TEXT );
+	assert( control );
+	if( control )
+	{
+		control->GetWindowText( mPassword );
+	}
+	
+	CDialog::OnOK();
+}
+
+//===========================================================================================================================
+//	GetLogin
+//===========================================================================================================================
+
+BOOL	LoginDialog::GetLogin( CString &outUsername, CString &outPassword )
+{
+	if( DoModal() == IDOK )
+	{
+		outUsername = mUsername;
+		outPassword = mPassword;
+		return( TRUE );
+	}
+	return( FALSE );
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.h
new file mode 100644
index 00000000..e53beb6b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/LoginDialog.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef	__LOGIN_DIALOG__
+#define	__LOGIN_DIALOG__
+
+#pragma once
+
+#include	"Resource.h"
+
+//===========================================================================================================================
+//	LoginDialog
+//===========================================================================================================================
+
+class	LoginDialog : public CDialog
+{
+	protected:
+	
+		CString		mUsername;
+		CString		mPassword;
+		
+	public:
+		
+		enum { IDD = IDD_LOGIN };
+		
+		LoginDialog( CWnd *inParent = NULL );
+		
+		virtual BOOL	GetLogin( CString &outUsername, CString &outPassword );
+	
+	protected:
+
+		virtual BOOL	OnInitDialog( void );
+		virtual void	DoDataExchange( CDataExchange *inDX );
+		virtual void	OnOK( void );
+		
+		DECLARE_MESSAGE_MAP()
+};
+
+#endif	// __LOGIN_DIALOG__
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.cpp
new file mode 100644
index 00000000..ae2ca2ec
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.cpp
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"stdafx.h"
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.h
new file mode 100644
index 00000000..c62bd3ee
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/Windows/Sources/StdAfx.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_STDAFX_H__424305D2_0A97_4AA0_B9B1_A7D90D18EBA0__INCLUDED_)
+#define AFX_STDAFX_H__424305D2_0A97_4AA0_B9B1_A7D90D18EBA0__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+
+#ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
+	#define WINVER 0x0400	// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#endif
+
+#include	<afxwin.h>		// MFC core and standard components
+#include	<afxext.h>		// MFC extensions
+#include	<afxdtctl.h>	// MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+	#include	<afxcmn.h>	// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include	<winsock2.h>
+
+#include	<stdlib.h>
+
+#include	"DNSServices.h"
+
+#include	"Application.h"
+
+#include	"ChooserDialog.h"
+
+#endif // !defined(AFX_STDAFX_H__424305D2_0A97_4AA0_B9B1_A7D90D18EBA0__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcc b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcc
new file mode 100644
index 00000000..22f443d1
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcc
@@ -0,0 +1,37 @@
+; CLW file contains information for the MFC ClassWizard
+
+[General Info]
+Version=1
+LastClass=BrowserDialog
+LastTemplate=CDialog
+NewFileInclude1=#include "stdafx.h"
+NewFileInclude2=#include "Application.h"
+
+ClassCount=3
+Class1=Application
+Class2=BrowserDialog
+
+ResourceCount=3
+Resource2=IDR_MAINFRAME
+Resource3=IDD_APPLICATION_DIALOG
+
+[CLS:Application]
+Type=0
+HeaderFile=Application.h
+ImplementationFile=Application.cpp
+Filter=N
+
+[CLS:BrowserDialog]
+Type=0
+HeaderFile=BrowserDialog.h
+ImplementationFile=BrowserDialog.cpp
+Filter=D
+
+
+[DLG:IDD_APPLICATION_DIALOG]
+Type=1
+ControlCount=3
+Control1=IDOK,button,1342242817
+Control2=IDCANCEL,button,1342242816
+Control3=IDC_STATIC,static,1342308352
+Class=BrowserDialog
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcp
new file mode 100644
index 00000000..9c735677
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcp
@@ -0,0 +1,868 @@
+# Microsoft eMbedded Visual Tools Project File - Name="Application" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE ARMV4) Application" 0xa301
+# TARGTYPE "Win32 (WCE emulator) Application" 0xa601
+
+CFG=Application - Win32 (WCE emulator) Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Application.vcn".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Application.vcn" CFG="Application - Win32 (WCE emulator) Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Application - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Application")
+!MESSAGE "Application - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Application")
+!MESSAGE "Application - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Application")
+!MESSAGE "Application - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "emulatorRel"
+# PROP BASE Intermediate_Dir "emulatorRel"
+# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "emulatorRel"
+# PROP Intermediate_Dir "emulatorRel"
+# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /d "_AFXDLL" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /d "_AFXDLL" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_WIN32_WCE_CEPC" /D "_AFXDLL" /Yu"stdafx.h" /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /WX /I "Resources" /I "Sources" /I "..\..\..\DNSServices" /I "..\..\..\..\mDNSCore" /I "..\..\..\..\mDNSCore\PlatformSupport" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_WIN32_WCE_CEPC" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_AFXDLL" /D DNS_SD_CLIENT_ENABLED=0 /Gs8192 /GF /O2 /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "emulatorDbg"
+# PROP BASE Intermediate_Dir "emulatorDbg"
+# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "emulatorDbg"
+# PROP Intermediate_Dir "emulatorDbg"
+# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /d "_AFXDLL" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /d "_AFXDLL" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_WIN32_WCE_CEPC" /D "_AFXDLL" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /WX /Zi /Od /I "Resources" /I "Sources" /I "..\..\..\DNSServices" /I "..\..\..\..\mDNSCore" /I "..\..\..\..\mDNSCore\PlatformSupport" /D "_i386_" /D "_X86_" /D "x86" /D "_WIN32_WCE_CEPC" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_AFXDLL" /D DNS_SD_CLIENT_ENABLED=0 /FR /Gs8192 /GF /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /debug /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /debug /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMV4Rel"
+# PROP BASE Intermediate_Dir "ARMV4Rel"
+# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMV4Rel"
+# PROP Intermediate_Dir "ARMV4Rel"
+# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /d "_AFXDLL" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /d "_AFXDLL" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_AFXDLL" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /WX /I "Resources" /I "Sources" /I "..\..\..\DNSServices" /I "..\..\..\..\mDNSCore" /I "..\..\..\..\mDNSCore\PlatformSupport" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_AFXDLL" /D DNS_SD_CLIENT_ENABLED=0 /O2 /M$(CECrtMT) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMV4Dbg"
+# PROP BASE Intermediate_Dir "ARMV4Dbg"
+# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMV4Dbg"
+# PROP Intermediate_Dir "ARMV4Dbg"
+# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /d "_AFXDLL" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /d "_AFXDLL" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /WX /Zi /Od /I "Resources" /I "Sources" /I "..\..\..\DNSServices" /I "..\..\..\..\mDNSCore" /I "..\..\..\..\mDNSCore\PlatformSupport" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_AFXDLL" /D DNS_SD_CLIENT_ENABLED=0 /FR /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /debug /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"wWinMainCRTStartup" /debug /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Application - Win32 (WCE emulator) Release"
+# Name "Application - Win32 (WCE emulator) Debug"
+# Name "Application - Win32 (WCE ARMV4) Release"
+# Name "Application - Win32 (WCE ARMV4) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Sources\Application.cpp
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_APPLI=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_APPLI=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_APPLI=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_APPLI=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sources\Application.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sources\BrowserDialog.cpp
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\DNSServices\DNSServices.h"\
+	".\Sources\Application.h"\
+	".\Sources\BrowserDialog.h"\
+	".\Sources\StdAfx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sources\BrowserDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sources\StdAfx.cpp
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_STDAF=\
+	".\Sources\StdAfx.h"\
+	
+# ADD CPP /Yc"stdafx.h"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_STDAF=\
+	".\Sources\StdAfx.h"\
+	
+# ADD CPP /Yc"stdafx.h"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_STDAF=\
+	".\Sources\StdAfx.h"\
+	
+# ADD CPP /Yc"stdafx.h"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_STDAF=\
+	".\Sources\StdAfx.h"\
+	
+# ADD CPP /Yc"stdafx.h"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sources\StdAfx.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Resources\Application.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resources\Application.rc
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resources\Application.rc2
+# PROP Exclude_From_Scan -1
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resources\newres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resources\Resource.h
+# End Source File
+# End Group
+# Begin Group "Support"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\CommonServices.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DebugServices.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\intLib.h"\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\intLib.h"\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\intLib.h"\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\intLib.h"\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DebugServices.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\DNSCommon.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DNSCO=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DNSCO=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DNSCO=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DNSCO=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\DNSCommon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\DNSDigest.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DNSDI=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DNSDI=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DNSDI=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DNSDI=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSSD.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DNSSD=\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	"..\..\..\RMxClient.h"\
+	
+NODEP_CPP_DNSSD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DNSSD=\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	"..\..\..\RMxClient.h"\
+	
+NODEP_CPP_DNSSD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DNSSD=\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	"..\..\..\RMxClient.h"\
+	
+NODEP_CPP_DNSSD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DNSSD=\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	"..\..\..\RMxClient.h"\
+	
+NODEP_CPP_DNSSD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSSD.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSSDDirect.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DNSSDD=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	
+NODEP_CPP_DNSSDD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DNSSDD=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	
+NODEP_CPP_DNSSDD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DNSSDD=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	
+NODEP_CPP_DNSSDD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DNSSDD=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\DNSSD.h"\
+	"..\..\..\DNSSDDirect.h"\
+	
+NODEP_CPP_DNSSDD=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSSDDirect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSServices\DNSServices.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_DNSSE=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\DNSServices\DNSServices.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_DNSSE=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\DNSServices\DNSServices.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DNSSE=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\DNSServices\DNSServices.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DNSSE=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\DNSServices\DNSServices.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\DNSServices\DNSServices.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\mDNS.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_MDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_MDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_MDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\mDNSClientAPI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\mDNSDebug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\mDNSWin32.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_MDNSW=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\mDNSWin32.h"\
+	{$(INCLUDE)}"ipexport.h"\
+	{$(INCLUDE)}"Iphlpapi.h"\
+	{$(INCLUDE)}"iptypes.h"\
+	
+NODEP_CPP_MDNSW=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_MDNSW=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\mDNSWin32.h"\
+	{$(INCLUDE)}"ipexport.h"\
+	{$(INCLUDE)}"Iphlpapi.h"\
+	{$(INCLUDE)}"iptypes.h"\
+	
+NODEP_CPP_MDNSW=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+# ADD CPP /W3
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MDNSW=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\mDNSWin32.h"\
+	{$(INCLUDE)}"ipexport.h"\
+	{$(INCLUDE)}"Iphlpapi.h"\
+	{$(INCLUDE)}"iptypes.h"\
+	
+NODEP_CPP_MDNSW=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_MDNSW=\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\CommonServices.h"\
+	"..\..\..\DebugServices.h"\
+	"..\..\..\mDNSWin32.h"\
+	{$(INCLUDE)}"ipexport.h"\
+	{$(INCLUDE)}"Iphlpapi.h"\
+	{$(INCLUDE)}"iptypes.h"\
+	
+NODEP_CPP_MDNSW=\
+	"..\..\..\logLib.h"\
+	"..\..\..\vxWorks.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\mDNSWin32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\uDNS.c
+
+!IF  "$(CFG)" == "Application - Win32 (WCE emulator) Release"
+
+DEP_CPP_UDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE emulator) Debug"
+
+DEP_CPP_UDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_UDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ELSEIF  "$(CFG)" == "Application - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_UDNS_=\
+	"..\..\..\..\mDNSCore\DNSCommon.h"\
+	"..\..\..\..\mDNSCore\mDNSClientAPI.h"\
+	"..\..\..\..\mDNSCore\mDNSDebug.h"\
+	"..\..\..\..\mDNSCore\uDNS.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\mDNSCore\uDNS.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcw b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcw
new file mode 100644
index 00000000..11ef513d
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Application.vcw
@@ -0,0 +1,29 @@
+Microsoft eMbedded Visual Tools Workspace File, Format Version 4.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Application"=.\Application.vcp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.ico b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.ico
new file mode 100644
index 00000000..50fb08fc
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.ico
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc
new file mode 100644
index 00000000..c153326b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc
@@ -0,0 +1,194 @@
+//Microsoft eMbedded Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "newres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""newres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif //_WIN32\r\n"
+    "#include ""Resources\\Application.rc2""  // non-Microsoft eMbedded Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#include ""wceres.rc""         // WCE-specific components\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON    DISCARDABLE     "Application.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_APPLICATION_DIALOG DIALOG DISCARDABLE  0, 0, 139, 153
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION
+EXSTYLE WS_EX_APPWINDOW | 0x80000000L
+CAPTION "DNSServiceBrowser"
+FONT 8, "System"
+BEGIN
+    CONTROL         "List1",IDC_BROWSE_LIST,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | 
+                    WS_BORDER | WS_TABSTOP,7,7,125,141
+END
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Apple Computer, Inc.\0"
+            VALUE "FileDescription", "DNSServiceBrowser for Windows CE\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "Application\0"
+            VALUE "LegalCopyright", "Copyright (C) 2003-2004 Apple Computer, Inc.\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "Application.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "DNSServiceBrowser for Windows CE\0"
+            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_APPLICATION_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 132
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 146
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDP_SOCKETS_INIT_FAILED "Windows CE sockets initialization failed."
+    IDS_BROWSER_LIST_COLUMN_NAME "Name"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+#include "Resources\Application.rc2"  // non-Microsoft eMbedded Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#include "wceres.rc"         // WCE-specific components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc2 b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc2
new file mode 100644
index 00000000..29c9fe7b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/Application.rc2
@@ -0,0 +1,13 @@
+//
+// APPLICATION.RC2 - resources Microsoft eMbedded Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft eMbedded Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/newres.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/newres.h
new file mode 100644
index 00000000..31c3a433
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/newres.h
@@ -0,0 +1,28 @@
+#ifndef __NEWRES_H__
+#define __NEWRES_H__
+
+#define  SHMENUBAR RCDATA
+#if !(defined(_WIN32_WCE_PSPC) && (_WIN32_WCE >= 300))
+	#undef HDS_HORZ  
+	#undef HDS_BUTTONS 
+	#undef HDS_HIDDEN 
+
+	#include <commctrl.h>
+	// for MenuBar
+	#define I_IMAGENONE		(-2)
+	#define NOMENU			0xFFFF
+	#define IDS_SHNEW		1
+	#define IDM_SHAREDNEW        10
+	#define IDM_SHAREDNEWDEFAULT 11
+
+	// for Tab Control
+	#define TCS_SCROLLOPPOSITE      0x0001   // assumes multiline tab
+	#define TCS_BOTTOM              0x0002
+	#define TCS_RIGHT               0x0002
+	#define TCS_VERTICAL            0x0080
+	#define TCS_MULTISELECT         0x0004  // allow multi-select in button mode
+	#define TCS_FLATBUTTONS         0x0008	
+#endif //_WIN32_WCE_PSPC
+
+
+#endif //__NEWRES_H__
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/resource.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/resource.h
new file mode 100644
index 00000000..0337c560
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Resources/resource.h
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft eMbedded Visual C++ generated include file.
+// Used by Application.rc
+//
+#define IDD_APPLICATION_DIALOG          102
+#define IDP_SOCKETS_INIT_FAILED         103
+#define IDS_BROWSER_LIST_COLUMN_NAME    104
+#define IDR_MAINFRAME                   128
+#define IDC_BROWSE_LIST                 1000
+#define IDC_IP_TEXT                     1003
+#define IDC_TXT_TEXT                    1004
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        129
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1005
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.cpp
new file mode 100644
index 00000000..931cd950
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.cpp
@@ -0,0 +1,92 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"stdafx.h"
+
+#include	"DNSServices.h"
+
+#include	"BrowserDialog.h"
+
+#include	"Application.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP(Application, CWinApp)
+	//{{AFX_MSG_MAP(Application)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+Application		gApp;
+
+//===========================================================================================================================
+//	Application
+//===========================================================================================================================
+
+Application::Application()
+	: CWinApp()
+{
+	//
+}
+
+//===========================================================================================================================
+//	InitInstance
+//===========================================================================================================================
+
+BOOL Application::InitInstance()
+{
+	DNSStatus			err;
+	BrowserDialog		dialog;
+	BOOL				dnsInitialized;
+	
+	dnsInitialized = FALSE;
+	
+	err = DNSServicesInitialize( kDNSFlagAdvertise, 0 );
+	if( err )
+	{
+		AfxMessageBox( IDP_SOCKETS_INIT_FAILED );
+		goto exit;
+	}
+	dnsInitialized = TRUE;
+
+	// Display the main browser dialog.
+	
+	m_pMainWnd = &dialog;
+	dialog.DoModal();
+
+	// Dialog has been closed. Return false to exit the app and not start the app's message pump.
+
+exit:
+	if( dnsInitialized )
+	{
+		DNSServicesFinalize();
+	}
+	return( FALSE );
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.h
new file mode 100644
index 00000000..cfd54292
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/Application.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_APPLICATION_H__E2E51302_D643_458E_A7A5_5157233D1E5C__INCLUDED_)
+#define AFX_APPLICATION_H__E2E51302_D643_458E_A7A5_5157233D1E5C__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#ifndef __AFXWIN_H__
+	#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include	"Resource.h"
+
+//===========================================================================================================================
+//	Application
+//===========================================================================================================================
+
+class	Application : public CWinApp
+{
+	public:
+		
+		Application();
+
+		// ClassWizard generated virtual function overrides
+		//{{AFX_VIRTUAL(Application)
+		public:
+		virtual BOOL InitInstance();
+		//}}AFX_VIRTUAL
+
+		//{{AFX_MSG(Application)
+			// NOTE - the ClassWizard will add and remove member functions here.
+			//    DO NOT EDIT what you see in these blocks of generated code !
+		//}}AFX_MSG
+		DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_APPLICATION_H__E2E51302_D643_458E_A7A5_5157233D1E5C__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.cpp
new file mode 100644
index 00000000..92cdeb30
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.cpp
@@ -0,0 +1,394 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"stdafx.h"
+
+#include	"Application.h"
+
+#include	"DNSServices.h"
+
+#include	"BrowserDialog.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#define	WM_USER_SERVICE_ADD			( WM_USER + 0x100 )
+#define	WM_USER_SERVICE_REMOVE		( WM_USER + 0x101 )
+
+//===========================================================================================================================
+//	Message Map
+//===========================================================================================================================
+
+BEGIN_MESSAGE_MAP(BrowserDialog, CDialog)
+	//{{AFX_MSG_MAP(BrowserDialog)
+	ON_NOTIFY(NM_CLICK, IDC_BROWSE_LIST, OnBrowserListDoubleClick)
+	ON_MESSAGE( WM_USER_SERVICE_ADD, OnServiceAdd )
+	ON_MESSAGE( WM_USER_SERVICE_REMOVE, OnServiceRemove )
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+static DWORD	UTF8StringToStringObject( const char *inUTF8, CString &inObject );
+
+//===========================================================================================================================
+//	BrowserDialog
+//===========================================================================================================================
+
+BrowserDialog::BrowserDialog( CWnd *inParent )
+	: CDialog( BrowserDialog::IDD, inParent )
+{
+	//{{AFX_DATA_INIT(BrowserDialog)
+		// Note: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+	
+	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32.
+	
+	mIcon = AfxGetApp()->LoadIcon( IDR_MAINFRAME );
+	ASSERT( mIcon );
+}
+
+//===========================================================================================================================
+//	DoDataExchange
+//===========================================================================================================================
+
+void	BrowserDialog::DoDataExchange( CDataExchange *pDX )
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(BrowserDialog)
+	DDX_Control(pDX, IDC_BROWSE_LIST, mBrowserList);
+	//}}AFX_DATA_MAP
+}
+
+//===========================================================================================================================
+//	OnInitDialog
+//===========================================================================================================================
+
+BOOL	BrowserDialog::OnInitDialog()
+{
+	CString		s;
+	
+	CDialog::OnInitDialog();
+
+	// Set the icon for this dialog. The framework does this automatically when the application's main window is not a dialog.
+	
+	SetIcon( mIcon, TRUE );		// Set big icon
+	SetIcon( mIcon, FALSE );	// Set small icon
+	
+	CenterWindow( GetDesktopWindow() );
+
+	// Set up the list.
+	
+	CRect		rect;
+	
+	s.LoadString( IDS_BROWSER_LIST_COLUMN_NAME );
+	mBrowserList.GetWindowRect( rect );
+	mBrowserList.InsertColumn( 0, s, LVCFMT_LEFT, rect.Width() - 8 );
+	
+	// Start browsing for services.
+
+	DNSStatus		err;
+
+	err = DNSBrowserCreate( 0, OnBrowserCallBack, this, &mBrowser );
+	if( err )
+	{
+		AfxMessageBox( IDP_SOCKETS_INIT_FAILED );
+		goto exit;
+	}
+	
+	err = DNSBrowserStartServiceSearch( mBrowser, kDNSBrowserFlagAutoResolve, "_http._tcp", NULL );
+	if( err )
+	{
+		AfxMessageBox( IDP_SOCKETS_INIT_FAILED );
+		goto exit;
+	}
+	
+exit:
+	return( TRUE );
+}
+
+
+//===========================================================================================================================
+//	OnBrowserListDoubleClick
+//===========================================================================================================================
+
+void	BrowserDialog::OnBrowserListDoubleClick( NMHDR *pNMHDR, LRESULT *pResult ) 
+{
+	int		selectedItem;
+
+	(void) pNMHDR;	// Unused
+
+	selectedItem = mBrowserList.GetNextItem( -1, LVNI_SELECTED );
+	if( selectedItem >= 0 )
+	{
+		BrowserEntry *		entry;
+		CString				temp;
+		CString				url;
+		
+		// Build the URL from the IP and optional TXT record.
+
+		entry = &mBrowserEntries[ selectedItem ];
+		url += "http://" + entry->ip;
+		temp = entry->text;
+		if( temp.Find( TEXT( "path=" ) ) == 0 )
+		{
+			temp.Delete( 0, 5 );
+		}
+		if( temp.Find( '/' ) != 0 )
+		{
+			url += '/';
+		}
+		url += temp;
+
+		// Let the system open the URL in the correct app.
+		
+		SHELLEXECUTEINFO		info;
+
+		info.cbSize			= sizeof( info );
+		info.fMask 			= 0;
+		info.hwnd 			= NULL;
+		info.lpVerb 		= NULL;
+		info.lpFile 		= url;
+		info.lpParameters 	= NULL;
+		info.lpDirectory 	= NULL;
+		info.nShow 			= SW_SHOWNORMAL;
+		info.hInstApp 		= NULL;
+
+		ShellExecuteEx( &info );
+	}
+	*pResult = 0;
+}
+
+//===========================================================================================================================
+//	OnBrowserCallBack [static]
+//===========================================================================================================================
+
+void
+	BrowserDialog::OnBrowserCallBack( 
+		void *					inContext, 
+		DNSBrowserRef			inRef, 
+		DNSStatus				inStatusCode,
+		const DNSBrowserEvent *	inEvent )
+{
+	BrowserDialog *		dialog;
+	BrowserEntry *		entry;
+	BOOL				posted;
+	
+	DNS_UNUSED( inStatusCode );
+	dialog = reinterpret_cast < BrowserDialog * > ( inContext );
+	ASSERT( dialog );
+	
+	switch( inEvent->type )
+	{
+		case kDNSBrowserEventTypeResolved:
+			if( inEvent->data.resolved->address.addressType == kDNSNetworkAddressTypeIPv4  )
+			{
+				char		ip[ 64 ];
+
+				sprintf( ip, "%u.%u.%u.%u:%u", 
+					inEvent->data.resolved->address.u.ipv4.addr.v8[ 0 ], 
+					inEvent->data.resolved->address.u.ipv4.addr.v8[ 1 ], 
+					inEvent->data.resolved->address.u.ipv4.addr.v8[ 2 ], 
+					inEvent->data.resolved->address.u.ipv4.addr.v8[ 3 ], 
+					( inEvent->data.resolved->address.u.ipv4.port.v8[ 0 ] << 8 ) | 
+					  inEvent->data.resolved->address.u.ipv4.port.v8[ 1 ] );
+				
+				entry = new BrowserEntry;
+				ASSERT( entry );
+				if( entry )
+				{
+					UTF8StringToStringObject( inEvent->data.resolved->name, entry->name );
+					UTF8StringToStringObject( ip, entry->ip );
+					UTF8StringToStringObject( inEvent->data.resolved->textRecord, entry->text );
+					
+					posted = ::PostMessage( dialog->GetSafeHwnd(), WM_USER_SERVICE_ADD, 0, (LPARAM) entry );
+					ASSERT( posted );
+					if( !posted )
+					{
+						delete entry;
+					}
+				}
+			}
+			break;
+
+		case kDNSBrowserEventTypeRemoveService:
+			entry = new BrowserEntry;
+			ASSERT( entry );
+			if( entry )
+			{
+				UTF8StringToStringObject( inEvent->data.removeService.name, entry->name );
+				
+				posted = ::PostMessage( dialog->GetSafeHwnd(), WM_USER_SERVICE_REMOVE, 0, (LPARAM) entry );
+				ASSERT( posted );
+				if( !posted )
+				{
+					delete entry;
+				}
+			}
+			break;
+		
+		default:
+			break;
+	}
+}
+
+//===========================================================================================================================
+//	BrowserAddService
+//===========================================================================================================================
+
+LONG	BrowserDialog::OnServiceAdd( WPARAM inWParam, LPARAM inLParam )
+{
+	BrowserEntry *		entry;
+	INT_PTR				lo;
+	INT_PTR				hi;
+	INT_PTR				mid;
+	int					result;
+	
+	(void) inWParam;	// Unused
+	
+	entry = reinterpret_cast < BrowserEntry * > ( inLParam );
+	ASSERT( entry );
+	
+	result 	= -1;
+	mid		= 0;
+	lo 		= 0;
+	hi 		= mBrowserEntries.GetSize() - 1;
+	while( lo <= hi )
+	{
+		mid = ( lo + hi ) / 2;
+		result = entry->name.CompareNoCase( mBrowserEntries[ mid ].name );
+		if( result == 0 )
+		{
+			break;
+		}
+		else if( result < 0 )
+		{
+			hi = mid - 1;
+		}
+		else
+		{
+			lo = mid + 1;
+		}
+	}
+	if( result == 0 )
+	{
+		mBrowserEntries[ mid ].ip	= entry->ip;
+		mBrowserEntries[ mid ].text	= entry->text;
+	}
+	else
+	{
+		if( result > 0 )
+		{
+			mid += 1;
+		}
+		mBrowserEntries.InsertAt( mid, *entry );
+		mBrowserList.InsertItem( mid, entry->name );
+	}
+	delete entry;
+	return( 0 );
+}
+
+//===========================================================================================================================
+//	OnServiceRemove
+//===========================================================================================================================
+
+LONG	BrowserDialog::OnServiceRemove( WPARAM inWParam, LPARAM inLParam )
+{
+	BrowserEntry *		entry;
+	INT_PTR				hi;
+	INT_PTR				lo;
+	INT_PTR				mid;
+	int					result;
+
+	(void) inWParam;	// Unused
+	
+	entry = reinterpret_cast < BrowserEntry * > ( inLParam );
+	ASSERT( entry );
+	
+	result 	= -1;
+	mid		= 0;
+	lo 		= 0;
+	hi 		= mBrowserEntries.GetSize() - 1;
+	while( lo <= hi )
+	{
+		mid = ( lo + hi ) / 2;
+		result = entry->name.CompareNoCase( mBrowserEntries[ mid ].name );
+		if( result == 0 )
+		{
+			break;
+		}
+		else if( result < 0 )
+		{
+			hi = mid - 1;
+		}
+		else
+		{
+			lo = mid + 1;
+		}
+	}
+	if( result == 0 )
+	{
+		mBrowserList.DeleteItem( mid );
+		mBrowserEntries.RemoveAt( mid );
+	}
+	delete entry;
+	return( 0 );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	UTF8StringToStringObject
+//===========================================================================================================================
+
+static DWORD	UTF8StringToStringObject( const char *inUTF8, CString &inObject )
+{
+	DWORD			err;
+	int				n;
+	wchar_t *		unicode;
+	
+	unicode = NULL;
+	
+	n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, NULL, 0 );
+	if( n > 0 )
+	{
+		unicode = (wchar_t *) malloc( (size_t)( n * sizeof( wchar_t ) ) );
+		if( !unicode ) { err = ERROR_INSUFFICIENT_BUFFER; goto exit; };
+		
+		n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, unicode, n );
+		inObject = unicode;
+	}
+	else
+	{
+		inObject = "";
+	}
+	err = 0;
+	
+exit:
+	if( unicode )
+	{
+		free( unicode );
+	}
+	return( err );
+}
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.h
new file mode 100644
index 00000000..a27df91e
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/BrowserDialog.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_BROWSERDIALOG_H__DECC5C82_C1C6_4630_B8D5_E1DDE570A061__INCLUDED_)
+#define AFX_BROWSERDIALOG_H__DECC5C82_C1C6_4630_B8D5_E1DDE570A061__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include	"afxtempl.h"
+#include	"Resource.h"
+
+#include	"DNSServices.h"
+
+//===========================================================================================================================
+//	BrowserDialog
+//===========================================================================================================================
+
+class	BrowserDialog : public CDialog
+{
+	public:
+		
+		BrowserDialog( CWnd *inParent = NULL );
+		
+		//{{AFX_DATA(BrowserDialog)
+		enum { IDD = IDD_APPLICATION_DIALOG };
+		CListCtrl	mBrowserList;
+		//}}AFX_DATA
+
+		// ClassWizard generated virtual function overrides
+		//{{AFX_VIRTUAL(BrowserDialog)
+		protected:
+		virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support
+		//}}AFX_VIRTUAL
+		
+		static void
+			OnBrowserCallBack( 
+				void *					inContext, 
+				DNSBrowserRef			inRef, 
+				DNSStatus				inStatusCode,  
+				const DNSBrowserEvent *	inEvent );
+		
+	protected:
+		
+		struct	BrowserEntry
+		{
+			CString		name;
+			CString		ip;
+			CString		text;
+		};
+		
+		HICON										mIcon;
+		DNSBrowserRef								mBrowser;
+		CArray < BrowserEntry, BrowserEntry >		mBrowserEntries;
+		
+		// Generated message map functions
+		//{{AFX_MSG(BrowserDialog)
+		virtual BOOL OnInitDialog();
+		afx_msg void OnBrowserListDoubleClick(NMHDR* pNMHDR, LRESULT* pResult);
+		afx_msg LONG OnServiceAdd( WPARAM inWParam, LPARAM inLParam );
+		afx_msg LONG OnServiceRemove( WPARAM inWParam, LPARAM inLParam );
+		//}}AFX_MSG
+		DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_BROWSERDIALOG_H__DECC5C82_C1C6_4630_B8D5_E1DDE570A061__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.cpp b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.cpp
new file mode 100644
index 00000000..ae2ca2ec
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.cpp
@@ -0,0 +1,18 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	"stdafx.h"
diff --git a/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.h b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.h
new file mode 100644
index 00000000..4b14a0b7
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/DNSServiceBrowser/WindowsCE/Sources/StdAfx.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(AFX_STDAFX_H__7F91E52B_CF39_429D_837D_599CE0B2B3D6__INCLUDED_)
+#define AFX_STDAFX_H__7F91E52B_CF39_429D_837D_599CE0B2B3D6__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+
+
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+
+#if defined(_AFXDLL)
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+#endif
+
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include <winsock2.h>
+//#include <afxsock.h>		// MFC socket extensions
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__7F91E52B_CF39_429D_837D_599CE0B2B3D6__INCLUDED_)
diff --git a/mDNSResponder/mDNSWindows/Java/Java.vcproj b/mDNSResponder/mDNSWindows/Java/Java.vcproj
new file mode 100755
index 00000000..1707ac59
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Java/Java.vcproj
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="Java"

+	ProjectGUID="{9CE2568A-3170-41C6-9F20-A0188A9EC114}"

+	Keyword="MakeFileProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f makefile DEBUG=1"

+				ReBuildCommandLine="nmake /f makefile DEBUG=1"

+				CleanCommandLine="nmake /f makefile DEBUG=1 clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f makefile64 DEBUG=1"

+				ReBuildCommandLine="nmake /f makefile64 DEBUG=1"

+				CleanCommandLine="nmake /f makefile64 DEBUG=1 clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f makefile"

+				ReBuildCommandLine="nmake /f makefile"

+				CleanCommandLine="nmake /f makefile clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /f makefile64"

+				ReBuildCommandLine="nmake /f makefile64"

+				CleanCommandLine="nmake /f makefile64 clean"

+				Output=""

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/Java/Java.vcxproj b/mDNSResponder/mDNSWindows/Java/Java.vcxproj
new file mode 100755
index 00000000..9c63f876
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Java/Java.vcxproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{9CE2568A-3170-41C6-9F20-A0188A9EC114}</ProjectGuid>

+    <Keyword>MakeFileProj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Makefile</ConfigurationType>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f makefile DEBUG=1</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f makefile DEBUG=1</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake /f makefile DEBUG=1 clean</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f makefile64 DEBUG=1</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f makefile64 DEBUG=1</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nmake /f makefile64 DEBUG=1 clean</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f makefile</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f makefile</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nmake /f makefile clean</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f makefile64</NMakeBuildCommandLine>

+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f makefile64</NMakeReBuildCommandLine>

+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nmake /f makefile64 clean</NMakeCleanCommandLine>

+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>

+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>

+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedIncludes)</NMakeForcedIncludes>

+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>

+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>

+  </PropertyGroup>

+  <ItemDefinitionGroup>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/Java/jdns_sd.rc b/mDNSResponder/mDNSWindows/Java/jdns_sd.rc
new file mode 100644
index 00000000..79fdf140
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Java/jdns_sd.rc
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JDNS_SD_RC
+#define JDNS_SD_RC
+
+#include "afxres.h"
+#include "../WinVersRes.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", MASTER_PROD_NAME " support for Java"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "jdns_sd"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "jdns_sd.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif // JDNS_SD_RC
diff --git a/mDNSResponder/mDNSWindows/Java/makefile b/mDNSResponder/mDNSWindows/Java/makefile
new file mode 100644
index 00000000..2e4b6bd0
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Java/makefile
@@ -0,0 +1,143 @@
+# -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This Makefile builds a .jar file and accompanying JNI support library
+# containing the DNSSD implementation for Java and support classes.
+#
+# Prior to building Java support, you must build DNSSD.dll.
+#
+# nmake with no arguments builds all production targets.
+# 'nmake DEBUG=1' to build debugging targets.
+# 'nmake clean' or 'nmake clean DEBUG=1' to delete prod/debug objects & targets
+#
+# To run nmake, you may need to set up your PATH correctly, using a script 
+# such as: "\Program Files\Microsoft Visual Studio .NET\Vc7\bin\vcvars32.bat"
+# 
+# The default location of the JDK is \javasdk. You can override this on the
+# command line (e.g. 'nmake JDK=\j2dk1.4.2_03').
+
+############################################################################
+
+COREDIR = ..\..\mDNSCore
+SHAREDDIR = ..\..\mDNSShared
+
+JDK = $(JAVA_HOME)
+
+CC = cl
+RC = rc
+LD = ld
+CP = copy
+RM = del /Q
+RMDIR = rmdir /S /Q
+JAVAC = $(JDK)\bin\javac
+JAVAH = $(JDK)\bin\javah
+JAR = $(JDK)\bin\jar
+CFLAGS_COMMON = -LD -DAUTO_CALLBACKS=0 -I. -I..\.. \
+	-I$(COREDIR) -I$(SHAREDDIR) -I$(JDK)\include -I$(JDK)\include\win32
+
+# Set up diverging paths for debug vs. prod builds
+DEBUG=0
+!if $(DEBUG) == 1
+CFLAGS_DEBUG = -Zi -DMDNS_DEBUGMSGS=2 
+OBJDIR = objects\debug
+BUILDDIR = build\debug
+INSTALLDIR = root\"Program Files"\Bonjour
+LIBDIR = ..\DLL\Win32\Debug
+!else
+CFLAGS_DEBUG = -Os -DMDNS_DEBUGMSGS=0 
+OBJDIR = objects\prod
+BUILDDIR = build\prod
+INSTALLDIR = root\"Program Files"\Bonjour
+LIBDIR = ..\DLL\Win32\Release
+!endif
+
+CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_DEBUG)
+JAVACFLAGS = $(CFLAGS) $(JAVACFLAGS_OS)
+
+#############################################################################
+
+all: setup Java postbuild
+
+# 'setup' sets up the build directory structure the way we want
+setup:
+	@if not exist objects		mkdir objects
+	@if not exist build			mkdir build
+	@if not exist $(OBJDIR)		mkdir $(OBJDIR)
+	@if not exist $(BUILDDIR)	mkdir $(BUILDDIR)
+
+postbuild:
+	@if not "%RC_XBS%"=="YES" GOTO CONT
+	@if not exist "$(DSTROOT)\WINDOWS\system32\Win32"	mkdir "$(DSTROOT)\WINDOWS\system32\Win32"
+	@if not exist "$(DSTROOT)\Program Files\Bonjour\Win32"	mkdir "$(DSTROOT)\Program Files\Bonjour\Win32"
+	@copy $(BUILDDIR)\jdns_sd.dll "$(DSTROOT)\WINDOWS\system32\Win32"
+	@copy $(BUILDDIR)\dns_sd.jar  "$(DSTROOT)\Program Files\Bonjour\Win32"
+	@:CONT
+	@if not exist root					mkdir root
+	@if not exist root\"Program Files"	mkdir root\"Program Files"
+	@if not exist $(INSTALLDIR)			mkdir $(INSTALLDIR)
+	copy $(BUILDDIR)\dns_sd.jar $(INSTALLDIR)
+	copy $(BUILDDIR)\jdns_sd.dll $(INSTALLDIR)
+
+# clean removes targets and objects
+clean:
+	@if exist $(OBJDIR)		$(RMDIR) $(OBJDIR)
+	@if exist $(BUILDDIR)	$(RMDIR) $(BUILDDIR)
+
+#############################################################################
+
+# The following targets build Java wrappers for the dns-sd.h API.
+
+Java: setup $(BUILDDIR)\dns_sd.jar $(BUILDDIR)\jdns_sd.dll postbuild
+	@echo "Java wrappers done"
+
+JAVASRC	= $(SHAREDDIR)\Java
+JARCONTENTS =	$(OBJDIR)\com\apple\dnssd\DNSSDService.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDException.class \
+				$(OBJDIR)\com\apple\dnssd\DNSRecord.class \
+				$(OBJDIR)\com\apple\dnssd\TXTRecord.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDRegistration.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDRecordRegistrar.class \
+				$(OBJDIR)\com\apple\dnssd\BaseListener.class \
+				$(OBJDIR)\com\apple\dnssd\BrowseListener.class \
+				$(OBJDIR)\com\apple\dnssd\ResolveListener.class \
+				$(OBJDIR)\com\apple\dnssd\RegisterListener.class \
+				$(OBJDIR)\com\apple\dnssd\RegisterRecordListener.class \
+				$(OBJDIR)\com\apple\dnssd\QueryListener.class \
+				$(OBJDIR)\com\apple\dnssd\DomainListener.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSD.class
+
+$(BUILDDIR)\dns_sd.jar: $(JARCONTENTS)
+	$(JAR) -cf $@ -C $(OBJDIR) com
+
+$(BUILDDIR)\jdns_sd.dll: $(JAVASRC)\JNISupport.c $(OBJDIR)\DNSSD.java.h $(OBJDIR)\jdns_sd.RES
+	$(CC) -Fe$@ $(JAVASRC)\JNISupport.c $(CFLAGS) -I$(OBJDIR) \
+	$(LIBDIR)\DNSSD.lib $(JDK)\lib\jvm.lib ws2_32.lib iphlpapi.lib $(OBJDIR)\jdns_sd.RES /link /NXCOMPAT /DYNAMICBASE /SAFESEH
+
+.SUFFIXES : .java
+{$(JAVASRC)}.java{$(OBJDIR)\com\apple\dnssd}.class:	
+	$(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $<
+
+$(OBJDIR)\DNSSD.java.h: $(OBJDIR)\com\apple\dnssd\DNSSD.class
+	$(JAVAH) -classpath $(OBJDIR) -o $@ \
+		com.apple.dnssd.AppleBrowser \
+		com.apple.dnssd.AppleResolver \
+		com.apple.dnssd.AppleRegistration \
+		com.apple.dnssd.AppleQuery \
+		com.apple.dnssd.AppleService 
+
+$(OBJDIR)\jdns_sd.RES: jdns_sd.rc
+	$(RC) /fo $@ $?
+
diff --git a/mDNSResponder/mDNSWindows/Java/makefile64 b/mDNSResponder/mDNSWindows/Java/makefile64
new file mode 100644
index 00000000..fb0ff9ce
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Java/makefile64
@@ -0,0 +1,143 @@
+# -*- tab-width: 4 -*-
+#
+# Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This Makefile builds a .jar file and accompanying JNI support library
+# containing the DNSSD implementation for Java and support classes.
+#
+# Prior to building Java support, you must build DNSSD.dll.
+#
+# nmake with no arguments builds all production targets.
+# 'nmake DEBUG=1' to build debugging targets.
+# 'nmake clean' or 'nmake clean DEBUG=1' to delete prod/debug objects & targets
+#
+# To run nmake, you may need to set up your PATH correctly, using a script 
+# such as: "\Program Files\Microsoft Visual Studio .NET\Vc7\bin\vcvars32.bat"
+# 
+# The default location of the JDK is \javasdk. You can override this on the
+# command line (e.g. 'nmake JDK=\j2dk1.4.2_03').
+
+############################################################################
+
+COREDIR = ..\..\mDNSCore
+SHAREDDIR = ..\..\mDNSShared
+
+JDK = $(JAVA_HOME)
+
+CC = cl
+RC = rc
+LD = ld
+CP = copy
+RM = del /Q
+RMDIR = rmdir /S /Q
+JAVAC = $(JDK)\bin\javac
+JAVAH = $(JDK)\bin\javah
+JAR = $(JDK)\bin\jar
+CFLAGS_COMMON = -LD -DAUTO_CALLBACKS=0 -I. -I..\.. \
+	-I$(COREDIR) -I$(SHAREDDIR) -I$(JDK)\include -I$(JDK)\include\win32
+
+# Set up diverging paths for debug vs. prod builds
+DEBUG=0
+!if $(DEBUG) == 1
+CFLAGS_DEBUG = -Zi -DMDNS_DEBUGMSGS=2 
+OBJDIR = objects\debug\x64
+BUILDDIR = build\debug\x64
+INSTALLDIR = root\"Program Files"\Bonjour
+LIBDIR = ..\DLL\x64\Debug
+!else
+CFLAGS_DEBUG = -Os -DMDNS_DEBUGMSGS=0 
+OBJDIR = objects\prod\x64
+BUILDDIR = build\prod\x64
+INSTALLDIR = root\"Program Files"\Bonjour
+LIBDIR = ..\DLL\x64\Release
+!endif
+
+CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_DEBUG)
+JAVACFLAGS = $(CFLAGS) $(JAVACFLAGS_OS)
+
+#############################################################################
+
+all: setup Java postbuild
+
+# 'setup' sets up the build directory structure the way we want
+setup:
+	@if not exist objects		mkdir objects
+	@if not exist build			mkdir build
+	@if not exist $(OBJDIR)		mkdir $(OBJDIR)
+	@if not exist $(BUILDDIR)	mkdir $(BUILDDIR)
+
+postbuild:
+	@if not "%RC_XBS%"=="YES" GOTO CONT
+	@if not exist "$(DSTROOT)\WINDOWS\system32\x64"	mkdir "$(DSTROOT)\WINDOWS\system32\x64"
+	@if not exist "$(DSTROOT)\Program Files\Bonjour\x64"	mkdir "$(DSTROOT)\Program Files\Bonjour\x64"
+	@copy $(BUILDDIR)\jdns_sd.dll "$(DSTROOT)\WINDOWS\system32\x64"
+	@copy $(BUILDDIR)\dns_sd.jar  "$(DSTROOT)\Program Files\Bonjour\x64"
+	@:CONT
+	@if not exist root					mkdir root
+	@if not exist root\"Program Files"	mkdir root\"Program Files"
+	@if not exist $(INSTALLDIR)			mkdir $(INSTALLDIR)
+	copy $(BUILDDIR)\dns_sd.jar $(INSTALLDIR)
+	copy $(BUILDDIR)\jdns_sd.dll $(INSTALLDIR)
+
+# clean removes targets and objects
+clean:
+	@if exist $(OBJDIR)		$(RMDIR) $(OBJDIR)
+	@if exist $(BUILDDIR)	$(RMDIR) $(BUILDDIR)
+
+#############################################################################
+
+# The following targets build Java wrappers for the dns-sd.h API.
+
+Java: setup $(BUILDDIR)\dns_sd.jar $(BUILDDIR)\jdns_sd.dll postbuild
+	@echo "Java wrappers done"
+
+JAVASRC	= $(SHAREDDIR)\Java
+JARCONTENTS =	$(OBJDIR)\com\apple\dnssd\DNSSDService.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDException.class \
+				$(OBJDIR)\com\apple\dnssd\DNSRecord.class \
+				$(OBJDIR)\com\apple\dnssd\TXTRecord.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDRegistration.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSDRecordRegistrar.class \
+				$(OBJDIR)\com\apple\dnssd\BaseListener.class \
+				$(OBJDIR)\com\apple\dnssd\BrowseListener.class \
+				$(OBJDIR)\com\apple\dnssd\ResolveListener.class \
+				$(OBJDIR)\com\apple\dnssd\RegisterListener.class \
+				$(OBJDIR)\com\apple\dnssd\RegisterRecordListener.class \
+				$(OBJDIR)\com\apple\dnssd\QueryListener.class \
+				$(OBJDIR)\com\apple\dnssd\DomainListener.class \
+				$(OBJDIR)\com\apple\dnssd\DNSSD.class
+
+$(BUILDDIR)\dns_sd.jar: $(JARCONTENTS)
+	$(JAR) -cf $@ -C $(OBJDIR) com
+
+$(BUILDDIR)\jdns_sd.dll: $(JAVASRC)\JNISupport.c $(OBJDIR)\DNSSD.java.h $(OBJDIR)\jdns_sd.RES
+	$(CC) -Fe$@ $(JAVASRC)\JNISupport.c $(CFLAGS) -I$(OBJDIR) \
+	$(LIBDIR)\DNSSD.lib $(JDK)\lib\jvm.lib ws2_32.lib iphlpapi.lib $(OBJDIR)\jdns_sd.RES /link /NXCOMPAT /DYNAMICBASE
+
+.SUFFIXES : .java
+{$(JAVASRC)}.java{$(OBJDIR)\com\apple\dnssd}.class:	
+	$(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $<
+
+$(OBJDIR)\DNSSD.java.h: $(OBJDIR)\com\apple\dnssd\DNSSD.class
+	$(JAVAH) -classpath $(OBJDIR) -o $@ \
+		com.apple.dnssd.AppleBrowser \
+		com.apple.dnssd.AppleResolver \
+		com.apple.dnssd.AppleRegistration \
+		com.apple.dnssd.AppleQuery \
+		com.apple.dnssd.AppleService 
+
+$(OBJDIR)\jdns_sd.RES: jdns_sd.rc
+	$(RC) /fo $@ $?
+
diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.aps b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.aps
new file mode 100644
index 00000000..313f3068
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.aps
diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.c b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.c
new file mode 100644
index 00000000..f3052d16
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.c
@@ -0,0 +1,581 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<stdio.h>
+#include	<stdlib.h>
+
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+
+#include	<guiddef.h>
+#include	<ws2spi.h>
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+int  					main( int argc, char *argv[] );
+DEBUG_LOCAL void		Usage( void );
+DEBUG_LOCAL int			ProcessArgs( int argc, char *argv[] );
+DEBUG_LOCAL OSStatus	InstallNSP( const char *inName, const char *inGUID, const char *inPath );
+DEBUG_LOCAL OSStatus	RemoveNSP( const char *inGUID );
+DEBUG_LOCAL OSStatus	EnableNSP( const char *inGUID, BOOL inEnable );
+DEBUG_LOCAL OSStatus	ListNameSpaces( void );
+DEBUG_LOCAL OSStatus	ReorderNameSpaces( void );
+
+DEBUG_LOCAL WCHAR *		CharToWCharString( const char *inCharString, WCHAR *outWCharString );
+DEBUG_LOCAL char *		GUIDtoString( const GUID *inGUID, char *outString );
+DEBUG_LOCAL OSStatus	StringToGUID( const char *inCharString, GUID *outGUID );
+
+DEBUG_LOCAL BOOL gToolQuietMode = FALSE;
+
+//===========================================================================================================================
+//	main
+//===========================================================================================================================
+
+int main( int argc, char *argv[] )
+{
+	OSStatus		err;
+	
+	debug_initialize( kDebugOutputTypeMetaConsole );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelVerbose );
+	
+	err = ProcessArgs( argc, argv );
+	return( (int) err );
+}
+
+//===========================================================================================================================
+//	Usage
+//===========================================================================================================================
+
+DEBUG_LOCAL void	Usage( void )
+{
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "NSP Tool 1.0d1\n" );
+	fprintf( stderr, "  Name Space Provider Tool\n" );
+	fprintf( stderr, "\n" );
+	
+	fprintf( stderr, "  -install <name> <guid> <path>   - Installs a Name Space Provider\n" );
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "      <name> Name of the NSP\n" );
+	fprintf( stderr, "      <guid> GUID of the NSP\n" );
+	fprintf( stderr, "      <path> Path to the NSP file\n" );
+	fprintf( stderr, "\n" );
+	
+	fprintf( stderr, "  -remove <guid>                  - Removes a Name Space Provider\n" );
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "      <guid> GUID of the NSP\n" );
+	fprintf( stderr, "\n" );
+	
+	fprintf( stderr, "  -enable/-disable <guid>         - Enables or Disables a Name Space Provider\n" );
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "      <guid> GUID of the NSP\n" );
+	fprintf( stderr, "\n" );
+	
+	fprintf( stderr, "  -list                           - Lists Name Space Providers\n" );	
+	fprintf( stderr, "  -reorder                        - Reorders Name Space Providers\n" );
+	fprintf( stderr, "  -q                              - Enable quiet mode\n" );
+	fprintf( stderr, "  -h[elp]                         - Help\n" );
+	fprintf( stderr, "\n" );
+}
+
+//===========================================================================================================================
+//	ProcessArgs
+//===========================================================================================================================
+
+DEBUG_LOCAL int ProcessArgs( int argc, char* argv[] )
+{	
+	OSStatus			err;
+	int					i;
+	const char *		name;
+	const char *		guid;
+	const char *		path;
+			
+	if( argc <= 1 )
+	{
+		Usage();
+		err = 0;
+		goto exit;
+	}
+	for( i = 1; i < argc; ++i )
+	{
+		if( strcmp( argv[ i ], "-install" ) == 0 )
+		{
+			// Install
+			
+			if( argc <= ( i + 3 ) )
+			{
+				fprintf( stderr, "\n### ERROR: missing arguments for %s\n\n", argv[ i ] );
+				Usage();
+				err = kParamErr;
+				goto exit;
+			}
+			name = argv[ ++i ];
+			guid = argv[ ++i ];
+			path = argv[ ++i ];
+			
+			if( *name == '\0' )
+			{
+				name = "DotLocalNSP";
+			}
+			if( *guid == '\0' )
+			{
+				guid = "B600E6E9-553B-4a19-8696-335E5C896153";
+			}
+			
+			err = InstallNSP( name, guid, path );
+			require_noerr( err, exit );
+		}
+		else if( strcmp( argv[ i ], "-remove" ) == 0 )
+		{
+			// Remove
+			
+			if( argc <= ( i + 1 ) )
+			{
+				fprintf( stderr, "\n### ERROR: missing arguments for %s\n\n", argv[ i ] );
+				Usage();
+				err = kParamErr;
+				goto exit;
+			}
+			guid = argv[ ++i ];
+			if( *guid == '\0' )
+			{
+				guid = "B600E6E9-553B-4a19-8696-335E5C896153";
+			}
+			
+			err = RemoveNSP( guid );
+			require_noerr( err, exit );
+		}
+		else if( ( strcmp( argv[ i ], "-enable" )  == 0 ) || 
+				 ( strcmp( argv[ i ], "-disable" ) == 0 ) )
+		{
+			BOOL		enable;
+			
+			// Enable/Disable
+			
+			enable = ( strcmp( argv[ i ], "-enable" ) == 0 );
+			if( argc <= ( i + 1 ) )
+			{
+				fprintf( stderr, "\n### ERROR: missing arguments for %s\n\n", argv[ i ] );
+				Usage();
+				err = kParamErr;
+				goto exit;
+			}
+			guid = argv[ ++i ];
+			
+			err = EnableNSP( guid, enable );
+			require_noerr( err, exit );
+		}
+		else if( strcmp( argv[ i ], "-list" ) == 0 )
+		{
+			// List
+						
+			err = ListNameSpaces();
+			require_noerr( err, exit );
+		}
+		else if( strcmp( argv[ i ], "-reorder" ) == 0 )
+		{
+			// Reorder
+			
+			err = ReorderNameSpaces();
+			require_noerr( err, exit );
+		}
+		else if( strcmp( argv[ i ], "-q" ) == 0 )
+		{
+			gToolQuietMode = TRUE;
+		}
+		else if( ( strcmp( argv[ i ], "-help" ) == 0 ) || 
+				 ( strcmp( argv[ i ], "-h" ) == 0 ) )
+		{
+			// Help
+			
+			Usage();
+			err = 0;
+			goto exit;
+		}
+		else
+		{
+			fprintf( stderr, "\n### ERROR: unknown argment: \"%s\"\n\n", argv[ i ] );
+			Usage();
+			err = kParamErr;
+			goto exit;
+		}
+	}
+	err = kNoErr;
+	
+exit:
+	return( err );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	InstallNSP
+//===========================================================================================================================
+
+OSStatus	InstallNSP( const char *inName, const char *inGUID, const char *inPath )
+{
+	OSStatus		err;
+	size_t			size;
+	WSADATA			wsd;
+	WCHAR			name[ 256 ];
+	GUID			guid;
+	WCHAR			path[ MAX_PATH ];
+	
+	require_action( inName && ( *inName != '\0' ), exit, err = kParamErr );
+	require_action( inGUID && ( *inGUID != '\0' ), exit, err = kParamErr );
+	require_action( inPath && ( *inPath != '\0' ), exit, err = kParamErr );
+	
+	size = strlen( inName );
+	require_action( size < sizeof_array( name ), exit, err = kSizeErr );
+	CharToWCharString( inName, name );
+	
+	err = StringToGUID( inGUID, &guid );
+	require_noerr( err, exit );
+	
+	size = strlen( inPath );
+	require_action( size < sizeof_array( path ), exit, err = kSizeErr );
+	CharToWCharString( inPath, path );
+	
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	err = WSCInstallNameSpace( name, path, NS_DNS, 1, &guid );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	WSACleanup();
+	require_noerr( err, exit );
+	
+	if (!gToolQuietMode)
+	{
+		fprintf( stderr, "Installed NSP \"%s\" (%s) at %s\n", inName, inGUID, inPath );
+	}
+	
+exit:
+	if( err != kNoErr )
+	{
+		fprintf( stderr, "### FAILED (%d) to install \"%s\" (%s) Name Space Provider at %s\n", err, inName, inGUID, inPath );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	RemoveNSP
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	RemoveNSP( const char *inGUID )
+{
+	OSStatus		err;
+	WSADATA			wsd;
+	GUID			guid;
+	
+	require_action( inGUID && ( *inGUID != '\0' ), exit, err = kParamErr );
+	
+	err = StringToGUID( inGUID, &guid );
+	require_noerr( err, exit );
+	
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	err = WSCUnInstallNameSpace( &guid );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	WSACleanup();
+	require_noerr( err, exit );
+	
+	if (!gToolQuietMode)
+	{
+		fprintf( stderr, "Removed NSP %s\n", inGUID );
+	}
+		
+exit:
+	if( err != kNoErr )
+	{
+		fprintf( stderr, "### FAILED (%d) to remove %s Name Space Provider\n", err, inGUID );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	EnableNSP
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	EnableNSP( const char *inGUID, BOOL inEnable )
+{
+	OSStatus		err;
+	WSADATA			wsd;
+	GUID			guid;
+	
+	require_action( inGUID && ( *inGUID != '\0' ), exit, err = kParamErr );
+	
+	err = StringToGUID( inGUID, &guid );
+	require_noerr( err, exit );
+	
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	err = WSCEnableNSProvider( &guid, inEnable );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	WSACleanup();
+	require_noerr( err, exit );
+	
+	if (!gToolQuietMode)
+	{
+		fprintf( stderr, "Removed NSP %s\n", inGUID );
+	}
+		
+exit:
+	if( err != kNoErr )
+	{
+		fprintf( stderr, "### FAILED (%d) to remove %s Name Space Provider\n", err, inGUID );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	ListNameSpaces
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	ListNameSpaces( void )
+{
+	OSStatus				err;
+	WSADATA					wsd;
+	bool					started;
+	int						n;
+	int						i;
+	DWORD					size;
+	WSANAMESPACE_INFO *		array;
+	char					s[ 256 ];
+	
+	array 	= NULL;
+	started	= false;
+	
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	started = true;
+	
+	// Build an array of all the NSPs. Call it first with NULL to get the size, allocate a buffer, then get them into it.
+	
+	size = 0;
+	n = WSAEnumNameSpaceProviders( &size, NULL );
+	err = translate_errno( n != SOCKET_ERROR, (OSStatus) GetLastError(), kUnknownErr );
+	require_action( err == WSAEFAULT, exit, err = kUnknownErr );
+	
+	array = (WSANAMESPACE_INFO *) malloc( size );
+	require_action( array, exit, err = kNoMemoryErr );
+	
+	n = WSAEnumNameSpaceProviders( &size, array );
+	err = translate_errno( n != SOCKET_ERROR, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	fprintf( stdout, "\n" );
+	for( i = 0; i < n; ++i )
+	{
+		fprintf( stdout, "Name Space %d\n", i + 1 );
+		fprintf( stdout, "    NSProviderId:   %s\n", GUIDtoString( &array[ i ].NSProviderId, s ) );
+		fprintf( stdout, "    dwNameSpace:    %d\n", array[ i ].dwNameSpace );
+		fprintf( stdout, "    fActive:        %s\n", array[ i ].fActive ? "YES" : "NO" );
+		fprintf( stdout, "    dwVersion:      %d\n", array[ i ].dwVersion );
+		fprintf( stdout, "    lpszIdentifier: \"%s\"\n", array[ i ].lpszIdentifier );
+		fprintf( stdout, "\n" );
+	}
+	err = kNoErr;
+	
+exit:
+	if( array )
+	{
+		free( array );
+	}
+	if( started )
+	{
+		WSACleanup();
+	}
+	if( err != kNoErr )
+	{
+		fprintf( stderr, "### FAILED (%d) to list Name Space Providers\n", err );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	ReorderNameSpaces
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	ReorderNameSpaces( void )
+{
+	OSStatus				err;
+	WSADATA					wsd;
+	bool					started;
+	int						n;
+	int						i;
+	DWORD					size;
+	WSANAMESPACE_INFO *		array;
+	WCHAR					name[ 256 ];
+	WCHAR					path[ MAX_PATH ];
+	
+	array 	= NULL;
+	started	= false;
+		
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	started = true;
+	
+	// Build an array of all the NSPs. Call it first with NULL to get the size, allocate a buffer, then get them into it.
+	
+	size = 0;
+	n = WSAEnumNameSpaceProviders( &size, NULL );
+	err = translate_errno( n != SOCKET_ERROR, (OSStatus) GetLastError(), kUnknownErr );
+	require_action( err == WSAEFAULT, exit, err = kUnknownErr );
+	
+	array = (WSANAMESPACE_INFO *) malloc( size );
+	require_action( array, exit, err = kNoMemoryErr );
+	
+	n = WSAEnumNameSpaceProviders( &size, array );
+	err = translate_errno( n != SOCKET_ERROR, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	// Find the "Tcpip" NSP.
+	
+	for( i = 0; i < n; ++i )
+	{
+		if( strcmp( array[ i ].lpszIdentifier, "Tcpip" ) == 0 )
+		{
+			break;
+		}
+	}
+	require_action( i < n, exit, err = kNotFoundErr );
+	
+	// Uninstall it then re-install it to move it to the end.
+	
+	size = (DWORD) strlen( array[ i ].lpszIdentifier );
+	require_action( size < sizeof_array( name ), exit, err = kSizeErr );
+	CharToWCharString( array[ i ].lpszIdentifier, name );
+	
+	size = (DWORD) strlen( "%SystemRoot%\\System32\\mswsock.dll" );
+	require_action( size < sizeof_array( path ), exit, err = kSizeErr );
+	CharToWCharString( "%SystemRoot%\\System32\\mswsock.dll", path );
+	
+	err = WSCUnInstallNameSpace( &array[ i ].NSProviderId );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	err = WSCInstallNameSpace( name, path, NS_DNS, array[ i ].dwVersion, &array[ i ].NSProviderId );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+		
+	// Success!
+	
+	fprintf( stderr, "Reordered \"Tcpip\" NSP to to the bottom of the NSP chain\n" );	
+	err = kNoErr;
+	
+exit:
+	if( array )
+	{
+		free( array );
+	}
+	if( started )
+	{
+		WSACleanup();
+	}
+	if( err != kNoErr )
+	{
+		fprintf( stderr, "### FAILED (%d) to reorder Name Space Providers\n", err );
+	}
+	return( err );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	CharToWCharString
+//===========================================================================================================================
+
+DEBUG_LOCAL WCHAR *	CharToWCharString( const char *inCharString, WCHAR *outWCharString )
+{
+	const char *		src;
+	WCHAR *				dst;
+	char				c;
+	
+	check( inCharString );
+	check( outWCharString );
+	
+	src = inCharString;
+	dst = outWCharString;
+	do
+	{
+		c = *src++;
+		*dst++ = (WCHAR) c;
+	
+	}	while( c != '\0' );
+	
+	return( outWCharString );
+}
+
+//===========================================================================================================================
+//	GUIDtoString
+//===========================================================================================================================
+
+DEBUG_LOCAL char *	GUIDtoString( const GUID *inGUID, char *outString )
+{
+	check( inGUID );
+	check( outString );
+	
+	sprintf( outString, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", 
+		inGUID->Data1, inGUID->Data2, inGUID->Data3, 
+		inGUID->Data4[ 0 ], inGUID->Data4[ 1 ], inGUID->Data4[ 2 ], inGUID->Data4[ 3 ], 
+		inGUID->Data4[ 4 ], inGUID->Data4[ 5 ], inGUID->Data4[ 6 ], inGUID->Data4[ 7 ] );
+	return( outString );
+}
+
+//===========================================================================================================================
+//	StringToGUID
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	StringToGUID( const char *inCharString, GUID *outGUID )
+{
+	OSStatus			err;
+	int					n;
+	unsigned int		v[ 8 ];
+	
+	check( inCharString );
+	check( outGUID );
+	
+	n = sscanf( inCharString, "%lX-%hX-%hX-%02X%02X-%02X%02X%02X%02X%02X%02X", 
+		&outGUID->Data1, &outGUID->Data2, &outGUID->Data3, 
+		&v[ 0 ], &v[ 1 ], &v[ 2 ], &v[ 3 ], &v[ 4 ], &v[ 5 ], &v[ 6 ], &v[ 7 ] );
+	require_action( n == 11, exit, err = kFormatErr );
+	
+	outGUID->Data4[ 0 ] = (unsigned char) v[ 0 ];
+	outGUID->Data4[ 1 ] = (unsigned char) v[ 1 ];
+	outGUID->Data4[ 2 ] = (unsigned char) v[ 2 ];
+	outGUID->Data4[ 3 ] = (unsigned char) v[ 3 ];
+	outGUID->Data4[ 4 ] = (unsigned char) v[ 4 ];
+	outGUID->Data4[ 5 ] = (unsigned char) v[ 5 ];
+	outGUID->Data4[ 6 ] = (unsigned char) v[ 6 ];
+	outGUID->Data4[ 7 ] = (unsigned char) v[ 7 ];
+	err = kNoErr;
+
+exit:
+	return( err );
+}
diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.rc b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.rc
new file mode 100644
index 00000000..72a6b36a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.rc
@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+#include "WinVersRes.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MASTER_PROD_VERS

+ PRODUCTVERSION MASTER_PROD_VERS

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", MASTER_COMPANY_NAME

+            VALUE "FileDescription", "NSPTool Application"

+            VALUE "FileVersion", MASTER_PROD_VERS_STR

+            VALUE "InternalName", "NSPTool"

+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT

+            VALUE "OriginalFilename", "NSPTool.exe"

+            VALUE "ProductName", MASTER_PROD_NAME

+            VALUE "ProductVersion", MASTER_PROD_VERS_STR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcproj b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcproj
new file mode 100644
index 00000000..bed32037
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcproj
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="NSPTool"

+	ProjectGUID="{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;..;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				EnableFunctionLevelLinking="false"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+				CallingConvention="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="..\"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/NSPTool.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/NSPTool.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;..;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				EnableFunctionLevelLinking="false"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="..\"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/NSPTool.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/NSPTool.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;..;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="..\"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/NSPTool.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;..;../../mDNSShared"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="..\"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"

+				OutputFile="$(OutDir)/NSPTool.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath=".\NSPTool.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\NSPTool.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj
new file mode 100755
index 00000000..7c86852b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{208B3A9F-1CA0-4D1D-9D6C-C61616F94705}</ProjectGuid>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;..;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)NSPTool.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)NSPTool.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;..;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>Cdecl</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)NSPTool.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)NSPTool.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;..;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)NSPTool.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;..;../../mDNSShared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)NSPTool.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="NSPTool.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="resource.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="NSPTool.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj.filters b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj.filters
new file mode 100755
index 00000000..e52b917c
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/NSPTool.vcxproj.filters
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="NSPTool.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="NSPTool.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/NSPTool/Prefix.h b/mDNSResponder/mDNSWindows/NSPTool/Prefix.h
new file mode 100644
index 00000000..3aa1cee7
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/Prefix.h
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __PREFIX__
+#define __PREFIX__
+
+#if( defined( _DEBUG ) )
+	#define	DEBUG				1
+	#define	MDNS_DEBUGMSGS		1
+#else
+	#define	DEBUG				0
+#endif
+
+#endif	// __PREFIX__
diff --git a/mDNSResponder/mDNSWindows/NSPTool/resource.h b/mDNSResponder/mDNSWindows/NSPTool/resource.h
new file mode 100644
index 00000000..78c1d91a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/NSPTool/resource.h
@@ -0,0 +1,27 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by NSPTool.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_WMDMLOGGER                  101
+#define IDS_LOG_SEV_INFO                201
+#define IDS_LOG_SEV_WARN                202
+#define IDS_LOG_SEV_ERROR               203
+#define IDS_LOG_DATETIME                204
+#define IDS_LOG_SRCNAME                 205
+#define IDS_DEF_LOGFILE                 301
+#define IDS_DEF_MAXSIZE                 302
+#define IDS_DEF_SHRINKTOSIZE            303
+#define IDS_DEF_LOGENABLED              304
+#define IDS_MUTEX_TIMEOUT               401
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/Poll.c b/mDNSResponder/mDNSWindows/Poll.c
new file mode 100755
index 00000000..9adc632b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Poll.c
@@ -0,0 +1,728 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Poll.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#include <process.h>
+#include "GenLinkedList.h"
+#include "DebugServices.h"
+
+
+typedef struct PollSource_struct
+{
+	SOCKET socket;
+	HANDLE handle;
+	void   *context;
+
+	union
+	{
+		mDNSPollSocketCallback socket;
+		mDNSPollEventCallback event;
+	} callback;
+
+	struct Worker_struct		*worker;
+	struct PollSource_struct	*next;
+
+} PollSource;
+
+
+typedef struct Worker_struct
+{
+	HANDLE					thread;		// NULL for main worker
+	unsigned				id;			// 0 for main worker
+
+	HANDLE					start;		// NULL for main worker
+	HANDLE					stop;		// NULL for main worker
+	BOOL					done;		// Not used for main worker
+
+	DWORD					numSources;
+	PollSource				*sources[ MAXIMUM_WAIT_OBJECTS ];
+	HANDLE					handles[ MAXIMUM_WAIT_OBJECTS ];
+	DWORD					result;
+	struct Worker_struct	*next;
+} Worker;
+
+
+typedef struct Poll_struct
+{
+	mDNSBool		setup;
+	HANDLE			wakeup;
+	GenLinkedList	sources;
+	DWORD			numSources;
+	Worker			main;
+	GenLinkedList	workers;
+	HANDLE			workerHandles[ MAXIMUM_WAIT_OBJECTS ];
+	DWORD			numWorkers;
+
+} Poll;
+
+
+/*
+ * Poll Methods
+ */
+
+mDNSlocal mStatus			PollSetup();
+mDNSlocal mStatus			PollRegisterSource( PollSource *source ); 
+mDNSlocal void				PollUnregisterSource( PollSource *source );
+mDNSlocal mStatus			PollStartWorkers();
+mDNSlocal mStatus			PollStopWorkers();
+mDNSlocal void				PollRemoveWorker( Worker *worker );
+
+
+/*
+ * Worker Methods
+ */
+
+mDNSlocal mStatus			WorkerInit( Worker *worker );
+mDNSlocal void				WorkerFree( Worker *worker );
+mDNSlocal void				WorkerRegisterSource( Worker *worker, PollSource *source );
+mDNSlocal int				WorkerSourceToIndex( Worker *worker, PollSource *source );
+mDNSlocal void				WorkerUnregisterSource( Worker *worker, PollSource *source );
+mDNSlocal void				WorkerDispatch( Worker *worker);
+mDNSlocal void CALLBACK		WorkerWakeupNotification( HANDLE event, void *context );
+mDNSlocal unsigned WINAPI	WorkerMain( LPVOID inParam );
+
+
+static void
+ShiftDown( void * arr, size_t arraySize, size_t itemSize, int index )
+{
+    memmove( ( ( unsigned char* ) arr ) + ( ( index - 1 ) * itemSize ), ( ( unsigned char* ) arr ) + ( index * itemSize ), ( arraySize - index ) * itemSize );
+}
+
+
+#define	DEBUG_NAME	"[mDNSWin32] "
+#define gMDNSRecord mDNSStorage
+mDNSlocal Poll gPoll = { mDNSfalse, NULL };
+
+#define LogErr( err, FUNC ) LogMsg( "%s:%d - %s failed: %d\n", __FUNCTION__, __LINE__, FUNC, err );
+
+
+mStatus
+mDNSPollRegisterSocket( SOCKET socket, int networkEvents, mDNSPollSocketCallback callback, void *context )
+{
+	PollSource	*source = NULL;
+	HANDLE		event = INVALID_HANDLE_VALUE;
+	mStatus		err = mStatus_NoError;
+
+	if ( !gPoll.setup )
+	{
+		err = PollSetup();
+		require_noerr( err, exit );
+	}
+
+	source = malloc( sizeof( PollSource ) );
+	require_action( source, exit, err = mStatus_NoMemoryErr );
+
+	event = WSACreateEvent();
+	require_action( event, exit, err = mStatus_NoMemoryErr );
+
+	err = WSAEventSelect( socket, event, networkEvents );
+	require_noerr( err, exit );
+
+	source->socket = socket;
+	source->handle = event;
+	source->callback.socket = callback;
+	source->context = context;
+
+	err = PollRegisterSource( source );
+	require_noerr( err, exit );
+	
+exit:
+
+	if ( err != mStatus_NoError )
+	{
+		if ( event != INVALID_HANDLE_VALUE )
+		{
+			WSACloseEvent( event );
+		}
+
+		if ( source != NULL )
+		{
+			free( source );
+		}
+	}
+
+	return err;
+}
+
+
+void
+mDNSPollUnregisterSocket( SOCKET socket )
+{
+	PollSource	*source;
+
+	for ( source = gPoll.sources.Head; source; source = source->next )
+	{
+		if ( source->socket == socket )
+		{
+			break;
+		}
+	}
+
+	if ( source )
+	{
+		WSACloseEvent( source->handle );
+		PollUnregisterSource( source );
+		free( source );
+	}
+}
+
+
+mStatus
+mDNSPollRegisterEvent( HANDLE event, mDNSPollEventCallback callback, void *context )
+{
+	PollSource	*source = NULL;
+	mStatus		err = mStatus_NoError;
+
+	if ( !gPoll.setup )
+	{
+		err = PollSetup();
+		require_noerr( err, exit );
+	}
+
+	source = malloc( sizeof( PollSource ) );
+	require_action( source, exit, err = mStatus_NoMemoryErr );
+
+	source->socket = INVALID_SOCKET;
+	source->handle = event;
+	source->callback.event = callback;
+	source->context = context;
+
+	err = PollRegisterSource( source ); 
+	require_noerr( err, exit );
+	
+exit:
+
+	if ( err != mStatus_NoError )
+	{
+		if ( source != NULL )
+		{
+			free( source );
+		}
+	}
+
+	return err;
+}
+
+
+void
+mDNSPollUnregisterEvent( HANDLE event )
+{
+	PollSource	*source;
+
+	for ( source = gPoll.sources.Head; source; source = source->next )
+	{
+		if ( source->handle == event )
+		{
+			break;
+		}
+	}
+
+	if ( source )
+	{
+		PollUnregisterSource( source );
+		free( source );
+	}
+}
+
+
+mStatus
+mDNSPoll( DWORD msec )
+{
+	mStatus err = mStatus_NoError;
+
+	if ( gPoll.numWorkers > 0 )
+	{	
+		err = PollStartWorkers();
+		require_noerr( err, exit );
+	}
+
+	gPoll.main.result = WaitForMultipleObjects( gPoll.main.numSources, gPoll.main.handles, FALSE, msec );
+	err = translate_errno( ( gPoll.main.result != WAIT_FAILED ), ( mStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "WaitForMultipleObjects()" );
+	require_action( gPoll.main.result != WAIT_FAILED, exit, err = ( mStatus ) GetLastError() );
+
+	if ( gPoll.numWorkers > 0 )
+	{
+		err = PollStopWorkers();
+		require_noerr( err, exit );
+	}
+
+	WorkerDispatch( &gPoll.main );
+
+exit:
+
+	return ( err );
+}
+
+
+mDNSlocal mStatus
+PollSetup()
+{
+	mStatus err = mStatus_NoError;
+
+	if ( !gPoll.setup )
+	{
+		memset( &gPoll, 0, sizeof( gPoll ) );
+
+		InitLinkedList( &gPoll.sources, offsetof( PollSource, next ) );
+		InitLinkedList( &gPoll.workers, offsetof( Worker, next ) );
+
+		gPoll.wakeup = CreateEvent( NULL, TRUE, FALSE, NULL );
+		require_action( gPoll.wakeup, exit, err = mStatus_NoMemoryErr );
+
+		err = WorkerInit( &gPoll.main );
+		require_noerr( err, exit );
+		
+		gPoll.setup = mDNStrue;
+	}
+
+exit:
+
+	return err;
+}
+
+
+mDNSlocal mStatus
+PollRegisterSource( PollSource *source )
+{
+	Worker	*worker = NULL;
+	mStatus err = mStatus_NoError;
+
+	AddToTail( &gPoll.sources, source );
+	gPoll.numSources++;
+
+	// First check our main worker. In most cases, we won't have to worry about threads
+
+	if ( gPoll.main.numSources < MAXIMUM_WAIT_OBJECTS )
+	{
+		WorkerRegisterSource( &gPoll.main, source );
+	}
+	else
+	{
+		// Try to find a thread to use that we've already created
+
+		for ( worker = gPoll.workers.Head; worker; worker = worker->next )
+		{
+			if ( worker->numSources < MAXIMUM_WAIT_OBJECTS )
+			{
+				WorkerRegisterSource( worker, source );
+				break;
+			}
+		}
+
+		// If not, then create a worker and make a thread to run it in
+		
+		if ( !worker )
+		{
+			worker = ( Worker* ) malloc( sizeof( Worker ) );			
+			require_action( worker, exit, err = mStatus_NoMemoryErr );
+
+			memset( worker, 0, sizeof( Worker ) );
+
+			worker->start = CreateEvent( NULL, FALSE, FALSE, NULL );
+			require_action( worker->start, exit, err = mStatus_NoMemoryErr );
+
+			worker->stop = CreateEvent( NULL, FALSE, FALSE, NULL );
+			require_action( worker->stop, exit, err = mStatus_NoMemoryErr );
+
+			err = WorkerInit( worker );
+			require_noerr( err, exit );
+
+			// Create thread with _beginthreadex() instead of CreateThread() to avoid
+			// memory leaks when using static run-time libraries.
+			// See <http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dllproc/base/createthread.asp>.
+
+			worker->thread = ( HANDLE ) _beginthreadex_compat( NULL, 0, WorkerMain, worker, 0, &worker->id );
+			err = translate_errno( worker->thread, ( mStatus ) GetLastError(), kUnknownErr );
+			require_noerr( err, exit );
+
+			AddToTail( &gPoll.workers, worker );
+			gPoll.workerHandles[ gPoll.numWorkers++ ] = worker->stop;
+			
+			WorkerRegisterSource( worker, source );
+		}
+	}
+
+exit:
+
+	if ( err && worker )
+	{
+		WorkerFree( worker );
+	}
+
+	return err;
+}
+
+
+mDNSlocal void
+PollUnregisterSource( PollSource *source )
+{
+	RemoveFromList( &gPoll.sources, source );
+	gPoll.numSources--;
+
+	WorkerUnregisterSource( source->worker, source );
+}
+
+
+mDNSlocal mStatus
+PollStartWorkers()
+{
+	Worker	*worker;
+	mStatus	err = mStatus_NoError;
+	BOOL	ok;
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "starting workers\n" );
+	
+	worker = gPoll.workers.Head;
+
+	while ( worker )
+	{
+		Worker *next = worker->next;
+
+		if ( worker->numSources == 1 )
+		{
+			PollRemoveWorker( worker );
+		}
+		else
+		{
+			dlog( kDebugLevelChatty, DEBUG_NAME "waking up worker\n" );
+
+			ok = SetEvent( worker->start );
+			err = translate_errno( ok, ( mStatus ) GetLastError(), kUnknownErr );
+			if ( err ) LogErr( err, "SetEvent()" );
+
+			if ( err )
+			{
+				PollRemoveWorker( worker );
+			}
+		}
+
+		worker = next;
+	}
+
+	err = mStatus_NoError;
+
+	return err;
+}
+
+
+mDNSlocal mStatus
+PollStopWorkers()
+{
+	DWORD	result;
+	Worker	*worker;
+	BOOL	ok;
+	mStatus	err = mStatus_NoError;
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "stopping workers\n" );
+	
+	ok = SetEvent( gPoll.wakeup );
+	err = translate_errno( ok, ( mStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "SetEvent()" );
+
+	// Wait For 5 seconds for all the workers to wake up
+
+	result = WaitForMultipleObjects( gPoll.numWorkers, gPoll.workerHandles, TRUE, 5000 );
+	err = translate_errno( ( result != WAIT_FAILED ), ( mStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "WaitForMultipleObjects()" );
+
+	ok = ResetEvent( gPoll.wakeup );
+	err = translate_errno( ok, ( mStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "ResetEvent()" );
+
+	for ( worker = gPoll.workers.Head; worker; worker = worker->next )
+	{
+		WorkerDispatch( worker );
+	}
+
+	err = mStatus_NoError;
+
+	return err;
+}
+
+
+mDNSlocal void
+PollRemoveWorker( Worker *worker )
+{
+	DWORD	result;
+	mStatus	err;
+	BOOL	ok;
+	DWORD	i;
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "removing worker %d\n", worker->id );
+	
+	RemoveFromList( &gPoll.workers, worker );
+
+	// Remove handle from gPoll.workerHandles
+
+	for ( i = 0; i < gPoll.numWorkers; i++ )
+	{
+		if ( gPoll.workerHandles[ i ] == worker->stop )
+		{
+			ShiftDown( gPoll.workerHandles, gPoll.numWorkers, sizeof( gPoll.workerHandles[ 0 ] ), i + 1 );
+			break;
+		}
+	}
+
+	worker->done = TRUE;
+	gPoll.numWorkers--;
+
+	// Cause the thread to exit.
+
+	ok = SetEvent( worker->start );
+	err = translate_errno( ok, ( OSStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "SetEvent()" );
+			
+	result = WaitForSingleObject( worker->thread, 5000 );
+	err = translate_errno( result != WAIT_FAILED, ( OSStatus ) GetLastError(), kUnknownErr );
+	if ( err ) LogErr( err, "WaitForSingleObject()" );
+			
+	if ( ( result == WAIT_FAILED ) || ( result == WAIT_TIMEOUT ) )
+	{
+		ok = TerminateThread( worker->thread, 0 );
+		err = translate_errno( ok, ( OSStatus ) GetLastError(), kUnknownErr );
+		if ( err ) LogErr( err, "TerminateThread()" );
+	}
+	
+	CloseHandle( worker->thread );
+	worker->thread = NULL;
+
+	WorkerFree( worker );
+}
+
+
+mDNSlocal void
+WorkerRegisterSource( Worker *worker, PollSource *source )
+{
+	source->worker = worker;
+	worker->sources[ worker->numSources ] = source;
+	worker->handles[ worker->numSources ] = source->handle;
+	worker->numSources++;
+}
+
+
+mDNSlocal int
+WorkerSourceToIndex( Worker *worker, PollSource *source )
+{
+	int index;
+
+	for ( index = 0; index < ( int ) worker->numSources; index++ )
+	{
+		if ( worker->sources[ index ] == source )
+		{
+			break;
+		}
+	}
+
+	if ( index == ( int ) worker->numSources )
+	{
+		index = -1;
+	}
+
+	return index;
+}
+
+
+mDNSlocal void
+WorkerUnregisterSource( Worker *worker, PollSource *source )
+{
+	int sourceIndex = WorkerSourceToIndex( worker, source );
+	DWORD delta;
+
+	if ( sourceIndex == -1 )
+	{
+		LogMsg( "WorkerUnregisterSource: source not found in list" );
+		goto exit;
+	}
+
+	delta = ( worker->numSources - sourceIndex - 1 );
+
+	// If this source is not at the end of the list, then move memory
+
+	if ( delta > 0 )
+	{
+		ShiftDown( worker->sources, worker->numSources, sizeof( worker->sources[ 0 ] ), sourceIndex + 1 );
+		ShiftDown( worker->handles, worker->numSources, sizeof( worker->handles[ 0 ] ), sourceIndex + 1 );
+	}
+		         
+	worker->numSources--;
+
+exit:
+
+	return;
+}
+
+
+mDNSlocal void CALLBACK
+WorkerWakeupNotification( HANDLE event, void *context )
+{
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "Worker thread wakeup\n" );
+}
+
+
+mDNSlocal void
+WorkerDispatch( Worker *worker )
+{
+	if ( worker->result == WAIT_FAILED )
+	{
+		/* What should we do here? */
+	}
+	else if ( worker->result == WAIT_TIMEOUT )
+	{
+		dlog( kDebugLevelChatty, DEBUG_NAME "timeout\n" );
+	}
+	else
+	{
+		DWORD		waitItemIndex = ( DWORD )( ( ( int ) worker->result ) - WAIT_OBJECT_0 );
+		PollSource	*source = NULL;
+
+		// Sanity check
+
+		if ( waitItemIndex >= worker->numSources )
+		{
+			LogMsg( "WorkerDispatch: waitItemIndex (%d) is >= numSources (%d)", waitItemIndex, worker->numSources );
+			goto exit;
+		}
+
+		source = worker->sources[ waitItemIndex ];
+
+		if ( source->socket != INVALID_SOCKET )
+		{
+			WSANETWORKEVENTS event;
+	
+			if ( WSAEnumNetworkEvents( source->socket, source->handle, &event ) == 0 )
+			{
+				source->callback.socket( source->socket, &event, source->context );
+			}
+			else
+			{
+				source->callback.socket( source->socket, NULL, source->context );
+			}
+		}
+		else
+		{
+			source->callback.event( source->handle, source->context );
+		}
+	}
+
+exit:
+
+	return;
+}
+
+
+mDNSlocal mStatus
+WorkerInit( Worker *worker )
+{
+	PollSource *source = NULL;
+	mStatus err = mStatus_NoError;
+	
+	require_action( worker, exit, err = mStatus_BadParamErr );
+
+	source = malloc( sizeof( PollSource ) );
+	require_action( source, exit, err = mStatus_NoMemoryErr );
+
+	source->socket = INVALID_SOCKET;
+	source->handle = gPoll.wakeup;
+	source->callback.event = WorkerWakeupNotification;
+	source->context = NULL;
+	
+	WorkerRegisterSource( worker, source );
+
+exit:
+
+	return err;
+}
+	
+
+mDNSlocal void
+WorkerFree( Worker *worker )
+{
+	if ( worker->start )
+	{
+		CloseHandle( worker->start );
+		worker->start = NULL;
+	}
+
+	if ( worker->stop )
+	{
+		CloseHandle( worker->stop );
+		worker->stop = NULL;
+	}
+
+	free( worker );
+}
+
+
+mDNSlocal unsigned WINAPI
+WorkerMain( LPVOID inParam )
+{
+	Worker *worker = ( Worker* ) inParam;
+	mStatus err = mStatus_NoError;
+
+	require_action( worker, exit, err = mStatus_BadParamErr );
+
+	dlog( kDebugLevelVerbose, DEBUG_NAME, "entering WorkerMain()\n" );
+
+	while ( TRUE )
+	{
+		DWORD	result;
+		BOOL	ok;
+
+		dlog( kDebugLevelChatty, DEBUG_NAME, "worker thread %d will wait on main loop\n", worker->id );
+		
+		result = WaitForSingleObject( worker->start, INFINITE );	
+		err = translate_errno( ( result != WAIT_FAILED ), ( mStatus ) GetLastError(), kUnknownErr );
+		if ( err ) { LogErr( err, "WaitForSingleObject()" ); break; }
+		if ( worker->done ) break;
+
+		dlog( kDebugLevelChatty, DEBUG_NAME "worker thread %d will wait on sockets\n", worker->id );
+
+		worker->result = WaitForMultipleObjects( worker->numSources, worker->handles, FALSE, INFINITE );
+		err = translate_errno( ( worker->result != WAIT_FAILED ), ( mStatus ) GetLastError(), kUnknownErr );
+		if ( err ) { LogErr( err, "WaitForMultipleObjects()" ); break; }
+
+		dlog( kDebugLevelChatty, DEBUG_NAME "worker thread %d did wait on sockets: %d\n", worker->id, worker->result );
+
+		ok = SetEvent( gPoll.wakeup );
+		err = translate_errno( ok, ( mStatus ) GetLastError(), kUnknownErr );
+		if ( err ) { LogErr( err, "SetEvent()" ); break; }
+
+		dlog( kDebugLevelChatty, DEBUG_NAME, "worker thread %d preparing to sleep\n", worker->id );
+
+		ok = SetEvent( worker->stop );
+		err = translate_errno( ok, ( mStatus ) GetLastError(), kUnknownErr );
+		if ( err ) { LogErr( err, "SetEvent()" ); break; }
+	}
+
+	dlog( kDebugLevelVerbose, DEBUG_NAME "exiting WorkerMain()\n" );
+
+exit:
+
+	return 0;
+}
diff --git a/mDNSResponder/mDNSWindows/Poll.h b/mDNSResponder/mDNSWindows/Poll.h
new file mode 100755
index 00000000..bd1b10fc
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Poll.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _Poll_h
+#define _Poll_h
+
+#include	"CommonServices.h"
+#include	<mswsock.h>
+#include	"mDNSEmbeddedAPI.h"
+#include	"uDNS.h"
+
+
+#if defined(__cplusplus )
+extern "C" {
+#endif
+
+
+typedef void ( CALLBACK *mDNSPollSocketCallback )( SOCKET socket, LPWSANETWORKEVENTS event, void *context );
+typedef void ( CALLBACK *mDNSPollEventCallback )( HANDLE event, void *context );
+
+
+extern mStatus
+mDNSPollRegisterSocket( SOCKET socket, int networkEvents, mDNSPollSocketCallback callback, void *context );
+
+
+extern void
+mDNSPollUnregisterSocket( SOCKET socket );
+
+
+extern mStatus
+mDNSPollRegisterEvent( HANDLE event, mDNSPollEventCallback callback, void *context );
+
+
+extern void
+mDNSPollUnregisterEvent( HANDLE event );
+
+
+extern mStatus
+mDNSPoll( DWORD msec );
+
+
+#if defined(__cplusplus)
+}
+#endif
+
+
+#endif
diff --git a/mDNSResponder/mDNSWindows/PosixCompat.c b/mDNSResponder/mDNSWindows/PosixCompat.c
new file mode 100755
index 00000000..faabd073
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/PosixCompat.c
@@ -0,0 +1,128 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "PosixCompat.h"
+#include <DebugServices.h>
+
+
+typedef PCHAR (WINAPI * if_indextoname_funcptr_t)(ULONG index, PCHAR name);
+typedef ULONG (WINAPI * if_nametoindex_funcptr_t)(PCSTR name);
+
+
+unsigned
+if_nametoindex( const char * ifname )
+{
+	HMODULE library;
+	unsigned index = 0;
+
+	check( ifname );
+
+	// Try and load the IP helper library dll
+	if ((library = LoadLibrary(TEXT("Iphlpapi")) ) != NULL )
+	{
+		if_nametoindex_funcptr_t if_nametoindex_funcptr;
+
+		// On Vista and above there is a Posix like implementation of if_nametoindex
+		if ((if_nametoindex_funcptr = (if_nametoindex_funcptr_t) GetProcAddress(library, "if_nametoindex")) != NULL )
+		{
+			index = if_nametoindex_funcptr(ifname);
+		}
+
+		FreeLibrary(library);
+	}
+
+	return index;
+}
+
+
+char*
+if_indextoname( unsigned ifindex, char * ifname )
+{
+	HMODULE library;
+	char * name = NULL;
+
+	check( ifname );
+	*ifname = '\0';
+
+	// Try and load the IP helper library dll
+	if ((library = LoadLibrary(TEXT("Iphlpapi")) ) != NULL )
+	{
+		if_indextoname_funcptr_t if_indextoname_funcptr;
+
+		// On Vista and above there is a Posix like implementation of if_indextoname
+		if ((if_indextoname_funcptr = (if_indextoname_funcptr_t) GetProcAddress(library, "if_indextoname")) != NULL )
+		{
+			name = if_indextoname_funcptr(ifindex, ifname);
+		}
+
+		FreeLibrary(library);
+	}
+
+	return name;
+}
+
+
+int
+inet_pton( int family, const char * addr, void * dst )
+{
+	struct sockaddr_storage ss;
+	int sslen = sizeof( ss );
+
+	ZeroMemory( &ss, sizeof( ss ) );
+	ss.ss_family = family;
+
+	if ( WSAStringToAddressA( ( LPSTR ) addr, family, NULL, ( struct sockaddr* ) &ss, &sslen ) == 0 )
+	{
+		if ( family == AF_INET ) { memcpy( dst, &( ( struct sockaddr_in* ) &ss)->sin_addr, sizeof( IN_ADDR ) ); return 1; }
+		else if ( family == AF_INET6 ) { memcpy( dst, &( ( struct sockaddr_in6* ) &ss)->sin6_addr, sizeof( IN6_ADDR ) ); return 1; }
+		else return 0;
+	}
+    else return 0;
+}
+
+
+int
+gettimeofday( struct timeval * tv, struct timezone * tz )
+{
+#define EPOCHFILETIME (116444736000000000i64)
+
+	if ( tv != NULL )
+	{
+		FILETIME        ft;
+		LARGE_INTEGER   li;
+		__int64         t;
+
+		GetSystemTimeAsFileTime(&ft);
+		li.LowPart  = ft.dwLowDateTime;
+		li.HighPart = ft.dwHighDateTime;
+		t  = li.QuadPart;	/* In 100-nanosecond intervals */
+		t -= EPOCHFILETIME;	/* Offset to the Epoch time */
+		t /= 10;			/* In microseconds */
+		tv->tv_sec  = ( long )( t / 1000000 );
+		tv->tv_usec = ( long )( t % 1000000 );
+	}
+
+	return 0;
+}
+
+
+extern struct tm*
+localtime_r( const time_t * clock, struct tm * result )
+{
+	localtime_s( result, clock );
+	return result;
+}
diff --git a/mDNSResponder/mDNSWindows/PosixCompat.h b/mDNSResponder/mDNSWindows/PosixCompat.h
new file mode 100755
index 00000000..9f9d0059
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/PosixCompat.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "CommonServices.h"
+#include <winsock2.h>
+#include <time.h>
+
+
+/* 
+ * Posix process compatibility
+ */
+typedef int pid_t;
+#if !defined( getpid )
+#	define getpid _getpid
+#endif
+
+
+/* 
+ * Posix networking compatibility
+ */
+extern unsigned
+if_nametoindex( const char * ifname );
+
+
+extern char*
+if_indextoname( unsigned ifindex, char * ifname );
+
+
+extern int
+inet_pton( int family, const char * addr, void * dst );
+
+
+/* 
+ * Posix time compatibility
+ */
+extern int
+gettimeofday( struct timeval * tv, struct timezone * tz );
+
+
+extern struct tm*
+localtime_r( const time_t * clock, struct tm * result );
+
+
+/* 
+ * Posix string compatibility
+ */
+#if !defined( strcasecmp )
+#	define strcasecmp	_stricmp
+#endif
+
+#if !defined( snprintf )
+#	define snprint		_snprintf
+#endif
+
diff --git a/mDNSResponder/mDNSWindows/README.txt b/mDNSResponder/mDNSWindows/README.txt
new file mode 100644
index 00000000..8d8ab4bf
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/README.txt
@@ -0,0 +1,85 @@
+This directory contains support files for running mDNS on Microsoft Windows 
+and Windows CE/PocketPC. Building this code requires the Windows SDK 2003
+or later. The CodeWarrior builds require CodeWarrior 8 or later and if using
+CodeWarrior 8, the newer Windows headers from the Mac CodeWarrior 9 need to
+be used.
+
+mDNSWin32.c/.h
+	
+	Platform Support files that go below mDNS Core. These work on both Windows 
+	and Windows CE/PocketPC.
+
+DNSSD.c/.h
+
+	High-level implementation of the DNS-SD API. This supports both "direct"
+	(compiled-in mDNSCore) and "client" (IPC to service) usage. Conditionals
+	can exclude either "direct" or "client" to reduce code size.
+
+DNSSDDirect.c/.h
+
+	Portable implementation of the DNS-SD API. This interacts with mDNSCore
+	to perform all the real work of the DNS-SD API. This code does not rely
+	on any platform-specifics so it should run on any platform with an mDNS
+	platform plugin available. Software that cannot or does not want to use
+	the IPC mechanism (e.g. Windows CE, VxWorks, etc.) can use this code 
+	directly without any of the IPC pieces.
+
+RMxClient.c/.h
+	
+	Client-side implementation of the DNS-SD IPC API. This handles sending 
+	and receiving messages from the service to perform DNS-SD operations 
+	and get DNS-SD responses.
+
+RMxCommon.c/.h
+
+	Common code between the RMxClient and RMxServer. This handles establishing
+	and accepting connections, the underying message sending and receiving, 
+	portable data packing and unpacking, and shared utility routines.
+
+RMxServer.c/.h
+
+	Server-side implementation of the DNS-SD IPC API. This listens for 
+	and accepts connections from IPC clients, starts server sessions, and 
+	acts as a mediator between the "direct" (compiled-in mDNSCore) code
+	and the IPC client.
+
+DNSServices is an obsolete higher-level API for using mDNS. New code should 
+use the DNS-SD APIs.
+
+DNSServiceDiscovery is an obsolete emulation layer that sits on top of 
+DNSServices and provides the Mac OS X DNS Service Discovery API's on any 
+platform. New code should use the DNS-SD APIs.
+
+Tool.c is an example client that uses the services of mDNS Core.
+
+ToolWin32.mcp is a CodeWarrior project (CodeWarrior for Windows version 8). 
+ToolWin32.vcproj is a Visual Studio .NET 7 project. These projects build 
+Tool.c to make DNSServiceTest.exe, a small Windows command-line tool to do all 
+the standard DNS-SD stuff on Windows. It has the following features:
+
+- Browse for browsing and/or registration domains.
+- Browse for services.
+- Lookup Service Instances.
+- Register domains for browsing and/or registration.
+- Register services.
+
+For example, if you have a Windows machine running a Web server,
+then you can make it advertise that it is offering HTTP on port 80
+with the following command:
+
+DNSServiceTest -rs "Windows Web Server" "_http._tcp." "local." 80 ""
+
+To search for AFP servers, use this:
+
+DNSServiceTest -bs "_afpovertcp._tcp." "local."
+
+You can also do multiple things at once (e.g. register a service and
+browse for it so one instance of the app can be used for testing).
+Multiple instances can also be run on the same machine to discover each
+other. There is a -help command to show all the commands, their
+parameters, and some examples of using it.
+
+DNSServiceBrowser contains the source code for a graphical browser application 
+for Windows CE/PocketPC. The Windows CE/PocketPC version requires Microsoft 
+eMbedded C++ 4.0 with SP2 installed and the PocketPC 2003 SDK.
+
diff --git a/mDNSResponder/mDNSWindows/RegNames.h b/mDNSResponder/mDNSWindows/RegNames.h
new file mode 100644
index 00000000..bc885d61
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/RegNames.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//----------------------------------------------------------------------------------------
+//	Registry Constants
+//----------------------------------------------------------------------------------------
+
+#if defined(UNICODE)
+
+#	define kServiceParametersSoftware			L"SOFTWARE"
+#	define kServiceParametersAppleComputer		L"Apple Computer, Inc."
+#	define kServiceParametersBonjour			L"Bonjour"
+#	define kServiceParametersNode				L"SOFTWARE\\Apple Inc.\\Bonjour"
+#	define kServiceName							L"Bonjour Service"
+#	define kServiceDynDNSBrowseDomains			L"BrowseDomains"
+#	define kServiceDynDNSHostNames				L"HostNames"
+#	define kServiceDynDNSRegistrationDomains	L"RegistrationDomains"
+#	define kServiceDynDNSDomains				L"Domains"	// value is comma separated list of domains
+#	define kServiceDynDNSEnabled				L"Enabled"
+#	define kServiceDynDNSStatus					L"Status"
+#	define kServiceManageLLRouting				L"ManageLLRouting"
+#	define kServiceCacheEntryCount				L"CacheEntryCount"
+#	define kServiceManageFirewall				L"ManageFirewall"
+#	define kServiceAdvertisedServices			L"Services"
+
+# else
+
+#	define kServiceParametersSoftware			"SOFTWARE"
+#	define kServiceParametersAppleComputer		"Apple Computer, Inc."
+#	define kServiceParametersBonjour			"Bonjour"
+#	define kServiceParametersNode				"SOFTWARE\\Apple Inc.\\Bonjour"
+#	define kServiceName							"Bonjour Service"
+#	define kServiceDynDNSBrowseDomains			"BrowseDomains"
+#	define kServiceDynDNSHostNames				"HostNames"
+#	define kServiceDynDNSRegistrationDomains	"RegistrationDomains"
+#	define kServiceDynDNSDomains				"Domains"	// value is comma separated list of domains
+#	define kServiceDynDNSEnabled				"Enabled"
+#	define kServiceDynDNSStatus					"Status"
+#	define kServiceManageLLRouting				"ManageLLRouting"
+#	define kServiceCacheEntryCount				"CacheEntryCount"
+#	define kServiceManageFirewall				"ManageFirewall"
+
+#endif
diff --git a/mDNSResponder/mDNSWindows/Secret.c b/mDNSResponder/mDNSWindows/Secret.c
new file mode 100644
index 00000000..b5f254cd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Secret.c
@@ -0,0 +1,338 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Secret.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#include <process.h>
+#include <ntsecapi.h>
+#include <lm.h>
+#include "DebugServices.h"
+
+
+mDNSlocal OSStatus MakeLsaStringFromUTF8String( PLSA_UNICODE_STRING output, const char * input );
+mDNSlocal OSStatus MakeUTF8StringFromLsaString( char * output, size_t len, PLSA_UNICODE_STRING input );
+
+
+mDNSBool
+LsaGetSecret( const char * inDomain, char * outDomain, unsigned outDomainSize, char * outKey, unsigned outKeySize, char * outSecret, unsigned outSecretSize )
+{
+	PLSA_UNICODE_STRING		domainLSA;
+	PLSA_UNICODE_STRING		keyLSA;
+	PLSA_UNICODE_STRING		secretLSA;
+	size_t					i;
+	size_t					dlen;
+	LSA_OBJECT_ATTRIBUTES	attrs;
+	LSA_HANDLE				handle = NULL;
+	NTSTATUS				res;
+	OSStatus				err;
+
+	check( inDomain );
+	check( outDomain );
+	check( outKey );
+	check( outSecret );
+
+	// Initialize
+
+	domainLSA	= NULL;
+	keyLSA		= NULL;
+	secretLSA	= NULL;
+
+	// Make sure we have enough space to add trailing dot
+
+	dlen = strlen( inDomain );
+	err = strcpy_s( outDomain, outDomainSize - 2, inDomain );
+	require_noerr( err, exit );
+
+	// If there isn't a trailing dot, add one because the mDNSResponder
+	// presents names with the trailing dot.
+
+	if ( outDomain[ dlen - 1 ] != '.' )
+	{
+		outDomain[ dlen++ ] = '.';
+		outDomain[ dlen ] = '\0';
+	}
+
+	// Canonicalize name by converting to lower case (keychain and some name servers are case sensitive)
+
+	for ( i = 0; i < dlen; i++ )
+	{
+		outDomain[i] = (char) tolower( outDomain[i] );  // canonicalize -> lower case
+	}
+
+	// attrs are reserved, so initialize to zeroes.
+
+	ZeroMemory( &attrs, sizeof( attrs ) );
+
+	// Get a handle to the Policy object on the local system
+
+	res = LsaOpenPolicy( NULL, &attrs, POLICY_GET_PRIVATE_INFORMATION, &handle );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr( err, exit );
+
+	// Get the encrypted data
+
+	domainLSA = ( PLSA_UNICODE_STRING ) malloc( sizeof( LSA_UNICODE_STRING ) );
+	require_action( domainLSA != NULL, exit, err = mStatus_NoMemoryErr );
+	err = MakeLsaStringFromUTF8String( domainLSA, outDomain );
+	require_noerr( err, exit );
+
+	// Retrieve the key
+
+	res = LsaRetrievePrivateData( handle, domainLSA, &keyLSA );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr_quiet( err, exit );
+
+	// <rdar://problem/4192119> Lsa secrets use a flat naming space.  Therefore, we will prepend "$" to the keyname to
+	// make sure it doesn't conflict with a zone name.	
+	// Strip off the "$" prefix.
+
+	err = MakeUTF8StringFromLsaString( outKey, outKeySize, keyLSA );
+	require_noerr( err, exit );
+	require_action( outKey[0] == '$', exit, err = kUnknownErr );
+	memcpy( outKey, outKey + 1, strlen( outKey ) );
+
+	// Retrieve the secret
+
+	res = LsaRetrievePrivateData( handle, keyLSA, &secretLSA );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr_quiet( err, exit );
+
+	// Convert the secret to UTF8 string
+
+	err = MakeUTF8StringFromLsaString( outSecret, outSecretSize, secretLSA );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( domainLSA != NULL )
+	{
+		if ( domainLSA->Buffer != NULL )
+		{
+			free( domainLSA->Buffer );
+		}
+
+		free( domainLSA );
+	}
+
+	if ( keyLSA != NULL )
+	{
+		LsaFreeMemory( keyLSA );
+	}
+
+	if ( secretLSA != NULL )
+	{
+		LsaFreeMemory( secretLSA );
+	}
+
+	if ( handle )
+	{
+		LsaClose( handle );
+		handle = NULL;
+	}
+
+	return ( !err ) ? TRUE : FALSE;
+}
+
+
+mDNSBool
+LsaSetSecret( const char * inDomain, const char * inKey, const char * inSecret )
+{
+	size_t					inDomainLength;
+	size_t					inKeyLength;
+	char					domain[ 1024 ];
+	char					key[ 1024 ];
+	LSA_OBJECT_ATTRIBUTES	attrs;
+	LSA_HANDLE				handle = NULL;
+	NTSTATUS				res;
+	LSA_UNICODE_STRING		lucZoneName;
+	LSA_UNICODE_STRING		lucKeyName;
+	LSA_UNICODE_STRING		lucSecretName;
+	BOOL					ok = TRUE;
+	OSStatus				err;
+
+	require_action( inDomain != NULL, exit, ok = FALSE );
+	require_action( inKey != NULL, exit, ok = FALSE );
+	require_action( inSecret != NULL, exit, ok = FALSE );
+
+	// If there isn't a trailing dot, add one because the mDNSResponder
+	// presents names with the trailing dot.
+
+	ZeroMemory( domain, sizeof( domain ) );
+	inDomainLength = strlen( inDomain );
+	require_action( inDomainLength > 0, exit, ok = FALSE );
+	err = strcpy_s( domain, sizeof( domain ) - 2, inDomain );
+	require_action( !err, exit, ok = FALSE );
+
+	if ( domain[ inDomainLength - 1 ] != '.' )
+	{
+		domain[ inDomainLength++ ] = '.';
+		domain[ inDomainLength ] = '\0';
+	}
+
+	// <rdar://problem/4192119>
+	//
+	// Prepend "$" to the key name, so that there will
+	// be no conflict between the zone name and the key
+	// name
+
+	ZeroMemory( key, sizeof( key ) );
+	inKeyLength = strlen( inKey );
+	require_action( inKeyLength > 0 , exit, ok = FALSE );
+	key[ 0 ] = '$';
+	err = strcpy_s( key + 1, sizeof( key ) - 3, inKey );
+	require_action( !err, exit, ok = FALSE );
+	inKeyLength++;
+
+	if ( key[ inKeyLength - 1 ] != '.' )
+	{
+		key[ inKeyLength++ ] = '.';
+		key[ inKeyLength ] = '\0';
+	}
+
+	// attrs are reserved, so initialize to zeroes.
+
+	ZeroMemory( &attrs, sizeof( attrs ) );
+
+	// Get a handle to the Policy object on the local system
+
+	res = LsaOpenPolicy( NULL, &attrs, POLICY_ALL_ACCESS, &handle );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr( err, exit );
+
+	// Intializing PLSA_UNICODE_STRING structures
+
+	err = MakeLsaStringFromUTF8String( &lucZoneName, domain );
+	require_noerr( err, exit );
+
+	err = MakeLsaStringFromUTF8String( &lucKeyName, key );
+	require_noerr( err, exit );
+
+	err = MakeLsaStringFromUTF8String( &lucSecretName, inSecret );
+	require_noerr( err, exit );
+
+	// Store the private data.
+
+	res = LsaStorePrivateData( handle, &lucZoneName, &lucKeyName );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr( err, exit );
+
+	res = LsaStorePrivateData( handle, &lucKeyName, &lucSecretName );
+	err = translate_errno( res == 0, LsaNtStatusToWinError( res ), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( handle )
+	{
+		LsaClose( handle );
+		handle = NULL;
+	}
+
+	return ok;
+}
+
+
+//===========================================================================================================================
+//	MakeLsaStringFromUTF8String
+//===========================================================================================================================
+
+mDNSlocal OSStatus
+MakeLsaStringFromUTF8String( PLSA_UNICODE_STRING output, const char * input )
+{
+	int			size;
+	OSStatus	err;
+	
+	check( input );
+	check( output );
+
+	output->Buffer = NULL;
+
+	size = MultiByteToWideChar( CP_UTF8, 0, input, -1, NULL, 0 );
+	err = translate_errno( size > 0, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	output->Length = (USHORT)( size * sizeof( wchar_t ) );
+	output->Buffer = (PWCHAR) malloc( output->Length );
+	require_action( output->Buffer, exit, err = mStatus_NoMemoryErr );
+	size = MultiByteToWideChar( CP_UTF8, 0, input, -1, output->Buffer, size );
+	err = translate_errno( size > 0, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// We're going to subtrace one wchar_t from the size, because we didn't
+	// include it when we encoded the string
+
+	output->MaximumLength = output->Length;
+	output->Length		-= sizeof( wchar_t );
+	
+exit:
+
+	if ( err && output->Buffer )
+	{
+		free( output->Buffer );
+		output->Buffer = NULL;
+	}
+
+	return( err );
+}
+
+
+
+//===========================================================================================================================
+//	MakeUTF8StringFromLsaString
+//===========================================================================================================================
+
+mDNSlocal OSStatus
+MakeUTF8StringFromLsaString( char * output, size_t len, PLSA_UNICODE_STRING input )
+{
+	size_t		size;
+	OSStatus	err = kNoErr;
+
+	// The Length field of this structure holds the number of bytes,
+	// but WideCharToMultiByte expects the number of wchar_t's. So
+	// we divide by sizeof(wchar_t) to get the correct number.
+
+	size = (size_t) WideCharToMultiByte(CP_UTF8, 0, input->Buffer, ( input->Length / sizeof( wchar_t ) ), NULL, 0, NULL, NULL);
+	err = translate_errno( size != 0, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	// Ensure that we have enough space (Add one for trailing '\0')
+
+	require_action( ( size + 1 ) <= len, exit, err = mStatus_NoMemoryErr );
+
+	// Convert the string
+
+	size = (size_t) WideCharToMultiByte( CP_UTF8, 0, input->Buffer, ( input->Length / sizeof( wchar_t ) ), output, (int) size, NULL, NULL);	
+	err = translate_errno( size != 0, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// have to add the trailing 0 because WideCharToMultiByte doesn't do it,
+	// although it does return the correct size
+
+	output[size] = '\0';
+
+exit:
+
+	return err;
+}
+
diff --git a/mDNSResponder/mDNSWindows/Secret.h b/mDNSResponder/mDNSWindows/Secret.h
new file mode 100644
index 00000000..f5434f03
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/Secret.h
@@ -0,0 +1,42 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _Secret_h
+#define _Secret_h
+
+#include "mDNSEmbeddedAPI.h"
+
+
+#if defined(__cplusplus )
+extern "C" {
+#endif
+
+
+extern mDNSBool
+LsaGetSecret( const char * inDomain, char * outDomain, unsigned outDomainSize, char * outKey, unsigned outKeySize, char * outSecret, unsigned outSecretSize );
+
+
+extern mDNSBool
+LsaSetSecret( const char * inDomain, const char * inKey, const char * inSecret );
+
+
+#if defined(__cplusplus)
+}
+#endif
+
+
+#endif
diff --git a/mDNSResponder/mDNSWindows/SystemService/EventLog.mc b/mDNSResponder/mDNSWindows/SystemService/EventLog.mc
new file mode 100644
index 00000000..248e6c1a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/EventLog.mc
@@ -0,0 +1,11 @@
+MessageIdTypedef=WORD
+LanguageNames=(English=0x409:MSG00409)
+
+MessageId=100
+SymbolicName=MDNSRESPONDER_LOG
+Severity=Success
+Facility=Application
+Language=English
+%1
+.
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/EventLogMessages.bin b/mDNSResponder/mDNSWindows/SystemService/EventLogMessages.bin
new file mode 100644
index 00000000..e74c67ec
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/EventLogMessages.bin
diff --git a/mDNSResponder/mDNSWindows/SystemService/Firewall.cpp b/mDNSResponder/mDNSWindows/SystemService/Firewall.cpp
new file mode 100755
index 00000000..c7c96d09
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Firewall.cpp
@@ -0,0 +1,484 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// <rdar://problem/4278931> Doesn't compile correctly with latest Platform SDK
+
+#if !defined(_WIN32_DCOM)
+#	define _WIN32_DCOM 
+#endif
+
+
+#include "Firewall.h"
+#include <windows.h>
+#include <crtdbg.h>
+#include <netfw.h>
+#include <objbase.h>
+#include <oleauto.h>
+
+
+static const int kMaxTries			= 30;
+static const int kRetrySleepPeriod	= 1 * 1000; // 1 second
+
+
+static OSStatus
+mDNSFirewallInitialize(OUT INetFwProfile ** fwProfile)
+{
+	INetFwMgr		*	fwMgr		= NULL;
+	INetFwPolicy	*	fwPolicy	= NULL;
+	int					numRetries	= 0;
+	HRESULT				err			= kNoErr;
+    
+	_ASSERT(fwProfile != NULL);
+
+    *fwProfile = NULL;
+
+	// Use COM to get a reference to the firewall settings manager.  This
+	// call will fail on anything other than XP SP2
+
+	err = CoCreateInstance( __uuidof(NetFwMgr), NULL, CLSCTX_INPROC_SERVER, __uuidof(INetFwMgr), (void**)&fwMgr );
+	require(SUCCEEDED(err) && ( fwMgr != NULL ), exit);
+
+	// Use the reference to get the local firewall policy
+
+	err = fwMgr->get_LocalPolicy(&fwPolicy);
+	require(SUCCEEDED(err) && ( fwPolicy != NULL ), exit);
+
+	// Use the reference to get the extant profile. Empirical evidence
+	// suggests that there is the potential for a race condition when a system
+	// service whose startup type is automatic calls this method.
+	// This is true even when the service declares itself to be dependent
+	// on the firewall service. Re-trying the method will succeed within
+	// a few seconds.
+
+	do
+	{
+    	err = fwPolicy->get_CurrentProfile(fwProfile);
+
+		if (err)
+		{
+			Sleep(kRetrySleepPeriod);
+		}
+	}
+	while (err && (numRetries++ < kMaxTries));
+
+	require(SUCCEEDED(err), exit);
+
+	err = kNoErr;
+
+exit:
+
+	// Release temporary COM objects
+
+    if (fwPolicy != NULL)
+    {
+        fwPolicy->Release();
+    }
+
+    if (fwMgr != NULL)
+    {
+        fwMgr->Release();
+    }
+
+    return err;
+}
+
+
+static void
+mDNSFirewallCleanup
+			(
+			IN INetFwProfile	*	fwProfile
+			)
+{
+	// Call Release on the COM reference.
+
+    if (fwProfile != NULL)
+    {
+        fwProfile->Release();
+    }
+}
+
+
+static OSStatus
+mDNSFirewallAppIsEnabled
+			(
+			IN INetFwProfile	*	fwProfile,
+			IN const wchar_t	*	fwProcessImageFileName,
+			OUT BOOL			*	fwAppEnabled    
+			)
+{
+	BSTR							fwBstrProcessImageFileName = NULL;
+	VARIANT_BOOL					fwEnabled;
+	INetFwAuthorizedApplication	*	fwApp	= NULL;
+	INetFwAuthorizedApplications*	fwApps	= NULL;
+	OSStatus						err		= kNoErr;
+    
+	_ASSERT(fwProfile != NULL);
+	_ASSERT(fwProcessImageFileName != NULL);
+	_ASSERT(fwAppEnabled != NULL);
+
+    *fwAppEnabled = FALSE;
+
+	// Get the list of authorized applications
+
+	err = fwProfile->get_AuthorizedApplications(&fwApps);
+	require(SUCCEEDED(err) && ( fwApps != NULL ), exit);
+
+    fwBstrProcessImageFileName = SysAllocString(fwProcessImageFileName);
+	require_action( ( fwProcessImageFileName != NULL ) && ( SysStringLen(fwBstrProcessImageFileName) > 0 ), exit, err = kNoMemoryErr);
+
+	// Look for us
+
+    err = fwApps->Item(fwBstrProcessImageFileName, &fwApp);
+	
+    if (SUCCEEDED(err) && ( fwApp != NULL ) )
+    {
+        // It's listed, but is it enabled?
+
+		err = fwApp->get_Enabled(&fwEnabled);
+		require(SUCCEEDED(err), exit);
+
+        if (fwEnabled != VARIANT_FALSE)
+        {
+			// Yes, it's enabled
+
+            *fwAppEnabled = TRUE;
+		}
+	}
+
+	err = kNoErr;
+
+exit:
+
+	// Deallocate the BSTR
+
+	if ( fwBstrProcessImageFileName != NULL )
+	{
+		SysFreeString(fwBstrProcessImageFileName);
+	}
+
+	// Release the COM objects
+
+    if (fwApp != NULL)
+    {
+        fwApp->Release();
+    }
+
+    if (fwApps != NULL)
+    {
+        fwApps->Release();
+    }
+
+    return err;
+}
+
+
+static OSStatus
+mDNSFirewallAddApp
+			(
+            IN INetFwProfile	*	fwProfile,
+            IN const wchar_t	*	fwProcessImageFileName,
+            IN const wchar_t	*	fwName
+            )
+{
+	BOOL							fwAppEnabled;
+	BSTR							fwBstrName = NULL;
+	BSTR							fwBstrProcessImageFileName = NULL;
+	INetFwAuthorizedApplication	*	fwApp = NULL;
+	INetFwAuthorizedApplications*	fwApps = NULL;
+	OSStatus						err = S_OK;
+    
+	_ASSERT(fwProfile != NULL);
+    _ASSERT(fwProcessImageFileName != NULL);
+    _ASSERT(fwName != NULL);
+
+    // First check to see if the application is already authorized.
+	err = mDNSFirewallAppIsEnabled( fwProfile, fwProcessImageFileName, &fwAppEnabled );
+	require_noerr(err, exit);
+
+	// Only add the application if it isn't enabled
+
+	if (!fwAppEnabled)
+	{
+		// Get the list of authorized applications
+
+        err = fwProfile->get_AuthorizedApplications(&fwApps);
+		require(SUCCEEDED(err) && ( fwApps != NULL ), exit);
+
+        // Create an instance of an authorized application.
+
+		err = CoCreateInstance( __uuidof(NetFwAuthorizedApplication), NULL, CLSCTX_INPROC_SERVER, __uuidof(INetFwAuthorizedApplication), (void**)&fwApp );
+		require(SUCCEEDED(err) && ( fwApp != NULL ), exit);
+
+        fwBstrProcessImageFileName = SysAllocString(fwProcessImageFileName);
+		require_action(( fwProcessImageFileName != NULL ) && ( SysStringLen(fwBstrProcessImageFileName) > 0 ), exit, err = kNoMemoryErr);
+
+		// Set the executable file name
+
+		err = fwApp->put_ProcessImageFileName(fwBstrProcessImageFileName);
+		require(SUCCEEDED(err), exit);
+
+		fwBstrName = SysAllocString(fwName);
+		require_action( ( fwBstrName != NULL ) && ( SysStringLen(fwBstrName) > 0 ), exit, err = kNoMemoryErr);
+
+		// Set the friendly name
+
+        err = fwApp->put_Name(fwBstrName);
+		require(SUCCEEDED(err), exit);
+
+		// Now add the application
+
+        err = fwApps->Add(fwApp);
+		require(SUCCEEDED(err), exit);
+	}
+
+	err = kNoErr;
+
+exit:
+
+	// Deallocate the BSTR objects
+
+	if ( fwBstrName != NULL )
+	{
+		SysFreeString(fwBstrName);
+	}
+
+	if ( fwBstrProcessImageFileName != NULL )
+	{
+		SysFreeString(fwBstrProcessImageFileName);
+	}
+
+    // Release the COM objects
+
+    if (fwApp != NULL)
+    {
+        fwApp->Release();
+    }
+
+    if (fwApps != NULL)
+    {
+        fwApps->Release();
+    }
+
+    return err;
+}
+
+
+
+
+
+static OSStatus
+
+mDNSFirewallIsFileAndPrintSharingEnabled
+
+	(
+
+	IN INetFwProfile	* fwProfile,
+
+	OUT BOOL			* fwServiceEnabled
+
+	)
+
+{
+
+    VARIANT_BOOL fwEnabled;
+
+    INetFwService* fwService = NULL;
+
+    INetFwServices* fwServices = NULL;
+
+	OSStatus err = S_OK;
+
+
+
+    _ASSERT(fwProfile != NULL);
+
+    _ASSERT(fwServiceEnabled != NULL);
+
+
+
+    *fwServiceEnabled = FALSE;
+
+
+
+    // Retrieve the globally open ports collection.
+
+    err = fwProfile->get_Services(&fwServices);
+
+	require( SUCCEEDED( err ), exit );
+
+
+
+    // Attempt to retrieve the globally open port.
+
+    err = fwServices->Item(NET_FW_SERVICE_FILE_AND_PRINT, &fwService);
+
+	require( SUCCEEDED( err ), exit );
+
+	
+
+	// Find out if the globally open port is enabled.
+
+    err = fwService->get_Enabled(&fwEnabled);
+
+	require( SUCCEEDED( err ), exit );
+
+	if (fwEnabled != VARIANT_FALSE)
+
+	{
+
+		*fwServiceEnabled = TRUE;
+
+	}
+
+
+
+exit:
+
+
+
+    // Release the globally open port.
+
+    if (fwService != NULL)
+
+    {
+
+        fwService->Release();
+
+    }
+
+
+
+    // Release the globally open ports collection.
+
+    if (fwServices != NULL)
+
+    {
+
+        fwServices->Release();
+
+    }
+
+
+
+    return err;
+
+}
+
+
+OSStatus
+mDNSAddToFirewall
+		(
+		LPWSTR	executable,
+		LPWSTR	name
+		)
+{
+	INetFwProfile	*	fwProfile	= NULL;
+	HRESULT				comInit		= E_FAIL;
+	OSStatus			err			= kNoErr;
+
+	// Initialize COM.
+
+	comInit = CoInitializeEx( 0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE );
+
+	// Ignore this case. RPC_E_CHANGED_MODE means that COM has already been
+	// initialized with a different mode.
+
+	if (comInit != RPC_E_CHANGED_MODE)
+	{
+		err = comInit;
+		require(SUCCEEDED(err), exit);
+	}
+
+	// Connect to the firewall
+
+	err = mDNSFirewallInitialize(&fwProfile);
+	require( SUCCEEDED( err ) && ( fwProfile != NULL ), exit);
+
+	// Add us to the list of exempt programs
+
+	err = mDNSFirewallAddApp( fwProfile, executable, name );
+	require_noerr(err, exit);
+
+exit:
+
+	// Disconnect from the firewall
+
+	if ( fwProfile != NULL )
+	{
+		mDNSFirewallCleanup(fwProfile);
+	}
+
+	// De-initialize COM
+
+	if (SUCCEEDED(comInit))
+    {
+        CoUninitialize();
+    }
+
+	return err;
+}
+
+
+BOOL
+mDNSIsFileAndPrintSharingEnabled( BOOL * retry )
+{
+	INetFwProfile	*	fwProfile					= NULL;
+	HRESULT				comInit						= E_FAIL;
+	BOOL				enabled						= FALSE;
+	OSStatus			err							= kNoErr;
+
+	// Initialize COM.
+
+	*retry = FALSE;
+	comInit = CoInitializeEx( 0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE );
+
+	// Ignore this case. RPC_E_CHANGED_MODE means that COM has already been
+	// initialized with a different mode.
+
+	if (comInit != RPC_E_CHANGED_MODE)
+	{
+		*retry = TRUE;
+		err = comInit;
+		require(SUCCEEDED(err), exit);
+	}
+
+	// Connect to the firewall
+
+	err = mDNSFirewallInitialize(&fwProfile);
+	require( SUCCEEDED( err ) && ( fwProfile != NULL ), exit);
+
+	err = mDNSFirewallIsFileAndPrintSharingEnabled( fwProfile, &enabled );
+	require_noerr( err, exit );
+
+exit:
+
+	// Disconnect from the firewall
+
+	if ( fwProfile != NULL )
+	{
+		mDNSFirewallCleanup(fwProfile);
+	}
+
+	// De-initialize COM
+
+	if (SUCCEEDED(comInit))
+    {
+        CoUninitialize();
+    }
+
+	return enabled;
+}
diff --git a/mDNSResponder/mDNSWindows/SystemService/Firewall.h b/mDNSResponder/mDNSWindows/SystemService/Firewall.h
new file mode 100755
index 00000000..3d7d532d
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Firewall.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#ifndef _Firewall_h
+
+#define _Firewall_h
+
+
+
+
+
+#include "CommonServices.h"
+
+#include "DebugServices.h"
+
+
+
+
+
+#if defined(__cplusplus)
+
+extern "C"
+
+{
+
+#endif
+
+
+
+
+
+OSStatus
+
+mDNSAddToFirewall
+
+		(
+
+		LPWSTR	executable,
+
+		LPWSTR	name
+
+		);
+
+
+BOOL
+mDNSIsFileAndPrintSharingEnabled( BOOL * retry );
+
+
+
+
+
+#if defined(__cplusplus)
+
+}
+
+#endif
+
+
+
+
+
+#endif
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/Prefix.h b/mDNSResponder/mDNSWindows/SystemService/Prefix.h
new file mode 100644
index 00000000..61381d08
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Prefix.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __PREFIX__
+#define __PREFIX__
+
+#if( defined( _DEBUG ) )
+	#define	DEBUG					1
+	#define	MDNS_DEBUGMSGS			1
+#else
+	#define	DEBUG					0
+#endif
+
+#define	DNS_SD_CLIENT_ENABLED		0
+
+#endif	// __PREFIX__
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.aps b/mDNSResponder/mDNSWindows/SystemService/Service.aps
new file mode 100644
index 00000000..41f25562
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.aps
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.c b/mDNSResponder/mDNSWindows/SystemService/Service.c
new file mode 100644
index 00000000..d175326f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.c
@@ -0,0 +1,2616 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<crtdbg.h>
+#include	<stdarg.h>
+#include	<stddef.h>
+
+#include	"Poll.h"
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+#include	"RegNames.h"
+
+#include	"uds_daemon.h"
+#include	"GenLinkedList.h"
+#include	"Service.h"
+#include	"EventLog.h"
+
+#include	"Resource.h"
+
+#include	"mDNSEmbeddedAPI.h"
+#include	"uDNS.h"
+#include	"mDNSWin32.h"
+#include	"mDNSDebug.h"
+
+#include	"Firewall.h"
+
+#if( !TARGET_OS_WINDOWS_CE )
+	#include	<mswsock.h>
+	#include	<process.h>
+	#include	<ipExport.h>
+	#include	<ws2def.h>
+	#include	<ws2ipdef.h>
+	#include	<iphlpapi.h>
+	#include	<netioapi.h>
+	#include	<iptypes.h>
+	#include	<powrprof.h>
+#endif
+
+#ifndef HeapEnableTerminationOnCorruption
+#	define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
+#endif
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#define	DEBUG_NAME							"[mDNSWin32] "
+#define kServiceFirewallName				L"Bonjour"
+#define	kServiceDependencies				TEXT("Tcpip\0\0")
+#define	kDNSServiceCacheEntryCountDefault	512
+#define kRetryFirewallPeriod				30 * 1000
+#define kDefValueSize						MAX_PATH + 1
+#define kZeroIndex							0
+#define kDefaultRouteMetric					399
+#define kSecondsTo100NSUnits				( 10 * 1000 * 1000 )
+#define kSPSMaintenanceWakePeriod			-30
+#define kWaitToRetry						(60 * 5)
+
+#define RR_CACHE_SIZE 500
+static CacheEntity gRRCache[RR_CACHE_SIZE];
+#if 0
+#pragma mark == Structures ==
+#endif
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+static void				Usage( void );
+static BOOL WINAPI		ConsoleControlHandler( DWORD inControlEvent );
+static OSStatus			InstallService( LPCTSTR inName, LPCTSTR inDisplayName, LPCTSTR inDescription, LPCTSTR inPath );
+static OSStatus			RemoveService( LPCTSTR inName );
+static OSStatus			SetServiceParameters();
+static OSStatus			GetServiceParameters();
+static OSStatus			CheckFirewall();
+static OSStatus			SetServiceInfo( SC_HANDLE inSCM, LPCTSTR inServiceName, LPCTSTR inDescription );
+static void				ReportStatus( int inType, const char *inFormat, ... );
+
+static void WINAPI		ServiceMain( DWORD argc, LPTSTR argv[] );
+static OSStatus			ServiceSetupEventLogging( void );
+static DWORD WINAPI		ServiceControlHandler( DWORD inControl, DWORD inEventType, LPVOID inEventData, LPVOID inContext );
+
+static OSStatus			ServiceRun( int argc, LPTSTR argv[] );
+static void				ServiceStop( void );
+
+static OSStatus			ServiceSpecificInitialize( int argc, LPTSTR  argv[] );
+static OSStatus			ServiceSpecificRun( int argc, LPTSTR argv[] );
+static OSStatus			ServiceSpecificStop( void );
+static void				ServiceSpecificFinalize( int argc, LPTSTR argv[] );
+static mStatus			SetupServiceEvents();
+static mStatus			TearDownServiceEvents();
+static mStatus			SetupNotifications();
+static mStatus			TearDownNotifications();
+static void CALLBACK	StopNotification( HANDLE event, void * context );
+static void CALLBACK	PowerSuspendNotification( HANDLE event, void * context );
+static void	CALLBACK	PowerResumeNotification( HANDLE event, void * context );
+static void CALLBACK	InterfaceListNotification( SOCKET socket, LPWSANETWORKEVENTS event, void *context );
+static void CALLBACK	ComputerDescriptionNotification( HANDLE event, void *context );
+static void CALLBACK	TCPChangedNotification( HANDLE event, void *context );
+static void CALLBACK	DDNSChangedNotification( HANDLE event, void *context );
+static void CALLBACK	FileSharingChangedNotification( HANDLE event, void *context );
+static void CALLBACK	FirewallChangedNotification( HANDLE event, void *context );
+static void CALLBACK	AdvertisedServicesChangedNotification( HANDLE event, void *context );
+static void CALLBACK	SPSWakeupNotification( HANDLE event, void *context );
+static void	CALLBACK	SPSSleepNotification( HANDLE event, void *context );
+static void CALLBACK	UDSAcceptNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context );
+static void CALLBACK	UDSReadNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context );
+static void				CoreCallback(mDNS * const inMDNS, mStatus result);
+static mDNSu8			SystemWakeForNetworkAccess( LARGE_INTEGER * timeout );
+static OSStatus			GetRouteDestination(DWORD * ifIndex, DWORD * address);
+static OSStatus			SetLLRoute( mDNS * const inMDNS );
+static bool				HaveRoute( PMIB_IPFORWARDROW rowExtant, unsigned long addr, unsigned long metric );
+static bool				IsValidAddress( const char * addr );
+static bool				IsNortelVPN( IP_ADAPTER_INFO * pAdapter );
+static bool				IsJuniperVPN( IP_ADAPTER_INFO * pAdapter );
+static bool				IsCiscoVPN( IP_ADAPTER_INFO * pAdapter );
+static const char *		strnistr( const char * string, const char * subString, size_t max );
+
+#if defined(UNICODE)
+#	define StrLen(X)	wcslen(X)
+#	define StrCmp(X,Y)	wcscmp(X,Y)
+#else
+#	define StrLen(X)	strlen(X)
+#	define StrCmp(X,Y)	strcmp(X,Y)
+#endif
+
+
+#define kLLNetworkAddr      "169.254.0.0"
+#define kLLNetworkAddrMask  "255.255.0.0"
+
+
+#include	"mDNSEmbeddedAPI.h"
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+#define gMDNSRecord mDNSStorage
+DEBUG_LOCAL	mDNS_PlatformSupport		gPlatformStorage;
+DEBUG_LOCAL BOOL						gServiceQuietMode		= FALSE;
+DEBUG_LOCAL SERVICE_TABLE_ENTRY			gServiceDispatchTable[] = 
+{
+	{ kServiceName,	ServiceMain }, 
+	{ NULL, 		NULL }
+};
+DEBUG_LOCAL HANDLE						gStopEvent					= NULL;
+DEBUG_LOCAL HANDLE						gPowerSuspendEvent			= NULL;
+DEBUG_LOCAL HANDLE						gPowerSuspendAckEvent		= NULL;
+DEBUG_LOCAL HANDLE						gPowerResumeEvent			= NULL;
+DEBUG_LOCAL SOCKET						gInterfaceListChangedSocket	= INVALID_SOCKET;
+DEBUG_LOCAL HKEY						gDescKey					= NULL;
+DEBUG_LOCAL HANDLE						gDescChangedEvent			= NULL;	// Computer description changed event
+DEBUG_LOCAL HKEY						gTcpipKey					= NULL;
+DEBUG_LOCAL HANDLE						gTcpipChangedEvent			= NULL;	// TCP/IP config changed
+DEBUG_LOCAL HKEY						gDdnsKey					= NULL;
+DEBUG_LOCAL HANDLE						gDdnsChangedEvent			= NULL;	// DynDNS config changed
+DEBUG_LOCAL HKEY						gFileSharingKey				= NULL;
+DEBUG_LOCAL HANDLE						gFileSharingChangedEvent	= NULL;	// File Sharing changed
+DEBUG_LOCAL HKEY						gFirewallKey				= NULL;
+DEBUG_LOCAL HANDLE						gFirewallChangedEvent		= NULL;	// Firewall changed
+DEBUG_LOCAL HKEY						gAdvertisedServicesKey		= NULL;
+DEBUG_LOCAL HANDLE						gAdvertisedServicesChangedEvent	= NULL; // Advertised services changed
+DEBUG_LOCAL SERVICE_STATUS				gServiceStatus;
+DEBUG_LOCAL SERVICE_STATUS_HANDLE		gServiceStatusHandle 	= NULL;
+DEBUG_LOCAL HANDLE						gServiceEventSource		= NULL;
+DEBUG_LOCAL bool						gServiceAllowRemote		= false;
+DEBUG_LOCAL int							gServiceCacheEntryCount	= 0;	// 0 means to use the DNS-SD default.
+DEBUG_LOCAL bool						gServiceManageLLRouting = true;
+DEBUG_LOCAL HANDLE						gSPSWakeupEvent			= NULL;
+DEBUG_LOCAL HANDLE						gSPSSleepEvent			= NULL;
+DEBUG_LOCAL SocketRef					gUDSSocket				= 0;
+DEBUG_LOCAL udsEventCallback			gUDSCallback			= NULL;
+DEBUG_LOCAL BOOL						gRetryFirewall			= FALSE;
+
+typedef DWORD ( WINAPI * GetIpInterfaceEntryFunctionPtr )( PMIB_IPINTERFACE_ROW );
+mDNSlocal HMODULE								gIPHelperLibraryInstance		= NULL;
+mDNSlocal GetIpInterfaceEntryFunctionPtr		gGetIpInterfaceEntryFunctionPtr	= NULL;
+
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	Main
+//===========================================================================================================================
+int	Main( int argc, LPTSTR argv[] )
+{
+	OSStatus		err;
+	BOOL			ok;
+	BOOL			start;
+	int				i;
+
+	HeapSetInformation( NULL, HeapEnableTerminationOnCorruption, NULL, 0 );
+
+	debug_initialize( kDebugOutputTypeMetaConsole );
+	debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelVerbose );
+
+	// Default to automatically starting the service dispatcher if no extra arguments are specified.
+	
+	start = ( argc <= 1 );
+	
+	// Parse arguments.
+	
+	for( i = 1; i < argc; ++i )
+	{
+		if( StrCmp( argv[ i ], TEXT("-install") ) == 0 )			// Install
+		{
+			TCHAR desc[ 256 ];
+			
+			desc[ 0 ] = 0;
+			LoadString( GetModuleHandle( NULL ), IDS_SERVICE_DESCRIPTION, desc, sizeof( desc ) );
+			err = InstallService( kServiceName, kServiceName, desc, argv[0] );
+			if( err )
+			{
+				ReportStatus( EVENTLOG_ERROR_TYPE, "install service failed (%d)\n", err );
+				goto exit;
+			}
+		}
+		else if( StrCmp( argv[ i ], TEXT("-remove") ) == 0 )		// Remove
+		{
+			err = RemoveService( kServiceName );
+			if( err )
+			{
+				ReportStatus( EVENTLOG_ERROR_TYPE, "remove service failed (%d)\n", err );
+				goto exit;
+			}
+		}
+		else if( StrCmp( argv[ i ], TEXT("-start") ) == 0 )		// Start
+		{
+			start = TRUE;
+		}
+		else if( StrCmp( argv[ i ], TEXT("-server") ) == 0 )		// Server
+		{
+			err = RunDirect( argc, argv );
+			if( err )
+			{
+				ReportStatus( EVENTLOG_ERROR_TYPE, "run service directly failed (%d)\n", err );
+			}
+			goto exit;
+		}
+		else if( StrCmp( argv[ i ], TEXT("-q") ) == 0 )			// Quiet Mode (toggle)
+		{
+			gServiceQuietMode = !gServiceQuietMode;
+		}
+		else if( ( StrCmp( argv[ i ], TEXT("-help") ) == 0 ) || 	// Help
+				 ( StrCmp( argv[ i ], TEXT("-h") ) == 0 ) )
+		{
+			Usage();
+			err = 0;
+			break;
+		}
+		else
+		{
+			Usage();
+			err = kParamErr;
+			break;
+		}
+	}
+	
+	// Start the service dispatcher if requested. This does not return until all services have terminated. If any 
+	// global initialization is needed, it should be done before starting the service dispatcher, but only if it 
+	// will take less than 30 seconds. Otherwise, use a separate thread for it and start the dispatcher immediately.
+	
+	if( start )
+	{
+		ok = StartServiceCtrlDispatcher( gServiceDispatchTable );
+		err = translate_errno( ok, (OSStatus) GetLastError(), kInUseErr );
+		if( err != kNoErr )
+		{
+			ReportStatus( EVENTLOG_ERROR_TYPE, "start service dispatcher failed (%d)\n", err );
+			goto exit;
+		}
+	}
+	err = 0;
+	
+exit:
+	dlog( kDebugLevelTrace, DEBUG_NAME "exited (%d %m)\n", err, err );
+	_CrtDumpMemoryLeaks();
+	return( (int) err );
+}
+
+//===========================================================================================================================
+//	Usage
+//===========================================================================================================================
+
+static void	Usage( void )
+{
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "mDNSResponder 1.0d1\n" );
+	fprintf( stderr, "\n" );
+	fprintf( stderr, "    <no args>    Runs the service normally\n" );
+	fprintf( stderr, "    -install     Creates the service and starts it\n" );
+	fprintf( stderr, "    -remove      Stops the service and deletes it\n" );
+	fprintf( stderr, "    -start       Starts the service dispatcher after processing all other arguments\n" );
+	fprintf( stderr, "    -server      Runs the service directly as a server (for debugging)\n" );
+	fprintf( stderr, "    -q           Toggles Quiet Mode (no events or output)\n" );
+	fprintf( stderr, "    -remote      Allow remote connections\n" );
+	fprintf( stderr, "    -cache n     Number of mDNS cache entries (defaults to %d)\n", kDNSServiceCacheEntryCountDefault );
+	fprintf( stderr, "    -h[elp]      Display Help/Usage\n" );
+	fprintf( stderr, "\n" );
+}
+
+//===========================================================================================================================
+//	ConsoleControlHandler
+//===========================================================================================================================
+
+static BOOL WINAPI	ConsoleControlHandler( DWORD inControlEvent )
+{
+	BOOL			handled;
+	OSStatus		err;
+	
+	handled = FALSE;
+	switch( inControlEvent )
+	{
+		case CTRL_C_EVENT:
+		case CTRL_BREAK_EVENT:
+		case CTRL_CLOSE_EVENT:
+		case CTRL_LOGOFF_EVENT:
+		case CTRL_SHUTDOWN_EVENT:
+			err = ServiceSpecificStop();
+			require_noerr( err, exit );
+			
+			handled = TRUE;
+			break;
+		
+		default:
+			break;
+	}
+	
+exit:
+	return( handled );
+}
+
+//===========================================================================================================================
+//	InstallService
+//===========================================================================================================================
+
+static OSStatus	InstallService( LPCTSTR inName, LPCTSTR inDisplayName, LPCTSTR inDescription, LPCTSTR inPath )
+{
+	OSStatus		err;
+	SC_HANDLE		scm;
+	SC_HANDLE		service;
+	BOOL			ok;
+	TCHAR			fullPath[ MAX_PATH ];
+	TCHAR *			namePtr;
+	DWORD			size;
+	
+	scm		= NULL;
+	service = NULL;
+	
+	// Get a full path to the executable since a relative path may have been specified.
+	
+	size = GetFullPathName( inPath, MAX_PATH, fullPath, &namePtr );
+	err = translate_errno( size > 0, (OSStatus) GetLastError(), kPathErr );
+	require_noerr( err, exit );
+	
+	// Create the service and start it.
+	
+	scm = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS );
+	err = translate_errno( scm, (OSStatus) GetLastError(), kOpenErr );
+	require_noerr( err, exit );
+	
+	service = CreateService( scm, inName, inDisplayName, SERVICE_ALL_ACCESS, SERVICE_WIN32_SHARE_PROCESS, 
+							 SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, fullPath, NULL, NULL, kServiceDependencies, 
+							 NULL, NULL );
+	err = translate_errno( service, (OSStatus) GetLastError(), kDuplicateErr );
+	require_noerr( err, exit );
+
+	err = SetServiceParameters();
+	check_noerr( err );
+	
+	if( inDescription )
+	{
+		err = SetServiceInfo( scm, inName, inDescription );
+		check_noerr( err );
+	}
+
+	ok = StartService( service, 0, NULL );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kInUseErr );
+	require_noerr( err, exit );
+	
+	ReportStatus( EVENTLOG_SUCCESS, "installed service\n" );
+	err = kNoErr;
+	
+exit:
+	if( service )
+	{
+		CloseServiceHandle( service );
+	}
+	if( scm )
+	{
+		CloseServiceHandle( scm );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	RemoveService
+//===========================================================================================================================
+
+static OSStatus	RemoveService( LPCTSTR inName )
+{
+	OSStatus			err;
+	SC_HANDLE			scm;
+	SC_HANDLE			service;
+	BOOL				ok;
+	SERVICE_STATUS		status;
+	
+	scm		= NULL;
+	service = NULL;
+	
+	// Open a connection to the service.
+	
+	scm = OpenSCManager( 0, 0, SC_MANAGER_ALL_ACCESS );
+	err = translate_errno( scm, (OSStatus) GetLastError(), kOpenErr );
+	require_noerr( err, exit );
+	
+	service = OpenService( scm, inName, SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE );
+	err = translate_errno( service, (OSStatus) GetLastError(), kNotFoundErr );
+	require_noerr( err, exit );
+	
+	// Stop the service, if it is not already stopped, then delete it.
+	
+	ok = QueryServiceStatus( service, &status );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kAuthenticationErr );
+	require_noerr( err, exit );
+	
+	if( status.dwCurrentState != SERVICE_STOPPED )
+	{
+		ok = ControlService( service, SERVICE_CONTROL_STOP, &status );
+		check_translated_errno( ok, (OSStatus) GetLastError(), kAuthenticationErr );
+	}
+	
+	ok = DeleteService( service );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kDeletedErr );
+	require_noerr( err, exit );
+		
+	ReportStatus( EVENTLOG_SUCCESS, "Removed service\n" );
+	err = ERROR_SUCCESS;
+	
+exit:
+	if( service )
+	{
+		CloseServiceHandle( service );
+	}
+	if( scm )
+	{
+		CloseServiceHandle( scm );
+	}
+	return( err );
+}
+
+
+
+//===========================================================================================================================
+//	SetServiceParameters
+//===========================================================================================================================
+
+static OSStatus SetServiceParameters()
+{
+	DWORD 			value;
+	DWORD			valueLen = sizeof(DWORD);
+	DWORD			type;
+	OSStatus		err;
+	HKEY			key;
+
+	key = NULL;
+
+	//
+	// Add/Open Parameters section under service entry in registry
+	//
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode, &key );
+	require_noerr( err, exit );
+	
+	//
+	// If the value isn't already there, then we create it
+	//
+	err = RegQueryValueEx(key, kServiceManageLLRouting, 0, &type, (LPBYTE) &value, &valueLen);
+
+	if (err != ERROR_SUCCESS)
+	{
+		value = 1;
+
+		err = RegSetValueEx( key, kServiceManageLLRouting, 0, REG_DWORD, (const LPBYTE) &value, sizeof(DWORD) );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return( err );
+}
+
+
+
+//===========================================================================================================================
+//	GetServiceParameters
+//===========================================================================================================================
+
+static OSStatus GetServiceParameters()
+{
+	DWORD 			value;
+	DWORD			valueLen;
+	DWORD			type;
+	OSStatus		err;
+	HKEY			key;
+
+	key = NULL;
+
+	//
+	// Add/Open Parameters section under service entry in registry
+	//
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode, &key );
+	require_noerr( err, exit );
+	
+	valueLen = sizeof(DWORD);
+	err = RegQueryValueEx(key, kServiceManageLLRouting, 0, &type, (LPBYTE) &value, &valueLen);
+	if (err == ERROR_SUCCESS)
+	{
+		gServiceManageLLRouting = (value) ? true : false;
+	}
+
+	valueLen = sizeof(DWORD);
+	err = RegQueryValueEx(key, kServiceCacheEntryCount, 0, &type, (LPBYTE) &value, &valueLen);
+	if (err == ERROR_SUCCESS)
+	{
+		gServiceCacheEntryCount = value;
+	}
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	CheckFirewall
+//===========================================================================================================================
+
+static OSStatus CheckFirewall()
+{
+	DWORD 					value;
+	DWORD					valueLen;
+	DWORD					type;
+	ENUM_SERVICE_STATUS	*	lpService = NULL;
+	SC_HANDLE				sc = NULL;
+	HKEY					key = NULL;
+	BOOL					ok;
+	DWORD					bytesNeeded = 0;
+	DWORD					srvCount;
+	DWORD					resumeHandle = 0;
+	DWORD					srvType;
+	DWORD					srvState;
+	DWORD					dwBytes = 0;
+	DWORD					i;
+	BOOL					isRunning = FALSE;
+	OSStatus				err = kUnknownErr;
+	
+	// Check to see if the firewall service is running.  If it isn't, then
+	// we want to return immediately
+
+	sc = OpenSCManager( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE );
+	err = translate_errno( sc, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	srvType		=	SERVICE_WIN32;
+	srvState	=	SERVICE_STATE_ALL;
+
+	for ( ;; )
+	{
+		// Call EnumServicesStatus using the handle returned by OpenSCManager
+
+		ok = EnumServicesStatus ( sc, srvType, srvState, lpService, dwBytes, &bytesNeeded, &srvCount, &resumeHandle );
+
+		if ( ok || ( GetLastError() != ERROR_MORE_DATA ) )
+		{
+			break;
+		}
+
+		if ( lpService )
+		{
+			free( lpService );
+		}
+
+		dwBytes = bytesNeeded;
+
+		lpService = ( ENUM_SERVICE_STATUS* ) malloc( dwBytes );
+		require_action( lpService, exit, err = mStatus_NoMemoryErr );
+	}
+
+	err = translate_errno( ok, GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	for ( i = 0; i < srvCount; i++ )
+	{
+		if ( wcscmp( lpService[i].lpServiceName, L"SharedAccess" ) == 0 )
+		{
+			if ( lpService[i].ServiceStatus.dwCurrentState == SERVICE_RUNNING )
+			{
+				isRunning = TRUE;
+			}
+
+			break;
+		}
+	}
+
+	require_action( isRunning, exit, err = kUnknownErr );
+
+	// Check to see if we've managed the firewall.
+	// This package might have been installed, then
+	// the OS was upgraded to SP2 or above.  If that's
+	// the case, then we need to manipulate the firewall
+	// so networking works correctly.
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode, &key );
+	require_noerr( err, exit );
+
+	valueLen = sizeof(DWORD);
+	err = RegQueryValueEx(key, kServiceManageFirewall, 0, &type, (LPBYTE) &value, &valueLen);
+	
+	if ((err != ERROR_SUCCESS) || (value == 0))
+	{
+		wchar_t	fullPath[ MAX_PATH ];
+		DWORD	size;
+
+		// Get a full path to the executable
+
+		size = GetModuleFileNameW( NULL, fullPath, MAX_PATH );
+		err = translate_errno( size > 0, (OSStatus) GetLastError(), kPathErr );
+		require_noerr( err, exit );
+
+		err = mDNSAddToFirewall(fullPath, kServiceFirewallName);
+		require_noerr( err, exit );
+
+		value = 1;
+		err = RegSetValueEx( key, kServiceManageFirewall, 0, REG_DWORD, (const LPBYTE) &value, sizeof( DWORD ) );
+		require_noerr( err, exit );
+	}
+	
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+	
+	if ( lpService )
+	{
+		free( lpService );
+	}
+
+	if ( sc )
+	{
+		CloseServiceHandle ( sc );
+	}
+
+	return( err );
+}
+
+
+
+//===========================================================================================================================
+//	SetServiceInfo
+//===========================================================================================================================
+
+static OSStatus	SetServiceInfo( SC_HANDLE inSCM, LPCTSTR inServiceName, LPCTSTR inDescription )
+{
+	OSStatus				err;
+	SC_LOCK					lock;
+	SC_HANDLE				service;
+	SERVICE_DESCRIPTION		description;
+	SERVICE_FAILURE_ACTIONS	actions;
+	SC_ACTION				action;
+	BOOL					ok;
+	
+	check( inServiceName );
+	check( inDescription );
+	
+	lock 	= NULL;
+	service	= NULL;
+	
+	// Open the database (if not provided) and lock it to prevent other access while re-configuring.
+	
+	if( !inSCM )
+	{
+		inSCM = OpenSCManager( NULL, NULL, SC_MANAGER_ALL_ACCESS );
+		err = translate_errno( inSCM, (OSStatus) GetLastError(), kOpenErr );
+		require_noerr( err, exit );
+	}
+	
+	lock = LockServiceDatabase( inSCM );
+	err = translate_errno( lock, (OSStatus) GetLastError(), kInUseErr );
+	require_noerr( err, exit );
+	
+	// Open a handle to the service. 
+
+	service = OpenService( inSCM, inServiceName, SERVICE_CHANGE_CONFIG|SERVICE_START );
+	err = translate_errno( service, (OSStatus) GetLastError(), kNotFoundErr );
+	require_noerr( err, exit );
+	
+	// Change the description.
+	
+	description.lpDescription = (LPTSTR) inDescription;
+	ok = ChangeServiceConfig2( service, SERVICE_CONFIG_DESCRIPTION, &description );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kParamErr );
+	require_noerr( err, exit );
+	
+	actions.dwResetPeriod	=	INFINITE;
+	actions.lpRebootMsg		=	NULL;
+	actions.lpCommand		=	NULL;
+	actions.cActions		=	1;
+	actions.lpsaActions		=	&action;
+	action.Delay			=	500;
+	action.Type				=	SC_ACTION_RESTART;
+
+	ok = ChangeServiceConfig2( service, SERVICE_CONFIG_FAILURE_ACTIONS, &actions );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kParamErr );
+	require_noerr( err, exit );
+	
+	err = ERROR_SUCCESS;
+	
+exit:
+	// Close the service and release the lock.
+	
+	if( service )
+	{
+		CloseServiceHandle( service );
+	}
+	if( lock )
+	{
+		UnlockServiceDatabase( lock ); 
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	ReportStatus
+//===========================================================================================================================
+
+static void	ReportStatus( int inType, const char *inFormat, ... )
+{
+	if( !gServiceQuietMode )
+	{
+		va_list		args;
+		
+		va_start( args, inFormat );
+		if( gServiceEventSource )
+		{
+			char				s[ 1024 ];
+			BOOL				ok;
+			const char *		array[ 1 ];
+			
+			vsprintf( s, inFormat, args );
+			array[ 0 ] = s;
+			ok = ReportEventA( gServiceEventSource, (WORD) inType, 0, MDNSRESPONDER_LOG, NULL, 1, 0, array, NULL );
+			check_translated_errno( ok, GetLastError(), kUnknownErr );
+		}
+		else
+		{
+			int		n;
+			
+			n = vfprintf( stderr, inFormat, args );
+			check( n >= 0 );
+		}
+		va_end( args );
+	}
+}
+
+//===========================================================================================================================
+//	RunDirect
+//===========================================================================================================================
+
+int	RunDirect( int argc, LPTSTR argv[] )
+{
+	OSStatus		err;
+	BOOL			initialized;
+   BOOL        ok;
+	
+	initialized = FALSE;
+
+	err = SetupServiceEvents();
+	require_noerr( err, exit );
+
+	// Install a Console Control Handler to handle things like control-c signals.
+	
+	ok = SetConsoleCtrlHandler( ConsoleControlHandler, TRUE );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	err = ServiceSpecificInitialize( argc, argv );
+	require_noerr( err, exit );
+	initialized = TRUE;
+	
+	// Run the service. This does not return until the service quits or is stopped.
+	
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "Running service directly\n" );
+	
+	err = ServiceSpecificRun( argc, argv );
+	require_noerr( err, exit );
+	
+	// Clean up.
+	
+exit:
+	if( initialized )
+	{
+		ServiceSpecificFinalize( argc, argv );
+	}
+
+	TearDownServiceEvents();
+
+	return( err );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	ServiceMain
+//===========================================================================================================================
+
+static void WINAPI ServiceMain( DWORD argc, LPTSTR argv[] )
+{
+	OSStatus		err;
+	BOOL			ok;
+
+	err = SetupServiceEvents();
+	require_noerr( err, exit );
+	
+	err = ServiceSetupEventLogging();
+	check_noerr( err );
+
+	err = GetServiceParameters();
+	check_noerr( err );
+	
+	// Initialize the service status and register the service control handler with the name of the service.
+	
+	gServiceStatus.dwServiceType 				= SERVICE_WIN32_SHARE_PROCESS;
+	gServiceStatus.dwCurrentState 				= 0;
+	gServiceStatus.dwControlsAccepted 			= SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN|SERVICE_ACCEPT_POWEREVENT;
+	gServiceStatus.dwWin32ExitCode 				= NO_ERROR;
+	gServiceStatus.dwServiceSpecificExitCode 	= NO_ERROR;
+	gServiceStatus.dwCheckPoint 				= 0;
+	gServiceStatus.dwWaitHint 					= 0;
+	
+	gServiceStatusHandle = RegisterServiceCtrlHandlerEx( argv[ 0 ], ServiceControlHandler, NULL );
+	err = translate_errno( gServiceStatusHandle, (OSStatus) GetLastError(), kInUseErr );
+	require_noerr( err, exit );
+	
+	// Mark the service as starting.
+
+	gServiceStatus.dwCurrentState 	= SERVICE_START_PENDING;
+	gServiceStatus.dwCheckPoint	 	= 0;
+	gServiceStatus.dwWaitHint 		= 5000;	// 5 seconds
+	ok = SetServiceStatus( gServiceStatusHandle, &gServiceStatus );
+	check_translated_errno( ok, GetLastError(), kParamErr );
+	
+	// Run the service. This does not return until the service quits or is stopped.
+	
+	err = ServiceRun( (int) argc, argv );
+	if( err != kNoErr )
+	{
+		gServiceStatus.dwWin32ExitCode				= ERROR_SERVICE_SPECIFIC_ERROR;
+		gServiceStatus.dwServiceSpecificExitCode 	= (DWORD) err;
+	}
+	
+	// Service-specific work is done so mark the service as stopped.
+	
+	gServiceStatus.dwCurrentState = SERVICE_STOPPED;
+	ok = SetServiceStatus( gServiceStatusHandle, &gServiceStatus );
+	check_translated_errno( ok, GetLastError(), kParamErr );
+	
+	// Note: The service status handle should not be closed according to Microsoft documentation.
+	
+exit:
+
+	if( gServiceEventSource )
+	{
+		ok = DeregisterEventSource( gServiceEventSource );
+		check_translated_errno( ok, GetLastError(), kUnknownErr );
+		gServiceEventSource = NULL;
+	}
+
+	TearDownServiceEvents();
+}
+
+//===========================================================================================================================
+//	ServiceSetupEventLogging
+//===========================================================================================================================
+
+static OSStatus	ServiceSetupEventLogging( void )
+{
+	OSStatus			err;
+	HKEY				key;
+	LPCTSTR				s;
+	DWORD				typesSupported;
+	TCHAR				path[ MAX_PATH ];
+	DWORD 				n;
+	
+	key = NULL;
+	
+	// Add/Open source name as a sub-key under the Application key in the EventLog registry key.
+
+	s = TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\") kServiceName;
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, s, &key );
+	require_noerr( err, exit );
+	
+	// Add the name to the EventMessageFile subkey.
+
+	path[ 0 ] = '\0';
+	GetModuleFileName( NULL, path, MAX_PATH );
+	n = (DWORD) ( ( StrLen( path ) + 1 ) * sizeof( TCHAR ) );
+	err = RegSetValueEx( key, TEXT("EventMessageFile"), 0, REG_EXPAND_SZ, (const LPBYTE) path, n );
+	require_noerr( err, exit );
+	
+	// Set the supported event types in the TypesSupported subkey.
+	
+	typesSupported = 0 
+					 | EVENTLOG_SUCCESS
+					 | EVENTLOG_ERROR_TYPE
+					 | EVENTLOG_WARNING_TYPE
+					 | EVENTLOG_INFORMATION_TYPE
+					 | EVENTLOG_AUDIT_SUCCESS
+					 | EVENTLOG_AUDIT_FAILURE; 
+	err = RegSetValueEx( key, TEXT("TypesSupported"), 0, REG_DWORD, (const LPBYTE) &typesSupported, sizeof( DWORD ) );
+	require_noerr( err, exit );
+	
+	// Set up the event source.
+	
+	gServiceEventSource = RegisterEventSource( NULL, kServiceName );
+	err = translate_errno( gServiceEventSource, (OSStatus) GetLastError(), kParamErr );
+	require_noerr( err, exit );
+		
+exit:
+	if( key )
+	{
+		RegCloseKey( key );
+	}
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	ServiceControlHandler
+//===========================================================================================================================
+
+static DWORD WINAPI	ServiceControlHandler( DWORD inControl, DWORD inEventType, LPVOID inEventData, LPVOID inContext )
+{
+	BOOL		setStatus;
+	OSStatus	err;
+	BOOL		ok;
+
+	DEBUG_UNUSED( inEventData );
+	DEBUG_UNUSED( inContext );
+	
+	setStatus = TRUE;
+	switch( inControl )
+	{
+		case SERVICE_CONTROL_STOP:
+		case SERVICE_CONTROL_SHUTDOWN:
+			
+			dlog( kDebugLevelInfo, DEBUG_NAME "ServiceControlHandler: SERVICE_CONTROL_STOP|SERVICE_CONTROL_SHUTDOWN\n" );
+			
+			ServiceStop();
+			setStatus = FALSE;
+			break;
+		
+		case SERVICE_CONTROL_POWEREVENT:
+
+			if (inEventType == PBT_APMSUSPEND)
+			{
+				dlog( kDebugLevelInfo, DEBUG_NAME "ServiceControlHandler: PBT_APMSUSPEND\n" );
+
+				if ( gPowerSuspendEvent )
+				{
+					ok = SetEvent( gPowerSuspendEvent );
+					err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+					check_noerr( err );
+
+					switch ( WaitForSingleObject( gPowerSuspendAckEvent, 5 * 1000 ) )
+					{
+						case WAIT_OBJECT_0:
+						{
+							// No error
+						}
+						break;
+
+						case WAIT_TIMEOUT:
+						{
+							dlog( kDebugLevelError, DEBUG_NAME "Timed out waiting for acknowledgement of machine sleep\n" );
+							ReportStatus( EVENTLOG_ERROR_TYPE, "Timed out waiting for acknowledgement of machine sleep" );
+						}
+						break;
+
+						default:
+						{
+							dlog( kDebugLevelError, DEBUG_NAME "Error waiting for acknowledgement of machine sleep: %d", GetLastError() );
+							ReportStatus( EVENTLOG_ERROR_TYPE, "Error waiting for acknowledgement of machine sleep: %d", GetLastError() );
+						}
+						break;
+					}
+				}
+			}
+			else if (inEventType == PBT_APMRESUMESUSPEND)
+			{
+				dlog( kDebugLevelInfo, DEBUG_NAME "ServiceControlHandler: PBT_APMRESUMESUSPEND\n" );
+
+				if ( gPowerResumeEvent )
+				{
+					ok = SetEvent( gPowerResumeEvent );
+					err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+					check_noerr( err );
+				}
+			}
+		
+			break;
+
+		default:
+			dlog( kDebugLevelNotice, DEBUG_NAME "ServiceControlHandler: event (0x%08X)\n", inControl );
+			break;
+	}
+	
+	if( setStatus && gServiceStatusHandle )
+	{
+		ok = SetServiceStatus( gServiceStatusHandle, &gServiceStatus );
+		check_translated_errno( ok, GetLastError(), kUnknownErr );
+	}
+
+	return NO_ERROR;
+}
+
+//===========================================================================================================================
+//	ServiceRun
+//===========================================================================================================================
+
+static OSStatus	ServiceRun( int argc, LPTSTR argv[] )
+{
+	OSStatus		err;
+	BOOL			initialized;
+	BOOL			ok;
+	
+	DEBUG_UNUSED( argc );
+	DEBUG_UNUSED( argv );
+	
+	initialized = FALSE;
+	
+	// <rdar://problem/5727548> Make the service as running before we call ServiceSpecificInitialize. We've
+	// had reports that some machines with McAfee firewall installed cause a problem with iTunes installation.
+	// We think that the firewall product is interferring with code in ServiceSpecificInitialize. So as a
+	// simple workaround, we'll mark us as running *before* we call ServiceSpecificInitialize. This will unblock
+	// any installers that are waiting for our state to change.
+
+	gServiceStatus.dwCurrentState = SERVICE_RUNNING;
+	ok = SetServiceStatus( gServiceStatusHandle, &gServiceStatus );
+	check_translated_errno( ok, GetLastError(), kParamErr );
+
+	// Initialize the service-specific stuff
+	
+	while ( 1 )
+	{
+		DWORD ret;
+
+		ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service initializing" );
+
+		err = ServiceSpecificInitialize( argc, argv );
+
+		if ( !err )
+		{
+			ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service initialized" );
+			break;
+		}
+
+		ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service initialization failed with err %d. Waiting %d seconds to retry...", err, kWaitToRetry );
+
+		ret = WaitForSingleObject( gStopEvent, 1000 * kWaitToRetry );
+
+		if ( ret == WAIT_OBJECT_0 )
+		{
+			ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service received a stop event" );
+			goto exit;
+		}
+		else if ( ret == WAIT_OBJECT_0 + 1 )
+		{
+			ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service received a power suspend event" );
+		}
+		else if ( ret == WAIT_OBJECT_0 + 2 )
+		{
+			ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service received a power resume event" );
+		}
+		else if ( ret != WAIT_TIMEOUT )
+		{
+			ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service received an error in WaitForSingleObject() : %d, %d", ret, GetLastError() );
+			goto exit;
+		}
+	}
+
+	initialized = TRUE;
+	
+	err = CheckFirewall();
+	check_noerr( err );
+
+	if ( err )
+	{
+		gRetryFirewall = TRUE;
+	}
+	
+	// Run the service-specific stuff. This does not return until the service quits or is stopped.
+
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service started\n" );
+
+	err = ServiceSpecificRun( argc, argv );
+	require_noerr( err, exit );
+
+exit:
+
+	// Service stopped. Clean up and we're done.
+	
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "Service stopped (%d)\n", err );
+	
+	if( initialized )
+	{
+		ServiceSpecificFinalize( argc, argv );
+	}
+	
+	return( err );
+}
+
+//===========================================================================================================================
+//	ServiceStop
+//===========================================================================================================================
+
+static void	ServiceStop( void )
+{
+	BOOL			ok;
+	OSStatus		err;
+	
+	// Signal the event to cause the service to exit.
+	
+	if( gServiceStatusHandle )
+	{
+		gServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+		ok = SetServiceStatus( gServiceStatusHandle, &gServiceStatus );
+		check_translated_errno( ok, GetLastError(), kParamErr );
+	}
+		
+	err = ServiceSpecificStop();
+	check_noerr( err );
+}
+
+
+#if 0
+#pragma mark -
+#pragma mark == Service Specific ==
+#endif
+
+//===========================================================================================================================
+//	ServiceSpecificInitialize
+//===========================================================================================================================
+
+static OSStatus	ServiceSpecificInitialize( int argc, LPTSTR argv[] )
+{
+	OSStatus err;
+	
+	DEBUG_UNUSED( argc );
+	DEBUG_UNUSED( argv );
+	
+	mDNSPlatformMemZero( &gMDNSRecord, sizeof gMDNSRecord);
+	mDNSPlatformMemZero( &gPlatformStorage, sizeof gPlatformStorage);
+
+	gPlatformStorage.reportStatusFunc = ReportStatus;
+
+	err = mDNS_Init( &gMDNSRecord, &gPlatformStorage, gRRCache, RR_CACHE_SIZE, mDNS_Init_AdvertiseLocalAddresses, CoreCallback, mDNS_Init_NoInitCallbackContext); 
+	require_noerr( err, exit);
+
+	err = SetupNotifications();
+	check_noerr( err );
+
+	err = udsserver_init(mDNSNULL, 0);
+	require_noerr( err, exit);
+
+	SetLLRoute( &gMDNSRecord );
+
+exit:
+	if( err != kNoErr )
+	{
+		ServiceSpecificFinalize( argc, argv );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	ServiceSpecificRun
+//===========================================================================================================================
+
+static OSStatus	ServiceSpecificRun( int argc, LPTSTR argv[] )
+{
+	mDNSBool done = mDNSfalse;
+	mStatus err = mStatus_NoError;
+	
+	DEBUG_UNUSED( argc );
+	DEBUG_UNUSED( argv );
+
+	err = SetupInterfaceList( &gMDNSRecord );
+	check( !err );
+
+	err = uDNS_SetupDNSConfig( &gMDNSRecord );
+	check( !err );
+
+	while( !done )
+	{
+		static mDNSs32 RepeatedBusy = 0;	
+		mDNSs32 nextTimerEvent;
+		mStatus err;
+
+		// Give the mDNS core a chance to do its work and determine next event time.
+
+		nextTimerEvent = udsserver_idle( mDNS_Execute( &gMDNSRecord ) - mDNS_TimeNow( &gMDNSRecord ) );
+
+		if      ( nextTimerEvent < 0)					nextTimerEvent = 0;
+		else if ( nextTimerEvent > (0x7FFFFFFF / 1000))	nextTimerEvent = 0x7FFFFFFF / mDNSPlatformOneSecond;
+		else											nextTimerEvent = ( nextTimerEvent * 1000) / mDNSPlatformOneSecond;
+
+		// Debugging sanity check, to guard against CPU spins
+			
+		if ( nextTimerEvent > 0 )
+		{
+			RepeatedBusy = 0;
+		}
+		else
+		{
+			nextTimerEvent = 1;
+
+			if ( ++RepeatedBusy >= mDNSPlatformOneSecond )
+			{
+				ShowTaskSchedulingError( &gMDNSRecord );
+				RepeatedBusy = 0;
+			}
+		}
+
+		if ( gMDNSRecord.ShutdownTime )
+		{
+			mDNSs32 now = mDNS_TimeNow( &gMDNSRecord );
+
+			if ( mDNS_ExitNow( &gMDNSRecord, now ) )
+			{
+				mDNS_FinalExit( &gMDNSRecord );
+				done = TRUE;
+				break;
+			}
+
+			if ( nextTimerEvent - gMDNSRecord.ShutdownTime >= 0 )
+			{
+				nextTimerEvent = gMDNSRecord.ShutdownTime;
+			}
+		}
+
+		err = mDNSPoll( nextTimerEvent );
+
+		if ( err )
+		{
+			Sleep( 3 * 1000 );
+				
+			err = SetupInterfaceList( &gMDNSRecord );
+			check( !err );
+
+			err = uDNS_SetupDNSConfig( &gMDNSRecord );
+			check( !err );
+				
+			break;
+		}
+	}
+
+	return ( err );
+}
+
+
+//===========================================================================================================================
+//	ServiceSpecificStop
+//===========================================================================================================================
+
+static OSStatus	ServiceSpecificStop( void )
+{
+	OSStatus    err;
+	BOOL        ok;
+
+	ok = SetEvent(gStopEvent);
+	err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+
+	return( err );
+}
+
+//===========================================================================================================================
+//	ServiceSpecificFinalize
+//===========================================================================================================================
+
+static void	ServiceSpecificFinalize( int argc, LPTSTR argv[] )
+{
+	DEBUG_UNUSED( argc );
+	DEBUG_UNUSED( argv );
+	
+	//
+	// clean up the notifications
+	//
+	TearDownNotifications();
+
+	//
+	// clean up loaded library
+	//
+
+	if( gIPHelperLibraryInstance )
+	{
+		gGetIpInterfaceEntryFunctionPtr = NULL;
+		
+		FreeLibrary( gIPHelperLibraryInstance );
+		gIPHelperLibraryInstance = NULL;
+	}
+}
+
+
+//===========================================================================================================================
+//	SetupServiceEvents
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupServiceEvents()
+{
+	mStatus err;
+	
+	// Stop Event
+
+	gStopEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gStopEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( err )
+	{
+		TearDownServiceEvents();
+	}
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	TearDownServiceNotifications
+//===========================================================================================================================
+
+mDNSlocal mStatus	TearDownServiceEvents()
+{
+	if ( gStopEvent )
+	{
+		CloseHandle( gStopEvent );
+		gStopEvent = NULL;
+	}
+
+	return mStatus_NoError;
+}
+
+
+//===========================================================================================================================
+//	SetupNotifications
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupNotifications()
+{
+	mStatus				err;
+	SocketRef			sock;
+	unsigned long		param;
+	int					inBuffer;
+	int					outBuffer;
+	DWORD				outSize;
+
+	require_action( gStopEvent, exit, err = kUnknownErr );
+	err = mDNSPollRegisterEvent( gStopEvent, StopNotification, NULL );
+	require_noerr( err, exit );
+
+	// Power Suspend
+
+	gPowerSuspendEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gPowerSuspendEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gPowerSuspendEvent, PowerSuspendNotification, NULL );
+	require_noerr( err, exit );
+
+	// Power Suspend Ack
+
+	gPowerSuspendAckEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+	err = translate_errno( gPowerSuspendAckEvent, ( mStatus ) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// Power Resume
+
+	gPowerResumeEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gPowerResumeEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gPowerResumeEvent, PowerResumeNotification, NULL );
+	require_noerr( err, exit );
+
+	// Register to listen for address list changes.
+	
+	sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+	err = translate_errno( IsValidSocket( sock ), errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+	gInterfaceListChangedSocket = sock;
+	
+	// Make the socket non-blocking so the WSAIoctl returns immediately with WSAEWOULDBLOCK. It will set the event 
+	// when a change to the interface list is detected.
+	
+	param = 1;
+	err = ioctlsocket( sock, FIONBIO, &param );
+	err = translate_errno( err == 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	inBuffer	= 0;
+	outBuffer	= 0;
+	err = WSAIoctl( sock, SIO_ADDRESS_LIST_CHANGE, &inBuffer, 0, &outBuffer, 0, &outSize, NULL, NULL );
+	if( err < 0 )
+	{
+		check( errno_compat() == WSAEWOULDBLOCK );
+	}
+
+	err = mDNSPollRegisterSocket( sock, FD_ADDRESS_LIST_CHANGE, InterfaceListNotification, NULL );
+	require_noerr( err, exit );
+	
+	gDescChangedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+	err = translate_errno( gDescChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	err = RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Services\\lanmanserver\\parameters"), 0, KEY_READ, &gDescKey);
+	check_translated_errno( err == 0, errno_compat(), kNameErr );
+
+	if ( gDescKey != NULL )
+	{
+		err = RegNotifyChangeKeyValue( gDescKey, TRUE, REG_NOTIFY_CHANGE_LAST_SET, gDescChangedEvent, TRUE);
+		require_noerr( err, exit );
+	}
+
+	err = mDNSPollRegisterEvent( gDescChangedEvent, ComputerDescriptionNotification, NULL );
+	require_noerr( err, exit );
+
+	// This will catch all changes to tcp/ip networking, including changes to the domain search list
+
+	gTcpipChangedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gTcpipChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"), &gTcpipKey );
+	require_noerr( err, exit );
+	err = RegNotifyChangeKeyValue( gTcpipKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gTcpipChangedEvent, TRUE);
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gTcpipChangedEvent, TCPChangedNotification, NULL );
+	require_noerr( err, exit );
+
+	// This will catch all changes to ddns configuration
+
+	gDdnsChangedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gDdnsChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode TEXT("\\DynDNS\\Setup"), &gDdnsKey );
+	require_noerr( err, exit );
+	err = RegNotifyChangeKeyValue( gDdnsKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gDdnsChangedEvent, TRUE);
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gDdnsChangedEvent, DDNSChangedNotification, NULL );
+	require_noerr( err, exit );
+
+	// This will catch all changes to file sharing
+
+	gFileSharingChangedEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+	err = translate_errno( gFileSharingChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Services\\lanmanserver\\Shares"), &gFileSharingKey );
+	
+	// Just to make sure that initialization doesn't fail on some old OS
+	// that doesn't have this key, we'll only add the notification if
+	// the key exists.
+
+	if ( !err )
+	{
+		err = RegNotifyChangeKeyValue( gFileSharingKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gFileSharingChangedEvent, TRUE);
+		require_noerr( err, exit );
+		err = mDNSPollRegisterEvent( gFileSharingChangedEvent, FileSharingChangedNotification, NULL );
+		require_noerr( err, exit );
+	}
+	else
+	{
+		err = mStatus_NoError;
+	}
+
+	// This will catch changes to the Windows firewall
+
+	gFirewallChangedEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+	err = translate_errno( gFirewallChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+
+	// Just to make sure that initialization doesn't fail on some old OS
+	// that doesn't have this key, we'll only add the notification if
+	// the key exists.
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Services\\SharedAccess\\Parameters\\FirewallPolicy\\FirewallRules"), &gFirewallKey );
+	
+	if ( !err )
+	{
+		err = RegNotifyChangeKeyValue( gFirewallKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gFirewallChangedEvent, TRUE);
+		require_noerr( err, exit );
+		err = mDNSPollRegisterEvent( gFirewallChangedEvent, FirewallChangedNotification, NULL );
+		require_noerr( err, exit );
+	}
+	else
+	{
+		err = mStatus_NoError;
+	}
+
+	// This will catch all changes to advertised services configuration
+
+	gAdvertisedServicesChangedEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	err = translate_errno( gAdvertisedServicesChangedEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode TEXT("\\Services"), &gAdvertisedServicesKey );
+	require_noerr( err, exit );
+	err = RegNotifyChangeKeyValue( gAdvertisedServicesKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gAdvertisedServicesChangedEvent, TRUE);
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gAdvertisedServicesChangedEvent, AdvertisedServicesChangedNotification, NULL );
+	require_noerr( err, exit );
+
+	// SPSWakeup timer
+
+	gSPSWakeupEvent = CreateWaitableTimer( NULL, FALSE, NULL );
+	err = translate_errno( gSPSWakeupEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gSPSWakeupEvent, SPSWakeupNotification, NULL );
+	require_noerr( err, exit );
+
+	// SPSSleep timer
+
+	gSPSSleepEvent = CreateWaitableTimer( NULL, FALSE, NULL );
+	err = translate_errno( gSPSSleepEvent, (mStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	err = mDNSPollRegisterEvent( gSPSSleepEvent, SPSSleepNotification, NULL );
+	require_noerr( err, exit );
+
+exit:
+	if( err )
+	{
+		TearDownNotifications();
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	TearDownNotifications
+//===========================================================================================================================
+
+mDNSlocal mStatus	TearDownNotifications()
+{
+	if( IsValidSocket( gInterfaceListChangedSocket ) )
+	{
+		mDNSPollUnregisterSocket( gInterfaceListChangedSocket );
+
+		close_compat( gInterfaceListChangedSocket );
+		gInterfaceListChangedSocket = kInvalidSocketRef;
+	}
+
+	if ( gDescChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gDescChangedEvent );
+		CloseHandle( gDescChangedEvent );
+		gDescChangedEvent = NULL;
+	}
+
+	if ( gDescKey != NULL )
+	{
+		RegCloseKey( gDescKey );
+		gDescKey = NULL;
+	}
+
+	if ( gTcpipChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gTcpipChangedEvent );
+		CloseHandle( gTcpipChangedEvent );
+		gTcpipChangedEvent = NULL;
+	}
+
+	if ( gDdnsChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gDdnsChangedEvent );
+		CloseHandle( gDdnsChangedEvent );
+		gDdnsChangedEvent = NULL;
+	}
+
+	if ( gDdnsKey != NULL )
+	{
+		RegCloseKey( gDdnsKey );
+		gDdnsKey = NULL;
+	}
+
+	if ( gFileSharingChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gFileSharingChangedEvent );
+		CloseHandle( gFileSharingChangedEvent );
+		gFileSharingChangedEvent = NULL;
+	}
+
+	if ( gFileSharingKey != NULL )
+	{
+		RegCloseKey( gFileSharingKey );
+		gFileSharingKey = NULL;
+	}
+
+	if ( gFirewallChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gFirewallChangedEvent );
+		CloseHandle( gFirewallChangedEvent );
+		gFirewallChangedEvent = NULL;
+	}
+
+	if ( gFirewallKey != NULL )
+	{
+		RegCloseKey( gFirewallKey );
+		gFirewallKey = NULL;
+	}
+
+	if ( gAdvertisedServicesChangedEvent != NULL )
+	{
+		mDNSPollUnregisterEvent( gAdvertisedServicesChangedEvent );
+		CloseHandle( gAdvertisedServicesChangedEvent );
+		gAdvertisedServicesChangedEvent = NULL;
+	}
+
+	if ( gAdvertisedServicesKey != NULL )
+	{
+		RegCloseKey( gAdvertisedServicesKey );
+		gAdvertisedServicesKey = NULL;
+	}
+
+	if ( gSPSWakeupEvent )
+	{
+		mDNSPollUnregisterEvent( gSPSWakeupEvent );
+		CloseHandle( gSPSWakeupEvent );
+		gSPSWakeupEvent = NULL;
+	}
+
+	if ( gSPSSleepEvent )
+	{
+		mDNSPollUnregisterEvent( gSPSSleepEvent );
+		CloseHandle( gSPSSleepEvent );
+		gSPSSleepEvent = NULL;
+	}
+
+	if ( gPowerResumeEvent )
+	{
+		mDNSPollUnregisterEvent( gPowerResumeEvent );
+		CloseHandle( gPowerResumeEvent );
+		gPowerResumeEvent = NULL;
+	}
+
+	if ( gPowerSuspendAckEvent )
+	{
+		CloseHandle( gPowerSuspendAckEvent );
+		gPowerSuspendAckEvent = NULL;
+	}
+
+	if ( gPowerSuspendEvent )
+	{
+		mDNSPollUnregisterEvent( gPowerSuspendEvent );
+		CloseHandle( gPowerSuspendEvent );
+		gPowerSuspendEvent = NULL;
+	}
+
+	if ( gStopEvent )
+	{
+		mDNSPollUnregisterEvent( gStopEvent );
+	}
+
+	return( mStatus_NoError );
+}
+
+
+mDNSlocal void CALLBACK
+StopNotification( HANDLE event, void *context )
+{
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	dlog( kDebugLevelVerbose, DEBUG_NAME "stopping...\n" );
+	udsserver_exit();
+	mDNS_StartExit( &gMDNSRecord );
+}
+
+
+mDNSlocal void CALLBACK
+PowerSuspendNotification( HANDLE event, void * context )
+{
+	LARGE_INTEGER	timeout;
+	BOOL			ok;
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	dlog( kDebugLevelInfo, DEBUG_NAME "PowerSuspendNotification\n" );
+
+	gMDNSRecord.SystemWakeOnLANEnabled = SystemWakeForNetworkAccess( &timeout );
+				
+	if ( gMDNSRecord.SystemWakeOnLANEnabled )
+	{
+		ok = SetWaitableTimer( gSPSWakeupEvent, &timeout, 0, NULL, NULL, TRUE );
+		check( ok );
+	}
+
+	mDNSCoreMachineSleep(&gMDNSRecord, TRUE);
+
+	ok = SetEvent( gPowerSuspendAckEvent );
+
+	if ( !ok )
+	{
+		dlog( kDebugLevelError, DEBUG_NAME "PowerSuspendNotification: error while setting acknowledgement: %d", GetLastError() );
+		ReportStatus( EVENTLOG_ERROR_TYPE, "PowerSuspendNotification: error while setting acknowledgement: %d", GetLastError() );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+PowerResumeNotification( HANDLE event, void * context )
+{
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	dlog( kDebugLevelInfo, DEBUG_NAME "PowerResumeNotification\n" );
+
+	if ( gSPSWakeupEvent )
+	{
+		CancelWaitableTimer( gSPSWakeupEvent );
+	}
+
+	if ( gSPSSleepEvent )
+	{
+		CancelWaitableTimer( gSPSSleepEvent );
+	}
+
+	mDNSCoreMachineSleep(&gMDNSRecord, FALSE);
+}
+
+
+
+mDNSlocal void CALLBACK
+InterfaceListNotification( SOCKET socket, LPWSANETWORKEVENTS event, void *context )
+{
+	int		inBuffer;
+	int		outBuffer;
+	DWORD	outSize;
+	int		err;
+
+	DEBUG_UNUSED( socket );
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	// It would be nice to come up with a more elegant solution to this, but it seems that
+	// GetAdaptersAddresses doesn't always stay in sync after network changed events.  So as
+	// as a simple workaround, we'll pause for a couple of seconds before processing the change.
+
+	// We arrived at 2 secs by trial and error. We could reproduce the problem after sleeping
+	// for 500 msec and 750 msec, but couldn't after sleeping for 1 sec.  We added another
+	// second on top of that to account for machine load or some other exigency.
+
+	Sleep( 2000 );
+
+	// Interface list changed event. Break out of the inner loop to re-setup the wait list.
+					
+	InterfaceListDidChange( &gMDNSRecord );
+
+	// reset the event handler
+	inBuffer	= 0;
+	outBuffer	= 0;
+	err = WSAIoctl( gInterfaceListChangedSocket, SIO_ADDRESS_LIST_CHANGE, &inBuffer, 0, &outBuffer, 0, &outSize, NULL, NULL );
+	if( err < 0 )
+	{
+		check( errno_compat() == WSAEWOULDBLOCK );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+ComputerDescriptionNotification( HANDLE event, void *context )
+{
+	// The computer description might have changed
+					
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	ComputerDescriptionDidChange( &gMDNSRecord );
+	udsserver_handle_configchange( &gMDNSRecord );
+
+	// and reset the event handler
+	if ( ( gDescKey != NULL ) && ( gDescChangedEvent != NULL ) )
+	{
+		int err = RegNotifyChangeKeyValue( gDescKey, TRUE, REG_NOTIFY_CHANGE_LAST_SET, gDescChangedEvent, TRUE);
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+TCPChangedNotification( HANDLE event, void *context )
+{
+	// The TCP/IP might have changed
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	TCPIPConfigDidChange( &gMDNSRecord );
+	udsserver_handle_configchange( &gMDNSRecord );
+
+	// and reset the event handler
+
+	if ( ( gTcpipKey != NULL ) && ( gTcpipChangedEvent ) )
+	{
+		int err = RegNotifyChangeKeyValue( gTcpipKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gTcpipChangedEvent, TRUE );
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+DDNSChangedNotification( HANDLE event, void *context )
+{
+	// The DynDNS config might have changed
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	DynDNSConfigDidChange( &gMDNSRecord );
+	udsserver_handle_configchange( &gMDNSRecord );
+
+	// and reset the event handler
+
+	if ((gDdnsKey != NULL) && (gDdnsChangedEvent))
+	{
+		int err = RegNotifyChangeKeyValue(gDdnsKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gDdnsChangedEvent, TRUE);
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+FileSharingChangedNotification( HANDLE event, void *context )
+{
+	// File sharing changed
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	FileSharingDidChange( &gMDNSRecord );
+
+	// and reset the event handler
+
+	if ((gFileSharingKey != NULL) && (gFileSharingChangedEvent))
+	{
+		int err = RegNotifyChangeKeyValue(gFileSharingKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gFileSharingChangedEvent, TRUE);
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+FirewallChangedNotification( HANDLE event, void *context )
+{
+	// Firewall configuration changed
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	FirewallDidChange( &gMDNSRecord );
+
+	// and reset the event handler
+
+	if ((gFirewallKey != NULL) && (gFirewallChangedEvent))
+	{
+		int err = RegNotifyChangeKeyValue(gFirewallKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gFirewallChangedEvent, TRUE);
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+AdvertisedServicesChangedNotification( HANDLE event, void *context )
+{
+	// Ultimately we'll want to manage multiple services, but right now the only service
+	// we'll be managing is SMB.
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	FileSharingDidChange( &gMDNSRecord );
+
+	// and reset the event handler
+
+	if ( ( gAdvertisedServicesKey != NULL ) && ( gAdvertisedServicesChangedEvent ) )
+	{
+		int err = RegNotifyChangeKeyValue(gAdvertisedServicesKey, TRUE, REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET, gAdvertisedServicesChangedEvent, TRUE);
+		check_noerr( err );
+	}
+}
+
+
+mDNSlocal void CALLBACK
+SPSWakeupNotification( HANDLE event, void *context )
+{
+	LARGE_INTEGER timeout;
+
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "Maintenance wake" );
+
+	timeout.QuadPart  = kSPSMaintenanceWakePeriod;
+	timeout.QuadPart *= kSecondsTo100NSUnits;
+
+	SetWaitableTimer( gSPSSleepEvent, &timeout, 0, NULL, NULL, TRUE );
+}
+
+
+mDNSlocal void CALLBACK
+SPSSleepNotification( HANDLE event, void *context )
+{
+	DEBUG_UNUSED( event );
+	DEBUG_UNUSED( context );
+
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "Returning to sleep after maintenance wake" );
+
+	// Calling SetSuspendState() doesn't invoke our sleep handlers, so we'll
+	// call HandlePowerSuspend() explicity.  This will reset the 
+	// maintenance wake timers.
+
+	PowerSuspendNotification( gPowerSuspendEvent, NULL );
+	SetSuspendState( FALSE, FALSE, FALSE );
+}
+
+
+//===========================================================================================================================
+//	CoreCallback
+//===========================================================================================================================
+
+static void
+CoreCallback(mDNS * const inMDNS, mStatus status)
+{
+	if (status == mStatus_ConfigChanged)
+	{
+		SetLLRoute( inMDNS );
+	}
+}
+
+
+//===========================================================================================================================
+//	UDSAcceptNotification
+//===========================================================================================================================
+
+mDNSlocal void CALLBACK
+UDSAcceptNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )
+{
+	( void ) sock;
+	( void ) event;
+	( void ) context;
+	
+	if ( gUDSCallback )
+	{
+		gUDSCallback( ( int ) gUDSSocket, 0, context );
+	}
+}
+
+
+//===========================================================================================================================
+//	UDSReadNotification
+//===========================================================================================================================
+
+mDNSlocal void CALLBACK
+UDSReadNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )
+{
+	TCPSocket *tcpSock = ( TCPSocket* ) context;
+
+	( void ) sock;
+	( void ) event;
+
+	if ( tcpSock )
+	{
+		tcpSock->userCallback( ( int ) tcpSock->fd, 0, tcpSock->userContext );
+	}
+}
+
+
+//===========================================================================================================================
+//	udsSupportAddFDToEventLoop
+//===========================================================================================================================
+
+mStatus
+udsSupportAddFDToEventLoop( SocketRef fd, udsEventCallback callback, void *context, void **platform_data)
+{
+	mStatus err = mStatus_NoError;
+
+	// We are using some knowledge of what is being passed to us here.  If the fd is a listen socket,
+	// then the "context" parameter is NULL.  If it is an actual read/write socket, then the "context"
+	// parameter is not null.
+
+	if ( context )
+	{
+		TCPSocket * sock;
+
+		sock = malloc( sizeof( TCPSocket ) );
+		require_action( sock, exit, err = mStatus_NoMemoryErr );
+		mDNSPlatformMemZero( sock, sizeof( TCPSocket ) );
+
+		sock->fd				= (SOCKET) fd;
+		sock->userCallback		= callback;
+		sock->userContext		= context;
+		sock->m					= &gMDNSRecord;
+
+		*platform_data = sock;
+
+		err = mDNSPollRegisterSocket( sock->fd, FD_READ | FD_CLOSE, UDSReadNotification, sock );
+		require_noerr( err, exit );
+	}
+	else
+	{
+		gUDSSocket		= fd;
+		gUDSCallback	= callback;
+
+		err = mDNSPollRegisterSocket( gUDSSocket, FD_ACCEPT | FD_CLOSE, UDSAcceptNotification, NULL );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	return err;
+}
+
+
+int
+udsSupportReadFD( SocketRef fd, char *buf, int len, int flags, void *platform_data )
+{
+	TCPSocket	*	sock;
+	mDNSBool		closed;
+	int				ret;
+
+	( void ) flags;
+
+	sock = ( TCPSocket* ) platform_data;
+	require_action( sock, exit, ret = -1 );
+	require_action( sock->fd == fd, exit, ret = -1 );
+
+	ret = mDNSPlatformReadTCP( sock, buf, len, &closed );
+
+	if ( closed )
+	{
+		ret = 0;
+	}
+	else if ( !ret && ( WSAGetLastError() == WSAEWOULDBLOCK ) )
+	{
+		// mDNSPlatformReadTCP will return 0 if it gets WSAEWOULDBLOCK, but
+		// that caller of this routine interprets that as close connection.
+		// We'll fix that by returning -1 in that case.
+
+		ret = -1;
+	}
+
+exit:
+
+	return ret;
+}
+
+
+mStatus
+udsSupportRemoveFDFromEventLoop( SocketRef fd, void *platform_data)		// Note: This also CLOSES the socket
+{
+	mStatus err = kNoErr;
+
+	mDNSPollUnregisterSocket( fd );
+
+	if ( platform_data != NULL )
+	{
+		TCPSocket * sock;
+
+		dlog( kDebugLevelInfo, DEBUG_NAME "session closed\n" );
+		sock = ( TCPSocket* ) platform_data;
+		check( sock->fd == fd );
+		mDNSPlatformTCPCloseConnection( sock );
+	}
+
+	return err;
+}
+
+
+mDNSexport void RecordUpdatedNiceLabel(mDNS *const m, mDNSs32 delay)
+	{
+	(void)m;
+	(void)delay;
+	// No-op, for now
+	}
+
+
+//===========================================================================================================================
+//	SystemWakeForNetworkAccess
+//===========================================================================================================================
+
+mDNSu8
+SystemWakeForNetworkAccess( LARGE_INTEGER * timeout )
+{
+	HKEY					key = NULL;
+	DWORD					dwSize;
+	DWORD					enabled;
+	mDNSu8					ok;
+	SYSTEM_POWER_STATUS		powerStatus;
+	time_t					startTime;
+	time_t					nextWakeupTime;
+	int						delta;
+	DWORD					err;
+
+	dlog( kDebugLevelInfo, DEBUG_NAME "SystemWakeForNetworkAccess\n" );
+
+	// Make sure we have a timer
+
+	require_action( gSPSWakeupEvent != NULL, exit, ok = FALSE );
+	require_action( gSPSSleepEvent != NULL, exit, ok = FALSE );
+
+	// Make sure the user enabled bonjour sleep proxy client 
+	
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Power Management", &key );
+	require_action( !err, exit, ok = FALSE );
+	dwSize = sizeof( DWORD );
+	err = RegQueryValueEx( key, L"Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+	require_action( !err, exit, ok = FALSE );
+	require_action( enabled, exit, ok = FALSE );
+	
+	// Make sure machine is on AC power
+	
+	ok = ( mDNSu8 ) GetSystemPowerStatus( &powerStatus );
+	require_action( ok, exit, ok = FALSE );
+	require_action( powerStatus.ACLineStatus == AC_LINE_ONLINE, exit, ok = FALSE );
+
+	// Now make sure we have a network interface that does wake-on-lan
+
+	ok = ( mDNSu8 ) IsWOMPEnabled( &gMDNSRecord );
+	require_action( ok, exit, ok = FALSE );
+
+	// Now make sure we have advertised services. Doesn't make sense to
+	// enable sleep proxy if we have no multicast services that could
+	// potentially wake us up.
+
+	ok = ( mDNSu8 ) mDNSCoreHaveAdvertisedMulticastServices( &gMDNSRecord );
+	require_action( ok, exit, ok = FALSE );
+
+	// Calculate next wake up time
+
+	startTime		= time( NULL );					// Seconds since midnight January 1, 1970
+	nextWakeupTime	= startTime + ( 120 * 60 );		// 2 hours later
+	
+	if ( gMDNSRecord.p->nextDHCPLeaseExpires < nextWakeupTime )
+	{
+		nextWakeupTime = gMDNSRecord.p->nextDHCPLeaseExpires;
+	}
+
+	// Finally calculate the next relative wakeup time
+
+	delta = ( int )( ( ( double )( nextWakeupTime - startTime ) ) * 0.9 );
+	ReportStatus( EVENTLOG_INFORMATION_TYPE, "enabling sleep proxy client with next maintenance wake in %d seconds", delta );
+
+	// Convert seconds to 100 nanosecond units expected by SetWaitableTimer
+
+	timeout->QuadPart  = -delta;
+	timeout->QuadPart *= kSecondsTo100NSUnits;
+
+	ok = TRUE;
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return ok;
+}
+
+
+//===========================================================================================================================
+//	HaveRoute
+//===========================================================================================================================
+
+static bool
+HaveRoute( PMIB_IPFORWARDROW rowExtant, unsigned long addr, unsigned long metric )
+{
+	PMIB_IPFORWARDTABLE	pIpForwardTable	= NULL;
+	DWORD				dwSize			= 0;
+	BOOL				bOrder			= FALSE;
+	OSStatus			err;
+	bool				found			= false;
+	unsigned long int	i;
+
+	//
+	// Find out how big our buffer needs to be.
+	//
+	err = GetIpForwardTable(NULL, &dwSize, bOrder);
+	require_action( err == ERROR_INSUFFICIENT_BUFFER, exit, err = kUnknownErr );
+
+	//
+	// Allocate the memory for the table
+	//
+	pIpForwardTable = (PMIB_IPFORWARDTABLE) malloc( dwSize );
+	require_action( pIpForwardTable, exit, err = kNoMemoryErr );
+  
+	//
+	// Now get the table.
+	//
+	err = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
+	require_noerr( err, exit );
+
+	//
+	// Search for the row in the table we want.
+	//
+	for ( i = 0; i < pIpForwardTable->dwNumEntries; i++)
+	{
+		if ( ( pIpForwardTable->table[i].dwForwardDest == addr ) && ( !metric || ( pIpForwardTable->table[i].dwForwardMetric1 == metric ) ) )
+		{
+			memcpy( rowExtant, &(pIpForwardTable->table[i]), sizeof(*rowExtant) );
+			found = true;
+			break;
+		}
+	}
+
+exit:
+
+	if ( pIpForwardTable != NULL ) 
+	{
+		free(pIpForwardTable);
+	}
+    
+	return found;
+}
+
+
+//===========================================================================================================================
+//	IsValidAddress
+//===========================================================================================================================
+
+static bool
+IsValidAddress( const char * addr )
+{
+	return ( addr && ( strcmp( addr, "0.0.0.0" ) != 0 ) ) ? true : false;
+}	
+
+
+//===========================================================================================================================
+//	GetAdditionalMetric
+//===========================================================================================================================
+
+static ULONG
+GetAdditionalMetric( DWORD ifIndex )
+{
+	ULONG metric = 0;
+
+	if( !gIPHelperLibraryInstance )
+	{
+		gIPHelperLibraryInstance = LoadLibrary( TEXT( "Iphlpapi" ) );
+
+		gGetIpInterfaceEntryFunctionPtr = 
+				(GetIpInterfaceEntryFunctionPtr) GetProcAddress( gIPHelperLibraryInstance, "GetIpInterfaceEntry" );
+
+		if( !gGetIpInterfaceEntryFunctionPtr )
+		{		
+			BOOL ok;
+				
+			ok = FreeLibrary( gIPHelperLibraryInstance );
+			check_translated_errno( ok, GetLastError(), kUnknownErr );
+			gIPHelperLibraryInstance = NULL;
+		}
+	}
+
+	if ( gGetIpInterfaceEntryFunctionPtr )
+	{
+		MIB_IPINTERFACE_ROW row;
+		DWORD err;
+
+		ZeroMemory( &row, sizeof( MIB_IPINTERFACE_ROW ) );
+		row.Family = AF_INET;
+		row.InterfaceIndex = ifIndex;
+		err = gGetIpInterfaceEntryFunctionPtr( &row );
+		require_noerr( err, exit );
+		metric = row.Metric + 256;
+	}
+
+exit:
+
+	return metric;
+}
+
+
+//===========================================================================================================================
+//	SetLLRoute
+//===========================================================================================================================
+
+static OSStatus
+SetLLRoute( mDNS * const inMDNS )
+{
+	OSStatus err = kNoErr;
+
+	DEBUG_UNUSED( inMDNS );
+
+	//
+	// <rdar://problem/4096464> Don't call SetLLRoute on loopback
+	// <rdar://problem/6885843> Default route on Windows 7 breaks network connectivity
+	// 
+	// Don't mess w/ the routing table on Vista and later OSes, as 
+	// they have a permanent route to link-local addresses. Otherwise,
+	// set a route to link local addresses (169.254.0.0)
+	//
+	if ( ( inMDNS->p->osMajorVersion < 6 ) && gServiceManageLLRouting && !gPlatformStorage.registeredLoopback4 )
+	{
+		DWORD				ifIndex;
+		MIB_IPFORWARDROW	rowExtant;
+		bool				addRoute;
+		MIB_IPFORWARDROW	row;
+
+		ZeroMemory(&row, sizeof(row));
+
+		err = GetRouteDestination(&ifIndex, &row.dwForwardNextHop);
+		require_noerr( err, exit );
+		row.dwForwardDest		= inet_addr(kLLNetworkAddr);
+		row.dwForwardIfIndex	= ifIndex;
+		row.dwForwardMask		= inet_addr(kLLNetworkAddrMask);
+		row.dwForwardType		= 3;
+		row.dwForwardProto		= MIB_IPPROTO_NETMGMT;
+		row.dwForwardAge		= 0;
+		row.dwForwardPolicy		= 0;
+		row.dwForwardMetric1	= 20 + GetAdditionalMetric( ifIndex );
+		row.dwForwardMetric2	= (DWORD) - 1;
+		row.dwForwardMetric3	= (DWORD) - 1;
+		row.dwForwardMetric4	= (DWORD) - 1;
+		row.dwForwardMetric5	= (DWORD) - 1;
+
+		addRoute = true;
+
+		//
+		// check to make sure we don't already have a route
+		//
+		if ( HaveRoute( &rowExtant, inet_addr( kLLNetworkAddr ), 0 ) )
+		{
+			//
+			// set the age to 0 so that we can do a memcmp.
+			//
+			rowExtant.dwForwardAge = 0;
+
+			//
+			// check to see if this route is the same as our route
+			//
+			if (memcmp(&row, &rowExtant, sizeof(row)) != 0)
+			{
+				//
+				// if it isn't then delete this entry
+				//
+				DeleteIpForwardEntry(&rowExtant);
+			}
+			else
+			{
+				//
+				// else it is, so we don't want to create another route
+				//
+				addRoute = false;
+			}
+		}
+
+		if (addRoute && row.dwForwardNextHop)
+		{
+			err = CreateIpForwardEntry(&row);
+			check_noerr( err );
+		}
+	}
+
+exit:
+
+	return ( err );
+}
+
+
+//===========================================================================================================================
+//	GetRouteDestination
+//===========================================================================================================================
+
+static OSStatus
+GetRouteDestination(DWORD * ifIndex, DWORD * address)
+{
+	struct in_addr		ia;
+	IP_ADAPTER_INFO	*	pAdapterInfo	=	NULL;
+	IP_ADAPTER_INFO	*	pAdapter		=	NULL;
+	ULONG				bufLen;
+	mDNSBool			done			=	mDNSfalse;
+	OSStatus			err;
+
+	//
+	// GetBestInterface will fail if there is no default gateway
+	// configured.  If that happens, we will just take the first
+	// interface in the list. MSDN support says there is no surefire
+	// way to manually determine what the best interface might
+	// be for a particular network address.
+	//
+	ia.s_addr	=	inet_addr(kLLNetworkAddr);
+	err			=	GetBestInterface(*(IPAddr*) &ia, ifIndex);
+
+	if (err)
+	{
+		*ifIndex = 0;
+	}
+
+	//
+	// Make an initial call to GetAdaptersInfo to get
+	// the necessary size into the bufLen variable
+	//
+	err = GetAdaptersInfo( NULL, &bufLen);
+	require_action( err == ERROR_BUFFER_OVERFLOW, exit, err = kUnknownErr );
+
+	pAdapterInfo = (IP_ADAPTER_INFO*) malloc( bufLen );
+	require_action( pAdapterInfo, exit, err = kNoMemoryErr );
+	
+	err = GetAdaptersInfo( pAdapterInfo, &bufLen);
+	require_noerr( err, exit );
+	
+	pAdapter	=	pAdapterInfo;
+	err			=	kUnknownErr;
+			
+	// <rdar://problem/3718122>
+	// <rdar://problem/5652098>
+	//
+	// Look for the Nortel VPN virtual interface, along with Juniper virtual interface.
+	//
+	// If these interfaces are active (i.e., has a non-zero IP Address),
+	// then we want to disable routing table modifications.
+
+	while (pAdapter)
+	{
+		if ( ( IsNortelVPN( pAdapter ) || IsJuniperVPN( pAdapter ) || IsCiscoVPN( pAdapter ) ) &&
+			 ( inet_addr( pAdapter->IpAddressList.IpAddress.String ) != 0 ) )
+		{
+			dlog( kDebugLevelTrace, DEBUG_NAME "disabling routing table management due to VPN incompatibility" );
+			goto exit;
+		}
+
+		pAdapter = pAdapter->Next;
+	}
+
+	while ( !done )
+	{
+		pAdapter	=	pAdapterInfo;
+		err			=	kUnknownErr;
+
+		while (pAdapter)
+		{
+			// If we don't have an interface selected, choose the first one that is of type ethernet and
+			// has a valid IP Address
+
+			if ((pAdapter->Type == MIB_IF_TYPE_ETHERNET) && ( IsValidAddress( pAdapter->IpAddressList.IpAddress.String ) ) && (!(*ifIndex) || (pAdapter->Index == (*ifIndex))))
+			{
+				*address =	inet_addr( pAdapter->IpAddressList.IpAddress.String );
+				*ifIndex =  pAdapter->Index;
+				err		 =	kNoErr;
+				break;
+			}
+		
+			pAdapter = pAdapter->Next;
+		}
+
+		// If we found the right interface, or we weren't trying to find a specific interface then we're done
+
+		if ( !err || !( *ifIndex) )
+		{
+			done = mDNStrue;
+		}
+
+		// Otherwise, try again by wildcarding the interface
+
+		else
+		{
+			*ifIndex = 0;
+		}
+	} 
+
+exit:
+
+	if ( pAdapterInfo != NULL )
+	{
+		free( pAdapterInfo );
+	}
+
+	return( err );
+}
+
+
+static bool
+IsNortelVPN( IP_ADAPTER_INFO * pAdapter )
+{
+	return ((pAdapter->Type == MIB_IF_TYPE_ETHERNET) &&
+		    (pAdapter->AddressLength == 6) &&
+		    (pAdapter->Address[0] == 0x44) &&
+		    (pAdapter->Address[1] == 0x45) &&
+		    (pAdapter->Address[2] == 0x53) &&
+		    (pAdapter->Address[3] == 0x54) &&
+		    (pAdapter->Address[4] == 0x42) &&
+			(pAdapter->Address[5] == 0x00)) ? true : false;
+}
+
+
+static bool
+IsJuniperVPN( IP_ADAPTER_INFO * pAdapter )
+{	
+	return ( strnistr( pAdapter->Description, "Juniper", sizeof( pAdapter->Description  ) ) != NULL ) ? true : false;
+}
+
+
+static bool
+IsCiscoVPN( IP_ADAPTER_INFO * pAdapter )
+{
+	return ((pAdapter->Type == MIB_IF_TYPE_ETHERNET) &&
+		    (pAdapter->AddressLength == 6) &&
+		    (pAdapter->Address[0] == 0x00) &&
+		    (pAdapter->Address[1] == 0x05) &&
+		    (pAdapter->Address[2] == 0x9a) &&
+		    (pAdapter->Address[3] == 0x3c) &&
+		    (pAdapter->Address[4] == 0x7a) &&
+			(pAdapter->Address[5] == 0x00)) ? true : false;
+}
+
+
+static const char *
+strnistr( const char * string, const char * subString, size_t max )
+{
+	size_t       subStringLen;
+	size_t       offset;
+	size_t       maxOffset;
+	size_t       stringLen;
+	const char * pPos;
+
+	if ( ( string == NULL ) || ( subString == NULL ) )
+	{
+		return string;
+	}
+
+	stringLen = ( max > strlen( string ) ) ? strlen( string ) : max;
+
+	if ( stringLen == 0 )
+	{
+		return NULL;
+	}
+	
+	subStringLen = strlen( subString );
+
+	if ( subStringLen == 0 )
+	{
+		return string;
+	}
+
+	if ( subStringLen > stringLen )
+	{
+		return NULL;
+	}
+
+	maxOffset = stringLen - subStringLen;
+	pPos      = string;
+
+	for ( offset = 0; offset <= maxOffset; offset++ )
+	{
+		if ( _strnicmp( pPos, subString, subStringLen ) == 0 )
+		{
+			return pPos;
+		}
+
+		pPos++;
+	}
+
+	return NULL;
+}
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.h b/mDNSResponder/mDNSWindows/SystemService/Service.h
new file mode 100755
index 00000000..0b806f00
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef	__MDNS_SERVICE_H__
+#define	__MDNS_SERVICE_H__
+
+
+#include <windows.h>
+
+
+extern int	RunDirect( int argc, LPTSTR argv[] );
+extern int	Main( int argc, LPTSTR argv[] );
+
+
+#endif
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.mcp b/mDNSResponder/mDNSWindows/SystemService/Service.mcp
new file mode 100644
index 00000000..ca155666
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.mcp
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.rc b/mDNSResponder/mDNSWindows/SystemService/Service.rc
new file mode 100644
index 00000000..60ad4847
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.rc
@@ -0,0 +1,114 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+#include "WinVersRes.h"
+#include "EventLog.rc"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "Bonjour Service"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "mDNSResponder.exe"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "mDNSResponder.exe"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "#include ""WinVersRes.h""\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_SERVICE_DESCRIPTION "Enables hardware devices and software services to automatically configure themselves on the network and advertise their presence, so that users can discover and use those services without any unnecessary manual setup or administration."
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.vcproj b/mDNSResponder/mDNSWindows/SystemService/Service.vcproj
new file mode 100644
index 00000000..7db6bc15
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.vcproj
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="mDNSResponder"

+	ProjectGUID="{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}"

+	RootNamespace="mDNSResponder"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../;../../mDNSCore;../../mDNSShared;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;DEBUG=1;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;_USE_32BIT_TIME_T"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				DisableSpecificWarnings="4127;4201"

+				ShowIncludes="false"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib crypt32.lib netapi32.lib powrprof.lib"

+				OutputFile="$(OutDir)/mDNSResponder.exe"

+				LinkIncremental="2"

+				IgnoreAllDefaultLibraries="false"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/mDNSResponder.pdb"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\mDNSResponder.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../;../../mDNSCore;../../mDNSShared;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;DEBUG=1;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				DisableSpecificWarnings="4127;4201"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib crypt32.lib netapi32.lib powrprof.lib"

+				OutputFile="$(OutDir)/mDNSResponder.exe"

+				LinkIncremental="2"

+				IgnoreAllDefaultLibraries="false"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/mDNSResponder.pdb"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\mDNSResponder64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;../;../../mDNSCore;../../mDNSShared;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;_USE_32BIT_TIME_T"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+				DisableSpecificWarnings="4127;4201"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib crypt32.lib netapi32.lib powrprof.lib"

+				OutputFile="$(OutDir)/mDNSResponder.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\mDNSResponder.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal&quot;                                                   mkdir &quot;$(DSTROOT)\AppleInternal&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin&quot;                                            mkdir &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                           &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetDir)$(TargetName).pdb&quot;                                          &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;../;../../mDNSCore;../../mDNSShared;&quot;$(VCInstallDir)include&quot;;&quot;$(VCInstallDir)atlmfc\include&quot;;&quot;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include&quot;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE=&quot;&quot;&quot;&quot;;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4127;4201"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="ws2_32.lib iphlpapi.lib netapi32.lib powrprof.lib"

+				OutputFile="$(OutDir)/mDNSResponder.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+				AdditionalManifestFiles="res\mDNSResponder64.manifest"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal&quot;                                                   mkdir &quot;$(DSTROOT)\AppleInternal&quot;&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\AppleInternal\bin&quot;                                            mkdir &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                           &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetDir)$(TargetName).pdb&quot;                                          &quot;$(DSTROOT)\AppleInternal\bin&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\DNSCommon.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\DNSDigest.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.c"

+				>

+			</File>

+			<File

+				RelativePath=".\EventLog.mc"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						Description="Compiling Message Resource"

+						CommandLine="mc.exe EventLog.mc"

+						Outputs="EventLog.rc EventLog.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						Description="Compiling Message Resource"

+						CommandLine="mc.exe EventLog.mc"

+						Outputs="EventLog.rc EventLog.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						Description="Compiling Message Resource"

+						CommandLine="mc.exe EventLog.mc"

+						Outputs="EventLog.rc EventLog.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						Description="Compiling Message Resource"

+						CommandLine="mc.exe EventLog.mc"

+						Outputs="EventLog.rc EventLog.h"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="Firewall.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSMacOSX\LegacyNATTraversal.c"

+				>

+			</File>

+			<File

+				RelativePath=".\main.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\mDNS.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\mDNSDebug.c"

+				>

+			</File>

+			<File

+				RelativePath="..\mDNSWin32.c"

+				>

+			</File>

+			<File

+				RelativePath="..\Poll.c"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.c"

+				>

+			</File>

+			<File

+				RelativePath=".\Service.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\uDNS.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\uds_daemon.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\DNSCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\dnssd_ipc.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\GenLinkedList.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\mDNSDebug.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\mDNSEmbeddedAPI.h"

+				>

+			</File>

+			<File

+				RelativePath="..\mDNSWin32.h"

+				>

+			</File>

+			<File

+				RelativePath="..\Poll.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Resource.h"

+				>

+			</File>

+			<File

+				RelativePath="..\Secret.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Service.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSCore\uDNS.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\uds_daemon.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\Service.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj b/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj
new file mode 100755
index 00000000..c0eb7a0f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>mDNSResponder</ProjectName>

+    <ProjectGuid>{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}</ProjectGuid>

+    <RootNamespace>mDNSResponder</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../;../../mDNSCore;../../mDNSShared;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;DEBUG=1;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE="";UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <DisableSpecificWarnings>4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <ShowIncludes>false</ShowIncludes>

+      <PrecompiledHeaderFile>

+      </PrecompiledHeaderFile>

+      <PrecompiledHeaderOutputFile>

+      </PrecompiledHeaderOutputFile>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mDNSResponder.exe</OutputFile>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)mDNSResponder.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\mDNSResponder.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../;../../mDNSCore;../../mDNSShared;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;DEBUG=1;MDNS_DEBUGMSGS=0;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE="";UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <DisableSpecificWarnings>4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mDNSResponder.exe</OutputFile>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)mDNSResponder.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\mDNSResponder64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;../;../../mDNSCore;../../mDNSShared;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE="";UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+      <DisableSpecificWarnings>4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;crypt32.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mDNSResponder.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\mDNSResponder.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+if not exist "$(DSTROOT)\AppleInternal"                                                   mkdir "$(DSTROOT)\AppleInternal"

+if not exist "$(DSTROOT)\AppleInternal\bin"                                            mkdir "$(DSTROOT)\AppleInternal\bin"

+xcopy /I/Y "$(TargetPath)"                                                                           "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+xcopy /I/Y "$(TargetDir)$(TargetName).pdb"                                          "$(DSTROOT)\AppleInternal\bin"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;../;../../mDNSCore;../../mDNSShared;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;C:/Program Files/Microsoft SDKs/Windows/v6.1/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;TARGET_OS_WIN32;WIN32_LEAN_AND_MEAN;USE_TCP_LOOPBACK;PLATFORM_NO_STRSEP;PLATFORM_NO_EPIPE;PLATFORM_NO_RLIMIT;PID_FILE="";UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_LEGACY_NAT_TRAVERSAL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;netapi32.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mDNSResponder.exe</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>

+    </Link>

+    <Manifest>

+      <AdditionalManifestFiles>res\mDNSResponder64.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

+    </Manifest>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+if not exist "$(DSTROOT)\AppleInternal"                                                   mkdir "$(DSTROOT)\AppleInternal"

+if not exist "$(DSTROOT)\AppleInternal\bin"                                            mkdir "$(DSTROOT)\AppleInternal\bin"

+xcopy /I/Y "$(TargetPath)"                                                                           "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+xcopy /I/Y "$(TargetDir)$(TargetName).pdb"                                          "$(DSTROOT)\AppleInternal\bin"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSCore\anonymous.c" />

+    <ClCompile Include="..\..\mDNSCore\CryptoAlg.c" />

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="..\..\mDNSCore\DNSCommon.c" />

+    <ClCompile Include="..\..\mDNSCore\DNSDigest.c" />

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c" />

+    <ClCompile Include="Firewall.cpp" />

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c" />

+    <ClCompile Include="..\..\mDNSMacOSX\LegacyNATTraversal.c" />

+    <ClCompile Include="main.c" />

+    <ClCompile Include="..\..\mDNSCore\mDNS.c" />

+    <ClCompile Include="..\..\mDNSShared\mDNSDebug.c" />

+    <ClCompile Include="..\mDNSWin32.c" />

+    <ClCompile Include="..\Poll.c" />

+    <ClCompile Include="..\Secret.c" />

+    <ClCompile Include="Service.c" />

+    <ClCompile Include="..\..\mDNSCore\uDNS.c" />

+    <ClCompile Include="..\..\mDNSShared\uds_daemon.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="EventLog.mc">

+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling Message Resource</Message>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc.exe EventLog.mc</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EventLog.rc EventLog.h;%(Outputs)</Outputs>

+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling Message Resource</Message>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc.exe EventLog.mc</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EventLog.rc EventLog.h;%(Outputs)</Outputs>

+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling Message Resource</Message>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc.exe EventLog.mc</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">EventLog.rc EventLog.h;%(Outputs)</Outputs>

+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling Message Resource</Message>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc.exe EventLog.mc</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">EventLog.rc EventLog.h;%(Outputs)</Outputs>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSCore\anonymous.h" />

+    <ClInclude Include="..\..\mDNSCore\CryptoAlg.h" />

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\mDNSCore\DNSCommon.h" />

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h" />

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h" />

+    <ClInclude Include="..\..\mDNSCore\mDNSDebug.h" />

+    <ClInclude Include="..\..\mDNSCore\mDNSEmbeddedAPI.h" />

+    <ClInclude Include="..\mDNSWin32.h" />

+    <ClInclude Include="..\Poll.h" />

+    <ClInclude Include="Resource.h" />

+    <ClInclude Include="..\Secret.h" />

+    <ClInclude Include="Service.h" />

+    <ClInclude Include="..\..\mDNSCore\uDNS.h" />

+    <ClInclude Include="..\..\mDNSShared\uds_daemon.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="Service.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj.filters b/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj.filters
new file mode 100755
index 00000000..ba41b93b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/Service.vcxproj.filters
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\DNSCommon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\DNSDigest.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\dnssd_ipc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Firewall.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\GenLinkedList.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSMacOSX\LegacyNATTraversal.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="main.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\mDNS.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\mDNSDebug.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\mDNSWin32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\Poll.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\Secret.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Service.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\uDNS.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\uds_daemon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\anonymous.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSCore\CryptoAlg.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\DNSCommon.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\dnssd_ipc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\GenLinkedList.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\mDNSDebug.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\mDNSEmbeddedAPI.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\mDNSWin32.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\Poll.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\Secret.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Service.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\uDNS.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\uds_daemon.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\anonymous.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSCore\CryptoAlg.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="Service.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="EventLog.mc">

+      <Filter>Source Files</Filter>

+    </CustomBuild>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/SystemService/main.c b/mDNSResponder/mDNSWindows/SystemService/main.c
new file mode 100755
index 00000000..33cce9ea
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/main.c
@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Service.h"
+
+
+//===========================================================================================================================
+//	main
+//===========================================================================================================================
+#if defined(UNICODE)
+int __cdecl wmain( int argc, wchar_t * argv[] )
+#else
+int	__cdecl main( int argc, char *argv[] )
+#endif
+{
+	return Main( argc, argv );
+}
+
diff --git a/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder.manifest b/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder.manifest
new file mode 100644
index 00000000..7275854b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.mDNSResponder" type="win32"/>
+	<description>Enables hardware devices and software services to automatically configure themselves and advertise their presence on the network.</description>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder64.manifest b/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder64.manifest
new file mode 100644
index 00000000..13b3998c
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/res/mDNSResponder64.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apple.Bonjour.ControlPanel" type="win32"/>
+	<description>Enables hardware devices and software services to automatically configure themselves and advertise their presence on the network.</description>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+</assembly>
diff --git a/mDNSResponder/mDNSWindows/SystemService/resource.h b/mDNSResponder/mDNSWindows/SystemService/resource.h
new file mode 100644
index 00000000..d968af90
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/resource.h
@@ -0,0 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Service.rc
+//
+
+#define IDS_SERVICE_DESCRIPTION        100
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/SystemService/resrc1.h b/mDNSResponder/mDNSWindows/SystemService/resrc1.h
new file mode 100644
index 00000000..54a6524a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/SystemService/resrc1.h
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Service.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/mDNSResponder/mDNSWindows/VPCDetect.cpp b/mDNSResponder/mDNSWindows/VPCDetect.cpp
new file mode 100755
index 00000000..3df7c141
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/VPCDetect.cpp
@@ -0,0 +1,165 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _WIN32_DCOM
+#include "VPCDetect.h"
+#include "DebugServices.h"
+#include <comdef.h>
+#include <Wbemidl.h>
+
+# pragma comment(lib, "wbemuuid.lib")
+
+static BOOL g_doneCheck = FALSE;
+static BOOL g_isVPC		= FALSE;
+
+
+mStatus
+IsVPCRunning( BOOL * inVirtualPC )
+{
+	IWbemLocator			*	pLoc 		= 0;
+	IWbemServices			*	pSvc 		= 0;
+    IEnumWbemClassObject	*	pEnumerator = NULL;
+	bool						coInit 		= false;
+	HRESULT						hres;
+	SC_HANDLE					scm			= NULL;
+	SC_HANDLE					service		= NULL;
+	SERVICE_STATUS				status;
+	mStatus						err;
+	BOOL						ok          = TRUE;
+
+	// Initialize flag
+
+	*inVirtualPC = FALSE;
+
+	// Find out if WMI is running
+
+	scm = OpenSCManager( 0, 0, SC_MANAGER_CONNECT );
+	err = translate_errno( scm, (OSStatus) GetLastError(), kOpenErr );
+	require_noerr( err, exit );
+
+	service = OpenService( scm, TEXT( "winmgmt" ), SERVICE_QUERY_STATUS );
+	err = translate_errno( service, (OSStatus) GetLastError(), kNotFoundErr );
+	require_noerr( err, exit );
+	
+	ok = QueryServiceStatus( service, &status );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kAuthenticationErr );
+	require_noerr( err, exit );
+	require_action( status.dwCurrentState == SERVICE_RUNNING, exit, err = kUnknownErr );
+	
+    // Initialize COM.
+
+	hres = CoInitializeEx(0, COINIT_MULTITHREADED);
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+	coInit = true;
+
+	// Initialize Security
+
+	hres =  CoInitializeSecurity(NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL );
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+
+                      
+    // Obtain the initial locator to Windows Management on a particular host computer.
+
+    hres = CoCreateInstance( CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID *) &pLoc );
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+ 
+    // Connect to the root\cimv2 namespace with the
+    // current user and obtain pointer pSvc
+    // to make IWbemServices calls.
+
+	hres = pLoc->ConnectServer( _bstr_t(L"ROOT\\CIMV2"), NULL, NULL, 0, WBEM_FLAG_CONNECT_USE_MAX_WAIT, 0, 0, &pSvc );
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+    
+    // Set the IWbemServices proxy so that impersonation
+    // of the user (client) occurs.
+
+	hres = CoSetProxyBlanket( pSvc, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+
+    // Use the IWbemServices pointer to make requests of WMI. 
+    // Make requests here:
+
+	hres = pSvc->ExecQuery( bstr_t("WQL"), bstr_t("SELECT * from Win32_BaseBoard"), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator);
+    
+	require_action( SUCCEEDED( hres ), exit, err = kUnknownErr );
+
+	do
+	{
+		IWbemClassObject* pInstance = NULL;
+		ULONG dwCount = NULL;
+
+		hres = pEnumerator->Next( WBEM_INFINITE, 1, &pInstance, &dwCount);
+
+		if ( pInstance )
+		{
+			VARIANT v;
+			BSTR strClassProp = SysAllocString(L"Manufacturer");
+			HRESULT hr;
+
+			hr = pInstance->Get(strClassProp, 0, &v, 0, 0);
+			SysFreeString(strClassProp);
+
+			// check the HRESULT to see if the action succeeded.
+
+			if (SUCCEEDED(hr) && (V_VT(&v) == VT_BSTR))
+			{
+				wchar_t * wstring = wcslwr( V_BSTR( &v ) );
+
+				if (wcscmp( wstring, L"microsoft corporation" ) == 0 )
+				{
+					*inVirtualPC = TRUE;
+				}
+			}
+		
+			VariantClear(&v);
+		}
+	} while (hres == WBEM_S_NO_ERROR);
+         
+exit:
+ 
+	if ( pSvc != NULL )
+	{
+    	pSvc->Release();
+	}
+
+	if ( pLoc != NULL )
+	{
+    	pLoc->Release();     
+	}
+
+	if ( coInit )
+	{
+    	CoUninitialize();
+	}
+
+	if ( service )
+	{
+		CloseServiceHandle( service );
+	}
+
+	if ( scm )
+	{
+		CloseServiceHandle( scm );
+	}
+
+	if ( *inVirtualPC )
+	{
+		dlog( kDebugLevelTrace, "Virtual PC detected" );
+	}
+
+	return err;
+}
diff --git a/mDNSResponder/mDNSWindows/VPCDetect.h b/mDNSResponder/mDNSWindows/VPCDetect.h
new file mode 100644
index 00000000..9f34beee
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/VPCDetect.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <windows.h>
+#include <mDNSEmbeddedAPI.h>
+
+
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+
+extern mStatus
+IsVPCRunning( BOOL * inVirtualPC );
+
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/mDNSResponder/mDNSWindows/WinServices.cpp b/mDNSResponder/mDNSWindows/WinServices.cpp
new file mode 100644
index 00000000..e47c4688
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/WinServices.cpp
@@ -0,0 +1,93 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "WinServices.h"
+#include <DebugServices.h>
+
+
+//===========================================================================================================================
+//	UTF8StringToStringObject
+//===========================================================================================================================
+
+OSStatus	UTF8StringToStringObject( const char *inUTF8, CString &inObject )
+{
+	OSStatus		err;
+	int				n;
+	BSTR			unicode;
+	
+	unicode = NULL;
+	
+	n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, NULL, 0 );
+	if( n > 0 )
+	{
+		unicode = (BSTR) malloc( (size_t)( n * sizeof( wchar_t ) ) );
+		if( !unicode )
+		{
+			err = ERROR_INSUFFICIENT_BUFFER;
+			goto exit;
+		}
+
+		n = MultiByteToWideChar( CP_UTF8, 0, inUTF8, -1, unicode, n );
+		try
+		{
+			inObject = unicode;
+		}
+		catch( ... )
+		{
+			err = ERROR_NO_UNICODE_TRANSLATION;
+			goto exit;
+		}
+	}
+	else
+	{
+		inObject = "";
+	}
+	err = ERROR_SUCCESS;
+	
+exit:
+	if( unicode )
+	{
+		free( unicode );
+	}
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	UTF8StringToStringObject
+//===========================================================================================================================
+
+OSStatus
+StringObjectToUTF8String( CString &inObject, char* outUTF8, size_t outUTF8Len )
+{
+    OSStatus err = kNoErr;
+
+	memset( outUTF8, 0, outUTF8Len );
+
+	if ( inObject.GetLength() > 0 )
+    {
+		size_t size;
+
+		size = (size_t) WideCharToMultiByte( CP_UTF8, 0, inObject.GetBuffer(), inObject.GetLength(), outUTF8, (int) outUTF8Len, NULL, NULL);
+        err = translate_errno( size != 0, GetLastError(), kUnknownErr );
+        require_noerr( err, exit );
+    }
+
+exit:
+
+	return err;
+}
diff --git a/mDNSResponder/mDNSWindows/WinServices.h b/mDNSResponder/mDNSWindows/WinServices.h
new file mode 100644
index 00000000..f650d1d3
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/WinServices.h
@@ -0,0 +1,34 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#pragma once
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#	include <afxcmn.h>		// MFC support for Windows Common Controls
+#endif
+
+#include <winsock2.h>
+#include <afxsock.h>		// MFC socket extensions
+#include "CommonServices.h"
+
+
+OSStatus	UTF8StringToStringObject( const char *inUTF8, CString &outObject );
+OSStatus	StringObjectToUTF8String( CString &inObject, char* outUTF8, size_t outUTF8Len );
diff --git a/mDNSResponder/mDNSWindows/WinVersRes.h b/mDNSResponder/mDNSWindows/WinVersRes.h
new file mode 100644
index 00000000..d7249be1
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/WinVersRes.h
@@ -0,0 +1,35 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WINRESVERS_H
+#define WINRESVERS_H
+
+#define MASTER_PROD_NAME	"Bonjour"
+
+// Define the company name for mDNSResponder on Windows
+#define MASTER_COMPANY_NAME   "Apple Inc."
+
+// Define the product version for mDNSResponder on Windows
+#define MASTER_PROD_VERS		3,0,0,2
+#define MASTER_PROD_VERS_STR	"3,0,0,2"
+#define MASTER_PROD_VERS_STR2	"3.0.0.2"
+#define MASTER_PROD_VERS_STR3 "Explorer Plugin 3.0.0.2"
+
+// Define the legal copyright
+#define MASTER_LEGAL_COPYRIGHT "Copyright (C) 2003-2011 Apple Inc."
+
+#endif // WINRESVERS_H
diff --git a/mDNSResponder/mDNSWindows/isocode.h b/mDNSResponder/mDNSWindows/isocode.h
new file mode 100755
index 00000000..fe04f312
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/isocode.h
@@ -0,0 +1,135 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* isocode.h                                                             */
+/* ----------------------------------------------------------------------*/
+/* THIS FILE HAS BEEN AUTO-GENERATED.  DO NOT EDIT DIRECTLY              */
+/* If a language needs to be added, edit isocode.txt, and run isocode.pl */
+/* to generate a new version of this file                                */
+/* ----------------------------------------------------------------------*/
+/* ----------------------------------------------------------------------*/
+
+
+unsigned char ISOCODES[] = {
+12, 9, 'e','n', 0 , 0 , 0 , 0 ,
+40, 9, 'e','n', 0 , 0 , 0 , 0 ,
+16, 9, 'e','n', 0 , 0 , 0 , 0 ,
+36, 9, 'e','n', 0 , 0 , 0 , 0 ,
+24, 9, 'e','n', 0 , 0 , 0 , 0 ,
+32, 9, 'e','n', 0 , 0 , 0 , 0 ,
+20, 9, 'e','n', 0 , 0 , 0 , 0 ,
+52, 9, 'e','n', 0 , 0 , 0 , 0 ,
+28, 9, 'e','n', 0 , 0 , 0 , 0 ,
+44, 9, 'e','n', 0 , 0 , 0 , 0 ,
+8, 9, 'e','n', 0 , 0 , 0 , 0 ,
+4, 9, 'e','n', 0 , 0 , 0 , 0 ,
+48, 9, 'e','n', 0 , 0 , 0 , 0 ,
+8, 12, 'f','r', 0 , 0 , 0 , 0 ,
+44, 12, 'f','r', 0 , 0 , 0 , 0 ,
+12, 12, 'f','r', 0 , 0 , 0 , 0 ,
+36, 12, 'f','r', 0 , 0 , 0 , 0 ,
+48, 12, 'f','r', 0 , 0 , 0 , 0 ,
+4, 12, 'f','r', 0 , 0 , 0 , 0 ,
+20, 12, 'f','r', 0 , 0 , 0 , 0 ,
+52, 12, 'f','r', 0 , 0 , 0 , 0 ,
+24, 12, 'f','r', 0 , 0 , 0 , 0 ,
+40, 12, 'f','r', 0 , 0 , 0 , 0 ,
+16, 12, 'f','r', 0 , 0 , 0 , 0 ,
+28, 12, 'f','r', 0 , 0 , 0 , 0 ,
+4, 98, 'f','r', 0 , 0 , 0 , 0 ,
+12, 7, 'd','e', 0 , 0 , 0 , 0 ,
+4, 7, 'd','e', 0 , 0 , 0 , 0 ,
+20, 7, 'd','e', 0 , 0 , 0 , 0 ,
+16, 7, 'd','e', 0 , 0 , 0 , 0 ,
+8, 7, 'd','e', 0 , 0 , 0 , 0 ,
+4, 17, 'j','a', 0 , 0 , 0 , 0 ,
+8, 19, 'n','l', 0 , 0 , 0 , 0 ,
+4, 19, 'n','l', 0 , 0 , 0 , 0 ,
+4, 16, 'i','t', 0 , 0 , 0 , 0 ,
+8, 16, 'i','t', 0 , 0 , 0 , 0 ,
+44, 10, 'e','s', 0 , 0 , 0 , 0 ,
+64, 10, 'e','s', 0 , 0 , 0 , 0 ,
+52, 10, 'e','s', 0 , 0 , 0 , 0 ,
+36, 10, 'e','s', 0 , 0 , 0 , 0 ,
+20, 10, 'e','s', 0 , 0 , 0 , 0 ,
+28, 10, 'e','s', 0 , 0 , 0 , 0 ,
+48, 10, 'e','s', 0 , 0 , 0 , 0 ,
+68, 10, 'e','s', 0 , 0 , 0 , 0 ,
+16, 10, 'e','s', 0 , 0 , 0 , 0 ,
+72, 10, 'e','s', 0 , 0 , 0 , 0 ,
+12, 10, 'e','s', 0 , 0 , 0 , 0 ,
+8, 10, 'e','s', 0 , 0 , 0 , 0 ,
+76, 10, 'e','s', 0 , 0 , 0 , 0 ,
+24, 10, 'e','s', 0 , 0 , 0 , 0 ,
+60, 10, 'e','s', 0 , 0 , 0 , 0 ,
+40, 10, 'e','s', 0 , 0 , 0 , 0 ,
+80, 10, 'e','s', 0 , 0 , 0 , 0 ,
+4, 10, 'e','s', 0 , 0 , 0 , 0 ,
+56, 10, 'e','s', 0 , 0 , 0 , 0 ,
+32, 10, 'e','s', 0 , 0 , 0 , 0 ,
+8, 4, 'z','h','_','C','N', 0 ,
+16, 4, 'z','h','_','C','N', 0 ,
+12, 4, 'z','h','_','T','W', 0 ,
+20, 4, 'z','h','_','T','W', 0 ,
+4, 4, 'z','h','_','T','W', 0 ,
+4, 6, 'd','a', 0 , 0 , 0 , 0 ,
+4, 11, 'f','i', 0 , 0 , 0 , 0 ,
+4, 18, 'k','o', 0 , 0 , 0 , 0 ,
+4, 20, 'n','b', 0 , 0 , 0 , 0 ,
+8, 20, 'n','b', 0 , 0 , 0 , 0 ,
+4, 22, 'p','t', 0 , 0 , 0 , 0 ,
+4, 29, 's','v', 0 , 0 , 0 , 0 ,
+8, 29, 's','v', 0 , 0 , 0 , 0 ,
+20, 1, 'a','r', 0 , 0 , 0 , 0 ,
+60, 1, 'a','r', 0 , 0 , 0 , 0 ,
+12, 1, 'a','r', 0 , 0 , 0 , 0 ,
+8, 1, 'a','r', 0 , 0 , 0 , 0 ,
+44, 1, 'a','r', 0 , 0 , 0 , 0 ,
+52, 1, 'a','r', 0 , 0 , 0 , 0 ,
+48, 1, 'a','r', 0 , 0 , 0 , 0 ,
+16, 1, 'a','r', 0 , 0 , 0 , 0 ,
+24, 1, 'a','r', 0 , 0 , 0 , 0 ,
+32, 1, 'a','r', 0 , 0 , 0 , 0 ,
+64, 1, 'a','r', 0 , 0 , 0 , 0 ,
+4, 1, 'a','r', 0 , 0 , 0 , 0 ,
+40, 1, 'a','r', 0 , 0 , 0 , 0 ,
+28, 1, 'a','r', 0 , 0 , 0 , 0 ,
+56, 1, 'a','r', 0 , 0 , 0 , 0 ,
+36, 1, 'a','r', 0 , 0 , 0 , 0 ,
+4, 2, 'b','g', 0 , 0 , 0 , 0 ,
+4, 26, 'h','r', 0 , 0 , 0 , 0 ,
+4, 5, 'c','s', 0 , 0 , 0 , 0 ,
+4, 8, 'e','l', 0 , 0 , 0 , 0 ,
+4, 13, 'i','w', 0 , 0 , 0 , 0 ,
+4, 14, 'h','u', 0 , 0 , 0 , 0 ,
+4, 15, 'i','s', 0 , 0 , 0 , 0 ,
+4, 21, 'p','l', 0 , 0 , 0 , 0 ,
+8, 22, 'p','t','_','P','T', 0 ,
+4, 24, 'r','o', 0 , 0 , 0 , 0 ,
+8, 24, 'r','o', 0 , 0 , 0 , 0 ,
+4, 25, 'r','u', 0 , 0 , 0 , 0 ,
+8, 25, 'r','u', 0 , 0 , 0 , 0 ,
+4, 30, 't','h', 0 , 0 , 0 , 0 ,
+4, 31, 't','r', 0 , 0 , 0 , 0 ,
+4, 34, 'u','k', 0 , 0 , 0 , 0 ,
+};
+
+#define NUM_ISOCODES      101
+#define LANG_CODE_LEN     5
+#define MODULO_ISOCODES   8
+
+
diff --git a/mDNSResponder/mDNSWindows/loclibrary.c b/mDNSResponder/mDNSWindows/loclibrary.c
new file mode 100755
index 00000000..97441203
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/loclibrary.c
@@ -0,0 +1,268 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+/* loclibrary.c                                                          
+ * ----------------------------------------------------------------------
+ * Source for localization library                                       
+ * Originally created by jsantamaria: 3 may 2004                         
+ * ----------------------------------------------------------------------
+ */
+ 
+#include "DebugServices.h"
+#include <windows.h>
+#include <stdio.h>
+#include "isocode.h"
+#include "loclibrary.h"
+#include "Shlwapi.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <wchar.h>
+
+
+#ifdef __cplusplus
+extern "c" {
+#endif
+
+#ifdef _MSC_VER
+#define swprintf _snwprintf
+#define snprintf _snprintf
+#endif
+
+
+
+#define DEFAULT_LANG_CODE "en"
+
+// gets the user language
+static LANGID _getUserLanguage( void ) {
+	
+	return GetUserDefaultUILanguage();
+
+}
+
+
+// gets the ISO mapping
+static int _getISOCode(LANGID wLangID, char *isoLangCode, int codeLen) {
+	int i;
+	unsigned short langCode;
+
+	for (i = 0; i < NUM_ISOCODES; i++) {
+		int startIndex = i * MODULO_ISOCODES;
+		
+		langCode = (ISOCODES[startIndex] << 8);
+		langCode = langCode + ( (unsigned short) (ISOCODES[startIndex + 1]) );
+
+		if (langCode == wLangID) {
+			char *langStr = (char *)&(ISOCODES[startIndex+2]);
+			strncpy(isoLangCode, langStr, codeLen);
+			return 0;
+		}
+	}
+	return 1;
+}
+
+static char isoLangCode[LANG_CODE_LEN + 1] = "";
+static LANGID wLangID = (LANGID) -1;
+
+static void _setLanguageIfNeeded(void) {
+	
+	// get the language code if we don't have it cached
+	if (!strncmp(isoLangCode,"",LANG_CODE_LEN + 1)) {
+		
+		// if we haven't cached the language id, do the lookup
+		if (wLangID == (LANGID) -1) {
+			wLangID = _getUserLanguage();
+		}
+		
+		// if no ISOCode, set it to DEFAULT_LANG_CODE
+		if (_getISOCode(wLangID, isoLangCode, LANG_CODE_LEN + 1)) {
+			strncpy(isoLangCode, DEFAULT_LANG_CODE, LANG_CODE_LEN+1);
+		}
+	}
+
+}
+
+//// PathForResource
+
+// Gets the PathForResource for handle 0 for the current process
+
+
+static char appPathNameA[MAX_PATH] = "";
+
+int PathForResourceA ( HMODULE module, const char *name, char *locFile, int locFileLen)
+{
+	int ret = 0;
+
+	if ( !strcmp( appPathNameA, "" ) )
+	{
+		char   folder[MAX_PATH];
+		char * ext;
+		char * app;
+
+		GetModuleFileNameA( module, folder, MAX_PATH );
+
+		// Get folder string
+		
+		app = strrchr( folder, '\\' );
+		require_action( app, exit, ret = 0 );
+		*app++ = '\0';
+
+		// Strip the extension
+
+		if ( ( ( ext = strstr( app, ".exe" ) ) != NULL ) || ( ( ext = strstr( app, ".dll" ) ) != NULL ) )
+		{
+			*ext = '\0';
+		}
+
+		snprintf( appPathNameA, MAX_PATH, "%s\\%s", folder, app );
+	}
+
+	ret = PathForResourceWithPathA (appPathNameA, name, locFile, locFileLen);
+
+exit:
+
+	return ret;
+}
+
+static wchar_t appPathNameW[MAX_PATH] = L"";
+
+int PathForResourceW ( HMODULE module, const wchar_t *name, wchar_t *locFile, int locFileLen)
+{
+	int ret = 0;
+
+	if ( !wcscmp( appPathNameW, L"" ) )
+	{
+		wchar_t   folder[MAX_PATH];
+		wchar_t * app;
+		wchar_t * ext;
+
+		GetModuleFileNameW( module, folder, MAX_PATH);
+
+		// Get folder string
+		
+		app = wcsrchr( folder, '\\' );
+		require_action( app, exit, ret = 0 );
+		*app++ = '\0';
+
+		// Strip the extension
+
+		if ( ( ( ext = wcsstr( app, L".exe" ) ) != NULL ) || ( ( ext = wcsstr( app, L".dll" ) ) != NULL ) )
+		{
+			*ext = '\0';
+		}
+
+		swprintf( appPathNameW, MAX_PATH, L"%ls\\%ls", folder, app );
+	}
+
+	ret = PathForResourceWithPathW (appPathNameW, name, locFile, locFileLen);
+
+exit:
+
+	return ret;
+}
+
+
+//// PathForResourceWithPath
+
+#define TMP_BUF_SIZE MAX_PATH
+
+int PathForResourceWithPathA (const char *path, const char *nm, 
+									char *locFile, int locFileLen) {
+	char tmpBuffer[TMP_BUF_SIZE];
+
+	// build the path to the executable in the generic 
+	// resources folder, check there first
+	snprintf(tmpBuffer, MAX_PATH, "%s.Resources\\%s", path, nm);
+
+	if (!PathFileExistsA(tmpBuffer)) {
+
+		// didn't hit generic resource folder, so need to get language codes
+		_setLanguageIfNeeded();
+
+		// test to see if localized directory exists, 
+		// if so, we don't fall back if we don't find the file.
+		snprintf(tmpBuffer, TMP_BUF_SIZE, 
+				 "%s.Resources\\%s.lproj", path, isoLangCode);
+
+		if (PathFileExistsA(tmpBuffer)) {
+			snprintf(tmpBuffer, TMP_BUF_SIZE, "%s\\%s", tmpBuffer, nm);
+
+			if (!PathFileExistsA(tmpBuffer)) return 0;
+
+			strncpy(locFile, tmpBuffer, locFileLen);
+			return (int) strlen(locFile);
+		}
+
+		// fall back on DEFAULT_LANG_CODE if still no good
+		snprintf(tmpBuffer, TMP_BUF_SIZE, "%s.Resources\\%s.lproj\\%s", 
+				path, DEFAULT_LANG_CODE, nm);
+				
+		// we can't find the resource, so return 0
+		if (!PathFileExistsA(tmpBuffer)) return 0;
+	}
+	
+	strncpy(locFile, tmpBuffer, locFileLen);
+	return (int) strlen(locFile);
+
+}
+
+
+int PathForResourceWithPathW (const wchar_t *path, const wchar_t *nm, 
+								wchar_t *locFile, int locFileLen) {
+
+	wchar_t tmpBuffer[TMP_BUF_SIZE];
+
+	// build the path to the executable in the generic
+	// resources folder, check there first
+	swprintf(tmpBuffer, TMP_BUF_SIZE, L"%ls.Resources\\%ls", path, nm);
+
+	if (!PathFileExistsW(tmpBuffer)) {
+		// didn't hit generic resource folder, so need to get language codes
+		_setLanguageIfNeeded();
+
+		// test to see if localized directory exists, 
+		// if so, we don't fall back if we don't find the file.
+		swprintf(tmpBuffer, TMP_BUF_SIZE, 
+				  L"%ls.Resources\\%S.lproj", path, isoLangCode);
+
+		if (PathFileExistsW(tmpBuffer)) {
+			swprintf(tmpBuffer, TMP_BUF_SIZE, L"%ls\\%ls", tmpBuffer, nm);
+
+			if (!PathFileExistsW(tmpBuffer)) return 0;
+
+			wcsncpy(locFile, tmpBuffer, locFileLen);
+			return (int) wcslen(locFile);
+		}
+
+		// fall back on DEFAULT_LANG_CODE if still no good
+		swprintf(tmpBuffer, TMP_BUF_SIZE, L"%ls.Resources\\%S.lproj\\%ls", 
+			path, DEFAULT_LANG_CODE, nm);
+
+		// we can't find the resource, so return 0
+		if (!PathFileExistsW(tmpBuffer)) return 0;
+	}
+	
+	wcsncpy(locFile, tmpBuffer, locFileLen);
+	return (int) wcslen(locFile);
+
+
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/mDNSResponder/mDNSWindows/loclibrary.h b/mDNSResponder/mDNSWindows/loclibrary.h
new file mode 100755
index 00000000..0a9b7ce6
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/loclibrary.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+    
+/* loclibrary.h                                                      
+ * ----------------------------------------------------------------------
+ * Header file for localization library                                       
+ * Originally created by jsantamaria: 3 may 2004                         
+ * ----------------------------------------------------------------------
+ */
+ 
+#ifndef _loclibrary_h_
+#define _loclibrary_h_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int PathForResourceW ( HMODULE module, const wchar_t *name, wchar_t *locFile, int locFileLen);
+int PathForResourceWithPathW ( const wchar_t *path, const wchar_t *name, wchar_t *locFile, int locFileLen);
+
+int PathForResourceA ( HMODULE module, const char *name, char *locFile, int locFileLen);
+int PathForResourceWithPathA ( const char *path, const char *name, char *locFile, int locFileLen);
+
+
+#ifdef UNICODE
+#define PathForResource PathForResourceW
+#define PathForResourceWithPath PathForResourceWithPathW
+#else
+#define PathForResource PathForResourceA
+#define PathForResourceWithPath PathForResourceWithPathA
+#endif // UNICODE
+
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+
+#endif // _loclibrary_h_
diff --git a/mDNSResponder/mDNSWindows/mDNSWin32.c b/mDNSResponder/mDNSWindows/mDNSWin32.c
new file mode 100755
index 00000000..fd11c58a
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mDNSWin32.c
@@ -0,0 +1,5197 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2013 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+	To Do:
+	
+	- Get unicode name of machine for nice name instead of just the host name.
+	- Use the IPv6 Internet Connection Firewall API to allow IPv6 mDNS without manually changing the firewall.
+	- Get DNS server address(es) from Windows and provide them to the uDNS layer.
+	- Implement TCP support for truncated packets (only stubs now).	
+
+*/
+
+#define _CRT_RAND_S
+
+#include	<stdarg.h>
+#include	<stddef.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<crtdbg.h>
+#include	<string.h>
+
+#include	"Poll.h"
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+#include	"Firewall.h"
+#include	"RegNames.h"
+#include	"Secret.h"
+#include	<dns_sd.h>
+
+#include	<Iphlpapi.h>
+#include	<mswsock.h>
+#include	<process.h>
+#include	<ntsecapi.h>
+#include	<lm.h>
+#include	<winioctl.h>
+#include	<ntddndis.h>        // This defines the IOCTL constants.
+
+#include	"mDNSEmbeddedAPI.h"
+#include	"GenLinkedList.h"
+#include	"DNSCommon.h"
+#include	"mDNSWin32.h"
+#include    "dnssec.h"
+#include    "nsec.h"
+
+#if 0
+#pragma mark == Constants ==
+#endif
+
+//===========================================================================================================================
+//	Constants
+//===========================================================================================================================
+
+#define	DEBUG_NAME									"[mDNSWin32] "
+
+#define	MDNS_WINDOWS_USE_IPV6_IF_ADDRS				1
+#define	MDNS_WINDOWS_ENABLE_IPV4					1
+#define	MDNS_WINDOWS_ENABLE_IPV6					1
+#define	MDNS_FIX_IPHLPAPI_PREFIX_BUG				1
+#define MDNS_SET_HINFO_STRINGS						0
+
+#define	kMDNSDefaultName							"My Computer"
+
+#define	kWinSockMajorMin							2
+#define	kWinSockMinorMin							2
+
+#define kRegistryMaxKeyLength						255
+#define kRegistryMaxValueName						16383
+
+static GUID											kWSARecvMsgGUID = WSAID_WSARECVMSG;
+
+#define kIPv6IfIndexBase							(10000000L)
+#define SMBPortAsNumber								445
+#define DEVICE_PREFIX								"\\\\.\\"
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+mDNSlocal mStatus			SetupNiceName( mDNS * const inMDNS );
+mDNSlocal mStatus			SetupHostName( mDNS * const inMDNS );
+mDNSlocal mStatus			SetupName( mDNS * const inMDNS );
+mDNSlocal mStatus			SetupInterface( mDNS * const inMDNS, const struct ifaddrs *inIFA, mDNSInterfaceData **outIFD );
+mDNSlocal mStatus			TearDownInterface( mDNS * const inMDNS, mDNSInterfaceData *inIFD );
+mDNSlocal void CALLBACK		FreeInterface( mDNSInterfaceData *inIFD );
+mDNSlocal mStatus			SetupSocket( mDNS * const inMDNS, const struct sockaddr *inAddr, mDNSIPPort port, SocketRef *outSocketRef  );
+mDNSlocal mStatus			SockAddrToMDNSAddr( const struct sockaddr * const inSA, mDNSAddr *outIP, mDNSIPPort *outPort );
+mDNSlocal OSStatus			GetWindowsVersionString( char *inBuffer, size_t inBufferSize );
+mDNSlocal int				getifaddrs( struct ifaddrs **outAddrs );
+mDNSlocal void				freeifaddrs( struct ifaddrs *inAddrs );
+
+
+
+// Platform Accessors
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+typedef struct mDNSPlatformInterfaceInfo	mDNSPlatformInterfaceInfo;
+struct	mDNSPlatformInterfaceInfo
+{
+	const char *		name;
+	mDNSAddr			ip;
+};
+
+
+mDNSexport mStatus	mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID );
+mDNSexport mStatus	mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo );
+
+
+// Wakeup Structs
+
+#define kUnicastWakeupNumTries				( 1 )
+#define kUnicastWakeupSleepBetweenTries		( 0 )
+#define kMulticastWakeupNumTries			( 18 )
+#define kMulticastWakeupSleepBetweenTries	( 100 )
+
+typedef struct MulticastWakeupStruct
+{
+	mDNS					*inMDNS;
+	struct sockaddr_in		addr;
+	INT						addrLen;
+	unsigned char			data[ 102 ];
+	INT						dataLen;
+	INT						numTries;
+	INT						msecSleep;
+} MulticastWakeupStruct;
+
+
+// Utilities
+
+#if( MDNS_WINDOWS_USE_IPV6_IF_ADDRS )
+	mDNSlocal int	getifaddrs_ipv6( struct ifaddrs **outAddrs );
+#endif
+
+mDNSlocal int getifaddrs_ipv4( struct ifaddrs **outAddrs );
+
+
+mDNSlocal DWORD				GetPrimaryInterface();
+mDNSlocal mStatus			AddressToIndexAndMask( struct sockaddr * address, uint32_t * index, struct sockaddr * mask );
+mDNSlocal mDNSBool			CanReceiveUnicast( void );
+mDNSlocal mDNSBool			IsPointToPoint( IP_ADAPTER_UNICAST_ADDRESS * addr );
+
+mDNSlocal mStatus			StringToAddress( mDNSAddr * ip, LPSTR string );
+mDNSlocal mStatus			RegQueryString( HKEY key, LPCSTR param, LPSTR * string, DWORD * stringLen, DWORD * enabled );
+mDNSlocal struct ifaddrs*	myGetIfAddrs(int refresh);
+mDNSlocal OSStatus			TCHARtoUTF8( const TCHAR *inString, char *inBuffer, size_t inBufferSize );
+mDNSlocal OSStatus			WindowsLatin1toUTF8( const char *inString, char *inBuffer, size_t inBufferSize );
+mDNSlocal void CALLBACK		TCPSocketNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context );
+mDNSlocal void				TCPCloseSocket( TCPSocket * socket );
+mDNSlocal void CALLBACK		UDPSocketNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context );
+mDNSlocal void				UDPCloseSocket( UDPSocket * sock );
+mDNSlocal mStatus           SetupAddr(mDNSAddr *ip, const struct sockaddr *const sa);
+mDNSlocal void				GetDDNSFQDN( domainname *const fqdn );
+#ifdef UNICODE
+mDNSlocal void				GetDDNSDomains( DNameListElem ** domains, LPCWSTR lpSubKey );
+#else
+mDNSlocal void				GetDDNSDomains( DNameListElem ** domains, LPCSTR lpSubKey );
+#endif
+mDNSlocal void				SetDomainSecrets( mDNS * const inMDNS );
+mDNSlocal void				SetDomainSecret( mDNS * const m, const domainname * inDomain );
+mDNSlocal VOID CALLBACK		CheckFileSharesProc( LPVOID arg, DWORD dwTimerLowValue, DWORD dwTimerHighValue );
+mDNSlocal void				CheckFileShares( mDNS * const inMDNS );
+mDNSlocal void				SMBCallback(mDNS *const m, ServiceRecordSet *const srs, mStatus result);
+mDNSlocal mDNSu8			IsWOMPEnabledForAdapter( const char * adapterName );
+mDNSlocal void				SendWakeupPacket( mDNS * const inMDNS, LPSOCKADDR addr, INT addrlen, const char * buf, INT buflen, INT numTries, INT msecSleep );
+mDNSlocal void _cdecl		SendMulticastWakeupPacket( void *arg );
+
+#ifdef	__cplusplus
+	}
+#endif
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+mDNSlocal mDNS_PlatformSupport	gMDNSPlatformSupport;
+mDNSs32							mDNSPlatformOneSecond	= 0;
+mDNSlocal UDPSocket		*		gUDPSockets				= NULL;
+mDNSlocal int					gUDPNumSockets			= 0;
+mDNSlocal BOOL					gEnableIPv6				= TRUE;
+
+#if( MDNS_WINDOWS_USE_IPV6_IF_ADDRS )
+
+	typedef DWORD
+		( WINAPI * GetAdaptersAddressesFunctionPtr )( 
+			ULONG 					inFamily, 
+			DWORD 					inFlags, 
+			PVOID 					inReserved, 
+			PIP_ADAPTER_ADDRESSES 	inAdapter, 
+			PULONG					outBufferSize );
+
+	mDNSlocal HMODULE								gIPHelperLibraryInstance			= NULL;
+	mDNSlocal GetAdaptersAddressesFunctionPtr		gGetAdaptersAddressesFunctionPtr	= NULL;
+
+#endif
+
+
+#ifndef HCRYPTPROV
+   typedef ULONG_PTR HCRYPTPROV;    // WinCrypt.h, line 249
+#endif
+
+
+#ifndef CRYPT_MACHINE_KEYSET
+#	define CRYPT_MACHINE_KEYSET    0x00000020
+#endif
+
+#ifndef CRYPT_NEWKEYSET
+#	define CRYPT_NEWKEYSET         0x00000008
+#endif
+
+#ifndef PROV_RSA_FULL
+#  define PROV_RSA_FULL 1
+#endif
+
+typedef BOOL (__stdcall *fnCryptGenRandom)( HCRYPTPROV, DWORD, BYTE* ); 
+typedef BOOL (__stdcall *fnCryptAcquireContext)( HCRYPTPROV*, LPCTSTR, LPCTSTR, DWORD, DWORD);
+typedef BOOL (__stdcall *fnCryptReleaseContext)(HCRYPTPROV, DWORD);
+
+static fnCryptAcquireContext g_lpCryptAcquireContext 	= NULL;
+static fnCryptReleaseContext g_lpCryptReleaseContext 	= NULL;
+static fnCryptGenRandom		 g_lpCryptGenRandom 		= NULL;
+static HINSTANCE			 g_hAAPI32 					= NULL;
+static HCRYPTPROV			 g_hProvider 				= ( ULONG_PTR ) NULL;
+
+
+typedef DNSServiceErrorType ( DNSSD_API *DNSServiceRegisterFunc )
+    (
+    DNSServiceRef                       *sdRef,
+    DNSServiceFlags                     flags,
+    uint32_t                            interfaceIndex,
+    const char                          *name,         /* may be NULL */
+    const char                          *regtype,
+    const char                          *domain,       /* may be NULL */
+    const char                          *host,         /* may be NULL */
+    uint16_t                            port,
+    uint16_t                            txtLen,
+    const void                          *txtRecord,    /* may be NULL */
+    DNSServiceRegisterReply             callBack,      /* may be NULL */
+    void                                *context       /* may be NULL */
+    );
+
+
+typedef void ( DNSSD_API *DNSServiceRefDeallocateFunc )( DNSServiceRef sdRef );
+
+mDNSlocal HMODULE					gDNSSDLibrary				= NULL;
+mDNSlocal DNSServiceRegisterFunc	gDNSServiceRegister			= NULL;
+mDNSlocal DNSServiceRefDeallocateFunc gDNSServiceRefDeallocate	= NULL;
+mDNSlocal HANDLE					gSMBThread					= NULL;
+mDNSlocal HANDLE					gSMBThreadRegisterEvent		= NULL;
+mDNSlocal HANDLE					gSMBThreadDeregisterEvent	= NULL;
+mDNSlocal HANDLE					gSMBThreadStopEvent			= NULL;
+mDNSlocal HANDLE					gSMBThreadQuitEvent			= NULL;
+
+#define	kSMBStopEvent				( WAIT_OBJECT_0 + 0 )
+#define	kSMBRegisterEvent			( WAIT_OBJECT_0 + 1 )
+#define kSMBDeregisterEvent			( WAIT_OBJECT_0 + 2 )
+
+
+#if 0
+#pragma mark -
+#pragma mark == Platform Support ==
+#endif
+
+//===========================================================================================================================
+//	mDNSPlatformInit
+//===========================================================================================================================
+
+mDNSexport mStatus	mDNSPlatformInit( mDNS * const inMDNS )
+{
+	mStatus		err;
+	OSVERSIONINFO osInfo;
+	BOOL ok;
+	WSADATA		wsaData;
+	int			supported;
+	struct sockaddr_in	sa4;
+	struct sockaddr_in6 sa6;
+	int					sa4len;
+	int					sa6len;
+	DWORD				size;
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "platform init\n" );
+	
+	// Initialize variables. If the PlatformSupport pointer is not null then just assume that a non-Apple client is 
+	// calling mDNS_Init and wants to provide its own storage for the platform-specific data so do not overwrite it.
+	
+	mDNSPlatformMemZero( &gMDNSPlatformSupport, sizeof( gMDNSPlatformSupport ) );
+	if( !inMDNS->p ) inMDNS->p				= &gMDNSPlatformSupport;
+	inMDNS->p->mainThread					= OpenThread( THREAD_ALL_ACCESS, FALSE, GetCurrentThreadId() );
+	require_action( inMDNS->p->mainThread, exit, err = mStatus_UnknownErr );
+	inMDNS->p->checkFileSharesTimer = CreateWaitableTimer( NULL, FALSE, NULL );
+	require_action( inMDNS->p->checkFileSharesTimer, exit, err = mStatus_UnknownErr );
+	inMDNS->p->checkFileSharesTimeout		= 10;		// Retry time for CheckFileShares() in seconds
+	mDNSPlatformOneSecond 					= 1000;		// Use milliseconds as the quantum of time
+	
+	// Get OS version info
+	
+	osInfo.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
+	ok = GetVersionEx( &osInfo );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	inMDNS->p->osMajorVersion = osInfo.dwMajorVersion;
+	inMDNS->p->osMinorVersion = osInfo.dwMinorVersion;
+	
+	// Don't enable IPv6 on anything less recent than Windows Vista
+
+	if ( inMDNS->p->osMajorVersion < 6 )
+	{
+		gEnableIPv6 = FALSE;
+	}
+
+	// Startup WinSock 2.2 or later.
+	
+	err = WSAStartup( MAKEWORD( kWinSockMajorMin, kWinSockMinorMin ), &wsaData );
+	require_noerr( err, exit );
+	
+	supported = ( ( LOBYTE( wsaData.wVersion ) == kWinSockMajorMin ) && ( HIBYTE( wsaData.wVersion ) == kWinSockMinorMin ) );
+	require_action( supported, exit, err = mStatus_UnsupportedErr );
+	
+	inMDNS->CanReceiveUnicastOn5353 = CanReceiveUnicast();
+	
+	// Setup the HINFO HW strings.
+	//<rdar://problem/7245119> device-info should have model=Windows
+
+	strcpy_s( ( char* ) &inMDNS->HIHardware.c[ 1 ], sizeof( inMDNS->HIHardware.c ) - 2, "Windows" );
+	inMDNS->HIHardware.c[ 0 ] = ( mDNSu8 ) mDNSPlatformStrLen( &inMDNS->HIHardware.c[ 1 ] );
+	dlog( kDebugLevelInfo, DEBUG_NAME "HIHardware: %#s\n", inMDNS->HIHardware.c );
+
+	// Setup the HINFO SW strings.
+#if ( MDNS_SET_HINFO_STRINGS )
+	mDNS_snprintf( (char *) &inMDNS->HISoftware.c[ 1 ], sizeof( inMDNS->HISoftware.c ) - 2, 
+		"mDNSResponder (%s %s)", __DATE__, __TIME__ );
+	inMDNS->HISoftware.c[ 0 ] = (mDNSu8) mDNSPlatformStrLen( &inMDNS->HISoftware.c[ 1 ] );
+	dlog( kDebugLevelInfo, DEBUG_NAME "HISoftware: %#s\n", inMDNS->HISoftware.c );
+#endif
+
+	// Set up the IPv4 unicast socket
+
+	inMDNS->p->unicastSock4.fd			= INVALID_SOCKET;
+	inMDNS->p->unicastSock4.recvMsgPtr	= NULL;
+	inMDNS->p->unicastSock4.ifd			= NULL;
+	inMDNS->p->unicastSock4.next		= NULL;
+	inMDNS->p->unicastSock4.m			= inMDNS;
+
+#if ( MDNS_WINDOWS_ENABLE_IPV4 )
+
+	sa4.sin_family		= AF_INET;
+	sa4.sin_addr.s_addr = INADDR_ANY;
+	err = SetupSocket( inMDNS, (const struct sockaddr*) &sa4, zeroIPPort, &inMDNS->p->unicastSock4.fd );
+	check_noerr( err );
+	sa4len = sizeof( sa4 );
+	err = getsockname( inMDNS->p->unicastSock4.fd, (struct sockaddr*) &sa4, &sa4len );
+	require_noerr( err, exit );
+	inMDNS->p->unicastSock4.port.NotAnInteger = sa4.sin_port;
+	inMDNS->UnicastPort4 = inMDNS->p->unicastSock4.port;
+	err = WSAIoctl( inMDNS->p->unicastSock4.fd, SIO_GET_EXTENSION_FUNCTION_POINTER, &kWSARecvMsgGUID, sizeof( kWSARecvMsgGUID ), &inMDNS->p->unicastSock4.recvMsgPtr, sizeof( inMDNS->p->unicastSock4.recvMsgPtr ), &size, NULL, NULL );
+		
+	if ( err )
+	{
+		inMDNS->p->unicastSock4.recvMsgPtr = NULL;
+	}
+
+	err = mDNSPollRegisterSocket( inMDNS->p->unicastSock4.fd, FD_READ, UDPSocketNotification, &inMDNS->p->unicastSock4 );
+	require_noerr( err, exit ); 
+
+#endif
+
+	// Set up the IPv6 unicast socket
+
+	inMDNS->p->unicastSock6.fd			= INVALID_SOCKET;
+	inMDNS->p->unicastSock6.recvMsgPtr	= NULL;
+	inMDNS->p->unicastSock6.ifd			= NULL;
+	inMDNS->p->unicastSock6.next		= NULL;
+	inMDNS->p->unicastSock6.m			= inMDNS;
+
+#if ( MDNS_WINDOWS_ENABLE_IPV6 )
+
+	if ( gEnableIPv6 )
+	{
+		sa6.sin6_family		= AF_INET6;
+		sa6.sin6_addr		= in6addr_any;
+		sa6.sin6_scope_id	= 0;
+
+		// This call will fail if the machine hasn't installed IPv6.  In that case,
+		// the error will be WSAEAFNOSUPPORT.
+
+		err = SetupSocket( inMDNS, (const struct sockaddr*) &sa6, zeroIPPort, &inMDNS->p->unicastSock6.fd );
+		require_action( !err || ( err == WSAEAFNOSUPPORT ), exit, err = (mStatus) WSAGetLastError() );
+		err = kNoErr;
+		
+		// If we weren't able to create the socket (because IPv6 hasn't been installed) don't do this
+
+		if ( inMDNS->p->unicastSock6.fd != INVALID_SOCKET )
+		{
+			sa6len = sizeof( sa6 );
+			err = getsockname( inMDNS->p->unicastSock6.fd, (struct sockaddr*) &sa6, &sa6len );
+			require_noerr( err, exit );
+			inMDNS->p->unicastSock6.port.NotAnInteger = sa6.sin6_port;
+			inMDNS->UnicastPort6 = inMDNS->p->unicastSock6.port;
+
+			err = WSAIoctl( inMDNS->p->unicastSock6.fd, SIO_GET_EXTENSION_FUNCTION_POINTER, &kWSARecvMsgGUID, sizeof( kWSARecvMsgGUID ), &inMDNS->p->unicastSock6.recvMsgPtr, sizeof( inMDNS->p->unicastSock6.recvMsgPtr ), &size, NULL, NULL );
+			
+			if ( err != 0 )
+			{
+				inMDNS->p->unicastSock6.recvMsgPtr = NULL;
+			}
+
+			err = mDNSPollRegisterSocket( inMDNS->p->unicastSock6.fd, FD_READ, UDPSocketNotification, &inMDNS->p->unicastSock6 );
+			require_noerr( err, exit );
+		}
+	}
+
+#endif
+
+	// Notify core of domain secret keys
+
+	SetDomainSecrets( inMDNS );
+	
+	// Success!
+
+	mDNSCoreInitComplete( inMDNS, err );
+
+	
+exit:
+
+	if ( err )
+	{
+		mDNSPlatformClose( inMDNS );
+	}
+
+	dlog( kDebugLevelTrace, DEBUG_NAME "platform init done (err=%d %m)\n", err, err );
+	return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformClose
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformClose( mDNS * const inMDNS )
+{
+	mStatus		err;
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "platform close\n" );
+	check( inMDNS );
+
+	if ( gSMBThread != NULL )
+	{
+		dlog( kDebugLevelTrace, DEBUG_NAME "tearing down smb registration thread\n" );
+		SetEvent( gSMBThreadStopEvent );
+		
+		if ( WaitForSingleObject( gSMBThreadQuitEvent, 5 * 1000 ) == WAIT_OBJECT_0 )
+		{
+			if ( gSMBThreadQuitEvent )
+			{
+				CloseHandle( gSMBThreadQuitEvent );
+				gSMBThreadQuitEvent = NULL;
+			}
+
+			if ( gSMBThreadStopEvent )
+			{
+				CloseHandle( gSMBThreadStopEvent );
+				gSMBThreadStopEvent = NULL;
+			}
+
+			if ( gSMBThreadDeregisterEvent )
+			{
+				CloseHandle( gSMBThreadDeregisterEvent );
+				gSMBThreadDeregisterEvent = NULL;
+			}
+
+			if ( gSMBThreadRegisterEvent )
+			{
+				CloseHandle( gSMBThreadRegisterEvent );
+				gSMBThreadRegisterEvent = NULL;
+			}
+
+			if ( gDNSSDLibrary )
+			{
+				FreeLibrary( gDNSSDLibrary );
+				gDNSSDLibrary = NULL;
+			}	
+		}
+		else
+		{
+			LogMsg( "Unable to stop SMBThread" );
+		}
+
+		inMDNS->p->smbFileSharing = mDNSfalse;
+		inMDNS->p->smbPrintSharing = mDNSfalse;
+	}
+
+	// Tear everything down in reverse order to how it was set up.
+	
+	err = TearDownInterfaceList( inMDNS );
+	check_noerr( err );
+	check( !inMDNS->p->inactiveInterfaceList );
+
+#if ( MDNS_WINDOWS_ENABLE_IPV4 )
+
+	UDPCloseSocket( &inMDNS->p->unicastSock4 );
+
+#endif
+	
+#if ( MDNS_WINDOWS_ENABLE_IPV6 )
+
+	if ( gEnableIPv6 )
+	{
+		UDPCloseSocket( &inMDNS->p->unicastSock6 );
+	}
+
+#endif
+
+	// Free the DLL needed for IPv6 support.
+	
+#if( MDNS_WINDOWS_USE_IPV6_IF_ADDRS )
+	if( gIPHelperLibraryInstance )
+	{
+		gGetAdaptersAddressesFunctionPtr = NULL;
+		
+		FreeLibrary( gIPHelperLibraryInstance );
+		gIPHelperLibraryInstance = NULL;
+	}
+#endif
+
+	if ( g_hAAPI32 )
+	{
+		// Release any resources
+
+		if ( g_hProvider && g_lpCryptReleaseContext )
+		{
+			( g_lpCryptReleaseContext )( g_hProvider, 0 );
+		}
+
+		// Free the AdvApi32.dll
+
+		FreeLibrary( g_hAAPI32 );
+
+		// And reset all the data
+
+		g_lpCryptAcquireContext = NULL;
+		g_lpCryptReleaseContext = NULL;
+		g_lpCryptGenRandom 		= NULL;
+		g_hProvider 			= ( ULONG_PTR ) NULL;
+		g_hAAPI32				= NULL;
+	}
+
+	WSACleanup();
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "platform close done\n" );
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformLock
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformLock( const mDNS * const inMDNS )
+{
+	( void ) inMDNS;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUnlock
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformUnlock( const mDNS * const inMDNS )
+{
+	( void ) inMDNS;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrCopy
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformStrCopy( void *inDst, const void *inSrc )
+{
+	check( inSrc );
+	check( inDst );
+	
+	strcpy( (char *) inDst, (const char*) inSrc );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformStrLen
+//===========================================================================================================================
+
+mDNSexport mDNSu32	mDNSPlatformStrLen( const void *inSrc )
+{
+	check( inSrc );
+	
+	return( (mDNSu32) strlen( (const char *) inSrc ) );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemCopy
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformMemCopy( void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+	check( inSrc );
+	check( inDst );
+	
+	memcpy( inDst, inSrc, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemSame
+//===========================================================================================================================
+
+mDNSexport mDNSBool	mDNSPlatformMemSame( const void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+	check( inSrc );
+	check( inDst );
+	
+	return( (mDNSBool)( memcmp( inSrc, inDst, inSize ) == 0 ) );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemCmp
+//===========================================================================================================================
+
+mDNSexport int	mDNSPlatformMemCmp( const void *inDst, const void *inSrc, mDNSu32 inSize )
+{
+	check( inSrc );
+	check( inDst );
+	
+	return( memcmp( inSrc, inDst, inSize ) );
+}
+
+mDNSexport void mDNSPlatformQsort(void *base, int nel, int width, int (*compar)(const void *, const void *))
+{
+	(void)base;
+	(void)nel;
+	(void)width;
+	(void)compar;
+}
+
+// DNSSEC stub functions
+mDNSexport void VerifySignature(mDNS *const m, DNSSECVerifier *dv, DNSQuestion *q)
+	{
+	(void)m;
+	(void)dv;
+	(void)q;
+	}
+
+mDNSexport mDNSBool AddNSECSForCacheRecord(mDNS *const m, CacheRecord *crlist, CacheRecord *negcr, mDNSu8 rcode)
+	{
+	(void)m;
+	(void)crlist;
+	(void)negcr;
+	(void)rcode;
+	return mDNSfalse;
+	}
+
+mDNSexport void BumpDNSSECStats(mDNS *const m, DNSSECStatsAction action, DNSSECStatsType type, mDNSu32 value)
+    {
+    (void)m;
+    (void)action;
+    (void)type;
+    (void)value;
+    }
+
+// Proxy stub functions
+mDNSexport mDNSu8 *DNSProxySetAttributes(DNSQuestion *q, DNSMessageHeader *h, DNSMessage *msg, mDNSu8 *ptr, mDNSu8 *limit)
+{
+    (void) q;
+    (void) h;
+    (void) msg;
+    (void) ptr;
+    (void) limit;
+
+    return ptr;
+}
+
+mDNSexport void DNSProxyInit(mDNS *const m, mDNSu32 IpIfArr[], mDNSu32 OpIf)
+{
+    (void) m;
+    (void) IpIfArr;
+    (void) OpIf;
+}
+
+mDNSexport void DNSProxyTerminate(mDNS *const m)
+{
+    (void) m;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemZero
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformMemZero( void *inDst, mDNSu32 inSize )
+{
+	check( inDst );
+	
+	memset( inDst, 0, inSize );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemAllocate
+//===========================================================================================================================
+
+mDNSexport void *	mDNSPlatformMemAllocate( mDNSu32 inSize )
+{
+	void *		mem;
+	
+	check( inSize > 0 );
+	
+	mem = malloc( inSize );
+	check( mem );
+	
+	return( mem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformMemFree
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformMemFree( void *inMem )
+{
+	check( inMem );
+	
+	free( inMem );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRandomNumber
+//===========================================================================================================================
+
+mDNSexport mDNSu32 mDNSPlatformRandomNumber(void)
+{
+	unsigned int	randomNumber;
+	errno_t			err;
+
+	err = rand_s( &randomNumber );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( err )
+	{
+		randomNumber = rand();
+	}
+
+	return ( mDNSu32 ) randomNumber;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTimeInit
+//===========================================================================================================================
+
+mDNSexport mStatus	mDNSPlatformTimeInit( void )
+{
+	// No special setup is required on Windows -- we just use GetTickCount().
+	return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformRawTime
+//===========================================================================================================================
+
+mDNSexport mDNSs32	mDNSPlatformRawTime( void )
+{
+	return( (mDNSs32) GetTickCount() );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformUTC
+//===========================================================================================================================
+
+mDNSexport mDNSs32	mDNSPlatformUTC( void )
+{
+	return ( mDNSs32 ) time( NULL );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceNameToID
+//===========================================================================================================================
+
+mDNSexport mStatus	mDNSPlatformInterfaceNameToID( mDNS * const inMDNS, const char *inName, mDNSInterfaceID *outID )
+{
+	mStatus					err;
+	mDNSInterfaceData *		ifd;
+	
+	check( inMDNS );
+	check( inMDNS->p );
+	check( inName );
+	
+	// Search for an interface with the specified name,
+	
+	for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+	{
+		if( strcmp( ifd->name, inName ) == 0 )
+		{
+			break;
+		}
+	}
+	require_action_quiet( ifd, exit, err = mStatus_NoSuchNameErr );
+	
+	// Success!
+	
+	if( outID )
+	{
+		*outID = (mDNSInterfaceID) ifd;
+	}
+	err = mStatus_NoError;
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIDToInfo
+//===========================================================================================================================
+
+mDNSexport mStatus	mDNSPlatformInterfaceIDToInfo( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSPlatformInterfaceInfo *outInfo )
+{
+	mStatus					err;
+	mDNSInterfaceData *		ifd;
+	
+	check( inMDNS );
+	check( inID );
+	check( outInfo );
+	
+	// Search for an interface with the specified ID,
+	
+	for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+	{
+		if( ifd == (mDNSInterfaceData *) inID )
+		{
+			break;
+		}
+	}
+	require_action_quiet( ifd, exit, err = mStatus_NoSuchNameErr );
+	
+	// Success!
+	
+	outInfo->name 	= ifd->name;
+	outInfo->ip 	= ifd->interfaceInfo.ip;
+	err 			= mStatus_NoError;
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIDfromInterfaceIndex
+//===========================================================================================================================
+
+mDNSexport mDNSInterfaceID	mDNSPlatformInterfaceIDfromInterfaceIndex( mDNS * const inMDNS, mDNSu32 inIndex )
+{
+	mDNSInterfaceID		id;
+	
+	id = mDNSNULL;
+	if( inIndex == kDNSServiceInterfaceIndexLocalOnly )
+	{
+		id = mDNSInterface_LocalOnly;
+	}
+	else if( inIndex != 0 )
+	{
+		mDNSInterfaceData *		ifd;
+		
+		for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+		{
+			if( ( ifd->scopeID == inIndex ) && ifd->interfaceInfo.InterfaceActive )
+			{
+				id = ifd->interfaceInfo.InterfaceID;
+				break;
+			}
+		}
+		check( ifd );
+	}
+	return( id );
+}
+
+//===========================================================================================================================
+//	mDNSPlatformInterfaceIndexfromInterfaceID
+//===========================================================================================================================
+	
+mDNSexport mDNSu32	mDNSPlatformInterfaceIndexfromInterfaceID( mDNS * const inMDNS, mDNSInterfaceID inID, mDNSBool suppressNetworkChange )
+{
+	mDNSu32		index;
+	
+	(void) suppressNetworkChange;
+
+	index = 0;
+	if( inID == mDNSInterface_LocalOnly )
+	{
+		index = (mDNSu32) kDNSServiceInterfaceIndexLocalOnly;
+	}
+	else if( inID )
+	{
+		mDNSInterfaceData *		ifd;
+		
+		// Search active interfaces.
+		for( ifd = inMDNS->p->interfaceList; ifd; ifd = ifd->next )
+		{
+			if( (mDNSInterfaceID) ifd == inID )
+			{
+				index = ifd->scopeID;
+				break;
+			}
+		}
+		
+		// Search inactive interfaces too so remove events for inactive interfaces report the old interface index.
+		
+		if( !ifd )
+		{
+			for( ifd = inMDNS->p->inactiveInterfaceList; ifd; ifd = ifd->next )
+			{
+				if( (mDNSInterfaceID) ifd == inID )
+				{
+					index = ifd->scopeID;
+					break;
+				}
+			}
+		}
+		check( ifd );
+	}
+	return( index );
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformTCPSocket
+//===========================================================================================================================
+
+TCPSocket *
+mDNSPlatformTCPSocket
+	(
+	mDNS			* const m,
+	TCPSocketFlags		flags,
+	mDNSIPPort			*	port, 
+	mDNSBool			useBackgroundTrafficClass
+	)
+{
+	TCPSocket *		sock    = NULL;
+	u_long				on		= 1;  // "on" for setsockopt
+	struct sockaddr_in	saddr;
+	int					len;
+	mStatus				err		= mStatus_NoError;
+
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( useBackgroundTrafficClass );
+
+	require_action( flags == 0, exit, err = mStatus_UnsupportedErr );
+
+	// Setup connection data object
+
+	sock = (TCPSocket *) malloc( sizeof( TCPSocket ) );
+	require_action( sock, exit, err = mStatus_NoMemoryErr );
+	mDNSPlatformMemZero( sock, sizeof( TCPSocket ) );
+	sock->fd		= INVALID_SOCKET;
+	sock->flags		= flags;
+	sock->m			= m;
+
+	mDNSPlatformMemZero(&saddr, sizeof(saddr));
+	saddr.sin_family		= AF_INET;
+	saddr.sin_addr.s_addr	= htonl( INADDR_ANY );
+	saddr.sin_port			= port->NotAnInteger;
+	
+	// Create the socket
+
+	sock->fd = socket(AF_INET, SOCK_STREAM, 0);
+	err = translate_errno( sock->fd != INVALID_SOCKET, WSAGetLastError(), mStatus_UnknownErr );
+	require_noerr( err, exit );
+
+	// bind
+
+	err = bind( sock->fd, ( struct sockaddr* ) &saddr, sizeof( saddr )  );
+	err = translate_errno( err == 0, WSAGetLastError(), mStatus_UnknownErr );
+	require_noerr( err, exit );
+
+	// Set it to be non-blocking
+
+	err = ioctlsocket( sock->fd, FIONBIO, &on );
+	err = translate_errno( err == 0, WSAGetLastError(), mStatus_UnknownErr );
+	require_noerr( err, exit );
+
+	// Get port number
+
+	mDNSPlatformMemZero( &saddr, sizeof( saddr ) );
+	len = sizeof( saddr );
+
+	err = getsockname( sock->fd, ( struct sockaddr* ) &saddr, &len );
+	err = translate_errno( err == 0, WSAGetLastError(), mStatus_UnknownErr );
+	require_noerr( err, exit );
+
+	port->NotAnInteger = saddr.sin_port;
+
+exit:
+
+	if ( err && sock )
+	{
+		TCPCloseSocket( sock );
+		free( sock );
+		sock = mDNSNULL;
+	}
+
+	return sock;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTCPConnect
+//===========================================================================================================================
+
+mStatus
+mDNSPlatformTCPConnect
+	(
+	TCPSocket			*	sock,
+	const mDNSAddr		*	inDstIP, 
+	mDNSOpaque16 			inDstPort, 
+	domainname			*	hostname,
+	mDNSInterfaceID			inInterfaceID,
+	TCPConnectionCallback	inCallback, 
+	void *					inContext
+	)
+{
+	struct sockaddr_in	saddr;
+	mStatus				err		= mStatus_NoError;
+
+	DEBUG_UNUSED( hostname );
+	DEBUG_UNUSED( inInterfaceID );
+
+	if ( inDstIP->type != mDNSAddrType_IPv4 )
+	{
+		LogMsg("ERROR: mDNSPlatformTCPConnect - attempt to connect to an IPv6 address: operation not supported");
+		return mStatus_UnknownErr;
+	}
+
+	// Setup connection data object
+
+	sock->userCallback	= inCallback;
+	sock->userContext	= inContext;
+
+	mDNSPlatformMemZero(&saddr, sizeof(saddr));
+	saddr.sin_family	= AF_INET;
+	saddr.sin_port		= inDstPort.NotAnInteger;
+	memcpy(&saddr.sin_addr, &inDstIP->ip.v4.NotAnInteger, sizeof(saddr.sin_addr));
+
+	// Try and do connect
+
+	err = connect( sock->fd, ( struct sockaddr* ) &saddr, sizeof( saddr ) );
+	require_action( !err || ( WSAGetLastError() == WSAEWOULDBLOCK ), exit, err = mStatus_ConnFailed );
+	sock->connected	= !err ? TRUE : FALSE;
+
+	err = mDNSPollRegisterSocket( sock->fd, FD_CONNECT | FD_READ | FD_CLOSE, TCPSocketNotification, sock );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( !err )
+	{
+		err = sock->connected ? mStatus_ConnEstablished : mStatus_ConnPending;
+	}
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformTCPAccept
+//===========================================================================================================================
+
+mDNSexport 
+mDNSexport TCPSocket *mDNSPlatformTCPAccept( TCPSocketFlags flags, int fd )
+	{
+	TCPSocket	*	sock = NULL;
+	mStatus							err = mStatus_NoError;
+
+	require_action( !flags, exit, err = mStatus_UnsupportedErr );
+
+	sock = malloc( sizeof( TCPSocket ) );
+	require_action( sock, exit, err = mStatus_NoMemoryErr );
+	
+	mDNSPlatformMemZero( sock, sizeof( *sock ) );
+
+	sock->fd	= fd;
+	sock->flags = flags;
+
+exit:
+
+	if ( err && sock )
+	{
+		free( sock );
+		sock = NULL;
+	}
+
+	return sock;
+	}
+
+
+//===========================================================================================================================
+//	mDNSPlatformTCPCloseConnection
+//===========================================================================================================================
+
+mDNSexport void	mDNSPlatformTCPCloseConnection( TCPSocket *sock )
+{
+	check( sock );
+
+	if ( sock )
+	{
+		dlog( kDebugLevelChatty, DEBUG_NAME "mDNSPlatformTCPCloseConnection 0x%x:%d\n", sock, sock->fd );
+
+		if ( sock->fd != INVALID_SOCKET )
+		{
+			mDNSPollUnregisterSocket( sock->fd );
+			closesocket( sock->fd );
+			sock->fd = INVALID_SOCKET;
+		}
+
+		free( sock );
+	}
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformReadTCP
+//===========================================================================================================================
+
+mDNSexport long	mDNSPlatformReadTCP( TCPSocket *sock, void *inBuffer, unsigned long inBufferSize, mDNSBool * closed )
+{
+	int			nread;
+    OSStatus    err;
+
+	*closed = mDNSfalse;
+    nread = recv( sock->fd, inBuffer, inBufferSize, 0 );
+    err = translate_errno( ( nread >= 0 ), WSAGetLastError(), mStatus_UnknownErr );
+	
+	if ( nread > 0 )
+	{
+		dlog( kDebugLevelChatty, DEBUG_NAME "mDNSPlatformReadTCP: 0x%x:%d read %d bytes\n", sock, sock->fd, nread );
+	}
+	else if ( !nread )
+	{
+		*closed = mDNStrue;
+	}
+	else if ( err == WSAECONNRESET )
+	{
+		*closed = mDNStrue;
+		nread = 0;
+	}
+	else if ( err == WSAEWOULDBLOCK )
+	{
+		nread = 0;
+	}
+	else
+	{
+		LogMsg( "ERROR: mDNSPlatformReadTCP - recv: %d\n", err );
+		nread = -1;
+	}
+
+    return nread;
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformWriteTCP
+//===========================================================================================================================
+
+mDNSexport long	mDNSPlatformWriteTCP( TCPSocket *sock, const char *inMsg, unsigned long inMsgSize )
+{
+	int			nsent;
+	OSStatus	err;
+
+	nsent = send( sock->fd, inMsg, inMsgSize, 0 );
+
+	err = translate_errno( ( nsent >= 0 ) || ( WSAGetLastError() == WSAEWOULDBLOCK ), WSAGetLastError(), mStatus_UnknownErr );
+	require_noerr( err, exit );
+
+	if ( nsent < 0)
+	{
+		nsent = 0;
+	}
+		
+exit:
+
+	return nsent;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTCPGetFD
+//===========================================================================================================================
+
+mDNSexport int mDNSPlatformTCPGetFD(TCPSocket *sock )
+{
+	return ( int ) sock->fd;
+}
+
+
+
+//===========================================================================================================================
+//	TCPSocketNotification
+//===========================================================================================================================
+
+mDNSlocal void CALLBACK
+TCPSocketNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )
+{
+	TCPSocket				*tcpSock = ( TCPSocket* ) context;
+	TCPConnectionCallback	callback;
+	int						err;
+
+	DEBUG_UNUSED( sock );
+
+	require_action( tcpSock, exit, err = mStatus_BadParamErr );
+	callback = ( TCPConnectionCallback ) tcpSock->userCallback;
+	require_action( callback, exit, err = mStatus_BadParamErr );
+
+	if ( event && ( event->lNetworkEvents & FD_CONNECT ) )
+	{
+		if ( event->iErrorCode[ FD_CONNECT_BIT ] == 0 )
+		{
+			callback( tcpSock, tcpSock->userContext, mDNStrue, 0 );
+			tcpSock->connected = mDNStrue;
+		}
+		else
+		{
+			callback( tcpSock, tcpSock->userContext, mDNSfalse, event->iErrorCode[ FD_CONNECT_BIT ] );
+		}
+	}
+	else
+	{
+		callback( tcpSock, tcpSock->userContext, mDNSfalse, 0 );
+	}
+
+exit:
+
+	return;
+}
+
+
+
+//===========================================================================================================================
+//	mDNSPlatformUDPSocket
+//===========================================================================================================================
+
+mDNSexport UDPSocket* mDNSPlatformUDPSocket(mDNS *const m, const mDNSIPPort requestedport)
+{
+	UDPSocket*	sock	= NULL;
+	mDNSIPPort	port	= requestedport;
+	mStatus		err		= mStatus_NoError;
+	unsigned	i;
+
+	// Setup connection data object
+
+	sock = ( UDPSocket* ) malloc(sizeof( UDPSocket ) );
+	require_action( sock, exit, err = mStatus_NoMemoryErr );
+	memset( sock, 0, sizeof( UDPSocket ) );
+
+	// Create the socket
+
+	sock->fd			= INVALID_SOCKET;
+	sock->recvMsgPtr	= m->p->unicastSock4.recvMsgPtr;
+	sock->addr			= m->p->unicastSock4.addr;
+	sock->ifd			= NULL;
+	sock->m				= m;
+
+	// Try at most 10000 times to get a unique random port
+
+	for (i=0; i<10000; i++)
+	{
+		struct sockaddr_in saddr;
+
+		saddr.sin_family		= AF_INET;
+		saddr.sin_addr.s_addr	= 0;
+
+		// The kernel doesn't do cryptographically strong random port
+		// allocation, so we do it ourselves here
+
+        if (mDNSIPPortIsZero(requestedport))
+		{
+			port = mDNSOpaque16fromIntVal( ( mDNSu16 ) ( 0xC000 + mDNSRandom(0x3FFF) ) );
+		}
+
+		saddr.sin_port = port.NotAnInteger;
+
+        err = SetupSocket(m, ( struct sockaddr* ) &saddr, port, &sock->fd );
+        if (!err) break;
+	}
+
+	require_noerr( err, exit );
+
+	// Set the port
+
+	sock->port = port;
+
+	// Arm the completion routine
+
+	err = mDNSPollRegisterSocket( sock->fd, FD_READ, UDPSocketNotification, sock );
+	require_noerr( err, exit ); 
+
+	// Bookkeeping
+
+	sock->next		= gUDPSockets;
+	gUDPSockets		= sock;
+	gUDPNumSockets++;
+
+exit:
+
+	if ( err && sock )
+	{
+		UDPCloseSocket( sock );
+		free( sock );
+		sock = NULL;
+	}
+
+	return sock;
+}
+	
+//===========================================================================================================================
+//	mDNSPlatformUDPClose
+//===========================================================================================================================
+	
+mDNSexport void mDNSPlatformUDPClose( UDPSocket *sock )
+{
+	UDPSocket	*	current  = gUDPSockets;
+	UDPSocket	*	last = NULL;
+
+	while ( current )
+	{
+		if ( current == sock )
+		{
+			if ( last == NULL )
+			{
+				gUDPSockets = sock->next;
+			}
+			else
+			{
+				last->next = sock->next;
+			}
+
+			UDPCloseSocket( sock );
+			free( sock );
+
+			gUDPNumSockets--;
+
+			break;
+		}
+
+		last	= current;
+		current	= current->next;
+	}
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformSendUDP
+//===========================================================================================================================
+
+mDNSexport mStatus
+	mDNSPlatformSendUDP( 
+		const mDNS * const			inMDNS, 
+		const void * const	        inMsg, 
+		const mDNSu8 * const		inMsgEnd, 
+		mDNSInterfaceID 			inInterfaceID, 
+		UDPSocket *					inSrcSocket,
+		const mDNSAddr *			inDstIP, 
+		mDNSIPPort 					inDstPort,
+		mDNSBool 					useBackgroundTrafficClass )
+{
+	SOCKET						sendingsocket = INVALID_SOCKET;
+	mStatus						err = mStatus_NoError;
+	mDNSInterfaceData *			ifd = (mDNSInterfaceData*) inInterfaceID;
+	struct sockaddr_storage		addr;
+	int							n;
+	
+	DEBUG_USE_ONLY( inMDNS );
+	DEBUG_USE_ONLY( useBackgroundTrafficClass );
+	
+	n = (int)( inMsgEnd - ( (const mDNSu8 * const) inMsg ) );
+	check( inMDNS );
+	check( inMsg );
+	check( inMsgEnd );
+	check( inDstIP );
+	
+	dlog( kDebugLevelChatty, DEBUG_NAME "platform send %d bytes to %#a:%u\n", n, inDstIP, ntohs( inDstPort.NotAnInteger ) );
+	
+	if( inDstIP->type == mDNSAddrType_IPv4 )
+	{
+		struct sockaddr_in *		sa4;
+		
+		sa4						= (struct sockaddr_in *) &addr;
+		sa4->sin_family			= AF_INET;
+		sa4->sin_port			= inDstPort.NotAnInteger;
+		sa4->sin_addr.s_addr	= inDstIP->ip.v4.NotAnInteger;
+		sendingsocket           = ifd ? ifd->sock.fd : inMDNS->p->unicastSock4.fd;
+
+		if (inSrcSocket) { sendingsocket = inSrcSocket->fd; debugf("mDNSPlatformSendUDP using port %d, static port %d, sock %d", mDNSVal16(inSrcSocket->port), inMDNS->p->unicastSock4.fd, sendingsocket); }
+	}
+	else if( inDstIP->type == mDNSAddrType_IPv6 )
+	{
+		struct sockaddr_in6 *		sa6;
+		
+		sa6					= (struct sockaddr_in6 *) &addr;
+		sa6->sin6_family	= AF_INET6;
+		sa6->sin6_port		= inDstPort.NotAnInteger;
+		sa6->sin6_flowinfo	= 0;
+		sa6->sin6_addr		= *( (struct in6_addr *) &inDstIP->ip.v6 );
+		sa6->sin6_scope_id	= 0;	// Windows requires the scope ID to be zero. IPV6_MULTICAST_IF specifies interface.
+		sendingsocket		= ifd ? ifd->sock.fd : inMDNS->p->unicastSock6.fd;
+	}
+	else
+	{
+		dlog( kDebugLevelError, DEBUG_NAME "%s: dst is not an IPv4 or IPv6 address (type=%d)\n", __ROUTINE__, inDstIP->type );
+		err = mStatus_BadParamErr;
+		goto exit;
+	}
+	
+	if (IsValidSocket(sendingsocket))
+	{
+		n = sendto( sendingsocket, (char *) inMsg, n, 0, (struct sockaddr *) &addr, sizeof( addr ) );
+		err = translate_errno( n > 0, errno_compat(), kWriteErr );
+
+		if ( err )
+		{
+			// Don't report EHOSTDOWN (i.e. ARP failure), ENETDOWN, or no route to host for unicast destinations
+
+			if ( !mDNSAddressIsAllDNSLinkGroup( inDstIP ) && ( WSAGetLastError() == WSAEHOSTDOWN || WSAGetLastError() == WSAENETDOWN || WSAGetLastError() == WSAEHOSTUNREACH || WSAGetLastError() == WSAENETUNREACH ) )
+			{
+				err = mStatus_TransientErr;
+			}
+			else
+			{
+				require_noerr( err, exit );
+			}
+		}
+	}
+	
+exit:
+	return( err );
+}
+
+
+mDNSexport mDNSBool mDNSPlatformPeekUDP(mDNS *const m, UDPSocket *src)
+{
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( src );
+	return mDNSfalse;
+}
+
+mDNSexport void mDNSPlatformUpdateProxyList(mDNS *const m, const mDNSInterfaceID InterfaceID)
+	{
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( InterfaceID );
+	}
+
+
+mDNSexport void mDNSPlatformSetAllowSleep(mDNS *const m, mDNSBool allowSleep, const char *reason)
+	{
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( allowSleep );
+	DEBUG_UNUSED( reason );
+	}
+
+//===========================================================================================================================
+//	mDNSPlatformSendRawPacket
+//===========================================================================================================================
+
+mDNSexport void mDNSPlatformSendWakeupPacket(mDNS *const m, mDNSInterfaceID InterfaceID, char *ethaddr, char *ipaddr, int iteration)
+{
+	unsigned char			mac[ 6 ];
+	unsigned char			buf[ 102 ];
+	char					hex[ 3 ] = { 0 };
+	unsigned char			*bufPtr = buf;
+	struct sockaddr_storage	saddr;
+	INT						len = sizeof( saddr );
+	mDNSBool				unicast = mDNSfalse;
+	MulticastWakeupStruct	*info;
+	int						i;
+	mStatus					err;
+
+	(void) InterfaceID;
+
+	require_action( ethaddr, exit, err = mStatus_BadParamErr );
+
+	for ( i = 0; i < 6; i++ )
+	{
+		memcpy( hex, ethaddr + ( i * 3 ), 2 );
+		mac[ i ] = ( unsigned char ) strtoul( hex, NULL, 16 );
+	}
+
+	memset( buf, 0, sizeof( buf ) );
+
+	for ( i = 0; i < 6; i++ )
+	{
+		*bufPtr++ = 0xff;
+	}
+	
+	for ( i = 0; i < 16; i++ )
+	{
+		memcpy( bufPtr, mac, sizeof( mac ) );
+		bufPtr += sizeof( mac );
+	}
+
+	if ( ipaddr )
+	{
+		if ( WSAStringToAddressA( ipaddr, AF_INET, NULL, ( LPSOCKADDR ) &saddr, &len ) == 0 )
+		{
+			struct sockaddr_in * saddr4 = ( struct sockaddr_in* ) &saddr;
+			saddr4->sin_port = htons( 9 );
+			len = sizeof( *saddr4 );
+
+			if ( saddr4->sin_addr.s_addr != htonl( INADDR_ANY ) )
+			{
+				unicast = mDNStrue;
+			}
+		}
+		else if ( WSAStringToAddressA( ipaddr, AF_INET6, NULL, ( LPSOCKADDR ) &saddr, &len ) == 0 )
+		{
+			mDNSInterfaceData *ifd = ( mDNSInterfaceData* ) InterfaceID;
+			struct sockaddr_in6 * saddr6 = ( struct sockaddr_in6* ) &saddr;
+			saddr6->sin6_port = htons( 9 );
+
+			if ( ifd != NULL )
+			{
+				saddr6->sin6_scope_id = ifd->scopeID;
+			}
+
+			len = sizeof( *saddr6 );
+
+			if ( memcmp( &saddr6->sin6_addr, &in6addr_any, sizeof( IN6_ADDR ) ) != 0 )
+			{
+				unicast = mDNStrue;
+			}
+		}
+	}
+
+	if ( ( iteration < 2 ) && ( unicast ) )
+	{
+		SendWakeupPacket( m, ( LPSOCKADDR ) &saddr, len, ( const char* ) buf, sizeof( buf ), kUnicastWakeupNumTries, kUnicastWakeupSleepBetweenTries );
+	}		
+
+	info = ( MulticastWakeupStruct* ) malloc( sizeof( MulticastWakeupStruct ) );
+	require_action( info, exit, err = mStatus_NoMemoryErr );
+	info->inMDNS = m;
+	memset( &info->addr, 0, sizeof( info->addr ) );
+	info->addr.sin_family = AF_INET;
+	info->addr.sin_addr.s_addr = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+	info->addr.sin_port = htons( 9 );
+	info->addrLen = sizeof( info->addr );
+	memcpy( info->data, buf, sizeof( buf ) );
+	info->dataLen = sizeof( buf );
+	info->numTries  = kMulticastWakeupNumTries;
+	info->msecSleep = kMulticastWakeupSleepBetweenTries;
+
+	_beginthread( SendMulticastWakeupPacket, 0, ( void* ) info );
+
+exit:
+
+	return;
+}
+
+
+mDNSexport mDNSBool mDNSPlatformValidRecordForInterface(AuthRecord *rr, const NetworkInterfaceInfo *intf)
+{
+	DEBUG_UNUSED( rr );
+	DEBUG_UNUSED( intf );
+
+	return mDNStrue;
+}
+ 
+mDNSexport mDNSBool mDNSPlatformValidQuestionForInterface(DNSQuestion *q, const NetworkInterfaceInfo *intf)
+{
+	DEBUG_UNUSED( q );
+	DEBUG_UNUSED( intf );
+
+	return mDNStrue;
+}
+ 
+mDNSexport void mDNSPlatformSendRawPacket(const void *const msg, const mDNSu8 *const end, mDNSInterfaceID InterfaceID)
+	{
+	DEBUG_UNUSED( msg );
+	DEBUG_UNUSED( end );
+	DEBUG_UNUSED( InterfaceID );
+	}
+
+// Used for debugging purposes. For now, just set the buffer to zero
+mDNSexport void mDNSPlatformFormatTime(unsigned long te, mDNSu8 *buf, int bufsize)
+	{
+	DEBUG_UNUSED( te );
+	if (bufsize) buf[0] = 0;
+	}
+
+
+mDNSexport void mDNSPlatformSetLocalAddressCacheEntry(mDNS *const m, const mDNSAddr *const tpa, const mDNSEthAddr *const tha, mDNSInterfaceID InterfaceID)
+	{
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( tpa );
+	DEBUG_UNUSED( tha );
+	DEBUG_UNUSED( InterfaceID );
+	}
+
+
+mDNSexport void mDNSPlatformReceiveRawPacket(const void *const msg, const mDNSu8 *const end, mDNSInterfaceID InterfaceID)
+	{
+	DEBUG_UNUSED( msg );
+	DEBUG_UNUSED( end );
+	DEBUG_UNUSED( InterfaceID );
+	}
+
+mDNSexport void mDNSPlatformSetLocalARP( const mDNSv4Addr * const tpa, const mDNSEthAddr * const tha, mDNSInterfaceID InterfaceID )
+	{
+	DEBUG_UNUSED( tpa );
+	DEBUG_UNUSED( tha );
+	DEBUG_UNUSED( InterfaceID );
+	}
+
+mDNSexport void mDNSPlatformWriteDebugMsg(const char *msg)
+	{
+	dlog( kDebugLevelInfo, "%s\n", msg );
+	}
+
+mDNSexport void mDNSPlatformWriteLogMsg( const char * ident, const char * msg, mDNSLogLevel_t loglevel )
+	{
+	extern mDNS mDNSStorage;
+	int type;
+	
+	DEBUG_UNUSED( ident );
+
+	type = EVENTLOG_ERROR_TYPE;
+
+	switch (loglevel) 
+	{
+		case MDNS_LOG_MSG:       type = EVENTLOG_ERROR_TYPE;		break;
+		case MDNS_LOG_OPERATION: type = EVENTLOG_WARNING_TYPE;		break;
+		case MDNS_LOG_SPS:       type = EVENTLOG_INFORMATION_TYPE;  break;
+		case MDNS_LOG_INFO:      type = EVENTLOG_INFORMATION_TYPE;	break;
+		case MDNS_LOG_DEBUG:     type = EVENTLOG_INFORMATION_TYPE;	break;
+		default:
+			fprintf(stderr, "Unknown loglevel %d, assuming LOG_ERR\n", loglevel);
+			fflush(stderr);
+			}
+
+	mDNSStorage.p->reportStatusFunc( type, msg );
+	dlog( kDebugLevelInfo, "%s\n", msg );
+	}
+
+mDNSexport void mDNSPlatformSourceAddrForDest( mDNSAddr * const src, const mDNSAddr * const dst )
+	{
+	DEBUG_UNUSED( src );
+	DEBUG_UNUSED( dst );
+	}
+
+//===========================================================================================================================
+//	mDNSPlatformTLSSetupCerts
+//===========================================================================================================================
+
+mDNSexport mStatus
+mDNSPlatformTLSSetupCerts(void)
+{
+	return mStatus_UnsupportedErr;
+}
+
+//===========================================================================================================================
+//	mDNSPlatformTLSTearDownCerts
+//===========================================================================================================================
+
+mDNSexport void
+mDNSPlatformTLSTearDownCerts(void)
+{
+}
+
+//===========================================================================================================================
+//	mDNSPlatformSetDNSConfig
+//===========================================================================================================================
+
+mDNSlocal void SetDNSServers( mDNS *const m );
+mDNSlocal void SetSearchDomainList( void );
+
+mDNSexport mDNSBool mDNSPlatformSetDNSConfig(mDNS *const m, mDNSBool setservers, mDNSBool setsearch, domainname *const fqdn, DNameListElem **regDomains, DNameListElem **browseDomains, mDNSBool ackConfig)
+{
+	(void) ackConfig;
+
+	if (setservers) SetDNSServers(m);
+	if (setsearch) SetSearchDomainList();
+	
+	if ( fqdn )
+	{
+		GetDDNSFQDN( fqdn );
+	}
+
+	if ( browseDomains )
+	{
+		GetDDNSDomains( browseDomains, kServiceParametersNode TEXT("\\DynDNS\\Setup\\") kServiceDynDNSBrowseDomains );
+	}
+
+	if ( regDomains )
+	{
+		GetDDNSDomains( regDomains, kServiceParametersNode TEXT("\\DynDNS\\Setup\\") kServiceDynDNSRegistrationDomains );
+	}
+    return mDNStrue;
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformDynDNSHostNameStatusChanged
+//===========================================================================================================================
+
+mDNSexport void
+mDNSPlatformDynDNSHostNameStatusChanged(const domainname *const dname, const mStatus status)
+{
+	char		uname[MAX_ESCAPED_DOMAIN_NAME];
+	BYTE		bStatus;
+	LPCTSTR		name;
+	HKEY		key = NULL;
+	mStatus		err;
+	char	*	p;
+	
+	ConvertDomainNameToCString(dname, uname);
+	
+	p = uname;
+
+	while (*p)
+	{
+		*p = (char) tolower(*p);
+		if (!(*(p+1)) && *p == '.') *p = 0; // if last character, strip trailing dot
+		p++;
+	}
+
+	check( strlen( p ) <= MAX_ESCAPED_DOMAIN_NAME );
+	name = kServiceParametersNode TEXT("\\DynDNS\\State\\HostNames");
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, name, &key );
+	require_noerr( err, exit );
+
+	bStatus = ( status ) ? 0 : 1;
+	err = RegSetValueEx( key, kServiceDynDNSStatus, 0, REG_DWORD, (const LPBYTE) &bStatus, sizeof(DWORD) );
+	require_noerr( err, exit );
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	return;
+}
+
+
+//===========================================================================================================================
+//	SetDomainSecrets
+//===========================================================================================================================
+
+// This routine needs to be called whenever the system secrets database changes.
+// We call it from DynDNSConfigDidChange and mDNSPlatformInit
+
+void
+SetDomainSecrets( mDNS * const m )
+{
+	DomainAuthInfo *ptr;
+	domainname		fqdn;
+	DNameListElem * regDomains = NULL;
+
+	// Rather than immediately deleting all keys now, we mark them for deletion in ten seconds.
+	// In the case where the user simultaneously removes their DDNS host name and the key
+	// for it, this gives mDNSResponder ten seconds to gracefully delete the name from the
+	// server before it loses access to the necessary key. Otherwise, we'd leave orphaned
+	// address records behind that we no longer have permission to delete.
+	
+	for (ptr = m->AuthInfoList; ptr; ptr = ptr->next)
+		ptr->deltime = NonZeroTime(m->timenow + mDNSPlatformOneSecond*10);
+
+	GetDDNSFQDN( &fqdn );
+
+	if ( fqdn.c[ 0 ] )
+	{
+		SetDomainSecret( m, &fqdn );
+	}
+
+	GetDDNSDomains( &regDomains, kServiceParametersNode TEXT("\\DynDNS\\Setup\\") kServiceDynDNSRegistrationDomains );
+
+	while ( regDomains )
+	{
+		DNameListElem * current = regDomains;
+		SetDomainSecret( m, &current->name );
+		regDomains = regDomains->next;
+		free( current );
+	}
+}
+
+
+//===========================================================================================================================
+//	SetSearchDomainList
+//===========================================================================================================================
+
+mDNSlocal void SetDomainFromDHCP( void );
+mDNSlocal void SetReverseMapSearchDomainList( void );
+
+mDNSlocal void
+SetSearchDomainList( void )
+{
+	char			*	searchList	= NULL;
+	DWORD				searchListLen;
+	//DNameListElem	*	head = NULL;
+	//DNameListElem	*	current = NULL;
+	char			*	tok;
+	HKEY				key;
+	mStatus				err;
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"), &key );
+	require_noerr( err, exit );
+
+	err = RegQueryString( key, "SearchList", &searchList, &searchListLen, NULL );
+	require_noerr( err, exit );
+
+	// Windows separates the search domains with ','
+
+	tok = strtok( searchList, "," );
+	while ( tok )
+	{
+		if ( ( strcmp( tok, "" ) != 0 ) && ( strcmp( tok, "." ) != 0 ) )
+			mDNS_AddSearchDomain_CString(tok, mDNSNULL);
+		tok = strtok( NULL, "," );
+	}
+
+exit:
+
+	if ( searchList ) 
+	{
+		free( searchList );
+	}
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+
+	SetDomainFromDHCP();
+	SetReverseMapSearchDomainList();
+}
+
+
+//===========================================================================================================================
+//	SetReverseMapSearchDomainList
+//===========================================================================================================================
+
+mDNSlocal void
+SetReverseMapSearchDomainList( void )
+{
+	struct ifaddrs	*	ifa;
+
+	ifa = myGetIfAddrs( 1 );
+	while (ifa)
+	{
+		mDNSAddr addr;
+		
+		if (ifa->ifa_addr->sa_family == AF_INET && !SetupAddr(&addr, ifa->ifa_addr) && !(ifa->ifa_flags & IFF_LOOPBACK) && ifa->ifa_netmask)
+		{
+			mDNSAddr	netmask;
+			char		buffer[256];
+			
+			if (!SetupAddr(&netmask, ifa->ifa_netmask))
+			{
+				sprintf(buffer, "%d.%d.%d.%d.in-addr.arpa.", addr.ip.v4.b[3] & netmask.ip.v4.b[3],
+                                                             addr.ip.v4.b[2] & netmask.ip.v4.b[2],
+                                                             addr.ip.v4.b[1] & netmask.ip.v4.b[1],
+                                                             addr.ip.v4.b[0] & netmask.ip.v4.b[0]);
+				mDNS_AddSearchDomain_CString(buffer, mDNSNULL);
+			}
+		}
+	
+		ifa = ifa->ifa_next;
+	}
+
+	return;
+}
+
+
+//===========================================================================================================================
+//	SetDNSServers
+//===========================================================================================================================
+
+mDNSlocal void
+SetDNSServers( mDNS *const m )
+{
+	PIP_PER_ADAPTER_INFO	pAdapterInfo	=	NULL;
+	FIXED_INFO			*	fixedInfo	= NULL;
+	ULONG					bufLen		= 0;	
+	IP_ADDR_STRING		*	dnsServerList;
+	IP_ADDR_STRING		*	ipAddr;
+	DWORD					index;
+	int						i			= 0;
+	mStatus					err			= kUnknownErr;
+
+	// Get the primary interface.
+
+	index = GetPrimaryInterface();
+
+	// This should have the interface index of the primary index.  Fall back in cases where
+	// it can't be determined.
+
+	if ( index )
+	{
+		bufLen = 0;
+
+		for ( i = 0; i < 100; i++ )
+		{
+			err = GetPerAdapterInfo( index, pAdapterInfo, &bufLen );
+
+			if ( err != ERROR_BUFFER_OVERFLOW )
+			{
+				break;
+			}
+
+			pAdapterInfo = (PIP_PER_ADAPTER_INFO) realloc( pAdapterInfo, bufLen );
+			require_action( pAdapterInfo, exit, err = mStatus_NoMemoryErr );
+		}
+
+		require_noerr( err, exit );
+
+		dnsServerList = &pAdapterInfo->DnsServerList;
+	}
+	else
+	{
+		bufLen = sizeof( FIXED_INFO );
+
+		for ( i = 0; i < 100; i++ )
+		{
+			if ( fixedInfo )
+			{
+				GlobalFree( fixedInfo );
+				fixedInfo = NULL;
+			}
+
+			fixedInfo = (FIXED_INFO*) GlobalAlloc( GPTR, bufLen );
+			require_action( fixedInfo, exit, err = mStatus_NoMemoryErr );
+	   
+			err = GetNetworkParams( fixedInfo, &bufLen );
+
+			if ( err != ERROR_BUFFER_OVERFLOW )
+			{
+				break;
+			}
+		}
+
+		require_noerr( err, exit );
+
+		dnsServerList = &fixedInfo->DnsServerList;
+	}
+
+	for ( ipAddr = dnsServerList; ipAddr; ipAddr = ipAddr->Next )
+	{
+		mDNSAddr addr;
+		err = StringToAddress( &addr, ipAddr->IpAddress.String );
+		if ( !err ) mDNS_AddDNSServer(m, mDNSNULL, mDNSInterface_Any, 0, &addr, UnicastDNSPort, kScopeNone, DEFAULT_UDNS_TIMEOUT, mDNSfalse, 0, mDNStrue, mDNStrue, mDNSfalse);
+	}
+
+exit:
+
+	if ( pAdapterInfo )
+	{
+		free( pAdapterInfo );
+	}
+
+	if ( fixedInfo )
+	{
+		GlobalFree( fixedInfo );
+	}
+}
+
+
+//===========================================================================================================================
+//	SetDomainFromDHCP
+//===========================================================================================================================
+
+mDNSlocal void
+SetDomainFromDHCP( void )
+{
+	int					i			= 0;
+	IP_ADAPTER_INFO *	pAdapterInfo;
+	IP_ADAPTER_INFO *	pAdapter;
+	DWORD				bufLen;
+	DWORD				index;
+	HKEY				key = NULL;
+	LPSTR				domain = NULL;
+	DWORD				dwSize;
+	mStatus				err = mStatus_NoError;
+
+	pAdapterInfo	= NULL;
+	
+	for ( i = 0; i < 100; i++ )
+	{
+		err = GetAdaptersInfo( pAdapterInfo, &bufLen);
+
+		if ( err != ERROR_BUFFER_OVERFLOW )
+		{
+			break;
+		}
+
+		pAdapterInfo = (IP_ADAPTER_INFO*) realloc( pAdapterInfo, bufLen );
+		require_action( pAdapterInfo, exit, err = kNoMemoryErr );
+	}
+
+	require_noerr( err, exit );
+
+	index = GetPrimaryInterface();
+
+	for ( pAdapter = pAdapterInfo; pAdapter; pAdapter = pAdapter->Next )
+	{
+		if ( pAdapter->IpAddressList.IpAddress.String &&
+		     pAdapter->IpAddressList.IpAddress.String[0] &&
+		     pAdapter->GatewayList.IpAddress.String &&
+		     pAdapter->GatewayList.IpAddress.String[0] &&
+		     ( !index || ( pAdapter->Index == index ) ) )
+		{
+			// Found one that will work
+
+			char keyName[1024];
+
+			_snprintf( keyName, 1024, "%s%s", "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\", pAdapter->AdapterName );
+
+			err = RegCreateKeyA( HKEY_LOCAL_MACHINE, keyName, &key );
+			require_noerr( err, exit );
+
+			err = RegQueryString( key, "Domain", &domain, &dwSize, NULL );
+			check_noerr( err );
+
+			if ( !domain || !domain[0] )
+			{
+				if ( domain )
+				{
+					free( domain );
+					domain = NULL;
+				}
+
+				err = RegQueryString( key, "DhcpDomain", &domain, &dwSize, NULL );
+				check_noerr( err );
+			}
+
+			if ( domain && domain[0] ) mDNS_AddSearchDomain_CString(domain, mDNSNULL);
+
+			break;
+		}
+	}
+
+exit:
+
+	if ( pAdapterInfo )
+	{
+		free( pAdapterInfo );
+	}
+
+	if ( domain )
+	{
+		free( domain );
+	}
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+//===========================================================================================================================
+//	mDNSPlatformGetPrimaryInterface
+//===========================================================================================================================
+
+mDNSexport mStatus
+mDNSPlatformGetPrimaryInterface( mDNS * const m, mDNSAddr * v4, mDNSAddr * v6, mDNSAddr * router )
+{
+	IP_ADAPTER_INFO *	pAdapterInfo;
+	IP_ADAPTER_INFO *	pAdapter;
+	DWORD				bufLen;
+	int					i;
+	BOOL				found;
+	DWORD				index;
+	mStatus				err = mStatus_NoError;
+
+	DEBUG_UNUSED( m );
+
+	*v6 = zeroAddr;
+
+	pAdapterInfo	= NULL;
+	bufLen			= 0;
+	found			= FALSE;
+
+	for ( i = 0; i < 100; i++ )
+	{
+		err = GetAdaptersInfo( pAdapterInfo, &bufLen);
+
+		if ( err != ERROR_BUFFER_OVERFLOW )
+		{
+			break;
+		}
+
+		pAdapterInfo = (IP_ADAPTER_INFO*) realloc( pAdapterInfo, bufLen );
+		require_action( pAdapterInfo, exit, err = kNoMemoryErr );
+	}
+
+	require_noerr( err, exit );
+
+	index = GetPrimaryInterface();
+
+	for ( pAdapter = pAdapterInfo; pAdapter; pAdapter = pAdapter->Next )
+	{
+		if ( pAdapter->IpAddressList.IpAddress.String &&
+		     pAdapter->IpAddressList.IpAddress.String[0] &&
+		     pAdapter->GatewayList.IpAddress.String &&
+		     pAdapter->GatewayList.IpAddress.String[0] &&
+		     ( StringToAddress( v4, pAdapter->IpAddressList.IpAddress.String ) == mStatus_NoError ) &&
+		     ( StringToAddress( router, pAdapter->GatewayList.IpAddress.String ) == mStatus_NoError ) &&
+		     ( !index || ( pAdapter->Index == index ) ) )
+		{
+			// Found one that will work
+
+			if ( pAdapter->AddressLength == sizeof( m->PrimaryMAC ) )
+			{
+				memcpy( &m->PrimaryMAC, pAdapter->Address, pAdapter->AddressLength );
+			}
+
+			found = TRUE;
+			break;
+		}
+	}
+
+exit:
+
+	if ( pAdapterInfo )
+	{
+		free( pAdapterInfo );
+	}
+
+	return err;
+}
+
+mDNSexport void mDNSPlatformSendKeepalive(mDNSAddr *sadd, mDNSAddr *dadd, mDNSIPPort *lport, mDNSIPPort *rport, mDNSu32 seq, mDNSu32 ack, mDNSu16 win)
+	{
+	(void) sadd; 	// Unused
+	(void) dadd; 	// Unused
+	(void) lport; 	// Unused
+	(void) rport; 	// Unused
+	(void) seq; 	// Unused
+	(void) ack; 	// Unused
+	(void) win;		// Unused
+	}
+
+mDNSexport mStatus mDNSPlatformGetRemoteMacAddr(mDNSAddr *raddr, char *eth)
+	{
+	(void) raddr; // Unused
+	(void) eth;   // Unused
+	}
+
+mDNSexport  mStatus    mDNSPlatformStoreSPSMACAddr(mDNSAddr *spsaddr, char *ifname)
+	{
+	(void) spsaddr; // Unused
+	(void) ifname;  // Unused
+	}
+
+mDNSexport  mStatus    mDNSPlatformClearSPSMACAddr(void)
+	{
+	}
+
+mDNSexport mStatus mDNSPlatformRetrieveTCPInfo(mDNS *const m, mDNSAddr *laddr, mDNSIPPort *lport, mDNSAddr *raddr, mDNSIPPort *rport, mDNSTCPInfo *mti)
+	{
+	(void) m;       // Unused
+	(void) laddr; 	// Unused
+	(void) raddr; 	// Unused
+	(void) lport; 	// Unused
+	(void) rport; 	// Unused
+	(void) mti; 	// Unused
+	}
+
+mDNSexport mDNSBool mDNSPlatformAllowPID(mDNS *const m, DNSQuestion *q)
+    {
+    (void) m;
+    (void) q;
+    return mDNStrue;
+    }
+
+mDNSexport mDNSs32 mDNSPlatformGetServiceID(mDNS *const m, DNSQuestion *q)
+    {
+    (void) m;
+    (void) q;
+    return -1;
+    }
+
+mDNSexport void mDNSPlatformSetDelegatePID(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)
+    {
+    (void) src;
+    (void) dst;
+    (void) q;
+    }
+
+mDNSexport mDNSs32 mDNSPlatformGetPID()
+    {
+    return 0;
+    }
+
+mDNSexport mDNSu16 mDNSPlatformGetUDPPort(UDPSocket *sock)
+{
+	DEBUG_UNUSED( sock );
+ 
+	return (mDNSu16)-1;
+}
+
+mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID)
+{
+	DEBUG_UNUSED( InterfaceID );
+    
+	return mDNSfalse;
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	debugf_
+//===========================================================================================================================
+#if( MDNS_DEBUGMSGS )
+mDNSexport void	debugf_( const char *inFormat, ... )
+{
+	char		buffer[ 512 ];
+    va_list		args;
+    mDNSu32		length;
+	
+	va_start( args, inFormat );
+	length = mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+	va_end( args );
+	
+	dlog( kDebugLevelInfo, "%s\n", buffer );
+}
+#endif
+
+//===========================================================================================================================
+//	verbosedebugf_
+//===========================================================================================================================
+
+#if( MDNS_DEBUGMSGS > 1 )
+mDNSexport void	verbosedebugf_( const char *inFormat, ... )
+{
+	char		buffer[ 512 ];
+    va_list		args;
+    mDNSu32		length;
+	
+	va_start( args, inFormat );
+	length = mDNS_vsnprintf( buffer, sizeof( buffer ), inFormat, args );
+	va_end( args );
+	
+	dlog( kDebugLevelVerbose, "%s\n", buffer );
+}
+#endif
+
+
+#if 0
+#pragma mark -
+#pragma mark == Platform Internals  ==
+#endif
+
+
+//===========================================================================================================================
+//	SetupNiceName
+//===========================================================================================================================
+
+mStatus	SetupNiceName( mDNS * const inMDNS )
+{
+	HKEY		descKey = NULL;
+	char		utf8[ 256 ];
+	LPCTSTR		s;
+	LPWSTR		joinName;
+	NETSETUP_JOIN_STATUS joinStatus;
+	mStatus		err = 0;
+	DWORD		namelen;
+	BOOL		ok;
+	
+	check( inMDNS );
+	
+	// Set up the nice name.
+	utf8[0] = '\0';
+
+	// First try and open the registry key that contains the computer description value
+	s = TEXT("SYSTEM\\CurrentControlSet\\Services\\lanmanserver\\parameters");
+	err = RegOpenKeyEx( HKEY_LOCAL_MACHINE, s, 0, KEY_READ, &descKey);
+	check_translated_errno( err == 0, errno_compat(), kNameErr );
+
+	if ( !err )
+	{
+		TCHAR	desc[256];
+		DWORD	descSize = sizeof( desc );
+
+		// look for the computer description
+		err = RegQueryValueEx( descKey, TEXT("srvcomment"), 0, NULL, (LPBYTE) &desc, &descSize);
+		
+		if ( !err )
+		{
+			err = TCHARtoUTF8( desc, utf8, sizeof( utf8 ) );
+		}
+
+		if ( err )
+		{
+			utf8[ 0 ] = '\0';
+		}
+	}
+
+	// if we can't find it in the registry, then use the hostname of the machine
+	if ( err || ( utf8[ 0 ] == '\0' ) )
+	{
+		TCHAR hostname[256];
+		
+		namelen = sizeof( hostname ) / sizeof( TCHAR );
+
+		ok = GetComputerNameExW( ComputerNamePhysicalDnsHostname, hostname, &namelen );
+		err = translate_errno( ok, (mStatus) GetLastError(), kNameErr );
+		check_noerr( err );
+		
+		if( !err )
+		{
+			err = TCHARtoUTF8( hostname, utf8, sizeof( utf8 ) );
+		}
+
+		if ( err )
+		{
+			utf8[ 0 ] = '\0';
+		}
+	}
+
+	// if we can't get the hostname
+	if ( err || ( utf8[ 0 ] == '\0' ) )
+	{
+		// Invalidate name so fall back to a default name.
+		
+		strcpy( utf8, kMDNSDefaultName );
+	}
+
+	utf8[ sizeof( utf8 ) - 1 ]	= '\0';	
+	inMDNS->nicelabel.c[ 0 ]	= (mDNSu8) (strlen( utf8 ) < MAX_DOMAIN_LABEL ? strlen( utf8 ) : MAX_DOMAIN_LABEL);
+	memcpy( &inMDNS->nicelabel.c[ 1 ], utf8, inMDNS->nicelabel.c[ 0 ] );
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "nice name \"%.*s\"\n", inMDNS->nicelabel.c[ 0 ], &inMDNS->nicelabel.c[ 1 ] );
+	
+	if ( descKey )
+	{
+		RegCloseKey( descKey );
+	}
+
+	ZeroMemory( inMDNS->p->nbname, sizeof( inMDNS->p->nbname ) );
+	ZeroMemory( inMDNS->p->nbdomain, sizeof( inMDNS->p->nbdomain ) );
+
+	namelen = sizeof( inMDNS->p->nbname );
+	ok = GetComputerNameExA( ComputerNamePhysicalNetBIOS, inMDNS->p->nbname, &namelen );
+	check( ok );
+	if ( ok ) dlog( kDebugLevelInfo, DEBUG_NAME "netbios name \"%s\"\n", inMDNS->p->nbname );
+
+	err = NetGetJoinInformation( NULL, &joinName, &joinStatus );
+	check ( err == NERR_Success );
+	if ( err == NERR_Success )
+	{
+		if ( ( joinStatus == NetSetupWorkgroupName ) || ( joinStatus == NetSetupDomainName ) )
+		{
+			err = TCHARtoUTF8( joinName, inMDNS->p->nbdomain, sizeof( inMDNS->p->nbdomain ) );
+			check( !err );
+			if ( !err ) dlog( kDebugLevelInfo, DEBUG_NAME "netbios domain/workgroup \"%s\"\n", inMDNS->p->nbdomain );
+		}
+
+		NetApiBufferFree( joinName );
+		joinName = NULL;
+	}
+
+	err = 0;
+
+	return( err );
+}
+
+//===========================================================================================================================
+//	SetupHostName
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupHostName( mDNS * const inMDNS )
+{
+	mStatus		err = 0;
+	char		tempString[ 256 ];
+	DWORD		tempStringLen;
+	domainlabel tempLabel;
+	BOOL		ok;
+	
+	check( inMDNS );
+
+	// Set up the nice name.
+	tempString[ 0 ] = '\0';
+
+	// use the hostname of the machine
+	tempStringLen = sizeof( tempString );
+	ok = GetComputerNameExA( ComputerNamePhysicalDnsHostname, tempString, &tempStringLen );
+	err = translate_errno( ok, (mStatus) GetLastError(), kNameErr );
+	check_noerr( err );
+
+	// if we can't get the hostname
+	if( err || ( tempString[ 0 ] == '\0' ) )
+	{
+		// Invalidate name so fall back to a default name.
+		
+		strcpy( tempString, kMDNSDefaultName );
+	}
+
+	tempString[ sizeof( tempString ) - 1 ] = '\0';
+	tempLabel.c[ 0 ] = (mDNSu8) (strlen( tempString ) < MAX_DOMAIN_LABEL ? strlen( tempString ) : MAX_DOMAIN_LABEL );
+	memcpy( &tempLabel.c[ 1 ], tempString, tempLabel.c[ 0 ] );
+	
+	// Set up the host name.
+	
+	ConvertUTF8PstringToRFC1034HostLabel( tempLabel.c, &inMDNS->hostlabel );
+	if( inMDNS->hostlabel.c[ 0 ] == 0 )
+	{
+		// Nice name has no characters that are representable as an RFC1034 name (e.g. Japanese) so use the default.
+		
+		MakeDomainLabelFromLiteralString( &inMDNS->hostlabel, kMDNSDefaultName );
+	}
+
+	check( inMDNS->hostlabel.c[ 0 ] != 0 );
+	
+	mDNS_SetFQDN( inMDNS );
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "host name \"%.*s\"\n", inMDNS->hostlabel.c[ 0 ], &inMDNS->hostlabel.c[ 1 ] );
+	
+	return( err );
+}
+
+//===========================================================================================================================
+//	SetupName
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupName( mDNS * const inMDNS )
+{
+	mStatus		err = 0;
+	
+	check( inMDNS );
+	
+	err = SetupNiceName( inMDNS );
+	check_noerr( err );
+
+	err = SetupHostName( inMDNS );
+	check_noerr( err );
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	SetupInterfaceList
+//===========================================================================================================================
+
+mStatus	SetupInterfaceList( mDNS * const inMDNS )
+{
+	mStatus						err;
+	mDNSInterfaceData **		next;
+	mDNSInterfaceData *			ifd;
+	struct ifaddrs *			addrs;
+	struct ifaddrs *			p;
+	struct ifaddrs *			loopbackv4;
+	struct ifaddrs *			loopbackv6;
+	u_int						flagMask;
+	u_int						flagTest;
+	mDNSBool					foundv4;
+	mDNSBool					foundv6;
+	mDNSBool					foundUnicastSock4DestAddr;
+	mDNSBool					foundUnicastSock6DestAddr;
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "setting up interface list\n" );
+	check( inMDNS );
+	check( inMDNS->p );
+	
+	inMDNS->p->registeredLoopback4	= mDNSfalse;
+	inMDNS->p->nextDHCPLeaseExpires = 0x7FFFFFFF;
+	addrs							= NULL;
+	foundv4							= mDNSfalse;
+	foundv6							= mDNSfalse;
+	foundUnicastSock4DestAddr		= mDNSfalse;
+	foundUnicastSock6DestAddr		= mDNSfalse;
+	
+	// Tear down any existing interfaces that may be set up.
+	
+	TearDownInterfaceList( inMDNS );
+
+	// Set up the name of this machine.
+	
+	err = SetupName( inMDNS );
+	check_noerr( err );
+
+	// Set up IPv4 interface(s). We have to set up IPv4 first so any IPv6 interface with an IPv4-routable address
+	// can refer to the IPv4 interface when it registers to allow DNS AAAA records over the IPv4 interface.
+	
+	err = getifaddrs( &addrs );
+	require_noerr( err, exit );
+	
+	loopbackv4	= NULL;
+	loopbackv6	= NULL;
+	next		= &inMDNS->p->interfaceList;
+
+	flagMask = IFF_UP | IFF_MULTICAST;
+	flagTest = IFF_UP | IFF_MULTICAST;
+	
+#if( MDNS_WINDOWS_ENABLE_IPV4 )
+	for( p = addrs; p; p = p->ifa_next )
+	{
+		if( !p->ifa_addr || ( p->ifa_addr->sa_family != AF_INET ) || ( ( p->ifa_flags & flagMask ) != flagTest ) )
+		{
+			continue;
+		}
+		if( p->ifa_flags & IFF_LOOPBACK )
+		{
+			if( !loopbackv4 )
+			{
+				loopbackv4 = p;
+			}
+			continue;
+		}
+		dlog( kDebugLevelVerbose, DEBUG_NAME "Interface %40s (0x%08X) %##a\n", 
+			p->ifa_name ? p->ifa_name : "<null>", p->ifa_extra.index, p->ifa_addr );
+		
+		err = SetupInterface( inMDNS, p, &ifd );
+		require_noerr( err, exit );
+
+		// If this guy is point-to-point (ifd->interfaceInfo.McastTxRx == 0 ) we still want to
+		// register him, but we also want to note that we haven't found a v4 interface
+		// so that we register loopback so same host operations work
+ 		
+		if ( ifd->interfaceInfo.McastTxRx == mDNStrue )
+		{
+			foundv4 = mDNStrue;
+		}
+
+		if ( p->ifa_dhcpEnabled && ( p->ifa_dhcpLeaseExpires < inMDNS->p->nextDHCPLeaseExpires ) )
+		{
+			inMDNS->p->nextDHCPLeaseExpires = p->ifa_dhcpLeaseExpires;
+		}
+
+		// If we're on a platform that doesn't have WSARecvMsg(), there's no way
+		// of determing the destination address of a packet that is sent to us.
+		// For multicast packets, that's easy to determine.  But for the unicast
+		// sockets, we'll fake it by taking the address of the first interface
+		// that is successfully setup.
+
+		if ( !foundUnicastSock4DestAddr )
+		{
+			inMDNS->p->unicastSock4.addr = ifd->interfaceInfo.ip;
+			foundUnicastSock4DestAddr = TRUE;
+		}
+			
+		*next = ifd;
+		next  = &ifd->next;
+		++inMDNS->p->interfaceCount;
+	}
+#endif
+	
+	// Set up IPv6 interface(s) after IPv4 is set up (see IPv4 notes above for reasoning).
+	
+#if( MDNS_WINDOWS_ENABLE_IPV6 )
+
+	if ( gEnableIPv6 )
+	{
+		for( p = addrs; p; p = p->ifa_next )
+		{
+			if( !p->ifa_addr || ( p->ifa_addr->sa_family != AF_INET6 ) || ( ( p->ifa_flags & flagMask ) != flagTest ) )
+			{
+				continue;
+			}
+			if( p->ifa_flags & IFF_LOOPBACK )
+			{
+				if( !loopbackv6 )
+				{
+					loopbackv6 = p;
+				}
+				continue;
+			}
+			dlog( kDebugLevelVerbose, DEBUG_NAME "Interface %40s (0x%08X) %##a\n", 
+				p->ifa_name ? p->ifa_name : "<null>", p->ifa_extra.index, p->ifa_addr );
+			
+			err = SetupInterface( inMDNS, p, &ifd );
+			require_noerr( err, exit );
+					
+			// If this guy is point-to-point (ifd->interfaceInfo.McastTxRx == 0 ) we still want to
+			// register him, but we also want to note that we haven't found a v4 interface
+			// so that we register loopback so same host operations work
+	 		
+			if ( ifd->interfaceInfo.McastTxRx == mDNStrue )
+			{
+				foundv6 = mDNStrue;
+			}
+
+			// If we're on a platform that doesn't have WSARecvMsg(), there's no way
+			// of determing the destination address of a packet that is sent to us.
+			// For multicast packets, that's easy to determine.  But for the unicast
+			// sockets, we'll fake it by taking the address of the first interface
+			// that is successfully setup.
+
+			if ( !foundUnicastSock6DestAddr )
+			{
+				inMDNS->p->unicastSock6.addr = ifd->interfaceInfo.ip;
+				foundUnicastSock6DestAddr = TRUE;
+			}
+
+			*next = ifd;
+			next  = &ifd->next;
+			++inMDNS->p->interfaceCount;
+		}
+	}
+
+#endif
+
+	// If there are no real interfaces, but there is a loopback interface, use that so same-machine operations work.
+
+#if( !MDNS_WINDOWS_ENABLE_IPV4 && !MDNS_WINDOWS_ENABLE_IPV6 )
+	
+	flagMask |= IFF_LOOPBACK;
+	flagTest |= IFF_LOOPBACK;
+	
+	for( p = addrs; p; p = p->ifa_next )
+	{
+		if( !p->ifa_addr || ( ( p->ifa_flags & flagMask ) != flagTest ) )
+		{
+			continue;
+		}
+		if( ( p->ifa_addr->sa_family != AF_INET ) && ( p->ifa_addr->sa_family != AF_INET6 ) )
+		{
+			continue;
+		}
+		
+		v4loopback = p;
+		break;
+	}
+	
+#endif
+	
+	if ( !foundv4 && loopbackv4 )
+	{
+		dlog( kDebugLevelInfo, DEBUG_NAME "Interface %40s (0x%08X) %##a\n", 
+			loopbackv4->ifa_name ? loopbackv4->ifa_name : "<null>", loopbackv4->ifa_extra.index, loopbackv4->ifa_addr );
+		
+		err = SetupInterface( inMDNS, loopbackv4, &ifd );
+		require_noerr( err, exit );
+
+		inMDNS->p->registeredLoopback4 = mDNStrue;
+		
+#if( MDNS_WINDOWS_ENABLE_IPV4 )
+
+		// If we're on a platform that doesn't have WSARecvMsg(), there's no way
+		// of determing the destination address of a packet that is sent to us.
+		// For multicast packets, that's easy to determine.  But for the unicast
+		// sockets, we'll fake it by taking the address of the first interface
+		// that is successfully setup.
+
+		if ( !foundUnicastSock4DestAddr )
+		{
+			inMDNS->p->unicastSock4.addr = ifd->sock.addr;
+			foundUnicastSock4DestAddr = TRUE;
+		}
+#endif
+
+		*next = ifd;
+		next  = &ifd->next;
+		++inMDNS->p->interfaceCount;
+	}
+
+	if ( !foundv6 && loopbackv6 )
+	{
+		dlog( kDebugLevelInfo, DEBUG_NAME "Interface %40s (0x%08X) %##a\n", 
+			loopbackv6->ifa_name ? loopbackv6->ifa_name : "<null>", loopbackv6->ifa_extra.index, loopbackv6->ifa_addr );
+		
+		err = SetupInterface( inMDNS, loopbackv6, &ifd );
+		require_noerr( err, exit );
+		
+#if( MDNS_WINDOWS_ENABLE_IPV6 )
+
+		if ( gEnableIPv6 )
+		{
+			// If we're on a platform that doesn't have WSARecvMsg(), there's no way
+			// of determing the destination address of a packet that is sent to us.
+			// For multicast packets, that's easy to determine.  But for the unicast
+			// sockets, we'll fake it by taking the address of the first interface
+			// that is successfully setup.
+
+			if ( !foundUnicastSock6DestAddr )
+			{
+				inMDNS->p->unicastSock6.addr = ifd->sock.addr;
+				foundUnicastSock6DestAddr = TRUE;
+			}
+		}
+
+#endif
+
+		*next = ifd;
+		next  = &ifd->next;
+		++inMDNS->p->interfaceCount;
+	}
+
+	CheckFileShares( inMDNS );
+
+exit:
+	if( err )
+	{
+		TearDownInterfaceList( inMDNS );
+	}
+	if( addrs )
+	{
+		freeifaddrs( addrs );
+	}
+	dlog( kDebugLevelTrace, DEBUG_NAME "setting up interface list done (err=%d %m)\n", err, err );
+	return( err );
+}
+
+//===========================================================================================================================
+//	TearDownInterfaceList
+//===========================================================================================================================
+
+mStatus	TearDownInterfaceList( mDNS * const inMDNS )
+{
+	mDNSInterfaceData **		p;
+	mDNSInterfaceData *		ifd;
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "tearing down interface list\n" );
+	check( inMDNS );
+	check( inMDNS->p );
+
+	// Free any interfaces that were previously marked inactive and are no longer referenced by the mDNS cache.
+	// Interfaces are marked inactive, but not deleted immediately if they were still referenced by the mDNS cache
+	// so that remove events that occur after an interface goes away can still report the correct interface.
+
+	p = &inMDNS->p->inactiveInterfaceList;
+	while( *p )
+	{
+		ifd = *p;
+		if( NumCacheRecordsForInterfaceID( inMDNS, (mDNSInterfaceID) ifd ) > 0 )
+		{
+			p = &ifd->next;
+			continue;
+		}
+		
+		dlog( kDebugLevelInfo, DEBUG_NAME "freeing unreferenced, inactive interface %#p %#a\n", ifd, &ifd->interfaceInfo.ip );
+		*p = ifd->next;
+
+		QueueUserAPC( ( PAPCFUNC ) FreeInterface, inMDNS->p->mainThread, ( ULONG_PTR ) ifd );
+	}
+
+	// Tear down all the interfaces.
+	
+	while( inMDNS->p->interfaceList )
+	{
+		ifd = inMDNS->p->interfaceList;
+		inMDNS->p->interfaceList = ifd->next;
+		
+		TearDownInterface( inMDNS, ifd );
+	}
+	inMDNS->p->interfaceCount = 0;
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "tearing down interface list done\n" );
+	return( mStatus_NoError );
+}
+
+//===========================================================================================================================
+//	SetupInterface
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupInterface( mDNS * const inMDNS, const struct ifaddrs *inIFA, mDNSInterfaceData **outIFD )
+{
+	mDNSInterfaceData	*	ifd;
+	mDNSInterfaceData	*	p;
+	mStatus					err;
+	
+	ifd = NULL;
+	dlog( kDebugLevelTrace, DEBUG_NAME "setting up interface\n" );
+	check( inMDNS );
+	check( inMDNS->p );
+	check( inIFA );
+	check( inIFA->ifa_addr );
+	check( outIFD );
+	
+	// Allocate memory for the interface and initialize it.
+	
+	ifd = (mDNSInterfaceData *) calloc( 1, sizeof( *ifd ) );
+	require_action( ifd, exit, err = mStatus_NoMemoryErr );
+	ifd->sock.fd	= kInvalidSocketRef;
+	ifd->sock.ifd	= ifd;
+	ifd->sock.next	= NULL;
+	ifd->sock.m		= inMDNS;
+	ifd->index		= inIFA->ifa_extra.index;
+	ifd->scopeID	= inIFA->ifa_extra.index;
+	check( strlen( inIFA->ifa_name ) < sizeof( ifd->name ) );
+	strncpy( ifd->name, inIFA->ifa_name, sizeof( ifd->name ) - 1 );
+	ifd->name[ sizeof( ifd->name ) - 1 ] = '\0';
+	
+	strncpy(ifd->interfaceInfo.ifname, inIFA->ifa_name, sizeof(ifd->interfaceInfo.ifname));
+	ifd->interfaceInfo.ifname[sizeof(ifd->interfaceInfo.ifname)-1] = 0;
+	
+	// We always send and receive using IPv4, but to reduce traffic, we send and receive using IPv6 only on interfaces 
+	// that have no routable IPv4 address. Having a routable IPv4 address assigned is a reasonable indicator of being 
+	// on a large configured network, which means there's a good chance that most or all the other devices on that 
+	// network should also have v4. By doing this we lose the ability to talk to true v6-only devices on that link, 
+	// but we cut the packet rate in half. At this time, reducing the packet rate is more important than v6-only 
+	// devices on a large configured network, so we are willing to make that sacrifice.
+	
+	ifd->interfaceInfo.McastTxRx   = ( ( inIFA->ifa_flags & IFF_MULTICAST ) && !( inIFA->ifa_flags & IFF_POINTTOPOINT ) ) ? mDNStrue : mDNSfalse;
+	ifd->interfaceInfo.InterfaceID = NULL;
+
+	for( p = inMDNS->p->interfaceList; p; p = p->next )
+	{
+		if ( strcmp( p->name, ifd->name ) == 0 )
+		{
+			if (!ifd->interfaceInfo.InterfaceID)
+			{
+				ifd->interfaceInfo.InterfaceID	= (mDNSInterfaceID) p;
+			}
+
+			if ( ( inIFA->ifa_addr->sa_family != AF_INET ) &&
+			     ( p->interfaceInfo.ip.type == mDNSAddrType_IPv4 ) &&
+			     ( p->interfaceInfo.ip.ip.v4.b[ 0 ] != 169 || p->interfaceInfo.ip.ip.v4.b[ 1 ] != 254 ) )
+			{
+				ifd->interfaceInfo.McastTxRx = mDNSfalse;
+			}
+
+			break;
+		}
+	}
+
+	if ( !ifd->interfaceInfo.InterfaceID )
+	{
+		ifd->interfaceInfo.InterfaceID = (mDNSInterfaceID) ifd;
+	}
+
+	// Set up a socket for this interface (if needed).
+	
+	if( ifd->interfaceInfo.McastTxRx )
+	{
+		DWORD size;
+			
+		err = SetupSocket( inMDNS, inIFA->ifa_addr, MulticastDNSPort, &ifd->sock.fd );
+		require_noerr( err, exit );
+		ifd->sock.addr = ( inIFA->ifa_addr->sa_family == AF_INET6 ) ? AllDNSLinkGroup_v6 : AllDNSLinkGroup_v4;
+		ifd->sock.port = MulticastDNSPort;
+		
+		// Get a ptr to the WSARecvMsg function, if supported. Otherwise, we'll fallback to recvfrom.
+
+		err = WSAIoctl( ifd->sock.fd, SIO_GET_EXTENSION_FUNCTION_POINTER, &kWSARecvMsgGUID, sizeof( kWSARecvMsgGUID ), &ifd->sock.recvMsgPtr, sizeof( ifd->sock.recvMsgPtr ), &size, NULL, NULL );
+
+		if ( err )
+		{
+			ifd->sock.recvMsgPtr = NULL;
+		}
+	}
+
+	if ( inIFA->ifa_dhcpEnabled && ( inIFA->ifa_dhcpLeaseExpires < inMDNS->p->nextDHCPLeaseExpires ) )
+	{
+		inMDNS->p->nextDHCPLeaseExpires = inIFA->ifa_dhcpLeaseExpires;
+	}
+
+	ifd->interfaceInfo.NetWake = inIFA->ifa_womp;
+
+	// Register this interface with mDNS.
+	
+	err = SockAddrToMDNSAddr( inIFA->ifa_addr, &ifd->interfaceInfo.ip, NULL );
+	require_noerr( err, exit );
+	
+	err = SockAddrToMDNSAddr( inIFA->ifa_netmask, &ifd->interfaceInfo.mask, NULL );
+	require_noerr( err, exit );
+
+	memcpy( ifd->interfaceInfo.MAC.b, inIFA->ifa_physaddr, sizeof( ifd->interfaceInfo.MAC.b ) );
+	
+	ifd->interfaceInfo.Advertise = ( mDNSu8 ) inMDNS->AdvertiseLocalAddresses;
+
+	if ( ifd->sock.fd != kInvalidSocketRef )
+	{
+		err = mDNSPollRegisterSocket( ifd->sock.fd, FD_READ, UDPSocketNotification, &ifd->sock );
+		require_noerr( err, exit );
+	}
+
+    // If interface is a direct link, address record will be marked as kDNSRecordTypeKnownUnique
+    // and skip the probe phase of the probe/announce packet sequence.
+    ifd->interfaceInfo.DirectLink = mDNSfalse;
+
+	err = mDNS_RegisterInterface( inMDNS, &ifd->interfaceInfo, mDNSfalse );
+	require_noerr( err, exit );
+	ifd->hostRegistered = mDNStrue;
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "Registered interface %##a with mDNS\n", inIFA->ifa_addr );
+	
+	// Success!
+	
+	*outIFD = ifd;
+	ifd = NULL;
+	
+exit:
+
+	if( ifd )
+	{
+		TearDownInterface( inMDNS, ifd );
+	}
+	dlog( kDebugLevelTrace, DEBUG_NAME "setting up interface done (err=%d %m)\n", err, err );
+	return( err );
+}
+
+//===========================================================================================================================
+//	TearDownInterface
+//===========================================================================================================================
+
+mDNSlocal mStatus	TearDownInterface( mDNS * const inMDNS, mDNSInterfaceData *inIFD )
+{	
+	check( inMDNS );
+	check( inIFD );
+	
+	// Deregister this interface with mDNS.
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "Deregistering interface %#a with mDNS\n", &inIFD->interfaceInfo.ip );
+	
+	if( inIFD->hostRegistered )
+	{
+		inIFD->hostRegistered = mDNSfalse;
+		mDNS_DeregisterInterface( inMDNS, &inIFD->interfaceInfo, mDNSfalse );
+	}
+	
+	// Tear down the multicast socket.
+	
+	UDPCloseSocket( &inIFD->sock );
+
+	// If the interface is still referenced by items in the mDNS cache then put it on the inactive list. This keeps 
+	// the InterfaceID valid so remove events report the correct interface. If it is no longer referenced, free it.
+
+	if( NumCacheRecordsForInterfaceID( inMDNS, (mDNSInterfaceID) inIFD ) > 0 )
+	{
+		inIFD->next = inMDNS->p->inactiveInterfaceList;
+		inMDNS->p->inactiveInterfaceList = inIFD;
+		dlog( kDebugLevelInfo, DEBUG_NAME "deferring free of interface %#p %#a\n", inIFD, &inIFD->interfaceInfo.ip );
+	}
+	else
+	{
+		dlog( kDebugLevelInfo, DEBUG_NAME "freeing interface %#p %#a immediately\n", inIFD, &inIFD->interfaceInfo.ip );
+		QueueUserAPC( ( PAPCFUNC ) FreeInterface, inMDNS->p->mainThread, ( ULONG_PTR ) inIFD );
+	}
+
+	return( mStatus_NoError );
+}
+
+mDNSlocal void CALLBACK FreeInterface( mDNSInterfaceData *inIFD )
+{
+	free( inIFD );
+}
+
+//===========================================================================================================================
+//	SetupSocket
+//===========================================================================================================================
+
+mDNSlocal mStatus	SetupSocket( mDNS * const inMDNS, const struct sockaddr *inAddr, mDNSIPPort port, SocketRef *outSocketRef  )
+{
+	mStatus			err;
+	SocketRef		sock;
+	int				option;
+	DWORD			bytesReturned = 0;
+	BOOL			behavior = FALSE;
+	
+	DEBUG_UNUSED( inMDNS );
+	
+	dlog( kDebugLevelTrace, DEBUG_NAME "setting up socket %##a\n", inAddr );
+	check( inMDNS );
+	check( outSocketRef );
+	
+	// Set up an IPv4 or IPv6 UDP socket.
+	
+	sock = socket( inAddr->sa_family, SOCK_DGRAM, IPPROTO_UDP );
+	err = translate_errno( IsValidSocket( sock ), errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+		
+	// Turn on reuse address option so multiple servers can listen for Multicast DNS packets,
+	// if we're creating a multicast socket
+	
+	if ( !mDNSIPPortIsZero( port ) )
+	{
+		option = 1;
+		err = setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+	}
+
+	// <rdar://problem/7894393> Bonjour for Windows broken on Windows XP
+	//
+	// Not sure why, but the default behavior for sockets is to behave incorrectly
+	// when using them in Overlapped I/O mode on XP. According to MSDN:
+	//
+	// SIO_UDP_CONNRESET (opcode setting: I, T==3)
+	//     Windows XP:  Controls whether UDP PORT_UNREACHABLE messages are reported. Set to TRUE to enable reporting.
+	//     Set to FALSE to disable reporting.
+	//
+	// Packet traces from misbehaving Bonjour installations showed that ICMP port unreachable
+	// messages were being sent to us after we sent out packets to a multicast address. This is clearly
+	// incorrect behavior, but should be harmless. However, after receiving a port unreachable error, WinSock
+	// will no longer receive any packets from that socket, which is not harmless. This behavior is only
+	// seen on XP.
+	//
+	// So we turn off port unreachable reporting to make sure our sockets that are reading
+	// multicast packets function correctly under all circumstances.
+
+	err = WSAIoctl( sock, SIO_UDP_CONNRESET, &behavior, sizeof(behavior), NULL, 0, &bytesReturned, NULL, NULL );
+	check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+	if( inAddr->sa_family == AF_INET )
+	{
+		mDNSv4Addr				ipv4;
+		struct sockaddr_in		sa4;
+		struct ip_mreq			mreqv4;
+		
+		// Bind the socket to the desired port
+		
+		ipv4.NotAnInteger 	= ( (const struct sockaddr_in *) inAddr )->sin_addr.s_addr;
+		mDNSPlatformMemZero( &sa4, sizeof( sa4 ) );
+		sa4.sin_family 		= AF_INET;
+		sa4.sin_port 		= port.NotAnInteger;
+		sa4.sin_addr.s_addr	= ipv4.NotAnInteger;
+		
+		err = bind( sock, (struct sockaddr *) &sa4, sizeof( sa4 ) );
+		check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+		
+		// Turn on option to receive destination addresses and receiving interface.
+		
+		option = 1;
+		err = setsockopt( sock, IPPROTO_IP, IP_PKTINFO, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+		if ( !mDNSIPPortIsZero( port ) )
+		{
+			// Join the all-DNS multicast group so we receive Multicast DNS packets
+
+			mreqv4.imr_multiaddr.s_addr = AllDNSLinkGroup_v4.ip.v4.NotAnInteger;
+			mreqv4.imr_interface.s_addr = ipv4.NotAnInteger;
+			err = setsockopt( sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &mreqv4, sizeof( mreqv4 ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+			// Specify the interface to send multicast packets on this socket.
+		
+			sa4.sin_addr.s_addr = ipv4.NotAnInteger;
+			err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_IF, (char *) &sa4.sin_addr, sizeof( sa4.sin_addr ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+			// Enable multicast loopback so we receive multicast packets we send (for same-machine operations).
+		
+			option = 1;
+			err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &option, sizeof( option ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		}
+
+		// Send unicast packets with TTL 255 (helps against spoofing).
+		
+		option = 255;
+		err = setsockopt( sock, IPPROTO_IP, IP_TTL, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+		// Send multicast packets with TTL 255 (helps against spoofing).
+		
+		option = 255;
+		err = setsockopt( sock, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+	}
+	else if( inAddr->sa_family == AF_INET6 )
+	{
+		struct sockaddr_in6 *		sa6p;
+		struct sockaddr_in6			sa6;
+		struct ipv6_mreq			mreqv6;
+		
+		sa6p = (struct sockaddr_in6 *) inAddr;
+		
+		// Bind the socket to the desired port
+		
+		mDNSPlatformMemZero( &sa6, sizeof( sa6 ) );
+		sa6.sin6_family		= AF_INET6;
+		sa6.sin6_port		= port.NotAnInteger;
+		sa6.sin6_flowinfo	= 0;
+		sa6.sin6_addr		= sa6p->sin6_addr;
+		sa6.sin6_scope_id	= sa6p->sin6_scope_id;
+		
+		err = bind( sock, (struct sockaddr *) &sa6, sizeof( sa6 ) );
+		check_translated_errno( err == 0, errno_compat(), kUnknownErr );
+		
+		// Turn on option to receive destination addresses and receiving interface.
+		
+		option = 1;
+		err = setsockopt( sock, IPPROTO_IPV6, IPV6_PKTINFO, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+		// We only want to receive IPv6 packets (not IPv4-mapped IPv6 addresses) because we have a separate socket 
+		// for IPv4, but the IPv6 stack in Windows currently doesn't support IPv4-mapped IPv6 addresses and doesn't
+		// support the IPV6_V6ONLY socket option so the following code would typically not be executed (or needed).
+		
+		#if( defined( IPV6_V6ONLY ) )
+			option = 1;
+			err = setsockopt( sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &option, sizeof( option ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );		
+		#endif
+		
+		if ( !mDNSIPPortIsZero( port ) )
+		{
+			// Join the all-DNS multicast group so we receive Multicast DNS packets.
+		
+			mreqv6.ipv6mr_multiaddr = *( (struct in6_addr *) &AllDNSLinkGroup_v6.ip.v6 );
+			mreqv6.ipv6mr_interface = sa6p->sin6_scope_id;
+			err = setsockopt( sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *) &mreqv6, sizeof( mreqv6 ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+			// Specify the interface to send multicast packets on this socket.
+		
+			option = (int) sa6p->sin6_scope_id;
+			err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, (char *) &option, sizeof( option ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		
+			// Enable multicast loopback so we receive multicast packets we send (for same-machine operations).
+			
+			option = 1;
+			err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &option, sizeof( option ) );
+			check_translated_errno( err == 0, errno_compat(), kOptionErr );
+		}
+
+		// Send unicast packets with TTL 255 (helps against spoofing).
+		
+		option = 255;
+		err = setsockopt( sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+
+		// Send multicast packets with TTL 255 (helps against spoofing).
+			
+		option = 255;
+		err = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &option, sizeof( option ) );
+		check_translated_errno( err == 0, errno_compat(), kOptionErr );
+	}
+	else
+	{
+		dlog( kDebugLevelError, DEBUG_NAME "%s: unsupport socket family (%d)\n", __ROUTINE__, inAddr->sa_family );
+		err = kUnsupportedErr;
+		goto exit;
+	}
+	
+	// Success!
+	
+	*outSocketRef = sock;
+	sock = kInvalidSocketRef;
+	err = mStatus_NoError;
+	
+exit:
+	if( IsValidSocket( sock ) )
+	{
+		close_compat( sock );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	SetupSocket
+//===========================================================================================================================
+
+mDNSlocal mStatus	SockAddrToMDNSAddr( const struct sockaddr * const inSA, mDNSAddr *outIP, mDNSIPPort *outPort )
+{
+	mStatus		err;
+	
+	check( inSA );
+	check( outIP );
+	
+	if( inSA->sa_family == AF_INET )
+	{
+		struct sockaddr_in *		sa4;
+		
+		sa4 						= (struct sockaddr_in *) inSA;
+		outIP->type 				= mDNSAddrType_IPv4;
+		outIP->ip.v4.NotAnInteger	= sa4->sin_addr.s_addr;
+		if( outPort )
+		{
+			outPort->NotAnInteger	= sa4->sin_port;
+		}
+		err = mStatus_NoError;
+	}
+	else if( inSA->sa_family == AF_INET6 )
+	{
+		struct sockaddr_in6 *		sa6;
+		
+		sa6 			= (struct sockaddr_in6 *) inSA;
+		outIP->type 	= mDNSAddrType_IPv6;
+		outIP->ip.v6 	= *( (mDNSv6Addr *) &sa6->sin6_addr );
+		if( IN6_IS_ADDR_LINKLOCAL( &sa6->sin6_addr ) )
+		{
+			outIP->ip.v6.w[ 1 ] = 0;
+		}
+		if( outPort )
+		{
+			outPort->NotAnInteger = sa6->sin6_port;
+		}
+		err = mStatus_NoError;
+	}
+	else
+	{
+		dlog( kDebugLevelError, DEBUG_NAME "%s: invalid sa_family %d", __ROUTINE__, inSA->sa_family );
+		err = mStatus_BadParamErr;
+	}
+	return( err );
+}
+
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	UDPSocketNotification
+//===========================================================================================================================
+
+mDNSlocal void CALLBACK
+UDPSocketNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )
+{
+	UDPSocket				*udpSock = ( UDPSocket* ) context;
+	WSAMSG					wmsg;
+	WSABUF					wbuf;
+	struct sockaddr_storage	sockSrcAddr;		// This is filled in by the WSARecv* function
+	INT						sockSrcAddrLen;		// See above
+	mDNSAddr				srcAddr;
+	mDNSInterfaceID			iid;
+	mDNSIPPort				srcPort;
+	mDNSAddr				dstAddr;
+	mDNSIPPort				dstPort;
+	uint8_t					controlBuffer[ 128 ];
+	mDNSu8				*	end;
+	int						num;
+	DWORD					numTries;
+	mStatus					err;
+
+	DEBUG_UNUSED( sock );
+	DEBUG_UNUSED( event );
+
+	require_action( udpSock != NULL, exit, err = mStatus_BadStateErr );
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "%s: sock = %d\n", __ROUTINE__, udpSock->fd );
+	
+	// Initialize the buffer structure
+
+	wbuf.buf		= (char *) &udpSock->packet;
+	wbuf.len		= (u_long) sizeof( udpSock->packet );
+	sockSrcAddrLen	= sizeof( sockSrcAddr );
+
+	numTries = 0;
+
+	do
+	{
+		if ( udpSock->recvMsgPtr )
+		{
+			DWORD size;
+
+			wmsg.name			= ( LPSOCKADDR ) &sockSrcAddr;
+			wmsg.namelen		= sockSrcAddrLen;
+			wmsg.lpBuffers		= &wbuf;
+			wmsg.dwBufferCount	= 1;
+			wmsg.Control.buf	= ( CHAR* ) controlBuffer;
+			wmsg.Control.len	= sizeof( controlBuffer );
+			wmsg.dwFlags		= 0;
+
+			err = udpSock->recvMsgPtr( udpSock->fd, &wmsg, &size, NULL, NULL );
+			err = translate_errno( ( err == 0 ), (OSStatus) WSAGetLastError(), kUnknownErr ); 
+			num = ( int ) size;
+
+			// <rdar://problem/7824093> iTunes 9.1 fails to install with Bonjour service on Windows 7 Ultimate
+			//
+			// There seems to be a bug in some network device drivers that involves calling WSARecvMsg().
+			// Although all the parameters to WSARecvMsg() are correct, it returns a
+			// WSAEFAULT error code when there is no actual error. We have found experientially that falling
+			// back to using WSARecvFrom() when this happens will work correctly.
+
+			if ( err == WSAEFAULT ) udpSock->recvMsgPtr = NULL;
+		}
+		else
+		{
+			DWORD flags = 0;
+
+			num = WSARecvFrom( udpSock->fd, &wbuf, 1, NULL, &flags, ( LPSOCKADDR ) &sockSrcAddr, &sockSrcAddrLen, NULL, NULL );
+			err = translate_errno( ( num >= 0 ), ( OSStatus ) WSAGetLastError(), kUnknownErr );
+		}
+
+		// According to MSDN <http://msdn.microsoft.com/en-us/library/ms741687(VS.85).aspx>:
+		//
+		// "WSAECONNRESET: For a UDP datagram socket, this error would indicate that a previous
+		//                 send operation resulted in an ICMP "Port Unreachable" message."
+		//
+		// Because this is the case, we want to ignore this error and try again.  Just in case
+		// this is some kind of pathological condition, we'll break out of the retry loop 
+		// after 100 iterations
+
+		require_action( !err || ( err == WSAECONNRESET ) || ( err == WSAEFAULT ), exit, err = WSAGetLastError() );
+	}
+	while ( ( ( err == WSAECONNRESET ) || ( err == WSAEFAULT ) ) && ( numTries++ < 100 ) );
+	
+	require_noerr( err, exit );
+	
+	// Translate the source of this packet into mDNS data types
+
+	SockAddrToMDNSAddr( (struct sockaddr* ) &sockSrcAddr, &srcAddr, &srcPort );
+	
+	// Initialize the destination of this packet. Just in case
+	// we can't determine this info because we couldn't call
+	// WSARecvMsg (recvMsgPtr)
+
+	dstAddr = udpSock->addr;
+	dstPort = udpSock->port;
+
+	if ( udpSock->recvMsgPtr )
+	{
+		LPWSACMSGHDR	header;
+		LPWSACMSGHDR	last = NULL;
+		int				count = 0;
+		
+		// Parse the control information. Reject packets received on the wrong interface.
+		
+		// <rdar://problem/7832196> INSTALL: Bonjour 2.0 on Windows can not start / stop
+		// 
+		// There seems to be an interaction between Bullguard and this next bit of code.
+		// When a user's machine is running Bullguard, the control information that is
+		// returned is corrupted, and the code would go into an infinite loop. We'll add
+		// two bits of defensive coding here. The first will check that each pointer to
+		// the LPWSACMSGHDR that is returned in the for loop is different than the last.
+		// This fixes the problem with Bullguard. The second will break out of this loop
+		// after 100 iterations, just in case the corruption isn't caught by the first
+		// check.
+
+		for ( header = WSA_CMSG_FIRSTHDR( &wmsg ); header; header = WSA_CMSG_NXTHDR( &wmsg, header ) )
+		{
+			if ( ( header != last ) && ( ++count < 100 ) )
+			{
+				last = header;
+					
+				if ( ( header->cmsg_level == IPPROTO_IP ) && ( header->cmsg_type == IP_PKTINFO ) )
+				{
+					IN_PKTINFO * ipv4PacketInfo;
+					
+					ipv4PacketInfo = (IN_PKTINFO *) WSA_CMSG_DATA( header );
+
+					if ( udpSock->ifd != NULL )
+					{
+						require_action( ipv4PacketInfo->ipi_ifindex == udpSock->ifd->index, exit, err = ( DWORD ) kMismatchErr );
+					}
+
+					dstAddr.type 				= mDNSAddrType_IPv4;
+					dstAddr.ip.v4.NotAnInteger	= ipv4PacketInfo->ipi_addr.s_addr;
+				}
+				else if( ( header->cmsg_level == IPPROTO_IPV6 ) && ( header->cmsg_type == IPV6_PKTINFO ) )
+				{
+					IN6_PKTINFO * ipv6PacketInfo;
+						
+					ipv6PacketInfo = (IN6_PKTINFO *) WSA_CMSG_DATA( header );
+		
+					if ( udpSock->ifd != NULL )
+					{
+						require_action( ipv6PacketInfo->ipi6_ifindex == ( udpSock->ifd->index - kIPv6IfIndexBase ), exit, err = ( DWORD ) kMismatchErr );
+					}
+
+					dstAddr.type	= mDNSAddrType_IPv6;
+					dstAddr.ip.v6	= *( (mDNSv6Addr *) &ipv6PacketInfo->ipi6_addr );
+				}
+			}
+			else
+			{
+				static BOOL loggedMessage = FALSE;
+
+				if ( !loggedMessage )
+				{
+					LogMsg( "UDPEndRecv: WSARecvMsg control information error." );
+					loggedMessage = TRUE;
+				}
+
+				break;
+			}
+		}
+	}
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "packet received\n" );
+	dlog( kDebugLevelChatty, DEBUG_NAME "    size      = %d\n", num );
+	dlog( kDebugLevelChatty, DEBUG_NAME "    src       = %#a:%u\n", &srcAddr, ntohs( srcPort.NotAnInteger ) );
+	dlog( kDebugLevelChatty, DEBUG_NAME "    dst       = %#a:%u\n", &dstAddr, ntohs( dstPort.NotAnInteger ) );
+	
+	if ( udpSock->ifd != NULL )
+	{
+		dlog( kDebugLevelChatty, DEBUG_NAME "    interface = %#a (index=0x%08X)\n", &udpSock->ifd->interfaceInfo.ip, udpSock->ifd->index );
+	}
+
+	dlog( kDebugLevelChatty, DEBUG_NAME "\n" );
+
+	iid = udpSock->ifd ? udpSock->ifd->interfaceInfo.InterfaceID : NULL;
+	end = ( (mDNSu8 *) &udpSock->packet ) + num;
+
+	mDNSCoreReceive( udpSock->m, &udpSock->packet, end, &srcAddr, srcPort, &dstAddr, dstPort, iid );
+
+exit:
+
+	return;
+}
+
+
+//===========================================================================================================================
+//	InterfaceListDidChange
+//===========================================================================================================================
+void InterfaceListDidChange( mDNS * const inMDNS )
+{
+	mStatus err;
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "interface list changed\n" );
+	check( inMDNS );
+	
+	// Tear down the existing interfaces and set up new ones using the new IP info.
+	
+	err = TearDownInterfaceList( inMDNS );
+	check_noerr( err );
+	
+	err = SetupInterfaceList( inMDNS );
+	check_noerr( err );
+		
+	err = uDNS_SetupDNSConfig( inMDNS );
+	check_noerr( err );
+	
+	// Inform clients of the change.
+	
+	mDNS_ConfigChanged(inMDNS);
+	
+	// Force mDNS to update.
+	
+	mDNSCoreMachineSleep( inMDNS, mDNSfalse ); // What is this for? Mac OS X does not do this
+}
+
+
+//===========================================================================================================================
+//	ComputerDescriptionDidChange
+//===========================================================================================================================
+void ComputerDescriptionDidChange( mDNS * const inMDNS )
+{	
+	dlog( kDebugLevelInfo, DEBUG_NAME "computer description has changed\n" );
+	check( inMDNS );
+
+	// redo the names
+	SetupNiceName( inMDNS );
+}
+
+
+//===========================================================================================================================
+//	TCPIPConfigDidChange
+//===========================================================================================================================
+void TCPIPConfigDidChange( mDNS * const inMDNS )
+{
+	mStatus		err;
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "TCP/IP config has changed\n" );
+	check( inMDNS );
+
+	err = uDNS_SetupDNSConfig( inMDNS );
+	check_noerr( err );
+}
+
+
+//===========================================================================================================================
+//	DynDNSConfigDidChange
+//===========================================================================================================================
+void DynDNSConfigDidChange( mDNS * const inMDNS )
+{
+	mStatus		err;
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "DynDNS config has changed\n" );
+	check( inMDNS );
+
+	SetDomainSecrets( inMDNS );
+
+	err = uDNS_SetupDNSConfig( inMDNS );
+	check_noerr( err );
+}
+
+
+//===========================================================================================================================
+//	FileSharingDidChange
+//===========================================================================================================================
+void FileSharingDidChange( mDNS * const inMDNS )
+{	
+	dlog( kDebugLevelInfo, DEBUG_NAME "File shares has changed\n" );
+	check( inMDNS );
+
+	CheckFileShares( inMDNS );
+}
+
+
+//===========================================================================================================================
+//	FilewallDidChange
+//===========================================================================================================================
+void FirewallDidChange( mDNS * const inMDNS )
+{	
+	dlog( kDebugLevelInfo, DEBUG_NAME "Firewall has changed\n" );
+	check( inMDNS );
+
+	CheckFileShares( inMDNS );
+}
+
+
+#if 0
+#pragma mark -
+#pragma mark == Utilities ==
+#endif
+
+//===========================================================================================================================
+//	getifaddrs
+//===========================================================================================================================
+
+mDNSlocal int	getifaddrs( struct ifaddrs **outAddrs )
+{
+	int		err;
+	
+#if( MDNS_WINDOWS_USE_IPV6_IF_ADDRS )
+	
+	// Try to the load the GetAdaptersAddresses function from the IP Helpers DLL. This API is only available on Windows
+	// XP or later. Looking up the symbol at runtime allows the code to still work on older systems without that API.
+	
+	if( !gIPHelperLibraryInstance )
+	{
+		gIPHelperLibraryInstance = LoadLibrary( TEXT( "Iphlpapi" ) );
+		if( gIPHelperLibraryInstance )
+		{
+			gGetAdaptersAddressesFunctionPtr = 
+				(GetAdaptersAddressesFunctionPtr) GetProcAddress( gIPHelperLibraryInstance, "GetAdaptersAddresses" );
+			if( !gGetAdaptersAddressesFunctionPtr )
+			{
+				BOOL		ok;
+				
+				ok = FreeLibrary( gIPHelperLibraryInstance );
+				check_translated_errno( ok, GetLastError(), kUnknownErr );
+				gIPHelperLibraryInstance = NULL;
+			}
+		}
+	}
+	
+	// Use the new IPv6-capable routine if supported. Otherwise, fall back to the old and compatible IPv4-only code.
+	// <rdar://problem/4278934>  Fall back to using getifaddrs_ipv4 if getifaddrs_ipv6 fails
+	// <rdar://problem/6145913>  Fall back to using getifaddrs_ipv4 if getifaddrs_ipv6 returns no addrs
+
+	if( !gGetAdaptersAddressesFunctionPtr || ( ( ( err = getifaddrs_ipv6( outAddrs ) ) != mStatus_NoError ) || ( ( outAddrs != NULL ) && ( *outAddrs == NULL ) ) ) )
+	{
+		err = getifaddrs_ipv4( outAddrs );
+		require_noerr( err, exit );
+	}
+	
+#else
+
+	err = getifaddrs_ipv4( outAddrs );
+	require_noerr( err, exit );
+
+#endif
+
+exit:
+	return( err );
+}
+
+#if( MDNS_WINDOWS_USE_IPV6_IF_ADDRS )
+//===========================================================================================================================
+//	getifaddrs_ipv6
+//===========================================================================================================================
+
+mDNSlocal int	getifaddrs_ipv6( struct ifaddrs **outAddrs )
+{
+	DWORD						err;
+	int							i;
+	DWORD						flags;
+	struct ifaddrs *			head;
+	struct ifaddrs **			next;
+	IP_ADAPTER_ADDRESSES *		iaaList;
+	ULONG						iaaListSize;
+	IP_ADAPTER_ADDRESSES *		iaa;
+	size_t						size;
+	struct ifaddrs *			ifa;
+	
+	check( gGetAdaptersAddressesFunctionPtr );
+	
+	head	= NULL;
+	next	= &head;
+	iaaList	= NULL;
+	
+	// Get the list of interfaces. The first call gets the size and the second call gets the actual data.
+	// This loops to handle the case where the interface changes in the window after getting the size, but before the
+	// second call completes. A limit of 100 retries is enforced to prevent infinite loops if something else is wrong.
+	
+	flags = GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
+	i = 0;
+	for( ;; )
+	{
+		iaaListSize = 0;
+		err = gGetAdaptersAddressesFunctionPtr( AF_UNSPEC, flags, NULL, NULL, &iaaListSize );
+		check( err == ERROR_BUFFER_OVERFLOW );
+		check( iaaListSize >= sizeof( IP_ADAPTER_ADDRESSES ) );
+		
+		iaaList = (IP_ADAPTER_ADDRESSES *) malloc( iaaListSize );
+		require_action( iaaList, exit, err = ERROR_NOT_ENOUGH_MEMORY );
+		
+		err = gGetAdaptersAddressesFunctionPtr( AF_UNSPEC, flags, NULL, iaaList, &iaaListSize );
+		if( err == ERROR_SUCCESS ) break;
+		
+		free( iaaList );
+		iaaList = NULL;
+		++i;
+		require( i < 100, exit );
+		dlog( kDebugLevelWarning, "%s: retrying GetAdaptersAddresses after %d failure(s) (%d %m)\n", __ROUTINE__, i, err, err );
+	}
+	
+	for( iaa = iaaList; iaa; iaa = iaa->Next )
+	{
+		int								addrIndex;
+		IP_ADAPTER_UNICAST_ADDRESS	*	addr;
+		DWORD							ipv6IfIndex;
+		IP_ADAPTER_PREFIX			*	firstPrefix;
+
+		if( iaa->IfIndex > 0xFFFFFF )
+		{
+			dlog( kDebugLevelAlert, DEBUG_NAME "%s: IPv4 ifindex out-of-range (0x%08X)\n", __ROUTINE__, iaa->IfIndex );
+		}
+		if( iaa->Ipv6IfIndex > 0xFF )
+		{
+			dlog( kDebugLevelAlert, DEBUG_NAME "%s: IPv6 ifindex out-of-range (0x%08X)\n", __ROUTINE__, iaa->Ipv6IfIndex );
+		}
+
+		// For IPv4 interfaces, there seems to be a bug in iphlpapi.dll that causes the 
+		// following code to crash when iterating through the prefix list.  This seems
+		// to occur when iaa->Ipv6IfIndex != 0 when IPv6 is not installed on the host.
+		// This shouldn't happen according to Microsoft docs which states:
+		//
+		//     "Ipv6IfIndex contains 0 if IPv6 is not available on the interface."
+		//
+		// So the data structure seems to be corrupted when we return from
+		// GetAdaptersAddresses(). The bug seems to occur when iaa->Length <
+		// sizeof(IP_ADAPTER_ADDRESSES), so when that happens, we'll manually
+		// modify iaa to have the correct values.
+
+		if ( iaa->Length >= sizeof( IP_ADAPTER_ADDRESSES ) )
+		{
+			ipv6IfIndex = iaa->Ipv6IfIndex;
+			firstPrefix = iaa->FirstPrefix;
+		}
+		else
+		{
+			ipv6IfIndex	= 0;
+			firstPrefix = NULL;
+		}
+
+		// Skip pseudo and tunnel interfaces.
+		
+		if( ( ( ipv6IfIndex == 1 ) && ( iaa->IfType != IF_TYPE_SOFTWARE_LOOPBACK ) ) || ( iaa->IfType == IF_TYPE_TUNNEL ) )
+		{
+			continue;
+		}
+		
+		// Add each address as a separate interface to emulate the way getifaddrs works.
+		
+		for( addrIndex = 0, addr = iaa->FirstUnicastAddress; addr; ++addrIndex, addr = addr->Next )
+		{			
+			int						family;
+			IP_ADAPTER_PREFIX *		prefix;
+			uint32_t				ipv4Index;
+			struct sockaddr_in		ipv4Netmask;
+
+			family = addr->Address.lpSockaddr->sa_family;
+			if( ( family != AF_INET ) && ( family != AF_INET6 ) ) continue;
+			
+			// <rdar://problem/6220642> iTunes 8: Bonjour doesn't work after upgrading iTunes 8
+			// Seems as if the problem here is a buggy implementation of some network interface
+			// driver. It is reporting that is has a link-local address when it is actually
+			// disconnected. This was causing a problem in AddressToIndexAndMask.
+			// The solution is to call AddressToIndexAndMask first, and if unable to lookup
+			// the address, to ignore that address.
+
+			ipv4Index = 0;
+			memset( &ipv4Netmask, 0, sizeof( ipv4Netmask ) );
+			
+			if ( family == AF_INET )
+			{
+				err = AddressToIndexAndMask( addr->Address.lpSockaddr, &ipv4Index, ( struct sockaddr* ) &ipv4Netmask );
+				
+				if ( err )
+				{
+					err = 0;
+					continue;
+				}
+			}
+
+			ifa = (struct ifaddrs *) calloc( 1, sizeof( struct ifaddrs ) );
+			require_action( ifa, exit, err = WSAENOBUFS );
+			
+			*next = ifa;
+			next  = &ifa->ifa_next;
+			
+			// Get the name.
+			
+			size = strlen( iaa->AdapterName ) + 1;
+			ifa->ifa_name = (char *) malloc( size );
+			require_action( ifa->ifa_name, exit, err = WSAENOBUFS );
+			memcpy( ifa->ifa_name, iaa->AdapterName, size );
+			
+			// Get interface flags.
+			
+			ifa->ifa_flags = 0;
+			if( iaa->OperStatus == IfOperStatusUp ) 		ifa->ifa_flags |= IFF_UP;
+			if( iaa->IfType == IF_TYPE_SOFTWARE_LOOPBACK )	ifa->ifa_flags |= IFF_LOOPBACK;
+			else if ( IsPointToPoint( addr ) )				ifa->ifa_flags |= IFF_POINTTOPOINT;
+			if( !( iaa->Flags & IP_ADAPTER_NO_MULTICAST ) )	ifa->ifa_flags |= IFF_MULTICAST;
+
+			
+			// <rdar://problem/4045657> Interface index being returned is 512
+			//
+			// Windows does not have a uniform scheme for IPv4 and IPv6 interface indexes.
+			// This code used to shift the IPv4 index up to ensure uniqueness between
+			// it and IPv6 indexes.  Although this worked, it was somewhat confusing to developers, who
+			// then see interface indexes passed back that don't correspond to anything
+			// that is seen in Win32 APIs or command line tools like "route".  As a relatively
+			// small percentage of developers are actively using IPv6, it seems to 
+			// make sense to make our use of IPv4 as confusion free as possible.
+			// So now, IPv6 interface indexes will be shifted up by a
+			// constant value which will serve to uniquely identify them, and we will
+			// leave IPv4 interface indexes unmodified.
+			
+			switch( family )
+			{
+				case AF_INET:  ifa->ifa_extra.index = iaa->IfIndex; break;
+				case AF_INET6: ifa->ifa_extra.index = ipv6IfIndex + kIPv6IfIndexBase;	 break;
+				default: break;
+			}
+
+			// Get lease lifetime
+
+			if ( ( iaa->IfType != IF_TYPE_SOFTWARE_LOOPBACK ) && ( addr->LeaseLifetime != 0 ) && ( addr->ValidLifetime != 0xFFFFFFFF ) )
+			{
+				ifa->ifa_dhcpEnabled		= TRUE;
+				ifa->ifa_dhcpLeaseExpires	= time( NULL ) + addr->ValidLifetime;
+			}
+			else
+			{
+				ifa->ifa_dhcpEnabled		= FALSE;
+				ifa->ifa_dhcpLeaseExpires	= 0;
+			}
+
+			if ( iaa->PhysicalAddressLength == sizeof( ifa->ifa_physaddr ) )
+			{
+				memcpy( ifa->ifa_physaddr, iaa->PhysicalAddress, iaa->PhysicalAddressLength );
+			}
+
+			// Because we don't get notified of womp changes, we're going to just assume
+			// that all wired interfaces have it enabled. Before we go to sleep, we'll check
+			// if the interface actually supports it, and update mDNS->SystemWakeOnLANEnabled
+			// accordingly
+
+			ifa->ifa_womp = ( iaa->IfType == IF_TYPE_ETHERNET_CSMACD ) ? mDNStrue : mDNSfalse;
+			
+			// Get address.
+			
+			switch( family )
+			{
+				case AF_INET:
+				case AF_INET6:
+					ifa->ifa_addr = (struct sockaddr *) calloc( 1, (size_t) addr->Address.iSockaddrLength );
+					require_action( ifa->ifa_addr, exit, err = WSAENOBUFS );
+					memcpy( ifa->ifa_addr, addr->Address.lpSockaddr, (size_t) addr->Address.iSockaddrLength );
+					break;
+				
+				default:
+					break;
+			}
+			check( ifa->ifa_addr );
+			
+			// Get subnet mask (IPv4)/link prefix (IPv6). It is specified as a bit length (e.g. 24 for 255.255.255.0).
+
+			switch ( family )
+			{
+				case AF_INET:
+				{
+					struct sockaddr_in * sa4;
+					
+					sa4 = (struct sockaddr_in *) calloc( 1, sizeof( *sa4 ) );
+					require_action( sa4, exit, err = WSAENOBUFS );
+					sa4->sin_family = AF_INET;
+					sa4->sin_addr.s_addr = ipv4Netmask.sin_addr.s_addr;
+
+					dlog( kDebugLevelInfo, DEBUG_NAME "%s: IPv4 mask = %s\n", __ROUTINE__, inet_ntoa( sa4->sin_addr ) );
+					ifa->ifa_netmask = (struct sockaddr *) sa4;
+					break;
+				}
+
+				case AF_INET6:
+				{
+					struct sockaddr_in6 *sa6;
+					char buf[ 256 ] = { 0 };
+					DWORD buflen = sizeof( buf );
+
+					sa6 = (struct sockaddr_in6 *) calloc( 1, sizeof( *sa6 ) );
+					require_action( sa6, exit, err = WSAENOBUFS );
+					sa6->sin6_family = AF_INET6;
+					memset( sa6->sin6_addr.s6_addr, 0xFF, sizeof( sa6->sin6_addr.s6_addr ) );
+					ifa->ifa_netmask = (struct sockaddr *) sa6;
+
+					for ( prefix = firstPrefix; prefix; prefix = prefix->Next )
+					{
+						IN6_ADDR	mask;
+						IN6_ADDR	maskedAddr;
+						int			maskIndex;
+						DWORD		len;
+
+						// According to MSDN:
+						// "On Windows Vista and later, the linked IP_ADAPTER_PREFIX structures pointed to by the FirstPrefix member
+						// include three IP adapter prefixes for each IP address assigned to the adapter. These include the host IP address prefix,
+						// the subnet IP address prefix, and the subnet broadcast IP address prefix.
+						// In addition, for each adapter there is a multicast address prefix and a broadcast address prefix.
+						// On Windows XP with SP1 and later prior to Windows Vista, the linked IP_ADAPTER_PREFIX structures pointed to by the FirstPrefix member
+						// include only a single IP adapter prefix for each IP address assigned to the adapter."
+						
+						// We're only interested in the subnet IP address prefix.  We'll determine if the prefix is the
+						// subnet prefix by masking our address with a mask (computed from the prefix length) and see if that is the same
+						// as the prefix address.
+
+						if ( ( prefix->PrefixLength == 0 ) ||
+						     ( prefix->PrefixLength > 128 ) ||
+						     ( addr->Address.iSockaddrLength != prefix->Address.iSockaddrLength ) ||
+							 ( memcmp( addr->Address.lpSockaddr, prefix->Address.lpSockaddr, addr->Address.iSockaddrLength ) == 0 ) )
+						{
+							continue;
+						}
+
+						// Compute the mask
+
+						memset( mask.s6_addr, 0, sizeof( mask.s6_addr ) );
+
+						for ( len = (int) prefix->PrefixLength, maskIndex = 0; len > 0; len -= 8 )
+						{
+							uint8_t maskByte = ( len >= 8 ) ? 0xFF : (uint8_t)( ( 0xFFU << ( 8 - len ) ) & 0xFFU );
+							mask.s6_addr[ maskIndex++ ] = maskByte;
+						}
+
+						// Apply the mask
+
+						for ( i = 0; i < 16; i++ )
+						{
+							maskedAddr.s6_addr[ i ] = ( ( struct sockaddr_in6* ) addr->Address.lpSockaddr )->sin6_addr.s6_addr[ i ] & mask.s6_addr[ i ];
+						}
+
+						// Compare
+
+						if ( memcmp( ( ( struct sockaddr_in6* ) prefix->Address.lpSockaddr )->sin6_addr.s6_addr, maskedAddr.s6_addr, sizeof( maskedAddr.s6_addr ) ) == 0 )
+						{
+							memcpy( sa6->sin6_addr.s6_addr, mask.s6_addr, sizeof( mask.s6_addr ) );
+							break;
+						}
+					}
+
+					WSAAddressToStringA( ( LPSOCKADDR ) sa6, sizeof( struct sockaddr_in6 ), NULL, buf, &buflen );
+					dlog( kDebugLevelInfo, DEBUG_NAME "%s: IPv6 mask = %s\n", __ROUTINE__, buf );				
+
+					break;
+				}
+				
+				default:
+					break;
+			}
+		}
+	}
+	
+	// Success!
+	
+	if( outAddrs )
+	{
+		*outAddrs = head;
+		head = NULL;
+	}
+	err = ERROR_SUCCESS;
+	
+exit:
+	if( head )
+	{
+		freeifaddrs( head );
+	}
+	if( iaaList )
+	{
+		free( iaaList );
+	}
+	return( (int) err );
+}
+
+#endif	// MDNS_WINDOWS_USE_IPV6_IF_ADDRS
+
+//===========================================================================================================================
+//	getifaddrs_ipv4
+//===========================================================================================================================
+
+mDNSlocal int	getifaddrs_ipv4( struct ifaddrs **outAddrs )
+{
+	int						err;
+	SOCKET					sock;
+	DWORD					size;
+	DWORD					actualSize;
+	INTERFACE_INFO *		buffer;
+	INTERFACE_INFO *		tempBuffer;
+	INTERFACE_INFO *		ifInfo;
+	int						n;
+	int						i;
+	struct ifaddrs *		head;
+	struct ifaddrs **		next;
+	struct ifaddrs *		ifa;
+	
+	sock	= INVALID_SOCKET;
+	buffer	= NULL;
+	head	= NULL;
+	next	= &head;
+	
+	// Get the interface list. WSAIoctl is called with SIO_GET_INTERFACE_LIST, but since this does not provide a 
+	// way to determine the size of the interface list beforehand, we have to start with an initial size guess and
+	// call WSAIoctl repeatedly with increasing buffer sizes until it succeeds. Limit this to 100 tries for safety.
+	
+	sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+	err = translate_errno( IsValidSocket( sock ), errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+		
+	n = 0;
+	size = 16 * sizeof( INTERFACE_INFO );
+	for( ;; )
+	{
+		tempBuffer = (INTERFACE_INFO *) realloc( buffer, size );
+		require_action( tempBuffer, exit, err = WSAENOBUFS );
+		buffer = tempBuffer;
+		
+		err = WSAIoctl( sock, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, size, &actualSize, NULL, NULL );
+		if( err == 0 )
+		{
+			break;
+		}
+		
+		++n;
+		require_action( n < 100, exit, err = WSAEADDRNOTAVAIL );
+		
+		size += ( 16 * sizeof( INTERFACE_INFO ) );
+	}
+	check( actualSize <= size );
+	check( ( actualSize % sizeof( INTERFACE_INFO ) ) == 0 );
+	n = (int)( actualSize / sizeof( INTERFACE_INFO ) );
+	
+	// Process the raw interface list and build a linked list of IPv4 interfaces.
+	
+	for( i = 0; i < n; ++i )
+	{
+		uint32_t ifIndex;
+		struct sockaddr_in netmask;
+		
+		ifInfo = &buffer[ i ];
+		if( ifInfo->iiAddress.Address.sa_family != AF_INET )
+		{
+			continue;
+		}
+		
+		// <rdar://problem/6220642> iTunes 8: Bonjour doesn't work after upgrading iTunes 8
+		// See comment in getifaddrs_ipv6
+
+		ifIndex = 0;
+		memset( &netmask, 0, sizeof( netmask ) );
+		err = AddressToIndexAndMask( ( struct sockaddr* ) &ifInfo->iiAddress.AddressIn, &ifIndex, ( struct sockaddr* ) &netmask );
+
+		if ( err )
+		{
+			continue;
+		}
+
+		ifa = (struct ifaddrs *) calloc( 1, sizeof( struct ifaddrs ) );
+		require_action( ifa, exit, err = WSAENOBUFS );
+		
+		*next = ifa;
+		next  = &ifa->ifa_next;
+		
+		// Get the name.
+		
+		ifa->ifa_name = (char *) malloc( 16 );
+		require_action( ifa->ifa_name, exit, err = WSAENOBUFS );
+		sprintf( ifa->ifa_name, "%d", i + 1 );
+		
+		// Get interface flags.
+		
+		ifa->ifa_flags = (u_int) ifInfo->iiFlags;
+		
+		// Get addresses.
+		
+		if ( ifInfo->iiAddress.Address.sa_family == AF_INET )
+		{
+			struct sockaddr_in *		sa4;
+			
+			sa4 = &ifInfo->iiAddress.AddressIn;
+			ifa->ifa_addr = (struct sockaddr *) calloc( 1, sizeof( *sa4 ) );
+			require_action( ifa->ifa_addr, exit, err = WSAENOBUFS );
+			memcpy( ifa->ifa_addr, sa4, sizeof( *sa4 ) );
+
+			ifa->ifa_netmask = (struct sockaddr*) calloc(1, sizeof( *sa4 ) );
+			require_action( ifa->ifa_netmask, exit, err = WSAENOBUFS );
+
+			// <rdar://problem/4076478> Service won't start on Win2K. The address
+			// family field was not being initialized.
+
+			ifa->ifa_netmask->sa_family = AF_INET;
+			( ( struct sockaddr_in* ) ifa->ifa_netmask )->sin_addr = netmask.sin_addr;
+			ifa->ifa_extra.index = ifIndex;
+		}
+		else
+		{
+			// Emulate an interface index.
+		
+			ifa->ifa_extra.index = (uint32_t)( i + 1 );
+		}
+	}
+	
+	// Success!
+	
+	if( outAddrs )
+	{
+		*outAddrs = head;
+		head = NULL;
+	}
+	err = 0;
+	
+exit:
+
+	if( head )
+	{
+		freeifaddrs( head );
+	}
+	if( buffer )
+	{
+		free( buffer );
+	}
+	if( sock != INVALID_SOCKET )
+	{
+		closesocket( sock );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	freeifaddrs
+//===========================================================================================================================
+
+mDNSlocal void	freeifaddrs( struct ifaddrs *inIFAs )
+{
+	struct ifaddrs *		p;
+	struct ifaddrs *		q;
+	
+	// Free each piece of the structure. Set to null after freeing to handle macro-aliased fields.
+	
+	for( p = inIFAs; p; p = q )
+	{
+		q = p->ifa_next;
+		
+		if( p->ifa_name )
+		{
+			free( p->ifa_name );
+			p->ifa_name = NULL;
+		}
+		if( p->ifa_addr )
+		{
+			free( p->ifa_addr );
+			p->ifa_addr = NULL;
+		}
+		if( p->ifa_netmask )
+		{
+			free( p->ifa_netmask );
+			p->ifa_netmask = NULL;
+		}
+		if( p->ifa_broadaddr )
+		{
+			free( p->ifa_broadaddr );
+			p->ifa_broadaddr = NULL;
+		}
+		if( p->ifa_dstaddr )
+		{
+			free( p->ifa_dstaddr );
+			p->ifa_dstaddr = NULL;
+		}
+		if( p->ifa_data )
+		{
+			free( p->ifa_data );
+			p->ifa_data = NULL;
+		}
+		free( p );
+	}
+}
+
+
+//===========================================================================================================================
+//	GetPrimaryInterface
+//===========================================================================================================================
+
+mDNSlocal DWORD
+GetPrimaryInterface()
+{
+	PMIB_IPFORWARDTABLE	pIpForwardTable	= NULL;
+	DWORD				dwSize			= 0;
+	BOOL				bOrder			= FALSE;
+	OSStatus			err;
+	DWORD				index			= 0;
+	DWORD				metric			= 0;
+	unsigned long int	i;
+
+	// Find out how big our buffer needs to be.
+
+	err = GetIpForwardTable(NULL, &dwSize, bOrder);
+	require_action( err == ERROR_INSUFFICIENT_BUFFER, exit, err = kUnknownErr );
+
+	// Allocate the memory for the table
+
+	pIpForwardTable = (PMIB_IPFORWARDTABLE) malloc( dwSize );
+	require_action( pIpForwardTable, exit, err = kNoMemoryErr );
+  
+	// Now get the table.
+
+	err = GetIpForwardTable(pIpForwardTable, &dwSize, bOrder);
+	require_noerr( err, exit );
+
+
+	// Search for the row in the table we want.
+
+	for ( i = 0; i < pIpForwardTable->dwNumEntries; i++)
+	{
+		// Look for a default route
+
+		if ( pIpForwardTable->table[i].dwForwardDest == 0 )
+		{
+			if ( index && ( pIpForwardTable->table[i].dwForwardMetric1 >= metric ) )
+			{
+				continue;
+			}
+
+			index	= pIpForwardTable->table[i].dwForwardIfIndex;
+			metric	= pIpForwardTable->table[i].dwForwardMetric1;
+		}
+	}
+
+exit:
+
+	if ( pIpForwardTable != NULL )
+	{
+		free( pIpForwardTable );
+	}
+
+	return index;
+}
+
+
+//===========================================================================================================================
+//	AddressToIndexAndMask
+//===========================================================================================================================
+
+mDNSlocal mStatus
+AddressToIndexAndMask( struct sockaddr * addr, uint32_t * ifIndex, struct sockaddr * mask  )
+{
+	// Before calling AddIPAddress we use GetIpAddrTable to get
+	// an adapter to which we can add the IP.
+	
+	PMIB_IPADDRTABLE	pIPAddrTable	= NULL;
+	DWORD				dwSize			= 0;
+	mStatus				err				= mStatus_UnknownErr;
+	DWORD				i;
+
+	// For now, this is only for IPv4 addresses.  That is why we can safely cast
+	// addr's to sockaddr_in.
+
+	require_action( addr->sa_family == AF_INET, exit, err = mStatus_UnknownErr );
+
+	// Make an initial call to GetIpAddrTable to get the
+	// necessary size into the dwSize variable
+
+	for ( i = 0; i < 100; i++ )
+	{
+		err = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
+
+		if ( err != ERROR_INSUFFICIENT_BUFFER )
+		{
+			break;
+		}
+
+		pIPAddrTable = (MIB_IPADDRTABLE *) realloc( pIPAddrTable, dwSize );
+		require_action( pIPAddrTable, exit, err = WSAENOBUFS );
+	}
+
+	require_noerr( err, exit );
+	err = mStatus_UnknownErr;
+
+	for ( i = 0; i < pIPAddrTable->dwNumEntries; i++ )
+	{
+		if ( ( ( struct sockaddr_in* ) addr )->sin_addr.s_addr == pIPAddrTable->table[i].dwAddr )
+		{
+			*ifIndex											= pIPAddrTable->table[i].dwIndex;
+			( ( struct sockaddr_in*) mask )->sin_addr.s_addr	= pIPAddrTable->table[i].dwMask;
+			err													= mStatus_NoError;
+			break;
+		}
+	}
+
+exit:
+
+	if ( pIPAddrTable )
+	{
+		free( pIPAddrTable );
+	}
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	CanReceiveUnicast
+//===========================================================================================================================
+
+mDNSlocal mDNSBool	CanReceiveUnicast( void )
+{
+	mDNSBool				ok;
+	SocketRef				sock;
+	struct sockaddr_in		addr;
+	
+	// Try to bind to the port without the SO_REUSEADDR option to test if someone else has already bound to it.
+	
+	sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+	check_translated_errno( IsValidSocket( sock ), errno_compat(), kUnknownErr );
+	ok = IsValidSocket( sock );
+	if( ok )
+	{
+		mDNSPlatformMemZero( &addr, sizeof( addr ) );
+		addr.sin_family			= AF_INET;
+		addr.sin_port			= MulticastDNSPort.NotAnInteger;
+		addr.sin_addr.s_addr	= htonl( INADDR_ANY );
+		
+		ok = ( bind( sock, (struct sockaddr *) &addr, sizeof( addr ) ) == 0 );
+		close_compat( sock );
+	}
+	
+	dlog( kDebugLevelInfo, DEBUG_NAME "Unicast UDP responses %s\n", ok ? "okay" : "*not allowed*" );
+	return( ok );
+}
+
+
+//===========================================================================================================================
+//	IsPointToPoint
+//===========================================================================================================================
+
+mDNSlocal mDNSBool IsPointToPoint( IP_ADAPTER_UNICAST_ADDRESS * addr )
+{
+	struct ifaddrs	*	addrs	=	NULL;
+	struct ifaddrs	*	p		=	NULL;
+	OSStatus			err;
+	mDNSBool			ret		=	mDNSfalse;
+
+	// For now, only works for IPv4 interfaces
+
+	if ( addr->Address.lpSockaddr->sa_family == AF_INET )
+	{
+		// The getifaddrs_ipv4 call will give us correct information regarding IFF_POINTTOPOINT flags.
+
+		err = getifaddrs_ipv4( &addrs );
+		require_noerr( err, exit );
+
+		for ( p = addrs; p; p = p->ifa_next )
+		{
+			if ( ( addr->Address.lpSockaddr->sa_family == p->ifa_addr->sa_family ) &&
+			     ( ( ( struct sockaddr_in* ) addr->Address.lpSockaddr )->sin_addr.s_addr == ( ( struct sockaddr_in* ) p->ifa_addr )->sin_addr.s_addr ) )
+			{
+				ret = ( p->ifa_flags & IFF_POINTTOPOINT ) ? mDNStrue : mDNSfalse;
+				break;
+			}
+		}
+	}
+
+exit:
+
+	if ( addrs )
+	{
+		freeifaddrs( addrs );
+	}
+
+	return ret;
+}
+
+
+//===========================================================================================================================
+//	GetWindowsVersionString
+//===========================================================================================================================
+
+mDNSlocal OSStatus	GetWindowsVersionString( char *inBuffer, size_t inBufferSize )
+{
+#if( !defined( VER_PLATFORM_WIN32_CE ) )
+	#define VER_PLATFORM_WIN32_CE		3
+#endif
+
+	OSStatus				err;
+	OSVERSIONINFO			osInfo;
+	BOOL					ok;
+	const char *			versionString;
+	DWORD					platformID;
+	DWORD					majorVersion;
+	DWORD					minorVersion;
+	DWORD					buildNumber;
+	
+	versionString = "unknown Windows version";
+	
+	osInfo.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
+	ok = GetVersionEx( &osInfo );
+	err = translate_errno( ok, (OSStatus) GetLastError(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	platformID		= osInfo.dwPlatformId;
+	majorVersion	= osInfo.dwMajorVersion;
+	minorVersion	= osInfo.dwMinorVersion;
+	buildNumber		= osInfo.dwBuildNumber & 0xFFFF;
+	
+	if( ( platformID == VER_PLATFORM_WIN32_WINDOWS ) && ( majorVersion == 4 ) )
+	{
+		if( ( minorVersion < 10 ) && ( buildNumber == 950 ) )
+		{
+			versionString	= "Windows 95";
+		}
+		else if( ( minorVersion < 10 ) && ( ( buildNumber > 950 ) && ( buildNumber <= 1080 ) ) )
+		{
+			versionString	= "Windows 95 SP1";
+		}
+		else if( ( minorVersion < 10 ) && ( buildNumber > 1080 ) )
+		{
+			versionString	= "Windows 95 OSR2";
+		}
+		else if( ( minorVersion == 10 ) && ( buildNumber == 1998 ) )
+		{
+			versionString	= "Windows 98";
+		}
+		else if( ( minorVersion == 10 ) && ( ( buildNumber > 1998 ) && ( buildNumber < 2183 ) ) )
+		{
+			versionString	= "Windows 98 SP1";
+		}
+		else if( ( minorVersion == 10 ) && ( buildNumber >= 2183 ) )
+		{
+			versionString	= "Windows 98 SE";
+		}
+		else if( minorVersion == 90 )
+		{
+			versionString	= "Windows ME";
+		}
+	}
+	else if( platformID == VER_PLATFORM_WIN32_NT )
+	{
+		if( ( majorVersion == 3 ) && ( minorVersion == 51 ) )
+		{
+			versionString	= "Windows NT 3.51";
+		}
+		else if( ( majorVersion == 4 ) && ( minorVersion == 0 ) )
+		{
+			versionString	= "Windows NT 4";
+		}
+		else if( ( majorVersion == 5 ) && ( minorVersion == 0 ) )
+		{
+			versionString	= "Windows 2000";
+		}
+		else if( ( majorVersion == 5 ) && ( minorVersion == 1 ) )
+		{
+			versionString	= "Windows XP";
+		}
+		else if( ( majorVersion == 5 ) && ( minorVersion == 2 ) )
+		{
+			versionString	= "Windows Server 2003";
+		}
+	}
+	else if( platformID == VER_PLATFORM_WIN32_CE )
+	{
+		versionString		= "Windows CE";
+	}
+	
+exit:
+	if( inBuffer && ( inBufferSize > 0 ) )
+	{
+		inBufferSize -= 1;
+		strncpy( inBuffer, versionString, inBufferSize );
+		inBuffer[ inBufferSize ] = '\0';
+	}
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	RegQueryString
+//===========================================================================================================================
+
+mDNSlocal mStatus
+RegQueryString( HKEY key, LPCSTR valueName, LPSTR * string, DWORD * stringLen, DWORD * enabled )
+{
+	DWORD	type;
+	int		i;
+	mStatus err;
+
+	*stringLen	= MAX_ESCAPED_DOMAIN_NAME;
+	*string		= NULL;
+	i			= 0;
+
+	do
+	{
+		if ( *string )
+		{
+			free( *string );
+		}
+
+		*string = (char*) malloc( *stringLen );
+		require_action( *string, exit, err = mStatus_NoMemoryErr );
+
+		err = RegQueryValueExA( key, valueName, 0, &type, (LPBYTE) *string, stringLen );
+
+		i++;
+	}
+	while ( ( err == ERROR_MORE_DATA ) && ( i < 100 ) );
+
+	require_noerr_quiet( err, exit );
+
+	if ( enabled )
+	{
+		DWORD dwSize = sizeof( DWORD );
+
+		err = RegQueryValueEx( key, TEXT("Enabled"), NULL, NULL, (LPBYTE) enabled, &dwSize );
+		check_noerr( err );
+
+		err = kNoErr;
+	}
+
+exit:
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	StringToAddress
+//===========================================================================================================================
+
+mDNSlocal mStatus StringToAddress( mDNSAddr * ip, LPSTR string )
+{
+	struct sockaddr_in6 sa6;
+	struct sockaddr_in	sa4;
+	INT					dwSize;
+	mStatus				err;
+
+	sa6.sin6_family	= AF_INET6;
+	dwSize			= sizeof( sa6 );
+
+	err = WSAStringToAddressA( string, AF_INET6, NULL, (struct sockaddr*) &sa6, &dwSize );
+
+	if ( err == mStatus_NoError )
+	{
+		err = SetupAddr( ip, (struct sockaddr*) &sa6 );
+		require_noerr( err, exit );
+	}
+	else
+	{
+		sa4.sin_family = AF_INET;
+		dwSize = sizeof( sa4 );
+
+		err = WSAStringToAddressA( string, AF_INET, NULL, (struct sockaddr*) &sa4, &dwSize );
+		err = translate_errno( err == 0, WSAGetLastError(), kUnknownErr );
+		require_noerr( err, exit );
+			
+		err = SetupAddr( ip, (struct sockaddr*) &sa4 );
+		require_noerr( err, exit );
+	}
+
+exit:
+
+	return err;
+}
+
+
+//===========================================================================================================================
+//	myGetIfAddrs
+//===========================================================================================================================
+
+mDNSlocal struct ifaddrs*
+myGetIfAddrs(int refresh)
+{
+	static struct ifaddrs *ifa = NULL;
+	
+	if (refresh && ifa)
+	{
+		freeifaddrs(ifa);
+		ifa = NULL;
+	}
+	
+	if (ifa == NULL)
+	{
+		getifaddrs(&ifa);
+	}
+	
+	return ifa;
+}
+
+
+//===========================================================================================================================
+//	TCHARtoUTF8
+//===========================================================================================================================
+
+mDNSlocal OSStatus
+TCHARtoUTF8( const TCHAR *inString, char *inBuffer, size_t inBufferSize )
+{
+#if( defined( UNICODE ) || defined( _UNICODE ) )
+	OSStatus		err;
+	int				len;
+	
+	len = WideCharToMultiByte( CP_UTF8, 0, inString, -1, inBuffer, (int) inBufferSize, NULL, NULL );
+	err = translate_errno( len > 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+	
+exit:
+	return( err );
+#else
+	return( WindowsLatin1toUTF8( inString, inBuffer, inBufferSize ) );
+#endif
+}
+
+
+//===========================================================================================================================
+//	WindowsLatin1toUTF8
+//===========================================================================================================================
+
+mDNSlocal OSStatus
+WindowsLatin1toUTF8( const char *inString, char *inBuffer, size_t inBufferSize )
+{
+	OSStatus		err;
+	WCHAR *			utf16;
+	int				len;
+	
+	utf16 = NULL;
+	
+	// Windows doesn't support going directly from Latin-1 to UTF-8 so we have to go from Latin-1 to UTF-16 first.
+	
+	len = MultiByteToWideChar( CP_ACP, 0, inString, -1, NULL, 0 );
+	err = translate_errno( len > 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	utf16 = (WCHAR *) malloc( len * sizeof( *utf16 ) );
+	require_action( utf16, exit, err = kNoMemoryErr );
+	
+	len = MultiByteToWideChar( CP_ACP, 0, inString, -1, utf16, len );
+	err = translate_errno( len > 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+	
+	// Now convert the temporary UTF-16 to UTF-8.
+	
+	len = WideCharToMultiByte( CP_UTF8, 0, utf16, -1, inBuffer, (int) inBufferSize, NULL, NULL );
+	err = translate_errno( len > 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+
+exit:
+	if( utf16 ) free( utf16 );
+	return( err );
+}
+
+
+//===========================================================================================================================
+//	TCPCloseSocket
+//===========================================================================================================================
+
+mDNSlocal void
+TCPCloseSocket( TCPSocket * sock )
+{
+	dlog( kDebugLevelChatty, DEBUG_NAME "closing TCPSocket 0x%x:%d\n", sock, sock->fd );
+
+	if ( sock->fd != INVALID_SOCKET )
+	{
+		closesocket( sock->fd );
+		sock->fd = INVALID_SOCKET;
+	}
+}
+
+
+//===========================================================================================================================
+//  UDPCloseSocket
+//===========================================================================================================================
+
+mDNSlocal void
+UDPCloseSocket( UDPSocket * sock )
+{
+	dlog( kDebugLevelChatty, DEBUG_NAME "closing UDPSocket %d\n", sock->fd );
+
+	if ( sock->fd != INVALID_SOCKET )
+	{
+		mDNSPollUnregisterSocket( sock->fd );
+		closesocket( sock->fd );
+		sock->fd = INVALID_SOCKET;
+	}
+}
+
+
+//===========================================================================================================================
+//	SetupAddr
+//===========================================================================================================================
+
+mDNSlocal mStatus SetupAddr(mDNSAddr *ip, const struct sockaddr *const sa)
+	{
+	if (!sa) { LogMsg("SetupAddr ERROR: NULL sockaddr"); return(mStatus_Invalid); }
+
+	if (sa->sa_family == AF_INET)
+		{
+		struct sockaddr_in *ifa_addr = (struct sockaddr_in *)sa;
+		ip->type = mDNSAddrType_IPv4;
+		ip->ip.v4.NotAnInteger = ifa_addr->sin_addr.s_addr;
+		return(mStatus_NoError);
+		}
+
+	if (sa->sa_family == AF_INET6)
+		{
+		struct sockaddr_in6 *ifa_addr = (struct sockaddr_in6 *)sa;
+		ip->type = mDNSAddrType_IPv6;
+		if (IN6_IS_ADDR_LINKLOCAL(&ifa_addr->sin6_addr)) ifa_addr->sin6_addr.u.Word[1] = 0;
+		ip->ip.v6 = *(mDNSv6Addr*)&ifa_addr->sin6_addr;
+		return(mStatus_NoError);
+		}
+
+	LogMsg("SetupAddr invalid sa_family %d", sa->sa_family);
+	return(mStatus_Invalid);
+	}
+
+
+mDNSlocal void GetDDNSFQDN( domainname *const fqdn )
+{
+	LPSTR		name = NULL;
+	DWORD		dwSize;
+	DWORD		enabled;
+	HKEY		key = NULL;
+	OSStatus	err;
+
+	check( fqdn );
+
+	// Initialize
+
+	fqdn->c[0] = '\0';
+
+	// Get info from Bonjour registry key
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode TEXT("\\DynDNS\\Setup\\") kServiceDynDNSHostNames, &key );
+	require_noerr( err, exit );
+
+	err = RegQueryString( key, "", &name, &dwSize, &enabled );
+	if ( !err && ( name[0] != '\0' ) && enabled )
+	{
+		if ( !MakeDomainNameFromDNSNameString( fqdn, name ) || !fqdn->c[0] )
+		{
+			dlog( kDebugLevelError, "bad DDNS host name in registry: %s", name[0] ? name : "(unknown)");
+		}
+	}
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+		key = NULL;
+	}
+
+	if ( name )
+	{
+		free( name );
+		name = NULL;
+	}
+}
+
+
+#ifdef UNICODE
+mDNSlocal void GetDDNSDomains( DNameListElem ** domains, LPCWSTR lpSubKey )
+#else
+mDNSlocal void GetDDNSConfig( DNameListElem ** domains, LPCSTR lpSubKey )
+#endif
+{
+	char		subKeyName[kRegistryMaxKeyLength + 1];
+	DWORD		cSubKeys = 0;
+	DWORD		cbMaxSubKey;
+	DWORD		cchMaxClass;
+	DWORD		dwSize;
+	HKEY		key = NULL;
+	HKEY		subKey = NULL;
+	domainname	dname;
+	DWORD		i;
+	OSStatus	err;
+
+	check( domains );
+
+	// Initialize
+
+	*domains = NULL;
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, lpSubKey, &key );
+	require_noerr( err, exit );
+
+	// Get information about this node
+
+	err = RegQueryInfoKey( key, NULL, NULL, NULL, &cSubKeys, &cbMaxSubKey, &cchMaxClass, NULL, NULL, NULL, NULL, NULL );       
+	require_noerr( err, exit );
+
+	for ( i = 0; i < cSubKeys; i++)
+	{
+		DWORD enabled;
+
+		dwSize = kRegistryMaxKeyLength;
+        
+		err = RegEnumKeyExA( key, i, subKeyName, &dwSize, NULL, NULL, NULL, NULL );
+
+		if ( !err )
+		{
+			err = RegOpenKeyExA( key, subKeyName, 0, KEY_READ, &subKey );
+			require_noerr( err, exit );
+
+			dwSize = sizeof( DWORD );
+			err = RegQueryValueExA( subKey, "Enabled", NULL, NULL, (LPBYTE) &enabled, &dwSize );
+
+			if ( !err && ( subKeyName[0] != '\0' ) && enabled )
+			{
+				if ( !MakeDomainNameFromDNSNameString( &dname, subKeyName ) || !dname.c[0] )
+				{
+					dlog( kDebugLevelError, "bad DDNS domain in registry: %s", subKeyName[0] ? subKeyName : "(unknown)");
+				}
+				else
+				{
+					DNameListElem * domain = (DNameListElem*) malloc( sizeof( DNameListElem ) );
+					require_action( domain, exit, err = mStatus_NoMemoryErr );
+					
+					AssignDomainName(&domain->name, &dname);
+					domain->next = *domains;
+
+					*domains = domain;
+				}
+			}
+
+			RegCloseKey( subKey );
+			subKey = NULL;
+		}
+	}
+
+exit:
+
+	if ( subKey )
+	{
+		RegCloseKey( subKey );
+	}
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+mDNSlocal void SetDomainSecret( mDNS * const m, const domainname * inDomain )
+{
+	char					domainUTF8[ 256 ];
+	DomainAuthInfo			*foundInList;
+	DomainAuthInfo			*ptr;
+	char					outDomain[ 256 ];
+	char					outKey[ 256 ];
+	char					outSecret[ 256 ];
+	OSStatus				err;
+	
+	ConvertDomainNameToCString( inDomain, domainUTF8 );
+	
+	// If we're able to find a secret for this domain
+
+	if ( LsaGetSecret( domainUTF8, outDomain, sizeof( outDomain ), outKey, sizeof( outKey ), outSecret, sizeof( outSecret ) ) )
+	{
+		domainname domain;
+		domainname key;
+
+		// Tell the core about this secret
+
+		MakeDomainNameFromDNSNameString( &domain, outDomain );
+		MakeDomainNameFromDNSNameString( &key, outKey );
+
+		for (foundInList = m->AuthInfoList; foundInList; foundInList = foundInList->next)
+			if (SameDomainName(&foundInList->domain, &domain ) ) break;
+
+		ptr = foundInList;
+	
+		if (!ptr)
+		{
+			ptr = (DomainAuthInfo*)malloc(sizeof(DomainAuthInfo));
+			require_action( ptr, exit, err = mStatus_NoMemoryErr );
+		}
+
+		err = mDNS_SetSecretForDomain(m, ptr, &domain, &key, outSecret, NULL, NULL, FALSE );
+		require_action( err != mStatus_BadParamErr, exit, if (!foundInList ) mDNSPlatformMemFree( ptr ) );
+
+		debugf("Setting shared secret for zone %s with key %##s", outDomain, key.c);
+	}
+
+exit:
+
+	return;
+}
+
+
+mDNSlocal VOID CALLBACK
+CheckFileSharesProc( LPVOID arg, DWORD dwTimerLowValue, DWORD dwTimerHighValue )
+{
+	mDNS * const m = ( mDNS * const ) arg;
+
+	( void ) dwTimerLowValue;
+	( void ) dwTimerHighValue;
+
+	CheckFileShares( m );
+}
+
+
+mDNSlocal unsigned __stdcall 
+SMBRegistrationThread( void * arg )
+{
+	mDNS * const m = ( mDNS * const ) arg;
+	DNSServiceRef sref = NULL;
+	HANDLE		handles[ 3 ];
+	mDNSu8		txtBuf[ 256 ];
+	mDNSu8	*	txtPtr;
+	size_t		keyLen;
+	size_t		valLen;
+	mDNSIPPort	port = { { SMBPortAsNumber >> 8, SMBPortAsNumber & 0xFF } };
+	DNSServiceErrorType err;
+
+	DEBUG_UNUSED( arg );
+
+	handles[ 0 ] = gSMBThreadStopEvent;
+	handles[ 1 ] = gSMBThreadRegisterEvent;
+	handles[ 2 ] = gSMBThreadDeregisterEvent;
+
+	memset( txtBuf, 0, sizeof( txtBuf )  );
+	txtPtr = txtBuf;
+	keyLen = strlen( "netbios=" );
+	valLen = strlen( m->p->nbname );
+	require_action( valLen < 32, exit, err = kUnknownErr );	// This should never happen, but check to avoid further memory corruption
+	*txtPtr++ = ( mDNSu8 ) ( keyLen + valLen );
+	memcpy( txtPtr, "netbios=", keyLen );
+	txtPtr += keyLen;
+	if ( valLen ) { memcpy( txtPtr, m->p->nbname, valLen ); txtPtr += ( mDNSu8 ) valLen; }
+	keyLen = strlen( "domain=" );
+	valLen = strlen( m->p->nbdomain );
+	require_action( valLen < 32, exit, err = kUnknownErr );	// This should never happen, but check to avoid further memory corruption
+	*txtPtr++ = ( mDNSu8 )( keyLen + valLen );
+	memcpy( txtPtr, "domain=", keyLen );
+	txtPtr += keyLen;
+	if ( valLen ) { memcpy( txtPtr, m->p->nbdomain, valLen ); txtPtr += valLen; }
+	
+	for ( ;; )
+	{
+		DWORD ret;
+
+		ret = WaitForMultipleObjects( 3, handles, FALSE, INFINITE );
+
+		if ( ret != WAIT_FAILED )
+		{
+			if ( ret == kSMBStopEvent )
+			{
+				break;
+			}
+			else if ( ret == kSMBRegisterEvent )
+			{
+				err = gDNSServiceRegister( &sref, 0, 0, NULL, "_smb._tcp,_file", NULL, NULL, ( uint16_t ) port.NotAnInteger, ( mDNSu16 )( txtPtr - txtBuf ), txtBuf, NULL, NULL );
+
+				if ( err )
+				{
+					LogMsg( "SMBRegistrationThread: DNSServiceRegister returned %d\n", err );
+					sref = NULL;
+					break;
+				}
+			}
+			else if ( ret == kSMBDeregisterEvent )
+			{
+				if ( sref )
+				{
+					gDNSServiceRefDeallocate( sref );
+					sref = NULL;
+				}
+			}
+		}
+		else
+		{
+			LogMsg( "SMBRegistrationThread:  WaitForMultipleObjects returned %d\n", GetLastError() );
+			break;
+		}
+	}
+
+exit:
+
+	if ( sref != NULL )
+	{
+		gDNSServiceRefDeallocate( sref );
+		sref = NULL;
+	}
+
+	SetEvent( gSMBThreadQuitEvent );
+	_endthreadex( 0 );
+	return 0;
+}
+
+
+mDNSlocal void
+CheckFileShares( mDNS * const m )
+{
+	PSHARE_INFO_1	bufPtr = ( PSHARE_INFO_1 ) NULL;
+	DWORD			entriesRead = 0;
+	DWORD			totalEntries = 0;
+	DWORD			resume = 0;
+	mDNSBool		advertise = mDNSfalse;
+	mDNSBool		fileSharing = mDNSfalse;
+	mDNSBool		printSharing = mDNSfalse;
+	HKEY			key = NULL;
+	BOOL			retry = FALSE;
+	NET_API_STATUS  res;
+	mStatus			err;
+
+	check( m );
+
+	// Only do this if we're not shutting down
+
+	require_action_quiet( m->AdvertiseLocalAddresses && !m->ShutdownTime, exit, err = kNoErr );
+
+	err = RegCreateKey( HKEY_LOCAL_MACHINE, kServiceParametersNode L"\\Services\\SMB", &key );
+
+	if ( !err )
+	{
+		DWORD dwSize = sizeof( DWORD );
+		RegQueryValueEx( key, L"Advertise", NULL, NULL, (LPBYTE) &advertise, &dwSize );
+	}
+
+	if ( advertise && mDNSIsFileAndPrintSharingEnabled( &retry ) )
+	{
+		dlog( kDebugLevelTrace, DEBUG_NAME "Sharing is enabled\n" );
+
+		res = NetShareEnum( NULL, 1, ( LPBYTE* )&bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, &resume );
+
+		if ( ( res == ERROR_SUCCESS ) || ( res == ERROR_MORE_DATA ) )
+		{
+			PSHARE_INFO_1 p = bufPtr;
+			DWORD i;
+
+			for( i = 0; i < entriesRead; i++ ) 
+			{
+				// We are only interested if the user is sharing anything other 
+				// than the built-in "print$" source
+
+				if ( ( p->shi1_type == STYPE_DISKTREE ) && ( wcscmp( p->shi1_netname, TEXT( "print$" ) ) != 0 ) )
+				{
+					fileSharing = mDNStrue;
+				}
+				else if ( p->shi1_type == STYPE_PRINTQ )
+				{
+					printSharing = mDNStrue;
+				}
+
+				p++;
+			}
+
+			NetApiBufferFree( bufPtr );
+			bufPtr = NULL;
+			retry = FALSE;
+		}
+		else if ( res == NERR_ServerNotStarted )
+		{
+			retry = TRUE;
+		}
+	}
+	
+	if ( retry )
+	{
+		__int64			qwTimeout;
+		LARGE_INTEGER   liTimeout;
+
+		qwTimeout = -m->p->checkFileSharesTimeout * 10000000;
+		liTimeout.LowPart  = ( DWORD )( qwTimeout & 0xFFFFFFFF );
+		liTimeout.HighPart = ( LONG )( qwTimeout >> 32 );
+
+		SetWaitableTimer( m->p->checkFileSharesTimer, &liTimeout, 0, CheckFileSharesProc, m, FALSE );
+	}
+
+	if ( !m->p->smbFileSharing && fileSharing )
+	{
+		if ( !gSMBThread )
+		{
+			if ( !gDNSSDLibrary )
+			{
+				gDNSSDLibrary = LoadLibrary( TEXT( "dnssd.dll" ) );
+				require_action( gDNSSDLibrary, exit, err = GetLastError() );
+			}
+
+			if ( !gDNSServiceRegister )
+			{
+				gDNSServiceRegister = ( DNSServiceRegisterFunc ) GetProcAddress( gDNSSDLibrary, "DNSServiceRegister" );
+				require_action( gDNSServiceRegister, exit, err = GetLastError() );
+			}
+
+			if ( !gDNSServiceRefDeallocate )
+			{
+				gDNSServiceRefDeallocate = ( DNSServiceRefDeallocateFunc ) GetProcAddress( gDNSSDLibrary, "DNSServiceRefDeallocate" );
+				require_action( gDNSServiceRefDeallocate, exit, err = GetLastError() );
+			}
+
+			if ( !gSMBThreadRegisterEvent )
+			{
+				gSMBThreadRegisterEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+				require_action( gSMBThreadRegisterEvent != NULL, exit, err = GetLastError() );
+			}
+
+			if ( !gSMBThreadDeregisterEvent )
+			{
+				gSMBThreadDeregisterEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+				require_action( gSMBThreadDeregisterEvent != NULL, exit, err = GetLastError() );
+			}
+
+			if ( !gSMBThreadStopEvent )
+			{
+				gSMBThreadStopEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+				require_action( gSMBThreadStopEvent != NULL, exit, err = GetLastError() );
+			}
+
+			if ( !gSMBThreadQuitEvent )
+			{
+				gSMBThreadQuitEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
+				require_action( gSMBThreadQuitEvent != NULL, exit, err = GetLastError() );
+			}
+
+			gSMBThread = ( HANDLE ) _beginthreadex( NULL, 0, SMBRegistrationThread, m, 0, NULL );
+			require_action( gSMBThread != NULL, exit, err = GetLastError() );
+		}
+
+		SetEvent( gSMBThreadRegisterEvent );
+
+		m->p->smbFileSharing = mDNStrue;
+	}
+	else if ( m->p->smbFileSharing && !fileSharing )
+	{
+		dlog( kDebugLevelTrace, DEBUG_NAME "deregistering smb type\n" );
+
+		if ( gSMBThreadDeregisterEvent != NULL )
+		{
+			SetEvent( gSMBThreadDeregisterEvent );
+		}
+
+		m->p->smbFileSharing = mDNSfalse;
+	}
+
+exit:
+
+	if ( key )
+	{
+		RegCloseKey( key );
+	}
+}
+
+
+BOOL
+IsWOMPEnabled( mDNS * const m )
+{
+	BOOL enabled;
+
+	mDNSInterfaceData * ifd;
+
+	enabled = FALSE;
+
+	for( ifd = m->p->interfaceList; ifd; ifd = ifd->next )
+	{
+		if ( IsWOMPEnabledForAdapter( ifd->name ) )
+		{
+			enabled = TRUE;
+			break;
+		}
+	}
+
+	return enabled;
+}
+
+
+mDNSlocal mDNSu8
+IsWOMPEnabledForAdapter( const char * adapterName )
+{
+	char						fileName[80];
+	NDIS_OID					oid;
+    DWORD						count;
+    HANDLE						handle	= INVALID_HANDLE_VALUE;
+	NDIS_PNP_CAPABILITIES	*	pNPC	= NULL;
+	int							err;
+	mDNSu8						ok		= TRUE;
+
+	require_action( adapterName != NULL, exit, ok = FALSE );
+
+	dlog( kDebugLevelTrace, DEBUG_NAME "IsWOMPEnabledForAdapter: %s\n", adapterName );
+	
+    // Construct a device name to pass to CreateFile
+
+	strncpy_s( fileName, sizeof( fileName ), DEVICE_PREFIX, strlen( DEVICE_PREFIX ) );
+	strcat_s( fileName, sizeof( fileName ), adapterName );
+    handle = CreateFileA( fileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, INVALID_HANDLE_VALUE );
+	require_action ( handle != INVALID_HANDLE_VALUE, exit, ok = FALSE );
+
+	// We successfully opened the driver, format the IOCTL to pass the driver.
+		
+	oid = OID_PNP_CAPABILITIES;
+	pNPC = ( NDIS_PNP_CAPABILITIES * ) malloc( sizeof( NDIS_PNP_CAPABILITIES ) );
+	require_action( pNPC != NULL, exit, ok = FALSE );
+	ok = ( mDNSu8 ) DeviceIoControl( handle, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof( oid ), pNPC, sizeof( NDIS_PNP_CAPABILITIES ), &count, NULL );
+	err = translate_errno( ok, GetLastError(), kUnknownErr );
+	require_action( !err, exit, ok = FALSE );
+	ok = ( mDNSu8 ) ( ( count == sizeof( NDIS_PNP_CAPABILITIES ) ) && ( pNPC->Flags & NDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE ) );
+       
+exit:
+
+	if ( pNPC != NULL )
+	{
+		free( pNPC );
+	}
+
+    if ( handle != INVALID_HANDLE_VALUE )
+    {
+		CloseHandle( handle );
+    }
+
+	dlog( kDebugLevelTrace, DEBUG_NAME "IsWOMPEnabledForAdapter returns %s\n", ok ? "true" : "false" );
+
+	return ( mDNSu8 ) ok;
+}
+
+
+mDNSlocal void
+SendWakeupPacket( mDNS * const inMDNS, LPSOCKADDR addr, INT addrlen, const char * buf, INT buflen, INT numTries, INT msecSleep )
+{
+	mDNSBool	repeat = ( numTries == 1 ) ? mDNStrue : mDNSfalse;
+	SOCKET		sock;
+	int			num;
+	mStatus		err;
+
+	( void ) inMDNS;
+
+	sock = socket( addr->sa_family, SOCK_DGRAM, IPPROTO_UDP );
+	require_action( sock != INVALID_SOCKET, exit, err = mStatus_UnknownErr );
+
+	while ( numTries-- )
+	{
+		num = sendto( sock, ( const char* ) buf, buflen, 0, addr, addrlen );
+
+		if ( num != buflen )
+		{
+			LogMsg( "SendWakeupPacket error: sent %d bytes: %d\n", num, WSAGetLastError() );
+		}
+
+		if ( repeat )
+		{
+			num = sendto( sock, buf, buflen, 0, addr, addrlen );
+
+			if ( num != buflen )
+			{
+				LogMsg( "SendWakeupPacket error: sent %d bytes: %d\n", num, WSAGetLastError() );
+			}
+		}
+
+		if ( msecSleep )
+		{
+			Sleep( msecSleep );
+		}
+	}
+
+exit:
+
+	if ( sock != INVALID_SOCKET )
+	{
+		closesocket( sock );
+	}
+} 
+
+
+mDNSlocal void _cdecl
+SendMulticastWakeupPacket( void *arg )
+{
+	MulticastWakeupStruct *info = ( MulticastWakeupStruct* ) arg;
+	
+	if ( info )
+	{
+		SendWakeupPacket( info->inMDNS, ( LPSOCKADDR ) &info->addr, sizeof( info->addr ), ( const char* ) info->data, sizeof( info->data ), info->numTries, info->msecSleep );
+		free( info );
+	}
+
+	_endthread();
+}
+
+
+mDNSexport void FreeEtcHosts(mDNS *const m, AuthRecord *const rr, mStatus result)
+{
+	DEBUG_UNUSED( m );
+	DEBUG_UNUSED( rr );
+	DEBUG_UNUSED( result );
+}
diff --git a/mDNSResponder/mDNSWindows/mDNSWin32.h b/mDNSResponder/mDNSWindows/mDNSWin32.h
new file mode 100755
index 00000000..6b5b4356
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mDNSWin32.h
@@ -0,0 +1,163 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef	__MDNS_WIN32__
+#define	__MDNS_WIN32__
+
+#include	"CommonServices.h"
+
+#if( !defined( _WIN32_WCE ) )
+	#include	<mswsock.h>
+#endif
+
+#include	"mDNSEmbeddedAPI.h"
+#include	"uDNS.h"
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+
+typedef void ( *TCPUserCallback )();
+
+struct TCPSocket_struct
+{
+	TCPSocketFlags				flags;		// MUST BE FIRST FIELD -- mDNSCore expects every TCPSocket_struct to begin with TCPSocketFlags flags
+	SOCKET						fd;
+	BOOL						connected;
+	TCPUserCallback				userCallback;
+	void					*	userContext;
+	BOOL						closed;
+	mDNS					*	m;
+};
+
+
+struct UDPSocket_struct
+{
+	mDNSIPPort					port; 		// MUST BE FIRST FIELD -- mDNSCoreReceive expects every UDPSocket_struct to begin with mDNSIPPort port
+	mDNSAddr					addr;		// This is initialized by our code. If we don't get the 
+											// dstAddr from WSARecvMsg we use this value instead.
+	SOCKET						fd;
+	LPFN_WSARECVMSG				recvMsgPtr;
+	DNSMessage					packet;
+	struct mDNSInterfaceData	*ifd;
+	UDPSocket					*next;
+	mDNS						*m;
+};
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		mDNSInterfaceData
+
+	@abstract	Structure containing interface-specific data.
+*/
+
+typedef struct	mDNSInterfaceData	mDNSInterfaceData;
+struct	mDNSInterfaceData
+{
+	char						name[ 128 ];
+	uint32_t					index;
+	uint32_t					scopeID;
+	struct UDPSocket_struct		sock;
+	NetworkInterfaceInfo		interfaceInfo;
+	mDNSBool					hostRegistered;
+	mDNSInterfaceData		*	next;
+};
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@typedef	ReportStatusFunc
+*/
+typedef void		(*ReportStatusFunc)(int inType, const char *inFormat, ...);
+
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		mDNS_PlatformSupport_struct
+
+	@abstract	Structure containing platform-specific data.
+*/
+
+struct	mDNS_PlatformSupport_struct
+{
+	HANDLE						mainThread;
+	HANDLE						checkFileSharesTimer;
+	mDNSs32						checkFileSharesTimeout;
+	ReportStatusFunc			reportStatusFunc;
+	time_t						nextDHCPLeaseExpires;
+	char						nbname[ 32 ];
+	char						nbdomain[ 32 ];
+	mDNSBool					smbFileSharing;
+	mDNSBool					smbPrintSharing;
+	ServiceRecordSet			smbSRS;
+	AuthRecord					smbSubTypes[ 2 ];
+	mDNSBool					registeredLoopback4;
+	int							interfaceCount;
+	mDNSInterfaceData *			interfaceList;
+	mDNSInterfaceData *			inactiveInterfaceList;
+	struct UDPSocket_struct		unicastSock4;
+	struct UDPSocket_struct		unicastSock6;
+	DWORD						osMajorVersion;
+	DWORD						osMinorVersion;
+};
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@struct		ifaddrs
+
+	@abstract	Interface information
+*/
+
+struct ifaddrs
+{
+	struct ifaddrs *	ifa_next;
+	char *				ifa_name;
+	u_int				ifa_flags;
+	struct sockaddr	*	ifa_addr;
+	struct sockaddr	*	ifa_netmask;
+	struct sockaddr	*	ifa_broadaddr;
+	struct sockaddr	*	ifa_dstaddr;
+	BYTE				ifa_physaddr[6];
+	BOOL				ifa_dhcpEnabled;
+	time_t				ifa_dhcpLeaseExpires;
+	mDNSu8				ifa_womp;
+	void *				ifa_data;
+	
+	struct
+	{
+		uint32_t		index;
+	
+	}	ifa_extra;
+};
+
+
+extern void		InterfaceListDidChange( mDNS * const inMDNS );
+extern void		ComputerDescriptionDidChange( mDNS * const inMDNS );
+extern void		TCPIPConfigDidChange( mDNS * const inMDNS );
+extern void		DynDNSConfigDidChange( mDNS * const inMDNS );
+extern void		FileSharingDidChange( mDNS * const inMDNS );
+extern void		FirewallDidChange( mDNS * const inMDNS );
+extern mStatus  TCPAddSocket( mDNS * const inMDNS, TCPSocket *sock );
+extern mStatus	SetupInterfaceList( mDNS * const inMDNS );
+extern mStatus	TearDownInterfaceList( mDNS * const inMDNS );
+extern BOOL		IsWOMPEnabled();
+extern void     DispatchSocketEvents( mDNS * const inMDNS );
+
+
+#ifdef	__cplusplus
+	}
+#endif
+
+#endif	// __MDNS_WIN32__
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/ReadMe.txt b/mDNSResponder/mDNSWindows/mdnsNSP/ReadMe.txt
new file mode 100644
index 00000000..7a6e2ccd
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/ReadMe.txt
@@ -0,0 +1,15 @@
+The mdnsNSP is a NameSpace Provider. It hooks into the Windows name resolution infrastructure to allow any software using the standard Windows APIs for resolving names to work with DNS-SD. For example, when the mdnsNSP is installed, you can type "http://computer.local./" in Internet Explorer and it will resolve "computer.local." using DNS-SD and go to the web site (assuming you have a computer named "computer" on the local network and advertised via DNS-SD).
+
+NSP's are implemented DLLs and must be installed to work. NSP DLLs export an NSPStartup function, which is called when the NSP is used, and NSPStartup provides information about itself (e.g. version number, compatibility information, and a list of function pointers for each of the supported NSP routines).
+
+If you need to register the mdnsNSP, you can use the NSPTool (sources for it are provided along with the mdnsNSP) with the following line from the DOS command line prompt ("<path>" is the actual parent path of the DLL):
+
+NSPTool -install "mdnsNSP" "B600E6E9-553B-4a19-8696-335E5C896153" "<path>"
+
+You can remove remove the mdnsNSP with the following line:
+
+NSPTool -remove "B600E6E9-553B-4a19-8696-335E5C896153"
+
+For more information, check out the following URL:
+
+<http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/winsock/name_space_service_providers_2.asp>
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.aps b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.aps
new file mode 100644
index 00000000..2e3b63a4
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.aps
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.c b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.c
new file mode 100644
index 00000000..2cd01eff
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.c
@@ -0,0 +1,2430 @@
+/* -*- Mode: C; tab-width: 4 -*-
+ *
+ * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+
+#include	"ClientCommon.h"
+#include	"CommonServices.h"
+#include	"DebugServices.h"
+
+#include	<iphlpapi.h>
+#include	<guiddef.h>
+#include	<ws2spi.h>
+#include	<shlwapi.h>
+
+
+
+#include	"dns_sd.h"
+
+#pragma comment(lib, "DelayImp.lib")
+
+#ifdef _MSC_VER
+#define swprintf _snwprintf
+#define snprintf _snprintf
+#endif
+
+#define MAX_LABELS 128
+
+#if 0
+#pragma mark == Structures ==
+#endif
+
+//===========================================================================================================================
+//	Structures
+//===========================================================================================================================
+
+typedef struct	Query *		QueryRef;
+typedef struct	Query		Query;
+struct	Query
+{
+	QueryRef			next;
+	int					refCount;
+	DWORD				querySetFlags;
+	WSAQUERYSETW *		querySet;
+	size_t				querySetSize;
+	HANDLE				data4Event;
+	HANDLE				data6Event;
+	HANDLE				cancelEvent;
+	HANDLE				waitHandles[ 3 ];
+	DWORD				waitCount;
+	DNSServiceRef		resolver4;
+	DNSServiceRef		resolver6;
+	char				name[ kDNSServiceMaxDomainName ];
+	size_t				nameSize;
+	uint8_t				numValidAddrs;
+	uint32_t			addr4;
+	bool				addr4Valid;
+	uint8_t				addr6[16];
+	u_long				addr6ScopeId;
+	bool				addr6Valid;
+};
+
+#define BUFFER_INITIAL_SIZE		4192
+#define ALIASES_INITIAL_SIZE	5
+
+typedef struct HostsFile
+{
+	int			m_bufferSize;
+	char	*	m_buffer;
+	FILE	*	m_fp;
+} HostsFile;
+
+
+typedef struct HostsFileInfo
+{
+	struct hostent		m_host;
+	struct HostsFileInfo	*	m_next;
+} HostsFileInfo;
+
+
+#if 0
+#pragma mark == Prototypes ==
+#endif
+
+//===========================================================================================================================
+//	Prototypes
+//===========================================================================================================================
+
+// DLL Exports
+
+BOOL WINAPI		DllMain( HINSTANCE inInstance, DWORD inReason, LPVOID inReserved );
+STDAPI			DllRegisterServer( void );
+STDAPI			DllRegisterServer( void );
+
+	
+// NSP SPIs
+
+int	WSPAPI	NSPCleanup( LPGUID inProviderID );
+
+DEBUG_LOCAL int WSPAPI
+	NSPLookupServiceBegin(
+		LPGUID					inProviderID,
+		LPWSAQUERYSETW			inQuerySet,
+		LPWSASERVICECLASSINFOW	inServiceClassInfo,
+		DWORD					inFlags,   
+		LPHANDLE				outLookup );
+
+DEBUG_LOCAL int WSPAPI
+	NSPLookupServiceNext(  
+		HANDLE			inLookup,
+		DWORD			inFlags,
+		LPDWORD			ioBufferLength,
+		LPWSAQUERYSETW	outResults );
+
+DEBUG_LOCAL int WSPAPI	NSPLookupServiceEnd( HANDLE inLookup );
+
+DEBUG_LOCAL int WSPAPI
+	NSPSetService(
+		LPGUID					inProviderID,						
+		LPWSASERVICECLASSINFOW	inServiceClassInfo,   
+		LPWSAQUERYSETW			inRegInfo,				  
+		WSAESETSERVICEOP		inOperation,			   
+		DWORD					inFlags );
+
+DEBUG_LOCAL int WSPAPI	NSPInstallServiceClass( LPGUID inProviderID, LPWSASERVICECLASSINFOW inServiceClassInfo );
+DEBUG_LOCAL int WSPAPI	NSPRemoveServiceClass( LPGUID inProviderID, LPGUID inServiceClassID );
+DEBUG_LOCAL int WSPAPI	NSPGetServiceClassInfo(	LPGUID inProviderID, LPDWORD ioBufSize, LPWSASERVICECLASSINFOW ioServiceClassInfo );
+
+// Private
+
+#define	NSPLock()		EnterCriticalSection( &gLock );
+#define	NSPUnlock()		LeaveCriticalSection( &gLock );
+
+DEBUG_LOCAL OSStatus	QueryCreate( const WSAQUERYSETW *inQuerySet, DWORD inQuerySetFlags, QueryRef *outRef );
+DEBUG_LOCAL OSStatus	QueryRetain( QueryRef inRef );
+DEBUG_LOCAL OSStatus	QueryRelease( QueryRef inRef );
+
+DEBUG_LOCAL void CALLBACK_COMPAT
+	QueryRecordCallback4(
+		DNSServiceRef		inRef,
+		DNSServiceFlags		inFlags,
+		uint32_t			inInterfaceIndex,
+		DNSServiceErrorType	inErrorCode,
+		const char *		inName,    
+		uint16_t			inRRType,
+		uint16_t			inRRClass,
+		uint16_t			inRDataSize,
+		const void *		inRData,
+		uint32_t			inTTL,
+		void *				inContext );
+
+DEBUG_LOCAL void CALLBACK_COMPAT
+	QueryRecordCallback6(
+		DNSServiceRef		inRef,
+		DNSServiceFlags		inFlags,
+		uint32_t			inInterfaceIndex,
+		DNSServiceErrorType	inErrorCode,
+		const char *		inName,    
+		uint16_t			inRRType,
+		uint16_t			inRRClass,
+		uint16_t			inRDataSize,
+		const void *		inRData,
+		uint32_t			inTTL,
+		void *				inContext );
+
+DEBUG_LOCAL OSStatus
+	QueryCopyQuerySet( 
+		QueryRef 				inRef, 
+		const WSAQUERYSETW *	inQuerySet, 
+		DWORD 					inQuerySetFlags, 
+		WSAQUERYSETW **			outQuerySet, 
+		size_t *				outSize );
+
+DEBUG_LOCAL void
+	QueryCopyQuerySetTo( 
+		QueryRef 				inRef, 
+		const WSAQUERYSETW *	inQuerySet, 
+		DWORD 					inQuerySetFlags, 
+		WSAQUERYSETW *			outQuerySet );
+
+DEBUG_LOCAL size_t	QueryCopyQuerySetSize( QueryRef inRef, const WSAQUERYSETW *inQuerySet, DWORD inQuerySetFlags );
+
+#if( DEBUG )
+	void	DebugDumpQuerySet( DebugLevel inLevel, const WSAQUERYSETW *inQuerySet );
+	
+	#define	dlog_query_set( LEVEL, SET )		DebugDumpQuerySet( LEVEL, SET )
+#else
+	#define	dlog_query_set( LEVEL, SET )
+#endif
+
+DEBUG_LOCAL BOOL		InHostsTable( const char * name );
+DEBUG_LOCAL BOOL		IsLocalName( HostsFileInfo * node );
+DEBUG_LOCAL BOOL		IsSameName( HostsFileInfo * node, const char * name );
+DEBUG_LOCAL OSStatus	HostsFileOpen( HostsFile ** self, const char * fname );
+DEBUG_LOCAL OSStatus	HostsFileClose( HostsFile * self );
+DEBUG_LOCAL void		HostsFileInfoFree( HostsFileInfo * info );
+DEBUG_LOCAL OSStatus	HostsFileNext( HostsFile * self, HostsFileInfo ** hInfo );
+DEBUG_LOCAL DWORD		GetScopeId( DWORD ifIndex );
+
+#ifdef ENABLE_REVERSE_LOOKUP
+DEBUG_LOCAL OSStatus	IsReverseLookup( LPCWSTR name, size_t size );
+#endif
+
+
+#if 0
+#pragma mark == Globals ==
+#endif
+
+//===========================================================================================================================
+//	Globals
+//===========================================================================================================================
+
+// {B600E6E9-553B-4a19-8696-335E5C896153}
+DEBUG_LOCAL HINSTANCE				gInstance			= NULL;
+DEBUG_LOCAL wchar_t				*	gNSPName			= L"mdnsNSP";
+DEBUG_LOCAL GUID					gNSPGUID			= { 0xb600e6e9, 0x553b, 0x4a19, { 0x86, 0x96, 0x33, 0x5e, 0x5c, 0x89, 0x61, 0x53 } };
+DEBUG_LOCAL LONG					gRefCount			= 0;
+DEBUG_LOCAL CRITICAL_SECTION		gLock;
+DEBUG_LOCAL bool					gLockInitialized 	= false;
+DEBUG_LOCAL QueryRef				gQueryList	 		= NULL;
+DEBUG_LOCAL HostsFileInfo		*	gHostsFileInfo		= NULL;
+typedef DWORD
+	( WINAPI * GetAdaptersAddressesFunctionPtr )( 
+			ULONG 					inFamily, 
+			DWORD 					inFlags, 
+			PVOID 					inReserved, 
+			PIP_ADAPTER_ADDRESSES 	inAdapter, 
+			PULONG					outBufferSize );
+
+DEBUG_LOCAL HMODULE								gIPHelperLibraryInstance			= NULL;
+DEBUG_LOCAL GetAdaptersAddressesFunctionPtr		gGetAdaptersAddressesFunctionPtr	= NULL;
+
+
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	DllMain
+//===========================================================================================================================
+
+BOOL APIENTRY	DllMain( HINSTANCE inInstance, DWORD inReason, LPVOID inReserved )
+{
+	DEBUG_USE_ONLY( inInstance );
+	DEBUG_UNUSED( inReserved );
+
+	switch( inReason )
+	{
+		case DLL_PROCESS_ATTACH:			
+			gInstance = inInstance;		
+			gHostsFileInfo	= NULL;
+			debug_initialize( kDebugOutputTypeWindowsEventLog, "mDNS NSP", inInstance );
+			debug_set_property( kDebugPropertyTagPrintLevel, kDebugLevelNotice );
+			dlog( kDebugLevelTrace, "\n" );
+			dlog( kDebugLevelVerbose, "%s: process attach\n", __ROUTINE__ );
+
+			break;
+		
+		case DLL_PROCESS_DETACH:
+			HostsFileInfoFree( gHostsFileInfo );
+			gHostsFileInfo = NULL;
+			dlog( kDebugLevelVerbose, "%s: process detach\n", __ROUTINE__ );
+			break;
+		
+		case DLL_THREAD_ATTACH:
+			dlog( kDebugLevelVerbose, "%s: thread attach\n", __ROUTINE__ );
+			break;
+		
+		case DLL_THREAD_DETACH:
+			dlog( kDebugLevelVerbose, "%s: thread detach\n", __ROUTINE__ );
+			break;
+		
+		default:
+			dlog( kDebugLevelNotice, "%s: unknown reason code (%d)\n", __ROUTINE__, inReason );
+			break;
+	}
+
+	return( TRUE );
+}
+
+
+//===========================================================================================================================
+//	DllRegisterServer
+//===========================================================================================================================
+
+STDAPI	DllRegisterServer( void )
+{
+	WSADATA		wsd;
+	WCHAR		path[ MAX_PATH ];
+	HRESULT		err;
+	
+	dlog( kDebugLevelTrace, "DllRegisterServer\n" );
+
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+
+	// Unregister before registering to workaround an installer
+	// problem during upgrade installs.
+
+	WSCUnInstallNameSpace( &gNSPGUID );
+
+	err = GetModuleFileNameW( gInstance, path, MAX_PATH );
+	err = translate_errno( err != 0, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+
+	err = WSCInstallNameSpace( gNSPName, path, NS_DNS, 1, &gNSPGUID );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+exit:
+
+	WSACleanup();
+	return( err );
+}
+
+//===========================================================================================================================
+//	DllUnregisterServer
+//===========================================================================================================================
+
+STDAPI	DllUnregisterServer( void )
+{
+	WSADATA		wsd;
+	HRESULT err;
+	
+	dlog( kDebugLevelTrace, "DllUnregisterServer\n" );
+	
+	err = WSAStartup( MAKEWORD( 2, 2 ), &wsd );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	err = WSCUnInstallNameSpace( &gNSPGUID );
+	err = translate_errno( err == 0, errno_compat(), WSAEINVAL );
+	require_noerr( err, exit );
+		
+exit:
+
+	WSACleanup();
+	return err;
+}
+
+
+//===========================================================================================================================
+//	NSPStartup
+//
+//	This function is called when our namespace DLL is loaded. It sets up the NSP functions we implement and initializes us.
+//===========================================================================================================================
+
+int WSPAPI	NSPStartup( LPGUID inProviderID, LPNSP_ROUTINE outRoutines )
+{
+	OSStatus		err;
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s (GUID=%U, refCount=%ld)\n", __ROUTINE__, inProviderID, gRefCount );
+	
+	// Only initialize if this is the first time NSPStartup is called. 
+	
+	if( InterlockedIncrement( &gRefCount ) != 1 )
+	{
+		err = NO_ERROR;
+		goto exit;
+	}
+	
+	// Initialize our internal state.
+	
+	InitializeCriticalSection( &gLock );
+	gLockInitialized = true;
+	
+	// Set the size to exclude NSPIoctl because we don't implement it.
+	
+	outRoutines->cbSize					= FIELD_OFFSET( NSP_ROUTINE, NSPIoctl );
+	outRoutines->dwMajorVersion			= 4;
+	outRoutines->dwMinorVersion			= 4;
+	outRoutines->NSPCleanup				= NSPCleanup;
+	outRoutines->NSPLookupServiceBegin	= NSPLookupServiceBegin;
+	outRoutines->NSPLookupServiceNext	= NSPLookupServiceNext;
+	outRoutines->NSPLookupServiceEnd	= NSPLookupServiceEnd;
+	outRoutines->NSPSetService			= NSPSetService;
+	outRoutines->NSPInstallServiceClass	= NSPInstallServiceClass;
+	outRoutines->NSPRemoveServiceClass	= NSPRemoveServiceClass;
+	outRoutines->NSPGetServiceClassInfo	= NSPGetServiceClassInfo;
+	
+	// See if we can get the address for the GetAdaptersAddresses() API.  This is only in XP, but we want our
+	// code to run on older versions of Windows
+
+	if ( !gIPHelperLibraryInstance )
+	{
+		gIPHelperLibraryInstance = LoadLibrary( TEXT( "Iphlpapi" ) );
+		if( gIPHelperLibraryInstance )
+		{
+			gGetAdaptersAddressesFunctionPtr = (GetAdaptersAddressesFunctionPtr) GetProcAddress( gIPHelperLibraryInstance, "GetAdaptersAddresses" );
+		}
+	}
+
+	err = NO_ERROR;
+	
+exit:
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	if( err != NO_ERROR )
+	{
+		NSPCleanup( inProviderID );
+		SetLastError( (DWORD) err );
+		return( SOCKET_ERROR );
+	}
+	return( NO_ERROR );
+}
+
+//===========================================================================================================================
+//	NSPCleanup
+//
+//	This function is called when our namespace DLL is unloaded. It cleans up anything we set up in NSPStartup.
+//===========================================================================================================================
+
+int	WSPAPI	NSPCleanup( LPGUID inProviderID )
+{
+	DEBUG_USE_ONLY( inProviderID );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s (GUID=%U, refCount=%ld)\n", __ROUTINE__, inProviderID, gRefCount );
+	
+	// Only initialize if this is the first time NSPStartup is called.
+	
+	if( InterlockedDecrement( &gRefCount ) != 0 )
+	{
+		goto exit;
+	}
+	
+	// Stop any outstanding queries.
+	
+	if( gLockInitialized )
+	{
+		NSPLock();
+	}
+	while( gQueryList )
+	{
+		check_string( gQueryList->refCount == 1, "NSPCleanup with outstanding queries!" );
+		QueryRelease( gQueryList );
+	}
+	if( gLockInitialized )
+	{
+		NSPUnlock();
+	}
+	
+	if( gLockInitialized )
+	{
+		gLockInitialized = false;
+		DeleteCriticalSection( &gLock );
+	}
+
+	if( gIPHelperLibraryInstance )
+	{
+		BOOL ok;
+				
+		ok = FreeLibrary( gIPHelperLibraryInstance );
+		check_translated_errno( ok, GetLastError(), kUnknownErr );
+		gIPHelperLibraryInstance = NULL;
+	}
+	
+exit:
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	return( NO_ERROR );
+}
+
+//===========================================================================================================================
+//	NSPLookupServiceBegin
+//
+//	This function maps to the WinSock WSALookupServiceBegin function. It starts the lookup process and returns a HANDLE 
+//	that can be used in subsequent operations. Subsequent calls only need to refer to this query by the handle as 
+//	opposed to specifying the query parameters each time.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI
+	NSPLookupServiceBegin(
+		LPGUID					inProviderID,
+		LPWSAQUERYSETW			inQuerySet,
+		LPWSASERVICECLASSINFOW	inServiceClassInfo,
+		DWORD					inFlags,   
+		LPHANDLE				outLookup )
+{
+	OSStatus		err;
+	QueryRef		obj;
+	LPCWSTR			name;
+	size_t			size;
+	LPCWSTR			p;
+	DWORD           type;
+	DWORD			n;
+	DWORD			i;
+	INT				family;
+	INT				protocol;
+	
+	DEBUG_UNUSED( inProviderID );
+	DEBUG_UNUSED( inServiceClassInfo );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	
+	obj = NULL;
+	require_action( inQuerySet, exit, err = WSAEINVAL );
+	name = inQuerySet->lpszServiceInstanceName;
+	require_action_quiet( name, exit, err = WSAEINVAL );
+	require_action( outLookup, exit, err = WSAEINVAL );
+	
+	dlog( kDebugLevelTrace, "%s (flags=0x%08X, name=\"%S\")\n", __ROUTINE__, inFlags, name );
+	dlog_query_set( kDebugLevelVerbose, inQuerySet );
+	
+	// Check if we can handle this type of request and if we support any of the protocols being requested.
+	// We only support the DNS namespace, TCP and UDP protocols, and IPv4. Only blob results are supported.
+	
+	require_action_quiet( inFlags & (LUP_RETURN_ADDR|LUP_RETURN_BLOB), exit, err = WSASERVICE_NOT_FOUND );
+	
+	type = inQuerySet->dwNameSpace;
+	require_action_quiet( ( type == NS_DNS ) || ( type == NS_ALL ), exit, err = WSASERVICE_NOT_FOUND );
+	
+	n = inQuerySet->dwNumberOfProtocols;
+	if( n > 0 )
+	{
+		require_action( inQuerySet->lpafpProtocols, exit, err = WSAEINVAL );
+		for( i = 0; i < n; ++i )
+		{
+			family = inQuerySet->lpafpProtocols[ i ].iAddressFamily;
+			protocol = inQuerySet->lpafpProtocols[ i ].iProtocol;
+			if( ( family == AF_INET ) && ( ( protocol == IPPROTO_UDP ) || ( protocol == IPPROTO_TCP ) ) )
+			{
+				break;
+			}
+		}
+		require_action_quiet( i < n, exit, err = WSASERVICE_NOT_FOUND );
+	}
+	
+	// Check if the name ends in ".local" and if not, exit with an error since we only resolve .local names.
+	// The name may or may not end with a "." (fully qualified) so handle both cases. DNS is also case 
+	// insensitive the check for .local has to be case insensitive (.LoCaL is equivalent to .local). This
+	// manually does the wchar_t strlen and stricmp to avoid needing any special wchar_t versions of the 
+	// libraries. It is probably faster to do the inline compare than invoke functions to do it anyway.
+	
+	for( p = name; *p; ++p ) {}		// Find end of string
+	size = (size_t)( p - name );
+	require_action_quiet( size > sizeof_string( ".local" ), exit, err = WSASERVICE_NOT_FOUND );
+	
+	p = name + ( size - 1 );
+	p = ( *p == '.' ) ? ( p - sizeof_string( ".local" ) ) : ( ( p - sizeof_string( ".local" ) ) + 1 );
+	if	( ( ( p[ 0 ] != '.' )						||
+		( ( p[ 1 ] != 'L' ) && ( p[ 1 ] != 'l' ) )	||
+		( ( p[ 2 ] != 'O' ) && ( p[ 2 ] != 'o' ) )	||
+		( ( p[ 3 ] != 'C' ) && ( p[ 3 ] != 'c' ) )	||
+		( ( p[ 4 ] != 'A' ) && ( p[ 4 ] != 'a' ) )	||
+		( ( p[ 5 ] != 'L' ) && ( p[ 5 ] != 'l' ) ) ) )
+	{
+#ifdef ENABLE_REVERSE_LOOKUP
+
+		err = IsReverseLookup( name, size );
+
+#else
+
+		err = WSASERVICE_NOT_FOUND;
+
+#endif
+
+		require_noerr( err, exit );
+	}
+	else
+	{
+		const char	*	replyDomain;
+		char			translated[ kDNSServiceMaxDomainName ];
+		int				n;
+		int				labels		= 0;
+		const char	*	label[MAX_LABELS];
+		char			text[64];
+
+		n = WideCharToMultiByte( CP_UTF8, 0, name, -1, translated, sizeof( translated ), NULL, NULL );
+		require_action( n > 0, exit, err = WSASERVICE_NOT_FOUND );
+
+		// <rdar://problem/4050633>
+
+		// Don't resolve multi-label name
+
+		// <rdar://problem/5914160> Eliminate use of GetNextLabel in mdnsNSP
+		// Add checks for GetNextLabel returning NULL, individual labels being greater than
+		// 64 bytes, and the number of labels being greater than MAX_LABELS
+		replyDomain = translated;
+
+		while (replyDomain && *replyDomain && labels < MAX_LABELS)
+		{
+			label[labels++]	= replyDomain;
+			replyDomain		= GetNextLabel(replyDomain, text);
+		}
+
+		require_action( labels == 2, exit, err = WSASERVICE_NOT_FOUND );
+
+		// <rdar://problem/3936771>
+		//
+		// Check to see if the name of this host is in the hosts table. If so,
+		// don't try and resolve it
+		
+		require_action( InHostsTable( translated ) == FALSE, exit, err = WSASERVICE_NOT_FOUND );
+	}
+
+	// The name ends in .local ( and isn't in the hosts table ), .0.8.e.f.ip6.arpa, or .254.169.in-addr.arpa so start the resolve operation. Lazy initialize DNS-SD if needed.
+		
+	NSPLock();
+	
+	err = QueryCreate( inQuerySet, inFlags, &obj );
+	NSPUnlock();
+	require_noerr( err, exit );
+	
+	*outLookup = (HANDLE) obj;
+	
+exit:
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	if( err != NO_ERROR )
+	{
+		SetLastError( (DWORD) err );
+		return( SOCKET_ERROR );
+	}
+	return( NO_ERROR );
+}
+
+//===========================================================================================================================
+//	NSPLookupServiceNext
+//
+//	This function maps to the Winsock call WSALookupServiceNext. This routine takes a handle to a previously defined 
+//	query and attempts to locate a service matching the criteria defined by the query. If so, that instance is returned 
+//	in the lpqsResults parameter.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI
+	NSPLookupServiceNext(  
+		HANDLE			inLookup,
+		DWORD			inFlags,
+		LPDWORD			ioSize,
+		LPWSAQUERYSETW	outResults )
+{
+	BOOL			data4;
+	BOOL			data6;
+	OSStatus		err;
+	QueryRef		obj;
+	DWORD			waitResult;
+	size_t			size;
+	
+	DEBUG_USE_ONLY( inFlags );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	
+	data4 = FALSE;
+	data6 = FALSE;
+	obj = NULL;
+	NSPLock();
+	err = QueryRetain( (QueryRef) inLookup );
+	require_noerr( err, exit );
+	obj = (QueryRef) inLookup;
+	require_action( ioSize, exit, err = WSAEINVAL );
+	require_action( outResults, exit, err = WSAEINVAL );
+	
+	dlog( kDebugLevelTrace, "%s (lookup=%#p, flags=0x%08X, *ioSize=%d)\n", __ROUTINE__, inLookup, inFlags, *ioSize );
+	
+	// Wait for data or a cancel. Release the lock while waiting. This is safe because we've retained the query.
+
+	NSPUnlock();
+	waitResult = WaitForMultipleObjects( obj->waitCount, obj->waitHandles, FALSE, 2 * 1000 );
+	NSPLock();
+	require_action_quiet( waitResult != ( WAIT_OBJECT_0 ), exit, err = WSA_E_CANCELLED );
+	err = translate_errno( ( waitResult == WAIT_OBJECT_0 + 1 ) || ( waitResult == WAIT_OBJECT_0 + 2 ), (OSStatus) GetLastError(), WSASERVICE_NOT_FOUND );
+	require_noerr_quiet( err, exit );
+
+	// If we've received an IPv4 reply, then hang out briefly for an IPv6 reply
+
+	if ( waitResult == WAIT_OBJECT_0 + 1 )
+	{
+		data4 = TRUE;
+		data6 = WaitForSingleObject( obj->data6Event, 100 ) == WAIT_OBJECT_0 ? TRUE : FALSE;
+	}
+
+	// Else we've received an IPv6 reply, so hang out briefly for an IPv4 reply
+
+	else if ( waitResult == WAIT_OBJECT_0 + 2 )
+	{
+		data4 = WaitForSingleObject( obj->data4Event, 100 ) == WAIT_OBJECT_0 ? TRUE : FALSE;
+		data6 = TRUE;
+	}
+
+	if ( data4 )
+	{
+		__try
+		{
+			err = DNSServiceProcessResult(obj->resolver4);
+		}
+		__except( EXCEPTION_EXECUTE_HANDLER )
+		{
+			err = kUnknownErr;
+		}
+
+		require_noerr( err, exit );
+	}
+
+	if ( data6 )
+	{
+		__try
+		{
+			err = DNSServiceProcessResult( obj->resolver6 );
+		}
+		__except( EXCEPTION_EXECUTE_HANDLER )
+		{
+			err = kUnknownErr;
+		}
+
+		require_noerr( err, exit );
+	}
+
+	require_action_quiet( obj->addr4Valid || obj->addr6Valid, exit, err = WSA_E_NO_MORE );
+
+	// Copy the externalized query results to the callers buffer (if it fits).
+	
+	size = QueryCopyQuerySetSize( obj, obj->querySet, obj->querySetFlags );
+	require_action( size <= (size_t) *ioSize, exit, err = WSAEFAULT );
+	
+	QueryCopyQuerySetTo( obj, obj->querySet, obj->querySetFlags, outResults );
+	outResults->dwOutputFlags = RESULT_IS_ADDED;
+	obj->addr4Valid = false;
+	obj->addr6Valid = false;
+
+exit:
+	if( obj )
+	{
+		QueryRelease( obj );
+	}
+	NSPUnlock();
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	if( err != NO_ERROR )
+	{
+		SetLastError( (DWORD) err );
+		return( SOCKET_ERROR );
+	}
+	return( NO_ERROR );
+}
+
+//===========================================================================================================================
+//	NSPLookupServiceEnd
+//
+//	This function maps to the Winsock call WSALookupServiceEnd. Once the user process has finished is query (usually 
+//	indicated when WSALookupServiceNext returns the error WSA_E_NO_MORE) a call to this function is made to release any 
+//	allocated resources associated with the query.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI	NSPLookupServiceEnd( HANDLE inLookup )
+{
+	OSStatus		err;
+
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	
+	dlog( kDebugLevelTrace, "%s (lookup=%#p)\n", __ROUTINE__, inLookup );
+	
+	NSPLock();
+	err = QueryRelease( (QueryRef) inLookup );
+	NSPUnlock();
+	require_noerr( err, exit );
+	
+exit:
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	if( err != NO_ERROR )
+	{
+		SetLastError( (DWORD) err );
+		return( SOCKET_ERROR );
+	}
+	return( NO_ERROR );
+}
+
+//===========================================================================================================================
+//	NSPSetService
+//
+//	This function maps to the Winsock call WSASetService. This routine is called when the user wants to register or 
+//	deregister an instance of a server with our service. For registration, the user needs to associate the server with a 
+//	service class. For deregistration the service class is required along with the servicename. The inRegInfo parameter 
+//	contains a WSAQUERYSET structure defining the server (such as protocol and address where it is).
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI
+	NSPSetService(
+		LPGUID					inProviderID,						
+		LPWSASERVICECLASSINFOW	inServiceClassInfo,   
+		LPWSAQUERYSETW			inRegInfo,				  
+		WSAESETSERVICEOP		inOperation,			   
+		DWORD					inFlags )
+{
+	DEBUG_UNUSED( inProviderID );
+	DEBUG_UNUSED( inServiceClassInfo );
+	DEBUG_UNUSED( inRegInfo );
+	DEBUG_UNUSED( inOperation );
+	DEBUG_UNUSED( inFlags );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s\n", __ROUTINE__ );
+	
+	// We don't allow services to be registered so always return an error.
+	
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	return( WSAEINVAL );
+}
+
+//===========================================================================================================================
+//	NSPInstallServiceClass
+//
+//	This function maps to the Winsock call WSAInstallServiceClass. This routine is used to install a service class which 
+//	is used to define certain characteristics for a group of services. After a service class is registered, an actual
+//	instance of a server may be registered.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI	NSPInstallServiceClass( LPGUID inProviderID, LPWSASERVICECLASSINFOW inServiceClassInfo )
+{
+	DEBUG_UNUSED( inProviderID );
+	DEBUG_UNUSED( inServiceClassInfo );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s\n", __ROUTINE__ );
+	
+	// We don't allow service classes to be installed so always return an error.
+
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	return( WSA_INVALID_PARAMETER );
+}
+
+//===========================================================================================================================
+//	NSPRemoveServiceClass
+//
+//	This function maps to the Winsock call WSARemoveServiceClass. This routine removes a previously registered service 
+//	class. This is accomplished by connecting to the namespace service and writing the GUID which defines the given 
+//	service class.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI	NSPRemoveServiceClass( LPGUID inProviderID, LPGUID inServiceClassID )
+{
+	DEBUG_UNUSED( inProviderID );
+	DEBUG_UNUSED( inServiceClassID );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s\n", __ROUTINE__ );
+	
+	// We don't allow service classes to be installed so always return an error.
+	
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	return( WSATYPE_NOT_FOUND );
+}
+
+//===========================================================================================================================
+//	NSPGetServiceClassInfo
+//
+//	This function maps to the Winsock call WSAGetServiceClassInfo. This routine returns the information associated with 
+//	a given service class.
+//===========================================================================================================================
+
+DEBUG_LOCAL int WSPAPI	NSPGetServiceClassInfo(	LPGUID inProviderID, LPDWORD ioSize, LPWSASERVICECLASSINFOW ioServiceClassInfo )
+{
+	DEBUG_UNUSED( inProviderID );
+	DEBUG_UNUSED( ioSize );
+	DEBUG_UNUSED( ioServiceClassInfo );
+	
+	dlog( kDebugLevelTrace, "%s begin (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	dlog( kDebugLevelTrace, "%s\n", __ROUTINE__ );
+	
+	// We don't allow service classes to be installed so always return an error.
+	
+	dlog( kDebugLevelTrace, "%s end   (ticks=%d)\n", __ROUTINE__, GetTickCount() );
+	return( WSATYPE_NOT_FOUND );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+//===========================================================================================================================
+//	QueryCreate
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	QueryCreate( const WSAQUERYSETW *inQuerySet, DWORD inQuerySetFlags, QueryRef *outRef )
+{
+	OSStatus		err;
+	QueryRef		obj;
+	char			name[ kDNSServiceMaxDomainName ];
+	int				n;
+	QueryRef *		p;
+	SOCKET			s4;
+	SOCKET			s6;
+
+	obj = NULL;
+	check( inQuerySet );
+	check( inQuerySet->lpszServiceInstanceName );
+	check( outRef );
+	
+	// Convert the wchar_t name to UTF-8.
+	
+	n = WideCharToMultiByte( CP_UTF8, 0, inQuerySet->lpszServiceInstanceName, -1, name, sizeof( name ), NULL, NULL );
+	err = translate_errno( n > 0, (OSStatus) GetLastError(), WSAEINVAL );
+	require_noerr( err, exit );
+	
+	// Allocate the object and append it to the list. Append immediately so releases of partial objects work.
+	
+	obj = (QueryRef) calloc( 1, sizeof( *obj ) );
+	require_action( obj, exit, err = WSA_NOT_ENOUGH_MEMORY );
+	
+	obj->refCount = 1;
+	
+	for( p = &gQueryList; *p; p = &( *p )->next ) {}	// Find the end of the list.
+	*p = obj;
+	
+	// Set up cancel event
+
+	obj->cancelEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
+	require_action( obj->cancelEvent, exit, err = WSA_NOT_ENOUGH_MEMORY );
+
+	// Set up events to signal when A record data is ready
+	
+	obj->data4Event = CreateEvent( NULL, TRUE, FALSE, NULL );
+	require_action( obj->data4Event, exit, err = WSA_NOT_ENOUGH_MEMORY );
+	
+	// Start the query.  Handle delay loaded DLL errors.
+
+	__try
+	{
+		err = DNSServiceQueryRecord( &obj->resolver4, 0, 0, name, kDNSServiceType_A, kDNSServiceClass_IN, QueryRecordCallback4, obj );
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+		err = kUnknownErr;
+	}
+
+	require_noerr( err, exit );
+
+	// Attach the socket to the event
+
+	__try
+	{
+		s4 = DNSServiceRefSockFD(obj->resolver4);
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+		s4 = INVALID_SOCKET;
+	}
+
+	err = translate_errno( s4 != INVALID_SOCKET, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+
+	WSAEventSelect(s4, obj->data4Event, FD_READ|FD_CLOSE);
+	
+	// Set up events to signal when AAAA record data is ready
+	
+	obj->data6Event = CreateEvent( NULL, TRUE, FALSE, NULL );
+	require_action( obj->data6Event, exit, err = WSA_NOT_ENOUGH_MEMORY );
+	
+	// Start the query.  Handle delay loaded DLL errors.
+
+	__try
+	{
+		err = DNSServiceQueryRecord( &obj->resolver6, 0, 0, name, kDNSServiceType_AAAA, kDNSServiceClass_IN, QueryRecordCallback6, obj );
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+		err = kUnknownErr;
+	}
+
+	require_noerr( err, exit );
+
+	// Attach the socket to the event
+
+	__try
+	{
+		s6 = DNSServiceRefSockFD(obj->resolver6);
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+		s6 = INVALID_SOCKET;
+	}
+
+	err = translate_errno( s6 != INVALID_SOCKET, errno_compat(), kUnknownErr );
+	require_noerr( err, exit );
+
+	WSAEventSelect(s6, obj->data6Event, FD_READ|FD_CLOSE);
+
+	obj->waitCount = 0;
+	obj->waitHandles[ obj->waitCount++ ] = obj->cancelEvent;
+	obj->waitHandles[ obj->waitCount++ ] = obj->data4Event;
+	obj->waitHandles[ obj->waitCount++ ] = obj->data6Event;
+	
+	check( obj->waitCount == sizeof_array( obj->waitHandles ) );
+	
+	// Copy the QuerySet so it can be returned later.
+	
+	obj->querySetFlags = inQuerySetFlags;
+	inQuerySetFlags = ( inQuerySetFlags & ~( LUP_RETURN_ADDR | LUP_RETURN_BLOB ) ) | LUP_RETURN_NAME;
+	err = QueryCopyQuerySet( obj, inQuerySet, inQuerySetFlags, &obj->querySet, &obj->querySetSize );
+	require_noerr( err, exit );
+	
+	// Success!
+	
+	*outRef	= obj;
+	obj 	= NULL;
+	err 	= NO_ERROR;
+
+exit:
+	if( obj )
+	{
+		QueryRelease( obj );
+	}
+	return( err );
+}
+
+//===========================================================================================================================
+//	QueryRetain
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	QueryRetain( QueryRef inRef )
+{
+	OSStatus		err;
+	QueryRef		obj;
+	
+	for( obj = gQueryList; obj; obj = obj->next )
+	{
+		if( obj == inRef )
+		{
+			break;
+		}
+	}
+	require_action( obj, exit, err = WSA_INVALID_HANDLE );
+	
+	++inRef->refCount;
+	err = NO_ERROR;
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	QueryRelease
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus	QueryRelease( QueryRef inRef )
+{
+	OSStatus		err;
+	QueryRef *		p;
+	BOOL			ok;
+		
+	// Find the item in the list.
+	
+	for( p = &gQueryList; *p; p = &( *p )->next )
+	{
+		if( *p == inRef )
+		{
+			break;
+		}
+	}
+	require_action( *p, exit, err = WSA_INVALID_HANDLE );
+	
+	// Signal a cancel to unblock any threads waiting for results.
+	
+	if( inRef->cancelEvent )
+	{
+		ok = SetEvent( inRef->cancelEvent );
+		check_translated_errno( ok, GetLastError(), WSAEINVAL );
+	}
+	
+	// Stop the query.
+	
+	if( inRef->resolver4 )
+	{
+		__try
+		{
+			DNSServiceRefDeallocate( inRef->resolver4 );
+		}
+		__except( EXCEPTION_EXECUTE_HANDLER )
+		{
+		}
+		
+		inRef->resolver4 = NULL;
+	}
+
+	if ( inRef->resolver6 )
+	{
+		__try
+		{
+			DNSServiceRefDeallocate( inRef->resolver6 );
+		}
+		__except( EXCEPTION_EXECUTE_HANDLER )
+		{
+		}
+
+		inRef->resolver6 = NULL;
+	}
+	
+	// Decrement the refCount. Fully release if it drops to 0. If still referenced, just exit.
+	
+	if( --inRef->refCount != 0 )
+	{
+		err = NO_ERROR;
+		goto exit;
+	}
+	*p = inRef->next;
+	
+	// Release resources.
+	
+	if( inRef->cancelEvent )
+	{
+		ok = CloseHandle( inRef->cancelEvent );
+		check_translated_errno( ok, GetLastError(), WSAEINVAL );
+	}
+	if( inRef->data4Event )
+	{
+		ok = CloseHandle( inRef->data4Event );
+		check_translated_errno( ok, GetLastError(), WSAEINVAL );
+	}
+	if( inRef->data6Event )
+	{
+		ok = CloseHandle( inRef->data6Event );
+		check_translated_errno( ok, GetLastError(), WSAEINVAL );
+	}
+	if( inRef->querySet )
+	{
+		free( inRef->querySet );
+	}
+	free( inRef );
+	err = NO_ERROR;
+	
+exit:
+	return( err );
+}
+
+//===========================================================================================================================
+//	QueryRecordCallback4
+//===========================================================================================================================
+
+DEBUG_LOCAL void CALLBACK_COMPAT
+	QueryRecordCallback4(
+		DNSServiceRef		inRef,
+		DNSServiceFlags		inFlags,
+		uint32_t			inInterfaceIndex,
+		DNSServiceErrorType	inErrorCode,
+		const char *		inName,    
+		uint16_t			inRRType,
+		uint16_t			inRRClass,
+		uint16_t			inRDataSize,
+		const void *		inRData,
+		uint32_t			inTTL,
+		void *				inContext )
+{
+	QueryRef			obj;
+	const char *		src;
+	char *				dst;
+	BOOL				ok;
+	
+	DEBUG_UNUSED( inFlags );
+	DEBUG_UNUSED( inInterfaceIndex );
+	DEBUG_UNUSED( inTTL );
+
+	NSPLock();
+	obj = (QueryRef) inContext;
+	check( obj );
+	require_noerr( inErrorCode, exit );
+	require_quiet( inFlags & kDNSServiceFlagsAdd, exit );
+	require( inRRClass   == kDNSServiceClass_IN, exit );
+	require( inRRType    == kDNSServiceType_A, exit );
+	require( inRDataSize == 4, exit );
+	
+	dlog( kDebugLevelTrace, "%s (flags=0x%08X, name=%s, rrType=%d, rDataSize=%d)\n", 
+		__ROUTINE__, inFlags, inName, inRRType, inRDataSize );
+		
+	// Copy the name if needed.
+	
+	if( obj->name[ 0 ] == '\0' )
+	{
+		src = inName;
+		dst = obj->name;
+		while( *src != '\0' )
+		{
+			*dst++ = *src++;
+		}
+		*dst = '\0';
+		obj->nameSize = (size_t)( dst - obj->name );
+		check( obj->nameSize < sizeof( obj->name ) );
+	}
+	
+	// Copy the data.
+	
+	memcpy( &obj->addr4, inRData, inRDataSize );
+	obj->addr4Valid = true;
+	obj->numValidAddrs++;
+	
+	// Signal that a result is ready.
+	
+	check( obj->data4Event );
+	ok = SetEvent( obj->data4Event );
+	check_translated_errno( ok, GetLastError(), WSAEINVAL );
+	
+	// Stop the resolver after the first response.
+	
+	__try
+	{
+		DNSServiceRefDeallocate( inRef );
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+	}
+
+	obj->resolver4 = NULL;
+
+exit:
+	NSPUnlock();
+}
+
+#if 0
+#pragma mark -
+#endif
+
+
+//===========================================================================================================================
+//	QueryRecordCallback6
+//===========================================================================================================================
+
+DEBUG_LOCAL void CALLBACK_COMPAT
+	QueryRecordCallback6(
+		DNSServiceRef		inRef,
+		DNSServiceFlags		inFlags,
+		uint32_t			inInterfaceIndex,
+		DNSServiceErrorType	inErrorCode,
+		const char *		inName,    
+		uint16_t			inRRType,
+		uint16_t			inRRClass,
+		uint16_t			inRDataSize,
+		const void *		inRData,
+		uint32_t			inTTL,
+		void *				inContext )
+{
+	QueryRef			obj;
+	const char *		src;
+	char *				dst;
+	BOOL				ok;
+	
+	DEBUG_UNUSED( inFlags );
+	DEBUG_UNUSED( inInterfaceIndex );
+	DEBUG_UNUSED( inTTL );
+
+	NSPLock();
+	obj = (QueryRef) inContext;
+	check( obj );
+	require_noerr( inErrorCode, exit );
+	require_quiet( inFlags & kDNSServiceFlagsAdd, exit );
+	require( inRRClass   == kDNSServiceClass_IN, exit );
+	require( inRRType    == kDNSServiceType_AAAA, exit );
+	require( inRDataSize == 16, exit );
+	
+	dlog( kDebugLevelTrace, "%s (flags=0x%08X, name=%s, rrType=%d, rDataSize=%d)\n", 
+		__ROUTINE__, inFlags, inName, inRRType, inRDataSize );
+
+	// Copy the name if needed.
+	
+	if( obj->name[ 0 ] == '\0' )
+	{
+		src = inName;
+		dst = obj->name;
+		while( *src != '\0' )
+		{
+			*dst++ = *src++;
+		}
+		*dst = '\0';
+		obj->nameSize = (size_t)( dst - obj->name );
+		check( obj->nameSize < sizeof( obj->name ) );
+	}
+	
+	// Copy the data.
+	
+	memcpy( &obj->addr6, inRData, inRDataSize );
+
+	obj->addr6ScopeId = GetScopeId( inInterfaceIndex );
+	require( obj->addr6ScopeId, exit );
+	obj->addr6Valid	  = true;
+	obj->numValidAddrs++;
+
+	// Signal that we're done
+	
+	check( obj->data6Event );
+	ok = SetEvent( obj->data6Event );
+	check_translated_errno( ok, GetLastError(), WSAEINVAL );
+
+	// Stop the resolver after the first response.
+	
+	__try
+	{
+		DNSServiceRefDeallocate( inRef );
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+	}
+
+	obj->resolver6 = NULL;
+
+exit:
+
+	
+	
+	NSPUnlock();
+}
+
+
+//===========================================================================================================================
+//	QueryCopyQuerySet
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus
+	QueryCopyQuerySet( 
+		QueryRef 				inRef, 
+		const WSAQUERYSETW *	inQuerySet, 
+		DWORD 					inQuerySetFlags, 
+		WSAQUERYSETW **			outQuerySet, 
+		size_t *				outSize )
+{
+	OSStatus			err;
+	size_t				size;
+	WSAQUERYSETW *		qs;
+	
+	check( inQuerySet );
+	check( outQuerySet );
+	
+	size  = QueryCopyQuerySetSize( inRef, inQuerySet, inQuerySetFlags );
+	qs = (WSAQUERYSETW *) calloc( 1, size );
+	require_action( qs, exit, err = WSA_NOT_ENOUGH_MEMORY  );
+	
+	QueryCopyQuerySetTo( inRef, inQuerySet, inQuerySetFlags, qs );
+	
+	*outQuerySet = qs;
+	if( outSize )
+	{
+		*outSize = size;
+	}
+	qs = NULL;
+	err = NO_ERROR;
+	
+exit:
+	if( qs )
+	{
+		free( qs );
+	}
+	return( err );	
+}
+
+
+
+//===========================================================================================================================
+//	QueryCopyQuerySetTo
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL void
+	QueryCopyQuerySetTo( 
+		QueryRef 				inRef, 
+		const WSAQUERYSETW *	inQuerySet, 
+		DWORD 					inQuerySetFlags, 
+		WSAQUERYSETW *			outQuerySet )
+{
+	uint8_t *		dst;
+	LPCWSTR			s;
+	LPWSTR			q;
+	DWORD			n;
+	DWORD			i;
+	
+#if( DEBUG )
+	size_t			debugSize;
+	
+	debugSize = QueryCopyQuerySetSize( inRef, inQuerySet, inQuerySetFlags );
+#endif
+
+	check( inQuerySet );
+	check( outQuerySet );
+
+	dst = (uint8_t *) outQuerySet;
+	
+	// Copy the static portion of the results.
+	
+	*outQuerySet = *inQuerySet;
+	dst += sizeof( *inQuerySet );
+	
+	if( inQuerySetFlags & LUP_RETURN_NAME )
+	{
+		s = inQuerySet->lpszServiceInstanceName;
+		if( s )
+		{
+			outQuerySet->lpszServiceInstanceName = (LPWSTR) dst;
+			q = (LPWSTR) dst;
+			while( ( *q++ = *s++ ) != 0 ) {}
+			dst = (uint8_t *) q;
+		}
+	}
+	else
+	{
+		outQuerySet->lpszServiceInstanceName = NULL;
+	}
+	
+	if( inQuerySet->lpServiceClassId )
+	{
+		outQuerySet->lpServiceClassId  = (LPGUID) dst;
+		*outQuerySet->lpServiceClassId = *inQuerySet->lpServiceClassId;
+		dst += sizeof( *inQuerySet->lpServiceClassId );
+	}
+	
+	if( inQuerySet->lpVersion )
+	{
+		outQuerySet->lpVersion  = (LPWSAVERSION) dst;
+		*outQuerySet->lpVersion = *inQuerySet->lpVersion;
+		dst += sizeof( *inQuerySet->lpVersion );
+	}
+	
+	s = inQuerySet->lpszComment;
+	if( s )
+	{
+		outQuerySet->lpszComment = (LPWSTR) dst;
+		q = (LPWSTR) dst;
+		while( ( *q++ = *s++ ) != 0 ) {}
+		dst = (uint8_t *) q;
+	}
+	
+	if( inQuerySet->lpNSProviderId )
+	{
+		outQuerySet->lpNSProviderId  = (LPGUID) dst;
+		*outQuerySet->lpNSProviderId = *inQuerySet->lpNSProviderId;
+		dst += sizeof( *inQuerySet->lpNSProviderId );
+	}
+	
+	s = inQuerySet->lpszContext;
+	if( s )
+	{
+		outQuerySet->lpszContext = (LPWSTR) dst;
+		q = (LPWSTR) dst;
+		while( ( *q++ = *s++ ) != 0 ) {}
+		dst = (uint8_t *) q;
+	}
+		
+	n = inQuerySet->dwNumberOfProtocols;
+
+	if( n > 0 )
+	{
+		check( inQuerySet->lpafpProtocols );
+		
+		outQuerySet->lpafpProtocols = (LPAFPROTOCOLS) dst;
+		for( i = 0; i < n; ++i )
+		{
+			outQuerySet->lpafpProtocols[ i ] = inQuerySet->lpafpProtocols[ i ];
+			dst += sizeof( *inQuerySet->lpafpProtocols );
+		}
+	}
+		
+	s = inQuerySet->lpszQueryString;
+	if( s )
+	{
+		outQuerySet->lpszQueryString = (LPWSTR) dst;
+		q = (LPWSTR) dst;
+		while( ( *q++ = *s++ ) != 0 ) {}
+		dst = (uint8_t *) q;
+	}
+	
+	// Copy the address(es).
+	
+	if( ( inQuerySetFlags & LUP_RETURN_ADDR ) && ( inRef->numValidAddrs > 0 ) )
+	{
+		struct sockaddr_in	*	addr4;
+		struct sockaddr_in6	*	addr6;
+		int						index;
+		
+		outQuerySet->dwNumberOfCsAddrs	= inRef->numValidAddrs;
+		outQuerySet->lpcsaBuffer 		= (LPCSADDR_INFO) dst;
+		dst 							+= ( sizeof( *outQuerySet->lpcsaBuffer ) ) * ( inRef->numValidAddrs ) ;
+		index							= 0;
+		
+		if ( inRef->addr4Valid )
+		{	
+			outQuerySet->lpcsaBuffer[ index ].LocalAddr.lpSockaddr 			= NULL;
+			outQuerySet->lpcsaBuffer[ index ].LocalAddr.iSockaddrLength		= 0;
+		
+			outQuerySet->lpcsaBuffer[ index ].RemoteAddr.lpSockaddr 		= (LPSOCKADDR) dst;
+			outQuerySet->lpcsaBuffer[ index ].RemoteAddr.iSockaddrLength	= sizeof( struct sockaddr_in );
+		
+			addr4 															= (struct sockaddr_in *) dst;
+			memset( addr4, 0, sizeof( *addr4 ) );
+			addr4->sin_family												= AF_INET;
+			memcpy( &addr4->sin_addr, &inRef->addr4, 4 );
+			dst 															+= sizeof( *addr4 );
+		
+			outQuerySet->lpcsaBuffer[ index ].iSocketType 					= AF_INET;		// Emulate Tcpip NSP
+			outQuerySet->lpcsaBuffer[ index ].iProtocol						= IPPROTO_UDP;	// Emulate Tcpip NSP
+
+			index++;
+		}
+
+		if ( inRef->addr6Valid )
+		{
+			outQuerySet->lpcsaBuffer[ index ].LocalAddr.lpSockaddr 			= NULL;
+			outQuerySet->lpcsaBuffer[ index ].LocalAddr.iSockaddrLength		= 0;
+		
+			outQuerySet->lpcsaBuffer[ index ].RemoteAddr.lpSockaddr 		= (LPSOCKADDR) dst;
+			outQuerySet->lpcsaBuffer[ index ].RemoteAddr.iSockaddrLength	= sizeof( struct sockaddr_in6 );
+		
+			addr6 															= (struct sockaddr_in6 *) dst;
+			memset( addr6, 0, sizeof( *addr6 ) );
+			addr6->sin6_family												= AF_INET6;
+			addr6->sin6_scope_id											= inRef->addr6ScopeId;
+			memcpy( &addr6->sin6_addr, &inRef->addr6, 16 );
+			dst 															+= sizeof( *addr6 );
+		
+			outQuerySet->lpcsaBuffer[ index ].iSocketType 					= AF_INET6;		// Emulate Tcpip NSP
+			outQuerySet->lpcsaBuffer[ index ].iProtocol						= IPPROTO_UDP;	// Emulate Tcpip NSP
+		}
+	}
+	else
+	{
+		outQuerySet->dwNumberOfCsAddrs	= 0;
+		outQuerySet->lpcsaBuffer 		= NULL;
+	}
+	
+	// Copy the hostent blob.
+	
+	if( ( inQuerySetFlags & LUP_RETURN_BLOB ) && inRef->addr4Valid )
+	{
+		uint8_t *				base;
+		struct hostent *		he;
+		uintptr_t *				p;
+
+		outQuerySet->lpBlob	 = (LPBLOB) dst;
+		dst 				+= sizeof( *outQuerySet->lpBlob );
+		
+		base = dst;
+		he	 = (struct hostent *) dst;
+		dst += sizeof( *he );
+		
+		he->h_name = (char *)( dst - base );
+		memcpy( dst, inRef->name, inRef->nameSize + 1 );
+		dst += ( inRef->nameSize + 1 );
+		
+		he->h_aliases 	= (char **)( dst - base );
+		p	  			= (uintptr_t *) dst;
+		*p++  			= 0;
+		dst 		 	= (uint8_t *) p;
+		
+		he->h_addrtype 	= AF_INET;
+		he->h_length	= 4;
+		
+		he->h_addr_list	= (char **)( dst - base );
+		p	  			= (uintptr_t *) dst;
+		dst 		   += ( 2 * sizeof( *p ) );
+		*p++			= (uintptr_t)( dst - base );
+		*p++			= 0;
+		p	  			= (uintptr_t *) dst;
+		*p++			= (uintptr_t) inRef->addr4;
+		dst 		 	= (uint8_t *) p;
+		
+		outQuerySet->lpBlob->cbSize 	= (ULONG)( dst - base );
+		outQuerySet->lpBlob->pBlobData	= (BYTE *) base;
+	}
+	dlog_query_set( kDebugLevelVerbose, outQuerySet );
+
+	check( (size_t)( dst - ( (uint8_t *) outQuerySet ) ) == debugSize );
+}
+
+//===========================================================================================================================
+//	QueryCopyQuerySetSize
+//
+//	Warning: Assumes the NSP lock is held.
+//===========================================================================================================================
+
+DEBUG_LOCAL size_t	QueryCopyQuerySetSize( QueryRef inRef, const WSAQUERYSETW *inQuerySet, DWORD inQuerySetFlags )
+{
+	size_t		size;
+	LPCWSTR		s;
+	LPCWSTR		p;
+	
+	check( inRef );
+	check( inQuerySet );
+	
+	// Calculate the size of the static portion of the results.
+	
+	size = sizeof( *inQuerySet );
+	
+	if( inQuerySetFlags & LUP_RETURN_NAME )
+	{
+		s = inQuerySet->lpszServiceInstanceName;
+		if( s )
+		{
+			for( p = s; *p; ++p ) {}
+			size += (size_t)( ( ( p - s ) + 1 ) * sizeof( *p ) );
+		}
+	}
+	
+	if( inQuerySet->lpServiceClassId )
+	{
+		size += sizeof( *inQuerySet->lpServiceClassId );
+	}
+	
+	if( inQuerySet->lpVersion )
+	{
+		size += sizeof( *inQuerySet->lpVersion );
+	}
+	
+	s = inQuerySet->lpszComment;
+	if( s )
+	{
+		for( p = s; *p; ++p ) {}
+		size += (size_t)( ( ( p - s ) + 1 ) * sizeof( *p ) );
+	}
+	
+	if( inQuerySet->lpNSProviderId )
+	{
+		size += sizeof( *inQuerySet->lpNSProviderId );
+	}
+	
+	s = inQuerySet->lpszContext;
+	if( s )
+	{
+		for( p = s; *p; ++p ) {}
+		size += (size_t)( ( ( p - s ) + 1 ) * sizeof( *p ) );
+	}
+	
+	size += ( inQuerySet->dwNumberOfProtocols * sizeof( *inQuerySet->lpafpProtocols ) );
+	
+	s = inQuerySet->lpszQueryString;
+	if( s )
+	{
+		for( p = s; *p; ++p ) {}
+		size += (size_t)( ( ( p - s ) + 1 ) * sizeof( *p ) );
+	}
+	
+	// Calculate the size of the address(es).
+	
+	if( ( inQuerySetFlags & LUP_RETURN_ADDR ) && inRef->addr4Valid )
+	{
+		size += sizeof( *inQuerySet->lpcsaBuffer );
+		size += sizeof( struct sockaddr_in );
+	}
+
+	if( ( inQuerySetFlags & LUP_RETURN_ADDR ) && inRef->addr6Valid )
+	{
+		size += sizeof( *inQuerySet->lpcsaBuffer );
+		size += sizeof( struct sockaddr_in6 );
+	}
+	
+	// Calculate the size of the hostent blob.
+	
+	if( ( inQuerySetFlags & LUP_RETURN_BLOB ) && inRef->addr4Valid )
+	{
+		size += sizeof( *inQuerySet->lpBlob );	// Blob ptr/size structure
+		size += sizeof( struct hostent );		// Old-style hostent structure
+		size += ( inRef->nameSize + 1 );		// Name and null terminator
+		size += 4;								// Alias list terminator (0 offset)
+		size += 4;								// Offset to address.
+		size += 4;								// Address list terminator (0 offset)
+		size += 4;								// IPv4 address
+	}
+	return( size );
+}
+
+#if 0
+#pragma mark -
+#endif
+
+#if( DEBUG )
+//===========================================================================================================================
+//	DebugDumpQuerySet
+//===========================================================================================================================
+
+#define	DebugSocketFamilyToString( FAM )	( ( FAM ) == AF_INET )  ? "AF_INET"  : \
+											( ( FAM ) == AF_INET6 ) ? "AF_INET6" : ""
+
+#define	DebugSocketProtocolToString( PROTO )	( ( PROTO ) == IPPROTO_UDP ) ? "IPPROTO_UDP" : \
+												( ( PROTO ) == IPPROTO_TCP ) ? "IPPROTO_TCP" : ""
+
+#define	DebugNameSpaceToString( NS )			( ( NS ) == NS_DNS ) ? "NS_DNS" : ( ( NS ) == NS_ALL ) ? "NS_ALL" : ""
+
+void	DebugDumpQuerySet( DebugLevel inLevel, const WSAQUERYSETW *inQuerySet )
+{
+	DWORD		i;
+	
+	check( inQuerySet );
+
+	// Fixed portion of the QuerySet.
+		
+	dlog( inLevel, "QuerySet:\n" );
+	dlog( inLevel, "    dwSize:                  %d (expected %d)\n", inQuerySet->dwSize, sizeof( *inQuerySet ) );
+	if( inQuerySet->lpszServiceInstanceName )
+	{
+		dlog( inLevel, "    lpszServiceInstanceName: %S\n", inQuerySet->lpszServiceInstanceName );
+	}
+	else
+	{
+		dlog( inLevel, "    lpszServiceInstanceName: <null>\n" );
+	}
+	if( inQuerySet->lpServiceClassId )
+	{
+		dlog( inLevel, "    lpServiceClassId:        %U\n", inQuerySet->lpServiceClassId );
+	}
+	else
+	{
+		dlog( inLevel, "    lpServiceClassId:        <null>\n" );
+	}
+	if( inQuerySet->lpVersion )
+	{
+		dlog( inLevel, "    lpVersion:\n" );
+		dlog( inLevel, "        dwVersion:               %d\n", inQuerySet->lpVersion->dwVersion );
+		dlog( inLevel, "        dwVersion:               %d\n", inQuerySet->lpVersion->ecHow );
+	}
+	else
+	{
+		dlog( inLevel, "    lpVersion:               <null>\n" );
+	}
+	if( inQuerySet->lpszComment )
+	{
+		dlog( inLevel, "    lpszComment:             %S\n", inQuerySet->lpszComment );
+	}
+	else
+	{
+		dlog( inLevel, "    lpszComment:             <null>\n" );
+	}
+	dlog( inLevel, "    dwNameSpace:             %d %s\n", inQuerySet->dwNameSpace, 
+		DebugNameSpaceToString( inQuerySet->dwNameSpace ) );
+	if( inQuerySet->lpNSProviderId )
+	{
+		dlog( inLevel, "    lpNSProviderId:          %U\n", inQuerySet->lpNSProviderId );
+	}
+	else
+	{
+		dlog( inLevel, "    lpNSProviderId:          <null>\n" );
+	}
+	if( inQuerySet->lpszContext )
+	{
+		dlog( inLevel, "    lpszContext:             %S\n", inQuerySet->lpszContext );
+	}
+	else
+	{
+		dlog( inLevel, "    lpszContext:             <null>\n" );
+	}
+	dlog( inLevel, "    dwNumberOfProtocols:     %d\n", inQuerySet->dwNumberOfProtocols );
+	dlog( inLevel, "    lpafpProtocols:          %s\n", inQuerySet->lpafpProtocols ? "" : "<null>" );
+	for( i = 0; i < inQuerySet->dwNumberOfProtocols; ++i )
+	{
+		if( i != 0 )
+		{
+			dlog( inLevel, "\n" );
+		}
+		dlog( inLevel, "        iAddressFamily:          %d %s\n", inQuerySet->lpafpProtocols[ i ].iAddressFamily, 
+			DebugSocketFamilyToString( inQuerySet->lpafpProtocols[ i ].iAddressFamily ) );
+		dlog( inLevel, "        iProtocol:               %d %s\n", inQuerySet->lpafpProtocols[ i ].iProtocol, 
+			DebugSocketProtocolToString( inQuerySet->lpafpProtocols[ i ].iProtocol ) );
+	}
+	if( inQuerySet->lpszQueryString )
+	{
+		dlog( inLevel, "    lpszQueryString:         %S\n", inQuerySet->lpszQueryString );
+	}
+	else
+	{
+		dlog( inLevel, "    lpszQueryString:         <null>\n" );
+	}
+	dlog( inLevel, "    dwNumberOfCsAddrs:       %d\n", inQuerySet->dwNumberOfCsAddrs );
+	dlog( inLevel, "    lpcsaBuffer:             %s\n", inQuerySet->lpcsaBuffer ? "" : "<null>" );
+	for( i = 0; i < inQuerySet->dwNumberOfCsAddrs; ++i )
+	{
+		if( i != 0 )
+		{
+			dlog( inLevel, "\n" );
+		}
+		if( inQuerySet->lpcsaBuffer[ i ].LocalAddr.lpSockaddr && 
+			( inQuerySet->lpcsaBuffer[ i ].LocalAddr.iSockaddrLength > 0 ) )
+		{
+			dlog( inLevel, "        LocalAddr:               %##a\n", 
+				inQuerySet->lpcsaBuffer[ i ].LocalAddr.lpSockaddr );
+		}
+		else
+		{
+			dlog( inLevel, "        LocalAddr:               <null/empty>\n" );
+		}
+		if( inQuerySet->lpcsaBuffer[ i ].RemoteAddr.lpSockaddr && 
+			( inQuerySet->lpcsaBuffer[ i ].RemoteAddr.iSockaddrLength > 0 ) )
+		{
+			dlog( inLevel, "        RemoteAddr:              %##a\n", 
+				inQuerySet->lpcsaBuffer[ i ].RemoteAddr.lpSockaddr );
+		}
+		else
+		{
+			dlog( inLevel, "        RemoteAddr:              <null/empty>\n" );
+		}
+		dlog( inLevel, "        iSocketType:             %d\n", inQuerySet->lpcsaBuffer[ i ].iSocketType );
+		dlog( inLevel, "        iProtocol:               %d\n", inQuerySet->lpcsaBuffer[ i ].iProtocol );
+	}
+	dlog( inLevel, "    dwOutputFlags:           %d\n", inQuerySet->dwOutputFlags );
+	
+	// Blob portion of the QuerySet.
+	
+	if( inQuerySet->lpBlob )
+	{
+		dlog( inLevel, "    lpBlob:\n" );
+		dlog( inLevel, "        cbSize:                  %ld\n", inQuerySet->lpBlob->cbSize );
+		dlog( inLevel, "        pBlobData:               %#p\n", inQuerySet->lpBlob->pBlobData );
+		dloghex( inLevel, 12, NULL, 0, 0, NULL, 0, 
+			inQuerySet->lpBlob->pBlobData, inQuerySet->lpBlob->pBlobData, inQuerySet->lpBlob->cbSize, 
+			kDebugFlagsNone, NULL, 0 );
+	}
+	else
+	{
+		dlog( inLevel, "    lpBlob:                  <null>\n" );
+	}
+}
+#endif
+
+
+//===========================================================================================================================
+//	InHostsTable
+//===========================================================================================================================
+
+DEBUG_LOCAL BOOL
+InHostsTable( const char * name )
+{
+	HostsFileInfo	*	node;
+	BOOL				ret = FALSE;
+	OSStatus			err;
+	
+	check( name );
+
+	if ( gHostsFileInfo == NULL )
+	{
+		TCHAR				systemDirectory[MAX_PATH];
+		TCHAR				hFileName[MAX_PATH];
+		HostsFile		*	hFile;
+
+		GetSystemDirectory( systemDirectory, sizeof( systemDirectory ) );
+		sprintf( hFileName, "%s\\drivers\\etc\\hosts", systemDirectory );
+		err = HostsFileOpen( &hFile, hFileName );
+		require_noerr( err, exit );
+
+		while ( HostsFileNext( hFile, &node ) == 0 )
+		{
+			if ( IsLocalName( node ) )
+			{
+				node->m_next = gHostsFileInfo;
+				gHostsFileInfo = node;
+			}
+			else
+			{
+				HostsFileInfoFree( node );
+			}
+		}
+
+		HostsFileClose( hFile );
+	}
+
+	for ( node = gHostsFileInfo; node; node = node->m_next )
+	{
+		if ( IsSameName( node, name ) )
+		{
+			ret = TRUE;
+			break;
+		}
+	}
+
+exit:
+
+	return ret;
+}
+
+
+//===========================================================================================================================
+//	IsLocalName
+//===========================================================================================================================
+
+DEBUG_LOCAL BOOL
+IsLocalName( HostsFileInfo * node )
+{
+	BOOL ret = TRUE;
+
+	check( node );
+
+	if ( strstr( node->m_host.h_name, ".local" ) == NULL )
+	{
+		int i;
+
+		for ( i = 0; node->m_host.h_aliases[i]; i++ )
+		{
+			if ( strstr( node->m_host.h_aliases[i], ".local" ) )
+			{
+				goto exit;
+			}
+		}
+
+		ret = FALSE;
+	}
+
+exit:
+
+	return ret;
+}
+
+
+//===========================================================================================================================
+//	IsSameName
+//===========================================================================================================================
+
+DEBUG_LOCAL BOOL
+IsSameName( HostsFileInfo * node, const char * name )
+{
+	BOOL ret = TRUE;
+
+	check( node );
+	check( name );
+
+	if ( strcmp( node->m_host.h_name, name ) != 0 )
+	{
+		int i;
+
+		for ( i = 0; node->m_host.h_aliases[i]; i++ )
+		{
+			if ( strcmp( node->m_host.h_aliases[i], name ) == 0 )
+			{
+				goto exit;
+			}
+		}
+
+		ret = FALSE;
+	}
+
+exit:
+
+	return ret;
+}
+
+
+//===========================================================================================================================
+//	HostsFileOpen
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus
+HostsFileOpen( HostsFile ** self, const char * fname )
+{
+	OSStatus err = kNoErr;
+
+	*self = (HostsFile*) malloc( sizeof( HostsFile ) );
+	require_action( *self, exit, err = kNoMemoryErr );
+	memset( *self, 0, sizeof( HostsFile ) );
+
+	(*self)->m_bufferSize = BUFFER_INITIAL_SIZE;
+	(*self)->m_buffer = (char*) malloc( (*self)->m_bufferSize );
+	require_action( (*self)->m_buffer, exit, err = kNoMemoryErr );
+
+	// check malloc
+
+	(*self)->m_fp = fopen( fname, "r" );
+	require_action( (*self)->m_fp, exit, err = kUnknownErr );
+
+exit:
+
+	if ( err && *self )
+	{
+		HostsFileClose( *self );
+		*self = NULL;
+	}
+		
+	return err;
+}
+
+
+//===========================================================================================================================
+//	HostsFileClose
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus
+HostsFileClose( HostsFile * self )
+{
+	check( self );
+
+	if ( self->m_buffer )
+	{
+		free( self->m_buffer );
+		self->m_buffer = NULL;
+	}
+
+	if ( self->m_fp )
+	{
+		fclose( self->m_fp );
+		self->m_fp = NULL;
+	}
+
+	free( self );
+
+	return kNoErr;
+} 
+
+
+//===========================================================================================================================
+//	HostsFileInfoFree
+//===========================================================================================================================
+
+DEBUG_LOCAL void
+HostsFileInfoFree( HostsFileInfo * info )
+{
+	while ( info )
+	{
+		HostsFileInfo * next = info->m_next;
+
+		if ( info->m_host.h_addr_list )
+		{
+			if ( info->m_host.h_addr_list[0] )
+			{
+				free( info->m_host.h_addr_list[0] );
+				info->m_host.h_addr_list[0] = NULL;
+			}
+
+			free( info->m_host.h_addr_list );
+			info->m_host.h_addr_list = NULL;
+		}
+
+		if ( info->m_host.h_aliases )
+		{
+			int i;
+
+			for ( i = 0; info->m_host.h_aliases[i]; i++ )
+			{
+				free( info->m_host.h_aliases[i] );
+			}
+
+			free( info->m_host.h_aliases );
+		}
+
+		if ( info->m_host.h_name )
+		{
+			free( info->m_host.h_name );
+			info->m_host.h_name = NULL;
+		}
+			
+		free( info );
+
+		info = next;
+	}
+}
+
+
+//===========================================================================================================================
+//	HostsFileNext
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus
+HostsFileNext( HostsFile * self, HostsFileInfo ** hInfo )
+{
+	struct sockaddr_in6	addr_6;
+	struct sockaddr_in	addr_4;
+	int					numAliases = ALIASES_INITIAL_SIZE;
+	char			*	line;
+	char			*	tok;
+	int					dwSize;
+	int					idx;
+	int					i;
+	short				family;
+	OSStatus			err = kNoErr;
+
+	check( self );
+	check( self->m_fp );
+	check( hInfo );
+
+	idx	= 0;
+
+	*hInfo = (HostsFileInfo*) malloc( sizeof( HostsFileInfo ) );
+	require_action( *hInfo, exit, err = kNoMemoryErr );
+	memset( *hInfo, 0, sizeof( HostsFileInfo ) );
+
+	for ( ; ; )
+	{
+		line = fgets( self->m_buffer + idx, self->m_bufferSize - idx, self->m_fp );
+		
+		if ( line == NULL )
+		{
+			err = 1;
+			goto exit;
+		}
+
+		// If there's no eol and no eof, then we didn't get the whole line
+
+		if ( !strchr( line, '\n' ) && !feof( self->m_fp ) )
+		{
+			int			bufferSize;
+			char	*	buffer;
+
+			/* Try and allocate space for longer line */
+
+			bufferSize	= self->m_bufferSize * 2;
+			buffer		= (char*) realloc( self->m_buffer, bufferSize );
+			require_action( buffer, exit, err = kNoMemoryErr );
+			self->m_bufferSize	= bufferSize;
+			self->m_buffer		= buffer;
+			idx					= (int) strlen( self->m_buffer );
+
+			continue;
+		}
+
+		line	= self->m_buffer;
+		idx		= 0;
+
+		if (*line == '#')
+		{
+			continue;
+		}
+
+		// Get rid of either comments or eol characters
+
+		if (( tok = strpbrk(line, "#\n")) != NULL )
+		{
+			*tok = '\0';
+		}
+
+		// Make sure there is some whitespace on this line
+
+		if (( tok = strpbrk(line, " \t")) == NULL )
+		{
+			continue;
+		}
+
+		// Create two strings, where p == the IP Address and tok is the name list
+
+		*tok++ = '\0';
+
+		while ( *tok == ' ' || *tok == '\t')
+		{
+			tok++;
+		}
+
+		// Now we have the name
+
+		(*hInfo)->m_host.h_name = (char*) malloc( strlen( tok ) + 1 );
+		require_action( (*hInfo)->m_host.h_name, exit, err = kNoMemoryErr );
+		strcpy( (*hInfo)->m_host.h_name, tok );
+
+		// Now create the address (IPv6/IPv4)
+
+		addr_6.sin6_family	= family = AF_INET6;
+		dwSize				= sizeof( addr_6 );
+
+		if ( WSAStringToAddress( line, AF_INET6, NULL, ( struct sockaddr*) &addr_6, &dwSize ) != 0 )
+		{
+			addr_4.sin_family = family = AF_INET;
+			dwSize = sizeof( addr_4 );
+
+			if (WSAStringToAddress( line, AF_INET, NULL, ( struct sockaddr*) &addr_4, &dwSize ) != 0 )
+			{
+				continue;
+			}
+		}
+
+		(*hInfo)->m_host.h_addr_list = (char**) malloc( sizeof( char**) * 2 );
+		require_action( (*hInfo)->m_host.h_addr_list, exit, err = kNoMemoryErr );
+
+		if ( family == AF_INET6 )
+		{
+			(*hInfo)->m_host.h_length		= (short) sizeof( addr_6.sin6_addr );
+			(*hInfo)->m_host.h_addr_list[0] = (char*) malloc( (*hInfo)->m_host.h_length );
+			require_action( (*hInfo)->m_host.h_addr_list[0], exit, err = kNoMemoryErr );
+			memmove( (*hInfo)->m_host.h_addr_list[0], &addr_6.sin6_addr, sizeof( addr_6.sin6_addr ) );
+			
+		}
+		else
+		{
+			(*hInfo)->m_host.h_length		= (short) sizeof( addr_4.sin_addr );
+			(*hInfo)->m_host.h_addr_list[0] = (char*) malloc( (*hInfo)->m_host.h_length );
+			require_action( (*hInfo)->m_host.h_addr_list[0], exit, err = kNoMemoryErr );
+			memmove( (*hInfo)->m_host.h_addr_list[0], &addr_4.sin_addr, sizeof( addr_4.sin_addr ) );
+		}
+
+		(*hInfo)->m_host.h_addr_list[1] = NULL;
+		(*hInfo)->m_host.h_addrtype		= family;
+
+		// Now get the aliases
+
+		if ((tok = strpbrk(tok, " \t")) != NULL)
+		{
+			*tok++ = '\0';
+		}
+
+		i = 0;
+
+		(*hInfo)->m_host.h_aliases		= (char**) malloc( sizeof(char**) * numAliases );
+		require_action( (*hInfo)->m_host.h_aliases, exit, err = kNoMemoryErr );
+		(*hInfo)->m_host.h_aliases[0]	= NULL;
+
+		while ( tok && *tok )
+		{
+			// Skip over the whitespace, waiting for the start of the next alias name
+
+			if (*tok == ' ' || *tok == '\t')
+			{
+				tok++;
+				continue;
+			}
+
+			// Check to make sure we don't exhaust the alias buffer
+
+			if ( i >= ( numAliases - 1 ) )
+			{
+				numAliases = numAliases * 2;
+				(*hInfo)->m_host.h_aliases = (char**) realloc( (*hInfo)->m_host.h_aliases, numAliases * sizeof( char** ) );
+				require_action( (*hInfo)->m_host.h_aliases, exit, err = kNoMemoryErr );
+			}
+
+			(*hInfo)->m_host.h_aliases[i] = (char*) malloc( strlen( tok ) + 1 );
+			require_action( (*hInfo)->m_host.h_aliases[i], exit, err = kNoMemoryErr );
+
+			strcpy( (*hInfo)->m_host.h_aliases[i], tok );
+
+			if (( tok = strpbrk( tok, " \t")) != NULL )
+			{
+				*tok++ = '\0';
+			}
+
+			(*hInfo)->m_host.h_aliases[++i] = NULL;
+		}
+
+		break;
+	}
+
+exit:
+
+	if ( err && ( *hInfo ) )
+	{
+		HostsFileInfoFree( *hInfo );
+		*hInfo = NULL;
+	}
+
+	return err;
+}
+
+
+#ifdef ENABLE_REVERSE_LOOKUP
+//===========================================================================================================================
+//	IsReverseLookup
+//===========================================================================================================================
+
+DEBUG_LOCAL OSStatus
+IsReverseLookup( LPCWSTR name, size_t size )
+{
+	LPCWSTR		p;
+	OSStatus	err = kNoErr;
+
+	// IPv6LL Reverse-mapping domains are {8,9,A,B}.E.F.ip6.arpa
+	require_action_quiet( size > sizeof_string( ".0.8.e.f.ip6.arpa" ), exit, err = WSASERVICE_NOT_FOUND );
+ 
+	p = name + ( size - 1 );
+	p = ( *p == '.' ) ? ( p - sizeof_string( ".0.8.e.f.ip6.arpa" ) ) : ( ( p - sizeof_string( ".0.8.e.f.ip6.arpa" ) ) + 1 );
+	
+	if	( ( ( p[ 0 ] != '.' )							||
+		( ( p[ 1 ] != '0' ) )							||
+		( ( p[ 2 ] != '.' ) )							||
+		( ( p[ 3 ] != '8' ) )							||
+		( ( p[ 4 ] != '.' ) )							||
+		( ( p[ 5 ] != 'E' ) && ( p[ 5 ] != 'e' ) )		||
+		( ( p[ 6 ] != '.' ) )							||
+		( ( p[ 7 ] != 'F' ) && ( p[ 7 ] != 'f' ) )		||
+		( ( p[ 8 ] != '.' ) )							||
+		( ( p[ 9 ] != 'I' ) && ( p[ 9 ] != 'i' ) )		||
+		( ( p[ 10 ] != 'P' ) && ( p[ 10 ] != 'p' ) )	||	
+		( ( p[ 11 ] != '6' ) )							||
+		( ( p[ 12 ] != '.' ) )							||
+		( ( p[ 13 ] != 'A' ) && ( p[ 13 ] != 'a' ) )	||
+		( ( p[ 14 ] != 'R' ) && ( p[ 14 ] != 'r' ) )	||
+		( ( p[ 15 ] != 'P' ) && ( p[ 15 ] != 'p' ) )	||
+		( ( p[ 16 ] != 'A' ) && ( p[ 16 ] != 'a' ) ) ) )
+	{
+		require_action_quiet( size > sizeof_string( ".254.169.in-addr.arpa" ), exit, err = WSASERVICE_NOT_FOUND );
+ 
+		p = name + ( size - 1 );
+		p = ( *p == '.' ) ? ( p - sizeof_string( ".254.169.in-addr.arpa" ) ) : ( ( p - sizeof_string( ".254.169.in-addr.arpa" ) ) + 1 );
+	
+		require_action_quiet( ( ( p[ 0 ] == '.' )						 &&
+								( ( p[ 1 ] == '2' ) )							&&
+								( ( p[ 2 ] == '5' ) )							&&
+								( ( p[ 3 ] == '4' ) )							&&
+								( ( p[ 4 ] == '.' ) )							&&
+								( ( p[ 5 ] == '1' ) )							&&
+								( ( p[ 6 ] == '6' ) )							&&
+								( ( p[ 7 ] == '9' ) )							&&
+								( ( p[ 8 ] == '.' ) )							&&
+								( ( p[ 9 ] == 'I' ) || ( p[ 9 ] == 'i' ) )		&&
+								( ( p[ 10 ] == 'N' ) || ( p[ 10 ] == 'n' ) )	&&	
+								( ( p[ 11 ] == '-' ) )							&&
+								( ( p[ 12 ] == 'A' ) || ( p[ 12 ] == 'a' ) )	&&
+								( ( p[ 13 ] == 'D' ) || ( p[ 13 ] == 'd' ) )	&&
+								( ( p[ 14 ] == 'D' ) || ( p[ 14 ] == 'd' ) )	&&
+								( ( p[ 15 ] == 'R' ) || ( p[ 15 ] == 'r' ) )	&&
+								( ( p[ 16 ] == '.' ) )							&&
+								( ( p[ 17 ] == 'A' ) || ( p[ 17 ] == 'a' ) )	&&
+								( ( p[ 18 ] == 'R' ) || ( p[ 18 ] == 'r' ) )	&&
+								( ( p[ 19 ] == 'P' ) || ( p[ 19 ] == 'p' ) )	&&
+								( ( p[ 20 ] == 'A' ) || ( p[ 20 ] == 'a' ) ) ),
+								exit, err = WSASERVICE_NOT_FOUND );
+	}
+
+	// It's a reverse lookup
+
+	check( err == kNoErr );
+
+exit:
+
+	return err;
+}
+#endif
+
+//===========================================================================================================================
+//	GetScopeId
+//===========================================================================================================================
+
+DEBUG_LOCAL DWORD
+GetScopeId( DWORD ifIndex )
+{
+	DWORD						err;
+	int							i;
+	DWORD						flags;
+	struct ifaddrs *			head;
+	struct ifaddrs **			next;
+	IP_ADAPTER_ADDRESSES *		iaaList;
+	ULONG						iaaListSize;
+	IP_ADAPTER_ADDRESSES *		iaa;
+	DWORD						scopeId = 0;
+	
+	head	= NULL;
+	next	= &head;
+	iaaList	= NULL;
+	
+	require( gGetAdaptersAddressesFunctionPtr, exit );
+
+	// Get the list of interfaces. The first call gets the size and the second call gets the actual data.
+	// This loops to handle the case where the interface changes in the window after getting the size, but before the
+	// second call completes. A limit of 100 retries is enforced to prevent infinite loops if something else is wrong.
+	
+	flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
+	i = 0;
+	for( ;; )
+	{
+		iaaListSize = 0;
+		err = gGetAdaptersAddressesFunctionPtr( AF_UNSPEC, flags, NULL, NULL, &iaaListSize );
+		check( err == ERROR_BUFFER_OVERFLOW );
+		check( iaaListSize >= sizeof( IP_ADAPTER_ADDRESSES ) );
+		
+		iaaList = (IP_ADAPTER_ADDRESSES *) malloc( iaaListSize );
+		require_action( iaaList, exit, err = ERROR_NOT_ENOUGH_MEMORY );
+		
+		err = gGetAdaptersAddressesFunctionPtr( AF_UNSPEC, flags, NULL, iaaList, &iaaListSize );
+		if( err == ERROR_SUCCESS ) break;
+		
+		free( iaaList );
+		iaaList = NULL;
+		++i;
+		require( i < 100, exit );
+		dlog( kDebugLevelWarning, "%s: retrying GetAdaptersAddresses after %d failure(s) (%d %m)\n", __ROUTINE__, i, err, err );
+	}
+	
+	for( iaa = iaaList; iaa; iaa = iaa->Next )
+	{
+		DWORD ipv6IfIndex;
+
+		if ( iaa->IfIndex > 0xFFFFFF )
+		{
+			continue;
+		}
+		if ( iaa->Ipv6IfIndex > 0xFF )
+		{
+			continue;
+		}
+
+		// For IPv4 interfaces, there seems to be a bug in iphlpapi.dll that causes the 
+		// following code to crash when iterating through the prefix list.  This seems
+		// to occur when iaa->Ipv6IfIndex != 0 when IPv6 is not installed on the host.
+		// This shouldn't happen according to Microsoft docs which states:
+		//
+		//     "Ipv6IfIndex contains 0 if IPv6 is not available on the interface."
+		//
+		// So the data structure seems to be corrupted when we return from
+		// GetAdaptersAddresses(). The bug seems to occur when iaa->Length <
+		// sizeof(IP_ADAPTER_ADDRESSES), so when that happens, we'll manually
+		// modify iaa to have the correct values.
+
+		if ( iaa->Length >= sizeof( IP_ADAPTER_ADDRESSES ) )
+		{
+			ipv6IfIndex = iaa->Ipv6IfIndex;
+		}
+		else
+		{
+			ipv6IfIndex	= 0;
+		}
+
+		// Skip psuedo and tunnel interfaces.
+		
+		if( ( ipv6IfIndex == 1 ) || ( iaa->IfType == IF_TYPE_TUNNEL ) )
+		{
+			continue;
+		}
+
+		if ( iaa->IfIndex == ifIndex )
+		{
+			scopeId = iaa->Ipv6IfIndex;
+			break;
+		}
+	} 
+
+exit:
+
+	if( iaaList )
+	{
+		free( iaaList );
+	}
+
+	return scopeId;
+}
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.def b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.def
new file mode 100644
index 00000000..822213db
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.def
@@ -0,0 +1,24 @@
+; -*- tab-width: 4 -*-
+;
+; Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+LIBRARY		mdnsNSP
+
+EXPORTS
+	NSPStartup
+	NSPCleanup
+	DllRegisterServer	PRIVATE
+	DllUnregisterServer	PRIVATE
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.rc b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.rc
new file mode 100644
index 00000000..c090f0c3
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.rc
@@ -0,0 +1,104 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "WinVersRes.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""WinVersRes.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "Bonjour Namespace Provider"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "mdnsNSP.dll"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "mdnsNSP.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcproj b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcproj
new file mode 100644
index 00000000..1d6f563f
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcproj
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="mdnsNSP"

+	ProjectGUID="{F4F15529-F0EB-402F-8662-73C5797EE557}"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NSP_EXPORTS;DEBUG;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib iphlpapi.lib shlwapi.lib"

+				OutputFile="$(OutDir)/mdnsNSP.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile="mdnsNSP.def"

+				DelayLoadDLLs="dnssd.dll"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/mdnsNSP.pdb"

+				SubSystem="2"

+				BaseAddress="0x64000000"

+				ImportLibrary="$(OutDir)/mdnsNSP.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NSP_EXPORTS;DEBUG;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="3"

+				SmallerTypeCheck="true"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="true"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib iphlpapi.lib shlwapi.lib"

+				OutputFile="$(OutDir)/mdnsNSP.dll"

+				LinkIncremental="2"

+				ModuleDefinitionFile="mdnsNSP.def"

+				DelayLoadDLLs="dnssd.dll"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/mdnsNSP.pdb"

+				SubSystem="2"

+				BaseAddress="0x64000000"

+				ImportLibrary="$(OutDir)/mdnsNSP.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;../;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NSP_EXPORTS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="0"

+				SmallerTypeCheck="false"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE /SAFESEH"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib iphlpapi.lib shlwapi.lib"

+				OutputFile="$(OutDir)/mdnsNSP.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile="mdnsNSP.def"

+				DelayLoadDLLs="dnssd.dll"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				BaseAddress="0x64000000"

+				ImportLibrary="$(IntDir)/mdnsNSP.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories=".;../;../../mDNSShared;../../Clients"

+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NSP_EXPORTS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1"

+				StringPooling="true"

+				MinimalRebuild="true"

+				ExceptionHandling="0"

+				BasicRuntimeChecks="0"

+				SmallerTypeCheck="false"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="0"

+				AssemblerListingLocation="$(IntDir)\"

+				WarningLevel="4"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+				CallingConvention="2"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				AdditionalIncludeDirectories="../"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/NXCOMPAT /DYNAMICBASE"

+				AdditionalDependencies="../DLL/$(PlatformName)/$(ConfigurationName)/dnssd.lib ws2_32.lib iphlpapi.lib shlwapi.lib"

+				OutputFile="$(OutDir)/mdnsNSP.dll"

+				LinkIncremental="1"

+				ModuleDefinitionFile="mdnsNSP.def"

+				DelayLoadDLLs="dnssd.dll"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"

+				SubSystem="2"

+				OptimizeReferences="0"

+				EnableCOMDATFolding="0"

+				BaseAddress="0x64000000"

+				ImportLibrary="$(IntDir)/mdnsNSP.lib"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\Clients\ClientCommon.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.c"

+				>

+			</File>

+			<File

+				RelativePath=".\mdnsNSP.c"

+				>

+			</File>

+			<File

+				RelativePath=".\mdnsNSP.def"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\Clients\ClientCommon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\CommonServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\mDNSShared\DebugServices.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\mDNSShared\dns_sd.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+			<File

+				RelativePath=".\mdnsNSP.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj
new file mode 100755
index 00000000..71b2b988
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{F4F15529-F0EB-402F-8662-73C5797EE557}</ProjectGuid>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NSP_EXPORTS;DEBUG;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mdnsNSP.dll</OutputFile>

+      <ModuleDefinitionFile>mdnsNSP.def</ModuleDefinitionFile>

+      <DelayLoadDLLs>dnssd.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)mdnsNSP.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <BaseAddress>0x64000000</BaseAddress>

+      <ImportLibrary>$(OutDir)mdnsNSP.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NSP_EXPORTS;DEBUG;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <SmallerTypeCheck>true</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mdnsNSP.dll</OutputFile>

+      <ModuleDefinitionFile>mdnsNSP.def</ModuleDefinitionFile>

+      <DelayLoadDLLs>dnssd.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)mdnsNSP.pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <BaseAddress>0x64000000</BaseAddress>

+      <ImportLibrary>$(OutDir)mdnsNSP.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;../;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NSP_EXPORTS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <SmallerTypeCheck>false</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE /SAFESEH %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mdnsNSP.dll</OutputFile>

+      <ModuleDefinitionFile>mdnsNSP.def</ModuleDefinitionFile>

+      <DelayLoadDLLs>dnssd.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <BaseAddress>0x64000000</BaseAddress>

+      <ImportLibrary>$(IntDir)mdnsNSP.lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <AdditionalIncludeDirectories>.;../;../../mDNSShared;../../Clients;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NSP_EXPORTS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <SmallerTypeCheck>false</SmallerTypeCheck>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <WarningLevel>Level4</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CallingConvention>StdCall</CallingConvention>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/NXCOMPAT /DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>../DLL/$(Platform)/$(Configuration)/dnssd.lib;ws2_32.lib;iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mdnsNSP.dll</OutputFile>

+      <ModuleDefinitionFile>mdnsNSP.def</ModuleDefinitionFile>

+      <DelayLoadDLLs>dnssd.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <BaseAddress>0x64000000</BaseAddress>

+      <ImportLibrary>$(IntDir)mdnsNSP.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not "%RC_XBS%" == "YES" goto END

+if not exist "$(DSTROOT)\Program Files\Bonjour\$(Platform)"   mkdir "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+xcopy /I/Y "$(TargetPath)"                                                                  "$(DSTROOT)\Program Files\Bonjour\$(Platform)"

+:END

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\Clients\ClientCommon.c" />

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c" />

+    <ClCompile Include="mdnsNSP.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="mdnsNSP.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\Clients\ClientCommon.h" />

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h" />

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h" />

+    <ClInclude Include="..\..\..\mDNSShared\dns_sd.h" />

+    <ClInclude Include="resource.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="mdnsNSP.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\DLL\dnssd.vcxproj">

+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj.filters b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj.filters
new file mode 100755
index 00000000..f09d07ab
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/mdnsNSP.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\Clients\ClientCommon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\mDNSShared\DebugServices.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="mdnsNSP.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="mdnsNSP.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\Clients\ClientCommon.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\CommonServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\mDNSShared\DebugServices.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\mDNSShared\dns_sd.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="mdnsNSP.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mDNSResponder/mDNSWindows/mdnsNSP/resource.h b/mDNSResponder/mDNSWindows/mdnsNSP/resource.h
new file mode 100644
index 00000000..818f083b
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/mdnsNSP/resource.h
@@ -0,0 +1,27 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by mdnsNSP.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_WMDMLOGGER                  101
+#define IDS_LOG_SEV_INFO                201
+#define IDS_LOG_SEV_WARN                202
+#define IDS_LOG_SEV_ERROR               203
+#define IDS_LOG_DATETIME                204
+#define IDS_LOG_SRCNAME                 205
+#define IDS_DEF_LOGFILE                 301
+#define IDS_DEF_MAXSIZE                 302
+#define IDS_DEF_SHRINKTOSIZE            303
+#define IDS_DEF_LOGENABLED              304
+#define IDS_MUTEX_TIMEOUT               401
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif